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

Adapt zk-token-{sdk,proof-program} for use in the monorepo

Browse Source
This commit is contained in:
Michael Vines
2022-01-04 20:44:07 -08:00
parent e1848ecbcc
commit 69e632a337
5 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
programs/zk-token-proof/Cargo.toml
View File

@@ -1,18 +1,17 @@
[package]
name = "spl-zk-token-proof-program"
description = "Solana Program Library ZkToken Proof Program"
name = "solana-zk-token-proof-program"
description = "Solana Zk Token Proof Program"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana-program-library"
version = "0.1.0"
repository = "https://github.com/solana-labs/solana"
version = "1.10.0"
license = "Apache-2.0"
edition = "2021"
publish = false
[dependencies]
bytemuck = { version = "1.7.2", features = ["derive"] }
getrandom = { version = "0.1", features = ["dummy"] }
num-derive = "0.3"
num-traits = "0.2"
solana-sdk = "=1.9.1"
solana-program-runtime = "=1.9.1"
spl-zk-token-sdk = { path = "../sdk" }
solana-program-runtime = { path = "../../program-runtime", version = "=1.10.0" }
solana-sdk = { path = "../../sdk", version = "=1.10.0" }
solana-zk-token-sdk = { path = "../../zk-token-sdk", version = "=1.10.0" }

5
programs/zk-token-proof/src/lib.rs
View File

@@ -4,7 +4,7 @@ use {
bytemuck::Pod,
solana_program_runtime::{ic_msg, invoke_context::InvokeContext},
solana_sdk::instruction::InstructionError,
spl_zk_token_sdk::zk_token_proof_instruction::*,
solana_zk_token_sdk::zk_token_proof_instruction::*,
std::result::Result,
};
@@ -36,7 +36,8 @@ pub fn process_instruction(
// Consume compute units since proof verification is an expensive operation
{
let compute_meter = invoke_context.get_compute_meter();
compute_meter.borrow_mut().consume(25_000)?; // TODO: Tune the number of units consumed?
// TODO: Tune the number of units consumed. The current value is just a rough estimate
compute_meter.borrow_mut().consume(100_000)?;
}
match ProofInstruction::decode_type(input).ok_or(InstructionError::InvalidInstructionData)? {