dont update lp quote owed unless collateralized

Author: moosecat2

programs/drift/src/instructions/admin.rs

@@ -971,7 +971,8 @@ pub fn handle_initialize_perp_market(
         protected_maker_limit_price_divisor: 0,
         protected_maker_dynamic_divisor: 0,
         lp_fee_transfer_scalar: 1,
-        padding: [0; 35],
+        lp_status: 0,
+        padding: [0; 34],
         amm: AMM {
             oracle: *ctx.accounts.oracle.key,
             oracle_source,
@@ -4217,6 +4218,16 @@ pub fn handle_update_perp_market_protected_maker_params(
     Ok(())
 }
 
+pub fn handle_update_perp_market_lp_pool_status(
+    ctx: Context<AdminUpdatePerpMarket>,
+    lp_status: u8,
+) -> Result<()> {
+    let perp_market = &mut load_mut!(ctx.accounts.perp_market)?;
+    msg!("perp market {}", perp_market.market_index);
+    perp_market.lp_status = lp_status;
+    Ok(())
+}
+
 #[access_control(
     perp_market_valid(&ctx.accounts.perp_market)
 )]

programs/drift/src/instructions/keeper.rs

@@ -3281,7 +3281,9 @@ pub fn handle_update_amm_cache<'c: 'info, 'info>(
         cached_info.max_confidence_interval_multiplier =
             perp_market.get_max_confidence_interval_multiplier()?;
 
-        amm_cache.update_amount_owed_from_lp_pool(&perp_market, &quote_market)?;
+        if perp_market.lp_status != 0 {
+            amm_cache.update_amount_owed_from_lp_pool(&perp_market, &quote_market)?;
+        }
     }
 
     Ok(())

programs/drift/src/lib.rs

@@ -1058,6 +1058,13 @@ pub mod drift {
         handle_update_perp_market_expiry(ctx, expiry_ts)
     }
 
+    pub fn update_perp_market_lp_pool_status(
+        ctx: Context<AdminUpdatePerpMarket>,
+        lp_status: u8,
+    ) -> Result<()> {
+        handle_update_perp_market_lp_pool_status(ctx, lp_status)
+    }
+
     pub fn settle_expired_market_pools_to_revenue_pool(
         ctx: Context<SettleExpiredMarketPoolsToRevenuePool>,
     ) -> Result<()> {

programs/drift/src/state/perp_market.rs

@@ -257,7 +257,8 @@ pub struct PerpMarket {
     pub protected_maker_limit_price_divisor: u8,
     pub protected_maker_dynamic_divisor: u8,
     pub lp_fee_transfer_scalar: u8,
-    pub padding: [u8; 35],
+    pub lp_status: u8,
+    pub padding: [u8; 34],
 }
 
 impl Default for PerpMarket {
@@ -300,7 +301,8 @@ impl Default for PerpMarket {
             protected_maker_limit_price_divisor: 0,
             protected_maker_dynamic_divisor: 0,
             lp_fee_transfer_scalar: 1,
-            padding: [0; 35],
+            lp_status: 0,
+            padding: [0; 34],
         }
     }
 }
@@ -1740,8 +1742,7 @@ pub struct CacheInfo {
     pub oracle_delay: i64,
     pub oracle_slot: u64,
     pub oracle_source: u8,
-    pub lp_status: u8,
-    _padding: [u8; 6],
+    _padding: [u8; 7],
     pub oracle: Pubkey,
 }
 
@@ -1760,15 +1761,14 @@ impl Default for CacheInfo {
             oracle_confidence: 0u64,
             oracle_delay: 0i64,
             oracle_slot: 0u64,
-            _padding: [0u8; 6],
+            _padding: [0u8; 7],
             oracle: Pubkey::default(),
             last_fee_pool_token_amount: 0u128,
             last_net_pnl_pool_token_amount: 0i128,
             last_settle_amount: 0u64,
             last_settle_ts: 0i64,
             oracle_source: 0u8,
             quote_owed_from_lp: 0i64,
-            lp_status: 0u8,
         }
     }
 }

