anchor v0.32.1 + solana-program 2.2.1 update

Author: jordy25519

Cargo.lock

@@ -18,24 +18,25 @@ default=["mainnet-beta", "no-entrypoint"]
 drift-rs=[]
 
 [dependencies]
-anchor-lang = "0.29.0"
-solana-program = "1.16"
-anchor-spl = { version = "0.29.0", features = [] }
+anchor-lang = "0.32.1"
+anchor-spl = { version = "0.32.1", features = [] }
+# pin to highest version anchor crate allows
+solana-program = "=2.2.1"
 pyth-client = "0.2.2"
-pyth-lazer-solana-contract = { git = "https://github.com/drift-labs/pyth-crosschain", rev = "d790d1cb4da873a949cf33ff70349b7614b232eb", features = ["no-entrypoint"]}
-pythnet-sdk = { git = "https://github.com/drift-labs/pyth-crosschain", rev = "d790d1cb4da873a949cf33ff70349b7614b232eb"}
-pyth-solana-receiver-sdk = { git = "https://github.com/drift-labs/pyth-crosschain", rev = "d790d1cb4da873a949cf33ff70349b7614b232eb"}
+pyth-lazer-solana-contract = { git = "https://github.com/jordy25519/pyth-crosschain", branch = "master", features = ["no-entrypoint"]}
+pythnet-sdk = { git = "https://github.com/jordy25519/pyth-crosschain", branch = "master"}
+pyth-solana-receiver-sdk = { git = "https://github.com/jordy25519/pyth-crosschain", branch = "master"}
 bytemuck = { version = "1.4.0" }
 borsh = "0.10.3"
 hex = "0.4.3"
-num-traits = "0.2"
 uint = { version = "0.9.1", default-features = false }
 num-integer = "0.1.44"
+num-traits = "0.2"
 arrayref = "0.3.6"
 base64 = "0.13.0"
-serum_dex = { git = "https://github.com/project-serum/serum-dex", rev = "85b4f14", version = "0.5.6", features = ["no-entrypoint"] }
+serum_dex = { git = "https://github.com/jordy25519/serum-dex", branch = "master", features = ["no-entrypoint"] }
 enumflags2 = "0.6.4"
-phoenix-v1 = { git = "https://github.com/drift-labs/phoenix-v1", rev = "7703c5", version = "0.2.4", features = ["no-entrypoint"] }
+phoenix-v1 = { git = "https://github.com/jordy25519/phoenix-v1", branch = "master", features = ["no-entrypoint"] }
 solana-security-txt = "1.1.0"
 static_assertions = "1.1.0"
 drift-macros = { git = "https://github.com/drift-labs/drift-macros.git", rev = "c57d87" }

programs/drift/Cargo.toml

@@ -504,9 +504,9 @@ pub fn handle_begin_insurance_fund_swap<'c: 'info, 'info>(
             found_end = true;
 
             // must be the SwapEnd instruction
-            let discriminator = crate::instruction::EndInsuranceFundSwap::discriminator();
+            let discriminator = crate::instruction::EndInsuranceFundSwap::DISCRIMINATOR;
             validate!(
-                ix.data[0..8] == discriminator,
+                &ix.data[0..8] == discriminator,
                 ErrorCode::InvalidSwap,
                 "last drift ix must be end of swap"
             )?;

programs/drift/src/instructions/if_staker.rs

@@ -1032,8 +1032,7 @@ pub fn place_signed_msg_taker_order<'c: 'info, 'info>(
         &mut builder_order,
     )?;
 
