Bump zk token sdk (#3002)

* token-2022: bumping zk-token-sdk to 1.10.1-pre1 and updating variable names accordingly

* token-2022: updating client and test variables to match newest zk-token-sdk

Author: samkim-crypto

Cargo.lock

@@ -1126,8 +1126,8 @@ where
             ),
             source_elgamal_keypair,
             (
-                &destination_extension.pubkey_elgamal.try_into().unwrap(),
-                &ct_mint.pubkey_auditor.try_into().unwrap(),
+                &destination_extension.encryption_pubkey.try_into().unwrap(),
+                &ct_mint.auditor_pubkey.try_into().unwrap(),
             ),
         )
         .map_err(TokenError::Proof)?;

token/client/src/token.rs

@@ -45,8 +45,8 @@ impl ConfidentialTransferMintWithKeypairs {
         let ct_mint = ConfidentialTransferMint {
             authority: ct_mint_authority.pubkey().into(),
             auto_approve_new_accounts: true.into(),
-            pubkey_auditor: ct_mint_transfer_auditor.public.into(),
-            pubkey_withdraw_withheld_authority: ct_mint_withdraw_withheld_authority.public.into(),
+            auditor_pubkey: ct_mint_transfer_auditor.public.into(),
+            withdraw_withheld_authority_pubkey: ct_mint_withdraw_withheld_authority.public.into(),
             withheld_amount: EncryptedWithheldAmount::zeroed(),
         };
         Self {
@@ -235,7 +235,7 @@ async fn ct_configure_token_account() {
     assert!(!bool::from(&extension.approved));
     assert!(bool::from(&extension.allow_balance_credits));
     assert_eq!(
-        extension.pubkey_elgamal,
+        extension.encryption_pubkey,
         alice_meta.elgamal_keypair.public.into()
     );
     assert_eq!(

token/program-2022-test/tests/confidential_transfer.rs

@@ -24,7 +24,7 @@ num-derive = "0.3"
 num-traits = "0.2"
 num_enum = "0.5.4"
 solana-program = "1.9.9"
-solana-zk-token-sdk = "0.8.1"
+solana-zk-token-sdk = "1.10.1-pre1"
 spl-memo = { version = "3.0.1", path = "../../memo/program", features = [ "no-entrypoint" ] }
 spl-token = { version = "3.3",  path = "../program", features = ["no-entrypoint"] }
 thiserror = "1.0"

token/program-2022/Cargo.toml

@@ -353,7 +353,7 @@ pub enum ConfidentialTransferInstruction {
 #[repr(C)]
 pub struct ConfigureAccountInstructionData {
     /// The public key associated with the account
-    pub elgamal_pubkey: EncryptionPubkey,
+    pub encryption_pubkey: EncryptionPubkey,
     /// The decryptable balance (always 0) once the configure account succeeds
     pub decryptable_zero_balance: DecryptableBalance,
 }
@@ -514,7 +514,7 @@ pub fn configure_account(
     token_program_id: &Pubkey,
     token_account: &Pubkey,
     mint: &Pubkey,
-    elgamal_pubkey: ElGamalPubkey,
+    encryption_pubkey: ElGamalPubkey,
     decryptable_zero_balance: AeCiphertext,
     authority: &Pubkey,
     multisig_signers: &[&Pubkey],
@@ -535,7 +535,7 @@ pub fn configure_account(
         accounts,
         ConfidentialTransferInstruction::ConfigureAccount,
         &ConfigureAccountInstructionData {
-            elgamal_pubkey: elgamal_pubkey.into(),
+            encryption_pubkey: encryption_pubkey.into(),
             decryptable_zero_balance: decryptable_zero_balance.into(),
         },
     ))

token/program-2022/src/extension/confidential_transfer/instruction.rs

@@ -50,14 +50,14 @@ pub struct ConfidentialTransferMint {
     /// * If non-zero, transfers must include ElGamal cypertext with this public key permitting the
     /// auditor to decode the transfer amount.
     /// * If all zero, auditing is currently disabled.
-    pub pubkey_auditor: EncryptionPubkey,
+    pub auditor_pubkey: EncryptionPubkey,
 
     /// * If non-zero, transfers must include ElGamal cypertext of the transfer fee with this
     /// public key. If this is the case, but the base mint is not extended for fees, then any
     /// transfer will fail.
     /// * If all zero, transfer fee is disabled. If this is the case, but the base mint is extended
     /// for fees, then any transfer will fail.
-    pub pubkey_withdraw_withheld_authority: EncryptionPubkey,
+    pub withdraw_withheld_authority_pubkey: EncryptionPubkey,
 
     /// Withheld transfer fee confidential tokens that have been moved to the mint for withdrawal.
     /// This will always be zero if fees are never enabled.
@@ -77,7 +77,7 @@ pub struct ConfidentialTransferAccount {
     pub approved: PodBool,
 
     /// The public key associated with ElGamal encryption
-    pub pubkey_elgamal: EncryptionPubkey,
+    pub encryption_pubkey: EncryptionPubkey,
 
     /// The pending balance (encrypted by `pubkey_elgamal`)
     pub pending_balance: EncryptedBalance,