From b6e70195883152564b9ad1b2c76145eb046489e1 Mon Sep 17 00:00:00 2001
From: Sergio Chouhy <sergio.chouhy@gmail.com>
Date: Fri, 3 Oct 2025 08:44:15 -0300
Subject: [PATCH] use account with metadata constructor

---
 wallet/src/token_transfers/deshielded.rs | 10 +++------
 wallet/src/token_transfers/private.rs    |  7 +++---
 wallet/src/token_transfers/shielded.rs   | 28 ++++++------------------
 3 files changed, 13 insertions(+), 32 deletions(-)

diff --git a/wallet/src/token_transfers/deshielded.rs b/wallet/src/token_transfers/deshielded.rs
index f193c63..5c8415e 100644
--- a/wallet/src/token_transfers/deshielded.rs
+++ b/wallet/src/token_transfers/deshielded.rs
@@ -1,6 +1,7 @@
 use common::{ExecutionFailureKind, sequencer_client::json::SendTxResponse};
 use key_protocol::key_management::ephemeral_key_holder::EphemeralKeyHolder;
 use nssa::Address;
+use nssa_core::account::AccountWithMetadata;
 
 use crate::{WalletCore, helperfunctions::produce_random_nonces};
 
@@ -29,13 +30,8 @@ impl WalletCore {
 
             let sender_commitment = nssa_core::Commitment::new(&npk_from, &from_acc);
 
-            let sender_pre =
-                nssa_core::account::AccountWithMetadata::new(from_acc.clone(), true, &npk_from);
-            let recipient_pre = nssa_core::account::AccountWithMetadata {
-                account: to_acc.clone(),
-                is_authorized: false,
-                account_id: to,
-            };
+            let sender_pre = AccountWithMetadata::new(from_acc.clone(), true, &npk_from);
+            let recipient_pre = AccountWithMetadata::new(to_acc.clone(), false, to);
 
             let eph_holder = EphemeralKeyHolder::new(&npk_from);
             let shared_secret = eph_holder.calculate_shared_secret_sender(&ipk_from);
diff --git a/wallet/src/token_transfers/private.rs b/wallet/src/token_transfers/private.rs
index afdbb52..4b1c5fa 100644
--- a/wallet/src/token_transfers/private.rs
+++ b/wallet/src/token_transfers/private.rs
@@ -1,6 +1,7 @@
 use common::{ExecutionFailureKind, sequencer_client::json::SendTxResponse};
 use key_protocol::key_management::ephemeral_key_holder::EphemeralKeyHolder;
 use nssa::Address;
+use nssa_core::account::AccountWithMetadata;
 
 use crate::{WalletCore, helperfunctions::produce_random_nonces};
 
@@ -129,10 +130,8 @@ impl WalletCore {
             let sender_commitment = nssa_core::Commitment::new(&from_npk, &from_acc);
             let receiver_commitment = nssa_core::Commitment::new(&to_npk, &to_acc);
 
-            let sender_pre =
-                nssa_core::account::AccountWithMetadata::new(from_acc.clone(), true, &from_npk);
-            let recipient_pre =
-                nssa_core::account::AccountWithMetadata::new(to_acc.clone(), true, &to_npk);
+            let sender_pre = AccountWithMetadata::new(from_acc.clone(), true, &from_npk);
+            let recipient_pre = AccountWithMetadata::new(to_acc.clone(), true, &to_npk);
 
             let eph_holder_from = EphemeralKeyHolder::new(&from_npk);
             let shared_secret_from = eph_holder_from.calculate_shared_secret_sender(&from_ipk);
diff --git a/wallet/src/token_transfers/shielded.rs b/wallet/src/token_transfers/shielded.rs
index 5de293c..c0a2d1c 100644
--- a/wallet/src/token_transfers/shielded.rs
+++ b/wallet/src/token_transfers/shielded.rs
@@ -1,6 +1,7 @@
 use common::{ExecutionFailureKind, sequencer_client::json::SendTxResponse};
 use key_protocol::key_management::ephemeral_key_holder::EphemeralKeyHolder;
 use nssa::Address;
+use nssa_core::account::AccountWithMetadata;
 
 use crate::{WalletCore, helperfunctions::produce_random_nonces};
 
@@ -29,16 +30,10 @@ impl WalletCore {
             let receiver_commitment =
                 nssa_core::Commitment::new(&to_keys.nullifer_public_key, &to_acc);
 
-            let sender_pre = nssa_core::account::AccountWithMetadata {
-                account: from_acc.clone(),
-                is_authorized: true,
-                account_id: from,
-            };
-            let recipient_pre = nssa_core::account::AccountWithMetadata {
-                account: to_acc.clone(),
-                is_authorized: true,
-                account_id: (&to_npk).into(),
-            };
+            let sender_pre =
+                nssa_core::account::AccountWithMetadata::new(from_acc.clone(), true, from);
+            let recipient_pre =
+                nssa_core::account::AccountWithMetadata::new(to_acc.clone(), true, &to_npk);
 
             let eph_holder = EphemeralKeyHolder::new(&to_npk);
             let shared_secret = eph_holder.calculate_shared_secret_sender(&to_ipk);
@@ -117,17 +112,8 @@ impl WalletCore {
         if from_acc.balance >= balance_to_move {
             let program = nssa::program::Program::authenticated_transfer_program();
 
-            let sender_pre = nssa_core::account::AccountWithMetadata {
-                account: from_acc.clone(),
-                is_authorized: true,
-                account_id: from,
-            };
-
-            let recipient_pre = nssa_core::account::AccountWithMetadata {
-                account: to_acc.clone(),
-                is_authorized: false,
-                account_id: (&to_npk).into(),
-            };
+            let sender_pre = AccountWithMetadata::new(from_acc.clone(), true, from);
+            let recipient_pre = AccountWithMetadata::new(to_acc.clone(), false, &to_npk);
 
             let eph_holder = EphemeralKeyHolder::new(&to_npk);
             let shared_secret = eph_holder.calculate_shared_secret_sender(&to_ipk);