add constituent map memcmp and lp status on cache

Author: moosecat2

programs/drift/src/instructions/admin.rs

@@ -4233,16 +4233,6 @@ 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(())
-}
-
 pub fn handle_update_perp_market_lp_pool_paused_operations(
     ctx: Context<AdminUpdatePerpMarket>,
     lp_paused_operations: u8,

programs/drift/src/instructions/lp_admin.rs

@@ -1,16 +1,18 @@
-use crate::controller;
+use crate::{controller, load_mut};
 use crate::controller::token::{receive, send_from_program_vault_with_signature_seeds};
 use crate::error::ErrorCode;
 use crate::ids::{admin_hot_wallet, lp_pool_swap_wallet};
 use crate::instructions::optional_accounts::get_token_mint;
 use crate::math::constants::{PRICE_PRECISION_U64, QUOTE_SPOT_MARKET_INDEX};
 use crate::math::safe_math::SafeMath;
+use crate::state::amm_cache::AmmCache;
 use crate::state::lp_pool::{
     AmmConstituentDatum, AmmConstituentMapping, Constituent, ConstituentCorrelations,
     ConstituentTargetBase, LPPool, TargetsDatum, AMM_MAP_PDA_SEED,
     CONSTITUENT_CORRELATIONS_PDA_SEED, CONSTITUENT_PDA_SEED, CONSTITUENT_TARGET_BASE_PDA_SEED,
     CONSTITUENT_VAULT_PDA_SEED,
 };
+use crate::state::perp_market::PerpMarket;
 use crate::state::spot_market::SpotMarket;
 use crate::state::state::State;
 use crate::validate;
@@ -880,6 +882,20 @@ pub fn handle_end_lp_swap<'c: 'info, 'info>(
     Ok(())
 }
 
+pub fn handle_update_perp_market_lp_pool_status(
+    ctx: Context<UpdatePerpMarketLpPoolStatus>,
+    lp_status: u8,
+) -> Result<()> {
+    let perp_market = &mut load_mut!(ctx.accounts.perp_market)?;
+    let amm_cache = &mut ctx.accounts.amm_cache;
+
+    msg!("perp market {}", perp_market.market_index);
+    perp_market.lp_status = lp_status;
+    amm_cache.update_perp_market_fields(&perp_market)?;
+    
+    Ok(())
+}
+
 #[derive(Accounts)]
 #[instruction(
     name: [u8; 32],
@@ -1226,3 +1242,16 @@ pub struct LPTakerSwap<'info> {
     pub instructions: UncheckedAccount<'info>,
     pub token_program: Interface<'info, TokenInterface>,
 }
+
+#[derive(Accounts)]
+pub struct UpdatePerpMarketLpPoolStatus<'info> {
+    pub admin: Signer<'info>,
+    #[account(
+        has_one = admin
+    )]
+    pub state: Box<Account<'info, State>>,
+    #[account(mut)]
+    pub perp_market: AccountLoader<'info, PerpMarket>,
+    #[account(mut)]
+    pub amm_cache: Box<Account<'info, AmmCache>>,
+}

programs/drift/src/lib.rs

@@ -1077,7 +1077,7 @@ pub mod drift {
     }
 
     pub fn update_perp_market_lp_pool_status(
-        ctx: Context<AdminUpdatePerpMarket>,
+        ctx: Context<UpdatePerpMarketLpPoolStatus>,
         lp_status: u8,
     ) -> Result<()> {
         handle_update_perp_market_lp_pool_status(ctx, lp_status)

programs/drift/src/state/amm_cache.rs

@@ -54,7 +54,8 @@ pub struct CacheInfo {
     pub oracle_slot: u64,
     pub oracle_source: u8,
     pub oracle_validity: u8,
-    pub _padding: [u8; 14],
+    pub lp_status_for_perp_market: u8,
+    pub _padding: [u8; 13],
 }
 
 impl Size for CacheInfo {
@@ -80,7 +81,8 @@ impl Default for CacheInfo {
             last_settle_amm_ex_fees: 0u128,
             oracle_source: 0u8,
             quote_owed_from_lp_pool: 0i64,
-            _padding: [0u8; 14],
+            lp_status_for_perp_market: 0u8,
+            _padding: [0u8; 13],
         }
     }
 }
@@ -110,6 +112,7 @@ impl CacheInfo {
             .amm
             .get_protocol_owned_position()?
             .safe_mul(-1)?;
+        self.lp_status_for_perp_market = perp_market.lp_status;
         Ok(())
     }
 

sdk/src/adminClient.ts

@@ -1057,6 +1057,7 @@ export class AdminClient extends DriftClient {
 						this.program.programId,
 						perpMarketIndex
 					),
