remove delete amm ixs (#2000)

Author: moosecat2

programs/drift/src/lib.rs

@@ -1026,12 +1026,6 @@ pub mod drift {
         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/src/adminClient.ts

@@ -736,9 +736,9 @@ export class AdminClient extends DriftClient {
 		return await this.program.instruction.updateInitialAmmCacheInfo({
 			accounts: {
 				state: await this.getStatePublicKey(),
-				admin: this.isSubscribed
-					? this.getStateAccount().admin
-					: this.wallet.publicKey,
+				admin: this.useHotWalletAdmin
+					? this.wallet.publicKey
+					: this.getStateAccount().admin,
 				ammCache: getAmmCachePublicKey(this.program.programId),
 			},
 			remainingAccounts,
@@ -796,9 +796,9 @@ export class AdminClient extends DriftClient {
 			{
 				accounts: {
 					state: await this.getStatePublicKey(),
-					admin: this.isSubscribed
-						? this.getStateAccount().admin
-						: this.wallet.publicKey,
+					admin: this.useHotWalletAdmin
+						? this.wallet.publicKey
+						: this.getStateAccount().admin,
 					ammCache: getAmmCachePublicKey(this.program.programId),
 				},
 			}
@@ -820,9 +820,9 @@ export class AdminClient extends DriftClient {
 		return this.program.instruction.resetAmmCache({
 			accounts: {
 				state: await this.getStatePublicKey(),
-				admin: this.isSubscribed
-					? this.getStateAccount().admin
-					: this.wallet.publicKey,
+				admin: this.useHotWalletAdmin
+					? this.wallet.publicKey
+					: this.getStateAccount().admin,
 				ammCache: getAmmCachePublicKey(this.program.programId),
 				systemProgram: anchor.web3.SystemProgram.programId,
 			},
@@ -5545,9 +5545,9 @@ export class AdminClient extends DriftClient {
 			{
 				accounts: {
 					constituent,
-					admin: this.isSubscribed
-						? this.getStateAccount().admin
-						: this.wallet.publicKey,
+					admin: this.useHotWalletAdmin
+						? this.wallet.publicKey
+						: this.getStateAccount().admin,
 					state: await this.getStatePublicKey(),
 				},
 			}
@@ -6435,9 +6435,9 @@ export class AdminClient extends DriftClient {
 			lpExchangeFeeExcluscionScalar ?? null,
 			{
 				accounts: {
-					admin: this.isSubscribed
-						? this.getStateAccount().admin
-						: this.wallet.publicKey,
+					admin: this.useHotWalletAdmin
+						? this.wallet.publicKey
+						: this.getStateAccount().admin,
 					state: await this.getStatePublicKey(),
 					perpMarket: this.getPerpMarketAccount(marketIndex).pubkey,
 				},
@@ -6466,9 +6466,9 @@ export class AdminClient extends DriftClient {
 			pausedOperations,
 			{
 				accounts: {
-					admin: this.isSubscribed
-						? this.getStateAccount().admin
-						: this.wallet.publicKey,
+					admin: this.useHotWalletAdmin
+						? this.wallet.publicKey
+						: this.getStateAccount().admin,
 					state: await this.getStatePublicKey(),
 					perpMarket: this.getPerpMarketAccount(marketIndex).pubkey,
 				},

sdk/src/idl/drift.json

@@ -4484,27 +4484,6 @@
       ],
       "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": [

tests/lpPool.ts

@@ -1734,26 +1734,26 @@ describe('LP Pool', () => {
 		}
 	});
 
-	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)
-			);
-		}
-	});
+	// 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)
+	// 		);
+	// 	}
+	// });
 });