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

fix: account storage

Browse Source
This commit is contained in:
Oleksandr Pravdyvyi 2025-09-23 14:47:18 +03:00
parent e0f5ac9e7c
commit 3d704bd321
No known key found for this signature in database
GPG Key ID: 9F8955C63C443871
3 changed files with 68 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,6 +32,17 @@ impl WalletChainStore {
})
}
pub fn insert_private_account_data(
&mut self,
addr: nssa::Address,
account: nssa_core::account::Account,
) {
self.user_data
.user_private_accounts
.entry(addr)
.and_modify(|(_, acc)| *acc = account);
}
pub(crate) fn insert_account_data(&mut self, acc_data: PersistentAccountData) {
match acc_data {
PersistentAccountData::Public(acc_data) => {

69
wallet/src/lib.rs
View File

@ -264,6 +264,10 @@ pub async fn execute_subcommand(command: Command) -> Result<()> {
let transfer_tx = wallet_core.poll_native_token_transfer(res.tx_hash).await?;
println!("Transaction data is {transfer_tx:?}");
let path = wallet_core.store_persistent_accounts()?;
println!("Stored persistent accounts at {path:#?}");
}
Command::SendNativeTokenTransferPrivate { from, to, amount } => {
let from = produce_account_addr_from_hex(from)?;
@ -284,7 +288,7 @@ pub async fn execute_subcommand(command: Command) -> Result<()> {
let to_ebc = tx.message.encrypted_private_post_states[1].clone();
let to_comm = tx.message.new_commitments[1].clone();
let res_acc = nssa_core::EncryptionScheme::decrypt(
let res_acc_from = nssa_core::EncryptionScheme::decrypt(
&from_ebc.ciphertext,
&secret,
&from_comm,
@ -296,11 +300,22 @@ pub async fn execute_subcommand(command: Command) -> Result<()> {
nssa_core::EncryptionScheme::decrypt(&to_ebc.ciphertext, &secret, &to_comm, 1)
.unwrap();
println!("RES acc {res_acc:#?}");
println!("RES acc to {res_acc_to:#?}");
println!("Received new from acc {res_acc_from:#?}");
println!("Received new to acc {res_acc_to:#?}");
println!("Transaction data is {:?}", tx.message);
wallet_core
.storage
.insert_private_account_data(from, res_acc_from);
wallet_core
.storage
.insert_private_account_data(to, res_acc_to);
}
let path = wallet_core.store_persistent_accounts()?;
println!("Stored persistent accounts at {path:#?}");
}
Command::SendNativeTokenTransferPrivateForeignAccount {
from,
@ -335,7 +350,7 @@ pub async fn execute_subcommand(command: Command) -> Result<()> {
let to_ebc = tx.message.encrypted_private_post_states[1].clone();
let to_comm = tx.message.new_commitments[1].clone();
let res_acc = nssa_core::EncryptionScheme::decrypt(
let res_acc_from = nssa_core::EncryptionScheme::decrypt(
&from_ebc.ciphertext,
&secret,
&from_comm,
@ -347,11 +362,19 @@ pub async fn execute_subcommand(command: Command) -> Result<()> {
nssa_core::EncryptionScheme::decrypt(&to_ebc.ciphertext, &secret, &to_comm, 1)
.unwrap();
println!("RES acc {res_acc:#?}");
println!("RES acc {res_acc_from:#?}");
println!("RES acc to {res_acc_to:#?}");
println!("Transaction data is {:?}", tx.message);
wallet_core
.storage
.insert_private_account_data(from, res_acc_from);
}
let path = wallet_core.store_persistent_accounts()?;
println!("Stored persistent accounts at {path:#?}");
}
Command::SendNativeTokenTransferDeshielded { from, to, amount } => {
let from = produce_account_addr_from_hex(from)?;
@ -369,7 +392,7 @@ pub async fn execute_subcommand(command: Command) -> Result<()> {
let from_ebc = tx.message.encrypted_private_post_states[0].clone();
let from_comm = tx.message.new_commitments[0].clone();
let res_acc = nssa_core::EncryptionScheme::decrypt(
let res_acc_from = nssa_core::EncryptionScheme::decrypt(
&from_ebc.ciphertext,
&secret,
&from_comm,
@ -377,10 +400,18 @@ pub async fn execute_subcommand(command: Command) -> Result<()> {
)
.unwrap();
println!("RES acc {res_acc:#?}");
println!("RES acc {res_acc_from:#?}");
println!("Transaction data is {:?}", tx.message);
wallet_core
.storage
.insert_private_account_data(from, res_acc_from);
}
let path = wallet_core.store_persistent_accounts()?;
println!("Stored persistent accounts at {path:#?}");
}
Command::SendNativeTokenTransferShielded { from, to, amount } => {
let from = produce_account_addr_from_hex(from)?;
@ -406,6 +437,10 @@ pub async fn execute_subcommand(command: Command) -> Result<()> {
println!("Transaction data is {:?}", tx.message);
}
let path = wallet_core.store_persistent_accounts()?;
println!("Stored persistent accounts at {path:#?}");
}
Command::SendNativeTokenTransferShieldedForeignAccount {
from,
@ -427,7 +462,9 @@ pub async fn execute_subcommand(command: Command) -> Result<()> {
nssa_core::encryption::shared_key_derivation::Secp256k1Point(to_ipk.to_vec());
let (res, secret) = wallet_core
.send_shielded_native_token_transfer_maybe_outer_account(from, to_npk, to_ipk, amount)
.send_shielded_native_token_transfer_maybe_outer_account(
from, to_npk, to_ipk, amount,
)
.await?;
println!("Results of tx send is {res:#?}");
@ -446,11 +483,19 @@ pub async fn execute_subcommand(command: Command) -> Result<()> {
println!("Transaction data is {:?}", tx.message);
}
let path = wallet_core.store_persistent_accounts()?;
println!("Stored persistent accounts at {path:#?}");
}
Command::RegisterAccountPublic {} => {
let addr = wallet_core.create_new_account_public();
println!("Generated new account with addr {addr}");
let path = wallet_core.store_persistent_accounts()?;
println!("Stored persistent accounts at {path:#?}");
}
Command::RegisterAccountPrivate {} => {
let addr = wallet_core.create_new_account_private();
@ -464,6 +509,10 @@ pub async fn execute_subcommand(command: Command) -> Result<()> {
println!("Generated new account with addr {addr:#?}");
println!("With key {key:#?}");
println!("With account {account:#?}");
let path = wallet_core.store_persistent_accounts()?;
println!("Stored persistent accounts at {path:#?}");
}
Command::FetchTx { tx_hash } => {
let tx_obj = wallet_core
@ -492,9 +541,5 @@ pub async fn execute_subcommand(command: Command) -> Result<()> {
}
}
let path = wallet_core.store_persistent_accounts()?;
println!("Stored persistent accounts at {path:#?}");
Ok(())
}

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

@ -41,7 +41,6 @@ impl WalletCore {
is_authorized: true,
};
//Move into different function
let mut esk = [0; 32];
OsRng.fill_bytes(&mut esk);