remove solana-program from zk-token-sdk (#3410)

anza-xyz · Oct 31, 2024 · d9c24ed · d9c24ed
1 parent 3b175b7
commit d9c24ed
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
diff --git a/zk-token-sdk/Cargo.toml b/zk-token-sdk/Cargo.toml
@@ -16,7 +16,8 @@ bytemuck_derive = { workspace = true }
 num-derive = { workspace = true }
 num-traits = { workspace = true }
 solana-curve25519 = { workspace = true }
-solana-program = { workspace = true }
+solana-instruction = { workspace = true, features = ["std"] }
+solana-pubkey = { workspace = true }
 thiserror = { workspace = true }
 
 [dev-dependencies]

diff --git a/zk-token-sdk/src/zk_token_elgamal/pod/mod.rs b/zk-token-sdk/src/zk_token_elgamal/pod/mod.rs
@@ -9,7 +9,7 @@ mod sigma_proofs;
 use {
     crate::zk_token_proof_instruction::ProofType,
     num_traits::{FromPrimitive, ToPrimitive},
-    solana_program::instruction::InstructionError,
+    solana_instruction::error::InstructionError,
     thiserror::Error,
 };
 pub use {

diff --git a/zk-token-sdk/src/zk_token_proof_instruction.rs b/zk-token-sdk/src/zk_token_proof_instruction.rs
@@ -37,10 +37,8 @@ use {
     bytemuck::bytes_of,
     num_derive::{FromPrimitive, ToPrimitive},
     num_traits::{FromPrimitive, ToPrimitive},
-    solana_program::{
-        instruction::{AccountMeta, Instruction},
-        pubkey::Pubkey,
-    },
+    solana_instruction::{AccountMeta, Instruction},
+    solana_pubkey::Pubkey,
 };
 
 #[derive(Clone, Copy, Debug, FromPrimitive, ToPrimitive, PartialEq, Eq)]

diff --git a/zk-token-sdk/src/zk_token_proof_program.rs b/zk-token-sdk/src/zk_token_proof_program.rs
@@ -8,4 +8,4 @@
 //! [`ZK Token proof`]: https://docs.solanalabs.com/runtime/zk-token-proof
 
 // Program Id of the ZkToken Proof program
-solana_program::declare_id!("ZkTokenProof1111111111111111111111111111111");
+solana_pubkey::declare_id!("ZkTokenProof1111111111111111111111111111111");
diff --git a/zk-token-sdk/src/zk_token_proof_state.rs b/zk-token-sdk/src/zk_token_proof_state.rs
@@ -2,10 +2,8 @@ use {
     crate::{zk_token_elgamal::pod::PodProofType, zk_token_proof_instruction::ProofType},
     bytemuck::{bytes_of, Pod, Zeroable},
     num_traits::ToPrimitive,
-    solana_program::{
-        instruction::{InstructionError, InstructionError::InvalidAccountData},
-        pubkey::Pubkey,
-    },
+    solana_instruction::error::{InstructionError, InstructionError::InvalidAccountData},
+    solana_pubkey::Pubkey,
     std::mem::size_of,
 };