From a7d565ac0dc36e706f7cf01c8f6017f7cac3f8d4 Mon Sep 17 00:00:00 2001 From: acheron Date: Sun, 5 Jan 2025 11:46:48 +0100 Subject: [PATCH 1/3] cli: Replace `solana-program` usage with `solana-sdk` --- cli/src/lib.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cli/src/lib.rs b/cli/src/lib.rs index 03ff43d19a..3404b03261 100644 --- a/cli/src/lib.rs +++ b/cli/src/lib.rs @@ -25,13 +25,13 @@ use semver::{Version, VersionReq}; use serde::Deserialize; use serde_json::{json, Map, Value as JsonValue}; use solana_client::rpc_client::RpcClient; -use solana_program::instruction::{AccountMeta, Instruction}; use solana_sdk::account_utils::StateMut; use solana_sdk::bpf_loader; use solana_sdk::bpf_loader_deprecated; use solana_sdk::bpf_loader_upgradeable::{self, UpgradeableLoaderState}; use solana_sdk::commitment_config::CommitmentConfig; use solana_sdk::compute_budget::ComputeBudgetInstruction; +use solana_sdk::instruction::{AccountMeta, Instruction}; use solana_sdk::pubkey::Pubkey; use solana_sdk::signature::Keypair; use solana_sdk::signature::Signer; @@ -3994,7 +3994,7 @@ fn create_idl_account( AccountMeta::new_readonly(keypair.pubkey(), true), AccountMeta::new(idl_address, false), AccountMeta::new_readonly(program_signer, false), - AccountMeta::new_readonly(solana_program::system_program::ID, false), + AccountMeta::new_readonly(solana_sdk::system_program::ID, false), AccountMeta::new_readonly(*program_id, false), ]; instructions.push(Instruction { @@ -4010,7 +4010,7 @@ fn create_idl_account( accounts: vec![ AccountMeta::new(idl_address, false), AccountMeta::new_readonly(keypair.pubkey(), true), - AccountMeta::new_readonly(solana_program::system_program::ID, false), + AccountMeta::new_readonly(solana_sdk::system_program::ID, false), ], data, }); From 16c3dc8ba368d08d5a5778be5403b4115f37bec9 Mon Sep 17 00:00:00 2001 From: acheron Date: Sun, 5 Jan 2025 11:47:29 +0100 Subject: [PATCH 2/3] cli: Remove `solana-program` dependency --- cli/Cargo.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 768a7069ab..9e81b7d186 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -39,7 +39,6 @@ shellexpand = "2.1.0" solana-client = "2" solana-cli-config = "2" solana-faucet = "2" -solana-program = "2" solana-sdk = "2" # Pin solang-parser because it may break in a backwards incompatible way in minor versions solang-parser = "=0.3.3" From b45bdbbb5bfc7afd7c0228cce1ca555f741905f9 Mon Sep 17 00:00:00 2001 From: acheron Date: Sun, 5 Jan 2025 11:48:01 +0100 Subject: [PATCH 3/3] Update workspace `Cargo.lock` --- Cargo.lock | 1 - 1 file changed, 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 5ce5100ad8..ef12c672e7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -192,7 +192,6 @@ dependencies = [ "solana-cli-config", "solana-client", "solana-faucet", - "solana-program", "solana-sdk", "solang-parser", "syn 1.0.109",