@drift-labs/sdk-browser 2.110.0-beta.22 → 2.110.0-beta.23

package/VERSION

@@ -1 +1 @@
-2.110.0-beta.22
+2.110.0-beta.23

package/lib/browser/driftClient.d.ts

@@ -343,6 +343,8 @@ export declare class DriftClient {
      */
     transferDeposit(amount: BN, marketIndex: number, fromSubAccountId: number, toSubAccountId: number, txParams?: TxParams): Promise<TransactionSignature>;
     getTransferDepositIx(amount: BN, marketIndex: number, fromSubAccountId: number, toSubAccountId: number): Promise<TransactionInstruction>;
+    transferPools(depositFromMarketIndex: number, depositToMarketIndex: number, borrowFromMarketIndex: number, borrowToMarketIndex: number, depositAmount: BN | undefined, borrowAmount: BN | undefined, fromSubAccountId: number, toSubAccountId: number, txParams?: TxParams): Promise<TransactionSignature>;
+    getTransferPoolsIx(depositFromMarketIndex: number, depositToMarketIndex: number, borrowFromMarketIndex: number, borrowToMarketIndex: number, depositAmount: BN | undefined, borrowAmount: BN | undefined, fromSubAccountId: number, toSubAccountId: number): Promise<TransactionInstruction>;
     updateSpotMarketCumulativeInterest(marketIndex: number, txParams?: TxParams): Promise<TransactionSignature>;
     updateSpotMarketCumulativeInterestIx(marketIndex: number): Promise<TransactionInstruction>;
     settleLP(settleeUserAccountPublicKey: PublicKey, marketIndex: number, txParams?: TxParams): Promise<TransactionSignature>;

package/lib/browser/driftClient.js

@@ -1716,6 +1716,62 @@ class DriftClient {
             remainingAccounts,
         });
     }
+    async transferPools(depositFromMarketIndex, depositToMarketIndex, borrowFromMarketIndex, borrowToMarketIndex, depositAmount, borrowAmount, fromSubAccountId, toSubAccountId, txParams) {
+        const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(await this.getTransferPoolsIx(depositFromMarketIndex, depositToMarketIndex, borrowFromMarketIndex, borrowToMarketIndex, depositAmount, borrowAmount, fromSubAccountId, toSubAccountId), txParams), [], this.opts);
+        if (fromSubAccountId === this.activeSubAccountId ||
+            toSubAccountId === this.activeSubAccountId) {
+            this.spotMarketLastSlotCache.set(depositFromMarketIndex, slot);
+            this.spotMarketLastSlotCache.set(depositToMarketIndex, slot);
+            this.spotMarketLastSlotCache.set(borrowFromMarketIndex, slot);
+            this.spotMarketLastSlotCache.set(borrowToMarketIndex, slot);
+        }
+        return txSig;
+    }
+    async getTransferPoolsIx(depositFromMarketIndex, depositToMarketIndex, borrowFromMarketIndex, borrowToMarketIndex, depositAmount, borrowAmount, fromSubAccountId, toSubAccountId) {
+        const fromUser = await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.wallet.publicKey, fromSubAccountId);
+        const toUser = await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.wallet.publicKey, toSubAccountId);
+        const userAccounts = [
+            this.getUserAccount(fromSubAccountId),
+            this.getUserAccount(toSubAccountId),
+        ];
+        const remainingAccounts = this.getRemainingAccounts({
+            userAccounts,
+            useMarketLastSlotCache: true,
+            writableSpotMarketIndexes: [
+                depositFromMarketIndex,
+                depositToMarketIndex,
+                borrowFromMarketIndex,
+                borrowToMarketIndex,
+            ],
+        });
+        const tokenPrograms = new Set();
+        const depositFromSpotMarket = this.getSpotMarketAccount(depositFromMarketIndex);
+        const borrowFromSpotMarket = this.getSpotMarketAccount(borrowFromMarketIndex);
+        tokenPrograms.add(this.getTokenProgramForSpotMarket(depositFromSpotMarket).toBase58());
+        tokenPrograms.add(this.getTokenProgramForSpotMarket(borrowFromSpotMarket).toBase58());
+        for (const tokenProgram of tokenPrograms) {
+            remainingAccounts.push({
+                isSigner: false,
+                isWritable: false,
+                pubkey: new web3_js_1.PublicKey(tokenProgram),
+            });
+        }
+        return await this.program.instruction.transferPools(depositFromMarketIndex, depositToMarketIndex, borrowFromMarketIndex, borrowToMarketIndex, depositAmount !== null && depositAmount !== void 0 ? depositAmount : null, borrowAmount !== null && borrowAmount !== void 0 ? borrowAmount : null, {
+            accounts: {
+                authority: this.wallet.publicKey,
+                fromUser,
+                toUser,
+                userStats: this.getUserStatsAccountPublicKey(),
+                state: await this.getStatePublicKey(),
+                depositFromSpotMarketVault: this.getSpotMarketAccount(depositFromMarketIndex).vault,
+                depositToSpotMarketVault: this.getSpotMarketAccount(depositToMarketIndex).vault,
+                borrowFromSpotMarketVault: this.getSpotMarketAccount(borrowFromMarketIndex).vault,
+                borrowToSpotMarketVault: this.getSpotMarketAccount(borrowToMarketIndex).vault,
+                driftSigner: this.getSignerPublicKey(),
+            },
+            remainingAccounts,
+        });
+    }
     async updateSpotMarketCumulativeInterest(marketIndex, txParams) {
         const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.updateSpotMarketCumulativeInterestIx(marketIndex), txParams), [], this.opts);
         return txSig;

