From 7e9c495946a15e1ce48973612b5398f57a617437 Mon Sep 17 00:00:00 2001 From: Kevin Heavey Date: Wed, 11 Dec 2024 16:29:15 +0400 Subject: [PATCH] remove solana-sdk from zk-token-proof (#4055) --- Cargo.lock | 3 ++- programs/sbf/Cargo.lock | 3 ++- programs/zk-token-proof/Cargo.toml | 3 ++- programs/zk-token-proof/src/lib.rs | 6 ++---- svm/examples/Cargo.lock | 3 ++- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4a197f768817de..27974ad156031a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10023,9 +10023,10 @@ dependencies = [ "num-derive", "num-traits", "solana-feature-set", + "solana-instruction", "solana-log-collector", "solana-program-runtime", - "solana-sdk", + "solana-sdk-ids", "solana-zk-token-sdk", ] diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock index 692343d2d41e8d..e112ff7a3eede5 100644 --- a/programs/sbf/Cargo.lock +++ b/programs/sbf/Cargo.lock @@ -8368,9 +8368,10 @@ dependencies = [ "num-derive", "num-traits", "solana-feature-set", + "solana-instruction", "solana-log-collector", "solana-program-runtime", - "solana-sdk", + "solana-sdk-ids", "solana-zk-token-sdk", ] diff --git a/programs/zk-token-proof/Cargo.toml b/programs/zk-token-proof/Cargo.toml index 2b8ce98f2ac2f3..50a49896dc83fb 100644 --- a/programs/zk-token-proof/Cargo.toml +++ b/programs/zk-token-proof/Cargo.toml @@ -13,9 +13,10 @@ bytemuck = { workspace = true } num-derive = { workspace = true } num-traits = { workspace = true } solana-feature-set = { workspace = true } +solana-instruction = { workspace = true } solana-log-collector = { workspace = true } solana-program-runtime = { workspace = true } -solana-sdk = { workspace = true } +solana-sdk-ids = { workspace = true } solana-zk-token-sdk = { workspace = true } [dev-dependencies] diff --git a/programs/zk-token-proof/src/lib.rs b/programs/zk-token-proof/src/lib.rs index 15d292b29a4ef4..70a7e8e593f722 100644 --- a/programs/zk-token-proof/src/lib.rs +++ b/programs/zk-token-proof/src/lib.rs @@ -3,12 +3,10 @@ use { bytemuck::Pod, solana_feature_set as feature_set, + solana_instruction::{error::InstructionError, TRANSACTION_LEVEL_STACK_HEIGHT}, solana_log_collector::ic_msg, solana_program_runtime::{declare_process_instruction, invoke_context::InvokeContext}, - solana_sdk::{ - instruction::{InstructionError, TRANSACTION_LEVEL_STACK_HEIGHT}, - system_program, - }, + solana_sdk_ids::system_program, solana_zk_token_sdk::{ zk_token_proof_instruction::*, zk_token_proof_program::id, diff --git a/svm/examples/Cargo.lock b/svm/examples/Cargo.lock index 02422b7e80d977..366a1284e132dd 100644 --- a/svm/examples/Cargo.lock +++ b/svm/examples/Cargo.lock @@ -7704,9 +7704,10 @@ dependencies = [ "num-derive", "num-traits", "solana-feature-set", + "solana-instruction", "solana-log-collector", "solana-program-runtime", - "solana-sdk", + "solana-sdk-ids", "solana-zk-token-sdk", ]