solana v2 update

Cargo.toml

@@ -13,14 +13,14 @@ members = [
 [workspace.dependencies]
 anyhow = "^1.0"
 bincode = "^1.0"
-borsh = ">=0.9,<1.0.0"
-clap = "^3"
+borsh = "^1"
+clap = "^4"
 itertools = ">=0.1"
 jupiter-amm-interface = "~0.4.0"
 lazy_static = "^1.0"
 # set git dependencies to branch instead of locking to rev so that consumers can upgrade easily
-lido = { git = "https://github.com/jup-ag/solido", branch = "jupiter", features = ["no-entrypoint"] } # rev = "ec25a9b"
-marinade_finance_interface = { git = "https://github.com/igneous-labs/marinade_finance_interface", branch = "master" } # rev = "4d1895b"
+lido = { git = "https://github.com/igneous-labs/solido", branch = "main", features = ["no-entrypoint"] }
+marinade_finance_interface = { git = "https://github.com/igneous-labs/marinade_finance_interface", branch = "master" }
 num-derive = ">=0.1"
 num-traits = ">=0.1"
 rand = "0.8.5"
@@ -29,26 +29,25 @@ sanctum-macros = "^1.2"
 serde = "^1"
 serde_json = "^1"
 spl-associated-token-account = { version = ">=1", features = ["no-entrypoint"] }
-spl-math = { version = "0.1.0", features = ["no-entrypoint"]}
-spl-stake-pool = { version = "^1", features = ["no-entrypoint"] }
+spl-stake-pool = { version = ">=2.0.1", features = ["no-entrypoint"] } # 2.0.1 is the specific vers that patches incompatible breaking changes in 2.0.0
 spl-token = ">=3.0"
 thiserror = "^1.0"
 tokio = "^1.0"
-unstake_interface = { git = "https://github.com/igneous-labs/sanctum-unstake-program.git", rev = "069f941" }
-unstake-lib = { git = "https://github.com/igneous-labs/sanctum-unstake-program.git", rev = "069f941" }
+unstake_interface = { git = "https://github.com/igneous-labs/sanctum-unstake-program.git", rev = "3651f16" }
+unstake-lib = { git = "https://github.com/igneous-labs/sanctum-unstake-program.git", rev = "3651f16" }
 
 # sanctum solana utils
-sanctum-solana-cli-utils = { git = "https://github.com/igneous-labs/sanctum-solana-utils.git", branch = "master" } # rev = "111f01"
+sanctum-solana-cli-utils = { git = "https://github.com/igneous-labs/sanctum-solana-utils.git", branch = "master" }
 
 # sanctum-lst-list
 # keep branch = "master" for flexibility of downstream crates
-sanctum-lst-list = { git = "https://github.com/igneous-labs/sanctum-lst-list.git", branch = "master" } # rev = ebecde4
+sanctum-lst-list = { git = "https://github.com/igneous-labs/sanctum-lst-list.git", branch = "master" }
 
 # solana core crates
-solana-program = "^1"
-solana-sdk = "^1"
-solana-account-decoder = "^1"
-solana-client = "^1"
+solana-program = ">=1"
+solana-sdk = ">=1"
+solana-account-decoder = ">=1"
+solana-client = ">=1"
 
 # workspace members
 stakedex_deposit_sol_interface = { path = "./interfaces/stakedex_deposit_sol_interface" }

cli/srlut/src/subcmd/extend.rs

@@ -1,7 +1,7 @@
 use std::{fs::File, io::BufReader, path::PathBuf};
 
 use clap::Args;
-use sanctum_solana_cli_utils::{parse_signer, TxSendingNonblockingRpcClient};
+use sanctum_solana_cli_utils::{parse_signer, HandleTxArgs, TxSendingNonblockingRpcClient};
 use solana_sdk::{
     address_lookup_table::{instruction::extend_lookup_table, state::AddressLookupTable},
     compute_budget::ComputeBudgetInstruction,
@@ -109,7 +109,9 @@ impl ExtendArgs {
                 &signers,
             )
             .unwrap();
-            rpc.handle_tx(&tx, args.send_mode).await;
+            rpc.handle_tx(&tx, args.send_mode, HandleTxArgs::cli_default())
+                .await
+                .unwrap();
         }
     }
 }

