@drift-labs/common 1.0.41 → 1.0.43

package/lib/drift/base/actions/index.d.ts

@@ -3,3 +3,4 @@ export * from './trade';
 export * from './perp';
 export * from './spot';
 export * from './builder';
+export * from './swift';

package/lib/drift/base/actions/index.js

@@ -19,4 +19,5 @@ __exportStar(require("./trade"), exports);
 __exportStar(require("./perp"), exports);
 __exportStar(require("./spot"), exports);
 __exportStar(require("./builder"), exports);
+__exportStar(require("./swift"), exports);
 //# sourceMappingURL=index.js.map

package/lib/drift/base/actions/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/drift/base/actions/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yCAAuB;AACvB,0CAAwB;AACxB,yCAAuB;AACvB,yCAAuB;AACvB,4CAA0B","sourcesContent":["export * from './user';\nexport * from './trade';\nexport * from './perp';\nexport * from './spot';\nexport * from './builder';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/drift/base/actions/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yCAAuB;AACvB,0CAAwB;AACxB,yCAAuB;AACvB,yCAAuB;AACvB,4CAA0B;AAC1B,0CAAwB","sourcesContent":["export * from './user';\nexport * from './trade';\nexport * from './perp';\nexport * from './spot';\nexport * from './builder';\nexport * from './swift';\n"]}

