Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[zk-token-sdk] Add option to create proof context state in the proof verification program #29996

Merged
merged 31 commits into from
Mar 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
54602fb
extend verifiable trait
samkim-crypto Jan 24, 2023
4d95325
add PodBool
samkim-crypto Jan 24, 2023
65b1739
implement ZkProofData trait
samkim-crypto Jan 24, 2023
8ef0a02
add proof context program to zk-token-proof program
samkim-crypto Jan 24, 2023
e3cf064
update tests for close account
samkim-crypto Jan 25, 2023
2d6f3a5
add close account instruction
samkim-crypto Jan 30, 2023
94d9cbd
reorganize tests
samkim-crypto Jan 30, 2023
e8f75d6
complete tests
samkim-crypto Jan 30, 2023
dbe5b9b
clean up and add docs
samkim-crypto Jan 31, 2023
49042ac
clean up pod
samkim-crypto Jan 31, 2023
93d9f35
add proof program state
samkim-crypto Jan 31, 2023
48ff709
update tests
samkim-crypto Jan 31, 2023
c943df7
move proof program tests as separate module
samkim-crypto Jan 31, 2023
89d1a2b
clippy
samkim-crypto Jan 31, 2023
8770a79
cargo sort
samkim-crypto Jan 31, 2023
5ae5ca7
cargo fmt
samkim-crypto Jan 31, 2023
06d52aa
re-organize visibility
samkim-crypto Jan 31, 2023
1160baa
add context state description
samkim-crypto Jan 31, 2023
b4e13c0
update maintainer reference
samkim-crypto Jan 31, 2023
2a8dc89
change `VerifyProofData` and `ProofContextState` to pod
samkim-crypto Feb 8, 2023
a2bd76f
add tests for mixing proof types
samkim-crypto Feb 8, 2023
0740410
add tests for self owned context state accounts
samkim-crypto Feb 8, 2023
c8fbf06
cargo fmt
samkim-crypto Feb 8, 2023
6420252
remove unnecessary scoping and add comments on scopes
samkim-crypto Feb 9, 2023
327961e
re-organize proof instructions
samkim-crypto Feb 10, 2023
59fc92b
clippy
samkim-crypto Feb 10, 2023
8cab652
update zk-token-proof-test to 1.16.0
samkim-crypto Feb 10, 2023
cadfb88
upgrade spl-token-2022 to 0.6.1
samkim-crypto Mar 13, 2023
09eaecb
reoganize proof type
samkim-crypto Mar 13, 2023
43faa3a
cargo lock
samkim-crypto Mar 13, 2023
275763c
remove ZkProofContext trait
samkim-crypto Mar 15, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ members = [
"programs/stake",
"programs/vote",
"programs/zk-token-proof",
"programs/zk-token-proof-tests",
"pubsub-client",
"quic-client",
"rayon-threadlimit",
Expand Down Expand Up @@ -360,7 +361,7 @@ spl-associated-token-account = "=1.1.3"
spl-instruction-padding = "0.1"
spl-memo = "=3.0.1"
spl-token = "=3.5.0"
spl-token-2022 = "=0.6.0"
spl-token-2022 = "=0.6.1"
static_assertions = "1.1.0"
stream-cancel = "0.8.1"
strum = "0.24"
Expand Down
4 changes: 2 additions & 2 deletions programs/sbf/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions programs/zk-token-proof-tests/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[package]
name = "solana-zk-token-proof-program-tests"
authors = ["Solana Labs Maintainers <[email protected]>"]
repository = "https://github.com/solana-labs/solana"
version = "1.16.0"
license = "Apache-2.0"
edition = "2021"
publish = false

[dev-dependencies]
bytemuck = { version = "1.11.0", features = ["derive"] }
solana-program-runtime = { path = "../../program-runtime", version = "=1.16.0" }
solana-program-test = { path = "../../program-test", version = "=1.16.0" }
solana-sdk = { path = "../../sdk", version = "=1.16.0" }
solana-zk-token-sdk = { path = "../../zk-token-sdk", version = "=1.16.0" }
Loading