Browse Source

deps: Bump Solana deps and toolchains (#44)

* deps: Bump Solana deps and toolchains

#### Problem

The Solana 2.2 crates and tools are available, but the repo is still
using 2.1.

#### Summary of changes

Pretty simple, but bump up the sdk crates to v2.2.1, non-sdk crates to
v2.2.0, toolchain to 1.84.1, and nightly to 2024-11-22

* Fixup imports
Jon C 8 months ago
parent
commit
f1379566e4
7 changed files with 329 additions and 294 deletions
  1. 291 259
      Cargo.lock
  2. 20 19
      Cargo.toml
  3. 3 3
      clients/rust/Cargo.toml
  4. 5 4
      interface/Cargo.toml
  5. 8 7
      interface/src/instruction.rs
  6. 1 1
      program/Cargo.toml
  7. 1 1
      rust-toolchain.toml

File diff suppressed because it is too large
+ 291 - 259
Cargo.lock


+ 20 - 19
Cargo.toml

@@ -14,26 +14,27 @@ license = "Apache-2.0"
 edition = "2021"
 
 [workspace.dependencies]
-solana-account = "2.1"
-solana-account-info = "2.1"
-solana-bincode = "2.1"
-solana-cpi = "2.1"
-solana-decode-error = "2.1"
-solana-frozen-abi = "2.1"
-solana-frozen-abi-macro = "2.1"
-solana-instruction = "2.1"
-solana-logger = "2.1"
-solana-nonce = "0.0.2"
-solana-msg = "2.1"
-solana-program = { version = "2.1", default-features = false }
-solana-program-entrypoint = "2.1"
-solana-program-error = "2.1"
-solana-pubkey = { version = "2.1", default-features = false }
+solana-account = "2.2.1"
+solana-account-info = "2.2.1"
+solana-bincode = "2.2.1"
+solana-cpi = "2.2.1"
+solana-decode-error = "2.2.1"
+solana-example-mocks = "2.2.1"
+solana-frozen-abi = "2.2.1"
+solana-frozen-abi-macro = "2.2.1"
+solana-instruction = "2.2.1"
+solana-logger = "2.2.1"
+solana-nonce = "2.2.1"
+solana-msg = "2.2.1"
+solana-program = { version = "2.2.1", default-features = false }
+solana-program-entrypoint = "2.2.1"
+solana-program-error = "2.2.1"
+solana-pubkey = { version = "2.2.1", default-features = false }
 
 [workspace.metadata.cli]
-solana = "2.1.0"
+solana = "2.2.0"
 
 [workspace.metadata.toolchains]
-format = "nightly-2024-08-08"
-lint = "nightly-2024-08-08"
-test = "nightly-2024-08-08"
+format = "nightly-2024-11-22"
+lint = "nightly-2024-11-22"
+test = "nightly-2024-11-22"

+ 3 - 3
clients/rust/Cargo.toml

@@ -19,7 +19,7 @@ num-derive = "^0.3"
 num-traits = "^0.2"
 serde = { version = "^1.0", features = ["derive"], optional = true }
 serde_with = { version = "^3.0", optional = true }
-solana-client = { version = "^2.1", optional = true }
-solana-sdk = { version = "^2.1", optional = true }
-solana-program = "^2.1"
+solana-client = { version = "2.2.0", optional = true }
+solana-sdk = { version = "2.2.1", optional = true }
+solana-program = "2.2.1"
 thiserror = "^1.0"

+ 5 - 4
interface/Cargo.toml

@@ -18,7 +18,7 @@ rustdoc-args = ["--cfg=docsrs"]
 num-traits = "0.2"
 serde = { version = "1.0.210", optional = true }
 serde_derive = { version = "1.0.210", optional = true }
-solana-decode-error = "^2.1"
+solana-decode-error = { workspace = true }
 solana-frozen-abi = { workspace = true, features = ["frozen-abi"], optional = true }
 solana-frozen-abi-macro = { workspace = true, features = ["frozen-abi"], optional = true }
 solana-instruction = { workspace = true, features = ["bincode", "std"], optional = true }
@@ -34,9 +34,10 @@ wasm-bindgen = "0.2"
 [dev-dependencies]
 anyhow = "1.0.89"
 borsh = { version = "1.5.1", features = ["derive", "unstable__schema"] }
-solana-account-info = "^2.1"
-solana-cpi = "^2.1"
-solana-nonce = "^0.0.2"
+solana-account-info = { workspace = true }
+solana-cpi = { workspace = true }
+solana-example-mocks = { workspace = true }
+solana-nonce = { workspace = true }
 solana-program = { workspace = true, default-features = false }
 solana-program-entrypoint = { workspace = true }
 solana-program-error = { workspace = true, features = ["borsh"] }

+ 8 - 7
interface/src/instruction.rs

@@ -1282,15 +1282,16 @@ pub fn create_nonce_account_with_seed(
 /// Create a nonce account from an off-chain client:
 ///
 /// ```
-/// # use solana_program::example_mocks::solana_sdk;
-/// # use solana_program::example_mocks::solana_rpc_client;
+/// # use solana_example_mocks::solana_keypair;
+/// # use solana_example_mocks::solana_signer;
+/// # use solana_example_mocks::solana_rpc_client;
+/// # use solana_example_mocks::solana_transaction;
+/// use solana_keypair::Keypair;
+/// use solana_nonce::state::State;
 /// use solana_rpc_client::rpc_client::RpcClient;
-/// use solana_sdk::{
-///     signature::{Keypair, Signer},
-///     transaction::Transaction,
-///     nonce::State,
-/// };
+/// use solana_signer::Signer;
 /// use solana_system_interface::instruction;
+/// use solana_transaction::Transaction;
 /// use anyhow::Result;
 ///
 /// fn submit_create_nonce_account_tx(

+ 1 - 1
program/Cargo.toml

@@ -25,7 +25,7 @@ solana-pubkey = { workspace = true, features = ["sha2"] }
 solana-system-interface = { path = "../interface", features = ["serde"] }
 
 [dev-dependencies]
-mollusk-svm = "0.0.15"
+mollusk-svm = "0.1.0"
 solana-account = { workspace = true }
 solana-system-interface = { path = "../interface", features = ["bincode"] }
 

+ 1 - 1
rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.81.0"
+channel = "1.84.1"

Some files were not shown because too many files changed in this diff