merge devnet

Author: moosecat2

programs/drift/src/instructions/admin.rs

@@ -1166,6 +1166,11 @@ pub fn handle_resize_amm_cache(ctx: Context<ResizeAmmCache>) -> Result<()> {
     Ok(())
 }
 
+pub fn handle_delete_amm_cache(_ctx: Context<DeleteAmmCache>) -> Result<()> {
+    msg!("deleted amm cache");
+    Ok(())
+}
+
 #[access_control(
     perp_market_valid(&ctx.accounts.perp_market)
 )]
@@ -5563,6 +5568,23 @@ pub struct ResizeAmmCache<'info> {
     pub system_program: Program<'info, System>,
 }
 
+#[derive(Accounts)]
+pub struct DeleteAmmCache<'info> {
+    #[account(mut)]
+    pub admin: Signer<'info>,
+    #[account(
+        has_one = admin
+    )]
+    pub state: Box<Account<'info, State>>,
+    #[account(
+        mut,
+        seeds = [AMM_POSITIONS_CACHE.as_ref()],
+        bump,
+        close = admin,
+    )]
+    pub amm_cache: Box<Account<'info, AmmCache>>,
+}
+
 #[derive(Accounts)]
 pub struct DeleteInitializedPerpMarket<'info> {
     #[account(mut)]

programs/drift/src/lib.rs

@@ -1062,6 +1062,18 @@ pub mod drift {
         handle_initialize_amm_cache(ctx)
     }
 
+    pub fn resize_amm_cache<'c: 'info, 'info>(
+        ctx: Context<'_, '_, 'c, 'info, ResizeAmmCache<'info>>,
+    ) -> Result<()> {
+        handle_resize_amm_cache(ctx)
+    }
+
+    pub fn delete_amm_cache<'c: 'info, 'info>(
+        ctx: Context<'_, '_, 'c, 'info, DeleteAmmCache<'info>>,
+    ) -> Result<()> {
+        handle_delete_amm_cache(ctx)
+    }
+
     pub fn update_initial_amm_cache_info<'c: 'info, 'info>(
         ctx: Context<'_, '_, 'c, 'info, UpdateInitialAmmCacheInfo<'info>>,
     ) -> Result<()> {

sdk/VERSION

@@ -1 +1 @@
-2.146.0-beta.2
+2.146.0-beta.3

sdk/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.146.0-beta.2",
+	"version": "2.146.0-beta.3",
 	"main": "lib/node/index.js",
 	"types": "lib/node/index.d.ts",
 	"module": "./lib/browser/index.js",

sdk/src/adminClient.ts

@@ -665,7 +665,7 @@ export class AdminClient extends DriftClient {
 	public async resizeAmmCache(
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
-		const initializeAmmCacheIx = await this.getInitializeAmmCacheIx();
+		const initializeAmmCacheIx = await this.getResizeAmmCacheIx();
 
 		const tx = await this.buildTransaction(initializeAmmCacheIx, txParams);
 
@@ -688,6 +688,28 @@ export class AdminClient extends DriftClient {
 		});
 	}
 
+	public async deleteAmmCache(
+		txParams?: TxParams
+	): Promise<TransactionSignature> {
+		const deleteAmmCacheIx = await this.getDeleteAmmCacheIx();
+
+		const tx = await this.buildTransaction(deleteAmmCacheIx, txParams);
+
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
+		return txSig;
+	}
+
+	public async getDeleteAmmCacheIx(): Promise<TransactionInstruction> {
+		return await this.program.instruction.deleteAmmCache({
+			accounts: {
+				state: await this.getStatePublicKey(),
+				admin: this.getStateAccount().admin,
+				ammCache: getAmmCachePublicKey(this.program.programId),
+			},
+		});
+	}
+
 	public async updateInitialAmmCacheInfo(
 		perpMarketIndexes: number[],
 		txParams?: TxParams

sdk/src/idl/drift.json

@@ -4610,6 +4610,58 @@
       ],
       "args": []
     },
+    {
+      "name": "resizeAmmCache",
+      "accounts": [
+        {
+          "name": "admin",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "ammCache",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "rent",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "systemProgram",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": []
+    },
+    {
+      "name": "deleteAmmCache",
+      "accounts": [
+        {
+          "name": "admin",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "ammCache",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": []
+    },
     {
       "name": "updateInitialAmmCacheInfo",
       "accounts": [
@@ -13215,12 +13267,6 @@
             "type": {
               "option": "u16"
             }
-          },
-          {
-            "name": "isolatedPositionDeposit",
-            "type": {
-              "option": "u64"
-            }
           }
         ]
       }
@@ -13286,12 +13332,6 @@
             "type": {
               "option": "u16"
             }
-          },
-          {
-            "name": "isolatedPositionDeposit",
-            "type": {
-              "option": "u64"
-            }
           }
         ]
       }

tests/lpPool.ts

@@ -1733,4 +1733,27 @@ describe('LP Pool', () => {
 			assert(e.message.includes('0x18'));
 		}
 	});
+
+	it('can delete amm cache and then init and realloc and update', async () => {
+		const ammCacheKey = getAmmCachePublicKey(program.programId);
+		const ammCacheBefore = (await adminClient.program.account.ammCache.fetch(
+			ammCacheKey
+		)) as AmmCache;
+
+		await adminClient.deleteAmmCache();
+		await adminClient.initializeAmmCache();
+		await adminClient.resizeAmmCache();
+		await adminClient.updateInitialAmmCacheInfo([0, 1, 2]);
+		await adminClient.updateAmmCache([0, 1, 2]);
+
+		const ammCacheAfter = (await adminClient.program.account.ammCache.fetch(
+			ammCacheKey
+		)) as AmmCache;
+
+		for (let i = 0; i < ammCacheBefore.cache.length; i++) {
+			assert(
+				ammCacheBefore.cache[i].position.eq(ammCacheAfter.cache[i].position)
+			);
+		}
+	});
 });