merge dlp

Author: moosecat2

programs/drift/src/error.rs

@@ -692,6 +692,8 @@ pub enum ErrorCode {
     Unauthorized,
     #[msg("Invalid Isolated Perp Market")]
     InvalidIsolatedPerpMarket,
+    #[msg("Invalid Lp Pool Id for Operation")]
+    InvalidLpPoolId,
 }
 
 #[macro_export]

programs/drift/src/instructions/admin.rs

@@ -714,6 +714,7 @@ pub fn handle_initialize_perp_market(
     curve_update_intensity: u8,
     amm_jit_intensity: u8,
     name: [u8; 32],
+    lp_pool_id: u8,
 ) -> Result<()> {
     msg!("perp market {}", market_index);
     let perp_market_pubkey = ctx.accounts.perp_market.to_account_info().key;
@@ -1001,7 +1002,8 @@ pub fn handle_initialize_perp_market(
         lp_exchange_fee_excluscion_scalar: 0,
         lp_paused_operations: 0,
         last_fill_price: 0,
-        padding: [0; 24],
+        lp_pool_id,
+        padding: [0; 23],
         amm: AMM {
             oracle: *ctx.accounts.oracle.key,
             oracle_source,
@@ -2829,6 +2831,25 @@ pub fn handle_update_perp_liquidation_fee(
     Ok(())
 }
 
+#[access_control(
+    perp_market_valid(&ctx.accounts.perp_market)
+)]
+pub fn handle_update_perp_lp_pool_id(
+    ctx: Context<AdminUpdatePerpMarket>,
+    lp_pool_id: u8,
+) -> Result<()> {
+    let perp_market = &mut load_mut!(ctx.accounts.perp_market)?;
+
+    msg!(
+        "updating perp market {} lp pool id: {} -> {}",
+        perp_market.market_index,
+        perp_market.lp_pool_id,
+        lp_pool_id
+    );
+    perp_market.lp_pool_id = lp_pool_id;
+    Ok(())
+}
+
 #[access_control(
     spot_market_valid(&ctx.accounts.spot_market)
 )]

programs/drift/src/instructions/keeper.rs

