@drift-labs/sdk 2.104.0-beta.22 → 2.104.0-beta.24

package/VERSION

@@ -1 +1 @@
-2.104.0-beta.22
+2.104.0-beta.24

package/lib/browser/addresses/pda.d.ts

@@ -30,3 +30,4 @@ export declare function getPythPullOraclePublicKey(progarmId: PublicKey, feedId:
 export declare function getPythLazerOraclePublicKey(progarmId: PublicKey, feedId: number): PublicKey;
 export declare function getTokenProgramForSpotMarket(spotMarketAccount: SpotMarketAccount): PublicKey;
 export declare function getHighLeverageModeConfigPublicKey(programId: PublicKey): PublicKey;
+export declare function getProtectedMakerModeConfigPublicKey(programId: PublicKey): PublicKey;

package/lib/browser/addresses/pda.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getHighLeverageModeConfigPublicKey = exports.getTokenProgramForSpotMarket = exports.getPythLazerOraclePublicKey = exports.getPythPullOraclePublicKey = exports.getPrelaunchOraclePublicKey = exports.getProtocolIfSharesTransferConfigPublicKey = exports.getReferrerNamePublicKeySync = exports.getOpenbookV2FulfillmentConfigPublicKey = exports.getPhoenixFulfillmentConfigPublicKey = exports.getSerumFulfillmentConfigPublicKey = exports.getSerumSignerPublicKey = exports.getSerumOpenOrdersPublicKey = exports.getDriftSignerPublicKey = exports.getInsuranceFundStakeAccountPublicKey = exports.getInsuranceFundVaultPublicKey = exports.getSpotMarketVaultPublicKey = exports.getSpotMarketPublicKeySync = exports.getSpotMarketPublicKey = exports.getPerpMarketPublicKeySync = exports.getPerpMarketPublicKey = exports.getSwiftUserAccountPublicKey = exports.getRFQUserAccountPublicKey = exports.getUserStatsAccountPublicKey = exports.getUserAccountPublicKeySync = exports.getUserAccountPublicKey = exports.getUserAccountPublicKeyAndNonce = exports.getDriftStateAccountPublicKey = exports.getDriftStateAccountPublicKeyAndNonce = void 0;
+exports.getProtectedMakerModeConfigPublicKey = exports.getHighLeverageModeConfigPublicKey = exports.getTokenProgramForSpotMarket = exports.getPythLazerOraclePublicKey = exports.getPythPullOraclePublicKey = exports.getPrelaunchOraclePublicKey = exports.getProtocolIfSharesTransferConfigPublicKey = exports.getReferrerNamePublicKeySync = exports.getOpenbookV2FulfillmentConfigPublicKey = exports.getPhoenixFulfillmentConfigPublicKey = exports.getSerumFulfillmentConfigPublicKey = exports.getSerumSignerPublicKey = exports.getSerumOpenOrdersPublicKey = exports.getDriftSignerPublicKey = exports.getInsuranceFundStakeAccountPublicKey = exports.getInsuranceFundVaultPublicKey = exports.getSpotMarketVaultPublicKey = exports.getSpotMarketPublicKeySync = exports.getSpotMarketPublicKey = exports.getPerpMarketPublicKeySync = exports.getPerpMarketPublicKey = exports.getSwiftUserAccountPublicKey = exports.getRFQUserAccountPublicKey = exports.getUserStatsAccountPublicKey = exports.getUserAccountPublicKeySync = exports.getUserAccountPublicKey = exports.getUserAccountPublicKeyAndNonce = exports.getDriftStateAccountPublicKey = exports.getDriftStateAccountPublicKeyAndNonce = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const anchor = __importStar(require("@coral-xyz/anchor"));
 const spl_token_1 = require("@solana/spl-token");
@@ -209,3 +209,9 @@ function getHighLeverageModeConfigPublicKey(programId) {
     return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from(anchor.utils.bytes.utf8.encode('high_leverage_mode_config'))], programId)[0];
 }
 exports.getHighLeverageModeConfigPublicKey = getHighLeverageModeConfigPublicKey;
+function getProtectedMakerModeConfigPublicKey(programId) {
+    return web3_js_1.PublicKey.findProgramAddressSync([
+        Buffer.from(anchor.utils.bytes.utf8.encode('protected_maker_mode_config')),
+    ], programId)[0];
+}
+exports.getProtectedMakerModeConfigPublicKey = getProtectedMakerModeConfigPublicKey;

