Merge remote-tracking branch 'origin/dlp' into devnet

Author: wphan

CHANGELOG.md

@@ -74,16 +74,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Breaking
 
-## [2.135.0] - 2025-08-22
-
-### Features
-
-### Fixes
-
-- program: trigger price use 5min mark price ([#1830](https://github.com/drift-labs/protocol-v2/pull/1830))
-
-### Breaking
-
 ## [2.134.0] - 2025-08-13
 
 ### Features

programs/drift/Cargo.toml

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

@@ -1177,7 +1177,7 @@ fn amm_perp_ref_offset() {
         max_ref_offset,
     )
     .unwrap();
-    assert_eq!(res, (perp_market.amm.max_spread / 2) as i32);
+    assert_eq!(res, 45000);
     assert_eq!(perp_market.amm.reference_price_offset, 18000); // not updated vs market account
 
     let now = 1741207620 + 1;
@@ -1256,21 +1256,15 @@ 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 mut mm_oracle_price = perp_market
+    let 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,
-        &mut mm_oracle_price,
-        &state,
-        now,
-        clock_slot,
-    );
+    let _ = _update_amm(&mut perp_market, &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

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, CloseAccount, Mint, TokenAccount, TokenInterface, Transfer, TransferChecked,
+    self, Burn, CloseAccount, Mint, MintTo, TokenAccount, TokenInterface, Transfer, TransferChecked,
 };
 use std::iter::Peekable;
 use std::slice::Iter;
@@ -25,7 +25,31 @@ pub fn send_from_program_vault<'info>(
     remaining_accounts: Option<&mut Peekable<Iter<'info, AccountInfo<'info>>>>,
 ) -> Result<()> {
     let signature_seeds = get_signer_seeds(&nonce);
-    let signers = &[&signature_seeds[..]];
+
+    send_from_program_vault_with_signature_seeds(
+        token_program,
+        from,
+        to,
+        authority,
+        &signature_seeds,
+        amount,
+        mint,
+        remaining_accounts,
+    )
+}
+
+#[inline]
+pub fn send_from_program_vault_with_signature_seeds<'info>(
+    token_program: &Interface<'info, TokenInterface>,
+    from: &InterfaceAccount<'info, TokenAccount>,
+    to: &InterfaceAccount<'info, TokenAccount>,
+    authority: &AccountInfo<'info>,
+    signature_seeds: &[&[u8]],
+    amount: u64,
+    mint: &Option<InterfaceAccount<'info, Mint>>,
+    remaining_accounts: Option<&mut Peekable<Iter<'info, AccountInfo<'info>>>>,
+) -> Result<()> {
+    let signers = &[signature_seeds];
 
     if let Some(mint) = mint {
         if let Some(remaining_accounts) = remaining_accounts {
@@ -137,6 +161,56 @@ 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>,
+    signature_seeds: &[&[u8]],
+    amount: u64,
+    mint: &InterfaceAccount<'info, Mint>,
+) -> Result<()> {
+    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>,
+    signature_seeds: &[&[u8]],
+    amount: u64,
+    mint: &InterfaceAccount<'info, Mint>,
+) -> Result<()> {
+    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,5 +1,4 @@
 use anchor_lang::prelude::*;
-
 pub type DriftResult<T = ()> = std::result::Result<T, ErrorCode>;
 
 #[error_code]
@@ -655,6 +654,48 @@ pub enum ErrorCode {
     CannotRevokeBuilderWithOpenOrders,
     #[msg("Unable to load builder account")]
     UnableToLoadRevenueShareAccount,
+    #[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,
+    #[msg("Mint/Redeem Lp Pool Disabled")]
+    MintRedeemLpPoolDisabled,
+    #[msg("Settlement amount exceeded")]
+    LpPoolSettleInvariantBreached,
+    #[msg("Invalid constituent operation")]
+    InvalidConstituentOperation,
+    #[msg("Unauthorized for operation")]
+    Unauthorized,
 }
 
 #[macro_export]

programs/drift/src/ids.rs

@@ -1,3 +1,6 @@
+use anchor_lang::prelude::Pubkey;
+use solana_program::pubkey;
+
 pub mod pyth_program {
     use solana_program::declare_id;
     #[cfg(feature = "mainnet-beta")]
@@ -107,3 +110,8 @@ pub mod amm_spread_adjust_wallet {
     #[cfg(feature = "anchor-test")]
     declare_id!("1ucYHAGrBbi1PaecC4Ptq5ocZLWGLBmbGWysoDGNB1N");
 }
+
+pub mod lp_pool_swap_wallet {
+    use solana_program::declare_id;
+    declare_id!("25qbsE2oWri76c9a86ubn17NKKdo6Am4HXD2Jm8vT8K4");
+}