dlp taker discovered bug fixes and sdk changes

moosecat2 · moosecat2 · commit 6b5142ab2575 · 2025-08-14T12:23:02.000-07:00
diff --git a/programs/drift/src/instructions/admin.rs b/programs/drift/src/instructions/admin.rs
@@ -4798,7 +4798,7 @@ pub fn handle_initialize_lp_pool(
         last_aum_slot: 0,
         last_aum_ts: 0,
         max_settle_quote_amount: max_settle_quote_amount_per_market,
-        last_revenue_rebalance_ts: 0,
+        last_hedge_ts: 0,
         total_fees_received: 0,
         total_fees_paid: 0,
         total_mint_redeem_fees_paid: 0,
@@ -5693,6 +5693,9 @@ pub fn handle_begin_lp_swap<'c: 'info, 'info>(
     in_constituent.flash_loan_initial_token_amount = ctx.accounts.signer_in_token_account.amount;
     out_constituent.flash_loan_initial_token_amount = ctx.accounts.signer_out_token_account.amount;
 
+    drop(in_constituent);
+    drop(out_constituent);
+
     send_from_program_vault(
         &ctx.accounts.token_program,
         constituent_in_token_account,
diff --git a/programs/drift/src/instructions/lp_pool.rs b/programs/drift/src/instructions/lp_pool.rs
@@ -176,7 +176,7 @@ pub fn handle_update_constituent_target_base<'c: 'info, 'info>(
     validate!(
         !exists_invalid_constituent_index,
         ErrorCode::InvalidUpdateConstituentTargetBaseArgument,
-        "Constituent index larger than number of constituent target weights"
+        "Constituent index larger than numr of constituent target weights"
     )?;
 
     constituent_target_base.update_target_base(
diff --git a/programs/drift/src/state/lp_pool.rs b/programs/drift/src/state/lp_pool.rs
@@ -84,7 +84,7 @@ pub struct LPPool {
     pub max_settle_quote_amount: u64,
 
     /// timestamp of last vAMM revenue rebalance
-    pub last_revenue_rebalance_ts: u64, // 8, 168
+    pub last_hedge_ts: u64, // 8, 168
     pub revenue_rebalance_period: u64,
 
     /// Every mint/redeem has a monotonically increasing id. This is the next id to use
@@ -619,8 +619,7 @@ impl LPPool {
 
     /// Returns the fee to charge for a mint or redeem in PERCENTAGE_PRECISION
     pub fn get_mint_redeem_fee(&self, now: i64, is_minting: bool) -> DriftResult<i64> {
-        let time_since_last_rebalance =
-            now.safe_sub(self.last_revenue_rebalance_ts.cast::<i64>()?)?;
+        let time_since_last_rebalance = now.safe_sub(self.last_hedge_ts.cast::<i64>()?)?;
         if is_minting {
             // mint fee
             self.min_mint_fee.safe_add(
diff --git a/programs/drift/src/state/lp_pool/tests.rs b/programs/drift/src/state/lp_pool/tests.rs
@@ -855,7 +855,7 @@ mod swap_tests {
 
     fn get_mint_redeem_fee_scenario(now: i64, is_mint: bool, expected_fee: i64) {
         let lp_pool = LPPool {
-            last_revenue_rebalance_ts: 0,
+            last_hedge_ts: 0,
             revenue_rebalance_period: 3600, // hourly
             max_mint_fee_premium: 2000,     // 20 bps
             min_mint_fee: 100,              // 1 bps
@@ -912,7 +912,7 @@ mod swap_tests {
     ) {
         let lp_pool = LPPool {
             last_aum,
-            last_revenue_rebalance_ts: 0,
+            last_hedge_ts: 0,
             revenue_rebalance_period: 3600,
             max_mint_fee_premium: 0,
             min_mint_fee: 0,
@@ -1095,7 +1095,7 @@ mod swap_tests {
     ) {
         let lp_pool = LPPool {
             last_aum,
-            last_revenue_rebalance_ts: 0,
+            last_hedge_ts: 0,
             revenue_rebalance_period: 3600,
             max_mint_fee_premium: 2000, // 20 bps
             min_mint_fee: 100,          // 1 bps
diff --git a/sdk/src/adminClient.ts b/sdk/src/adminClient.ts
@@ -5867,12 +5867,10 @@ export class AdminClient extends DriftClient {
 		depositMarketIndex: number,
 		amountToDeposit: BN
 	): Promise<TransactionSignature> {
-		const { depositIx } = await this.getDepositWithdrawToProgramVaultIxs(
+		const depositIx = await this.getDepositToProgramVaultIx(
 			lpPoolName,
 			depositMarketIndex,
-			depositMarketIndex,
 			amountToDeposit,
-			new BN(0)
 		);
 
 		const tx = await this.buildTransaction([depositIx]);
@@ -5885,19 +5883,46 @@ export class AdminClient extends DriftClient {
 		borrowMarketIndex: number,
 		amountToWithdraw: BN
 	): Promise<TransactionSignature> {
-		const { withdrawIx } = await this.getDepositWithdrawToProgramVaultIxs(
+		const withdrawIx = await this.getWithdrawFromProgramVaultIx(
 			lpPoolName,
 			borrowMarketIndex,
-			borrowMarketIndex,
-			new BN(0),
 			amountToWithdraw
 		);
-
 		const tx = await this.buildTransaction([withdrawIx]);
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
 		return txSig;
 	}
 
+	public async getDepositToProgramVaultIx(
+		lpPoolName: number[],
+		depositMarketIndex: number,
+		amountToDeposit: BN
+	): Promise<TransactionInstruction> {
+		const { depositIx } = await this.getDepositWithdrawToProgramVaultIxs(
+			lpPoolName,
+			depositMarketIndex,
+			depositMarketIndex,
+			amountToDeposit,
+			new BN(0)
+		);
+		return depositIx;
+	}
+
+	public async getWithdrawFromProgramVaultIx(
+		lpPoolName: number[],
+		borrowMarketIndex: number,
+		amountToWithdraw: BN
+	): Promise<TransactionInstruction> {
+		const { withdrawIx } = await this.getDepositWithdrawToProgramVaultIxs(
+			lpPoolName,
+			borrowMarketIndex,
+			borrowMarketIndex,
+			new BN(0),
+			amountToWithdraw
+		);
+		return withdrawIx;
+	}
+
 	public async updatePerpMarketLpPoolFeeTransferScalar(
 		marketIndex: number,
 		lpFeeTransferScalar: number
diff --git a/sdk/src/constituentMap/constituentMap.ts b/sdk/src/constituentMap/constituentMap.ts
@@ -39,6 +39,11 @@ export interface ConstituentMapInterface {
 	unsubscribe(): Promise<void>;
 	has(key: string): boolean;
 	get(key: string): ConstituentAccount | undefined;
+	getFromSpotMarketIndex(
+		spotMarketIndex: number): ConstituentAccount | undefined;
+	getFromConstituentIndex(
+		constituentIndex: number): ConstituentAccount | undefined;
+		
 	getWithSlot(key: string): DataAndSlot<ConstituentAccount> | undefined;
 	mustGet(key: string): Promise<ConstituentAccount>;
 	mustGetWithSlot(key: string): Promise<DataAndSlot<ConstituentAccount>>;
@@ -52,6 +57,9 @@ export class ConstituentMap implements ConstituentMapInterface {
 	private commitment?: Commitment;
 	private connection?: Connection;
 
+	private constituentIndexToKeyMap = new Map<number, string>();
+	private spotMarketIndexToKeyMap = new Map<number, string>();
+
 	constructor(config: ConstituentMapConfig) {
 		this.driftClient = config.driftClient;
 		this.additionalFilters = config.additionalFilters;
@@ -172,6 +180,16 @@ export class ConstituentMap implements ConstituentMapInterface {
 		return this.constituentMap.get(key)?.data;
 	}
 
+	public getFromConstituentIndex(constituentIndex: number): ConstituentAccount | undefined {
+		const key = this.constituentIndexToKeyMap.get(constituentIndex);
+		return key ? this.get(key) : undefined;
+	}
+
+	public getFromSpotMarketIndex(spotMarketIndex: number): ConstituentAccount | undefined {
+		const key = this.spotMarketIndexToKeyMap.get(spotMarketIndex);
+		return key ? this.get(key) : undefined;
+	}
+
 	public getWithSlot(key: string): DataAndSlot<ConstituentAccount> | undefined {
 		return this.constituentMap.get(key);
 	}
@@ -245,5 +263,13 @@ export class ConstituentMap implements ConstituentMapInterface {
 				slot,
 			});
 		}
+		this.constituentIndexToKeyMap.set(
+			constituentAccount.constituentIndex,
+			key
+		);
+		this.spotMarketIndexToKeyMap.set(
+			constituentAccount.spotMarketIndex,
+			key
+		);
 	}
 }
diff --git a/sdk/src/idl/drift.json b/sdk/src/idl/drift.json
@@ -9700,7 +9700,7 @@
             "type": "u64"
           },
           {
-            "name": "lastRevenueRebalanceTs",
+            "name": "lastHedgeTs",
             "docs": [
               "timestamp of last vAMM revenue rebalance"
             ],
diff --git a/sdk/src/types.ts b/sdk/src/types.ts
@@ -1658,6 +1658,7 @@ export type LPPoolAccount = {
 	lastAum: BN;
 	lastAumSlot: BN;
 	lastAumTs: BN;
+	lastHedgeTs: BN;
 	bump: number;
 	oldestOracleSlot: BN;
 	lastRevenueRebalanceTs: BN;

Original file line number	Diff line number	Diff line change
`@@ -9700,7 +9700,7 @@`
`9700`	`9700`	`"type": "u64"`
`9701`	`9701`	`},`
`9702`	`9702`	`{`
`9703`		`- "name": "lastRevenueRebalanceTs",`
	`9703`	`+ "name": "lastHedgeTs",`
`9704`	`9704`	`"docs": [`
`9705`	`9705`	`"timestamp of last vAMM revenue rebalance"`
`9706`	`9706`	`],`