Browse Source

CI: Update to Solana v2.1 crates (#7416)

* Run update script, update curve25519-dalek dep, rust

* Run clippy + fmt

* Add workspace lints, start fixing doc comments

* Update doc comments for clippy

* Re-run cargo fmt after doc comment update

* Update solana-version

* Update CI jobs
Jon C 1 năm trước cách đây
mục cha
commit
69ae144a60

+ 7 - 7
clients/cli/Cargo.toml

@@ -11,12 +11,12 @@ version = "0.2.0"
 [dependencies]
 clap = { version = "3", features = ["cargo"] }
 futures-util = "0.3.31"
-solana-clap-v3-utils = "2.0.3"
-solana-cli-config = "2.0.3"
-solana-client = "2.0.3"
-solana-logger = "2.0.3"
-solana-remote-wallet = "2.0.3"
-solana-sdk = "2.0.3"
+solana-clap-v3-utils = "2.1.0"
+solana-cli-config = "2.1.0"
+solana-client = "2.1.0"
+solana-logger = "2.1.0"
+solana-remote-wallet = "2.1.0"
+solana-sdk = "2.1.0"
 spl-tlv-account-resolution = { version = "0.8.1", path = "../../../libraries/tlv-account-resolution", features = ["serde-traits"] }
 spl-transfer-hook-interface = { version = "0.8.2", path = "../interface" }
 strum = "0.26"
@@ -27,7 +27,7 @@ serde_json = "1.0.132"
 serde_yaml = "0.9.34"
 
 [dev-dependencies]
-solana-test-validator = "2.0.3"
+solana-test-validator = "2.1.0"
 spl-token-2022 = { version = "5.0.2", path = "../../program-2022", features = ["no-entrypoint"] }
 spl-token-client = { version = "0.12.1", path = "../../client" }
 spl-transfer-hook-example = { version = "0.6.0", path = "../example" }

+ 1 - 1
interface/Cargo.toml

@@ -10,7 +10,7 @@ edition = "2021"
 [dependencies]
 arrayref = "0.3.9"
 bytemuck = { version = "1.19.0", features = ["derive"] }
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 spl-discriminator = { version = "0.3.0" , path = "../../../libraries/discriminator" }
 spl-program-error = { version = "0.5.0" , path = "../../../libraries/program-error" }
 spl-tlv-account-resolution = { version = "0.8.1", path = "../../../libraries/tlv-account-resolution" }

+ 2 - 2
interface/src/instruction.rs

@@ -26,8 +26,8 @@ pub enum TransferHookInstruction {
     ///   2. `[]` Destination account
     ///   3. `[]` Source account's owner/delegate
     ///   4. `[]` (Optional) Validation account
-    ///   5..5+M `[]` `M` optional additional accounts, written in validation
-    /// account     data
+    ///   5. ..5+M `[]` `M` optional additional accounts, written in validation
+    ///      account data
     Execute {
         /// Amount of tokens to transfer
         amount: u64,

+ 3 - 3
program/Cargo.toml

@@ -15,15 +15,15 @@ forbid-additional-mints = []
 
 [dependencies]
 arrayref = "0.3.9"
-solana-program = "2.0.3"
+solana-program = "2.1.0"
 spl-tlv-account-resolution = { version = "0.8.1", path = "../../../libraries/tlv-account-resolution" }
 spl-token-2022 = { version = "5.0.2",  path = "../../program-2022", features = ["no-entrypoint"] }
 spl-transfer-hook-interface = { version = "0.8.2", path = "../interface" }
 spl-type-length-value = { version = "0.6.0", path = "../../../libraries/type-length-value" }
 
 [dev-dependencies]
-solana-program-test = "2.0.3"
-solana-sdk = "2.0.3"
+solana-program-test = "2.1.0"
+solana-sdk = "2.1.0"
 
 [lib]
 crate-type = ["cdylib", "lib"]

+ 7 - 7
program/tests/functional.rs

@@ -220,7 +220,7 @@ async fn success_execute() {
         AccountMeta::new(writable_pubkey, false),
     ];
 
-    let mut context = program_test.start_with_context().await;
+    let context = program_test.start_with_context().await;
     let rent = context.banks_client.get_rent().await.unwrap();
     let rent_lamports = rent
         .minimum_balance(ExtraAccountMetaList::size_of(init_extra_account_metas.len()).unwrap());
@@ -460,7 +460,7 @@ async fn fail_incorrect_derivation() {
     // wrong derivation
     let extra_account_metas = get_extra_account_metas_address(&program_id, &mint_address);
 
-    let mut context = program_test.start_with_context().await;
+    let context = program_test.start_with_context().await;
     let rent = context.banks_client.get_rent().await.unwrap();
     let rent_lamports = rent.minimum_balance(ExtraAccountMetaList::size_of(0).unwrap());
 
@@ -523,7 +523,7 @@ async fn fail_incorrect_mint() {
 
     let extra_account_metas = get_extra_account_metas_address(&mint_address, &program_id);
 
-    let mut context = program_test.start_with_context().await;
+    let context = program_test.start_with_context().await;
     let rent = context.banks_client.get_rent().await.unwrap();
     let rent_lamports = rent.minimum_balance(ExtraAccountMetaList::size_of(0).unwrap());
 
@@ -671,7 +671,7 @@ async fn success_on_chain_invoke() {
         AccountMeta::new(writable_pubkey, false),
     ];
 
-    let mut context = program_test.start_with_context().await;
+    let context = program_test.start_with_context().await;
     let rent = context.banks_client.get_rent().await.unwrap();
     let rent_lamports = rent
         .minimum_balance(ExtraAccountMetaList::size_of(init_extra_account_metas.len()).unwrap());
@@ -758,7 +758,7 @@ async fn fail_without_transferring_flag() {
     let extra_account_metas_address = get_extra_account_metas_address(&mint_address, &program_id);
     let extra_account_metas = [];
     let init_extra_account_metas = [];
-    let mut context = program_test.start_with_context().await;
+    let context = program_test.start_with_context().await;
     let rent = context.banks_client.get_rent().await.unwrap();
     let rent_lamports = rent
         .minimum_balance(ExtraAccountMetaList::size_of(init_extra_account_metas.len()).unwrap());
@@ -884,7 +884,7 @@ async fn success_on_chain_invoke_with_updated_extra_account_metas() {
         ExtraAccountMeta::new_with_pubkey(&writable_pubkey, false, true).unwrap(),
     ];
 
-    let mut context = program_test.start_with_context().await;
+    let context = program_test.start_with_context().await;
     let rent = context.banks_client.get_rent().await.unwrap();
     let rent_lamports = rent
         .minimum_balance(ExtraAccountMetaList::size_of(init_extra_account_metas.len()).unwrap());
@@ -1112,7 +1112,7 @@ async fn success_execute_with_updated_extra_account_metas() {
         AccountMeta::new(writable_pubkey, false),
     ];
 
-    let mut context = program_test.start_with_context().await;
+    let context = program_test.start_with_context().await;
     let rent = context.banks_client.get_rent().await.unwrap();
     let rent_lamports = rent
         .minimum_balance(ExtraAccountMetaList::size_of(init_extra_account_metas.len()).unwrap());