sdk/src/adminClient.ts

@@ -968,6 +968,40 @@ export class AdminClient extends DriftClient {
 		);
 	}
 
+	public async updatePerpMarketLpPoolStatus(
+		perpMarketIndex: number,
+		lpStatus: number,
+	) {
+		const updatePerpMarketLpPoolStatusIx = await this.getUpdatePerpMarketLpPoolStatusIx(
+			perpMarketIndex,
+			lpStatus
+		);
+
+		const tx = await this.buildTransaction(updatePerpMarketLpPoolStatusIx);
+
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
+		return txSig;
+	}
+
+	public async getUpdatePerpMarketLpPoolStatusIx(
+		perpMarketIndex: number,
+		lpStatus: number
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updatePerpMarketLpPoolStatus(lpStatus, {
+			accounts: {
+				state: await this.getStatePublicKey(),
+				admin: this.isSubscribed
+					? this.getStateAccount().admin
+					: this.wallet.publicKey,
+				perpMarket: await getPerpMarketPublicKey(
+					this.program.programId,
+					perpMarketIndex
+				),
+			},
+		});
+	}
+
 	public async moveAmmToPrice(
 		perpMarketIndex: number,
 		targetPrice: BN

sdk/src/idl/drift.json

@@ -4805,6 +4805,32 @@
         }
       ]
     },
+    {
+      "name": "updatePerpMarketLpPoolStatus",
+      "accounts": [
+        {
+          "name": "admin",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "perpMarket",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "lpStatus",
+          "type": "u8"
+        }
+      ]
+    },
     {
       "name": "settleExpiredMarketPoolsToRevenuePool",
       "accounts": [
@@ -9913,12 +9939,16 @@
             "name": "lpFeeTransferScalar",
             "type": "u8"
           },
+          {
+            "name": "lpStatus",
+            "type": "u8"
+          },
           {
             "name": "padding",
             "type": {
               "array": [
                 "u8",
-                35
+                34
               ]
             }
           }
@@ -13072,16 +13102,12 @@
             "name": "oracleSource",
             "type": "u8"
           },
-          {
-            "name": "lpStatus",
-            "type": "u8"
-          },
           {
             "name": "padding",
             "type": {
               "array": [
                 "u8",
-                6
+                7
               ]
             }
           },

tests/lpPool.ts

@@ -195,6 +195,7 @@ describe('LP Pool', () => {
 			periodicity,
 			new BN(200 * PEG_PRECISION.toNumber())
 		);
+		await adminClient.updatePerpMarketLpPoolStatus(0, 1);	
 
 		await adminClient.initializePerpMarket(
 			1,
@@ -204,6 +205,7 @@ describe('LP Pool', () => {
 			periodicity,
 			new BN(200 * PEG_PRECISION.toNumber())
 		);
+		await adminClient.updatePerpMarketLpPoolStatus(1, 1);
 
 		await adminClient.initializePerpMarket(
 			2,
@@ -213,6 +215,7 @@ describe('LP Pool', () => {
 			periodicity,
 			new BN(200 * PEG_PRECISION.toNumber())
 		);
+		await adminClient.updatePerpMarketLpPoolStatus(2, 1);	
 
 		await adminClient.updatePerpAuctionDuration(new BN(0));
 

tests/lpPoolSwap.ts

@@ -175,6 +175,7 @@ describe('LP Pool', () => {
 			periodicity,
 			new BN(224 * PEG_PRECISION.toNumber())
 		);
+		await adminClient.updatePerpMarketLpPoolStatus(0, 1);
 
 		await adminClient.initializePerpMarket(
 			1,
@@ -184,6 +185,7 @@ describe('LP Pool', () => {
 			periodicity,
 			new BN(224 * PEG_PRECISION.toNumber())
 		);
+		await adminClient.updatePerpMarketLpPoolStatus(1, 1);	
 
 		const optimalUtilization = SPOT_MARKET_RATE_PRECISION.div(
 			new BN(2)