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

fix: merge updates

Browse Source
This commit is contained in:
Oleksandr Pravdyvyi 2025-05-21 08:34:03 +03:00
parent 77062e2e4e
commit 00fe02c1d1
2 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
accounts/src/account_core/mod.rs
View File

@ -116,9 +116,6 @@ impl Account {
asset: Asset, asset: Asset,
amount: u128, amount: u128,
privacy_flag: bool, privacy_flag: bool,
utxo_id: u64,
tx_id: u64,
block_id: u64,
) -> Result<()> { ) -> Result<()> {
let payload_with_asset = UTXOPayload { let payload_with_asset = UTXOPayload {
owner: self.address, owner: self.address,
@ -169,24 +166,14 @@ mod tests {
UTXONullifier::default() UTXONullifier::default()
} }
fn generate_dummy_utxo( fn generate_dummy_utxo(address: TreeHashType, amount: u128) -> anyhow::Result<UTXO> {
address: TreeHashType,
amount: u128,
utxo_id: u64,
) -> anyhow::Result<UTXOTreeInput> {
let payload = UTXOPayload { let payload = UTXOPayload {
owner: address, owner: address,
asset: vec![], asset: vec![],
amount, amount,
privacy_flag: false, privacy_flag: false,
}; };
let utxo = UTXO::create_utxo_from_payload(payload); UTXO::create_utxo_from_payload(payload)
utxo.map(|utxo| UTXOTreeInput {
utxo_id,
tx_id: 1,
block_id: 1,
utxo,
})
} }
#[test] #[test]
@ -200,7 +187,7 @@ mod tests {
#[test] #[test]
fn test_mark_spent_utxo() { fn test_mark_spent_utxo() {
let mut account = Account::new(); let mut account = Account::new();
let utxo = generate_dummy_utxo(account.address, 100, 1).unwrap(); let utxo = generate_dummy_utxo(account.address, 100).unwrap();
account.add_new_utxo_outputs(vec![utxo]).unwrap(); account.add_new_utxo_outputs(vec![utxo]).unwrap();
let mut utxo_nullifier_map = HashMap::new(); let mut utxo_nullifier_map = HashMap::new();
@ -214,8 +201,8 @@ mod tests {
#[test] #[test]
fn test_add_new_utxo_outputs() { fn test_add_new_utxo_outputs() {
let mut account = Account::new(); let mut account = Account::new();
let utxo1 = generate_dummy_utxo(account.address, 100, 1).unwrap(); let utxo1 = generate_dummy_utxo(account.address, 100).unwrap();
let utxo2 = generate_dummy_utxo(account.address, 200, 2).unwrap(); let utxo2 = generate_dummy_utxo(account.address, 200).unwrap();
let result = account.add_new_utxo_outputs(vec![utxo1.clone(), utxo2.clone()]); let result = account.add_new_utxo_outputs(vec![utxo1.clone(), utxo2.clone()]);
@ -237,7 +224,7 @@ mod tests {
let asset = "dummy_asset"; let asset = "dummy_asset";
let amount = 1000u128; let amount = 1000u128;
let result = account.add_asset(asset, amount, false, 1, 1, 1); let result = account.add_asset(asset, amount, false);
assert!(result.is_ok()); assert!(result.is_ok());
assert_eq!(account.utxos.len(), 1); assert_eq!(account.utxos.len(), 1);

6
node_core/src/chain_storage/mod.rs
View File

@ -15,7 +15,7 @@ use common::{
}; };
use k256::AffinePoint; use k256::AffinePoint;
use public_context::PublicSCContext; use public_context::PublicSCContext;
use utxo::{utxo_core::UTXO, utxo_tree::UTXOTreeInput}; use utxo::utxo_core::UTXO;
use crate::ActionData; use crate::ActionData;
@ -115,9 +115,7 @@ impl NodeChainStore {
let ephemeral_public_key_sender = let ephemeral_public_key_sender =
serde_json::from_slice::<AffinePoint>(&tx.ephemeral_pub_key)?; serde_json::from_slice::<AffinePoint>(&tx.ephemeral_pub_key)?;
for (utxo_id, (ciphertext, nonce, tag)) in for (ciphertext, nonce, tag) in tx.encoded_data.clone() {
tx.encoded_data.clone().into_iter().enumerate()
{
let slice = nonce.as_slice(); let slice = nonce.as_slice();
let nonce = let nonce =
accounts::key_management::constants_types::Nonce::clone_from_slice(slice); accounts::key_management::constants_types::Nonce::clone_from_slice(slice);