package/lib/browser/idl/drift.json

@@ -452,6 +452,91 @@
                 }
             ]
         },
+        {
+            "name": "transferPools",
+            "accounts": [
+                {
+                    "name": "fromUser",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "toUser",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "userStats",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "authority",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "depositFromSpotMarketVault",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "depositToSpotMarketVault",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "borrowFromSpotMarketVault",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "borrowToSpotMarketVault",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "driftSigner",
+                    "isMut": false,
+                    "isSigner": false
+                }
+            ],
+            "args": [
+                {
+                    "name": "depositFromMarketIndex",
+                    "type": "u16"
+                },
+                {
+                    "name": "depositToMarketIndex",
+                    "type": "u16"
+                },
+                {
+                    "name": "borrowFromMarketIndex",
+                    "type": "u16"
+                },
+                {
+                    "name": "borrowToMarketIndex",
+                    "type": "u16"
+                },
+                {
+                    "name": "depositAmount",
+                    "type": {
+                        "option": "u64"
+                    }
+                },
+                {
+                    "name": "borrowAmount",
+                    "type": {
+                        "option": "u64"
+                    }
+                }
+            ]
+        },
         {
             "name": "placePerpOrder",
             "accounts": [

package/lib/node/driftClient.d.ts

@@ -343,6 +343,8 @@ export declare class DriftClient {
      */
     transferDeposit(amount: BN, marketIndex: number, fromSubAccountId: number, toSubAccountId: number, txParams?: TxParams): Promise<TransactionSignature>;
     getTransferDepositIx(amount: BN, marketIndex: number, fromSubAccountId: number, toSubAccountId: number): Promise<TransactionInstruction>;
+    transferPools(depositFromMarketIndex: number, depositToMarketIndex: number, borrowFromMarketIndex: number, borrowToMarketIndex: number, depositAmount: BN | undefined, borrowAmount: BN | undefined, fromSubAccountId: number, toSubAccountId: number, txParams?: TxParams): Promise<TransactionSignature>;
+    getTransferPoolsIx(depositFromMarketIndex: number, depositToMarketIndex: number, borrowFromMarketIndex: number, borrowToMarketIndex: number, depositAmount: BN | undefined, borrowAmount: BN | undefined, fromSubAccountId: number, toSubAccountId: number): Promise<TransactionInstruction>;
     updateSpotMarketCumulativeInterest(marketIndex: number, txParams?: TxParams): Promise<TransactionSignature>;
     updateSpotMarketCumulativeInterestIx(marketIndex: number): Promise<TransactionInstruction>;
     settleLP(settleeUserAccountPublicKey: PublicKey, marketIndex: number, txParams?: TxParams): Promise<TransactionSignature>;

package/lib/node/driftClient.js

@@ -1716,6 +1716,62 @@ class DriftClient {
             remainingAccounts,
         });
     }
+    async transferPools(depositFromMarketIndex, depositToMarketIndex, borrowFromMarketIndex, borrowToMarketIndex, depositAmount, borrowAmount, fromSubAccountId, toSubAccountId, txParams) {
+        const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(await this.getTransferPoolsIx(depositFromMarketIndex, depositToMarketIndex, borrowFromMarketIndex, borrowToMarketIndex, depositAmount, borrowAmount, fromSubAccountId, toSubAccountId), txParams), [], this.opts);
+        if (fromSubAccountId === this.activeSubAccountId ||
+            toSubAccountId === this.activeSubAccountId) {
+            this.spotMarketLastSlotCache.set(depositFromMarketIndex, slot);
+            this.spotMarketLastSlotCache.set(depositToMarketIndex, slot);
+            this.spotMarketLastSlotCache.set(borrowFromMarketIndex, slot);
+            this.spotMarketLastSlotCache.set(borrowToMarketIndex, slot);
+        }
+        return txSig;
+    }
+    async getTransferPoolsIx(depositFromMarketIndex, depositToMarketIndex, borrowFromMarketIndex, borrowToMarketIndex, depositAmount, borrowAmount, fromSubAccountId, toSubAccountId) {
+        const fromUser = await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.wallet.publicKey, fromSubAccountId);
+        const toUser = await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.wallet.publicKey, toSubAccountId);
+        const userAccounts = [
+            this.getUserAccount(fromSubAccountId),
+            this.getUserAccount(toSubAccountId),
+        ];
+        const remainingAccounts = this.getRemainingAccounts({
+            userAccounts,
+            useMarketLastSlotCache: true,
+            writableSpotMarketIndexes: [
+                depositFromMarketIndex,
+                depositToMarketIndex,
+                borrowFromMarketIndex,
+                borrowToMarketIndex,
+            ],
+        });
+        const tokenPrograms = new Set();
+        const depositFromSpotMarket = this.getSpotMarketAccount(depositFromMarketIndex);
+        const borrowFromSpotMarket = this.getSpotMarketAccount(borrowFromMarketIndex);
+        tokenPrograms.add(this.getTokenProgramForSpotMarket(depositFromSpotMarket).toBase58());
+        tokenPrograms.add(this.getTokenProgramForSpotMarket(borrowFromSpotMarket).toBase58());
+        for (const tokenProgram of tokenPrograms) {
+            remainingAccounts.push({
+                isSigner: false,
+                isWritable: false,
+                pubkey: new web3_js_1.PublicKey(tokenProgram),
+            });
+        }
+        return await this.program.instruction.transferPools(depositFromMarketIndex, depositToMarketIndex, borrowFromMarketIndex, borrowToMarketIndex, depositAmount !== null && depositAmount !== void 0 ? depositAmount : null, borrowAmount !== null && borrowAmount !== void 0 ? borrowAmount : null, {
+            accounts: {
+                authority: this.wallet.publicKey,
+                fromUser,
+                toUser,
+                userStats: this.getUserStatsAccountPublicKey(),
+                state: await this.getStatePublicKey(),
+                depositFromSpotMarketVault: this.getSpotMarketAccount(depositFromMarketIndex).vault,
+                depositToSpotMarketVault: this.getSpotMarketAccount(depositToMarketIndex).vault,
+                borrowFromSpotMarketVault: this.getSpotMarketAccount(borrowFromMarketIndex).vault,
+                borrowToSpotMarketVault: this.getSpotMarketAccount(borrowToMarketIndex).vault,
+                driftSigner: this.getSignerPublicKey(),
+            },
+            remainingAccounts,
+        });
+    }
     async updateSpotMarketCumulativeInterest(marketIndex, txParams) {
         const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.updateSpotMarketCumulativeInterestIx(marketIndex), txParams), [], this.opts);
         return txSig;

