mirror of
https://github.com/logos-blockchain/logos-execution-zone.git
synced 2026-05-13 03:30:05 +00:00
fmt
This commit is contained in:
parent
9c90a6d182
commit
6f9c3b2af3
@ -115,12 +115,9 @@ impl KeyTreeNode for ChildKeysPrivate {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn account_ids(&self) -> impl Iterator<Item = nssa::AccountId> {
|
fn account_ids(&self) -> impl Iterator<Item = nssa::AccountId> {
|
||||||
self.value
|
self.value.1.iter().map(|(identifier, _)| {
|
||||||
.1
|
nssa::AccountId::from((&self.value.0.nullifier_public_key, *identifier))
|
||||||
.iter()
|
})
|
||||||
.map(|(identifier, _)| {
|
|
||||||
nssa::AccountId::from((&self.value.0.nullifier_public_key, *identifier))
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -17,7 +17,7 @@ pub type PublicKey = AffinePoint;
|
|||||||
#[derive(Clone, Debug, Serialize, Deserialize)]
|
#[derive(Clone, Debug, Serialize, Deserialize)]
|
||||||
pub struct UserPrivateAccountData {
|
pub struct UserPrivateAccountData {
|
||||||
pub key_chain: KeyChain,
|
pub key_chain: KeyChain,
|
||||||
pub accounts: Vec<(Identifier, Account)>
|
pub accounts: Vec<(Identifier, Account)>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, Serialize, Deserialize)]
|
#[derive(Clone, Debug, Serialize, Deserialize)]
|
||||||
@ -54,7 +54,8 @@ impl NSSAUserData {
|
|||||||
let mut check_res = true;
|
let mut check_res = true;
|
||||||
for (account_id, entry) in accounts_keys_map {
|
for (account_id, entry) in accounts_keys_map {
|
||||||
let any_match = entry.accounts.iter().any(|(identifier, _)| {
|
let any_match = entry.accounts.iter().any(|(identifier, _)| {
|
||||||
nssa::AccountId::from((&entry.key_chain.nullifier_public_key, *identifier)) == *account_id
|
nssa::AccountId::from((&entry.key_chain.nullifier_public_key, *identifier))
|
||||||
|
== *account_id
|
||||||
});
|
});
|
||||||
if !any_match {
|
if !any_match {
|
||||||
println!("No matching entry found for account_id {account_id}");
|
println!("No matching entry found for account_id {account_id}");
|
||||||
|
|||||||
@ -79,7 +79,11 @@ impl WalletChainStore {
|
|||||||
InitialAccountData::Private(data) => {
|
InitialAccountData::Private(data) => {
|
||||||
private_init_acc_map.insert(
|
private_init_acc_map.insert(
|
||||||
data.account_id,
|
data.account_id,
|
||||||
UserPrivateAccountData{ key_chain: data.key_chain, accounts: vec![(data.identifier, data.account)]});
|
UserPrivateAccountData {
|
||||||
|
key_chain: data.key_chain,
|
||||||
|
accounts: vec![(data.identifier, data.account)],
|
||||||
|
},
|
||||||
|
);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
@ -120,7 +124,11 @@ impl WalletChainStore {
|
|||||||
account.program_owner = Program::authenticated_transfer_program().id();
|
account.program_owner = Program::authenticated_transfer_program().id();
|
||||||
private_init_acc_map.insert(
|
private_init_acc_map.insert(
|
||||||
data.account_id,
|
data.account_id,
|
||||||
UserPrivateAccountData{key_chain: data.key_chain, accounts:vec![(data.identifier, account)]});
|
UserPrivateAccountData {
|
||||||
|
key_chain: data.key_chain,
|
||||||
|
accounts: vec![(data.identifier, account)],
|
||||||
|
},
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -185,10 +193,12 @@ impl WalletChainStore {
|
|||||||
.entry(account_id)
|
.entry(account_id)
|
||||||
{
|
{
|
||||||
let entry = entry.get_mut();
|
let entry = entry.get_mut();
|
||||||
let identifier = entry.accounts
|
let identifier = entry
|
||||||
|
.accounts
|
||||||
.iter()
|
.iter()
|
||||||
.find_map(|(id, _)| {
|
.find_map(|(id, _)| {
|
||||||
(nssa::AccountId::from((&entry.key_chain.nullifier_public_key, *id)) == account_id)
|
(nssa::AccountId::from((&entry.key_chain.nullifier_public_key, *id))
|
||||||
|
== account_id)
|
||||||
.then_some(*id)
|
.then_some(*id)
|
||||||
})
|
})
|
||||||
.unwrap_or(0);
|
.unwrap_or(0);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user