From 90b9f0b1e7c32a2aae40ea16a853e321de820cbf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 30 Jul 2025 09:00:55 +0000 Subject: [PATCH 1/2] build(deps): bump solana-program from 2.2.1 to 2.3.0 Bumps [solana-program](https://github.com/anza-xyz/solana-sdk) from 2.2.1 to 2.3.0. - [Release notes](https://github.com/anza-xyz/solana-sdk/releases) - [Commits](https://github.com/anza-xyz/solana-sdk/compare/sdk@v2.2.1...sdk@v2.3.0) --- updated-dependencies: - dependency-name: solana-program dependency-version: 2.3.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 39 ++++++++++++--------------------------- program/Cargo.toml | 2 +- 2 files changed, 13 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f475b76..a784b49 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5352,7 +5352,7 @@ dependencies = [ "solana-epoch-schedule", "solana-fee-calculator", "solana-instruction", - "solana-loader-v3-interface 5.0.0", + "solana-loader-v3-interface", "solana-nonce", "solana-program-option", "solana-program-pack", @@ -5669,7 +5669,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", @@ -6129,7 +6129,7 @@ dependencies = [ "solana-instruction", "solana-keypair", "solana-ledger", - "solana-loader-v3-interface 5.0.0", + "solana-loader-v3-interface", "solana-measure", "solana-message", "solana-metrics", @@ -6854,21 +6854,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" @@ -6911,7 +6896,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", @@ -7218,9 +7203,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", @@ -7263,7 +7248,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", @@ -7423,7 +7408,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", @@ -7909,7 +7894,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", @@ -8578,7 +8563,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", @@ -8790,7 +8775,7 @@ dependencies = [ "solana-instruction", "solana-keypair", "solana-ledger", - "solana-loader-v3-interface 5.0.0", + "solana-loader-v3-interface", "solana-logger", "solana-message", "solana-native-token", @@ -9024,7 +9009,7 @@ dependencies = [ "solana-hash", "solana-instruction", "solana-loader-v2-interface", - "solana-loader-v3-interface 5.0.0", + "solana-loader-v3-interface", "solana-message", "solana-program-option", "solana-pubkey", diff --git a/program/Cargo.toml b/program/Cargo.toml index 398449a..93871fb 100644 --- a/program/Cargo.toml +++ b/program/Cargo.toml @@ -20,7 +20,7 @@ num-derive = "0.4" num-traits = "0.2" solana-instruction = "2.2.0" solana-instructions-sysvar = "2.2.0" -solana-program = "2.2.0" +solana-program = "2.3.0" solana-signature = "2.2.0" serde = "1.0.219" # must match the serde_derive version, see https://github.com/serde-rs/serde/issues/2584#issuecomment-1685252251 serde_bytes = "0.11.17" From 86acea107e805c01787692f5c3bf1e5da0f30f3a Mon Sep 17 00:00:00 2001 From: Jon C Date: Fri, 1 Aug 2025 14:17:17 +0200 Subject: [PATCH 2/2] Use solana-system-interface --- program/Cargo.toml | 1 + program/src/instruction.rs | 3 ++- program/src/state.rs | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/program/Cargo.toml b/program/Cargo.toml index 93871fb..72058ed 100644 --- a/program/Cargo.toml +++ b/program/Cargo.toml @@ -22,6 +22,7 @@ solana-instruction = "2.2.0" solana-instructions-sysvar = "2.2.0" solana-program = "2.3.0" solana-signature = "2.2.0" +solana-system-interface = "1" serde = "1.0.219" # must match the serde_derive version, see https://github.com/serde-rs/serde/issues/2584#issuecomment-1685252251 serde_bytes = "0.11.17" serde_derive = "1.0.210" # must match the serde version, see https://github.com/serde-rs/serde/issues/2584#issuecomment-1685252251 diff --git a/program/src/instruction.rs b/program/src/instruction.rs index fedef2b..c3ac532 100644 --- a/program/src/instruction.rs +++ b/program/src/instruction.rs @@ -16,9 +16,10 @@ use { program_error::ProgramError, pubkey::{Pubkey, PUBKEY_BYTES}, rent::Rent, - system_instruction, system_program, sysvar, + sysvar, }, solana_signature::SIGNATURE_BYTES, + solana_system_interface::{instruction as system_instruction, program as system_program}, spl_pod::{ bytemuck::{pod_from_bytes, pod_get_packed_len}, primitives::PodU64, diff --git a/program/src/state.rs b/program/src/state.rs index 9c65e20..12a889e 100644 --- a/program/src/state.rs +++ b/program/src/state.rs @@ -13,9 +13,9 @@ use { program_error::ProgramError, pubkey::Pubkey, rent::Rent, - system_instruction, system_program, sysvar::{self, Sysvar}, }, + solana_system_interface::{instruction as system_instruction, program as system_program}, spl_pod::{bytemuck::pod_from_bytes, primitives::PodU64}, std::{fmt::Display, str::FromStr}, };