package/lib/browser/adminClient.d.ts

@@ -203,4 +203,8 @@ export declare class AdminClient extends DriftClient {
     getInitializeHighLeverageModeConfigIx(maxUsers: number): Promise<TransactionInstruction>;
     updateUpdateHighLeverageModeConfig(maxUsers: number, reduceOnly: boolean): Promise<TransactionSignature>;
     getUpdateHighLeverageModeConfigIx(maxUsers: number, reduceOnly: boolean): Promise<TransactionInstruction>;
+    initializeProtectedMakerModeConfig(maxUsers: number): Promise<TransactionSignature>;
+    getInitializeProtectedMakerModeConfigIx(maxUsers: number): Promise<TransactionInstruction>;
+    updateProtectedMakerModeConfig(maxUsers: number, reduceOnly: boolean): Promise<TransactionSignature>;
+    getUpdateProtectedMakerModeConfigIx(maxUsers: number, reduceOnly: boolean): Promise<TransactionInstruction>;
 }

package/lib/browser/adminClient.js

@@ -1854,5 +1854,41 @@ class AdminClient extends driftClient_1.DriftClient {
             },
         });
     }
+    async initializeProtectedMakerModeConfig(maxUsers) {
+        const initializeProtectedMakerModeConfigIx = await this.getInitializeProtectedMakerModeConfigIx(maxUsers);
+        const tx = await this.buildTransaction(initializeProtectedMakerModeConfigIx);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
+    }
+    async getInitializeProtectedMakerModeConfigIx(maxUsers) {
+        return await this.program.instruction.initializeProtectedMakerModeConfig(maxUsers, {
+            accounts: {
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+                rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+                systemProgram: anchor.web3.SystemProgram.programId,
+                protectedMakerModeConfig: (0, pda_1.getProtectedMakerModeConfigPublicKey)(this.program.programId),
+            },
+        });
+    }
+    async updateProtectedMakerModeConfig(maxUsers, reduceOnly) {
+        const updateProtectedMakerModeConfigIx = await this.getUpdateProtectedMakerModeConfigIx(maxUsers, reduceOnly);
+        const tx = await this.buildTransaction(updateProtectedMakerModeConfigIx);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
+    }
+    async getUpdateProtectedMakerModeConfigIx(maxUsers, reduceOnly) {
+        return await this.program.instruction.updateProtectedMakerModeConfig(maxUsers, reduceOnly, {
+            accounts: {
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+                protectedMakerModeConfig: (0, pda_1.getProtectedMakerModeConfigPublicKey)(this.program.programId),
+            },
+        });
+    }
 }
 exports.AdminClient = AdminClient;

package/lib/browser/constants/perpMarkets.js

