From 69e632a3372b2d93e89095ff8fef718e98616ac2 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Tue, 4 Jan 2022 20:44:07 -0800
Subject: [PATCH] Adapt zk-token-{sdk,proof-program} for use in the monorepo

---
 Cargo.toml                         |  2 ++
 programs/zk-token-proof/Cargo.toml | 15 +++++++--------
 programs/zk-token-proof/src/lib.rs |  5 +++--
 zk-token-sdk/Cargo.toml            | 12 ++++++------
 zk-token-sdk/src/lib.rs            |  2 ++
 5 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 6f33ee6816..8b8562ee14 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -80,6 +80,8 @@ members = [
     "test-validator",
     "rpc-test",
     "client-test",
+    "zk-token-sdk",
+    "programs/zk-token-proof",
 ]
 
 exclude = [
diff --git a/programs/zk-token-proof/Cargo.toml b/programs/zk-token-proof/Cargo.toml
index 5a2fb514fc..163b44593e 100644
--- a/programs/zk-token-proof/Cargo.toml
+++ b/programs/zk-token-proof/Cargo.toml
@@ -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" }
diff --git a/programs/zk-token-proof/src/lib.rs b/programs/zk-token-proof/src/lib.rs
index 50d7f64503..b18c075fa9 100644
--- a/programs/zk-token-proof/src/lib.rs
+++ b/programs/zk-token-proof/src/lib.rs
@@ -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)? {
diff --git a/zk-token-sdk/Cargo.toml b/zk-token-sdk/Cargo.toml
index 4764f21ef3..c8c9553533 100644
--- a/zk-token-sdk/Cargo.toml
+++ b/zk-token-sdk/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
-name = "spl-zk-token-sdk"
-description = "Solana Program Library ZkToken SDK"
+name = "solana-zk-token-sdk"
+description = "Solana Zk Token SDK"
 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"
 
@@ -12,7 +12,7 @@ base64 = "0.13"
 bytemuck = { version = "1.7.2", features = ["derive"] }
 num-derive = "0.3"
 num-traits = "0.2"
-solana-program = "=1.9.1"
+solana-program = { path = "../sdk/program", version = "=1.10.0" }
 
 [target.'cfg(not(target_arch = "bpf"))'.dependencies]
 aes-gcm-siv = "0.10.3"
@@ -28,7 +28,7 @@ rand = "0.7"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 sha3 = "0.9"
-solana-sdk = "=1.9.1"
+solana-sdk = { path = "../sdk", version = "=1.10.0" }
 subtle = "2"
 thiserror = "1"
 zeroize = { version = "1.2.0", default-features = false, features = ["zeroize_derive"] }
diff --git a/zk-token-sdk/src/lib.rs b/zk-token-sdk/src/lib.rs
index bc0a0d49eb..7bd75d32de 100644
--- a/zk-token-sdk/src/lib.rs
+++ b/zk-token-sdk/src/lib.rs
@@ -1,3 +1,5 @@
+#![allow(clippy::integer_arithmetic)]
+
 #[cfg(not(target_arch = "bpf"))]
 #[macro_use]
 pub(crate) mod macros;