-    let order_params_hash =
-        base64::encode(solana_program::hash::hash(&signature.try_to_vec().unwrap()).as_ref());
+    let order_params_hash = base64::encode(solana_program::hash::hash(signature.as_ref()).as_ref());
 
     emit!(SignedMsgOrderRecord {
         user: taker_key,
@@ -1653,9 +1652,9 @@ pub fn handle_liquidate_spot_with_swap_begin<'c: 'info, 'info>(
             found_end = true;
 
             // must be the SwapEnd instruction
-            let discriminator = crate::instruction::LiquidateSpotWithSwapEnd::discriminator();
+            let discriminator = crate::instruction::LiquidateSpotWithSwapEnd::DISCRIMINATOR;
             validate!(
-                ix.data[0..8] == discriminator,
+                &ix.data[0..8] == discriminator,
                 ErrorCode::InvalidLiquidateSpotWithSwap,
                 "last drift ix must be end of swap"
             )?;

programs/drift/src/instructions/keeper.rs

@@ -693,9 +693,9 @@ pub fn handle_begin_lp_swap<'c: 'info, 'info>(
             found_end = true;
 
             // must be the SwapEnd instruction
-            let discriminator = crate::instruction::EndLpSwap::discriminator();
+            let discriminator = crate::instruction::EndLpSwap::DISCRIMINATOR;
             validate!(
-                ix.data[0..8] == discriminator,
+                &ix.data[0..8] == discriminator,
                 ErrorCode::InvalidSwap,
                 "last drift ix must be end of swap"
             )?;

programs/drift/src/instructions/lp_admin.rs

@@ -134,9 +134,8 @@ pub fn get_referrer_and_referrer_stats<'a>(
         return Ok((None, None));
     }
 
-    let user_discriminator: [u8; 8] = User::discriminator();
-    let account_discriminator = array_ref![data, 0, 8];
-    if account_discriminator != &user_discriminator {
+    let account_discriminator = &data[..8];
+    if account_discriminator != User::DISCRIMINATOR {
         return Ok((None, None));
     }
 
@@ -165,9 +164,8 @@ pub fn get_referrer_and_referrer_stats<'a>(
         return Ok((None, None));
     }
 
-    let user_stats_discriminator: [u8; 8] = UserStats::discriminator();
-    let account_discriminator = array_ref![data, 0, 8];
-    if account_discriminator != &user_stats_discriminator {
+    let account_discriminator = &data[..8];
+    if account_discriminator != UserStats::DISCRIMINATOR {
         return Ok((None, None));
     }
 
@@ -262,9 +260,8 @@ pub fn get_high_leverage_mode_config<'a>(
         return Ok(None);
     }
 
-    let high_leverage_mode_config_discriminator: [u8; 8] = HighLeverageModeConfig::discriminator();
-    let account_discriminator = array_ref![data, 0, 8];
-    if account_discriminator != &high_leverage_mode_config_discriminator {
+    let account_discriminator = &data[..8];
+    if account_discriminator != HighLeverageModeConfig::DISCRIMINATOR {
         return Ok(None);
     }
 
@@ -293,10 +290,9 @@ pub fn get_revenue_share_escrow_account<'a>(
         return Ok(None);
     }
 
-    let discriminator: [u8; 8] = RevenueShareEscrow::discriminator();
     let borrowed_data = account_info.data.borrow();
     let account_discriminator = array_ref![&borrowed_data, 0, 8];
-    if account_discriminator != &discriminator {
+    if account_discriminator != RevenueShareEscrow::DISCRIMINATOR {
         return Ok(None);
     }
 

programs/drift/src/instructions/optional_accounts.rs

@@ -3606,9 +3606,9 @@ pub fn handle_begin_swap<'c: 'info, 'info>(
             found_end = true;
 
             // must be the SwapEnd instruction
-            let discriminator = crate::instruction::EndSwap::discriminator();
+            let discriminator = crate::instruction::EndSwap::DISCRIMINATOR;
             validate!(
-                ix.data[0..8] == discriminator,
+                &ix.data[0..8] == discriminator,
                 ErrorCode::InvalidSwap,
                 "last drift ix must be end of swap"
             )?;

programs/drift/src/instructions/user.rs

@@ -89,32 +89,16 @@ macro_rules! safe_decrement {
     }};
 }
 
-/// Calculate the sha256 digest of anchor encoded `struct`
-#[macro_export]
-macro_rules! digest_struct {
-    ($struct:expr) => {
-        solana_program::hash::hash(&$struct.try_to_vec().unwrap()).to_bytes()
-    };
-}
-
-/// Calculate the hexified sha256 digest of anchor encoded `struct`
-#[macro_export]
-macro_rules! digest_struct_hex {
-    ($struct:expr) => {{
-        hex::encode(digest_struct!($struct)).into_bytes()
-    }};
-}
-
 /// same as `solana_program::msg!` but it can compile away for off-chain use
 #[macro_export]
 macro_rules! msg {
     ($msg:expr) => {
         #[cfg(not(feature = "drift-rs"))]
-        solana_program::msg!($msg)
+        ::solana_program::msg!($msg)
     };
     ($($arg:tt)*) => {
         #[cfg(not(feature = "drift-rs"))]
-        (solana_program::msg!(&format!($($arg)*)));
+        (::solana_program::msg!(&format!($($arg)*)));
     }
 }
 

