Reapply "[token-2022] Add support for reading proofs from record acco… (

solana-labs#7086) Reapply "[token-2022] Add support for reading proofs from record accou… (solana-labs#7084) This reverts commit e99e313.
joncinque · Jul 31, 2024 · 1244657 · 1244657
1 parent d181f74
commit 1244657
Show file tree

Hide file tree

Showing 14 changed files with 1,032 additions and 146 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/token/cli/src/command.rs b/token/cli/src/command.rs
@@ -69,6 +69,7 @@ use {
     },
     spl_token_client::{
         client::{ProgramRpcClientSendTransaction, RpcClientResponse},
+        proof_generation::ProofAccount,
         token::{ComputeUnitLimit, ExtensionInitializationParams, Token},
     },
     spl_token_group_interface::state::TokenGroup,
@@ -3348,7 +3349,7 @@ async fn command_deposit_withdraw_confidential_tokens(
                 .confidential_transfer_withdraw(
                     &token_account_address,
                     &owner,
-                    Some(&context_state_pubkey),
+                    Some(&ProofAccount::ContextAccount(context_state_pubkey)),
                     amount,
                     decimals,
                     Some(withdraw_account_info),

diff --git a/token/client/Cargo.toml b/token/client/Cargo.toml
@@ -9,6 +9,8 @@ version = "0.11.0"
 
 [dependencies]
 async-trait = "0.1"
+bincode = "1.3.2"
+bytemuck = "1.16.3"
 curve25519-dalek = "3.2.1"
 futures = "0.3.30"
 futures-util = "0.3"
@@ -26,6 +28,7 @@ spl-associated-token-account = { version = "4.0.0", path = "../../associated-tok
 spl-memo = { version = "5.0", path = "../../memo/program", features = [
   "no-entrypoint",
 ] }
+spl-record = { version = "0.2.0", path = "../../record/program", features = ["no-entrypoint"] }
 spl-token = { version = "6.0", path = "../program", features = [
   "no-entrypoint",
 ] }

diff --git a/token/client/src/proof_generation.rs b/token/client/src/proof_generation.rs
@@ -6,6 +6,7 @@
 
 use {
     curve25519_dalek::scalar::Scalar,
+    solana_sdk::pubkey::Pubkey,
     spl_token_2022::{
         error::TokenError,
         extension::confidential_transfer::{
@@ -32,6 +33,11 @@ use {
     },
 };
 
+pub enum ProofAccount {
+    ContextAccount(Pubkey),
+    RecordAccount(Pubkey, u32),
+}
+
 /// The main logic to create the five split proof data for a transfer with fee.
 #[allow(clippy::too_many_arguments)]
 pub fn transfer_with_fee_split_proof_data(