@drift-labs/sdk 2.103.0-beta.2 → 2.103.0-beta.4

package/VERSION

@@ -1 +1 @@
-2.103.0-beta.2
+2.103.0-beta.4

package/lib/browser/adminClient.d.ts

@@ -67,6 +67,8 @@ export declare class AdminClient extends DriftClient {
     getUpdatePerpMarketNameIx(perpMarketIndex: number, name: string): Promise<TransactionInstruction>;
     updateSpotMarketName(spotMarketIndex: number, name: string): Promise<TransactionSignature>;
     getUpdateSpotMarketNameIx(spotMarketIndex: number, name: string): Promise<TransactionInstruction>;
+    updateSpotMarketPoolId(spotMarketIndex: number, poolId: number): Promise<TransactionSignature>;
+    getUpdateSpotMarketPoolIdIx(spotMarketIndex: number, poolId: number): Promise<TransactionInstruction>;
     updatePerpMarketPerLpBase(perpMarketIndex: number, perLpBase: number): Promise<TransactionSignature>;
     getUpdatePerpMarketPerLpBaseIx(perpMarketIndex: number, perLpBase: number): Promise<TransactionInstruction>;
     updatePerpMarketMaxSpread(perpMarketIndex: number, maxSpread: number): Promise<TransactionSignature>;

package/lib/browser/adminClient.js

@@ -665,6 +665,23 @@ class AdminClient extends driftClient_1.DriftClient {
             },
         });
     }
+    async updateSpotMarketPoolId(spotMarketIndex, poolId) {
+        const updateSpotMarketPoolIdIx = await this.getUpdateSpotMarketPoolIdIx(spotMarketIndex, poolId);
+        const tx = await this.buildTransaction(updateSpotMarketPoolIdIx);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
+    }
+    async getUpdateSpotMarketPoolIdIx(spotMarketIndex, poolId) {
+        return await this.program.instruction.updateSpotMarketPoolId(poolId, {
+            accounts: {
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
+            },
+        });
+    }
     async updatePerpMarketPerLpBase(perpMarketIndex, perLpBase) {
         const updatePerpMarketPerLpBaseIx = await this.getUpdatePerpMarketPerLpBaseIx(perpMarketIndex, perLpBase);
         const tx = await this.buildTransaction(updatePerpMarketPerLpBaseIx);

package/lib/browser/constants/spotMarkets.js

@@ -363,6 +363,7 @@ exports.MainnetSpotMarkets = [
         mint: new web3_js_1.PublicKey('cbbtcf3aa214zXHbiAZQwf4122FBYbraNdFqgw4iMij'),
         precision: new __1.BN(10).pow(numericConstants_1.EIGHT),
         precisionExp: numericConstants_1.EIGHT,
+        openbookMarket: new web3_js_1.PublicKey('2HXgKaXKsMUEzQaSBZiXSd54eMHaS3roiefyGWtkW97W'),
         pythFeedId: '0xe62df6c8b4a85fe1a67db44dc12de5db330f7ac66b72dc658afedf0f4a415b43',
     },
     {

package/lib/browser/driftClient.d.ts

@@ -171,6 +171,11 @@ export declare class DriftClient {
         subAccountId: number;
     }[]): Promise<TransactionSignature>;
     getUpdateUserReduceOnlyIx(reduceOnly: boolean, subAccountId: number): Promise<anchor.web3.TransactionInstruction>;
+    updateUserPoolId(updates: {
+        poolId: number;
+        subAccountId: number;
+    }[]): Promise<TransactionSignature>;
+    getUpdateUserPoolIdIx(poolId: number, subAccountId: number): Promise<anchor.web3.TransactionInstruction>;
     fetchAllUserAccounts(includeIdle?: boolean): Promise<ProgramAccount<UserAccount>[]>;
     getUserAccountsForDelegate(delegate: PublicKey): Promise<UserAccount[]>;
     getUserAccountsAndAddressesForAuthority(authority: PublicKey): Promise<ProgramAccount<UserAccount>[]>;

package/lib/browser/driftClient.js

@@ -824,6 +824,23 @@ class DriftClient {
         });
         return ix;
     }