programs/drift/src/macros.rs

@@ -574,14 +574,13 @@ mod calculate_cumulative_deposit_interest_delta_to_resolve_bankruptcy {
 }
 
 mod validate_transfer_satisfies_limit_price {
-    use crate::math::constants::{PRICE_PRECISION_U64, QUOTE_PRECISION};
+    use crate::math::constants::{LAMPORTS_PER_SOL_U64, PRICE_PRECISION_U64, QUOTE_PRECISION};
     use crate::math::liquidation::validate_transfer_satisfies_limit_price;
-    use anchor_lang::solana_program::native_token::LAMPORTS_PER_SOL;
 
     #[test]
     fn sol_asset_usdc_liability() {
         let limit_price = PRICE_PRECISION_U64 / 100; // 1 SOL / $100 USD
-        let asset = LAMPORTS_PER_SOL as u128;
+        let asset = LAMPORTS_PER_SOL_U64 as u128;
         let asset_decimals = 9_u32;
         let liability = 100 * QUOTE_PRECISION;
         let liability_decimals = 6_u32;

programs/drift/src/math/liquidation/tests.rs

@@ -462,7 +462,6 @@ mod get_max_fill_amounts {
     use crate::state::user::{Order, SpotPosition, User};
     use crate::test_utils::get_orders;
     use crate::LAMPORTS_PER_SOL_U64;
-    use anchor_spl::token::spl_token::solana_program::native_token::LAMPORTS_PER_SOL;
 
     #[test]
     fn fully_collateralized_selling_base() {
@@ -493,7 +492,7 @@ mod get_max_fill_amounts {
             spot_positions,
             orders: get_orders(Order {
                 direction: PositionDirection::Short,
-                base_asset_amount: 100 * LAMPORTS_PER_SOL,
+                base_asset_amount: 100 * LAMPORTS_PER_SOL_U64,
                 ..Order::default()
             }),
             ..User::default()
@@ -531,7 +530,7 @@ mod get_max_fill_amounts {
             spot_positions,
             orders: get_orders(Order {
                 direction: PositionDirection::Short,
-                base_asset_amount: 100 * LAMPORTS_PER_SOL,
+                base_asset_amount: 100 * LAMPORTS_PER_SOL_U64,
                 ..Order::default()
             }),
             ..User::default()
@@ -572,7 +571,7 @@ mod get_max_fill_amounts {
             spot_positions,
             orders: get_orders(Order {
                 direction: PositionDirection::Short,
-                base_asset_amount: 100 * LAMPORTS_PER_SOL,
+                base_asset_amount: 100 * LAMPORTS_PER_SOL_U64,
                 ..Order::default()
             }),
             ..User::default()
@@ -614,7 +613,7 @@ mod get_max_fill_amounts {
             spot_positions,
             orders: get_orders(Order {
                 direction: PositionDirection::Long,
-                base_asset_amount: 100 * LAMPORTS_PER_SOL,
+                base_asset_amount: 100 * LAMPORTS_PER_SOL_U64,
                 ..Order::default()
             }),
             ..User::default()
@@ -652,7 +651,7 @@ mod get_max_fill_amounts {
             spot_positions,
             orders: get_orders(Order {
                 direction: PositionDirection::Long,
-                base_asset_amount: 100 * LAMPORTS_PER_SOL,
+                base_asset_amount: 100 * LAMPORTS_PER_SOL_U64,
                 ..Order::default()
             }),
             ..User::default()
@@ -694,7 +693,7 @@ mod get_max_fill_amounts {
             spot_positions,
             orders: get_orders(Order {
                 direction: PositionDirection::Long,
-                base_asset_amount: 100 * LAMPORTS_PER_SOL,
+                base_asset_amount: 100 * LAMPORTS_PER_SOL_U64,
                 ..Order::default()
             }),
             ..User::default()