Swap-out `solana-zk-sdk` for `solana-zk-elgamal-proof-interface` and `solana-zk-sdk-pod` by samkim-crypto · Pull Request #1090 · solana-program/token-2022

samkim-crypto · 2026-04-08T08:16:48Z

Summary of Changes

487e83c: I swapped out solana-zk-sdk for solana-zk-elgamal-proof-interface and solana-zk-sdk-pod in token-2022 interface and program. The solana-zk-sdk is needed in some places like proof-generation. For these places, I bumped the version to v6.0.0. This commit should be pretty straightforward and mechanical, just re-organizing the imports. The exception is replacing the OptionalNonZeroElGamalPubkey with MaybeNull<PodElGamalPubkey>.

0fb0bed: I bumped agave crates like solana-test-validator and solana-program-test to v4-beta while downgrading some of the solana-sdk dependencies to resolve some dependency conflicts. I divided this commit in smaller commits in #1106.

e814132: in 487e83c, I made a mistake in comparing MaybeNull ElGamalPubkeys, so I fixed it here.

76e9728: Addressed #1116 (comment).

grod220

Thanks for this work! Unraveling dependencies can be tricky. Just have some cleanup comments.

grod220 · 2026-04-17T10:29:57Z

+solana-zk-sdk = "6.0.0"
+solana-zk-sdk-pod = "0.1.1"


Can you put these in alphabetical order?

Fixed in cfea17c.

grod220 · 2026-04-17T10:30:54Z


 [dev-dependencies]
-solana-nonce = "3.2.0"
+solana-nonce = "3.1.0"


Think we can keep v3.2 here?

I actually can't get this to work due to wincode.

solana-nonce v3.2 requires solana-hash v4.3, which requires wincode` v0.5.3

agave crates like solana-ledger v4.0.0 requires wincode v0.4

This causes dependency conflict in the token-cli.

The crate solana-nonce v3.1 requires solana-hash v4.2, which requires wincode v0.4, so I can make this work.

grod220 · 2026-04-17T10:31:16Z

+        // solana_zk_sdk::{
+        //     encryption::{
+        //         auth_encryption::AeKey,
+        //         elgamal::{ElGamalCiphertext, ElGamalKeypair, ElGamalPubkey, ElGamalSecretKey},
+        //         pod::{
+        //             auth_encryption::PodAeCiphertext,
+        //             elgamal::{PodElGamalCiphertext, PodElGamalPubkey},
+        //         },
+        //     },
+        //     zk_elgamal_proof_program::{
+        //         self,
+        //         instruction::{close_context_state, ContextStateInfo},
+        //         proof_data::*,
+        //         state::ProofContextState,
+        //     },
+        // },


nit: remove

Sorry, this should have removed prior to asking for review 🙏

grod220 · 2026-04-17T10:32:29Z

-solana-address = "2.6.0"
-solana-banks-client = { version = "3.0.0", optional = true }
-solana-banks-interface = { version = "3.0.0", optional = true }
+solana-address = "2.5.0"


nit: v2.6 here

I downgrade solana-address for the same reason as #1090 (comment):

solana-address v2.6.0 requires wincode v0.5

solana-address v2.5.0 requires wincode v0.4

But unlike with solana-hash, it doesn't create conflicts in the token-cli (though we do get two versions of wincode in Cargo.lock), so I think we can keep v2.6.0 here.

Fixed in 91b1fa3.

grod220 · 2026-04-17T10:33:13Z

-solana-cli-output = { version = "3.1.0", features = ["agave-unstable-api"], optional = true }
-solana-hash = "4.3.0"
+solana-cli-output = { version = "4.0.0-beta.7", features = ["agave-unstable-api"], optional = true }
+solana-hash = "4.2.0"


Maybe some of these version regressions are rebase artifacts? Perhaps you can do another pass to catch these in the rest of the PR.

I couldn't get this to work with solana-hash v4.3 due to the same reason as #1090 (comment).

grod220 · 2026-04-17T10:34:07Z

 [package]
 name = "spl-token-confidential-transfer-proof-extraction"
-version = "0.5.1"
+version = "0.6.0"


We don't bump these ourselves right? Think the publish github action is responsible for that. See a few examples in this PR of this.

I did this to actually resolve version conflicts. Some of the agave crates (e.g. solana-account-decoder) depend on spl-token-2022-interface v2.1.0, which depends on the spl-token-confidential-transfer-proof-extraction crate v0.5.1.

So if I leave the local crate version to v0.5.1, then cargo will try to be efficient and just use my local spl-token-confidential-transfer-proof-extraction version, which is not compatible with solana-account-decoder.

If I bump the local crate version to v0.6.0, then cargo has no choice and will maintain two versions of ``spl-token-confidential-transfer-proof-extractionin theCargo.lock` file, the local version with v0.6.0 and the crate.io v5.1, so things will compile.

