deps: Bump sdk in interface and its dependents (#641)

joncinque · web-flow · commit e889854f1514 · 2025-08-12T17:18:20.000+02:00
* deps: Bump sdk in interface and its dependents

#### Problem

The sdk v3 crates are all out, and most of the SPL interface crates have
been updated to use it too, but token-2022 is still on sdk v2.

#### Summary of changes

Bump the interface, proof-extraction, and proof-generation to the newest
SDK crates, and have elgamal-registry / program / rust client all use
the crate versions from crates.io.

At the same time, update the interface to use the spl-token-interface,
and update the error type to use the new traits.

* Update proof-tests too

* Update ciphertext-arithmetic too, use new zk-sdk functions

* Update token-group, detach proof generation
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/clients/cli/Cargo.toml b/clients/cli/Cargo.toml
@@ -35,7 +35,7 @@ spl-associated-token-account-client = { version = "2.0.0" }
 spl-token = { version = "8.0", features = ["no-entrypoint"] }
 spl-token-2022 = { version = "9.0.0", path = "../../program", features = ["no-entrypoint"] }
 spl-token-client = { version = "0.16.1", path = "../rust-legacy" }
-spl-token-confidential-transfer-proof-generation = { version = "0.4.1", path = "../../confidential-transfer/proof-generation" }
+spl-token-confidential-transfer-proof-generation = { version = "0.4.1" }
 spl-token-metadata-interface = { version = "0.7.0" }
 spl-token-group-interface = { version = "0.6.0" }
 spl-memo = { version = "6.0", features = ["no-entrypoint"] }
diff --git a/clients/rust-legacy/Cargo.toml b/clients/rust-legacy/Cargo.toml
@@ -32,8 +32,8 @@ spl-elgamal-registry = { version = "0.3.0",features = ["no-entrypoint"], path =
 spl-memo = { version = "6.0", features = ["no-entrypoint"] }
 spl-record = { version = "0.3.0", features = ["no-entrypoint"] }
 spl-token = { version = "8.0", features = ["no-entrypoint"] }
-spl-token-confidential-transfer-proof-extraction = { version = "0.4.1", path = "../../confidential-transfer/proof-extraction" }
-spl-token-confidential-transfer-proof-generation = { version = "0.4.1", path = "../../confidential-transfer/proof-generation" }
+spl-token-confidential-transfer-proof-extraction = { version = "0.4.1" }
+spl-token-confidential-transfer-proof-generation = { version = "0.4.1" }
 spl-token-2022 = { version = "9.0.0", features = ["no-entrypoint"], path = "../../program" }
 spl-token-group-interface = { version = "0.6.0" }
 spl-token-metadata-interface = { version = "0.7.0" }
diff --git a/confidential-transfer/ciphertext-arithmetic/Cargo.toml b/confidential-transfer/ciphertext-arithmetic/Cargo.toml
@@ -12,7 +12,7 @@ edition = { workspace = true }
 base64 = "0.22.1"
 bytemuck = "1.23.1"
 solana-curve25519 = "2.3.4"
-solana-zk-sdk = "2.3.4"
+solana-zk-sdk = "4.0.0"
 
 [dev-dependencies]
 spl-token-confidential-transfer-proof-generation = { version = "0.4.1", path = "../proof-generation" }
diff --git a/confidential-transfer/elgamal-registry/Cargo.toml b/confidential-transfer/elgamal-registry/Cargo.toml
@@ -28,7 +28,7 @@ solana-system-interface = { version = "1.0.0", features = ["bincode"] }
 solana-sysvar = { version = "2.3.0", features = ["bincode"] }
 solana-zk-sdk = "2.3.4"
 spl-pod = "0.5.1"
-spl-token-confidential-transfer-proof-extraction = { version = "0.4.1", path = "../proof-extraction" }
+spl-token-confidential-transfer-proof-extraction = { version = "0.4.1" }
 
 [lib]
 crate-type = ["cdylib", "lib"]
diff --git a/confidential-transfer/proof-extraction/Cargo.toml b/confidential-transfer/proof-extraction/Cargo.toml
@@ -10,14 +10,14 @@ edition = { workspace = true }
 
 [dependencies]
 bytemuck = "1.23.1"
-solana-account-info = "2.3.0"
+solana-account-info = "3.0.0"
 solana-curve25519 = "2.3.4"
-solana-instruction = "2.2.1"
-solana-instructions-sysvar = "2.2.1"
-solana-msg = "2.2.1"
-solana-program-error = "2.2.1"
-solana-pubkey = "2.2.1"
-solana-sdk-ids = "2.2.1"
-solana-zk-sdk = "2.3.4"
-spl-pod = "0.5.1"
+solana-instruction = "3.0.0"
+solana-instructions-sysvar = "3.0.0"
+solana-msg = "3.0.0"
+solana-program-error = "3.0.0"
+solana-pubkey = "3.0.0"
+solana-sdk-ids = "3.0.0"
+solana-zk-sdk = "4.0.0"
+spl-pod = "0.7.0"
 thiserror = "2.0.12"
diff --git a/confidential-transfer/proof-generation/Cargo.toml b/confidential-transfer/proof-generation/Cargo.toml
@@ -10,7 +10,7 @@ edition = { workspace = true }
 
 [dependencies]
 curve25519-dalek = "4.1.3"
-solana-zk-sdk = "2.3.4"
+solana-zk-sdk = "4.0.0"
 thiserror = "2.0.12"
 
 [lints]
diff --git a/confidential-transfer/proof-generation/src/burn.rs b/confidential-transfer/proof-generation/src/burn.rs
@@ -94,7 +94,7 @@ pub fn burn_split_proof_data(
     #[cfg(not(target_arch = "wasm32"))]
     let grouped_ciphertext_lo = burn_amount_ciphertext_lo.0;
     #[cfg(target_arch = "wasm32")]
-    let grouped_ciphertext_lo = GroupedElGamalCiphertext3Handles::encryption_with_u64(
+    let grouped_ciphertext_lo = GroupedElGamalCiphertext3Handles::encrypt_with_u64(
         source_elgamal_keypair.pubkey(),
         supply_elgamal_pubkey,
         auditor_elgamal_pubkey,
@@ -111,7 +111,7 @@ pub fn burn_split_proof_data(
     #[cfg(not(target_arch = "wasm32"))]
     let grouped_ciphertext_hi = burn_amount_ciphertext_hi.0;
     #[cfg(target_arch = "wasm32")]
-    let grouped_ciphertext_hi = GroupedElGamalCiphertext3Handles::encryption_with_u64(
+    let grouped_ciphertext_hi = GroupedElGamalCiphertext3Handles::encrypt_with_u64(
         source_elgamal_keypair.pubkey(),
         supply_elgamal_pubkey,
         auditor_elgamal_pubkey,
diff --git a/confidential-transfer/proof-generation/src/mint.rs b/confidential-transfer/proof-generation/src/mint.rs
@@ -93,7 +93,7 @@ pub fn mint_split_proof_data(
     #[cfg(not(target_arch = "wasm32"))]
     let grouped_ciphertext_lo = mint_amount_grouped_ciphertext_lo.0;
     #[cfg(target_arch = "wasm32")]
-    let grouped_ciphertext_lo = GroupedElGamalCiphertext3Handles::encryption_with_u64(
+    let grouped_ciphertext_lo = GroupedElGamalCiphertext3Handles::encrypt_with_u64(
         destination_elgamal_pubkey,
         supply_elgamal_keypair.pubkey(),
         auditor_elgamal_pubkey,
@@ -110,7 +110,7 @@ pub fn mint_split_proof_data(
     #[cfg(not(target_arch = "wasm32"))]
     let grouped_ciphertext_hi = mint_amount_grouped_ciphertext_hi.0;
     #[cfg(target_arch = "wasm32")]
-    let grouped_ciphertext_hi = GroupedElGamalCiphertext3Handles::encryption_with_u64(
+    let grouped_ciphertext_hi = GroupedElGamalCiphertext3Handles::encrypt_with_u64(
         destination_elgamal_pubkey,
         supply_elgamal_keypair.pubkey(),
         auditor_elgamal_pubkey,
diff --git a/confidential-transfer/proof-generation/src/transfer.rs b/confidential-transfer/proof-generation/src/transfer.rs
@@ -101,7 +101,7 @@ pub fn transfer_split_proof_data(
     #[cfg(not(target_arch = "wasm32"))]
     let grouped_ciphertext_lo = transfer_amount_grouped_ciphertext_lo.0;
     #[cfg(target_arch = "wasm32")]
-    let grouped_ciphertext_lo = GroupedElGamalCiphertext3Handles::encryption_with_u64(
+    let grouped_ciphertext_lo = GroupedElGamalCiphertext3Handles::encrypt_with_u64(
         source_elgamal_keypair.pubkey(),
         destination_elgamal_pubkey,
         auditor_elgamal_pubkey,
@@ -119,7 +119,7 @@ pub fn transfer_split_proof_data(
     #[cfg(not(target_arch = "wasm32"))]
     let grouped_ciphertext_hi = transfer_amount_grouped_ciphertext_hi.0;
     #[cfg(target_arch = "wasm32")]
-    let grouped_ciphertext_hi = GroupedElGamalCiphertext3Handles::encryption_with_u64(
+    let grouped_ciphertext_hi = GroupedElGamalCiphertext3Handles::encrypt_with_u64(
         source_elgamal_keypair.pubkey(),
         destination_elgamal_pubkey,
         auditor_elgamal_pubkey,
diff --git a/confidential-transfer/proof-generation/src/transfer_with_fee.rs b/confidential-transfer/proof-generation/src/transfer_with_fee.rs
@@ -129,7 +129,7 @@ pub fn transfer_with_fee_split_proof_data(
     #[cfg(not(target_arch = "wasm32"))]
     let grouped_ciphertext_lo = transfer_amount_grouped_ciphertext_lo.0;
     #[cfg(target_arch = "wasm32")]
-    let grouped_ciphertext_lo = GroupedElGamalCiphertext3Handles::encryption_with_u64(
+    let grouped_ciphertext_lo = GroupedElGamalCiphertext3Handles::encrypt_with_u64(
         source_elgamal_keypair.pubkey(),
         destination_elgamal_pubkey,
         auditor_elgamal_pubkey,
@@ -147,7 +147,7 @@ pub fn transfer_with_fee_split_proof_data(
     #[cfg(not(target_arch = "wasm32"))]
     let grouped_ciphertext_hi = transfer_amount_grouped_ciphertext_hi.0;
     #[cfg(target_arch = "wasm32")]
-    let grouped_ciphertext_hi = GroupedElGamalCiphertext3Handles::encryption_with_u64(
+    let grouped_ciphertext_hi = GroupedElGamalCiphertext3Handles::encrypt_with_u64(
         source_elgamal_keypair.pubkey(),
         destination_elgamal_pubkey,
         auditor_elgamal_pubkey,
@@ -333,7 +333,7 @@ pub fn transfer_with_fee_split_proof_data(
     );
     #[cfg(target_arch = "wasm32")]
     let fee_destination_withdraw_withheld_authority_ciphertext_lo =
-        GroupedElGamalCiphertext2Handles::encryption_with_u64(
+        GroupedElGamalCiphertext2Handles::encrypt_with_u64(
             destination_elgamal_pubkey,
             withdraw_withheld_authority_elgamal_pubkey,
             fee_amount_lo,
@@ -351,7 +351,7 @@ pub fn transfer_with_fee_split_proof_data(
     );
     #[cfg(target_arch = "wasm32")]
     let fee_destination_withdraw_withheld_authority_ciphertext_hi =
-        GroupedElGamalCiphertext2Handles::encryption_with_u64(
+        GroupedElGamalCiphertext2Handles::encrypt_with_u64(
             destination_elgamal_pubkey,
             withdraw_withheld_authority_elgamal_pubkey,
             fee_amount_hi,
diff --git a/confidential-transfer/proof-tests/Cargo.toml b/confidential-transfer/proof-tests/Cargo.toml
@@ -10,7 +10,7 @@ edition = { workspace = true }
 
 [dev-dependencies]
 curve25519-dalek = "4.1.3"
-solana-zk-sdk = "2.3.4"
+solana-zk-sdk = "4.0.0"
 thiserror = "2.0.12"
 spl-token-confidential-transfer-proof-extraction = { version = "0.4.1", path = "../proof-extraction" }
 spl-token-confidential-transfer-proof-generation = { version = "0.4.1", path = "../proof-generation" }
diff --git a/interface/Cargo.toml b/interface/Cargo.toml
@@ -11,29 +11,27 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [features]
-serde = ["dep:serde", "dep:serde_with", "dep:base64", "spl-pod/serde-traits"]
+serde = ["dep:serde", "dep:serde_with", "dep:base64", "spl-pod/serde-traits", "solana-pubkey/serde"]
 
 [dependencies]
 arrayref = "0.3.9"
 bytemuck = { version = "1.23.1", features = ["derive"] }
 num-derive = "0.4"
 num-traits = "0.2"
 num_enum = "0.7.4"
-solana-account-info = "2.3.0"
-solana-decode-error = "2.2.1"
-solana-instruction = "2.2.1"
-solana-msg = "2.2.1"
-solana-program-error = "2.2.1"
-solana-program-option = "2.2.1"
-solana-program-pack = "2.2.1"
-solana-pubkey = "2.2.1"
-solana-sdk-ids = "2.2.1"
-solana-zk-sdk = "2.3.4"
+solana-account-info = "3.0.0"
+solana-instruction = "3.0.0"
+solana-program-error = "3.0.0"
+solana-program-option = "3.0.0"
+solana-program-pack = "3.0.0"
+solana-pubkey = "3.0.0"
+solana-sdk-ids = "3.0.0"
+solana-zk-sdk = "4.0.0"
 spl-token-confidential-transfer-proof-extraction = { version = "0.4.1", path = "../confidential-transfer/proof-extraction" }
-spl-token-group-interface = { version = "0.6.0" }
-spl-token-metadata-interface = { version = "0.7.0" }
-spl-type-length-value = { version = "0.8.0" }
-spl-pod = { version = "0.5.1" }
+spl-token-group-interface = { version = "0.7.1" }
+spl-token-metadata-interface = { version = "0.8.0" }
+spl-type-length-value = { version = "0.9.0" }
+spl-pod = { version = "0.7.0" }
 thiserror = "2.0"
 serde = { version = "1.0.219", optional = true }
 serde_with = { version = "3.14.0", optional = true }
@@ -44,8 +42,8 @@ spl-token-confidential-transfer-proof-generation = { version = "0.4.1", path = "
 
 [dev-dependencies]
 proptest = "1.7"
-solana-pubkey = { version = "2.2.1", features = ["curve25519"] }
-spl-token = { version = "8.0", features = ["no-entrypoint"] }
+solana-pubkey = { version = "3.0.0", features = ["curve25519"] }
+spl-token-interface = { version = "2.0" }
 spl-token-2022-interface = { path = ".", features = ["serde"] }
 serde_json = "1.0.141"
 
diff --git a/interface/src/error.rs b/interface/src/error.rs
diff --git a/interface/src/extension/mod.rs b/interface/src/extension/mod.rs
diff --git a/interface/src/instruction.rs b/interface/src/instruction.rs
diff --git a/interface/src/lib.rs b/interface/src/lib.rs
diff --git a/program/Cargo.toml b/program/Cargo.toml