@@ -380,8 +380,8 @@ exports.MainnetPerpMarkets = [
     {
         fullName: 'Polygon',
         category: ['L2', 'Infra'],
-        symbol: 'MATIC-PERP',
-        baseAssetSymbol: 'MATIC',
+        symbol: 'POL-PERP',
+        baseAssetSymbol: 'POL',
         marketIndex: 5,
         oracle: new web3_js_1.PublicKey('BrzyDgwELy4jjjsqLQpBeUxzrsueYyMhuWpYBaUYcXvi'),
         launchTs: 1677690149000,

package/lib/browser/driftClient.js

@@ -429,13 +429,17 @@ class DriftClient {
             userStatsAccountPublicKey: this.getUserStatsAccountPublicKey(),
             accountSubscription: this.userStatsAccountSubscriptionConfig,
         });
-        await this.userStats.subscribe();
+        const subscriptionPromises = [this.userStats.subscribe()];
         let success = true;
         if (this.isSubscribed) {
-            await Promise.all(this.unsubscribeUsers());
-            this.users.clear();
-            success = await this.addAndSubscribeToUsers();
+            const reSubscribeUsersPromise = async () => {
+                await Promise.all(this.unsubscribeUsers());
+                this.users.clear();
+                success = await this.addAndSubscribeToUsers();
+            };
+            subscriptionPromises.push(reSubscribeUsersPromise());
         }
+        await Promise.all(subscriptionPromises);
         return success;
     }
     /**

package/lib/node/addresses/pda.d.ts

@@ -30,3 +30,4 @@ export declare function getPythPullOraclePublicKey(progarmId: PublicKey, feedId:
 export declare function getPythLazerOraclePublicKey(progarmId: PublicKey, feedId: number): PublicKey;
 export declare function getTokenProgramForSpotMarket(spotMarketAccount: SpotMarketAccount): PublicKey;
 export declare function getHighLeverageModeConfigPublicKey(programId: PublicKey): PublicKey;
+export declare function getProtectedMakerModeConfigPublicKey(programId: PublicKey): PublicKey;

package/lib/node/addresses/pda.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getHighLeverageModeConfigPublicKey = exports.getTokenProgramForSpotMarket = exports.getPythLazerOraclePublicKey = exports.getPythPullOraclePublicKey = exports.getPrelaunchOraclePublicKey = exports.getProtocolIfSharesTransferConfigPublicKey = exports.getReferrerNamePublicKeySync = exports.getOpenbookV2FulfillmentConfigPublicKey = exports.getPhoenixFulfillmentConfigPublicKey = exports.getSerumFulfillmentConfigPublicKey = exports.getSerumSignerPublicKey = exports.getSerumOpenOrdersPublicKey = exports.getDriftSignerPublicKey = exports.getInsuranceFundStakeAccountPublicKey = exports.getInsuranceFundVaultPublicKey = exports.getSpotMarketVaultPublicKey = exports.getSpotMarketPublicKeySync = exports.getSpotMarketPublicKey = exports.getPerpMarketPublicKeySync = exports.getPerpMarketPublicKey = exports.getSwiftUserAccountPublicKey = exports.getRFQUserAccountPublicKey = exports.getUserStatsAccountPublicKey = exports.getUserAccountPublicKeySync = exports.getUserAccountPublicKey = exports.getUserAccountPublicKeyAndNonce = exports.getDriftStateAccountPublicKey = exports.getDriftStateAccountPublicKeyAndNonce = void 0;
+exports.getProtectedMakerModeConfigPublicKey = exports.getHighLeverageModeConfigPublicKey = exports.getTokenProgramForSpotMarket = exports.getPythLazerOraclePublicKey = exports.getPythPullOraclePublicKey = exports.getPrelaunchOraclePublicKey = exports.getProtocolIfSharesTransferConfigPublicKey = exports.getReferrerNamePublicKeySync = exports.getOpenbookV2FulfillmentConfigPublicKey = exports.getPhoenixFulfillmentConfigPublicKey = exports.getSerumFulfillmentConfigPublicKey = exports.getSerumSignerPublicKey = exports.getSerumOpenOrdersPublicKey = exports.getDriftSignerPublicKey = exports.getInsuranceFundStakeAccountPublicKey = exports.getInsuranceFundVaultPublicKey = exports.getSpotMarketVaultPublicKey = exports.getSpotMarketPublicKeySync = exports.getSpotMarketPublicKey = exports.getPerpMarketPublicKeySync = exports.getPerpMarketPublicKey = exports.getSwiftUserAccountPublicKey = exports.getRFQUserAccountPublicKey = exports.getUserStatsAccountPublicKey = exports.getUserAccountPublicKeySync = exports.getUserAccountPublicKey = exports.getUserAccountPublicKeyAndNonce = exports.getDriftStateAccountPublicKey = exports.getDriftStateAccountPublicKeyAndNonce = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const anchor = __importStar(require("@coral-xyz/anchor"));
 const spl_token_1 = require("@solana/spl-token");
@@ -209,3 +209,9 @@ function getHighLeverageModeConfigPublicKey(programId) {
     return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from(anchor.utils.bytes.utf8.encode('high_leverage_mode_config'))], programId)[0];
 }
 exports.getHighLeverageModeConfigPublicKey = getHighLeverageModeConfigPublicKey;
+function getProtectedMakerModeConfigPublicKey(programId) {
+    return web3_js_1.PublicKey.findProgramAddressSync([
+        Buffer.from(anchor.utils.bytes.utf8.encode('protected_maker_mode_config')),
+    ], programId)[0];
+}
+exports.getProtectedMakerModeConfigPublicKey = getProtectedMakerModeConfigPublicKey;

package/lib/node/adminClient.d.ts

@@ -203,4 +203,8 @@ export declare class AdminClient extends DriftClient {
     getInitializeHighLeverageModeConfigIx(maxUsers: number): Promise<TransactionInstruction>;
     updateUpdateHighLeverageModeConfig(maxUsers: number, reduceOnly: boolean): Promise<TransactionSignature>;
     getUpdateHighLeverageModeConfigIx(maxUsers: number, reduceOnly: boolean): Promise<TransactionInstruction>;
+    initializeProtectedMakerModeConfig(maxUsers: number): Promise<TransactionSignature>;
+    getInitializeProtectedMakerModeConfigIx(maxUsers: number): Promise<TransactionInstruction>;
+    updateProtectedMakerModeConfig(maxUsers: number, reduceOnly: boolean): Promise<TransactionSignature>;
+    getUpdateProtectedMakerModeConfigIx(maxUsers: number, reduceOnly: boolean): Promise<TransactionInstruction>;
 }

package/lib/node/adminClient.js

@@ -1854,5 +1854,41 @@ class AdminClient extends driftClient_1.DriftClient {
             },
         });
     }
+    async initializeProtectedMakerModeConfig(maxUsers) {
+        const initializeProtectedMakerModeConfigIx = await this.getInitializeProtectedMakerModeConfigIx(maxUsers);
+        const tx = await this.buildTransaction(initializeProtectedMakerModeConfigIx);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
+    }
+    async getInitializeProtectedMakerModeConfigIx(maxUsers) {
+        return await this.program.instruction.initializeProtectedMakerModeConfig(maxUsers, {
+            accounts: {
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+                rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+                systemProgram: anchor.web3.SystemProgram.programId,
+                protectedMakerModeConfig: (0, pda_1.getProtectedMakerModeConfigPublicKey)(this.program.programId),
+            },
+        });
+    }
+    async updateProtectedMakerModeConfig(maxUsers, reduceOnly) {
+        const updateProtectedMakerModeConfigIx = await this.getUpdateProtectedMakerModeConfigIx(maxUsers, reduceOnly);
+        const tx = await this.buildTransaction(updateProtectedMakerModeConfigIx);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
+    }
+    async getUpdateProtectedMakerModeConfigIx(maxUsers, reduceOnly) {
+        return await this.program.instruction.updateProtectedMakerModeConfig(maxUsers, reduceOnly, {
+            accounts: {
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+                protectedMakerModeConfig: (0, pda_1.getProtectedMakerModeConfigPublicKey)(this.program.programId),
+            },
+        });
+    }
 }
 exports.AdminClient = AdminClient;

package/lib/node/constants/perpMarkets.js

@@ -380,8 +380,8 @@ exports.MainnetPerpMarkets = [
     {
         fullName: 'Polygon',
         category: ['L2', 'Infra'],
-        symbol: 'MATIC-PERP',
-        baseAssetSymbol: 'MATIC',
+        symbol: 'POL-PERP',
+        baseAssetSymbol: 'POL',
         marketIndex: 5,
         oracle: new web3_js_1.PublicKey('BrzyDgwELy4jjjsqLQpBeUxzrsueYyMhuWpYBaUYcXvi'),
         launchTs: 1677690149000,

package/lib/node/driftClient.js

@@ -429,13 +429,17 @@ class DriftClient {
             userStatsAccountPublicKey: this.getUserStatsAccountPublicKey(),
             accountSubscription: this.userStatsAccountSubscriptionConfig,
         });
-        await this.userStats.subscribe();
+        const subscriptionPromises = [this.userStats.subscribe()];
         let success = true;
         if (this.isSubscribed) {
-            await Promise.all(this.unsubscribeUsers());
-            this.users.clear();
-            success = await this.addAndSubscribeToUsers();
+            const reSubscribeUsersPromise = async () => {
+                await Promise.all(this.unsubscribeUsers());
+                this.users.clear();
+                success = await this.addAndSubscribeToUsers();
+            };
+            subscriptionPromises.push(reSubscribeUsersPromise());
         }
+        await Promise.all(subscriptionPromises);
         return success;
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.104.0-beta.22",
+	"version": "2.104.0-beta.24",
 	"main": "lib/node/index.js",
 	"types": "lib/node/index.d.ts",
 	"browser": "./lib/browser/index.js",

package/src/addresses/pda.ts

@@ -353,3 +353,16 @@ export function getHighLeverageModeConfigPublicKey(
 		programId
 	)[0];
 }
+
+export function getProtectedMakerModeConfigPublicKey(
+	programId: PublicKey
+): PublicKey {
+	return PublicKey.findProgramAddressSync(
+		[
+			Buffer.from(
+				anchor.utils.bytes.utf8.encode('protected_maker_mode_config')
+			),
+		],
+		programId
+	)[0];
+}

package/src/adminClient.ts

@@ -34,6 +34,7 @@ import {
 	getUserStatsAccountPublicKey,
 	getHighLeverageModeConfigPublicKey,
 	getPythLazerOraclePublicKey,
+	getProtectedMakerModeConfigPublicKey,
 } from './addresses/pda';
 import { squareRootBN } from './math/utils';
 import { TOKEN_PROGRAM_ID } from '@solana/spl-token';
@@ -4027,4 +4028,75 @@ export class AdminClient extends DriftClient {
 			}
 		);
 	}
+
+	public async initializeProtectedMakerModeConfig(
+		maxUsers: number
+	): Promise<TransactionSignature> {
+		const initializeProtectedMakerModeConfigIx =
+			await this.getInitializeProtectedMakerModeConfigIx(maxUsers);
+
+		const tx = await this.buildTransaction(
+			initializeProtectedMakerModeConfigIx
+		);
+
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
+		return txSig;
+	}
+
+	public async getInitializeProtectedMakerModeConfigIx(
+		maxUsers: number
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.initializeProtectedMakerModeConfig(
+			maxUsers,
+			{
+				accounts: {
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					rent: SYSVAR_RENT_PUBKEY,
+					systemProgram: anchor.web3.SystemProgram.programId,
+					protectedMakerModeConfig: getProtectedMakerModeConfigPublicKey(
+						this.program.programId
+					),
+				},
+			}
+		);
+	}
+
+	public async updateProtectedMakerModeConfig(
+		maxUsers: number,
+		reduceOnly: boolean
+	): Promise<TransactionSignature> {
+		const updateProtectedMakerModeConfigIx =
+			await this.getUpdateProtectedMakerModeConfigIx(maxUsers, reduceOnly);
+
+		const tx = await this.buildTransaction(updateProtectedMakerModeConfigIx);
+
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
+		return txSig;
+	}
+
+	public async getUpdateProtectedMakerModeConfigIx(
+		maxUsers: number,
+		reduceOnly: boolean
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updateProtectedMakerModeConfig(
+			maxUsers,
+			reduceOnly,
+			{
+				accounts: {
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					protectedMakerModeConfig: getProtectedMakerModeConfigPublicKey(
+						this.program.programId
+					),
+				},
+			}
+		);
+	}
 }

package/src/constants/perpMarkets.ts

@@ -423,8 +423,8 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 	{
 		fullName: 'Polygon',
 		category: ['L2', 'Infra'],
-		symbol: 'MATIC-PERP',
-		baseAssetSymbol: 'MATIC',
+		symbol: 'POL-PERP',
+		baseAssetSymbol: 'POL',
 		marketIndex: 5,
 		oracle: new PublicKey('BrzyDgwELy4jjjsqLQpBeUxzrsueYyMhuWpYBaUYcXvi'),
 		launchTs: 1677690149000, //todo

package/src/driftClient.ts

@@ -776,16 +776,22 @@ export class DriftClient {
 			accountSubscription: this.userStatsAccountSubscriptionConfig,
 		});
 
-		await this.userStats.subscribe();
+		const subscriptionPromises: Promise<any>[] = [this.userStats.subscribe()];
 
 		let success = true;
 
 		if (this.isSubscribed) {
-			await Promise.all(this.unsubscribeUsers());
-			this.users.clear();
-			success = await this.addAndSubscribeToUsers();
+			const reSubscribeUsersPromise = async () => {
+				await Promise.all(this.unsubscribeUsers());
+				this.users.clear();
+				success = await this.addAndSubscribeToUsers();
+			};
+
+			subscriptionPromises.push(reSubscribeUsersPromise());
 		}
 
+		await Promise.all(subscriptionPromises);
+
 		return success;
 	}