update dlp types to include lp pool key

Author: moosecat2

.devcontainer/Dockerfile

@@ -19,6 +19,12 @@ RUN mkdir -p /workdir /tmp && \
       libssl-dev libudev-dev bash && \
     rm -rf /var/lib/apt/lists/*
 
+RUN apt-get install -y software-properties-common \
+  && add-apt-repository 'deb http://deb.debian.org/debian bookworm main' \
+  && apt-get update && apt-get install -y libc6 libc6-dev
+
+RUN rustup component add rustfmt
+
 RUN rustup install 1.78.0 \
   && rustup component add rustfmt clippy --toolchain 1.78.0
 

package.json

@@ -94,5 +94,6 @@
 		"chalk-template": "<1.1.1",
 		"supports-hyperlinks": "<4.1.1",
 		"has-ansi": "<6.0.1"
-	}
-}
+	},
+	"packageManager": "[email protected]+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
+}

programs/drift/src/instructions/keeper.rs

@@ -3333,6 +3333,7 @@ pub fn handle_settle_perp_to_lp_pool<'c: 'info, 'info>(
         ctx.accounts.amm_cache.load_zc_mut()?;
     let quote_market = &mut ctx.accounts.quote_market.load_mut()?;
     let mut quote_constituent = ctx.accounts.constituent.load_mut()?;
+    let lp_pool_key = ctx.accounts.lp_pool.key();
     let mut lp_pool = ctx.accounts.lp_pool.load_mut()?;
 
     let remaining_accounts_iter = &mut ctx.remaining_accounts.iter().peekable();
@@ -3486,6 +3487,7 @@ pub fn handle_settle_perp_to_lp_pool<'c: 'info, 'info>(
                 .cast::<i64>()?,
             lp_aum: lp_pool.last_aum,
             lp_price: lp_pool.get_price(lp_pool.token_supply)?,
+            lp_pool: lp_pool_key,
         });
 
         // Calculate new quote owed amount

programs/drift/src/instructions/lp_pool.rs

@@ -483,6 +483,7 @@ pub fn handle_lp_pool_swap<'c: 'info, 'info>(
         out_market_target_weight: out_target_weight,
         in_swap_id,
         out_swap_id,
+        lp_pool: lp_pool_key,
     })?;
 
     receive(
@@ -848,6 +849,7 @@ pub fn handle_lp_pool_add_liquidity<'c: 'info, 'info>(
             lp_pool.last_aum,
         )?,
         in_market_target_weight: in_target_weight,
+        lp_pool: lp_pool_key,
     })?;
 
     Ok(())
@@ -1230,6 +1232,7 @@ pub fn handle_lp_pool_remove_liquidity<'c: 'info, 'info>(
             lp_pool.last_aum,
         )?,
         in_market_target_weight: out_target_weight,
+        lp_pool: lp_pool_key,
     })?;
 
     Ok(())
@@ -1371,6 +1374,7 @@ pub fn handle_deposit_to_program_vault<'c: 'info, 'info>(
     let remaining_accounts = &mut ctx.remaining_accounts.iter().peekable();
 
     let mut constituent = ctx.accounts.constituent.load_mut()?;
+    let lp_pool_key = constituent.lp_pool;
 
     if amount == 0 {
         return Err(ErrorCode::InsufficientDeposit.into());
@@ -1478,6 +1482,7 @@ pub fn handle_deposit_to_program_vault<'c: 'info, 'info>(
         last_token_balance: constituent.last_spot_balance_token_amount,
         interest_accrued_token_amount,
         amount_deposit_withdraw: amount,
+        lp_pool: lp_pool_key,
     });
     constituent.last_spot_balance_token_amount = new_token_balance;
     constituent.cumulative_spot_interest_accrued_token_amount = constituent
@@ -1561,6 +1566,7 @@ pub fn handle_withdraw_from_program_vault<'c: 'info, 'info>(
         last_token_balance: constituent.last_spot_balance_token_amount,
         interest_accrued_token_amount,
         amount_deposit_withdraw: amount,
+        lp_pool: constituent.lp_pool,
     });
     constituent.last_spot_balance_token_amount = new_token_balance;
     constituent.cumulative_spot_interest_accrued_token_amount = constituent

programs/drift/src/state/events.rs

@@ -789,6 +789,8 @@ pub struct LPSettleRecord {
     pub lp_aum: u128,
     // current mint price of lp
     pub lp_price: u128,
+    // lp pool pubkey
+    pub lp_pool: Pubkey,
 }
 
 #[event]
@@ -830,10 +832,12 @@ pub struct LPSwapRecord {
     pub out_market_target_weight: i64,
     pub in_swap_id: u64,
     pub out_swap_id: u64,
+    // lp pool pubkey
+    pub lp_pool: Pubkey,
 }
 
 impl Size for LPSwapRecord {
-    const SIZE: usize = 376;
+    const SIZE: usize = 408;
 }
 
 #[event]
@@ -868,10 +872,12 @@ pub struct LPMintRedeemRecord {
     /// PERCENTAGE_PRECISION
     pub in_market_current_weight: i64,
     pub in_market_target_weight: i64,
+    // lp pool pubkey
+    pub lp_pool: Pubkey,
 }
 
 impl Size for LPMintRedeemRecord {
-    const SIZE: usize = 328;
+    const SIZE: usize = 360;
 }
 
 #[event]
@@ -886,8 +892,9 @@ pub struct LPBorrowLendDepositRecord {
     pub last_token_balance: i64,
     pub interest_accrued_token_amount: i64,
     pub amount_deposit_withdraw: u64,
+    pub lp_pool: Pubkey,
 }
 
 impl Size for LPBorrowLendDepositRecord {
-    const SIZE: usize = 72;
+    const SIZE: usize = 104;
 }

sdk/src/idl/drift.json

@@ -17672,6 +17672,11 @@
           "name": "lpPrice",
           "type": "u128",
           "index": false
+        },
+        {
+          "name": "lpPool",
+          "type": "publicKey",
+          "index": false
         }
       ]
     },
@@ -17782,6 +17787,11 @@
           "name": "outSwapId",
           "type": "u64",
           "index": false
+        },
+        {
+          "name": "lpPool",
+          "type": "publicKey",
+          "index": false
         }
       ]
     },
@@ -17877,6 +17887,11 @@
           "name": "inMarketTargetWeight",
           "type": "i64",
           "index": false
+        },
+        {
+          "name": "lpPool",
+          "type": "publicKey",
+          "index": false
         }
       ]
     },
@@ -17929,6 +17944,11 @@
           "name": "amountDepositWithdraw",
           "type": "u64",
           "index": false
+        },
+        {
+          "name": "lpPool",
+          "type": "publicKey",
+          "index": false
         }
       ]
     }

sdk/src/types.ts

@@ -767,6 +767,7 @@ export type LPSwapRecord = {
 	outMarketTargetWeight: BN;
 	inSwapId: BN;
 	outSwapId: BN;
+	lpPool: PublicKey;
 };
 
 export type LPMintRedeemRecord = {
@@ -789,6 +790,7 @@ export type LPMintRedeemRecord = {
 	lastAumSlot: BN;
 	inMarketCurrentWeight: BN;
 	inMarketTargetWeight: BN;
+	lpPool: PublicKey;
 };
 
 export type LPSettleRecord = {
@@ -803,6 +805,7 @@ export type LPSettleRecord = {
 	perpAmmExFeeDelta: BN;
 	lpAum: BN;
 	lpPrice: BN;
+	lpPool: PublicKey;
 };
 
 export type LPBorrowLendDepositRecord = {
@@ -815,6 +818,7 @@ export type LPBorrowLendDepositRecord = {
 	lastTokenBalance: BN;
 	interestAccruedTokenAmount: BN;
 	amountDepositWithdraw: BN;
+	lpPool: PublicKey;
 };
 
 export type StateAccount = {
@@ -1411,9 +1415,9 @@ export interface IWallet {
 	publicKey: PublicKey;
 	payer?: Keypair;
 	supportedTransactionVersions?:
-		| ReadonlySet<TransactionVersion>
-		| null
-		| undefined;
+	| ReadonlySet<TransactionVersion>
+	| null
+	| undefined;
 }
 export interface IVersionedWallet {
 	signVersionedTransaction(