+    async updateUserPoolId(updates) {
+        const ixs = await Promise.all(updates.map(async ({ poolId, subAccountId }) => {
+            return await this.getUpdateUserPoolIdIx(poolId, subAccountId);
+        }));
+        const tx = await this.buildTransaction(ixs, this.txParams);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
+    }
+    async getUpdateUserPoolIdIx(poolId, subAccountId) {
+        const ix = await this.program.instruction.updateUserPoolId(subAccountId, poolId, {
+            accounts: {
+                user: (0, pda_1.getUserAccountPublicKeySync)(this.program.programId, this.wallet.publicKey, subAccountId),
+                authority: this.wallet.publicKey,
+            },
+        });
+        return ix;
+    }
     async fetchAllUserAccounts(includeIdle = true) {
         let filters = undefined;
         if (!includeIdle) {

package/lib/browser/idl/drift.json

@@ -1357,6 +1357,31 @@
                 }
             ]
         },
+        {
+            "name": "updateUserPoolId",
+            "accounts": [
+                {
+                    "name": "user",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "authority",
+                    "isMut": false,
+                    "isSigner": true
+                }
+            ],
+            "args": [
+                {
+                    "name": "subAccountId",
+                    "type": "u16"
+                },
+                {
+                    "name": "poolId",
+                    "type": "u8"
+                }
+            ]
+        },
         {
             "name": "updateUserDelegate",
             "accounts": [
@@ -4500,6 +4525,32 @@
                 }
             ]
         },
+        {
+            "name": "updateSpotMarketPoolId",
+            "accounts": [
+                {
+                    "name": "admin",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "spotMarket",
+                    "isMut": true,
+                    "isSigner": false
+                }
+            ],
+            "args": [
+                {
+                    "name": "poolId",
+                    "type": "u8"
+                }
+            ]
+        },
         {
             "name": "updateSpotMarketLiquidationFee",
             "accounts": [
@@ -7039,7 +7090,7 @@
                         "type": "u8"
                     },
                     {
-                        "name": "padding1",
+                        "name": "poolId",
                         "type": "u8"
                     },
                     {
@@ -7575,12 +7626,16 @@
                         "name": "tokenProgram",
                         "type": "u8"
                     },
+                    {
+                        "name": "poolId",
+                        "type": "u8"
+                    },
                     {
                         "name": "padding",
                         "type": {
                             "array": [
                                 "u8",
-                                41
+                                40
                             ]
                         }
                     }
@@ -7961,12 +8016,16 @@
                             "defined": "MarginMode"
                         }
                     },
+                    {
+                        "name": "poolId",
+                        "type": "u8"
+                    },
                     {
                         "name": "padding1",
                         "type": {
                             "array": [
                                 "u8",
-                                4
+                                3
                             ]
                         }
                     },
@@ -14089,6 +14148,11 @@
             "code": 6301,
             "name": "InvalidSwiftOrderId",
             "msg": "Swift order id cannot be 0s"
+        },
+        {
+            "code": 6302,
+            "name": "InvalidPoolId",
+            "msg": "Invalid pool id"
         }
     ],
     "metadata": {

package/lib/browser/types.d.ts

@@ -867,6 +867,7 @@ export type SpotMarketAccount = {
     fuelBoostMaker: number;
     fuelBoostInsurance: number;
     tokenProgram: number;
+    poolId: number;
 };
 export type PoolBalance = {
     scaledBalance: BN;

package/lib/node/adminClient.d.ts

@@ -67,6 +67,8 @@ export declare class AdminClient extends DriftClient {
     getUpdatePerpMarketNameIx(perpMarketIndex: number, name: string): Promise<TransactionInstruction>;
     updateSpotMarketName(spotMarketIndex: number, name: string): Promise<TransactionSignature>;
     getUpdateSpotMarketNameIx(spotMarketIndex: number, name: string): Promise<TransactionInstruction>;
+    updateSpotMarketPoolId(spotMarketIndex: number, poolId: number): Promise<TransactionSignature>;
+    getUpdateSpotMarketPoolIdIx(spotMarketIndex: number, poolId: number): Promise<TransactionInstruction>;
     updatePerpMarketPerLpBase(perpMarketIndex: number, perLpBase: number): Promise<TransactionSignature>;
     getUpdatePerpMarketPerLpBaseIx(perpMarketIndex: number, perLpBase: number): Promise<TransactionInstruction>;
     updatePerpMarketMaxSpread(perpMarketIndex: number, maxSpread: number): Promise<TransactionSignature>;

package/lib/node/adminClient.js

@@ -665,6 +665,23 @@ class AdminClient extends driftClient_1.DriftClient {
             },
         });
     }
