diff --git a/Cargo.lock b/Cargo.lock index 6f7c8e8..e5cf9ad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4240,7 +4240,7 @@ dependencies = [ "solana-hash", "solana-instruction", "solana-keccak-hasher", - "solana-loader-v3-interface 5.0.0", + "solana-loader-v3-interface", "solana-loader-v4-interface", "solana-log-collector", "solana-measure", @@ -4964,21 +4964,6 @@ dependencies = [ "solana-sdk-ids", ] -[[package]] -name = "solana-loader-v3-interface" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4be76cfa9afd84ca2f35ebc09f0da0f0092935ccdac0595d98447f259538c2" -dependencies = [ - "serde", - "serde_bytes", - "serde_derive", - "solana-instruction", - "solana-pubkey", - "solana-sdk-ids", - "solana-system-interface", -] - [[package]] name = "solana-loader-v3-interface" version = "5.0.0" @@ -5021,7 +5006,7 @@ dependencies = [ "solana-bincode", "solana-bpf-loader-program", "solana-instruction", - "solana-loader-v3-interface 5.0.0", + "solana-loader-v3-interface", "solana-loader-v4-interface", "solana-log-collector", "solana-measure", @@ -5293,9 +5278,9 @@ dependencies = [ [[package]] name = "solana-program" -version = "2.2.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "586469467e93ceb79048f8d8e3a619bf61d05396ee7de95cb40280301a589d05" +checksum = "98eca145bd3545e2fbb07166e895370576e47a00a7d824e325390d33bf467210" dependencies = [ "bincode", "blake3", @@ -5338,7 +5323,7 @@ dependencies = [ "solana-keccak-hasher", "solana-last-restart-slot", "solana-loader-v2-interface", - "solana-loader-v3-interface 3.0.0", + "solana-loader-v3-interface", "solana-loader-v4-interface", "solana-message", "solana-msg", @@ -5498,7 +5483,7 @@ dependencies = [ "solana-hash", "solana-instruction", "solana-keypair", - "solana-loader-v3-interface 5.0.0", + "solana-loader-v3-interface", "solana-log-collector", "solana-logger", "solana-message", @@ -5898,7 +5883,7 @@ dependencies = [ "solana-instruction", "solana-keypair", "solana-lattice-hash", - "solana-loader-v3-interface 5.0.0", + "solana-loader-v3-interface", "solana-loader-v4-interface", "solana-measure", "solana-message", @@ -6425,7 +6410,7 @@ dependencies = [ "solana-hash", "solana-instruction", "solana-instructions-sysvar", - "solana-loader-v3-interface 5.0.0", + "solana-loader-v3-interface", "solana-loader-v4-interface", "solana-loader-v4-program", "solana-log-collector", @@ -7087,9 +7072,12 @@ name = "spl-feature-proposal" version = "2.0.0" dependencies = [ "borsh 1.5.7", + "solana-feature-gate-interface", "solana-program", "solana-program-test", "solana-sdk", + "solana-sdk-ids", + "solana-system-interface", "spl-token", ] diff --git a/program/Cargo.toml b/program/Cargo.toml index d21621e..e7a5e81 100644 --- a/program/Cargo.toml +++ b/program/Cargo.toml @@ -13,7 +13,10 @@ test-sbf = [] [dependencies] borsh = "1.5.7" -solana-program = "2.2.1" +solana-feature-gate-interface = "2.2.1" +solana-program = "2.3.0" +solana-sdk-ids = "2.2.1" +solana-system-interface = "1" spl-token = { version = "8.0", features = [ "no-entrypoint", ] } diff --git a/program/src/processor.rs b/program/src/processor.rs index 6aa00a6..03f94e0 100644 --- a/program/src/processor.rs +++ b/program/src/processor.rs @@ -2,19 +2,20 @@ use { crate::{instruction::*, state::*, *}, + solana_feature_gate_interface::Feature, solana_program::{ account_info::{next_account_info, AccountInfo}, clock::Clock, entrypoint::ProgramResult, - feature::{self, Feature}, msg, program::{invoke, invoke_signed}, program_error::ProgramError, pubkey::Pubkey, rent::Rent, - system_instruction, sysvar::Sysvar, }, + solana_sdk_ids::feature, + solana_system_interface::instruction as system_instruction, }; /// Instruction processor diff --git a/program/tests/functional.rs b/program/tests/functional.rs index 149b68b..e9b9866 100644 --- a/program/tests/functional.rs +++ b/program/tests/functional.rs @@ -3,16 +3,14 @@ #![cfg(feature = "test-sbf")] use { - solana_program::{ - feature::{self, Feature}, - program_option::COption, - system_program, - }, + solana_feature_gate_interface::Feature, + solana_program::program_option::COption, solana_program_test::*, solana_sdk::{ signature::{Keypair, Signer}, transaction::Transaction, }, + solana_sdk_ids::{feature, system_program}, spl_feature_proposal::{instruction::*, state::*, *}, };