package/lib/node/idl/drift.json

@@ -452,6 +452,91 @@
                 }
             ]
         },
+        {
+            "name": "transferPools",
+            "accounts": [
+                {
+                    "name": "fromUser",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "toUser",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "userStats",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "authority",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "depositFromSpotMarketVault",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "depositToSpotMarketVault",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "borrowFromSpotMarketVault",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "borrowToSpotMarketVault",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "driftSigner",
+                    "isMut": false,
+                    "isSigner": false
+                }
+            ],
+            "args": [
+                {
+                    "name": "depositFromMarketIndex",
+                    "type": "u16"
+                },
+                {
+                    "name": "depositToMarketIndex",
+                    "type": "u16"
+                },
+                {
+                    "name": "borrowFromMarketIndex",
+                    "type": "u16"
+                },
+                {
+                    "name": "borrowToMarketIndex",
+                    "type": "u16"
+                },
+                {
+                    "name": "depositAmount",
+                    "type": {
+                        "option": "u64"
+                    }
+                },
+                {
+                    "name": "borrowAmount",
+                    "type": {
+                        "option": "u64"
+                    }
+                }
+            ]
+        },
         {
             "name": "placePerpOrder",
             "accounts": [

package/package.json

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

package/src/driftClient.ts

@@ -3154,6 +3154,138 @@ export class DriftClient {
 		});
 	}
 