+    async updateSpotMarketPoolId(spotMarketIndex, poolId) {
+        const updateSpotMarketPoolIdIx = await this.getUpdateSpotMarketPoolIdIx(spotMarketIndex, poolId);
+        const tx = await this.buildTransaction(updateSpotMarketPoolIdIx);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
+    }
+    async getUpdateSpotMarketPoolIdIx(spotMarketIndex, poolId) {
+        return await this.program.instruction.updateSpotMarketPoolId(poolId, {
+            accounts: {
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
+            },
+        });
+    }
     async updatePerpMarketPerLpBase(perpMarketIndex, perLpBase) {
         const updatePerpMarketPerLpBaseIx = await this.getUpdatePerpMarketPerLpBaseIx(perpMarketIndex, perLpBase);
         const tx = await this.buildTransaction(updatePerpMarketPerLpBaseIx);

package/lib/node/constants/spotMarkets.js

@@ -363,6 +363,7 @@ exports.MainnetSpotMarkets = [
         mint: new web3_js_1.PublicKey('cbbtcf3aa214zXHbiAZQwf4122FBYbraNdFqgw4iMij'),
         precision: new __1.BN(10).pow(numericConstants_1.EIGHT),
         precisionExp: numericConstants_1.EIGHT,
+        openbookMarket: new web3_js_1.PublicKey('2HXgKaXKsMUEzQaSBZiXSd54eMHaS3roiefyGWtkW97W'),
         pythFeedId: '0xe62df6c8b4a85fe1a67db44dc12de5db330f7ac66b72dc658afedf0f4a415b43',
     },
     {

package/lib/node/driftClient.d.ts

@@ -171,6 +171,11 @@ export declare class DriftClient {
         subAccountId: number;
     }[]): Promise<TransactionSignature>;
     getUpdateUserReduceOnlyIx(reduceOnly: boolean, subAccountId: number): Promise<anchor.web3.TransactionInstruction>;
+    updateUserPoolId(updates: {
+        poolId: number;
+        subAccountId: number;
+    }[]): Promise<TransactionSignature>;
+    getUpdateUserPoolIdIx(poolId: number, subAccountId: number): Promise<anchor.web3.TransactionInstruction>;
     fetchAllUserAccounts(includeIdle?: boolean): Promise<ProgramAccount<UserAccount>[]>;
     getUserAccountsForDelegate(delegate: PublicKey): Promise<UserAccount[]>;
     getUserAccountsAndAddressesForAuthority(authority: PublicKey): Promise<ProgramAccount<UserAccount>[]>;

package/lib/node/driftClient.js

@@ -824,6 +824,23 @@ class DriftClient {
         });
         return ix;
     }
+    async updateUserPoolId(updates) {
+        const ixs = await Promise.all(updates.map(async ({ poolId, subAccountId }) => {
+            return await this.getUpdateUserPoolIdIx(poolId, subAccountId);
+        }));
+        const tx = await this.buildTransaction(ixs, this.txParams);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
+    }
+    async getUpdateUserPoolIdIx(poolId, subAccountId) {
+        const ix = await this.program.instruction.updateUserPoolId(subAccountId, poolId, {
+            accounts: {
+                user: (0, pda_1.getUserAccountPublicKeySync)(this.program.programId, this.wallet.publicKey, subAccountId),
+                authority: this.wallet.publicKey,
+            },
+        });
+        return ix;
+    }
     async fetchAllUserAccounts(includeIdle = true) {
         let filters = undefined;
         if (!includeIdle) {

package/lib/node/idl/drift.json

@@ -1357,6 +1357,31 @@
                 }
             ]
         },