package/lib/drift/base/actions/spot/deposit.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createDepositTxn = exports.createDepositIxs = void 0;
-const sdk_1 = require("@drift-labs/sdk");
-const spl_token_1 = require("@solana/spl-token");
+const token_1 = require("../../../../utils/token");
 /**
  * Creates transaction instructions for depositing a spot token.
  *
@@ -18,10 +17,7 @@ const spl_token_1 = require("@solana/spl-token");
 const createDepositIxs = async ({ driftClient, user, amount, spotMarketConfig, isMaxBorrowRepayment, externalWallet, }) => {
     const authority = externalWallet !== null && externalWallet !== void 0 ? externalWallet : user.getUserAccount().authority;
     const spotMarketAccount = driftClient.getSpotMarketAccount(spotMarketConfig.marketIndex);
-    const isSol = spotMarketAccount.mint.equals(sdk_1.WRAPPED_SOL_MINT);
-    const associatedDepositTokenAddress = isSol
-        ? authority
-        : await (0, spl_token_1.getAssociatedTokenAddress)(spotMarketAccount.mint, authority, true, (0, sdk_1.getTokenProgramForSpotMarket)(spotMarketAccount));
+    const associatedDepositTokenAddress = await (0, token_1.getTokenAddressForDepositAndWithdraw)(spotMarketAccount, authority);
     let finalDepositAmount = amount;
     if (isMaxBorrowRepayment) {
         // we over-estimate to ensure that there is no borrow dust left

package/lib/drift/base/actions/spot/deposit.js.map

@@ -1 +1 @@
-{"version":3,"file":"deposit.js","sourceRoot":"","sources":["../../../../../src/drift/base/actions/spot/deposit.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n\tBigNum,\n\tDriftClient,\n\tgetTokenProgramForSpotMarket,\n\tSpotMarketConfig,\n\tTxParams,\n\tUser,\n\tWRAPPED_SOL_MINT,\n} from '@drift-labs/sdk';\nimport {\n\tPublicKey,\n\tTransaction,\n\tTransactionInstruction,\n\tVersionedTransaction,\n} from '@solana/web3.js';\nimport { getAssociatedTokenAddress } from '@solana/spl-token';\n\ninterface CreateDepositIxParams {\n\tdriftClient: DriftClient;\n\tuser: User;\n\tamount: BigNum;\n\tspotMarketConfig: Pick<SpotMarketConfig, 'mint' | 'marketIndex'>;\n\tisMaxBorrowRepayment?: boolean;\n\t/**\n\t * Optional external wallet to deposit from. If provided, the deposit will be made\n\t * from this wallet instead of the user's authority wallet.\n\t */\n\texternalWallet?: PublicKey;\n}\n\n/**\n * Creates transaction instructions for depositing a spot token.\n *\n * @param driftClient - The Drift client instance for interacting with the protocol\n * @param user - The user account that will perform the deposit\n * @param amount - The amount to deposit (in BigNum format)\n * @param spotMarketConfig - The spot market configuration for the token being deposited\n * @param isMaxBorrowRepayment - Whether this deposit is for maximum borrow repayment (scales amount by 2x, set to reduce only)\n * @param externalWallet - Optional external wallet to deposit from (instead of user's authority wallet)\n *\n * @returns Promise resolving to an array of transaction instructions for the deposit\n */\nexport const createDepositIxs = async ({\n\tdriftClient,\n\tuser,\n\tamount,\n\tspotMarketConfig,\n\tisMaxBorrowRepayment,\n\texternalWallet,\n}: CreateDepositIxParams): Promise<TransactionInstruction[]> => {\n\tconst authority = externalWallet ?? user.getUserAccount().authority;\n\tconst spotMarketAccount = driftClient.getSpotMarketAccount(\n\t\tspotMarketConfig.marketIndex\n\t);\n\tconst isSol = spotMarketAccount.mint.equals(WRAPPED_SOL_MINT);\n\tconst associatedDepositTokenAddress = isSol\n\t\t? authority\n\t\t: await getAssociatedTokenAddress(\n\t\t\t\tspotMarketAccount.mint,\n\t\t\t\tauthority,\n\t\t\t\ttrue,\n\t\t\t\tgetTokenProgramForSpotMarket(spotMarketAccount)\n\t\t  );\n\n\tlet finalDepositAmount = amount;\n\n\tif (isMaxBorrowRepayment) {\n\t\t// we over-estimate to ensure that there is no borrow dust left\n\t\t// since isMaxBorrowRepayment = reduceOnly, it is safe to over-estimate\n\t\tfinalDepositAmount = finalDepositAmount.scale(2, 1);\n\t}\n\n\tconst depositIxs = await driftClient.getDepositTxnIx(\n\t\tfinalDepositAmount.val,\n\t\tspotMarketConfig.marketIndex,\n\t\tassociatedDepositTokenAddress,\n\t\tuser.getUserAccount().subAccountId,\n\t\tisMaxBorrowRepayment,\n\t\texternalWallet ? { authority: externalWallet } : undefined\n\t);\n\n\treturn depositIxs;\n};\n\ninterface CreateDepositTxnParams extends CreateDepositIxParams {\n\ttxParams?: TxParams;\n\tinitSwiftAccount?: boolean;\n}\n\n/**\n * Creates a complete transaction for depositing assets into a spot market.\n *\n * @param driftClient - The Drift client instance for interacting with the protocol\n * @param user - The user account that will perform the deposit\n * @param amount - The amount to deposit (in BigNum format)\n * @param spotMarketConfig - The spot market configuration for the token being deposited\n * @param isMaxBorrowRepayment - Whether this deposit is for maximum borrow repayment (scales amount by 2x)\n * @param txParams - Optional transaction parameters for building the transaction (compute units, priority fees, etc.)\n * @param initSwiftAccount - Optional flag to initialize a Swift account during the deposit\n * @param externalWallet - Optional external wallet to deposit from (instead of user's authority wallet)\n *\n * @returns Promise resolving to a built transaction ready for signing (Transaction or VersionedTransaction)\n */\nexport const createDepositTxn = async ({\n\tdriftClient,\n\tuser,\n\tamount,\n\tspotMarketConfig,\n\tisMaxBorrowRepayment,\n\ttxParams,\n\tinitSwiftAccount: _initSwiftAccount,\n\texternalWallet,\n}: CreateDepositTxnParams): Promise<Transaction | VersionedTransaction> => {\n\t// const authority = user.getUserAccount().authority;\n\t// const associatedDepositTokenAddress =\n\t// \tawait getTokenAddressForDepositAndWithdraw(\n\t// \t\tspotMarketConfig.mint,\n\t// \t\tauthority\n\t// \t);\n\n\tlet finalDepositAmount = amount;\n\n\tif (isMaxBorrowRepayment) {\n\t\t// we over-estimate to ensure that there is no borrow dust left\n\t\t// since isMaxBorrowRepayment = reduceOnly, it is safe to over-estimate\n\t\tfinalDepositAmount = finalDepositAmount.scale(2, 1);\n\t}\n\n\t// we choose to not use createDepositIxs here because it doesn't have the initSwiftAccount logic\n\t// const depositTxn = await driftClient.createDepositTxn(\n\t// \tfinalDepositAmount.val,\n\t// \tspotMarketConfig.marketIndex,\n\t// \tassociatedDepositTokenAddress,\n\t// \tuser.getUserAccount().subAccountId,\n\t// \tisMaxBorrowRepayment,\n\t// \ttxParams,\n\t// \tinitSwiftAccount\n\t// );\n\tconst depositIxs = await createDepositIxs({\n\t\tdriftClient,\n\t\tuser,\n\t\tamount: finalDepositAmount,\n\t\tspotMarketConfig,\n\t\tisMaxBorrowRepayment,\n\t\texternalWallet,\n\t});\n\n\t// Wrapper to filter out null lookup tables from the driftClient\n\tconst fetchFilteredLookupTables = async () => {\n\t\tconst lookupTables = await driftClient.fetchAllLookupTableAccounts();\n\t\t// Filter out null/undefined values and return empty array if undefined\n\t\treturn (\n\t\t\tlookupTables?.filter((table) => table !== null && table !== undefined) ??\n\t\t\t[]\n\t\t);\n\t};\n\n\tconst depositTxn = await driftClient.txHandler.buildTransaction({\n\t\tinstructions: depositIxs,\n\t\ttxVersion: 0,\n\t\tconnection: driftClient.connection,\n\t\tpreFlightCommitment: 'confirmed',\n\t\tfetchAllMarketLookupTableAccounts: fetchFilteredLookupTables,\n\t\ttxParams,\n\t});\n\n\treturn depositTxn;\n};\n"]}
+{"version":3,"file":"deposit.js","sourceRoot":"","sources":["../../../../../src/drift/base/actions/spot/deposit.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n\tBigNum,\n\tDriftClient,\n\tSpotMarketConfig,\n\tTxParams,\n\tUser,\n} from '@drift-labs/sdk';\nimport {\n\tPublicKey,\n\tTransaction,\n\tTransactionInstruction,\n\tVersionedTransaction,\n} from '@solana/web3.js';\nimport { getTokenAddressForDepositAndWithdraw } from '../../../../utils/token';\n\ninterface CreateDepositIxParams {\n\tdriftClient: DriftClient;\n\tuser: User;\n\tamount: BigNum;\n\tspotMarketConfig: Pick<SpotMarketConfig, 'mint' | 'marketIndex'>;\n\tisMaxBorrowRepayment?: boolean;\n\t/**\n\t * Optional external wallet to deposit from. If provided, the deposit will be made\n\t * from this wallet instead of the user's authority wallet.\n\t */\n\texternalWallet?: PublicKey;\n}\n\n/**\n * Creates transaction instructions for depositing a spot token.\n *\n * @param driftClient - The Drift client instance for interacting with the protocol\n * @param user - The user account that will perform the deposit\n * @param amount - The amount to deposit (in BigNum format)\n * @param spotMarketConfig - The spot market configuration for the token being deposited\n * @param isMaxBorrowRepayment - Whether this deposit is for maximum borrow repayment (scales amount by 2x, set to reduce only)\n * @param externalWallet - Optional external wallet to deposit from (instead of user's authority wallet)\n *\n * @returns Promise resolving to an array of transaction instructions for the deposit\n */\nexport const createDepositIxs = async ({\n\tdriftClient,\n\tuser,\n\tamount,\n\tspotMarketConfig,\n\tisMaxBorrowRepayment,\n\texternalWallet,\n}: CreateDepositIxParams): Promise<TransactionInstruction[]> => {\n\tconst authority = externalWallet ?? user.getUserAccount().authority;\n\tconst spotMarketAccount = driftClient.getSpotMarketAccount(\n\t\tspotMarketConfig.marketIndex\n\t);\n\tconst associatedDepositTokenAddress =\n\t\tawait getTokenAddressForDepositAndWithdraw(spotMarketAccount, authority);\n\n\tlet finalDepositAmount = amount;\n\n\tif (isMaxBorrowRepayment) {\n\t\t// we over-estimate to ensure that there is no borrow dust left\n\t\t// since isMaxBorrowRepayment = reduceOnly, it is safe to over-estimate\n\t\tfinalDepositAmount = finalDepositAmount.scale(2, 1);\n\t}\n\n\tconst depositIxs = await driftClient.getDepositTxnIx(\n\t\tfinalDepositAmount.val,\n\t\tspotMarketConfig.marketIndex,\n\t\tassociatedDepositTokenAddress,\n\t\tuser.getUserAccount().subAccountId,\n\t\tisMaxBorrowRepayment,\n\t\texternalWallet ? { authority: externalWallet } : undefined\n\t);\n\n\treturn depositIxs;\n};\n\ninterface CreateDepositTxnParams extends CreateDepositIxParams {\n\ttxParams?: TxParams;\n\tinitSwiftAccount?: boolean;\n}\n\n/**\n * Creates a complete transaction for depositing assets into a spot market.\n *\n * @param driftClient - The Drift client instance for interacting with the protocol\n * @param user - The user account that will perform the deposit\n * @param amount - The amount to deposit (in BigNum format)\n * @param spotMarketConfig - The spot market configuration for the token being deposited\n * @param isMaxBorrowRepayment - Whether this deposit is for maximum borrow repayment (scales amount by 2x)\n * @param txParams - Optional transaction parameters for building the transaction (compute units, priority fees, etc.)\n * @param initSwiftAccount - Optional flag to initialize a Swift account during the deposit\n * @param externalWallet - Optional external wallet to deposit from (instead of user's authority wallet)\n *\n * @returns Promise resolving to a built transaction ready for signing (Transaction or VersionedTransaction)\n */\nexport const createDepositTxn = async ({\n\tdriftClient,\n\tuser,\n\tamount,\n\tspotMarketConfig,\n\tisMaxBorrowRepayment,\n\ttxParams,\n\tinitSwiftAccount: _initSwiftAccount,\n\texternalWallet,\n}: CreateDepositTxnParams): Promise<Transaction | VersionedTransaction> => {\n\t// const authority = user.getUserAccount().authority;\n\t// const associatedDepositTokenAddress =\n\t// \tawait getTokenAddressForDepositAndWithdraw(\n\t// \t\tspotMarketConfig.mint,\n\t// \t\tauthority\n\t// \t);\n\n\tlet finalDepositAmount = amount;\n\n\tif (isMaxBorrowRepayment) {\n\t\t// we over-estimate to ensure that there is no borrow dust left\n\t\t// since isMaxBorrowRepayment = reduceOnly, it is safe to over-estimate\n\t\tfinalDepositAmount = finalDepositAmount.scale(2, 1);\n\t}\n\n\t// we choose to not use createDepositIxs here because it doesn't have the initSwiftAccount logic\n\t// const depositTxn = await driftClient.createDepositTxn(\n\t// \tfinalDepositAmount.val,\n\t// \tspotMarketConfig.marketIndex,\n\t// \tassociatedDepositTokenAddress,\n\t// \tuser.getUserAccount().subAccountId,\n\t// \tisMaxBorrowRepayment,\n\t// \ttxParams,\n\t// \tinitSwiftAccount\n\t// );\n\tconst depositIxs = await createDepositIxs({\n\t\tdriftClient,\n\t\tuser,\n\t\tamount: finalDepositAmount,\n\t\tspotMarketConfig,\n\t\tisMaxBorrowRepayment,\n\t\texternalWallet,\n\t});\n\n\t// Wrapper to filter out null lookup tables from the driftClient\n\tconst fetchFilteredLookupTables = async () => {\n\t\tconst lookupTables = await driftClient.fetchAllLookupTableAccounts();\n\t\t// Filter out null/undefined values and return empty array if undefined\n\t\treturn (\n\t\t\tlookupTables?.filter((table) => table !== null && table !== undefined) ??\n\t\t\t[]\n\t\t);\n\t};\n\n\tconst depositTxn = await driftClient.txHandler.buildTransaction({\n\t\tinstructions: depositIxs,\n\t\ttxVersion: 0,\n\t\tconnection: driftClient.connection,\n\t\tpreFlightCommitment: 'confirmed',\n\t\tfetchAllMarketLookupTableAccounts: fetchFilteredLookupTables,\n\t\ttxParams,\n\t});\n\n\treturn depositTxn;\n};\n"]}

package/lib/drift/base/actions/spot/withdraw.js

@@ -20,7 +20,7 @@ const createWithdrawIx = async ({ driftClient, amount, spotMarketConfig, user, i
         }
     }
     const authority = user.getUserAccount().authority;
-    const associatedDepositTokenAddress = await (0, token_1.getTokenAddressForDepositAndWithdraw)(spotMarketConfig.mint, authority, (0, sdk_1.getTokenProgramForSpotMarket)(driftClient.getSpotMarketAccount(spotMarketConfig.marketIndex)));
+    const associatedDepositTokenAddress = await (0, token_1.getTokenAddressForDepositAndWithdraw)(driftClient.getSpotMarketAccount(spotMarketConfig.marketIndex), authority);
     const withdrawIxs = await driftClient.getWithdrawalIxs(finalWithdrawAmount.val, spotMarketConfig.marketIndex, associatedDepositTokenAddress, reduceOnly, user.getUserAccount().subAccountId, undefined);
     return withdrawIxs;
 };

package/lib/drift/base/actions/spot/withdraw.js.map

@@ -1 +1 @@
-{"version":3,"file":"withdraw.js","sourceRoot":"","sources":["../../../../../src/drift/base/actions/spot/withdraw.ts"],"names":[],"mappings":";;;AAAA,yCAOyB;AAMzB,mDAA+E;AAWxE,MAAM,gBAAgB,GAAG,KAAK,EAAE,EACtC,WAAW,EACX,MAAM,EACN,gBAAgB,EAChB,IAAI,EACJ,QAAQ,EACR,KAAK,GACmB,EAAqC,EAAE;;IAC/D,MAAM,UAAU,GAAG,CAAC,QAAQ,CAAC;IAE7B,IAAI,mBAAmB,GAAG,MAAM,CAAC;IAEjC,IAAI,KAAK,IAAI,UAAU,EAAE,CAAC;QACzB,+DAA+D;QAC/D,wDAAwD;QACxD,mBAAmB,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACtD,MAAM,aAAa,GAAG,MAAA,IAAI;aACxB,cAAc,EAAE;aAChB,aAAa,CAAC,IAAI,CAClB,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,WAAW,KAAK,gBAAgB,CAAC,WAAW,CACnE,0CAAE,aAAa,CAAC;QAClB,IAAI,aAAa,IAAI,aAAa,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACjD,uDAAuD;YACvD,mBAAmB,GAAG,YAAM,CAAC,GAAG,CAC/B,mBAAmB,EACnB,YAAM,CAAC,IAAI,CAAC,aAAa,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CACrE,CAAC;QACH,CAAC;IACF,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC,SAAS,CAAC;IAClD,MAAM,6BAA6B,GAClC,MAAM,IAAA,4CAAoC,EACzC,gBAAgB,CAAC,IAAI,EACrB,SAAS,EACT,IAAA,kCAA4B,EAC3B,WAAW,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAC9D,CACD,CAAC;IAEH,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,gBAAgB,CACrD,mBAAmB,CAAC,GAAG,EACvB,gBAAgB,CAAC,WAAW,EAC5B,6BAA6B,EAC7B,UAAU,EACV,IAAI,CAAC,cAAc,EAAE,CAAC,YAAY,EAClC,SAAS,CACT,CAAC;IAEF,OAAO,WAAW,CAAC;AACpB,CAAC,CAAC;AAlDW,QAAA,gBAAgB,oBAkD3B;AAMK,MAAM,iBAAiB,GAAG,KAAK,EAAE,EACvC,WAAW,EACX,MAAM,EACN,gBAAgB,EAChB,IAAI,EACJ,QAAQ,EACR,KAAK,EACL,QAAQ,GACiB,EAA+C,EAAE;IAC1E,MAAM,WAAW,GAAG,MAAM,IAAA,wBAAgB,EAAC;QAC1C,WAAW;QACX,MAAM;QACN,gBAAgB;QAChB,IAAI;QACJ,QAAQ;QACR,KAAK;KACL,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,gBAAgB,CAAC;QAChE,YAAY,EAAE,WAAW;QACzB,SAAS,EAAE,CAAC;QACZ,UAAU,EAAE,WAAW,CAAC,UAAU;QAClC,mBAAmB,EAAE,WAAW;QAChC,iCAAiC,EAChC,WAAW,CAAC,2BAA2B,CAAC,IAAI,CAAC,WAAW,CAAC;QAC1D,QAAQ;KACR,CAAC,CAAC;IAEH,OAAO,WAAW,CAAC;AACpB,CAAC,CAAC;AA7BW,QAAA,iBAAiB,qBA6B5B","sourcesContent":["import {\n\tBigNum,\n\tDriftClient,\n\tgetTokenProgramForSpotMarket,\n\tSpotMarketConfig,\n\tTxParams,\n\tUser,\n} from '@drift-labs/sdk';\nimport {\n\tTransaction,\n\tTransactionInstruction,\n\tVersionedTransaction,\n} from '@solana/web3.js';\nimport { getTokenAddressForDepositAndWithdraw } from '../../../../utils/token';\n\ninterface CreateWithdrawIxParams {\n\tdriftClient: DriftClient;\n\tuser: User;\n\tamount: BigNum;\n\tspotMarketConfig: SpotMarketConfig;\n\tisBorrow?: boolean;\n\tisMax?: boolean;\n}\n\nexport const createWithdrawIx = async ({\n\tdriftClient,\n\tamount,\n\tspotMarketConfig,\n\tuser,\n\tisBorrow,\n\tisMax,\n}: CreateWithdrawIxParams): Promise<TransactionInstruction[]> => {\n\tconst reduceOnly = !isBorrow;\n\n\tlet finalWithdrawAmount = amount;\n\n\tif (isMax && reduceOnly) {\n\t\t// we over-estimate to ensure that there is no borrow dust left\n\t\t// since reduceOnly is true, it is safe to over-estimate\n\t\tfinalWithdrawAmount = finalWithdrawAmount.scale(2, 1);\n\t\tconst scaledBalance = user\n\t\t\t.getUserAccount()\n\t\t\t.spotPositions.find(\n\t\t\t\t(position) => position.marketIndex === spotMarketConfig.marketIndex\n\t\t\t)?.scaledBalance;\n\t\tif (scaledBalance && scaledBalance.abs().gtn(0)) {\n\t\t\t// we use scaledBalance in case amount argument is zero\n\t\t\tfinalWithdrawAmount = BigNum.max(\n\t\t\t\tfinalWithdrawAmount,\n\t\t\t\tBigNum.from(scaledBalance, spotMarketConfig.precisionExp).scale(2, 1)\n\t\t\t);\n\t\t}\n\t}\n\n\tconst authority = user.getUserAccount().authority;\n\tconst associatedDepositTokenAddress =\n\t\tawait getTokenAddressForDepositAndWithdraw(\n\t\t\tspotMarketConfig.mint,\n\t\t\tauthority,\n\t\t\tgetTokenProgramForSpotMarket(\n\t\t\t\tdriftClient.getSpotMarketAccount(spotMarketConfig.marketIndex)\n\t\t\t)\n\t\t);\n\n\tconst withdrawIxs = await driftClient.getWithdrawalIxs(\n\t\tfinalWithdrawAmount.val,\n\t\tspotMarketConfig.marketIndex,\n\t\tassociatedDepositTokenAddress,\n\t\treduceOnly,\n\t\tuser.getUserAccount().subAccountId,\n\t\tundefined\n\t);\n\n\treturn withdrawIxs;\n};\n\ninterface CreateWithdrawTxnParams extends CreateWithdrawIxParams {\n\ttxParams?: TxParams;\n}\n\nexport const createWithdrawTxn = async ({\n\tdriftClient,\n\tamount,\n\tspotMarketConfig,\n\tuser,\n\tisBorrow,\n\tisMax,\n\ttxParams,\n}: CreateWithdrawTxnParams): Promise<Transaction | VersionedTransaction> => {\n\tconst withdrawIxs = await createWithdrawIx({\n\t\tdriftClient,\n\t\tamount,\n\t\tspotMarketConfig,\n\t\tuser,\n\t\tisBorrow,\n\t\tisMax,\n\t});\n\n\tconst withdrawTxn = await driftClient.txHandler.buildTransaction({\n\t\tinstructions: withdrawIxs,\n\t\ttxVersion: 0,\n\t\tconnection: driftClient.connection,\n\t\tpreFlightCommitment: 'confirmed',\n\t\tfetchAllMarketLookupTableAccounts:\n\t\t\tdriftClient.fetchAllLookupTableAccounts.bind(driftClient),\n\t\ttxParams,\n\t});\n\n\treturn withdrawTxn;\n};\n"]}
+{"version":3,"file":"withdraw.js","sourceRoot":"","sources":["../../../../../src/drift/base/actions/spot/withdraw.ts"],"names":[],"mappings":";;;AAAA,yCAMyB;AAMzB,mDAA+E;AAWxE,MAAM,gBAAgB,GAAG,KAAK,EAAE,EACtC,WAAW,EACX,MAAM,EACN,gBAAgB,EAChB,IAAI,EACJ,QAAQ,EACR,KAAK,GACmB,EAAqC,EAAE;;IAC/D,MAAM,UAAU,GAAG,CAAC,QAAQ,CAAC;IAE7B,IAAI,mBAAmB,GAAG,MAAM,CAAC;IAEjC,IAAI,KAAK,IAAI,UAAU,EAAE,CAAC;QACzB,+DAA+D;QAC/D,wDAAwD;QACxD,mBAAmB,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACtD,MAAM,aAAa,GAAG,MAAA,IAAI;aACxB,cAAc,EAAE;aAChB,aAAa,CAAC,IAAI,CAClB,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,WAAW,KAAK,gBAAgB,CAAC,WAAW,CACnE,0CAAE,aAAa,CAAC;QAClB,IAAI,aAAa,IAAI,aAAa,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACjD,uDAAuD;YACvD,mBAAmB,GAAG,YAAM,CAAC,GAAG,CAC/B,mBAAmB,EACnB,YAAM,CAAC,IAAI,CAAC,aAAa,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CACrE,CAAC;QACH,CAAC;IACF,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC,SAAS,CAAC;IAClD,MAAM,6BAA6B,GAClC,MAAM,IAAA,4CAAoC,EACzC,WAAW,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,WAAW,CAAC,EAC9D,SAAS,CACT,CAAC;IAEH,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,gBAAgB,CACrD,mBAAmB,CAAC,GAAG,EACvB,gBAAgB,CAAC,WAAW,EAC5B,6BAA6B,EAC7B,UAAU,EACV,IAAI,CAAC,cAAc,EAAE,CAAC,YAAY,EAClC,SAAS,CACT,CAAC;IAEF,OAAO,WAAW,CAAC;AACpB,CAAC,CAAC;AA/CW,QAAA,gBAAgB,oBA+C3B;AAMK,MAAM,iBAAiB,GAAG,KAAK,EAAE,EACvC,WAAW,EACX,MAAM,EACN,gBAAgB,EAChB,IAAI,EACJ,QAAQ,EACR,KAAK,EACL,QAAQ,GACiB,EAA+C,EAAE;IAC1E,MAAM,WAAW,GAAG,MAAM,IAAA,wBAAgB,EAAC;QAC1C,WAAW;QACX,MAAM;QACN,gBAAgB;QAChB,IAAI;QACJ,QAAQ;QACR,KAAK;KACL,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,gBAAgB,CAAC;QAChE,YAAY,EAAE,WAAW;QACzB,SAAS,EAAE,CAAC;QACZ,UAAU,EAAE,WAAW,CAAC,UAAU;QAClC,mBAAmB,EAAE,WAAW;QAChC,iCAAiC,EAChC,WAAW,CAAC,2BAA2B,CAAC,IAAI,CAAC,WAAW,CAAC;QAC1D,QAAQ;KACR,CAAC,CAAC;IAEH,OAAO,WAAW,CAAC;AACpB,CAAC,CAAC;AA7BW,QAAA,iBAAiB,qBA6B5B","sourcesContent":["import {\n\tBigNum,\n\tDriftClient,\n\tSpotMarketConfig,\n\tTxParams,\n\tUser,\n} from '@drift-labs/sdk';\nimport {\n\tTransaction,\n\tTransactionInstruction,\n\tVersionedTransaction,\n} from '@solana/web3.js';\nimport { getTokenAddressForDepositAndWithdraw } from '../../../../utils/token';\n\ninterface CreateWithdrawIxParams {\n\tdriftClient: DriftClient;\n\tuser: User;\n\tamount: BigNum;\n\tspotMarketConfig: SpotMarketConfig;\n\tisBorrow?: boolean;\n\tisMax?: boolean;\n}\n\nexport const createWithdrawIx = async ({\n\tdriftClient,\n\tamount,\n\tspotMarketConfig,\n\tuser,\n\tisBorrow,\n\tisMax,\n}: CreateWithdrawIxParams): Promise<TransactionInstruction[]> => {\n\tconst reduceOnly = !isBorrow;\n\n\tlet finalWithdrawAmount = amount;\n\n\tif (isMax && reduceOnly) {\n\t\t// we over-estimate to ensure that there is no borrow dust left\n\t\t// since reduceOnly is true, it is safe to over-estimate\n\t\tfinalWithdrawAmount = finalWithdrawAmount.scale(2, 1);\n\t\tconst scaledBalance = user\n\t\t\t.getUserAccount()\n\t\t\t.spotPositions.find(\n\t\t\t\t(position) => position.marketIndex === spotMarketConfig.marketIndex\n\t\t\t)?.scaledBalance;\n\t\tif (scaledBalance && scaledBalance.abs().gtn(0)) {\n\t\t\t// we use scaledBalance in case amount argument is zero\n\t\t\tfinalWithdrawAmount = BigNum.max(\n\t\t\t\tfinalWithdrawAmount,\n\t\t\t\tBigNum.from(scaledBalance, spotMarketConfig.precisionExp).scale(2, 1)\n\t\t\t);\n\t\t}\n\t}\n\n\tconst authority = user.getUserAccount().authority;\n\tconst associatedDepositTokenAddress =\n\t\tawait getTokenAddressForDepositAndWithdraw(\n\t\t\tdriftClient.getSpotMarketAccount(spotMarketConfig.marketIndex),\n\t\t\tauthority\n\t\t);\n\n\tconst withdrawIxs = await driftClient.getWithdrawalIxs(\n\t\tfinalWithdrawAmount.val,\n\t\tspotMarketConfig.marketIndex,\n\t\tassociatedDepositTokenAddress,\n\t\treduceOnly,\n\t\tuser.getUserAccount().subAccountId,\n\t\tundefined\n\t);\n\n\treturn withdrawIxs;\n};\n\ninterface CreateWithdrawTxnParams extends CreateWithdrawIxParams {\n\ttxParams?: TxParams;\n}\n\nexport const createWithdrawTxn = async ({\n\tdriftClient,\n\tamount,\n\tspotMarketConfig,\n\tuser,\n\tisBorrow,\n\tisMax,\n\ttxParams,\n}: CreateWithdrawTxnParams): Promise<Transaction | VersionedTransaction> => {\n\tconst withdrawIxs = await createWithdrawIx({\n\t\tdriftClient,\n\t\tamount,\n\t\tspotMarketConfig,\n\t\tuser,\n\t\tisBorrow,\n\t\tisMax,\n\t});\n\n\tconst withdrawTxn = await driftClient.txHandler.buildTransaction({\n\t\tinstructions: withdrawIxs,\n\t\ttxVersion: 0,\n\t\tconnection: driftClient.connection,\n\t\tpreFlightCommitment: 'confirmed',\n\t\tfetchAllMarketLookupTableAccounts:\n\t\t\tdriftClient.fetchAllLookupTableAccounts.bind(driftClient),\n\t\ttxParams,\n\t});\n\n\treturn withdrawTxn;\n};\n"]}

package/lib/drift/base/actions/swift/create.d.ts

@@ -0,0 +1,64 @@
+import { DriftClient, PublicKey, TxParams } from '@drift-labs/sdk';
+import { Transaction, TransactionInstruction, VersionedTransaction } from '@solana/web3.js';
+interface CreateSwiftAccountIxParams {
+    driftClient: DriftClient;
+    authority: PublicKey;
+    numOrders?: number;
+    /**
+     * Optional external wallet to use as payer. If provided, this wallet will pay
+     * for the account creation instead of the default wallet.
+     */
+    rentPayerOverride?: PublicKey;
+}
+/**
+ * Creates a transaction instruction for initializing a Swift (signed message user orders) account.
+ *
+ * @param driftClient - The Drift client instance
+ * @param authority - The public key of the account authority
+ * @param numOrders - The number of order slots to allocate (default: 8)
+ * @param rentPayerOverride - Optional wallet to pay for account creation instead of the default wallet
+ *
+ * @returns The Swift account public key and the initialization instruction
+ */
+export declare const createSwiftAccountIx: ({ driftClient, authority, numOrders, rentPayerOverride, }: CreateSwiftAccountIxParams) => Promise<{
+    swiftAccountPublicKey: PublicKey;
+    ix: TransactionInstruction;
+}>;
+interface CreateSwiftAccountTxnParams extends CreateSwiftAccountIxParams {
+    txParams?: TxParams;
+}
+/**
+ * Creates a complete transaction for initializing a Swift (signed message user orders) account.
+ *
+ * Wraps {@link createSwiftAccountIx} and builds a transaction ready for signing and submission.
+ *
+ * @param driftClient - The Drift client instance
+ * @param authority - The public key of the account authority
+ * @param numOrders - The number of order slots to allocate (default: 8)
+ * @param rentPayerOverride - Optional wallet to pay for account creation instead of the default wallet
+ * @param txParams - Optional transaction parameters (compute units, priority fees, etc.)
+ *
+ * @returns The built transaction and the Swift account public key
+ */
+export declare const createSwiftAccountTxn: ({ driftClient, authority, numOrders, rentPayerOverride: externalWallet, txParams, }: CreateSwiftAccountTxnParams) => Promise<{
+    transaction: Transaction | VersionedTransaction;
+    swiftAccountPublicKey: PublicKey;
+}>;
+/**
+ * Creates a Swift account instruction only if one doesn't already exist for the given authority.
+ *
+ * Always returns the Swift account public key. The `ix` will be `null` if the account
+ * is already initialized, indicating no transaction is needed.
+ *
+ * @param driftClient - The Drift client instance
+ * @param authority - The public key of the account authority
+ * @param numOrders - The number of order slots to allocate (default: 8)
+ * @param rentPayerOverride - Optional wallet to pay for account creation instead of the default wallet
+ *
+ * @returns The Swift account public key and the initialization instruction (null if already initialized)
+ */
+export declare const createSwiftAccountIxIfNotExists: ({ driftClient, authority, numOrders, rentPayerOverride, }: CreateSwiftAccountIxParams) => Promise<{
+    swiftAccountPublicKey: PublicKey;
+    ix: TransactionInstruction | null;
+}>;
+export {};

package/lib/drift/base/actions/swift/create.js

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createSwiftAccountIxIfNotExists = exports.createSwiftAccountTxn = exports.createSwiftAccountIx = void 0;
+const sdk_1 = require("@drift-labs/sdk");
+/**
+ * Creates a transaction instruction for initializing a Swift (signed message user orders) account.
+ *
+ * @param driftClient - The Drift client instance
+ * @param authority - The public key of the account authority
+ * @param numOrders - The number of order slots to allocate (default: 8)
+ * @param rentPayerOverride - Optional wallet to pay for account creation instead of the default wallet
+ *
+ * @returns The Swift account public key and the initialization instruction
+ */
+const createSwiftAccountIx = async ({ driftClient, authority, numOrders = 8, rentPayerOverride, }) => {
+    const [swiftAccountPublicKey, ix] = await driftClient.getInitializeSignedMsgUserOrdersAccountIx(authority, numOrders, { externalWallet: rentPayerOverride });
+    return { swiftAccountPublicKey, ix };
+};
+exports.createSwiftAccountIx = createSwiftAccountIx;
+/**
+ * Creates a complete transaction for initializing a Swift (signed message user orders) account.
+ *
+ * Wraps {@link createSwiftAccountIx} and builds a transaction ready for signing and submission.
+ *
+ * @param driftClient - The Drift client instance
+ * @param authority - The public key of the account authority
+ * @param numOrders - The number of order slots to allocate (default: 8)
+ * @param rentPayerOverride - Optional wallet to pay for account creation instead of the default wallet
+ * @param txParams - Optional transaction parameters (compute units, priority fees, etc.)
+ *
+ * @returns The built transaction and the Swift account public key
+ */
+const createSwiftAccountTxn = async ({ driftClient, authority, numOrders, rentPayerOverride: externalWallet, txParams, }) => {
+    const { swiftAccountPublicKey, ix } = await (0, exports.createSwiftAccountIx)({
+        driftClient,
+        authority,
+        numOrders,
+        rentPayerOverride: externalWallet,
+    });
+    const transaction = await driftClient.buildTransaction([ix], txParams);
+    return { transaction, swiftAccountPublicKey };
+};
+exports.createSwiftAccountTxn = createSwiftAccountTxn;
+/**
+ * Creates a Swift account instruction only if one doesn't already exist for the given authority.
+ *
+ * Always returns the Swift account public key. The `ix` will be `null` if the account
+ * is already initialized, indicating no transaction is needed.
+ *
+ * @param driftClient - The Drift client instance
+ * @param authority - The public key of the account authority
+ * @param numOrders - The number of order slots to allocate (default: 8)
+ * @param rentPayerOverride - Optional wallet to pay for account creation instead of the default wallet
+ *
+ * @returns The Swift account public key and the initialization instruction (null if already initialized)
+ */
+const createSwiftAccountIxIfNotExists = async ({ driftClient, authority, numOrders = 8, rentPayerOverride, }) => {
+    const isInitialized = await driftClient.isSignedMsgUserOrdersAccountInitialized(authority);
+    if (isInitialized) {
+        const swiftAccountPublicKey = (0, sdk_1.getSignedMsgUserAccountPublicKey)(driftClient.program.programId, authority);
+        return { swiftAccountPublicKey, ix: null };
+    }
+    return await (0, exports.createSwiftAccountIx)({
+        driftClient,
+        authority,
+        numOrders,
+        rentPayerOverride,
+    });
+};
+exports.createSwiftAccountIxIfNotExists = createSwiftAccountIxIfNotExists;
+//# sourceMappingURL=create.js.map

package/lib/drift/base/actions/swift/create.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../../src/drift/base/actions/swift/create.ts"],"names":[],"mappings":";;;AAAA,yCAKyB;AAkBzB;;;;;;;;;GASG;AACI,MAAM,oBAAoB,GAAG,KAAK,EAAE,EAC1C,WAAW,EACX,SAAS,EACT,SAAS,GAAG,CAAC,EACb,iBAAiB,GACW,EAG1B,EAAE;IACJ,MAAM,CAAC,qBAAqB,EAAE,EAAE,CAAC,GAChC,MAAM,WAAW,CAAC,yCAAyC,CAC1D,SAAS,EACT,SAAS,EACT,EAAE,cAAc,EAAE,iBAAiB,EAAE,CACrC,CAAC;IAEH,OAAO,EAAE,qBAAqB,EAAE,EAAE,EAAE,CAAC;AACtC,CAAC,CAAC;AAjBW,QAAA,oBAAoB,wBAiB/B;AAMF;;;;;;;;;;;;GAYG;AACI,MAAM,qBAAqB,GAAG,KAAK,EAAE,EAC3C,WAAW,EACX,SAAS,EACT,SAAS,EACT,iBAAiB,EAAE,cAAc,EACjC,QAAQ,GACqB,EAG3B,EAAE;IACJ,MAAM,EAAE,qBAAqB,EAAE,EAAE,EAAE,GAAG,MAAM,IAAA,4BAAoB,EAAC;QAChE,WAAW;QACX,SAAS;QACT,SAAS;QACT,iBAAiB,EAAE,cAAc;KACjC,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,gBAAgB,CAAC,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC;IAEvE,OAAO,EAAE,WAAW,EAAE,qBAAqB,EAAE,CAAC;AAC/C,CAAC,CAAC;AApBW,QAAA,qBAAqB,yBAoBhC;AAEF;;;;;;;;;;;;GAYG;AACI,MAAM,+BAA+B,GAAG,KAAK,EAAE,EACrD,WAAW,EACX,SAAS,EACT,SAAS,GAAG,CAAC,EACb,iBAAiB,GACW,EAG1B,EAAE;IACJ,MAAM,aAAa,GAClB,MAAM,WAAW,CAAC,uCAAuC,CAAC,SAAS,CAAC,CAAC;IAEtE,IAAI,aAAa,EAAE,CAAC;QACnB,MAAM,qBAAqB,GAAG,IAAA,sCAAgC,EAC7D,WAAW,CAAC,OAAO,CAAC,SAAS,EAC7B,SAAS,CACT,CAAC;QAEF,OAAO,EAAE,qBAAqB,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;IAC5C,CAAC;IAED,OAAO,MAAM,IAAA,4BAAoB,EAAC;QACjC,WAAW;QACX,SAAS;QACT,SAAS;QACT,iBAAiB;KACjB,CAAC,CAAC;AACJ,CAAC,CAAC;AA3BW,QAAA,+BAA+B,mCA2B1C","sourcesContent":["import {\n\tDriftClient,\n\tgetSignedMsgUserAccountPublicKey,\n\tPublicKey,\n\tTxParams,\n} from '@drift-labs/sdk';\nimport {\n\tTransaction,\n\tTransactionInstruction,\n\tVersionedTransaction,\n} from '@solana/web3.js';\n\ninterface CreateSwiftAccountIxParams {\n\tdriftClient: DriftClient;\n\tauthority: PublicKey;\n\tnumOrders?: number;\n\t/**\n\t * Optional external wallet to use as payer. If provided, this wallet will pay\n\t * for the account creation instead of the default wallet.\n\t */\n\trentPayerOverride?: PublicKey;\n}\n\n/**\n * Creates a transaction instruction for initializing a Swift (signed message user orders) account.\n *\n * @param driftClient - The Drift client instance\n * @param authority - The public key of the account authority\n * @param numOrders - The number of order slots to allocate (default: 8)\n * @param rentPayerOverride - Optional wallet to pay for account creation instead of the default wallet\n *\n * @returns The Swift account public key and the initialization instruction\n */\nexport const createSwiftAccountIx = async ({\n\tdriftClient,\n\tauthority,\n\tnumOrders = 8,\n\trentPayerOverride,\n}: CreateSwiftAccountIxParams): Promise<{\n\tswiftAccountPublicKey: PublicKey;\n\tix: TransactionInstruction;\n}> => {\n\tconst [swiftAccountPublicKey, ix] =\n\t\tawait driftClient.getInitializeSignedMsgUserOrdersAccountIx(\n\t\t\tauthority,\n\t\t\tnumOrders,\n\t\t\t{ externalWallet: rentPayerOverride }\n\t\t);\n\n\treturn { swiftAccountPublicKey, ix };\n};\n\ninterface CreateSwiftAccountTxnParams extends CreateSwiftAccountIxParams {\n\ttxParams?: TxParams;\n}\n\n/**\n * Creates a complete transaction for initializing a Swift (signed message user orders) account.\n *\n * Wraps {@link createSwiftAccountIx} and builds a transaction ready for signing and submission.\n *\n * @param driftClient - The Drift client instance\n * @param authority - The public key of the account authority\n * @param numOrders - The number of order slots to allocate (default: 8)\n * @param rentPayerOverride - Optional wallet to pay for account creation instead of the default wallet\n * @param txParams - Optional transaction parameters (compute units, priority fees, etc.)\n *\n * @returns The built transaction and the Swift account public key\n */\nexport const createSwiftAccountTxn = async ({\n\tdriftClient,\n\tauthority,\n\tnumOrders,\n\trentPayerOverride: externalWallet,\n\ttxParams,\n}: CreateSwiftAccountTxnParams): Promise<{\n\ttransaction: Transaction | VersionedTransaction;\n\tswiftAccountPublicKey: PublicKey;\n}> => {\n\tconst { swiftAccountPublicKey, ix } = await createSwiftAccountIx({\n\t\tdriftClient,\n\t\tauthority,\n\t\tnumOrders,\n\t\trentPayerOverride: externalWallet,\n\t});\n\n\tconst transaction = await driftClient.buildTransaction([ix], txParams);\n\n\treturn { transaction, swiftAccountPublicKey };\n};\n\n/**\n * Creates a Swift account instruction only if one doesn't already exist for the given authority.\n *\n * Always returns the Swift account public key. The `ix` will be `null` if the account\n * is already initialized, indicating no transaction is needed.\n *\n * @param driftClient - The Drift client instance\n * @param authority - The public key of the account authority\n * @param numOrders - The number of order slots to allocate (default: 8)\n * @param rentPayerOverride - Optional wallet to pay for account creation instead of the default wallet\n *\n * @returns The Swift account public key and the initialization instruction (null if already initialized)\n */\nexport const createSwiftAccountIxIfNotExists = async ({\n\tdriftClient,\n\tauthority,\n\tnumOrders = 8,\n\trentPayerOverride,\n}: CreateSwiftAccountIxParams): Promise<{\n\tswiftAccountPublicKey: PublicKey;\n\tix: TransactionInstruction | null;\n}> => {\n\tconst isInitialized =\n\t\tawait driftClient.isSignedMsgUserOrdersAccountInitialized(authority);\n\n\tif (isInitialized) {\n\t\tconst swiftAccountPublicKey = getSignedMsgUserAccountPublicKey(\n\t\t\tdriftClient.program.programId,\n\t\t\tauthority\n\t\t);\n\n\t\treturn { swiftAccountPublicKey, ix: null };\n\t}\n\n\treturn await createSwiftAccountIx({\n\t\tdriftClient,\n\t\tauthority,\n\t\tnumOrders,\n\t\trentPayerOverride,\n\t});\n};\n"]}

package/lib/drift/base/actions/swift/index.d.ts

@@ -0,0 +1 @@
+export * from './create';

package/lib/drift/base/actions/swift/index.js

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./create"), exports);
+//# sourceMappingURL=index.js.map

package/lib/drift/base/actions/swift/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/drift/base/actions/swift/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAyB","sourcesContent":["export * from './create';\n"]}

package/lib/drift/base/actions/user/create.js

@@ -36,12 +36,12 @@ const createUserAndDepositCollateralBaseIxs = async ({ driftClient, amount, spot
     const nextSubaccountId = (_a = userStatsAccount === null || userStatsAccount === void 0 ? void 0 : userStatsAccount.numberOfSubAccountsCreated) !== null && _a !== void 0 ? _a : 0; // userId is zero indexed
     // Get the spot market account to determine the correct token program for Token-2022 tokens
     const spotMarketAccount = driftClient.getSpotMarketAccount(spotMarketConfig.marketIndex);
-    const tokenProgram = spotMarketAccount
-        ? (0, sdk_1.getTokenProgramForSpotMarket)(spotMarketAccount)
-        : undefined;
+    if (!spotMarketAccount) {
+        throw new Error(`Spot market account not found for market index ${spotMarketConfig.marketIndex}`);
+    }
     // Use external wallet for token address if provided, otherwise use authority
     const depositSourceWallet = externalWallet !== null && externalWallet !== void 0 ? externalWallet : authority;
-    const associatedDepositTokenAddressPromise = (0, token_1.getTokenAddressForDepositAndWithdraw)(spotMarketConfig.mint, depositSourceWallet, tokenProgram);
+    const associatedDepositTokenAddressPromise = (0, token_1.getTokenAddressForDepositAndWithdraw)(spotMarketAccount, depositSourceWallet);
     const referrerNameAccountPromise = referrerName
         ? driftClient.fetchReferrerNameAccount(referrerName)
         : Promise.resolve(undefined);

package/lib/drift/base/actions/user/create.js.map

@@ -1 +1 @@
-{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../../src/drift/base/actions/user/create.ts"],"names":[],"mappings":";;;AAAA,yCAYyB;AACzB,mDAA+E;AAC/E,+DAAgF;AAChF,uDAA2D;AAM3D,2DAA8D;AAqB9D;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACI,MAAM,qCAAqC,GAAG,KAAK,EAAE,EAC3D,WAAW,EACX,MAAM,EACN,gBAAgB,EAChB,SAAS,EACT,gBAAgB,EAChB,YAAY,EACZ,WAAW,EACX,MAAM,GAAG,oBAAY,EACrB,gBAAgB,EAChB,oBAAoB,EACpB,QAAQ,EACR,cAAc,GAC+B,EAI3C,EAAE;;IACJ,MAAM,gBAAgB,GAAG,MAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,0BAA0B,mCAAI,CAAC,CAAC,CAAC,yBAAyB;IAErG,2FAA2F;IAC3F,MAAM,iBAAiB,GAAG,WAAW,CAAC,oBAAoB,CACzD,gBAAgB,CAAC,WAAW,CAC5B,CAAC;IACF,MAAM,YAAY,GAAG,iBAAiB;QACrC,CAAC,CAAC,IAAA,kCAA4B,EAAC,iBAAiB,CAAC;QACjD,CAAC,CAAC,SAAS,CAAC;IAEb,6EAA6E;IAC7E,MAAM,mBAAmB,GAAG,cAAc,aAAd,cAAc,cAAd,cAAc,GAAI,SAAS,CAAC;IACxD,MAAM,oCAAoC,GACzC,IAAA,4CAAoC,EACnC,gBAAgB,CAAC,IAAI,EACrB,mBAAmB,EACnB,YAAY,CACZ,CAAC;IACH,MAAM,0BAA0B,GAC/B,YAAY;QACX,CAAC,CAAC,WAAW,CAAC,wBAAwB,CAAC,YAAY,CAAC;QACpD,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAC/B,MAAM,uBAAuB,GAAG,iBAAU,CAAC,wBAAwB,CAClE,WAAW,EACX;QACC,IAAI,EAAE,cAAc;QACpB,YAAY,EAAE,gBAAgB;QAC9B,SAAS;KACT,CACD,CAAC;IAEF,MAAM,CAAC,6BAA6B,EAAE,mBAAmB,EAAE,gBAAgB,CAAC,GAC3E,MAAM,OAAO,CAAC,GAAG,CAAC;QACjB,oCAAoC;QACpC,0BAA0B;QAC1B,uBAAuB;KACvB,CAAC,CAAC;IAEJ,IAAI,gBAAgB,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC9C,CAAC;IAED,MAAM,gBAAgB,GACrB,WAAW,aAAX,WAAW,cAAX,WAAW,GACX,CAAC,MAAM,KAAK,oBAAY,IAAI,gBAAgB,KAAK,CAAC;QACjD,CAAC,CAAC,+CAAgC,CAAC,MAAM,CAAC;QAC1C,CAAC,CAAC,WAAW,gBAAgB,EAAE,CAAC,CAAC;IAEnC,MAAM,YAAY,GAA6B,mBAAmB;QACjE,CAAC,CAAC;YACA,QAAQ,EAAE,mBAAmB,CAAC,IAAI;YAClC,aAAa,EAAE,mBAAmB,CAAC,SAAS;SAC3C;QACH,CAAC,CAAC,SAAS,CAAC;IAEb,MAAM,EAAE,GAAG,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,GACvD,MAAM,WAAW,CAAC,kDAAkD,CACnE,MAAM,EACN,6BAA6B,EAC7B,gBAAgB,CAAC,WAAW,EAC5B,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EAChB,YAAY,EACZ,UAAI,EACJ,oBAAoB,EACpB,MAAM,EACN,cAAc,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,SAAS,CAC/C,CAAC;IACH,MAAM,GAAG,GAA6B,CAAC,GAAG,mBAAmB,CAAC,CAAC;IAE/D,MAAM,uBAAuB,GAAG,IAAA,iCAA2B,EAC1D,WAAW,CAAC,OAAO,CAAC,SAAS,EAC7B,SAAS,EACT,gBAAgB,CAChB,CAAC;IACF,MAAM,UAAU,GAAG,QAAQ;QAC1B,CAAC,CAAC,MAAM,WAAW,CAAC,uBAAuB,CAAC,QAAQ,EAAE;YACpD,YAAY,EAAE,gBAAgB;YAC9B,oBAAoB,EAAE,uBAAuB;YAC7C,SAAS;SACR,CAAC;QACJ,CAAC,CAAC,SAAS,CAAC;IAEb,IAAI,UAAU,EAAE,CAAC;QAChB,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACtB,CAAC;IAED,OAAO;QACN,YAAY,EAAE,gBAAgB;QAC9B,oBAAoB;QACpB,GAAG;KACH,CAAC;AACH,CAAC,CAAC;AA/GW,QAAA,qCAAqC,yCA+GhD;AAOF;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACI,MAAM,qCAAqC,GAAG,KAAK,EAAE,EAC3D,WAAW,EACX,MAAM,EACN,gBAAgB,EAChB,SAAS,EACT,gBAAgB,EAChB,YAAY,EACZ,WAAW,EACX,MAAM,GAAG,oBAAY,EACrB,gBAAgB,EAChB,oBAAoB,EACpB,QAAQ,EACR,cAAc,GAC+B,EAI3C,EAAE;IACJ,MAAM,EAAE,GAAG,EAAE,oBAAoB,EAAE,YAAY,EAAE,GAChD,MAAM,IAAA,6CAAqC,EAAC;QAC3C,WAAW;QACX,MAAM;QACN,gBAAgB;QAChB,SAAS;QACT,gBAAgB;QAChB,YAAY;QACZ,WAAW;QACX,MAAM;QACN,gBAAgB;QAChB,oBAAoB;QACpB,cAAc;KACd,CAAC,CAAC;IAEJ,MAAM,EAAE,GAAG,MAAM,WAAW,CAAC,gBAAgB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IAE7D,OAAO,EAAE,WAAW,EAAE,EAAE,EAAE,oBAAoB,EAAE,YAAY,EAAE,CAAC;AAChE,CAAC,CAAC;AApCW,QAAA,qCAAqC,yCAoChD","sourcesContent":["import {\n\tBN,\n\tDriftClient,\n\tgetTokenProgramForSpotMarket,\n\tgetUserAccountPublicKeySync,\n\tPublicKey,\n\tReferrerInfo,\n\tReferrerNameAccount,\n\tSpotMarketConfig,\n\tTxParams,\n\tUserStatsAccount,\n\tZERO,\n} from '@drift-labs/sdk';\nimport { getTokenAddressForDepositAndWithdraw } from '../../../../utils/token';\nimport { DEFAULT_ACCOUNT_NAMES_BY_POOL_ID } from '../../constants/accountNames';\nimport { MAIN_POOL_ID } from '../../../../constants/pools';\nimport {\n\tTransaction,\n\tTransactionInstruction,\n\tVersionedTransaction,\n} from '@solana/web3.js';\nimport { USER_UTILS } from '../../../../common-ui-utils/user';\n\ninterface CreateUserAndDepositCollateralBaseIxsParams {\n\tdriftClient: DriftClient;\n\tamount: BN;\n\tspotMarketConfig: SpotMarketConfig;\n\tauthority: PublicKey;\n\tuserStatsAccount: UserStatsAccount | undefined;\n\treferrerName?: string;\n\taccountName?: string;\n\tpoolId?: number;\n\tfromSubAccountId?: number;\n\tcustomMaxMarginRatio?: number;\n\tdelegate?: PublicKey;\n\t/**\n\t * Optional external wallet to deposit from. If provided, the deposit will be made\n\t * from this wallet instead of the authority wallet.\n\t */\n\texternalWallet?: PublicKey;\n}\n\n/**\n * Creates transaction instructions for initializing a new user account and depositing collateral.\n *\n * This function generates the necessary transaction instructions to:\n * 1. Initialize a new user account in the Drift protocol\n * 2. Deposit collateral into the newly created account\n *\n * @param driftClient - The Drift client instance for interacting with the protocol\n * @param amount - The amount of collateral to deposit (in base units)\n * @param spotMarketConfig - The spot market config of the deposit collateral\n * @param authority - The public key of the account authority (wallet owner)\n * @param userStatsAccount - Existing user stats account, used to determine next sub-account ID\n * @param referrerName - Optional name of the referrer for referral tracking\n * @param accountName - Optional custom name for the account (defaults to pool-specific name)\n * @param poolId - The pool ID to associate the account with (defaults to MAIN_POOL_ID)\n * @param fromSubAccountId - Optional sub-account ID to transfer funds from\n * @param customMaxMarginRatio - Optional custom maximum margin ratio for the account\n * @param delegate - Optional delegate public key for the account. Immediately assigns this as the delegate of the account.\n * @param externalWallet - Optional external wallet to deposit from (instead of authority wallet)\n *\n * @returns Promise resolving to an object containing:\n *   - subAccountId: The ID of the newly created sub-account\n *   - userAccountPublicKey: The public key of the created user account\n *   - ixs: Array of transaction instructions to execute\n */\nexport const createUserAndDepositCollateralBaseIxs = async ({\n\tdriftClient,\n\tamount,\n\tspotMarketConfig,\n\tauthority,\n\tuserStatsAccount,\n\treferrerName,\n\taccountName,\n\tpoolId = MAIN_POOL_ID,\n\tfromSubAccountId,\n\tcustomMaxMarginRatio,\n\tdelegate,\n\texternalWallet,\n}: CreateUserAndDepositCollateralBaseIxsParams): Promise<{\n\tsubAccountId: number;\n\tuserAccountPublicKey: PublicKey;\n\tixs: TransactionInstruction[];\n}> => {\n\tconst nextSubaccountId = userStatsAccount?.numberOfSubAccountsCreated ?? 0; // userId is zero indexed\n\n\t// Get the spot market account to determine the correct token program for Token-2022 tokens\n\tconst spotMarketAccount = driftClient.getSpotMarketAccount(\n\t\tspotMarketConfig.marketIndex\n\t);\n\tconst tokenProgram = spotMarketAccount\n\t\t? getTokenProgramForSpotMarket(spotMarketAccount)\n\t\t: undefined;\n\n\t// Use external wallet for token address if provided, otherwise use authority\n\tconst depositSourceWallet = externalWallet ?? authority;\n\tconst associatedDepositTokenAddressPromise =\n\t\tgetTokenAddressForDepositAndWithdraw(\n\t\t\tspotMarketConfig.mint,\n\t\t\tdepositSourceWallet,\n\t\t\ttokenProgram\n\t\t);\n\tconst referrerNameAccountPromise: Promise<ReferrerNameAccount | undefined> =\n\t\treferrerName\n\t\t\t? driftClient.fetchReferrerNameAccount(referrerName)\n\t\t\t: Promise.resolve(undefined);\n\tconst subaccountExistsPromise = USER_UTILS.checkIfUserAccountExists(\n\t\tdriftClient,\n\t\t{\n\t\t\ttype: 'subAccountId',\n\t\t\tsubAccountId: nextSubaccountId,\n\t\t\tauthority,\n\t\t}\n\t);\n\n\tconst [associatedDepositTokenAddress, referrerNameAccount, subaccountExists] =\n\t\tawait Promise.all([\n\t\t\tassociatedDepositTokenAddressPromise,\n\t\t\treferrerNameAccountPromise,\n\t\t\tsubaccountExistsPromise,\n\t\t]);\n\n\tif (subaccountExists) {\n\t\tthrow new Error('Subaccount already exists');\n\t}\n\n\tconst accountNameToUse =\n\t\taccountName ??\n\t\t(poolId !== MAIN_POOL_ID || nextSubaccountId === 0\n\t\t\t? DEFAULT_ACCOUNT_NAMES_BY_POOL_ID[poolId]\n\t\t\t: `Account ${nextSubaccountId}`);\n\n\tconst referrerInfo: ReferrerInfo | undefined = referrerNameAccount\n\t\t? {\n\t\t\t\treferrer: referrerNameAccount.user,\n\t\t\t\treferrerStats: referrerNameAccount.userStats,\n\t\t  }\n\t\t: undefined;\n\n\tconst { ixs: createAndDepositIxs, userAccountPublicKey } =\n\t\tawait driftClient.createInitializeUserAccountAndDepositCollateralIxs(\n\t\t\tamount,\n\t\t\tassociatedDepositTokenAddress,\n\t\t\tspotMarketConfig.marketIndex,\n\t\t\tnextSubaccountId,\n\t\t\taccountNameToUse,\n\t\t\tfromSubAccountId,\n\t\t\treferrerInfo,\n\t\t\tZERO,\n\t\t\tcustomMaxMarginRatio,\n\t\t\tpoolId,\n\t\t\texternalWallet ? { externalWallet } : undefined\n\t\t);\n\tconst ixs: TransactionInstruction[] = [...createAndDepositIxs];\n\n\tconst nextSubAccountPublicKey = getUserAccountPublicKeySync(\n\t\tdriftClient.program.programId,\n\t\tauthority,\n\t\tnextSubaccountId\n\t);\n\tconst delegateIx = delegate\n\t\t? await driftClient.getUpdateUserDelegateIx(delegate, {\n\t\t\t\tsubAccountId: nextSubaccountId,\n\t\t\t\tuserAccountPublicKey: nextSubAccountPublicKey,\n\t\t\t\tauthority,\n\t\t  })\n\t\t: undefined;\n\n\tif (delegateIx) {\n\t\tixs.push(delegateIx);\n\t}\n\n\treturn {\n\t\tsubAccountId: nextSubaccountId,\n\t\tuserAccountPublicKey,\n\t\tixs,\n\t};\n};\n\ninterface CreateUserAndDepositCollateralBaseTxnParams\n\textends CreateUserAndDepositCollateralBaseIxsParams {\n\ttxParams?: TxParams;\n}\n\n/**\n * Creates a complete transaction for initializing a new user account and depositing collateral.\n *\n * This function is a higher-level wrapper around `createUserAndDepositCollateralBaseIxs` that:\n * 1. Generates the necessary transaction instructions\n * 2. Builds a complete transaction ready for signing and submission\n *\n * @param driftClient - The Drift client instance for interacting with the protocol\n * @param amount - The amount of collateral to deposit (in base units)\n * @param spotMarketConfig - The spot market config of the deposit collateral\n * @param authority - The public key of the account authority (wallet owner)\n * @param userStatsAccount - Existing user stats account, used to determine next sub-account ID\n * @param referrerName - Optional name of the referrer for referral tracking\n * @param accountName - Optional custom name for the account (defaults to pool-specific name)\n * @param poolId - The pool ID to associate the account with (defaults to MAIN_POOL_ID)\n * @param fromSubAccountId - Optional sub-account ID to transfer funds from\n * @param customMaxMarginRatio - Optional custom maximum margin ratio for the account\n * @param txParams - Transaction parameters for building the transaction (compute units, priority fees, etc.)\n * @param externalWallet - Optional external wallet to deposit from (instead of authority wallet)\n *\n * @returns Promise resolving to an object containing:\n *   - transaction: The built transaction ready for signing (Transaction or VersionedTransaction)\n *   - userAccountPublicKey: The public key of the created user account\n *   - subAccountId: The ID of the newly created sub-account\n */\nexport const createUserAndDepositCollateralBaseTxn = async ({\n\tdriftClient,\n\tamount,\n\tspotMarketConfig,\n\tauthority,\n\tuserStatsAccount,\n\treferrerName,\n\taccountName,\n\tpoolId = MAIN_POOL_ID,\n\tfromSubAccountId,\n\tcustomMaxMarginRatio,\n\ttxParams,\n\texternalWallet,\n}: CreateUserAndDepositCollateralBaseTxnParams): Promise<{\n\ttransaction: Transaction | VersionedTransaction;\n\tuserAccountPublicKey: PublicKey;\n\tsubAccountId: number;\n}> => {\n\tconst { ixs, userAccountPublicKey, subAccountId } =\n\t\tawait createUserAndDepositCollateralBaseIxs({\n\t\t\tdriftClient,\n\t\t\tamount,\n\t\t\tspotMarketConfig,\n\t\t\tauthority,\n\t\t\tuserStatsAccount,\n\t\t\treferrerName,\n\t\t\taccountName,\n\t\t\tpoolId,\n\t\t\tfromSubAccountId,\n\t\t\tcustomMaxMarginRatio,\n\t\t\texternalWallet,\n\t\t});\n\n\tconst tx = await driftClient.buildTransaction(ixs, txParams);\n\n\treturn { transaction: tx, userAccountPublicKey, subAccountId };\n};\n"]}
+{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../../src/drift/base/actions/user/create.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n\tBN,\n\tDriftClient,\n\tgetUserAccountPublicKeySync,\n\tPublicKey,\n\tReferrerInfo,\n\tReferrerNameAccount,\n\tSpotMarketConfig,\n\tTxParams,\n\tUserStatsAccount,\n\tZERO,\n} from '@drift-labs/sdk';\nimport { getTokenAddressForDepositAndWithdraw } from '../../../../utils/token';\nimport { DEFAULT_ACCOUNT_NAMES_BY_POOL_ID } from '../../constants/accountNames';\nimport { MAIN_POOL_ID } from '../../../../constants/pools';\nimport {\n\tTransaction,\n\tTransactionInstruction,\n\tVersionedTransaction,\n} from '@solana/web3.js';\nimport { USER_UTILS } from '../../../../common-ui-utils/user';\n\ninterface CreateUserAndDepositCollateralBaseIxsParams {\n\tdriftClient: DriftClient;\n\tamount: BN;\n\tspotMarketConfig: SpotMarketConfig;\n\tauthority: PublicKey;\n\tuserStatsAccount: UserStatsAccount | undefined;\n\treferrerName?: string;\n\taccountName?: string;\n\tpoolId?: number;\n\tfromSubAccountId?: number;\n\tcustomMaxMarginRatio?: number;\n\tdelegate?: PublicKey;\n\t/**\n\t * Optional external wallet to deposit from. If provided, the deposit will be made\n\t * from this wallet instead of the authority wallet.\n\t */\n\texternalWallet?: PublicKey;\n}\n\n/**\n * Creates transaction instructions for initializing a new user account and depositing collateral.\n *\n * This function generates the necessary transaction instructions to:\n * 1. Initialize a new user account in the Drift protocol\n * 2. Deposit collateral into the newly created account\n *\n * @param driftClient - The Drift client instance for interacting with the protocol\n * @param amount - The amount of collateral to deposit (in base units)\n * @param spotMarketConfig - The spot market config of the deposit collateral\n * @param authority - The public key of the account authority (wallet owner)\n * @param userStatsAccount - Existing user stats account, used to determine next sub-account ID\n * @param referrerName - Optional name of the referrer for referral tracking\n * @param accountName - Optional custom name for the account (defaults to pool-specific name)\n * @param poolId - The pool ID to associate the account with (defaults to MAIN_POOL_ID)\n * @param fromSubAccountId - Optional sub-account ID to transfer funds from\n * @param customMaxMarginRatio - Optional custom maximum margin ratio for the account\n * @param delegate - Optional delegate public key for the account. Immediately assigns this as the delegate of the account.\n * @param externalWallet - Optional external wallet to deposit from (instead of authority wallet)\n *\n * @returns Promise resolving to an object containing:\n *   - subAccountId: The ID of the newly created sub-account\n *   - userAccountPublicKey: The public key of the created user account\n *   - ixs: Array of transaction instructions to execute\n */\nexport const createUserAndDepositCollateralBaseIxs = async ({\n\tdriftClient,\n\tamount,\n\tspotMarketConfig,\n\tauthority,\n\tuserStatsAccount,\n\treferrerName,\n\taccountName,\n\tpoolId = MAIN_POOL_ID,\n\tfromSubAccountId,\n\tcustomMaxMarginRatio,\n\tdelegate,\n\texternalWallet,\n}: CreateUserAndDepositCollateralBaseIxsParams): Promise<{\n\tsubAccountId: number;\n\tuserAccountPublicKey: PublicKey;\n\tixs: TransactionInstruction[];\n}> => {\n\tconst nextSubaccountId = userStatsAccount?.numberOfSubAccountsCreated ?? 0; // userId is zero indexed\n\n\t// Get the spot market account to determine the correct token program for Token-2022 tokens\n\tconst spotMarketAccount = driftClient.getSpotMarketAccount(\n\t\tspotMarketConfig.marketIndex\n\t);\n\n\tif (!spotMarketAccount) {\n\t\tthrow new Error(\n\t\t\t`Spot market account not found for market index ${spotMarketConfig.marketIndex}`\n\t\t);\n\t}\n\n\t// Use external wallet for token address if provided, otherwise use authority\n\tconst depositSourceWallet = externalWallet ?? authority;\n\tconst associatedDepositTokenAddressPromise =\n\t\tgetTokenAddressForDepositAndWithdraw(\n\t\t\tspotMarketAccount,\n\t\t\tdepositSourceWallet\n\t\t);\n\tconst referrerNameAccountPromise: Promise<ReferrerNameAccount | undefined> =\n\t\treferrerName\n\t\t\t? driftClient.fetchReferrerNameAccount(referrerName)\n\t\t\t: Promise.resolve(undefined);\n\tconst subaccountExistsPromise = USER_UTILS.checkIfUserAccountExists(\n\t\tdriftClient,\n\t\t{\n\t\t\ttype: 'subAccountId',\n\t\t\tsubAccountId: nextSubaccountId,\n\t\t\tauthority,\n\t\t}\n\t);\n\n\tconst [associatedDepositTokenAddress, referrerNameAccount, subaccountExists] =\n\t\tawait Promise.all([\n\t\t\tassociatedDepositTokenAddressPromise,\n\t\t\treferrerNameAccountPromise,\n\t\t\tsubaccountExistsPromise,\n\t\t]);\n\n\tif (subaccountExists) {\n\t\tthrow new Error('Subaccount already exists');\n\t}\n\n\tconst accountNameToUse =\n\t\taccountName ??\n\t\t(poolId !== MAIN_POOL_ID || nextSubaccountId === 0\n\t\t\t? DEFAULT_ACCOUNT_NAMES_BY_POOL_ID[poolId]\n\t\t\t: `Account ${nextSubaccountId}`);\n\n\tconst referrerInfo: ReferrerInfo | undefined = referrerNameAccount\n\t\t? {\n\t\t\t\treferrer: referrerNameAccount.user,\n\t\t\t\treferrerStats: referrerNameAccount.userStats,\n\t\t  }\n\t\t: undefined;\n\n\tconst { ixs: createAndDepositIxs, userAccountPublicKey } =\n\t\tawait driftClient.createInitializeUserAccountAndDepositCollateralIxs(\n\t\t\tamount,\n\t\t\tassociatedDepositTokenAddress,\n\t\t\tspotMarketConfig.marketIndex,\n\t\t\tnextSubaccountId,\n\t\t\taccountNameToUse,\n\t\t\tfromSubAccountId,\n\t\t\treferrerInfo,\n\t\t\tZERO,\n\t\t\tcustomMaxMarginRatio,\n\t\t\tpoolId,\n\t\t\texternalWallet ? { externalWallet } : undefined\n\t\t);\n\tconst ixs: TransactionInstruction[] = [...createAndDepositIxs];\n\n\tconst nextSubAccountPublicKey = getUserAccountPublicKeySync(\n\t\tdriftClient.program.programId,\n\t\tauthority,\n\t\tnextSubaccountId\n\t);\n\tconst delegateIx = delegate\n\t\t? await driftClient.getUpdateUserDelegateIx(delegate, {\n\t\t\t\tsubAccountId: nextSubaccountId,\n\t\t\t\tuserAccountPublicKey: nextSubAccountPublicKey,\n\t\t\t\tauthority,\n\t\t  })\n\t\t: undefined;\n\n\tif (delegateIx) {\n\t\tixs.push(delegateIx);\n\t}\n\n\treturn {\n\t\tsubAccountId: nextSubaccountId,\n\t\tuserAccountPublicKey,\n\t\tixs,\n\t};\n};\n\ninterface CreateUserAndDepositCollateralBaseTxnParams\n\textends CreateUserAndDepositCollateralBaseIxsParams {\n\ttxParams?: TxParams;\n}\n\n/**\n * Creates a complete transaction for initializing a new user account and depositing collateral.\n *\n * This function is a higher-level wrapper around `createUserAndDepositCollateralBaseIxs` that:\n * 1. Generates the necessary transaction instructions\n * 2. Builds a complete transaction ready for signing and submission\n *\n * @param driftClient - The Drift client instance for interacting with the protocol\n * @param amount - The amount of collateral to deposit (in base units)\n * @param spotMarketConfig - The spot market config of the deposit collateral\n * @param authority - The public key of the account authority (wallet owner)\n * @param userStatsAccount - Existing user stats account, used to determine next sub-account ID\n * @param referrerName - Optional name of the referrer for referral tracking\n * @param accountName - Optional custom name for the account (defaults to pool-specific name)\n * @param poolId - The pool ID to associate the account with (defaults to MAIN_POOL_ID)\n * @param fromSubAccountId - Optional sub-account ID to transfer funds from\n * @param customMaxMarginRatio - Optional custom maximum margin ratio for the account\n * @param txParams - Transaction parameters for building the transaction (compute units, priority fees, etc.)\n * @param externalWallet - Optional external wallet to deposit from (instead of authority wallet)\n *\n * @returns Promise resolving to an object containing:\n *   - transaction: The built transaction ready for signing (Transaction or VersionedTransaction)\n *   - userAccountPublicKey: The public key of the created user account\n *   - subAccountId: The ID of the newly created sub-account\n */\nexport const createUserAndDepositCollateralBaseTxn = async ({\n\tdriftClient,\n\tamount,\n\tspotMarketConfig,\n\tauthority,\n\tuserStatsAccount,\n\treferrerName,\n\taccountName,\n\tpoolId = MAIN_POOL_ID,\n\tfromSubAccountId,\n\tcustomMaxMarginRatio,\n\ttxParams,\n\texternalWallet,\n}: CreateUserAndDepositCollateralBaseTxnParams): Promise<{\n\ttransaction: Transaction | VersionedTransaction;\n\tuserAccountPublicKey: PublicKey;\n\tsubAccountId: number;\n}> => {\n\tconst { ixs, userAccountPublicKey, subAccountId } =\n\t\tawait createUserAndDepositCollateralBaseIxs({\n\t\t\tdriftClient,\n\t\t\tamount,\n\t\t\tspotMarketConfig,\n\t\t\tauthority,\n\t\t\tuserStatsAccount,\n\t\t\treferrerName,\n\t\t\taccountName,\n\t\t\tpoolId,\n\t\t\tfromSubAccountId,\n\t\t\tcustomMaxMarginRatio,\n\t\t\texternalWallet,\n\t\t});\n\n\tconst tx = await driftClient.buildTransaction(ixs, txParams);\n\n\treturn { transaction: tx, userAccountPublicKey, subAccountId };\n};\n"]}

package/lib/utils/token.d.ts

@@ -1,15 +1,16 @@
+import { SpotMarketAccount } from '@drift-labs/sdk';
 import { Connection, PublicKey, TransactionInstruction } from '@solana/web3.js';
 export { TOKEN_PROGRAM_ID, createTransferCheckedInstruction, } from '@solana/spl-token';
 export declare const getTokenAddress: (mintAddress: string, userPubKey: string) => Promise<PublicKey>;
 /**
- * Get the associated token address for the given mint and user public key. If the mint is SOL, return the user public key.
+ * Get the associated token address for the given spot market and authority. If the mint is SOL, return the authority public key.
  * This should be used for spot token movement in and out of the user's wallet.
- * @param mintAddress - The mint address
- * @param authorityPubKey - The authority's public key
- * @param tokenProgram - The token program ID (defaults to TOKEN_PROGRAM_ID, use TOKEN_2022_PROGRAM_ID for Token-2022 tokens)
+ * Automatically resolves the correct token program (TOKEN_PROGRAM_ID or TOKEN_2022_PROGRAM_ID) from the spot market account.
+ * @param spotMarketAccount - The spot market account
+ * @param authority - The authority's public key
  * @returns The associated token address
  */
-export declare const getTokenAddressForDepositAndWithdraw: (mintAddress: PublicKey, authorityPubKey: PublicKey, tokenProgram?: PublicKey) => Promise<PublicKey>;
+export declare const getTokenAddressForDepositAndWithdraw: (spotMarketAccount: SpotMarketAccount, authority: PublicKey) => Promise<PublicKey>;
 export declare const getTokenAccount: (connection: Connection, mintAddress: string, userPubKey: string) => Promise<{
     pubkey: PublicKey;
     account: import('@solana/web3.js').AccountInfo<import('@solana/web3.js').ParsedAccountData>;

package/lib/utils/token.js

@@ -12,18 +12,18 @@ const getTokenAddress = (mintAddress, userPubKey) => {
 };
 exports.getTokenAddress = getTokenAddress;
 /**
- * Get the associated token address for the given mint and user public key. If the mint is SOL, return the user public key.
+ * Get the associated token address for the given spot market and authority. If the mint is SOL, return the authority public key.
  * This should be used for spot token movement in and out of the user's wallet.
- * @param mintAddress - The mint address
- * @param authorityPubKey - The authority's public key
- * @param tokenProgram - The token program ID (defaults to TOKEN_PROGRAM_ID, use TOKEN_2022_PROGRAM_ID for Token-2022 tokens)
+ * Automatically resolves the correct token program (TOKEN_PROGRAM_ID or TOKEN_2022_PROGRAM_ID) from the spot market account.
+ * @param spotMarketAccount - The spot market account
+ * @param authority - The authority's public key
  * @returns The associated token address
  */
-const getTokenAddressForDepositAndWithdraw = async (mintAddress, authorityPubKey, tokenProgram = spl_token_1.TOKEN_PROGRAM_ID) => {
-    const isSol = mintAddress.equals(sdk_1.WRAPPED_SOL_MINT);
+const getTokenAddressForDepositAndWithdraw = async (spotMarketAccount, authority) => {
+    const isSol = spotMarketAccount.mint.equals(sdk_1.WRAPPED_SOL_MINT);
     if (isSol)
-        return authorityPubKey;
-    return (0, spl_token_1.getAssociatedTokenAddress)(mintAddress, authorityPubKey, true, tokenProgram);
+        return authority;
+    return (0, spl_token_1.getAssociatedTokenAddress)(spotMarketAccount.mint, authority, true, (0, sdk_1.getTokenProgramForSpotMarket)(spotMarketAccount));
 };
 exports.getTokenAddressForDepositAndWithdraw = getTokenAddressForDepositAndWithdraw;
 const getTokenAccount = async (connection, mintAddress, userPubKey) => {

package/lib/utils/token.js.map

@@ -1 +1 @@
-{"version":3,"file":"token.js","sourceRoot":"","sources":["../../src/utils/token.ts"],"names":[],"mappings":";;;AAAA,yCAAmD;AACnD,iDAI2B;AAC3B,6CAAgF;AAEhF,+CAG2B;AAF1B,6GAAA,gBAAgB,OAAA;AAChB,6HAAA,gCAAgC,OAAA;AAG1B,MAAM,eAAe,GAAG,CAC9B,WAAmB,EACnB,UAAkB,EACG,EAAE;IACvB,OAAO,IAAA,qCAAyB,EAC/B,IAAI,mBAAS,CAAC,WAAW,CAAC,EAC1B,IAAI,mBAAS,CAAC,UAAU,CAAC,EACzB,IAAI,CACJ,CAAC;AACH,CAAC,CAAC;AATW,QAAA,eAAe,mBAS1B;AAEF;;;;;;;GAOG;AACI,MAAM,oCAAoC,GAAG,KAAK,EACxD,WAAsB,EACtB,eAA0B,EAC1B,eAA0B,4BAAgB,EACrB,EAAE;IACvB,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,sBAAgB,CAAC,CAAC;IAEnD,IAAI,KAAK;QAAE,OAAO,eAAe,CAAC;IAElC,OAAO,IAAA,qCAAyB,EAC/B,WAAW,EACX,eAAe,EACf,IAAI,EACJ,YAAY,CACZ,CAAC;AACH,CAAC,CAAC;AAfW,QAAA,oCAAoC,wCAe/C;AAEK,MAAM,eAAe,GAAG,KAAK,EACnC,UAAsB,EACtB,WAAmB,EACnB,UAAkB,EAMhB,EAAE;IACJ,MAAM,aAAa,GAAG,MAAM,UAAU,CAAC,6BAA6B,CACnE,IAAI,mBAAS,CAAC,UAAU,CAAC,EACzB,EAAE,IAAI,EAAE,IAAI,mBAAS,CAAC,WAAW,CAAC,EAAE,CACpC,CAAC;IAEF,MAAM,iBAAiB,GAAG,MAAM,IAAA,qCAAyB,EACxD,IAAI,mBAAS,CAAC,WAAW,CAAC,EAC1B,IAAI,mBAAS,CAAC,UAAU,CAAC,EACzB,IAAI,CACJ,CAAC;IAEF,MAAM,aAAa,GAClB,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CACtC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CACxC,CAAC,CAAC,CAAC,IAAI,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAEhC,OAAO,aAAa,CAAC;AACtB,CAAC,CAAC;AA3BW,QAAA,eAAe,mBA2B1B;AAEK,MAAM,oBAAoB,GAAG,KAAK,EACxC,KAAgB,EAChB,WAAsB,EACtB,KAAiB,EACiB,EAAE;IACpC,IAAI,CAAC,KAAK,EAAE,CAAC;QACZ,KAAK,GAAG,KAAK,CAAC;IACf,CAAC;IAED,MAAM,iBAAiB,GAAG,MAAM,IAAA,qCAAyB,EACxD,WAAW,EACX,KAAK,EACL,IAAI,CACJ,CAAC;IAEF,MAAM,WAAW,GAAG,MAAM,IAAA,mDAAuC,EAChE,KAAK,EACL,iBAAiB,EACjB,KAAK,EACL,WAAW,CACX,CAAC;IAEF,OAAO,WAAW,CAAC;AACpB,CAAC,CAAC;AAvBW,QAAA,oBAAoB,wBAuB/B","sourcesContent":["import { WRAPPED_SOL_MINT } from '@drift-labs/sdk';\nimport {\n\tcreateAssociatedTokenAccountInstruction,\n\tgetAssociatedTokenAddress,\n\tTOKEN_PROGRAM_ID,\n} from '@solana/spl-token';\nimport { Connection, PublicKey, TransactionInstruction } from '@solana/web3.js';\n\nexport {\n\tTOKEN_PROGRAM_ID,\n\tcreateTransferCheckedInstruction,\n} from '@solana/spl-token';\n\nexport const getTokenAddress = (\n\tmintAddress: string,\n\tuserPubKey: string\n): Promise<PublicKey> => {\n\treturn getAssociatedTokenAddress(\n\t\tnew PublicKey(mintAddress),\n\t\tnew PublicKey(userPubKey),\n\t\ttrue\n\t);\n};\n\n/**\n * Get the associated token address for the given mint and user public key. If the mint is SOL, return the user public key.\n * This should be used for spot token movement in and out of the user's wallet.\n * @param mintAddress - The mint address\n * @param authorityPubKey - The authority's public key\n * @param tokenProgram - The token program ID (defaults to TOKEN_PROGRAM_ID, use TOKEN_2022_PROGRAM_ID for Token-2022 tokens)\n * @returns The associated token address\n */\nexport const getTokenAddressForDepositAndWithdraw = async (\n\tmintAddress: PublicKey,\n\tauthorityPubKey: PublicKey,\n\ttokenProgram: PublicKey = TOKEN_PROGRAM_ID\n): Promise<PublicKey> => {\n\tconst isSol = mintAddress.equals(WRAPPED_SOL_MINT);\n\n\tif (isSol) return authorityPubKey;\n\n\treturn getAssociatedTokenAddress(\n\t\tmintAddress,\n\t\tauthorityPubKey,\n\t\ttrue,\n\t\ttokenProgram\n\t);\n};\n\nexport const getTokenAccount = async (\n\tconnection: Connection,\n\tmintAddress: string,\n\tuserPubKey: string\n): Promise<{\n\tpubkey: PublicKey;\n\taccount: import('@solana/web3.js').AccountInfo<\n\t\timport('@solana/web3.js').ParsedAccountData\n\t>;\n}> => {\n\tconst tokenAccounts = await connection.getParsedTokenAccountsByOwner(\n\t\tnew PublicKey(userPubKey),\n\t\t{ mint: new PublicKey(mintAddress) }\n\t);\n\n\tconst associatedAddress = await getAssociatedTokenAddress(\n\t\tnew PublicKey(mintAddress),\n\t\tnew PublicKey(userPubKey),\n\t\ttrue\n\t);\n\n\tconst targetAccount =\n\t\ttokenAccounts.value.filter((account) =>\n\t\t\taccount.pubkey.equals(associatedAddress)\n\t\t)[0] || tokenAccounts.value[0];\n\n\treturn targetAccount;\n};\n\nexport const createTokenAccountIx = async (\n\towner: PublicKey,\n\tmintAddress: PublicKey,\n\tpayer?: PublicKey\n): Promise<TransactionInstruction> => {\n\tif (!payer) {\n\t\tpayer = owner;\n\t}\n\n\tconst associatedAddress = await getAssociatedTokenAddress(\n\t\tmintAddress,\n\t\towner,\n\t\ttrue\n\t);\n\n\tconst createAtaIx = await createAssociatedTokenAccountInstruction(\n\t\tpayer,\n\t\tassociatedAddress,\n\t\towner,\n\t\tmintAddress\n\t);\n\n\treturn createAtaIx;\n};\n"]}
+{"version":3,"file":"token.js","sourceRoot":"","sources":["../../src/utils/token.ts"],"names":[],"mappings":";;;AAAA,yCAIyB;AACzB,iDAG2B;AAC3B,6CAAgF;AAEhF,+CAG2B;AAF1B,6GAAA,gBAAgB,OAAA;AAChB,6HAAA,gCAAgC,OAAA;AAG1B,MAAM,eAAe,GAAG,CAC9B,WAAmB,EACnB,UAAkB,EACG,EAAE;IACvB,OAAO,IAAA,qCAAyB,EAC/B,IAAI,mBAAS,CAAC,WAAW,CAAC,EAC1B,IAAI,mBAAS,CAAC,UAAU,CAAC,EACzB,IAAI,CACJ,CAAC;AACH,CAAC,CAAC;AATW,QAAA,eAAe,mBAS1B;AAEF;;;;;;;GAOG;AACI,MAAM,oCAAoC,GAAG,KAAK,EACxD,iBAAoC,EACpC,SAAoB,EACC,EAAE;IACvB,MAAM,KAAK,GAAG,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,sBAAgB,CAAC,CAAC;IAE9D,IAAI,KAAK;QAAE,OAAO,SAAS,CAAC;IAE5B,OAAO,IAAA,qCAAyB,EAC/B,iBAAiB,CAAC,IAAI,EACtB,SAAS,EACT,IAAI,EACJ,IAAA,kCAA4B,EAAC,iBAAiB,CAAC,CAC/C,CAAC;AACH,CAAC,CAAC;AAdW,QAAA,oCAAoC,wCAc/C;AAEK,MAAM,eAAe,GAAG,KAAK,EACnC,UAAsB,EACtB,WAAmB,EACnB,UAAkB,EAMhB,EAAE;IACJ,MAAM,aAAa,GAAG,MAAM,UAAU,CAAC,6BAA6B,CACnE,IAAI,mBAAS,CAAC,UAAU,CAAC,EACzB,EAAE,IAAI,EAAE,IAAI,mBAAS,CAAC,WAAW,CAAC,EAAE,CACpC,CAAC;IAEF,MAAM,iBAAiB,GAAG,MAAM,IAAA,qCAAyB,EACxD,IAAI,mBAAS,CAAC,WAAW,CAAC,EAC1B,IAAI,mBAAS,CAAC,UAAU,CAAC,EACzB,IAAI,CACJ,CAAC;IAEF,MAAM,aAAa,GAClB,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CACtC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CACxC,CAAC,CAAC,CAAC,IAAI,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAEhC,OAAO,aAAa,CAAC;AACtB,CAAC,CAAC;AA3BW,QAAA,eAAe,mBA2B1B;AAEK,MAAM,oBAAoB,GAAG,KAAK,EACxC,KAAgB,EAChB,WAAsB,EACtB,KAAiB,EACiB,EAAE;IACpC,IAAI,CAAC,KAAK,EAAE,CAAC;QACZ,KAAK,GAAG,KAAK,CAAC;IACf,CAAC;IAED,MAAM,iBAAiB,GAAG,MAAM,IAAA,qCAAyB,EACxD,WAAW,EACX,KAAK,EACL,IAAI,CACJ,CAAC;IAEF,MAAM,WAAW,GAAG,MAAM,IAAA,mDAAuC,EAChE,KAAK,EACL,iBAAiB,EACjB,KAAK,EACL,WAAW,CACX,CAAC;IAEF,OAAO,WAAW,CAAC;AACpB,CAAC,CAAC;AAvBW,QAAA,oBAAoB,wBAuB/B","sourcesContent":["import {\n\tSpotMarketAccount,\n\tWRAPPED_SOL_MINT,\n\tgetTokenProgramForSpotMarket,\n} from '@drift-labs/sdk';\nimport {\n\tcreateAssociatedTokenAccountInstruction,\n\tgetAssociatedTokenAddress,\n} from '@solana/spl-token';\nimport { Connection, PublicKey, TransactionInstruction } from '@solana/web3.js';\n\nexport {\n\tTOKEN_PROGRAM_ID,\n\tcreateTransferCheckedInstruction,\n} from '@solana/spl-token';\n\nexport const getTokenAddress = (\n\tmintAddress: string,\n\tuserPubKey: string\n): Promise<PublicKey> => {\n\treturn getAssociatedTokenAddress(\n\t\tnew PublicKey(mintAddress),\n\t\tnew PublicKey(userPubKey),\n\t\ttrue\n\t);\n};\n\n/**\n * Get the associated token address for the given spot market and authority. If the mint is SOL, return the authority public key.\n * This should be used for spot token movement in and out of the user's wallet.\n * Automatically resolves the correct token program (TOKEN_PROGRAM_ID or TOKEN_2022_PROGRAM_ID) from the spot market account.\n * @param spotMarketAccount - The spot market account\n * @param authority - The authority's public key\n * @returns The associated token address\n */\nexport const getTokenAddressForDepositAndWithdraw = async (\n\tspotMarketAccount: SpotMarketAccount,\n\tauthority: PublicKey\n): Promise<PublicKey> => {\n\tconst isSol = spotMarketAccount.mint.equals(WRAPPED_SOL_MINT);\n\n\tif (isSol) return authority;\n\n\treturn getAssociatedTokenAddress(\n\t\tspotMarketAccount.mint,\n\t\tauthority,\n\t\ttrue,\n\t\tgetTokenProgramForSpotMarket(spotMarketAccount)\n\t);\n};\n\nexport const getTokenAccount = async (\n\tconnection: Connection,\n\tmintAddress: string,\n\tuserPubKey: string\n): Promise<{\n\tpubkey: PublicKey;\n\taccount: import('@solana/web3.js').AccountInfo<\n\t\timport('@solana/web3.js').ParsedAccountData\n\t>;\n}> => {\n\tconst tokenAccounts = await connection.getParsedTokenAccountsByOwner(\n\t\tnew PublicKey(userPubKey),\n\t\t{ mint: new PublicKey(mintAddress) }\n\t);\n\n\tconst associatedAddress = await getAssociatedTokenAddress(\n\t\tnew PublicKey(mintAddress),\n\t\tnew PublicKey(userPubKey),\n\t\ttrue\n\t);\n\n\tconst targetAccount =\n\t\ttokenAccounts.value.filter((account) =>\n\t\t\taccount.pubkey.equals(associatedAddress)\n\t\t)[0] || tokenAccounts.value[0];\n\n\treturn targetAccount;\n};\n\nexport const createTokenAccountIx = async (\n\towner: PublicKey,\n\tmintAddress: PublicKey,\n\tpayer?: PublicKey\n): Promise<TransactionInstruction> => {\n\tif (!payer) {\n\t\tpayer = owner;\n\t}\n\n\tconst associatedAddress = await getAssociatedTokenAddress(\n\t\tmintAddress,\n\t\towner,\n\t\ttrue\n\t);\n\n\tconst createAtaIx = await createAssociatedTokenAccountInstruction(\n\t\tpayer,\n\t\tassociatedAddress,\n\t\towner,\n\t\tmintAddress\n\t);\n\n\treturn createAtaIx;\n};\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/common",
-	"version": "1.0.41",
+	"version": "1.0.43",
 	"description": "Common functions for Drift",
 	"main": "./lib/index.js",
 	"types": "./lib/index.d.ts",