+					ammCache: getAmmCachePublicKey(this.program.programId),
 				},
 			}
 		);

sdk/src/constituentMap/constituentMap.ts

@@ -10,11 +10,15 @@ import { ConstituentAccount } from '../types';
 import { PollingConstituentAccountSubscriber } from './pollingConstituentAccountSubscriber';
 import { WebSocketConstituentAccountSubscriber } from './webSocketConstituentAccountSubscriber';
 import { DriftClient } from '../driftClient';
-import { getConstituentFilter } from '../memcmp';
+import { getConstituentFilter, getConstituentLpPoolFilter } from '../memcmp';
 import { ZSTDDecoder } from 'zstddec';
+import { encodeName } from '../userName';
+import { getLpPoolPublicKey } from '../addresses/pda';
 
 const MAX_CONSTITUENT_SIZE_BYTES = 304; // TODO: update this when account is finalized
 
+const LP_POOL_NAME = 'test lp pool 2';
+
 export type ConstituentMapConfig = {
 	driftClient: DriftClient;
 	connection?: Connection;
@@ -30,6 +34,7 @@ export type ConstituentMapConfig = {
 				logResubMessages?: boolean;
 				commitment?: Commitment;
 		  };
+	lpPoolName?: string;
 	// potentially use these to filter Constituent accounts
 	additionalFilters?: MemcmpFilter[];
 };
@@ -62,11 +67,14 @@ export class ConstituentMap implements ConstituentMapInterface {
 	private constituentIndexToKeyMap = new Map<number, string>();
 	private spotMarketIndexToKeyMap = new Map<number, string>();
 
+	private lpPoolName: string;
+
 	constructor(config: ConstituentMapConfig) {
 		this.driftClient = config.driftClient;
 		this.additionalFilters = config.additionalFilters;
 		this.commitment = config.subscriptionConfig.commitment;
 		this.connection = config.connection || this.driftClient.connection;
+		this.lpPoolName = config.lpPoolName ?? LP_POOL_NAME;
 
 		if (config.subscriptionConfig.type === 'polling') {
 			this.constituentAccountSubscriber =
@@ -75,7 +83,7 @@ export class ConstituentMap implements ConstituentMapInterface {
 					this.driftClient.program,
 					config.subscriptionConfig.frequency,
 					config.subscriptionConfig.commitment,
-					config.additionalFilters
+					this.getFilters()
 				);
 		} else if (config.subscriptionConfig.type === 'websocket') {
 			this.constituentAccountSubscriber =
@@ -84,7 +92,7 @@ export class ConstituentMap implements ConstituentMapInterface {
 					this.driftClient.program,
 					config.subscriptionConfig.resubTimeoutMs,
 					config.subscriptionConfig.commitment,
-					config.additionalFilters
+					this.getFilters()
 				);
 		}
 
@@ -98,7 +106,15 @@ export class ConstituentMap implements ConstituentMapInterface {
 	}
 
 	private getFilters(): MemcmpFilter[] {
-		const filters = [getConstituentFilter()];
+		const filters = [
+			getConstituentFilter(),
+			getConstituentLpPoolFilter(
+				getLpPoolPublicKey(
+					this.driftClient.program.programId,
+					encodeName(this.lpPoolName)
+				)
+			),
+		];
 		if (this.additionalFilters) {
 			filters.push(...this.additionalFilters);
 		}

sdk/src/idl/drift.json

@@ -4773,6 +4773,11 @@
           "name": "perpMarket",
           "isMut": true,
           "isSigner": false
+        },
+        {
+          "name": "ammCache",
+          "isMut": true,
+          "isSigner": false
         }
       ],
       "args": [
@@ -12000,12 +12005,16 @@
             "name": "oracleValidity",
             "type": "u8"
           },
+          {
+            "name": "lpStatusForPerpMarket",
+            "type": "u8"
+          },
           {
             "name": "padding",
             "type": {
               "array": [
                 "u8",
-                14
+                13
               ]
             }
           }

sdk/src/memcmp.ts

@@ -1,4 +1,4 @@
-import { MemcmpFilter } from '@solana/web3.js';
+import { MemcmpFilter, PublicKey } from '@solana/web3.js';
 import bs58 from 'bs58';
 import { BorshAccountsCoder } from '@coral-xyz/anchor';
 import { encodeName } from './userName';
@@ -140,3 +140,14 @@ export function getConstituentFilter(): MemcmpFilter {
 		},
 	};
 }
+
+export function getConstituentLpPoolFilter(
+	lpPoolPublicKey: PublicKey
+): MemcmpFilter {
+	return {
+		memcmp: {
+			offset: 72,
+			bytes: lpPoolPublicKey.toBase58(),
+		},
+	};
+}