From 5010c6c37020e4ad1f8e9c4b75d18851d4df3037 Mon Sep 17 00:00:00 2001
From: Oleksandr Pravdyvyi <awxrvtb@gmail.com>
Date: Wed, 15 Oct 2025 15:29:28 +0300
Subject: [PATCH] fix: merge update

---
 wallet/src/cli/token_program.rs          | 28 +++++++++++++-----------
 wallet/src/token_program_interactions.rs | 10 +++------
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/wallet/src/cli/token_program.rs b/wallet/src/cli/token_program.rs
index 02c9b53..7a17730 100644
--- a/wallet/src/cli/token_program.rs
+++ b/wallet/src/cli/token_program.rs
@@ -188,27 +188,29 @@ impl WalletSubcommand for TokenProgramSubcommandPrivate {
                 let sender_addr: Address = sender_addr.parse().unwrap();
                 let recipient_addr: Address = recipient_addr.parse().unwrap();
 
-                let recipient_initialized = wallet_core
+                let recipient_initialization = wallet_core
                     .check_private_account_initialized(&recipient_addr)
-                    .await;
+                    .await?;
 
-                let (res, [secret_sender, secret_recipient]) = if recipient_initialized {
-                    wallet_core
+                let (res, [secret_sender, secret_recipient]) =
+                    if let Some(recipient_proof) = recipient_initialization {
+                        wallet_core
                         .send_transfer_token_transaction_private_owned_account_already_initialized(
                             sender_addr,
                             recipient_addr,
                             balance_to_move,
+                            recipient_proof,
                         )
                         .await?
-                } else {
-                    wallet_core
-                        .send_transfer_token_transaction_private_owned_account_not_initialized(
-                            sender_addr,
-                            recipient_addr,
-                            balance_to_move,
-                        )
-                        .await?
-                };
+                    } else {
+                        wallet_core
+                            .send_transfer_token_transaction_private_owned_account_not_initialized(
+                                sender_addr,
+                                recipient_addr,
+                                balance_to_move,
+                            )
+                            .await?
+                    };
 
                 println!("Results of tx send is {res:#?}");
 
diff --git a/wallet/src/token_program_interactions.rs b/wallet/src/token_program_interactions.rs
index 74c341e..76bd36b 100644
--- a/wallet/src/token_program_interactions.rs
+++ b/wallet/src/token_program_interactions.rs
@@ -2,7 +2,7 @@ use common::{ExecutionFailureKind, sequencer_client::json::SendTxResponse};
 use key_protocol::key_management::ephemeral_key_holder::EphemeralKeyHolder;
 use nssa::{Address, privacy_preserving_transaction::circuit, program::Program};
 use nssa_core::{
-    Commitment, NullifierPublicKey, SharedSecretKey, account::AccountWithMetadata,
+    Commitment, MembershipProof, NullifierPublicKey, SharedSecretKey, account::AccountWithMetadata,
     encryption::IncomingViewingPublicKey,
 };
 
@@ -146,6 +146,7 @@ impl WalletCore {
         sender_address: Address,
         recipient_address: Address,
         amount: u128,
+        recipient_proof: MembershipProof,
     ) -> Result<(SendTxResponse, [SharedSecretKey; 2]), ExecutionFailureKind> {
         let Some((sender_keys, sender_acc)) = self
             .storage
@@ -173,7 +174,6 @@ impl WalletCore {
         let program = Program::token();
 
         let sender_commitment = Commitment::new(&sender_npk, &sender_acc);
-        let receiver_commitment = Commitment::new(&recipient_npk, &recipient_acc);
 
         let sender_pre = AccountWithMetadata::new(sender_acc.clone(), true, &sender_npk);
         let recipient_pre = AccountWithMetadata::new(recipient_acc.clone(), true, &recipient_npk);
@@ -210,11 +210,7 @@ impl WalletCore {
                 ),
                 (
                     recipient_keys.private_key_holder.nullifier_secret_key,
-                    self.sequencer_client
-                        .get_proof_for_commitment(receiver_commitment)
-                        .await
-                        .unwrap()
-                        .unwrap(),
+                    recipient_proof,
                 ),
             ],
             &program,