I think the publish script will not bump Cargo.toml if it is already set to be correctly (or we can also manually specify the version in the CI publish UI), so I think this should be fine, though let me know if I am missing something.

grod220 · 2026-04-17T10:34:44Z

+    // test_transfer_with_fee_proof_validity(65535, 65535, 5, 10);
+    // test_transfer_with_fee_proof_validity(65535, 65535, 5, 1);

-    test_transfer_with_fee_proof_validity(65536, 65536, 5, 10);
-    test_transfer_with_fee_proof_validity(65536, 65536, 5, 1);
-
-    test_transfer_with_fee_proof_validity(281474976710655, 281474976710655, 5, 10); // 2^48 - 1
-    test_transfer_with_fee_proof_validity(281474976710655, 281474976710655, 5, 1);
+    // test_transfer_with_fee_proof_validity(65536, 65536, 5, 10);
+    // test_transfer_with_fee_proof_validity(65536, 65536, 5, 1);
+    //
+    // test_transfer_with_fee_proof_validity(281474976710655, 281474976710655, 5, 10); // 2^48 - 1
+    // test_transfer_with_fee_proof_validity(281474976710655, 281474976710655, 5, 1);


Probably can re-enable?

Yeah sorry, I forgot about addressing this before asking for review 🙏 . This requires a small in on the zk-sdk side, so I will address this once solana-program/zk-elgamal-proof#377 is merged.

Okay, this is fixed in e897b95.

joncinque

Looks great overall! I agree with all of Gabe's comments

…-proof-interface`

samkim-crypto · 2026-04-22T05:21:04Z

Thanks for the patience. This PR should be ready for another set of reviews! 🙏

grod220

Thanks for those changes! Definitely some tricky dep combinations. Let's get Jon's eyes on this too though.

joncinque

Looks good to me! We'll just need to be careful when doing the publishes on the confidential-transfer crates

samkim-crypto force-pushed the swap-zk-sdk branch 3 times, most recently from 351682b to 87f0130 Compare April 16, 2026 00:55

samkim-crypto force-pushed the swap-zk-sdk branch from 87f0130 to e814132 Compare April 17, 2026 00:04

samkim-crypto mentioned this pull request Apr 17, 2026

Bump solana-test-validator and solana-program-test to v4-beta #1106

Closed

samkim-crypto marked this pull request as ready for review April 17, 2026 09:27

samkim-crypto requested review from grod220 and joncinque April 17, 2026 09:28

grod220 reviewed Apr 17, 2026

View reviewed changes

joncinque reviewed Apr 17, 2026

View reviewed changes

samkim-crypto force-pushed the swap-zk-sdk branch 3 times, most recently from 4d3bf65 to 91b1fa3 Compare April 21, 2026 00:31

samkim-crypto mentioned this pull request Apr 21, 2026

Re-enabling the ZK ElGamal Proof Program and Token-22 Confidential Transfer Features #657

Open

samkim-crypto added 9 commits April 21, 2026 22:03

swap out solana-zk-sdk with solana-zk-sdk-pod and `solana-elgamal…

a57aa8c

…-proof-interface`

downgrade sdk crates and upgrade agave crates

8d207b7

fix MaybeNull comparison

706959a

add clarifying docs on the constants G and H

0b07671

cargo sort

ccb8f0a

remove commented out code

e82cab7

revert solana-address version downgrade

6ca38c1

bump solana-zk-sdk to 6.0.1

fac6b02

uncomment transfer with fee proof tests

e897b95

samkim-crypto force-pushed the swap-zk-sdk branch from cbb7d9a to e897b95 Compare April 22, 2026 05:04

samkim-crypto requested review from grod220 and joncinque April 22, 2026 05:21

grod220 approved these changes Apr 22, 2026

View reviewed changes

joncinque approved these changes Apr 22, 2026

View reviewed changes

samkim-crypto merged commit fc61b7f into solana-program:main Apr 22, 2026
40 checks passed

grod220 mentioned this pull request Apr 22, 2026

Swap spl-pod for solana-zero-copy + solana-nullable #1069

Merged

Conversation

samkim-crypto commented Apr 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary of Changes

Uh oh!

grod220 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

samkim-crypto Apr 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

samkim-crypto Apr 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

joncinque left a comment

Choose a reason for hiding this comment

Uh oh!

samkim-crypto commented Apr 22, 2026

Uh oh!

grod220 left a comment

Choose a reason for hiding this comment

Uh oh!

joncinque left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

samkim-crypto commented Apr 8, 2026 •

edited

Loading

samkim-crypto Apr 21, 2026 •

edited

Loading

samkim-crypto Apr 20, 2026 •

edited

Loading