Revert recent builder codes chain and merge (#1848)

* Revert recent builder codes chain and merge

* update driftclient

* disable extra instructions, fix builder code feature flag selection

Author: wphan

programs/drift/Cargo.toml

@@ -20,7 +20,7 @@ drift-rs=[]
 [dependencies]
 anchor-lang = "0.29.0"
 solana-program = "1.16"
-anchor-spl = { version = "0.29.0", features = [] }
+anchor-spl = "0.29.0"
 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 = "3e8a24ecd0bcf22b787313e2020f4186bb22c729"}

programs/drift/src/controller/position/tests.rs

@@ -1203,7 +1203,7 @@ fn amm_perp_ref_offset() {
         max_ref_offset,
     )
     .unwrap();
-    assert_eq!(res, 45000);
+    assert_eq!(res, (perp_market.amm.max_spread / 2) as i32);
     assert_eq!(perp_market.amm.reference_price_offset, 18000); // not updated vs market account
 
     let now = 1741207620 + 1;
@@ -1281,15 +1281,21 @@ fn amm_perp_ref_offset() {
     // Uses the original oracle if the slot is old, ignoring MM oracle
     perp_market.amm.mm_oracle_price = mm_oracle_price_data.get_price() * 995 / 1000;
     perp_market.amm.mm_oracle_slot = clock_slot - 100;
-    let mm_oracle_price = perp_market
+    let mut mm_oracle_price = perp_market
         .get_mm_oracle_price_data(
             oracle_price_data,
             clock_slot,
             &state.oracle_guard_rails.validity,
         )
         .unwrap();
 
-    let _ = _update_amm(&mut perp_market, &mm_oracle_price, &state, now, clock_slot);
+    let _ = _update_amm(
+        &mut perp_market,
+        &mut mm_oracle_price,
+        &state,
+        now,
+        clock_slot,
+    );
     let reserve_price_mm_offset_3 = perp_market.amm.reserve_price().unwrap();
     let (b3, a3) = perp_market
         .amm
@@ -1724,7 +1730,7 @@ fn amm_split_large_k_with_rebase() {
         delay: 14,
         has_sufficient_number_of_data_points: true,
     };
-    let mm_oracle_price_data = perp_market
+    let mut mm_oracle_price = perp_market
         .get_mm_oracle_price_data(
             oracle_price_data,
             clock_slot,
@@ -1734,7 +1740,7 @@ fn amm_split_large_k_with_rebase() {
 
     let cost = _update_amm(
         &mut perp_market,
-        &mm_oracle_price_data,
+        &mut mm_oracle_price,
         &state,
         now,
         clock_slot,

programs/drift/src/controller/spot_balance.rs

@@ -250,12 +250,10 @@ pub fn update_spot_balances(
         }
 
         if token_amount > 0 {
-            msg!("token amount to transfer: {}", token_amount);
             spot_balance.update_balance_type(*update_direction)?;
             let round_up = update_direction == &SpotBalanceType::Borrow;
             let balance_delta =
                 get_spot_balance(token_amount, spot_market, update_direction, round_up)?;
-            msg!("balance delta {}", balance_delta);
             spot_balance.increase_balance(balance_delta)?;
             increase_spot_balance(balance_delta, spot_market, update_direction)?;
         }

programs/drift/src/controller/token.rs

@@ -9,7 +9,7 @@ use anchor_spl::token_2022::spl_token_2022::extension::{
 };
 use anchor_spl::token_2022::spl_token_2022::state::Mint as MintInner;
 use anchor_spl::token_interface::{
-    self, Burn, CloseAccount, Mint, MintTo, TokenAccount, TokenInterface, Transfer, TransferChecked,
+    self, CloseAccount, Mint, TokenAccount, TokenInterface, Transfer, TransferChecked,
 };
 use std::iter::Peekable;
 use std::slice::Iter;
@@ -137,58 +137,6 @@ pub fn close_vault<'info>(
     token_interface::close_account(cpi_context)
 }
 
-pub fn mint_tokens<'info>(
-    token_program: &Interface<'info, TokenInterface>,
-    destination: &InterfaceAccount<'info, TokenAccount>,
-    authority: &AccountInfo<'info>,
-    nonce: u8,
-    amount: u64,
-    mint: &InterfaceAccount<'info, Mint>,
-) -> Result<()> {
-    let signature_seeds = get_signer_seeds(&nonce);
-    let signers = &[&signature_seeds[..]];
-
-    let mint_account_info = mint.to_account_info();
-
-    validate_mint_fee(&mint_account_info)?;
-
-    let cpi_accounts = MintTo {
-        mint: mint_account_info,
-        to: destination.to_account_info(),
-        authority: authority.to_account_info(),
-    };
-
-    let cpi_program = token_program.to_account_info();
-    let cpi_context = CpiContext::new_with_signer(cpi_program, cpi_accounts, signers);
-    token_interface::mint_to(cpi_context, amount)
-}
-
-pub fn burn_tokens<'info>(
-    token_program: &Interface<'info, TokenInterface>,
-    destination: &InterfaceAccount<'info, TokenAccount>,
-    authority: &AccountInfo<'info>,
-    nonce: u8,
-    amount: u64,
-    mint: &InterfaceAccount<'info, Mint>,
-) -> Result<()> {
-    let signature_seeds = get_signer_seeds(&nonce);
-    let signers = &[&signature_seeds[..]];
-
-    let mint_account_info = mint.to_account_info();
-
-    validate_mint_fee(&mint_account_info)?;
-
-    let cpi_accounts = Burn {
-        mint: mint_account_info,
-        from: destination.to_account_info(),
-        authority: authority.to_account_info(),
-    };
-
-    let cpi_program = token_program.to_account_info();
-    let cpi_context = CpiContext::new_with_signer(cpi_program, cpi_accounts, signers);
-    token_interface::burn(cpi_context, amount)
-}
-
 pub fn validate_mint_fee(account_info: &AccountInfo) -> Result<()> {
     let mint_data = account_info.try_borrow_data()?;
     let mint_with_extension = StateWithExtensions::<MintInner>::unpack(&mint_data)?;

programs/drift/src/error.rs

@@ -1,4 +1,5 @@
 use anchor_lang::prelude::*;
+
 pub type DriftResult<T = ()> = std::result::Result<T, ErrorCode>;
 
 #[error_code]
@@ -656,40 +657,6 @@ pub enum ErrorCode {
     UnableToLoadRevenueShareAccount,
     #[msg("RevenueShare order not found")]
     RevenueShareOrderNotFound,
-    #[msg("Invalid Constituent")]
-    InvalidConstituent,
-    #[msg("Invalid Amm Constituent Mapping argument")]
-    InvalidAmmConstituentMappingArgument,
-    #[msg("Invalid update constituent update target weights argument")]
-    InvalidUpdateConstituentTargetBaseArgument,
-    #[msg("Constituent not found")]
-    ConstituentNotFound,
-    #[msg("Constituent could not load")]
-    ConstituentCouldNotLoad,
-    #[msg("Constituent wrong mutability")]
-    ConstituentWrongMutability,
-    #[msg("Wrong number of constituents passed to instruction")]
-    WrongNumberOfConstituents,
-    #[msg("Oracle too stale for LP AUM update")]
-    OracleTooStaleForLPAUMUpdate,
-    #[msg("Insufficient constituent token balance")]
-    InsufficientConstituentTokenBalance,
-    #[msg("Amm Cache data too stale")]
-    AMMCacheStale,
-    #[msg("LP Pool AUM not updated recently")]
-    LpPoolAumDelayed,
-    #[msg("Constituent oracle is stale")]
-    ConstituentOracleStale,
-    #[msg("LP Invariant failed")]
-    LpInvariantFailed,
-    #[msg("Invalid constituent derivative weights")]
-    InvalidConstituentDerivativeWeights,
-    #[msg("Unauthorized dlp authority")]
-    UnauthorizedDlpAuthority,
-    #[msg("Max DLP AUM Breached")]
-    MaxDlpAumBreached,
-    #[msg("Settle Lp Pool Disabled")]
-    SettleLpPoolDisabled,
 }
 
 #[macro_export]

programs/drift/src/ids.rs

@@ -1,6 +1,3 @@
-use anchor_lang::prelude::Pubkey;
-use solana_program::pubkey;
-
 pub mod pyth_program {
     use solana_program::declare_id;
     #[cfg(feature = "mainnet-beta")]
@@ -91,11 +88,6 @@ pub mod lighthouse {
     declare_id!("L2TExMFKdjpN9kozasaurPirfHy9P8sbXoAN1qA3S95");
 }
 
-pub mod usdc_mint {
-    use solana_program::declare_id;
-    declare_id!("BJE5MMbqXjVwjAF7oxwPYXnTXDyspzZyt4vwenNw5ruG");
-}
-
 pub mod mm_oracle_crank_wallet {
     use solana_program::declare_id;
     #[cfg(not(feature = "anchor-test"))]
@@ -115,11 +107,3 @@ pub mod amm_spread_adjust_wallet {
     #[cfg(feature = "anchor-test")]
     declare_id!("1ucYHAGrBbi1PaecC4Ptq5ocZLWGLBmbGWysoDGNB1N");
 }
-
-#[cfg(not(feature = "mainnet-beta"))]
-pub const DLP_WHITELIST: [Pubkey; 2] = [
-    pubkey!("4rmhwytmKH1XsgGAUyUUH7U64HS5FtT6gM8HGKAfwcFE"),
-    pubkey!("1ucYHAGrBbi1PaecC4Ptq5ocZLWGLBmbGWysoDGNB1N"),
-];
-#[cfg(feature = "mainnet-beta")]
-pub const DLP_WHITELIST: [Pubkey; 1] = [pubkey!("1ucYHAGrBbi1PaecC4Ptq5ocZLWGLBmbGWysoDGNB1N")];