include new amm inventory limit (#1932)

Author: moosecat2

programs/drift/src/instructions/lp_admin.rs

@@ -944,6 +944,7 @@ pub struct OverrideAmmCacheParams {
     pub last_fee_pool_token_amount: Option<u128>,
     pub last_net_pnl_pool_token_amount: Option<i128>,
     pub amm_position_scalar: Option<u8>,
+    pub amm_inventory_limit: Option<i64>,
 }
 
 pub fn handle_override_amm_cache_info<'c: 'info, 'info>(
@@ -977,6 +978,14 @@ pub fn handle_override_amm_cache_info<'c: 'info, 'info>(
         cache_entry.amm_position_scalar = amm_position_scalar;
     }
 
+    if let Some(amm_position_scalar) = override_params.amm_position_scalar {
+        cache_entry.amm_position_scalar = amm_position_scalar;
+    }
+
+    if let Some(amm_inventory_limit) = override_params.amm_inventory_limit {
+        cache_entry.amm_inventory_limit = amm_inventory_limit;
+    }
+
     Ok(())
 }
 

programs/drift/src/instructions/lp_pool.rs

@@ -134,7 +134,10 @@ pub fn handle_update_constituent_target_base<'c: 'info, 'info>(
             inventory: cache_info
                 .position
                 .safe_mul(cache_info.amm_position_scalar as i64)?
-                .safe_div(100)?,
+                .safe_div(100)?
+                .abs()
+                .min(cache_info.amm_inventory_limit)
+                .safe_mul(cache_info.position.signum())?,
             price: cache_info.oracle_price,
         });
     }

programs/drift/src/state/amm_cache.rs

@@ -50,17 +50,18 @@ pub struct CacheInfo {
     pub last_settle_slot: u64,
     pub last_settle_ts: i64,
     pub quote_owed_from_lp_pool: i64,
+    pub amm_inventory_limit: i64,
     pub oracle_price: i64,
     pub oracle_slot: u64,
     pub oracle_source: u8,
     pub oracle_validity: u8,
     pub lp_status_for_perp_market: u8,
     pub amm_position_scalar: u8,
-    pub _padding: [u8; 12],
+    _padding: [u8; 28],
 }
 
 impl Size for CacheInfo {
-    const SIZE: usize = 192;
+    const SIZE: usize = 224;
 }
 
 impl Default for CacheInfo {
@@ -80,11 +81,12 @@ impl Default for CacheInfo {
             last_settle_ts: 0i64,
             last_settle_amm_pnl: 0i128,
             last_settle_amm_ex_fees: 0u128,
+            amm_inventory_limit: 0i64,
             oracle_source: 0u8,
             quote_owed_from_lp_pool: 0i64,
             lp_status_for_perp_market: 0u8,
-            amm_position_scalar: 100u8,
-            _padding: [0u8; 12],
+            amm_position_scalar: 0u8,
+            _padding: [0u8; 28],
         }
     }
 }

sdk/src/adminClient.ts

@@ -715,6 +715,7 @@ export class AdminClient extends DriftClient {
 			lastFeePoolTokenAmount?: BN;
 			lastNetPnlPoolTokenAmount?: BN;
 			ammPositionScalar?: number;
+			ammInventoryLimit?: BN;
 		},
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
@@ -737,6 +738,7 @@ export class AdminClient extends DriftClient {
 			lastFeePoolTokenAmount?: BN;
 			lastNetPnlPoolTokenAmount?: BN;
 			ammPositionScalar?: number;
+			ammInventoryLimit?: BN;
 		}
 	): Promise<TransactionInstruction> {
 		return this.program.instruction.overrideAmmCacheInfo(
@@ -749,6 +751,7 @@ export class AdminClient extends DriftClient {
 					lastFeePoolTokenAmount: null,
 					lastNetPnlPoolTokenAmount: null,
 					ammPositionScalar: null,
+					ammInventoryLimit: null,
 				},
 				params
 			),

sdk/src/idl/drift.json

@@ -12074,6 +12074,12 @@
             "type": {
               "option": "u8"
             }
+          },
+          {
+            "name": "ammInventoryLimit",
+            "type": {
+              "option": "i64"
+            }
           }
         ]
       }
@@ -12154,6 +12160,10 @@
             "name": "quoteOwedFromLpPool",
             "type": "i64"
           },
+          {
+            "name": "ammInventoryLimit",
+            "type": "i64"
+          },
           {
             "name": "oraclePrice",
             "type": "i64"
@@ -12183,7 +12193,7 @@
             "type": {
               "array": [
                 "u8",
-                12
+                28
               ]
             }
           }

sdk/src/types.ts

@@ -1415,9 +1415,9 @@ export interface IWallet {
 	publicKey: PublicKey;
 	payer?: Keypair;
 	supportedTransactionVersions?:
-	| ReadonlySet<TransactionVersion>
-	| null
-	| undefined;
+		| ReadonlySet<TransactionVersion>
+		| null
+		| undefined;
 }
 export interface IVersionedWallet {
 	signVersionedTransaction(

tests/lpPool.ts

@@ -722,6 +722,19 @@ describe('LP Pool', () => {
 		);
 		await adminClient.updateAmmCache([0, 1, 2]);
 
+		await adminClient.overrideAmmCacheInfo(0, {
+			ammPositionScalar: 100,
+			ammInventoryLimit: BASE_PRECISION.muln(5000),
+		});
+		await adminClient.overrideAmmCacheInfo(1, {
+			ammPositionScalar: 100,
+			ammInventoryLimit: BASE_PRECISION.muln(5000),
+		});
+		await adminClient.overrideAmmCacheInfo(2, {
+			ammPositionScalar: 100,
+			ammInventoryLimit: BASE_PRECISION.muln(5000),
+		});
+
 		let tx = new Transaction();
 		tx.add(await adminClient.getUpdateAmmCacheIx([0, 1, 2]));
 		tx.add(