Swap-out solana-zk-sdk for solana-zk-elgamal-proof-interface and solana-zk-sdk-pod#1090
Open
samkim-crypto wants to merge 4 commits intosolana-program:mainfrom
Open
Swap-out solana-zk-sdk for solana-zk-elgamal-proof-interface and solana-zk-sdk-pod#1090samkim-crypto wants to merge 4 commits intosolana-program:mainfrom
solana-zk-sdk for solana-zk-elgamal-proof-interface and solana-zk-sdk-pod#1090samkim-crypto wants to merge 4 commits intosolana-program:mainfrom
Conversation
samkim-crypto
force-pushed
the
swap-zk-sdk
branch
3 times, most recently
from
351682b to
87f0130
Compare
samkim-crypto
force-pushed
the
swap-zk-sdk
branch
from
87f0130 to
e814132
Compare
grod220
reviewed
Apr 17, 2026
Member
grod220
left a comment
grod220
left a comment
There was a problem hiding this comment.
Thanks for this work! Unraveling dependencies can be tricky. Just have some cleanup comments.
Comment on lines
+33
to
+34
| solana-zk-sdk = "6.0.0" | ||
| solana-zk-sdk-pod = "0.1.1" |
Member
There was a problem hiding this comment.
Can you put these in alphabetical order?
|
|
||
| [dev-dependencies] | ||
| solana-nonce = "3.2.0" | ||
| solana-nonce = "3.1.0" |
Comment on lines
+70
to
+85
| // 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, | ||
| // }, | ||
| // }, |
| 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" |
| 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" |
Member
There was a problem hiding this comment.
Maybe some of these version regressions are rebase artifacts? Perhaps you can do another pass to catch these in the rest of the PR.
| [package] | ||
| name = "spl-token-confidential-transfer-proof-extraction" | ||
| version = "0.5.1" | ||
| version = "0.6.0" |
Member
There was a problem hiding this comment.
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.
Comment on lines
+88
to
+95
| // 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); |
joncinque
reviewed
Apr 17, 2026
Contributor
joncinque
left a comment
joncinque
left a comment
There was a problem hiding this comment.
Looks great overall! I agree with all of Gabe's comments
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary of Changes
487e83c: I swapped out
solana-zk-sdkforsolana-zk-elgamal-proof-interfaceandsolana-zk-sdk-podin token-2022interfaceandprogram. Thesolana-zk-sdkis 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 theOptionalNonZeroElGamalPubkeywithMaybeNull<PodElGamalPubkey>.0fb0bed: I bumped agave crates like
solana-test-validatorandsolana-program-testto 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
MaybeNullElGamalPubkeys, so I fixed it here.76e9728: Addressed #1116 (comment).