cli/srlut/src/subcmd/init.rs

@@ -1,5 +1,5 @@
 use clap::Args;
-use sanctum_solana_cli_utils::{parse_signer, TxSendingNonblockingRpcClient};
+use sanctum_solana_cli_utils::{parse_signer, HandleTxArgs, TxSendingNonblockingRpcClient};
 use solana_sdk::{
     address_lookup_table::instruction::create_lookup_table,
     epoch_info::EpochInfo,
@@ -54,6 +54,8 @@ impl InitArgs {
 
         eprintln!("Creating LUT {lut_addr}");
 
-        rpc.handle_tx(&tx, args.send_mode).await;
+        rpc.handle_tx(&tx, args.send_mode, HandleTxArgs::cli_default())
+            .await
+            .unwrap();
     }
 }

libs/lido/src/lib.rs

@@ -5,7 +5,7 @@ use lido::state::{AccountType, Lido, Validator};
 
 mod stakedex_traits;
 
-use solana_program::{borsh0_10::try_from_slice_unchecked, program_pack::Pack};
+use solana_program::{borsh1::try_from_slice_unchecked, program_pack::Pack};
 pub use stakedex_traits::*;
 
 pub const LIDO_LABEL: &str = "Lido";

libs/marinade/src/lib.rs

@@ -10,7 +10,7 @@ use consts::VALIDATOR_RECORD_BYTE_LENGTH;
 use marinade_finance_interface::{
     Fee, FeeCents, LiqPool, List, StakeSystem, State, ValidatorRecord, ValidatorSystem,
 };
-use solana_program::{borsh0_10::try_from_slice_unchecked, pubkey::Pubkey};
+use solana_program::{borsh1::try_from_slice_unchecked, pubkey::Pubkey};
 
 pub const MARINADE_LABEL: &str = "Marinade";
 

libs/spl_stake_pool/src/lib.rs

@@ -2,7 +2,7 @@ use std::sync::{atomic::AtomicU64, Arc};
 
 use anyhow::{anyhow, Result};
 use deposit_cap_guard::{find_spl_deposit_cap_guard_state, DepositCap};
-use solana_program::{borsh0_10::try_from_slice_unchecked, pubkey::Pubkey};
+use solana_program::{borsh1::try_from_slice_unchecked, pubkey::Pubkey};
 use spl_stake_pool::{
     error::StakePoolError,
     find_deposit_authority_program_address, find_withdraw_authority_program_address,

libs/unstake_it/Cargo.toml

@@ -9,7 +9,6 @@ edition = "2021"
 anyhow = { workspace = true }
 jupiter-amm-interface = { workspace = true }
 solana-program = { workspace = true }
-spl-math = { workspace = true }
 spl-token = { workspace = true }
 stakedex_deposit_stake_interface = { workspace = true }
 stakedex_jup_interface = { workspace = true }

libs/unstake_it/src/lib.rs

@@ -1,5 +1,5 @@
 use anyhow::Result;
-use solana_program::{borsh0_10::try_from_slice_unchecked, pubkey::Pubkey};
+use solana_program::{borsh1::try_from_slice_unchecked, pubkey::Pubkey};
 use unstake_interface::{Fee, FeeEnum, Pool, ProtocolFee, Rational};
 
 mod pda;

stakedex_sdk/tests/test_main.rs

@@ -395,9 +395,8 @@ fn setup_swap_via_stake(
 ) -> (u64, Vec<Instruction>, u64, u64) {
     let source_balance = RPC
         .get_token_account_balance(&src_token_acc)
-        .map_err(|err| {
-            println!("Could not swap {} to {}", input_mint, output_mint);
-            err
+        .inspect_err(|err| {
+            println!("Could not swap {input_mint} to {output_mint}: {err}");
         })
         .unwrap();