+        {
+            "name": "updateUserPoolId",
+            "accounts": [
+                {
+                    "name": "user",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "authority",
+                    "isMut": false,
+                    "isSigner": true
+                }
+            ],
+            "args": [
+                {
+                    "name": "subAccountId",
+                    "type": "u16"
+                },
+                {
+                    "name": "poolId",
+                    "type": "u8"
+                }
+            ]
+        },
         {
             "name": "updateUserDelegate",
             "accounts": [
@@ -4500,6 +4525,32 @@
                 }
             ]
         },
+        {
+            "name": "updateSpotMarketPoolId",
+            "accounts": [
+                {
+                    "name": "admin",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "spotMarket",
+                    "isMut": true,
+                    "isSigner": false
+                }
+            ],
+            "args": [
+                {
+                    "name": "poolId",
+                    "type": "u8"
+                }
+            ]
+        },
         {
             "name": "updateSpotMarketLiquidationFee",
             "accounts": [
@@ -7039,7 +7090,7 @@
                         "type": "u8"
                     },
                     {
-                        "name": "padding1",
+                        "name": "poolId",
                         "type": "u8"
                     },
                     {
@@ -7575,12 +7626,16 @@
                         "name": "tokenProgram",
                         "type": "u8"
                     },
+                    {
+                        "name": "poolId",
+                        "type": "u8"
+                    },
                     {
                         "name": "padding",
                         "type": {
                             "array": [
                                 "u8",
-                                41
+                                40
                             ]
                         }
                     }
@@ -7961,12 +8016,16 @@
                             "defined": "MarginMode"
                         }
                     },
+                    {
+                        "name": "poolId",
+                        "type": "u8"
+                    },
                     {
                         "name": "padding1",
                         "type": {
                             "array": [
                                 "u8",
-                                4
+                                3
                             ]
                         }
                     },
@@ -14089,6 +14148,11 @@
             "code": 6301,
             "name": "InvalidSwiftOrderId",
             "msg": "Swift order id cannot be 0s"
+        },
+        {
+            "code": 6302,
+            "name": "InvalidPoolId",
+            "msg": "Invalid pool id"
         }
     ],
     "metadata": {

package/lib/node/types.d.ts

@@ -867,6 +867,7 @@ export type SpotMarketAccount = {
     fuelBoostMaker: number;
     fuelBoostInsurance: number;
     tokenProgram: number;
+    poolId: number;
 };
 export type PoolBalance = {
     scaledBalance: BN;

package/package.json

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

package/src/adminClient.ts

@@ -1497,6 +1497,40 @@ export class AdminClient extends DriftClient {
 		});
 	}
 
+	public async updateSpotMarketPoolId(
+		spotMarketIndex: number,
+		poolId: number
+	): Promise<TransactionSignature> {
+		const updateSpotMarketPoolIdIx = await this.getUpdateSpotMarketPoolIdIx(
+			spotMarketIndex,
+			poolId
+		);
+
+		const tx = await this.buildTransaction(updateSpotMarketPoolIdIx);
+
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
+		return txSig;
+	}
+
+	public async getUpdateSpotMarketPoolIdIx(
+		spotMarketIndex: number,
+		poolId: number
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updateSpotMarketPoolId(poolId, {
+			accounts: {
+				admin: this.isSubscribed
+					? this.getStateAccount().admin
+					: this.wallet.publicKey,
+				state: await this.getStatePublicKey(),
+				spotMarket: await getSpotMarketPublicKey(
+					this.program.programId,
+					spotMarketIndex
+				),
+			},
+		});
+	}
+
 	public async updatePerpMarketPerLpBase(
 		perpMarketIndex: number,
 		perLpBase: number

package/src/constants/spotMarkets.ts

@@ -447,6 +447,9 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 		mint: new PublicKey('cbbtcf3aa214zXHbiAZQwf4122FBYbraNdFqgw4iMij'),
 		precision: new BN(10).pow(EIGHT),
 		precisionExp: EIGHT,
+		openbookMarket: new PublicKey(
+			'2HXgKaXKsMUEzQaSBZiXSd54eMHaS3roiefyGWtkW97W'
+		),
 		pythFeedId:
 			'0xe62df6c8b4a85fe1a67db44dc12de5db330f7ac66b72dc658afedf0f4a415b43',
 	},