@@ -3409,6 +3409,16 @@ pub fn handle_settle_perp_to_lp_pool<'c: 'info, 'info>(
 
     for (_, perp_market_loader) in perp_market_map.0.iter() {
         let mut perp_market = perp_market_loader.load_mut()?;
+        if lp_pool.lp_pool_id != perp_market.lp_pool_id {
+            msg!(
+                "Perp market {} does not have the same lp pool id as the lp pool being settled to: {} != {}",
+                perp_market.market_index,
+                perp_market.lp_pool_id,
+                lp_pool.lp_pool_id
+            );
+            return Err(ErrorCode::InvalidLpPoolId.into());
+        }
+
         if perp_market.lp_status == 0
             || PerpLpOperation::is_operation_paused(
                 perp_market.lp_paused_operations,

programs/drift/src/instructions/lp_admin.rs

@@ -36,7 +36,7 @@ use super::optional_accounts::get_token_interface;
 
 pub fn handle_initialize_lp_pool(
     ctx: Context<InitializeLpPool>,
-    name: [u8; 32],
+    lp_pool_id: u8,
     min_mint_fee: i64,
     max_aum: u128,
     max_settle_quote_amount_per_market: u64,
@@ -59,7 +59,6 @@ pub fn handle_initialize_lp_pool(
     )?;
 
     *lp_pool = LPPool {
-        name,
         pubkey: ctx.accounts.lp_pool.key(),
         mint: mint.key(),
         constituent_target_base: ctx.accounts.constituent_target_base.key(),
@@ -84,7 +83,8 @@ pub fn handle_initialize_lp_pool(
         xi: 2,
         target_oracle_delay_fee_bps_per_10_slots: 0,
         target_position_delay_fee_bps_per_10_slots: 0,
-        padding: [0u8; 15],
+        lp_pool_id,
+        padding: [0u8; 14],
         whitelist_mint,
     };
 
@@ -598,11 +598,14 @@ pub fn handle_begin_lp_swap<'c: 'info, 'info>(
     // Check admin
     let admin = &ctx.accounts.admin;
     #[cfg(feature = "anchor-test")]
-    validate!(
-        admin.key() == admin_hot_wallet::id() || admin.key() == ctx.accounts.state.key(),
-        ErrorCode::Unauthorized,
-        "Wrong signer for lp taker swap"
-    )?;
+    {
+        let state = &ctx.accounts.state;
+        validate!(
+            admin.key() == admin_hot_wallet::id() || admin.key() == state.admin,
+            ErrorCode::Unauthorized,
+            "Wrong signer for lp taker swap"
+        )?;
+    }
     #[cfg(not(feature = "anchor-test"))]
     validate!(
         admin.key() == lp_pool_swap_wallet::id(),
@@ -1008,14 +1011,14 @@ pub fn handle_override_amm_cache_info<'c: 'info, 'info>(
 
 #[derive(Accounts)]
 #[instruction(
-    name: [u8; 32],
+    id: u8,
 )]
 pub struct InitializeLpPool<'info> {
     #[account(mut)]
     pub admin: Signer<'info>,
     #[account(
         init,
-        seeds = [b"lp_pool", name.as_ref()],
+        seeds = [b"lp_pool", id.to_le_bytes().as_ref()],
         space = LPPool::SIZE,
         bump,
         payer = admin

programs/drift/src/instructions/lp_pool.rs

@@ -775,10 +775,10 @@ pub fn handle_lp_pool_add_liquidity<'c: 'info, 'info>(
     in_constituent.record_swap_fees(in_fee_amount)?;
     lp_pool.record_mint_redeem_fees(lp_fee_amount)?;
 
-    let lp_name = lp_pool.name;
+    let lp_pool_id = lp_pool.lp_pool_id;
     let lp_bump = lp_pool.bump;
 
-    let lp_vault_signer_seeds = LPPool::get_lp_pool_signer_seeds(&lp_name, &lp_bump);
+    let lp_vault_signer_seeds = LPPool::get_lp_pool_signer_seeds(&lp_pool_id, &lp_bump);
 
     drop(lp_pool);
 
@@ -1173,10 +1173,10 @@ pub fn handle_lp_pool_remove_liquidity<'c: 'info, 'info>(
     out_constituent.record_swap_fees(out_fee_amount)?;
     lp_pool.record_mint_redeem_fees(lp_fee_amount)?;
 
-    let lp_name = lp_pool.name;
+    let lp_pool_id = lp_pool.lp_pool_id;
     let lp_bump = lp_pool.bump;
 
-    let lp_vault_signer_seeds = LPPool::get_lp_pool_signer_seeds(&lp_name, &lp_bump);
+    let lp_vault_signer_seeds = LPPool::get_lp_pool_signer_seeds(&lp_pool_id, &lp_bump);
 
     drop(lp_pool);
 

programs/drift/src/lib.rs

@@ -1023,6 +1023,7 @@ pub mod drift {
         curve_update_intensity: u8,
         amm_jit_intensity: u8,
         name: [u8; 32],
+        lp_pool_id: u8,
     ) -> Result<()> {
         handle_initialize_perp_market(
             ctx,
@@ -1051,6 +1052,7 @@ pub mod drift {
             curve_update_intensity,
             amm_jit_intensity,
             name,
+            lp_pool_id,
         )
     }
 
@@ -1242,6 +1244,13 @@ pub mod drift {
         handle_update_perp_liquidation_fee(ctx, liquidator_fee, if_liquidation_fee)
     }
 
+    pub fn update_perp_market_lp_pool_id(
+        ctx: Context<AdminUpdatePerpMarket>,
+        lp_pool_id: u8,
+    ) -> Result<()> {
+        handle_update_perp_lp_pool_id(ctx, lp_pool_id)
+    }
+
     pub fn update_insurance_fund_unstaking_period(
         ctx: Context<AdminUpdateSpotMarket>,
         insurance_fund_unstaking_period: i64,
@@ -1837,15 +1846,15 @@ pub mod drift {
 
     pub fn initialize_lp_pool(
         ctx: Context<InitializeLpPool>,
-        name: [u8; 32],
+        lp_pool_id: u8,
         min_mint_fee: i64,
         max_aum: u128,
         max_settle_quote_amount_per_market: u64,
         whitelist_mint: Pubkey,
     ) -> Result<()> {
         handle_initialize_lp_pool(
             ctx,
-            name,
+            lp_pool_id,
             min_mint_fee,
             max_aum,
             max_settle_quote_amount_per_market,

programs/drift/src/state/lp_pool.rs

@@ -64,8 +64,6 @@ mod tests;
 #[derive(Default, Debug)]
 #[repr(C)]
 pub struct LPPool {
-    /// name of vault, TODO: check type + size
-    pub name: [u8; 32],
     /// address of the vault.
     pub pubkey: Pubkey,
     // vault token mint
@@ -128,11 +126,13 @@ pub struct LPPool {
     pub target_oracle_delay_fee_bps_per_10_slots: u8,
     pub target_position_delay_fee_bps_per_10_slots: u8,
 
-    pub padding: [u8; 15],
+    pub lp_pool_id: u8,
+
+    pub padding: [u8; 14],
 }
 
 impl Size for LPPool {
-    const SIZE: usize = 376;
+    const SIZE: usize = 344;
 }
 
 impl LPPool {
@@ -805,8 +805,12 @@ impl LPPool {
         Ok((aum_u128, crypto_delta, derivative_groups))
     }
 
-    pub fn get_lp_pool_signer_seeds<'a>(name: &'a [u8; 32], bump: &'a u8) -> [&'a [u8]; 3] {
-        [LP_POOL_PDA_SEED.as_ref(), name, bytemuck::bytes_of(bump)]
+    pub fn get_lp_pool_signer_seeds<'a>(lp_pool_id: &'a u8, bump: &'a u8) -> [&'a [u8]; 3] {
+        [
+            LP_POOL_PDA_SEED.as_ref(),
+            bytemuck::bytes_of(lp_pool_id),
+            bytemuck::bytes_of(bump),
+        ]
     }
 }
 

programs/drift/src/state/perp_market.rs

@@ -251,7 +251,8 @@ pub struct PerpMarket {
     pub lp_paused_operations: u8,
     pub lp_exchange_fee_excluscion_scalar: u8,
     pub last_fill_price: u64,
-    pub padding: [u8; 24],
+    pub lp_pool_id: u8,
+    pub padding: [u8; 23],
 }
 
 impl Default for PerpMarket {
@@ -298,7 +299,8 @@ impl Default for PerpMarket {
             lp_exchange_fee_excluscion_scalar: 0,
             lp_paused_operations: 0,
             last_fill_price: 0,
-            padding: [0; 24],
+            lp_pool_id: 0,
+            padding: [0; 23],
         }
     }
 }

sdk/src/addresses/pda.ts

@@ -427,12 +427,12 @@ export function getRevenueShareEscrowAccountPublicKey(
 
 export function getLpPoolPublicKey(
 	programId: PublicKey,
-	nameBuffer: number[]
+	lpPoolId: number
 ): PublicKey {
 	return PublicKey.findProgramAddressSync(
 		[
 			Buffer.from(anchor.utils.bytes.utf8.encode('lp_pool')),
-			Buffer.from(nameBuffer),
+			new anchor.BN(lpPoolId).toArrayLike(Buffer, 'le', 1),
 		],
 		programId
 	)[0];