logos-blockchain/lssa
1
0
Fork 0
mirror of https://github.com/logos-blockchain/lssa.git synced 2026-01-07 15:53:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove resetting program owner in wallet privacy commands

Browse Source
This commit is contained in:
Sergio Chouhy 2025-10-03 00:44:46 -03:00
parent e69fb8b1b8
commit d54ea96bba
5 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wallet/src/chain_storage/mod.rs
View File

@ -2,6 +2,7 @@ use std::collections::HashMap;
use anyhow::Result; use anyhow::Result;
use key_protocol::key_protocol_core::NSSAUserData; use key_protocol::key_protocol_core::NSSAUserData;
use nssa::program::Program;
use crate::config::{InitialAccountData, PersistentAccountData, WalletConfig}; use crate::config::{InitialAccountData, PersistentAccountData, WalletConfig};
@ -21,8 +22,12 @@ impl WalletChainStore {
public_init_acc_map.insert(data.address.parse()?, data.pub_sign_key); public_init_acc_map.insert(data.address.parse()?, data.pub_sign_key);
} }
InitialAccountData::Private(data) => { InitialAccountData::Private(data) => {
private_init_acc_map let mut account = data.account;
.insert(data.address.parse()?, (data.key_chain, data.account)); // TODO: Program owner is only known after code is compiled and can't be set in
// the config. Therefore we overwrite it here on startup. Fix this when program
// id can be fetched from the node and queried from the wallet.
account.program_owner = Program::authenticated_transfer_program().id();
private_init_acc_map.insert(data.address.parse()?, (data.key_chain, account));
} }
} }
} }

25
wallet/src/lib.rs
View File

@ -431,9 +431,13 @@ pub async fn execute_subcommand(command: Command) -> Result<SubcommandReturnValu
) )
.unwrap(); .unwrap();
let res_acc_to = let res_acc_to = nssa_core::EncryptionScheme::decrypt(
nssa_core::EncryptionScheme::decrypt(&to_ebc.ciphertext, &secret_to, &to_comm, 1) &to_ebc.ciphertext,
.unwrap(); &secret_to,
&to_comm,
1,
)
.unwrap();
println!("Received new from acc {res_acc_from:#?}"); println!("Received new from acc {res_acc_from:#?}");
println!("Received new to acc {res_acc_to:#?}"); println!("Received new to acc {res_acc_to:#?}");
@ -498,9 +502,13 @@ pub async fn execute_subcommand(command: Command) -> Result<SubcommandReturnValu
) )
.unwrap(); .unwrap();
let res_acc_to = let res_acc_to = nssa_core::EncryptionScheme::decrypt(
nssa_core::EncryptionScheme::decrypt(&to_ebc.ciphertext, &secret_to, &to_comm, 1) &to_ebc.ciphertext,
.unwrap(); &secret_to,
&to_comm,
1,
)
.unwrap();
println!("RES acc {res_acc_from:#?}"); println!("RES acc {res_acc_from:#?}");
println!("RES acc to {res_acc_to:#?}"); println!("RES acc to {res_acc_to:#?}");
@ -712,7 +720,10 @@ pub async fn execute_subcommand(command: Command) -> Result<SubcommandReturnValu
println!("Generated new account with addr {addr}"); println!("Generated new account with addr {addr}");
println!("With npk {}", hex::encode(&key.nullifer_public_key)); println!("With npk {}", hex::encode(&key.nullifer_public_key));
println!("With ipk {}", hex::encode(&key.incoming_viewing_public_key.to_bytes())); println!(
"With ipk {}",
hex::encode(&key.incoming_viewing_public_key.to_bytes())
);
let path = wallet_core.store_persistent_accounts()?; let path = wallet_core.store_persistent_accounts()?;

2
wallet/src/token_transfers/deshielded.rs
View File

@ -29,8 +29,6 @@ impl WalletCore {
let npk_from = from_keys.nullifer_public_key; let npk_from = from_keys.nullifer_public_key;
let ipk_from = from_keys.incoming_viewing_public_key; let ipk_from = from_keys.incoming_viewing_public_key;
from_acc.program_owner = program.id();
let sender_commitment = nssa_core::Commitment::new(&npk_from, &from_acc); let sender_commitment = nssa_core::Commitment::new(&npk_from, &from_acc);
let sender_pre = let sender_pre =

5
wallet/src/token_transfers/private.rs
View File

@ -26,8 +26,6 @@ impl WalletCore {
let from_npk = from_keys.nullifer_public_key; let from_npk = from_keys.nullifer_public_key;
let from_ipk = from_keys.incoming_viewing_public_key; let from_ipk = from_keys.incoming_viewing_public_key;
from_acc.program_owner = program.id();
let sender_commitment = nssa_core::Commitment::new(&from_npk, &from_acc); let sender_commitment = nssa_core::Commitment::new(&from_npk, &from_acc);
let sender_pre = let sender_pre =
@ -128,9 +126,6 @@ impl WalletCore {
if from_acc.balance >= balance_to_move { if from_acc.balance >= balance_to_move {
let program = nssa::program::Program::authenticated_transfer_program(); let program = nssa::program::Program::authenticated_transfer_program();
from_acc.program_owner = program.id();
to_acc.program_owner = program.id();
let sender_commitment = nssa_core::Commitment::new(&from_npk, &from_acc); let sender_commitment = nssa_core::Commitment::new(&from_npk, &from_acc);
let receiver_commitment = nssa_core::Commitment::new(&to_npk, &to_acc); let receiver_commitment = nssa_core::Commitment::new(&to_npk, &to_acc);

2
wallet/src/token_transfers/shielded.rs
View File

@ -28,8 +28,6 @@ impl WalletCore {
if from_acc.balance >= balance_to_move { if from_acc.balance >= balance_to_move {
let program = nssa::program::Program::authenticated_transfer_program(); let program = nssa::program::Program::authenticated_transfer_program();
to_acc.program_owner = program.id();
let receiver_commitment = let receiver_commitment =
nssa_core::Commitment::new(&to_keys.nullifer_public_key, &to_acc); nssa_core::Commitment::new(&to_keys.nullifer_public_key, &to_acc);