Procházet zdrojové kódy

build(deps): bump solana-program from 2.2.1 to 2.3.0 (#48)

* 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] <support@github.com>

* Fix deprecation warnings

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jon C <me@jonc.dev>
dependabot[bot] před 4 měsíci
rodič
revize
878fbb7333
5 změnil soubory, kde provedl 19 přidání a 31 odebrání
  1. 13 27
      Cargo.lock
  2. 2 1
      interface/Cargo.toml
  3. 1 1
      interface/src/onchain.rs
  4. 2 1
      program/Cargo.toml
  5. 1 1
      program/src/processor.rs

+ 13 - 27
Cargo.lock

@@ -5194,7 +5194,7 @@ dependencies = [
  "solana-epoch-schedule",
  "solana-epoch-schedule",
  "solana-fee-calculator",
  "solana-fee-calculator",
  "solana-instruction",
  "solana-instruction",
- "solana-loader-v3-interface 5.0.0",
+ "solana-loader-v3-interface",
  "solana-nonce",
  "solana-nonce",
  "solana-program-option",
  "solana-program-option",
  "solana-program-pack",
  "solana-program-pack",
@@ -5511,7 +5511,7 @@ dependencies = [
  "solana-hash",
  "solana-hash",
  "solana-instruction",
  "solana-instruction",
  "solana-keccak-hasher",
  "solana-keccak-hasher",
- "solana-loader-v3-interface 5.0.0",
+ "solana-loader-v3-interface",
  "solana-loader-v4-interface",
  "solana-loader-v4-interface",
  "solana-log-collector",
  "solana-log-collector",
  "solana-measure",
  "solana-measure",
@@ -5971,7 +5971,7 @@ dependencies = [
  "solana-instruction",
  "solana-instruction",
  "solana-keypair",
  "solana-keypair",
  "solana-ledger",
  "solana-ledger",
- "solana-loader-v3-interface 5.0.0",
+ "solana-loader-v3-interface",
  "solana-measure",
  "solana-measure",
  "solana-message",
  "solana-message",
  "solana-metrics",
  "solana-metrics",
@@ -6696,21 +6696,6 @@ dependencies = [
  "solana-sdk-ids",
  "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]]
 [[package]]
 name = "solana-loader-v3-interface"
 name = "solana-loader-v3-interface"
 version = "5.0.0"
 version = "5.0.0"
@@ -6753,7 +6738,7 @@ dependencies = [
  "solana-bincode",
  "solana-bincode",
  "solana-bpf-loader-program",
  "solana-bpf-loader-program",
  "solana-instruction",
  "solana-instruction",
- "solana-loader-v3-interface 5.0.0",
+ "solana-loader-v3-interface",
  "solana-loader-v4-interface",
  "solana-loader-v4-interface",
  "solana-log-collector",
  "solana-log-collector",
  "solana-measure",
  "solana-measure",
@@ -7060,9 +7045,9 @@ dependencies = [
 
 
 [[package]]
 [[package]]
 name = "solana-program"
 name = "solana-program"
-version = "2.2.1"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "586469467e93ceb79048f8d8e3a619bf61d05396ee7de95cb40280301a589d05"
+checksum = "98eca145bd3545e2fbb07166e895370576e47a00a7d824e325390d33bf467210"
 dependencies = [
 dependencies = [
  "bincode",
  "bincode",
  "blake3",
  "blake3",
@@ -7105,7 +7090,7 @@ dependencies = [
  "solana-keccak-hasher",
  "solana-keccak-hasher",
  "solana-last-restart-slot",
  "solana-last-restart-slot",
  "solana-loader-v2-interface",
  "solana-loader-v2-interface",
- "solana-loader-v3-interface 3.0.0",
+ "solana-loader-v3-interface",
  "solana-loader-v4-interface",
  "solana-loader-v4-interface",
  "solana-message",
  "solana-message",
  "solana-msg",
  "solana-msg",
@@ -7265,7 +7250,7 @@ dependencies = [
  "solana-hash",
  "solana-hash",
  "solana-instruction",
  "solana-instruction",
  "solana-keypair",
  "solana-keypair",
- "solana-loader-v3-interface 5.0.0",
+ "solana-loader-v3-interface",
  "solana-log-collector",
  "solana-log-collector",
  "solana-logger",
  "solana-logger",
  "solana-message",
  "solana-message",
@@ -7751,7 +7736,7 @@ dependencies = [
  "solana-instruction",
  "solana-instruction",
  "solana-keypair",
  "solana-keypair",
  "solana-lattice-hash",
  "solana-lattice-hash",
- "solana-loader-v3-interface 5.0.0",
+ "solana-loader-v3-interface",
  "solana-loader-v4-interface",
  "solana-loader-v4-interface",
  "solana-measure",
  "solana-measure",
  "solana-message",
  "solana-message",
@@ -8351,7 +8336,7 @@ dependencies = [
  "solana-hash",
  "solana-hash",
  "solana-instruction",
  "solana-instruction",
  "solana-instructions-sysvar",
  "solana-instructions-sysvar",
- "solana-loader-v3-interface 5.0.0",
+ "solana-loader-v3-interface",
  "solana-loader-v4-interface",
  "solana-loader-v4-interface",
  "solana-loader-v4-program",
  "solana-loader-v4-program",
  "solana-log-collector",
  "solana-log-collector",
@@ -8563,7 +8548,7 @@ dependencies = [
  "solana-instruction",
  "solana-instruction",
  "solana-keypair",
  "solana-keypair",
  "solana-ledger",
  "solana-ledger",
- "solana-loader-v3-interface 5.0.0",
+ "solana-loader-v3-interface",
  "solana-logger",
  "solana-logger",
  "solana-message",
  "solana-message",
  "solana-native-token",
  "solana-native-token",
@@ -8797,7 +8782,7 @@ dependencies = [
  "solana-hash",
  "solana-hash",
  "solana-instruction",
  "solana-instruction",
  "solana-loader-v2-interface",
  "solana-loader-v2-interface",
- "solana-loader-v3-interface 5.0.0",
+ "solana-loader-v3-interface",
  "solana-message",
  "solana-message",
  "solana-program-option",
  "solana-program-option",
  "solana-pubkey",
  "solana-pubkey",
@@ -9756,6 +9741,7 @@ dependencies = [
  "solana-program",
  "solana-program",
  "solana-program-error",
  "solana-program-error",
  "solana-pubkey",
  "solana-pubkey",
+ "solana-sdk-ids",
  "spl-discriminator",
  "spl-discriminator",
  "spl-pod",
  "spl-pod",
  "spl-program-error",
  "spl-program-error",

+ 2 - 1
interface/Cargo.toml

@@ -21,6 +21,7 @@ solana-instruction = { version = "2.2.1", features = ["std"] }
 solana-msg = "2.2.1"
 solana-msg = "2.2.1"
 solana-program-error = "2.2.1"
 solana-program-error = "2.2.1"
 solana-pubkey = { version = "2.2.1", features = ["curve25519"] }
 solana-pubkey = { version = "2.2.1", features = ["curve25519"] }
+solana-sdk-ids = "2.2.1"
 spl-discriminator = "0.4.0"
 spl-discriminator = "0.4.0"
 spl-program-error = "0.7.0"
 spl-program-error = "0.7.0"
 spl-tlv-account-resolution = "0.10.0"
 spl-tlv-account-resolution = "0.10.0"
@@ -35,7 +36,7 @@ crate-type = ["cdylib", "lib"]
 workspace = true
 workspace = true
 
 
 [dev-dependencies]
 [dev-dependencies]
-solana-program = "2.2.1"
+solana-program = "2.3.0"
 tokio = { version = "1.46.1", features = ["full"] }
 tokio = { version = "1.46.1", features = ["full"] }
 
 
 [package.metadata.docs.rs]
 [package.metadata.docs.rs]

+ 1 - 1
interface/src/onchain.rs

@@ -139,7 +139,7 @@ mod tests {
     use {
     use {
         super::*,
         super::*,
         crate::instruction::ExecuteInstruction,
         crate::instruction::ExecuteInstruction,
-        solana_program::{bpf_loader_upgradeable, system_program},
+        solana_sdk_ids::{bpf_loader_upgradeable, system_program},
         spl_tlv_account_resolution::{
         spl_tlv_account_resolution::{
             account::ExtraAccountMeta, error::AccountResolutionError, seeds::Seed,
             account::ExtraAccountMeta, error::AccountResolutionError, seeds::Seed,
         },
         },

+ 2 - 1
program/Cargo.toml

@@ -17,7 +17,8 @@ forbid-additional-mints = []
 
 
 [dependencies]
 [dependencies]
 arrayref = "0.3.9"
 arrayref = "0.3.9"
-solana-program = "2.2.1"
+solana-program = "2.3.0"
+solana-system-interface = "1"
 spl-tlv-account-resolution = "0.10.0"
 spl-tlv-account-resolution = "0.10.0"
 spl-token-2022 = { version = "9.0.0", features = ["no-entrypoint"] }
 spl-token-2022 = { version = "9.0.0", features = ["no-entrypoint"] }
 spl-transfer-hook-interface = { version = "0.10.0", path = "../interface" }
 spl-transfer-hook-interface = { version = "0.10.0", path = "../interface" }

+ 1 - 1
program/src/processor.rs

@@ -8,8 +8,8 @@ use {
         program::invoke_signed,
         program::invoke_signed,
         program_error::ProgramError,
         program_error::ProgramError,
         pubkey::Pubkey,
         pubkey::Pubkey,
-        system_instruction,
     },
     },
+    solana_system_interface::instruction as system_instruction,
     spl_tlv_account_resolution::{account::ExtraAccountMeta, state::ExtraAccountMetaList},
     spl_tlv_account_resolution::{account::ExtraAccountMeta, state::ExtraAccountMetaList},
     spl_token_2022::{
     spl_token_2022::{
         extension::{
         extension::{