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

refactor(wallet): route note decryption through decrypt_note_at

Browse Source
This commit is contained in:
Artem Gureev 2026-07-14 10:58:10 +00:00
parent 4b516d8e15
commit 719c2af38d
2 changed files with 28 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
lez/wallet/src/lib.rs
View File

@ -566,14 +566,8 @@ impl WalletCore {
else {
continue;
};
let acc_ead = tx.message.encrypted_private_post_states[output_index].clone();
let (kind, res_acc) = lee_core::EncryptionScheme::decrypt(
&acc_ead.ciphertext,
secret,
&tx.message.new_nullifiers[output_index].0,
)
.unwrap();
let (kind, res_acc) =
decrypt_note_at(&tx.message, output_index, secret).unwrap();
println!("Received new acc {res_acc:#?}");
@ -829,8 +823,6 @@ impl WalletCore {
&key_chain.nullifier_public_key,
&key_chain.viewing_public_key,
);
let new_nullifiers = &message.new_nullifiers;
message
.encrypted_private_post_states
.iter()
@ -842,22 +834,19 @@ impl WalletCore {
!handled.contains(ciph_id) && encrypted_data.view_tag == view_tag
})
.filter_map(move |(ciph_id, encrypted_data)| {
let ciphertext = &encrypted_data.ciphertext;
let nullifier = &new_nullifiers[ciph_id].0;
let shared_secret =
key_chain.calculate_shared_secret_receiver(&encrypted_data.epk)?;
lee_core::EncryptionScheme::decrypt(ciphertext, &shared_secret, nullifier)
.map(|(kind, res_acc)| {
let npk = &key_chain.nullifier_public_key;
let account_id = lee::AccountId::for_private_account(
npk,
&key_chain.viewing_public_key,
&kind,
);
let nsk = key_chain.private_key_holder.nullifier_secret_key;
(account_id, kind, res_acc, nsk)
})
decrypt_note_at(message, ciph_id, &shared_secret).map(|(kind, res_acc)| {
let npk = &key_chain.nullifier_public_key;
let account_id = lee::AccountId::for_private_account(
npk,
&key_chain.viewing_public_key,
&kind,
);
let nsk = key_chain.private_key_holder.nullifier_secret_key;
(account_id, kind, res_acc, nsk)
})
})
.collect::<Vec<_>>()
})
@ -916,11 +905,7 @@ impl WalletCore {
else {
continue;
};
if let Some((_kind, new_acc)) = lee_core::EncryptionScheme::decrypt(
&encrypted_data.ciphertext,
&shared_secret,
&message.new_nullifiers[ciph_id].0,
) {
if let Some((_kind, new_acc)) = decrypt_note_at(message, ciph_id, &shared_secret) {
info!("Synced shared account {account_id:#?} with new state {new_acc:#?}");
index.track(account_id, &new_acc, &nsk);
self.storage
@ -947,6 +932,18 @@ impl WalletCore {
}
}
fn decrypt_note_at(
message: &Message,
i: usize,
secret: &SharedSecretKey,
) -> Option<(lee_core::PrivateAccountKind, Account)> {
lee_core::EncryptionScheme::decrypt(
&message.encrypted_private_post_states[i].ciphertext,
secret,
&message.new_nullifiers[i].0,
)
}
#[cfg(test)]
mod tests {
use std::{ffi::CString, str::FromStr as _};

11
lez/wallet/src/storage/key_chain.rs
View File

@ -10,8 +10,7 @@ use key_protocol::key_management::{
};
use lee::{Account, AccountId, privacy_preserving_transaction::message::Message};
use lee_core::{
Commitment, EncryptionScheme, Identifier, Nullifier, NullifierSecretKey, PrivateAccountKind,
SharedSecretKey,
Commitment, Identifier, Nullifier, NullifierSecretKey, PrivateAccountKind, SharedSecretKey,
};
use log::{debug, warn};
use serde::{Deserialize, Serialize};
@ -440,11 +439,7 @@ impl UserKeyChain {
)
};
let (kind, new_account) = EncryptionScheme::decrypt(
&encrypted.ciphertext,
&secret,
&message.new_nullifiers[i].0,
)?;
let (kind, new_account) = crate::decrypt_note_at(message, i, &secret)?;
let new_nullifier = NullifierIndex::next_update_nullifier(account_id, &new_account, &nsk);
if is_shared {
@ -881,7 +876,7 @@ impl Default for UserKeyChain {
#[cfg(test)]
mod tests {
use lee_core::encryption::EncryptedAccountData;
use lee_core::{EncryptionScheme, encryption::EncryptedAccountData};
use super::*;