package/src/driftClient.ts

@@ -1440,6 +1440,40 @@ export class DriftClient {
 		return ix;
 	}
 
+	public async updateUserPoolId(
+		updates: { poolId: number; subAccountId: number }[]
+	): Promise<TransactionSignature> {
+		const ixs = await Promise.all(
+			updates.map(async ({ poolId, subAccountId }) => {
+				return await this.getUpdateUserPoolIdIx(poolId, subAccountId);
+			})
+		);
+
+		const tx = await this.buildTransaction(ixs, this.txParams);
+
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+		return txSig;
+	}
+
+	public async getUpdateUserPoolIdIx(poolId: number, subAccountId: number) {
+		const ix = await this.program.instruction.updateUserPoolId(
+			subAccountId,
+			poolId,
+			{
+				accounts: {
+					user: getUserAccountPublicKeySync(
+						this.program.programId,
+						this.wallet.publicKey,
+						subAccountId
+					),
+					authority: this.wallet.publicKey,
+				},
+			}
+		);
+
+		return ix;
+	}
+
 	public async fetchAllUserAccounts(
 		includeIdle = true
 	): Promise<ProgramAccount<UserAccount>[]> {

package/src/idl/drift.json

@@ -1357,6 +1357,31 @@
         }
       ]
     },
+    {
+      "name": "updateUserPoolId",
+      "accounts": [
+        {
+          "name": "user",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "authority",
+          "isMut": false,
+          "isSigner": true
+        }
+      ],
+      "args": [
+        {
+          "name": "subAccountId",
+          "type": "u16"
+        },
+        {
+          "name": "poolId",
+          "type": "u8"
+        }
+      ]
+    },
     {
       "name": "updateUserDelegate",
       "accounts": [
@@ -4500,6 +4525,32 @@
         }
       ]
     },
+    {
+      "name": "updateSpotMarketPoolId",
+      "accounts": [
+        {
+          "name": "admin",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "spotMarket",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "poolId",
+          "type": "u8"
+        }
+      ]
+    },
     {
       "name": "updateSpotMarketLiquidationFee",
       "accounts": [
@@ -7039,7 +7090,7 @@
             "type": "u8"
           },
           {
-            "name": "padding1",
+            "name": "poolId",
             "type": "u8"
           },
           {
@@ -7575,12 +7626,16 @@
             "name": "tokenProgram",
             "type": "u8"
           },
+          {
+            "name": "poolId",
+            "type": "u8"
+          },
           {
             "name": "padding",
             "type": {
               "array": [
                 "u8",
-                41
+                40
               ]
             }
           }
@@ -7961,12 +8016,16 @@
               "defined": "MarginMode"
             }
           },
+          {
+            "name": "poolId",
+            "type": "u8"
+          },
           {
             "name": "padding1",
             "type": {
               "array": [
                 "u8",
-                4
+                3
               ]
             }
           },
@@ -14089,6 +14148,11 @@
       "code": 6301,
       "name": "InvalidSwiftOrderId",
       "msg": "Swift order id cannot be 0s"
+    },
+    {
+      "code": 6302,
+      "name": "InvalidPoolId",
+      "msg": "Invalid pool id"
     }
   ],
   "metadata": {

package/src/types.ts

@@ -794,6 +794,8 @@ export type SpotMarketAccount = {
 	fuelBoostInsurance: number;
 
 	tokenProgram: number;
+
+	poolId: number;
 };
 
 export type PoolBalance = {