gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add zk_token_sdk_enabled feature to gate Zk Token proof program and sol_zk_token_elgamal_op syscalls

Browse Source
This commit is contained in:
Michael Vines
2022-01-04 22:55:26 -08:00
parent 98e7fada15
commit bb3a1b6b31
17 changed files with 482 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
runtime/Cargo.toml
View File

@@ -35,18 +35,20 @@ regex = "1.5.4"
serde = { version = "1.0.133", features = ["rc"] }
serde_derive = "1.0.103"
solana-address-lookup-table-program = { path = "../programs/address-lookup-table", version = "=1.10.0" }
solana-config-program = { path = "../programs/config", version = "=1.10.0" }
solana-bucket-map = { path = "../bucket_map", version = "=1.10.0" }
solana-compute-budget-program = { path = "../programs/compute-budget", version = "=1.10.0" }
solana-config-program = { path = "../programs/config", version = "=1.10.0" }
solana-frozen-abi = { path = "../frozen-abi", version = "=1.10.0" }
solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.10.0" }
solana-measure = { path = "../measure", version = "=1.10.0" }
solana-metrics = { path = "../metrics", version = "=1.10.0" }
solana-bucket-map = { path = "../bucket_map", version = "=1.10.0" }
solana-program-runtime = { path = "../program-runtime", version = "=1.10.0" }
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.10.0" }
solana-sdk = { path = "../sdk", version = "=1.10.0" }
solana-stake-program = { path = "../programs/stake", version = "=1.10.0" }
solana-vote-program = { path = "../programs/vote", version = "=1.10.0" }
solana-zk-token-proof-program = { path = "../programs/zk-token-proof", version = "=1.10.0" }
solana-zk-token-sdk = { path = "../zk-token-sdk", version = "=1.10.0" }
symlink = "0.1.0"
tar = "0.4.38"
tempfile = "3.2.0"

9
runtime/src/builtins.rs
View File

@@ -181,6 +181,15 @@ fn feature_builtins() -> Vec<(Builtin, Pubkey, ActivationType)> {
feature_set::versioned_tx_message_enabled::id(),
ActivationType::NewProgram,
),
(
Builtin::new(
"zk_token_proof_program",
solana_zk_token_sdk::zk_token_proof_program::id(),
with_program_logging!(solana_zk_token_proof_program::process_instruction),
),
feature_set::zk_token_sdk_enabled::id(),
ActivationType::NewProgram,
),
]
}