+	public async transferPools(
+		depositFromMarketIndex: number,
+		depositToMarketIndex: number,
+		borrowFromMarketIndex: number,
+		borrowToMarketIndex: number,
+		depositAmount: BN | undefined,
+		borrowAmount: BN | undefined,
+		fromSubAccountId: number,
+		toSubAccountId: number,
+		txParams?: TxParams
+	): Promise<TransactionSignature> {
+		const { txSig, slot } = await this.sendTransaction(
+			await this.buildTransaction(
+				await this.getTransferPoolsIx(
+					depositFromMarketIndex,
+					depositToMarketIndex,
+					borrowFromMarketIndex,
+					borrowToMarketIndex,
+					depositAmount,
+					borrowAmount,
+					fromSubAccountId,
+					toSubAccountId
+				),
+				txParams
+			),
+			[],
+			this.opts
+		);
+
+		if (
+			fromSubAccountId === this.activeSubAccountId ||
+			toSubAccountId === this.activeSubAccountId
+		) {
+			this.spotMarketLastSlotCache.set(depositFromMarketIndex, slot);
+			this.spotMarketLastSlotCache.set(depositToMarketIndex, slot);
+			this.spotMarketLastSlotCache.set(borrowFromMarketIndex, slot);
+			this.spotMarketLastSlotCache.set(borrowToMarketIndex, slot);
+		}
+		return txSig;
+	}
+
+	public async getTransferPoolsIx(
+		depositFromMarketIndex: number,
+		depositToMarketIndex: number,
+		borrowFromMarketIndex: number,
+		borrowToMarketIndex: number,
+		depositAmount: BN | undefined,
+		borrowAmount: BN | undefined,
+		fromSubAccountId: number,
+		toSubAccountId: number
+	): Promise<TransactionInstruction> {
+		const fromUser = await getUserAccountPublicKey(
+			this.program.programId,
+			this.wallet.publicKey,
+			fromSubAccountId
+		);
+		const toUser = await getUserAccountPublicKey(
+			this.program.programId,
+			this.wallet.publicKey,
+			toSubAccountId
+		);
+
+		const userAccounts = [
+			this.getUserAccount(fromSubAccountId),
+			this.getUserAccount(toSubAccountId),
+		];
+
+		const remainingAccounts = this.getRemainingAccounts({
+			userAccounts,
+			useMarketLastSlotCache: true,
+			writableSpotMarketIndexes: [
+				depositFromMarketIndex,
+				depositToMarketIndex,
+				borrowFromMarketIndex,
+				borrowToMarketIndex,
+			],
+		});
+
+		const tokenPrograms = new Set<string>();
+		const depositFromSpotMarket = this.getSpotMarketAccount(
+			depositFromMarketIndex
+		);
+		const borrowFromSpotMarket = this.getSpotMarketAccount(
+			borrowFromMarketIndex
+		);
+
+		tokenPrograms.add(
+			this.getTokenProgramForSpotMarket(depositFromSpotMarket).toBase58()
+		);
+		tokenPrograms.add(
+			this.getTokenProgramForSpotMarket(borrowFromSpotMarket).toBase58()
+		);
+
+		for (const tokenProgram of tokenPrograms) {
+			remainingAccounts.push({
+				isSigner: false,
+				isWritable: false,
+				pubkey: new PublicKey(tokenProgram),
+			});
+		}
+
+		return await this.program.instruction.transferPools(
+			depositFromMarketIndex,
+			depositToMarketIndex,
+			borrowFromMarketIndex,
+			borrowToMarketIndex,
+			depositAmount ?? null,
+			borrowAmount ?? null,
+			{
+				accounts: {
+					authority: this.wallet.publicKey,
+					fromUser,
+					toUser,
+					userStats: this.getUserStatsAccountPublicKey(),
+					state: await this.getStatePublicKey(),
+					depositFromSpotMarketVault: this.getSpotMarketAccount(
+						depositFromMarketIndex
+					).vault,
+					depositToSpotMarketVault:
+						this.getSpotMarketAccount(depositToMarketIndex).vault,
+					borrowFromSpotMarketVault: this.getSpotMarketAccount(
+						borrowFromMarketIndex
+					).vault,
+					borrowToSpotMarketVault:
+						this.getSpotMarketAccount(borrowToMarketIndex).vault,
+					driftSigner: this.getSignerPublicKey(),
+				},
+				remainingAccounts,
+			}
+		);
+	}
+
 	public async updateSpotMarketCumulativeInterest(
 		marketIndex: number,
 		txParams?: TxParams

package/src/idl/drift.json

@@ -452,6 +452,91 @@
         }
       ]
     },
+    {
+      "name": "transferPools",
+      "accounts": [
+        {
+          "name": "fromUser",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "toUser",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "userStats",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "authority",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "depositFromSpotMarketVault",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "depositToSpotMarketVault",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "borrowFromSpotMarketVault",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "borrowToSpotMarketVault",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "driftSigner",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "depositFromMarketIndex",
+          "type": "u16"
+        },
+        {
+          "name": "depositToMarketIndex",
+          "type": "u16"
+        },
+        {
+          "name": "borrowFromMarketIndex",
+          "type": "u16"
+        },
+        {
+          "name": "borrowToMarketIndex",
+          "type": "u16"
+        },
+        {
+          "name": "depositAmount",
+          "type": {
+            "option": "u64"
+          }
+        },
+        {
+          "name": "borrowAmount",
+          "type": {
+            "option": "u64"
+          }
+        }
+      ]
+    },
     {
       "name": "placePerpOrder",
       "accounts": [