spl: Bump to newest SPL crates for token-2022 release

Cargo.toml

@@ -456,14 +456,14 @@ solana-zk-sdk = { path = "zk-sdk", version = "=2.1.0" }
 solana-zk-token-proof-program = { path = "programs/zk-token-proof", version = "=2.1.0" }
 solana-zk-token-sdk = { path = "zk-token-sdk", version = "=2.1.0" }
 solana_rbpf = "=0.8.5"
-spl-associated-token-account = "=4.0.0"
+spl-associated-token-account = "=5.0.1"
 spl-instruction-padding = "0.2"
 spl-memo = "=5.0.0"
-spl-pod = "=0.3.0"
+spl-pod = "=0.4.0"
 spl-token = "=6.0.0"
-spl-token-2022 = "=4.0.0"
-spl-token-group-interface = "=0.3.0"
-spl-token-metadata-interface = "=0.4.0"
+spl-token-2022 = "=5.0.2"
+spl-token-group-interface = "=0.4.2"
+spl-token-metadata-interface = "=0.5.1"
 static_assertions = "1.1.0"
 stream-cancel = "0.8.2"
 strum = "0.24"

account-decoder/src/parse_token_extension.rs

@@ -4,7 +4,7 @@ use {
     spl_token_2022::{
         extension::{self, BaseState, BaseStateWithExtensions, ExtensionType, StateWithExtensions},
         solana_program::pubkey::Pubkey,
-        solana_zk_token_sdk::zk_token_elgamal::pod::ElGamalPubkey,
+        solana_zk_sdk::encryption::pod::elgamal::PodElGamalPubkey,
     },
     spl_token_group_interface::state::{TokenGroup, TokenGroupMember},
     spl_token_metadata_interface::state::TokenMetadata,
@@ -313,7 +313,7 @@ impl From<extension::confidential_transfer::ConfidentialTransferMint>
         confidential_transfer_mint: extension::confidential_transfer::ConfidentialTransferMint,
     ) -> Self {
         let authority: Option<Pubkey> = confidential_transfer_mint.authority.into();
-        let auditor_elgamal_pubkey: Option<ElGamalPubkey> =
+        let auditor_elgamal_pubkey: Option<PodElGamalPubkey> =
             confidential_transfer_mint.auditor_elgamal_pubkey.into();
         Self {
             authority: authority.map(|pubkey| pubkey.to_string()),
@@ -339,7 +339,7 @@ impl From<extension::confidential_transfer_fee::ConfidentialTransferFeeConfig>
         confidential_transfer_fee_config: extension::confidential_transfer_fee::ConfidentialTransferFeeConfig,
     ) -> Self {
         let authority: Option<Pubkey> = confidential_transfer_fee_config.authority.into();
-        let withdraw_withheld_authority_elgamal_pubkey: Option<ElGamalPubkey> =
+        let withdraw_withheld_authority_elgamal_pubkey: Option<PodElGamalPubkey> =
             confidential_transfer_fee_config
                 .withdraw_withheld_authority_elgamal_pubkey
                 .into();
@@ -544,8 +544,8 @@ impl From<extension::group_member_pointer::GroupMemberPointer> for UiGroupMember
 pub struct UiTokenGroup {
     pub update_authority: Option<String>,
     pub mint: String,
-    pub size: u32,
-    pub max_size: u32,
+    pub size: u64,
+    pub max_size: u64,
 }
 
 impl From<TokenGroup> for UiTokenGroup {
@@ -565,7 +565,7 @@ impl From<TokenGroup> for UiTokenGroup {
 pub struct UiTokenGroupMember {
     pub mint: String,
     pub group: String,
-    pub member_number: u32,
+    pub member_number: u64,
 }
 
 impl From<TokenGroupMember> for UiTokenGroupMember {

programs/sbf/Cargo.toml

@@ -64,7 +64,6 @@ solana-timings = { path = "../../timings", version = "=2.1.0" }
 solana-transaction-status = { path = "../../transaction-status", version = "=2.1.0" }
 solana-type-overrides = { path = "../../type-overrides", version = "=2.1.0" }
 agave-validator = { path = "../../validator", version = "=2.1.0" }
-solana-zk-token-sdk = { path = "../../zk-token-sdk", version = "=2.1.0" }
 solana_rbpf = "=0.8.5"
 thiserror = "1.0"
 
@@ -232,4 +231,5 @@ members = [
 # and the overrides in sync.
 solana-curve25519 = { path = "../../curves/curve25519" }
 solana-program = { path = "../../sdk/program" }
+solana-zk-sdk = { path = "../../zk-sdk" }
 solana-zk-token-sdk = { path = "../../zk-token-sdk" }

programs/sbf/rust/curve25519/Cargo.toml

@@ -11,7 +11,6 @@ edition = { workspace = true }
 [dependencies]
 solana-curve25519 = { workspace = true }
 solana-program = { workspace = true }
-solana-zk-token-sdk = { workspace = true }
 
 [lib]
 crate-type = ["cdylib"]

transaction-status/src/parse_token/extension/confidential_transfer.rs

@@ -157,7 +157,9 @@ pub(in crate::parse_token) fn parse_confidential_transfer_instruction(
                     ParseInstructionError::InstructionNotParsable(ParsableProgram::SplToken)
                 })?;
             let amount: u64 = withdrawal_data.amount.into();
-            let proof_instruction_offset: i8 = withdrawal_data.proof_instruction_offset;
+            let equality_proof_instruction_offset: i8 =
+                withdrawal_data.equality_proof_instruction_offset;
+            let range_proof_instruction_offset: i8 = withdrawal_data.range_proof_instruction_offset;
             let mut value = json!({
                 "source": account_keys[account_indexes[0] as usize].to_string(),
                 "destination": account_keys[account_indexes[1] as usize].to_string(),
@@ -166,8 +168,8 @@ pub(in crate::parse_token) fn parse_confidential_transfer_instruction(
                 "amount": amount,
                 "decimals": withdrawal_data.decimals,
                 "newDecryptableAvailableBalance": format!("{}", withdrawal_data.new_decryptable_available_balance),
-                "proofInstructionOffset": proof_instruction_offset,
-
+                "equalityProofInstructionOffset": equality_proof_instruction_offset,
+                "rangeProofInstructionOffset": range_proof_instruction_offset,
             });
             let map = value.as_object_mut().unwrap();
             parse_signers(
@@ -189,15 +191,20 @@ pub(in crate::parse_token) fn parse_confidential_transfer_instruction(
                 .map_err(|_| {
                     ParseInstructionError::InstructionNotParsable(ParsableProgram::SplToken)
                 })?;
-            let proof_instruction_offset: i8 = transfer_data.proof_instruction_offset;
+            let equality_proof_instruction_offset: i8 =
+                transfer_data.equality_proof_instruction_offset;
+            let ciphertext_validity_proof_instruction_offset: i8 =
+                transfer_data.ciphertext_validity_proof_instruction_offset;
+            let range_proof_instruction_offset: i8 = transfer_data.range_proof_instruction_offset;
             let mut value = json!({
                 "source": account_keys[account_indexes[0] as usize].to_string(),
                 "mint": account_keys[account_indexes[1] as usize].to_string(),
                 "destination": account_keys[account_indexes[2] as usize].to_string(),
                 "instructionsSysvar": account_keys[account_indexes[3] as usize].to_string(),
                 "newSourceDecryptableAvailableBalance": format!("{}", transfer_data.new_source_decryptable_available_balance),
-                "proofInstructionOffset": proof_instruction_offset,
-
+                "equalityProofInstructionOffset": equality_proof_instruction_offset,
+                "ciphertextValidityProofInstructionOffset": ciphertext_validity_proof_instruction_offset,
+                "rangeProofInstructionOffset": range_proof_instruction_offset,
             });
             let map = value.as_object_mut().unwrap();
             parse_signers(
@@ -322,35 +329,34 @@ pub(in crate::parse_token) fn parse_confidential_transfer_instruction(
                 info: value,
             })
         }
-        ConfidentialTransferInstruction::TransferWithSplitProofs => {
-            check_num_token_accounts(account_indexes, 7)?;
-            let transfer_data: TransferWithSplitProofsInstructionData =
+        ConfidentialTransferInstruction::TransferWithFee => {
+            check_num_token_accounts(account_indexes, 5)?;
+            let transfer_data: TransferWithFeeInstructionData =
                 *decode_instruction_data(instruction_data).map_err(|_| {
                     ParseInstructionError::InstructionNotParsable(ParsableProgram::SplToken)
                 })?;
-            let mut value = json!({
+            let equality_proof_instruction_offset: i8 =
+                transfer_data.equality_proof_instruction_offset;
+            let transfer_amount_ciphertext_validity_proof_instruction_offset: i8 =
+                transfer_data.transfer_amount_ciphertext_validity_proof_instruction_offset;
+            let fee_sigma_proof_instruction_offset: i8 =
+                transfer_data.fee_sigma_proof_instruction_offset;
+            let fee_ciphertext_validity_proof_instruction_offset: i8 =
+                transfer_data.fee_ciphertext_validity_proof_instruction_offset;
+            let range_proof_instruction_offset: i8 = transfer_data.range_proof_instruction_offset;
+            let value = json!({
                 "source": account_keys[account_indexes[0] as usize].to_string(),
                 "mint": account_keys[account_indexes[1] as usize].to_string(),
                 "destination": account_keys[account_indexes[2] as usize].to_string(),
-                "ciphertextCommitmentEqualityContext": account_keys[account_indexes[3] as usize].to_string(),
-                "batchedGroupedCiphertext2HandlesValidityContext": account_keys[account_indexes[4] as usize].to_string(),
-                "batchedRangeProofContext": account_keys[account_indexes[5] as usize].to_string(),
-                "owner": account_keys[account_indexes[6] as usize].to_string(),
+                "instructionsSysvar": account_keys[account_indexes[3] as usize].to_string(),
+                "owner": account_keys[account_indexes[4] as usize].to_string(),
                 "newSourceDecryptableAvailableBalance": format!("{}", transfer_data.new_source_decryptable_available_balance),
-                "noOpOnUninitializedSplitContextState": bool::from(transfer_data.no_op_on_uninitialized_split_context_state),
-                "closeSplitContextStateOnExecution": bool::from(transfer_data.close_split_context_state_on_execution),
+                "equalityProofInstructionOffset": equality_proof_instruction_offset,
+                "transferAmountCiphertextValidityProofInstructionOffset": transfer_amount_ciphertext_validity_proof_instruction_offset,
+                "feeCiphertextValidityProofInstructionOffset": fee_ciphertext_validity_proof_instruction_offset,
+                "feeSigmaProofInstructionOffset": fee_sigma_proof_instruction_offset,
+                "rangeProofInstructionOffset": range_proof_instruction_offset,
             });
-            let map = value.as_object_mut().unwrap();
-            if transfer_data.close_split_context_state_on_execution.into() {
-                map.insert(
-                    "lamportDestination".to_string(),
-                    json!(account_keys[account_indexes[7] as usize].to_string()),
-                );
-                map.insert(
-                    "contextStateOwner".to_string(),
-                    json!(account_keys[account_indexes[8] as usize].to_string()),
-                );
-            }
             Ok(ParsedInstructionEnum {
                 instruction_type: "confidentialTransferWithSplitProofs".to_string(),
                 info: value,

transaction-status/src/parse_token/extension/token_group.rs

@@ -19,7 +19,7 @@ pub(in crate::parse_token) fn parse_token_group_instruction(
             } = group;
             let value = json!({
                 "group": account_keys[account_indexes[0] as usize].to_string(),
-                "maxSize": u32::from(*max_size),
+                "maxSize": u64::from(*max_size),
                 "mint": account_keys[account_indexes[1] as usize].to_string(),
                 "mintAuthority": account_keys[account_indexes[2] as usize].to_string(),
                 "updateAuthority": Option::<Pubkey>::from(*update_authority).map(|v| v.to_string())
@@ -34,7 +34,7 @@ pub(in crate::parse_token) fn parse_token_group_instruction(
             let UpdateGroupMaxSize { max_size } = update;
             let value = json!({
                 "group": account_keys[account_indexes[0] as usize].to_string(),
-                "maxSize": u32::from(*max_size),
+                "maxSize": u64::from(*max_size),
                 "updateAuthority": account_keys[account_indexes[1] as usize].to_string(),
             });
             Ok(ParsedInstructionEnum {