@drift-labs/common 1.0.17 → 1.0.19

package/lib/drift/base/actions/trade/swap.js

@@ -1,13 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSwapTxn = exports.createSwapIxDetails = void 0;
-const sdk_1 = require("@drift-labs/sdk");
 /**
  * Creates swap instruction details for a swap through Drift
  *
  * @param driftClient - The Drift client instance
  * @param swapClient - The swap client instance for performing the swap (supports UnifiedSwapClient or JupiterClient)
- * @param jupiterClient - @deprecated Use swapClient instead. Kept for backwards compatibility.
  * @param quote - Quote response from swap provider with routing information
  * @param swapFromMarketIndex - Source token market index
  * @param swapToMarketIndex - Destination token market index
@@ -17,37 +15,16 @@ const sdk_1 = require("@drift-labs/sdk");
  * @returns ixs - Array of Solana transaction instructions for the swap
  * @returns lookupTables - Address lookup table accounts for transaction compression
  */
-const createSwapIxDetails = async ({ driftClient, swapClient, jupiterClient, quote, swapFromMarketIndex, swapToMarketIndex, amount, user, }) => {
-    // Use swapClient if provided, otherwise fall back to jupiterClient for backwards compatibility
-    const clientToUse = swapClient || jupiterClient;
-    if (!clientToUse) {
-        throw new Error('Either swapClient or jupiterClient must be provided');
-    }
-    const userPublicKey = user.getUserAccountPublicKey();
-    let swapIxsDetails;
-    // Use the appropriate method based on client type
-    if (clientToUse instanceof sdk_1.UnifiedSwapClient) {
-        swapIxsDetails = await driftClient.getSwapIxV2({
-            swapClient: clientToUse,
-            outMarketIndex: swapToMarketIndex,
-            inMarketIndex: swapFromMarketIndex,
-            amount,
-            quote,
-        });
-    }
-    else {
-        // JupiterClient path
-        swapIxsDetails = await driftClient.getJupiterSwapIxV6({
-            jupiterClient: clientToUse,
-            outMarketIndex: swapToMarketIndex,
-            inMarketIndex: swapFromMarketIndex,
-            amount,
-            quote,
-            userAccountPublicKey: userPublicKey,
-            // we skip passing in the associated token accounts and have the swap client derive them instead.
-            // The swap client will also add the ixs to create the associated token accounts if they don't exist.
-        });
-    }
+const createSwapIxDetails = async ({ driftClient, swapClient, quote, swapFromMarketIndex, swapToMarketIndex, amount, user, }) => {
+    const userPublicKey = user.userAccountPublicKey;
+    const swapIxsDetails = await driftClient.getSwapIxV2({
+        swapClient,
+        outMarketIndex: swapToMarketIndex,
+        inMarketIndex: swapFromMarketIndex,
+        amount,
+        quote,
+        userAccountPublicKey: userPublicKey,
+    });
     return swapIxsDetails;
 };
 exports.createSwapIxDetails = createSwapIxDetails;
@@ -56,7 +33,6 @@ exports.createSwapIxDetails = createSwapIxDetails;
  *
  * @param driftClient - The Drift client instance
  * @param swapClient - The swap client instance for performing the swap (supports UnifiedSwapClient or JupiterClient)
- * @param jupiterClient - @deprecated Use swapClient instead. Kept for backwards compatibility.
  * @param quote - Quote response from swap provider with routing information
  * @param swapFromMarketIndex - Source token market index
  * @param swapToMarketIndex - Destination token market index
@@ -65,11 +41,10 @@ exports.createSwapIxDetails = createSwapIxDetails;
  * @param txParams - Transaction parameters for fees and compute units
  * @returns Promise resolving to either a legacy Transaction or VersionedTransaction ready for signing
  */
-const createSwapTxn = async ({ driftClient, swapClient, jupiterClient, quote, swapFromMarketIndex, swapToMarketIndex, amount, user, txParams, }) => {
+const createSwapTxn = async ({ driftClient, swapClient, quote, swapFromMarketIndex, swapToMarketIndex, amount, user, txParams, }) => {
     const swapIxsDetails = await (0, exports.createSwapIxDetails)({
         driftClient,
         swapClient,
-        jupiterClient,
         quote,
         swapFromMarketIndex,
         swapToMarketIndex,

package/lib/drift/base/actions/trade/swap.js.map

@@ -1 +1 @@
-{"version":3,"file":"swap.js","sourceRoot":"","sources":["../../../../../src/drift/base/actions/trade/swap.ts"],"names":[],"mappings":";;;AAAA,yCAQyB;AAiCzB;;;;;;;;;;;;;;GAcG;AACI,MAAM,mBAAmB,GAAG,KAAK,EAAE,EACzC,WAAW,EACX,UAAU,EACV,aAAa,EACb,KAAK,EACL,mBAAmB,EACnB,iBAAiB,EACjB,MAAM,EACN,IAAI,GACuB,EAGzB,EAAE;IACJ,+FAA+F;IAC/F,MAAM,WAAW,GAAG,UAAU,IAAI,aAAa,CAAC;IAEhD,IAAI,CAAC,WAAW,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;IACxE,CAAC;IAED,MAAM,aAAa,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAC;IAErD,IAAI,cAGH,CAAC;IAEF,kDAAkD;IAClD,IAAI,WAAW,YAAY,uBAAiB,EAAE,CAAC;QAC9C,cAAc,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC;YAC9C,UAAU,EAAE,WAAW;YACvB,cAAc,EAAE,iBAAiB;YACjC,aAAa,EAAE,mBAAmB;YAClC,MAAM;YACN,KAAK;SACL,CAAC,CAAC;IACJ,CAAC;SAAM,CAAC;QACP,qBAAqB;QACrB,cAAc,GAAG,MAAM,WAAW,CAAC,kBAAkB,CAAC;YACrD,aAAa,EAAE,WAAW;YAC1B,cAAc,EAAE,iBAAiB;YACjC,aAAa,EAAE,mBAAmB;YAClC,MAAM;YACN,KAAK;YACL,oBAAoB,EAAE,aAAa;YACnC,iGAAiG;YACjG,qGAAqG;SACrG,CAAC,CAAC;IACJ,CAAC;IAED,OAAO,cAAc,CAAC;AACvB,CAAC,CAAC;AAnDW,QAAA,mBAAmB,uBAmD9B;AAWF;;;;;;;;;;;;;GAaG;AACI,MAAM,aAAa,GAAG,KAAK,EAAE,EACnC,WAAW,EACX,UAAU,EACV,aAAa,EACb,KAAK,EACL,mBAAmB,EACnB,iBAAiB,EACjB,MAAM,EACN,IAAI,EACJ,QAAQ,GACa,EAA+C,EAAE;IACtE,MAAM,cAAc,GAAG,MAAM,IAAA,2BAAmB,EAAC;QAChD,WAAW;QACX,UAAU;QACV,aAAa;QACb,KAAK;QACL,mBAAmB;QACnB,iBAAiB;QACjB,MAAM;QACN,IAAI;KACJ,CAAC,CAAC;IAEH,MAAM,EAAE,GAAG,MAAM,WAAW,CAAC,gBAAgB,CAC5C,cAAc,CAAC,GAAG,EAClB,QAAQ,EACR,CAAC,EACD,cAAc,CAAC,YAAY,CAC3B,CAAC;IAEF,OAAO,EAAE,CAAC;AACX,CAAC,CAAC;AA9BW,QAAA,aAAa,iBA8BxB","sourcesContent":["import {\n\tBN,\n\tDriftClient,\n\tJupiterClient,\n\tQuoteResponse,\n\tTxParams,\n\tUnifiedSwapClient,\n\tUser,\n} from '@drift-labs/sdk';\nimport {\n\tAddressLookupTableAccount,\n\tTransaction,\n\tTransactionInstruction,\n\tVersionedTransaction,\n} from '@solana/web3.js';\n\n/**\n * Parameters for creating swap instruction details\n */\ninterface CreateSwapIxDetailsParams {\n\t/** The Drift client instance for interacting with the Drift protocol */\n\tdriftClient: DriftClient;\n\t/** Quote response from swap provider containing swap route information */\n\tquote: QuoteResponse;\n\t/** Swap client instance for performing the swap (supports UnifiedSwapClient or JupiterClient) */\n\tswapClient?: UnifiedSwapClient | JupiterClient;\n\t/**\n\t * @deprecated Use swapClient instead. This parameter is kept for backwards compatibility.\n\t * Swap client instance for performing the swap\n\t */\n\tjupiterClient?: JupiterClient;\n\t/** Market index of the token being swapped from */\n\tswapFromMarketIndex: number;\n\t/** Market index of the token being swapped to */\n\tswapToMarketIndex: number;\n\t/** Amount to swap in base units */\n\tamount: BN;\n\t/** User instance containing account information */\n\tuser: User;\n}\n\n/**\n * Creates swap instruction details for a swap through Drift\n *\n * @param driftClient - The Drift client instance\n * @param swapClient - The swap client instance for performing the swap (supports UnifiedSwapClient or JupiterClient)\n * @param jupiterClient - @deprecated Use swapClient instead. Kept for backwards compatibility.\n * @param quote - Quote response from swap provider with routing information\n * @param swapFromMarketIndex - Source token market index\n * @param swapToMarketIndex - Destination token market index\n * @param amount - Amount to swap in base units\n * @param user - User account instance\n * @returns Promise resolving to an object containing transaction instructions and lookup tables\n * @returns ixs - Array of Solana transaction instructions for the swap\n * @returns lookupTables - Address lookup table accounts for transaction compression\n */\nexport const createSwapIxDetails = async ({\n\tdriftClient,\n\tswapClient,\n\tjupiterClient,\n\tquote,\n\tswapFromMarketIndex,\n\tswapToMarketIndex,\n\tamount,\n\tuser,\n}: CreateSwapIxDetailsParams): Promise<{\n\tixs: TransactionInstruction[];\n\tlookupTables: AddressLookupTableAccount[];\n}> => {\n\t// Use swapClient if provided, otherwise fall back to jupiterClient for backwards compatibility\n\tconst clientToUse = swapClient || jupiterClient;\n\n\tif (!clientToUse) {\n\t\tthrow new Error('Either swapClient or jupiterClient must be provided');\n\t}\n\n\tconst userPublicKey = user.getUserAccountPublicKey();\n\n\tlet swapIxsDetails: {\n\t\tixs: TransactionInstruction[];\n\t\tlookupTables: AddressLookupTableAccount[];\n\t};\n\n\t// Use the appropriate method based on client type\n\tif (clientToUse instanceof UnifiedSwapClient) {\n\t\tswapIxsDetails = await driftClient.getSwapIxV2({\n\t\t\tswapClient: clientToUse,\n\t\t\toutMarketIndex: swapToMarketIndex,\n\t\t\tinMarketIndex: swapFromMarketIndex,\n\t\t\tamount,\n\t\t\tquote,\n\t\t});\n\t} else {\n\t\t// JupiterClient path\n\t\tswapIxsDetails = await driftClient.getJupiterSwapIxV6({\n\t\t\tjupiterClient: clientToUse,\n\t\t\toutMarketIndex: swapToMarketIndex,\n\t\t\tinMarketIndex: swapFromMarketIndex,\n\t\t\tamount,\n\t\t\tquote,\n\t\t\tuserAccountPublicKey: userPublicKey,\n\t\t\t// we skip passing in the associated token accounts and have the swap client derive them instead.\n\t\t\t// The swap client will also add the ixs to create the associated token accounts if they don't exist.\n\t\t});\n\t}\n\n\treturn swapIxsDetails;\n};\n\n/**\n * Parameters for creating a complete swap transaction\n * Extends CreateSwapIxDetailsParams with additional transaction parameters\n */\ninterface CreateSwapTxnParams extends CreateSwapIxDetailsParams {\n\t/** Transaction parameters including compute units, priority fees, and other options */\n\ttxParams?: TxParams;\n}\n\n/**\n * Creates a complete swap transaction ready for signing and submission\n *\n * @param driftClient - The Drift client instance\n * @param swapClient - The swap client instance for performing the swap (supports UnifiedSwapClient or JupiterClient)\n * @param jupiterClient - @deprecated Use swapClient instead. Kept for backwards compatibility.\n * @param quote - Quote response from swap provider with routing information\n * @param swapFromMarketIndex - Source token market index\n * @param swapToMarketIndex - Destination token market index\n * @param amount - Amount to swap in base units\n * @param user - User account instance\n * @param txParams - Transaction parameters for fees and compute units\n * @returns Promise resolving to either a legacy Transaction or VersionedTransaction ready for signing\n */\nexport const createSwapTxn = async ({\n\tdriftClient,\n\tswapClient,\n\tjupiterClient,\n\tquote,\n\tswapFromMarketIndex,\n\tswapToMarketIndex,\n\tamount,\n\tuser,\n\ttxParams,\n}: CreateSwapTxnParams): Promise<Transaction | VersionedTransaction> => {\n\tconst swapIxsDetails = await createSwapIxDetails({\n\t\tdriftClient,\n\t\tswapClient,\n\t\tjupiterClient,\n\t\tquote,\n\t\tswapFromMarketIndex,\n\t\tswapToMarketIndex,\n\t\tamount,\n\t\tuser,\n\t});\n\n\tconst tx = await driftClient.buildTransaction(\n\t\tswapIxsDetails.ixs,\n\t\ttxParams,\n\t\t0,\n\t\tswapIxsDetails.lookupTables\n\t);\n\n\treturn tx;\n};\n"]}
+{"version":3,"file":"swap.js","sourceRoot":"","sources":["../../../../../src/drift/base/actions/trade/swap.ts"],"names":[],"mappings":";;;AAmCA;;;;;;;;;;;;;GAaG;AACI,MAAM,mBAAmB,GAAG,KAAK,EAAE,EACzC,WAAW,EACX,UAAU,EACV,KAAK,EACL,mBAAmB,EACnB,iBAAiB,EACjB,MAAM,EACN,IAAI,GACuB,EAGzB,EAAE;IACJ,MAAM,aAAa,GAAG,IAAI,CAAC,oBAAoB,CAAC;IAEhD,MAAM,cAAc,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC;QACpD,UAAU;QACV,cAAc,EAAE,iBAAiB;QACjC,aAAa,EAAE,mBAAmB;QAClC,MAAM;QACN,KAAK;QACL,oBAAoB,EAAE,aAAa;KACnC,CAAC,CAAC;IAEH,OAAO,cAAc,CAAC;AACvB,CAAC,CAAC;AAxBW,QAAA,mBAAmB,uBAwB9B;AAWF;;;;;;;;;;;;GAYG;AACI,MAAM,aAAa,GAAG,KAAK,EAAE,EACnC,WAAW,EACX,UAAU,EACV,KAAK,EACL,mBAAmB,EACnB,iBAAiB,EACjB,MAAM,EACN,IAAI,EACJ,QAAQ,GACa,EAA+C,EAAE;IACtE,MAAM,cAAc,GAAG,MAAM,IAAA,2BAAmB,EAAC;QAChD,WAAW;QACX,UAAU;QACV,KAAK;QACL,mBAAmB;QACnB,iBAAiB;QACjB,MAAM;QACN,IAAI;KACJ,CAAC,CAAC;IAEH,MAAM,EAAE,GAAG,MAAM,WAAW,CAAC,gBAAgB,CAC5C,cAAc,CAAC,GAAG,EAClB,QAAQ,EACR,CAAC,EACD,cAAc,CAAC,YAAY,CAC3B,CAAC;IAEF,OAAO,EAAE,CAAC;AACX,CAAC,CAAC;AA5BW,QAAA,aAAa,iBA4BxB","sourcesContent":["import {\n\tBN,\n\tDriftClient,\n\tTxParams,\n\tUnifiedQuoteResponse,\n\tUnifiedSwapClient,\n\tUser,\n} from '@drift-labs/sdk';\nimport {\n\tAddressLookupTableAccount,\n\tTransaction,\n\tTransactionInstruction,\n\tVersionedTransaction,\n} from '@solana/web3.js';\n\n/**\n * Parameters for creating swap instruction details\n */\ninterface CreateSwapIxDetailsParams {\n\t/** The Drift client instance for interacting with the Drift protocol */\n\tdriftClient: DriftClient;\n\t/** Quote response from swap provider containing swap route information */\n\tquote: UnifiedQuoteResponse;\n\t/** Swap client instance for performing the swap */\n\tswapClient?: UnifiedSwapClient;\n\t/** Market index of the token being swapped from */\n\tswapFromMarketIndex: number;\n\t/** Market index of the token being swapped to */\n\tswapToMarketIndex: number;\n\t/** Amount to swap in base units */\n\tamount: BN;\n\t/** User instance containing account information */\n\tuser: User;\n}\n\n/**\n * Creates swap instruction details for a swap through Drift\n *\n * @param driftClient - The Drift client instance\n * @param swapClient - The swap client instance for performing the swap (supports UnifiedSwapClient or JupiterClient)\n * @param quote - Quote response from swap provider with routing information\n * @param swapFromMarketIndex - Source token market index\n * @param swapToMarketIndex - Destination token market index\n * @param amount - Amount to swap in base units\n * @param user - User account instance\n * @returns Promise resolving to an object containing transaction instructions and lookup tables\n * @returns ixs - Array of Solana transaction instructions for the swap\n * @returns lookupTables - Address lookup table accounts for transaction compression\n */\nexport const createSwapIxDetails = async ({\n\tdriftClient,\n\tswapClient,\n\tquote,\n\tswapFromMarketIndex,\n\tswapToMarketIndex,\n\tamount,\n\tuser,\n}: CreateSwapIxDetailsParams): Promise<{\n\tixs: TransactionInstruction[];\n\tlookupTables: AddressLookupTableAccount[];\n}> => {\n\tconst userPublicKey = user.userAccountPublicKey;\n\n\tconst swapIxsDetails = await driftClient.getSwapIxV2({\n\t\tswapClient,\n\t\toutMarketIndex: swapToMarketIndex,\n\t\tinMarketIndex: swapFromMarketIndex,\n\t\tamount,\n\t\tquote,\n\t\tuserAccountPublicKey: userPublicKey,\n\t});\n\n\treturn swapIxsDetails;\n};\n\n/**\n * Parameters for creating a complete swap transaction\n * Extends CreateSwapIxDetailsParams with additional transaction parameters\n */\ninterface CreateSwapTxnParams extends CreateSwapIxDetailsParams {\n\t/** Transaction parameters including compute units, priority fees, and other options */\n\ttxParams?: TxParams;\n}\n\n/**\n * Creates a complete swap transaction ready for signing and submission\n *\n * @param driftClient - The Drift client instance\n * @param swapClient - The swap client instance for performing the swap (supports UnifiedSwapClient or JupiterClient)\n * @param quote - Quote response from swap provider with routing information\n * @param swapFromMarketIndex - Source token market index\n * @param swapToMarketIndex - Destination token market index\n * @param amount - Amount to swap in base units\n * @param user - User account instance\n * @param txParams - Transaction parameters for fees and compute units\n * @returns Promise resolving to either a legacy Transaction or VersionedTransaction ready for signing\n */\nexport const createSwapTxn = async ({\n\tdriftClient,\n\tswapClient,\n\tquote,\n\tswapFromMarketIndex,\n\tswapToMarketIndex,\n\tamount,\n\tuser,\n\ttxParams,\n}: CreateSwapTxnParams): Promise<Transaction | VersionedTransaction> => {\n\tconst swapIxsDetails = await createSwapIxDetails({\n\t\tdriftClient,\n\t\tswapClient,\n\t\tquote,\n\t\tswapFromMarketIndex,\n\t\tswapToMarketIndex,\n\t\tamount,\n\t\tuser,\n\t});\n\n\tconst tx = await driftClient.buildTransaction(\n\t\tswapIxsDetails.ixs,\n\t\ttxParams,\n\t\t0,\n\t\tswapIxsDetails.lookupTables\n\t);\n\n\treturn tx;\n};\n"]}

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

@@ -12,6 +12,11 @@ interface CreateUserAndDepositCollateralBaseIxsParams {
     fromSubAccountId?: number;
     customMaxMarginRatio?: number;
     delegate?: PublicKey;
+    /**
+     * Optional external wallet to deposit from. If provided, the deposit will be made
+     * from this wallet instead of the authority wallet.
+     */
+    externalWallet?: PublicKey;
 }
 /**
  * Creates transaction instructions for initializing a new user account and depositing collateral.
@@ -31,13 +36,14 @@ interface CreateUserAndDepositCollateralBaseIxsParams {
  * @param fromSubAccountId - Optional sub-account ID to transfer funds from
  * @param customMaxMarginRatio - Optional custom maximum margin ratio for the account
  * @param delegate - Optional delegate public key for the account. Immediately assigns this as the delegate of the account.
+ * @param externalWallet - Optional external wallet to deposit from (instead of authority wallet)
  *
  * @returns Promise resolving to an object containing:
  *   - subAccountId: The ID of the newly created sub-account
  *   - userAccountPublicKey: The public key of the created user account
  *   - ixs: Array of transaction instructions to execute
  */
-export declare const createUserAndDepositCollateralBaseIxs: ({ driftClient, amount, spotMarketConfig, authority, userStatsAccount, referrerName, accountName, poolId, fromSubAccountId, customMaxMarginRatio, delegate, }: CreateUserAndDepositCollateralBaseIxsParams) => Promise<{
+export declare const createUserAndDepositCollateralBaseIxs: ({ driftClient, amount, spotMarketConfig, authority, userStatsAccount, referrerName, accountName, poolId, fromSubAccountId, customMaxMarginRatio, delegate, externalWallet, }: CreateUserAndDepositCollateralBaseIxsParams) => Promise<{
     subAccountId: number;
     userAccountPublicKey: PublicKey;
     ixs: TransactionInstruction[];
@@ -63,13 +69,14 @@ interface CreateUserAndDepositCollateralBaseTxnParams extends CreateUserAndDepos
  * @param fromSubAccountId - Optional sub-account ID to transfer funds from
  * @param customMaxMarginRatio - Optional custom maximum margin ratio for the account
  * @param txParams - Transaction parameters for building the transaction (compute units, priority fees, etc.)
+ * @param externalWallet - Optional external wallet to deposit from (instead of authority wallet)
  *
  * @returns Promise resolving to an object containing:
  *   - transaction: The built transaction ready for signing (Transaction or VersionedTransaction)
  *   - userAccountPublicKey: The public key of the created user account
  *   - subAccountId: The ID of the newly created sub-account
  */
-export declare const createUserAndDepositCollateralBaseTxn: ({ driftClient, amount, spotMarketConfig, authority, userStatsAccount, referrerName, accountName, poolId, fromSubAccountId, customMaxMarginRatio, txParams, }: CreateUserAndDepositCollateralBaseTxnParams) => Promise<{
+export declare const createUserAndDepositCollateralBaseTxn: ({ driftClient, amount, spotMarketConfig, authority, userStatsAccount, referrerName, accountName, poolId, fromSubAccountId, customMaxMarginRatio, txParams, externalWallet, }: CreateUserAndDepositCollateralBaseTxnParams) => Promise<{
     transaction: Transaction | VersionedTransaction;
     userAccountPublicKey: PublicKey;
     subAccountId: number;

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

@@ -24,16 +24,24 @@ const user_1 = require("../../../../common-ui-utils/user");
  * @param fromSubAccountId - Optional sub-account ID to transfer funds from
  * @param customMaxMarginRatio - Optional custom maximum margin ratio for the account
  * @param delegate - Optional delegate public key for the account. Immediately assigns this as the delegate of the account.
+ * @param externalWallet - Optional external wallet to deposit from (instead of authority wallet)
  *
  * @returns Promise resolving to an object containing:
  *   - subAccountId: The ID of the newly created sub-account
  *   - userAccountPublicKey: The public key of the created user account
  *   - ixs: Array of transaction instructions to execute
  */
-const createUserAndDepositCollateralBaseIxs = async ({ driftClient, amount, spotMarketConfig, authority, userStatsAccount, referrerName, accountName, poolId = pools_1.MAIN_POOL_ID, fromSubAccountId, customMaxMarginRatio, delegate, }) => {
+const createUserAndDepositCollateralBaseIxs = async ({ driftClient, amount, spotMarketConfig, authority, userStatsAccount, referrerName, accountName, poolId = pools_1.MAIN_POOL_ID, fromSubAccountId, customMaxMarginRatio, delegate, externalWallet, }) => {
     var _a;
     const nextSubaccountId = (_a = userStatsAccount === null || userStatsAccount === void 0 ? void 0 : userStatsAccount.numberOfSubAccountsCreated) !== null && _a !== void 0 ? _a : 0; // userId is zero indexed
-    const associatedDepositTokenAddressPromise = (0, token_1.getTokenAddressForDepositAndWithdraw)(spotMarketConfig.mint, authority);
+    // 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;
+    // 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 referrerNameAccountPromise = referrerName
         ? driftClient.fetchReferrerNameAccount(referrerName)
         : Promise.resolve(undefined);
@@ -59,9 +67,8 @@ const createUserAndDepositCollateralBaseIxs = async ({ driftClient, amount, spot
             referrerStats: referrerNameAccount.userStats,
         }
         : undefined;
-    const ixs = [];
-    const { ixs: createAndDepositIxs, userAccountPublicKey } = await driftClient.createInitializeUserAccountAndDepositCollateralIxs(amount, associatedDepositTokenAddress, spotMarketConfig.marketIndex, nextSubaccountId, accountNameToUse, fromSubAccountId, referrerInfo, sdk_1.ZERO, customMaxMarginRatio, poolId);
-    ixs.push(...createAndDepositIxs);
+    const { ixs: createAndDepositIxs, userAccountPublicKey } = await driftClient.createInitializeUserAccountAndDepositCollateralIxs(amount, associatedDepositTokenAddress, spotMarketConfig.marketIndex, nextSubaccountId, accountNameToUse, fromSubAccountId, referrerInfo, sdk_1.ZERO, customMaxMarginRatio, poolId, externalWallet ? { externalWallet } : undefined);
+    const ixs = [...createAndDepositIxs];
     const nextSubAccountPublicKey = (0, sdk_1.getUserAccountPublicKeySync)(driftClient.program.programId, authority, nextSubaccountId);
     const delegateIx = delegate
         ? await driftClient.getUpdateUserDelegateIx(delegate, {
@@ -98,13 +105,14 @@ exports.createUserAndDepositCollateralBaseIxs = createUserAndDepositCollateralBa
  * @param fromSubAccountId - Optional sub-account ID to transfer funds from
  * @param customMaxMarginRatio - Optional custom maximum margin ratio for the account
  * @param txParams - Transaction parameters for building the transaction (compute units, priority fees, etc.)
+ * @param externalWallet - Optional external wallet to deposit from (instead of authority wallet)
  *
  * @returns Promise resolving to an object containing:
  *   - transaction: The built transaction ready for signing (Transaction or VersionedTransaction)
  *   - userAccountPublicKey: The public key of the created user account
  *   - subAccountId: The ID of the newly created sub-account
  */
-const createUserAndDepositCollateralBaseTxn = async ({ driftClient, amount, spotMarketConfig, authority, userStatsAccount, referrerName, accountName, poolId = pools_1.MAIN_POOL_ID, fromSubAccountId, customMaxMarginRatio, txParams, }) => {
+const createUserAndDepositCollateralBaseTxn = async ({ driftClient, amount, spotMarketConfig, authority, userStatsAccount, referrerName, accountName, poolId = pools_1.MAIN_POOL_ID, fromSubAccountId, customMaxMarginRatio, txParams, externalWallet, }) => {
     const { ixs, userAccountPublicKey, subAccountId } = await (0, exports.createUserAndDepositCollateralBaseIxs)({
         driftClient,
         amount,
@@ -116,6 +124,7 @@ const createUserAndDepositCollateralBaseTxn = async ({ driftClient, amount, spot
         poolId,
         fromSubAccountId,
         customMaxMarginRatio,
+        externalWallet,
     });
     const tx = await driftClient.buildTransaction(ixs, txParams);
     return { transaction: tx, userAccountPublicKey, subAccountId };

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":"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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}\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 *\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}: CreateUserAndDepositCollateralBaseIxsParams): Promise<{\n\tsubAccountId: number;\n\tuserAccountPublicKey: PublicKey;\n\tixs: TransactionInstruction[];\n}> => {\n\tconst nextSubaccountId = userStatsAccount?.numberOfSubAccountsCreated ?? 0; // userId is zero indexed\n\n\tconst associatedDepositTokenAddressPromise =\n\t\tgetTokenAddressForDepositAndWithdraw(spotMarketConfig.mint, authority);\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 = [];\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);\n\tixs.push(...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 *\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}: 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});\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\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"]}

package/lib/drift/base/details/user/balances.d.ts

@@ -1,4 +1,4 @@
-import { BigNum, BN, DriftClient, User } from '@drift-labs/sdk';
+import { BigNum, DriftClient, User } from '@drift-labs/sdk';
 /**
  * Essential balance information for a spot market position.
  * Contains the three key metrics needed for balance display and analysis.

package/lib/drift/base/details/user/positions.d.ts

@@ -1,4 +1,4 @@
-import { BN, BigNum, DriftClient, PerpPosition, PositionDirection, User } from '@drift-labs/sdk';
+import { BigNum, DriftClient, PerpPosition, PositionDirection, User } from '@drift-labs/sdk';
 /**
  * Comprehensive position information derived from a PerpPosition at a specific reference price.
  * This interface contains all the key metrics needed for position display and analysis.

package/lib/drift/cli.js

@@ -62,6 +62,7 @@ dotenv.config({ path: path.resolve(__dirname, '.env') });
  *   ts-node cli.ts swap --userAccount=11111111111111111111111111111111 --fromMarketIndex=1 --toMarketIndex=0 --fromAmount=1.5 --slippage=100 --swapMode=ExactIn
  *   ts-node cli.ts swap --userAccount=11111111111111111111111111111111 --fromMarketIndex=1 --toMarketIndex=0 --toAmount=150 --slippage=100 --swapMode=ExactOut
  *   ts-node cli.ts createUserAndDeposit --marketIndex=0 --amount=100 --accountName="Primary"
+ *   ts-node cli.ts createUserAndDeposit --marketIndex=0 --amount=100 --fromWallet=22222222222222222222222222222222 --forAuthority=33333333333333333333333333333333
  */
 // Shared configuration
 let centralServerDrift;
@@ -207,6 +208,7 @@ function getMarketPrecision(marketIndex, isMainnet = true) {
  * Initialize CentralServerDrift instance
  */
 async function initializeCentralServerDrift() {
+    var _a;
     console.log('🚀 Initializing CentralServerDrift...\n');
     // Validate required environment variables
     if (!process.env.ANCHOR_WALLET) {
@@ -220,10 +222,12 @@ async function initializeCentralServerDrift() {
     console.log(`✅ Wallet Public Key: ${wallet.publicKey.toString()}`);
     console.log(`✅ RPC Endpoint: ${process.env.ENDPOINT}\n`);
     // Initialize CentralServerDrift
-    console.log('🏗️  Initializing CentralServerDrift...');
+    const driftEnv = (_a = process.env.DRIFT_ENV) !== null && _a !== void 0 ? _a : 'devnet';
+    console.log(`🏗️  Initializing CentralServerDrift... (${driftEnv})`);
+    const rpcEndpoint = process.env.ENDPOINT;
     centralServerDrift = new CentralServerDrift_1.CentralServerDrift({
-        solanaRpcEndpoint: process.env.ENDPOINT,
-        driftEnv: 'mainnet-beta', // Change to 'devnet' for devnet testing
+        solanaRpcEndpoint: rpcEndpoint,
+        driftEnv,
         supportedPerpMarkets: [0, 1, 2], // SOL, BTC, ETH
         supportedSpotMarkets: [0, 1], // USDC, SOL
         additionalDriftClientConfig: {
@@ -323,9 +327,15 @@ async function createUserAndDepositCommand(args) {
     const poolIdArg = args.poolId;
     const fromSubAccountIdArg = args.fromSubAccountId;
     const customMaxMarginRatioArg = args.customMaxMarginRatio;
+    const fromWallet = args.fromWallet;
+    const forAuthority = args.forAuthority;
     if (!marketIndexArg || !amountArg) {
         throw new Error('Required arguments: --marketIndex, --amount');
     }
+    // If external wallet is provided, authority must also be specified
+    if (fromWallet && !forAuthority) {
+        throw new Error('When using --fromWallet, you must also specify --forAuthority (the account owner)');
+    }
     const marketIndex = parseInt(marketIndexArg, 10);
     if (isNaN(marketIndex)) {
         throw new Error(`Invalid marketIndex: ${marketIndexArg}`);
@@ -360,8 +370,16 @@ async function createUserAndDepositCommand(args) {
         }
         options.customMaxMarginRatio = customMaxMarginRatio;
     }
+    // Parse external wallet and authority if provided
+    const externalWallet = fromWallet ? new web3_js_1.PublicKey(fromWallet) : undefined;
+    const authority = forAuthority
+        ? new web3_js_1.PublicKey(forAuthority)
+        : wallet.publicKey;
+    if (externalWallet) {
+        options.externalWallet = externalWallet;
+    }
     console.log('--- 🆕 Create User & Deposit Transaction ---');
-    console.log(`🔑 Authority (wallet): ${wallet.publicKey.toString()}`);
+    console.log(`🔑 Authority (account owner): ${authority.toString()}`);
     console.log(`🏪 Spot Market Index: ${marketIndex}`);
     console.log(`💰 Initial Deposit: ${amountArg} (${amountBN.toString()} raw units)`);
     if (options.accountName) {
@@ -379,8 +397,11 @@ async function createUserAndDepositCommand(args) {
     if (options.customMaxMarginRatio !== undefined) {
         console.log(`📐 Custom Max Margin Ratio: ${options.customMaxMarginRatio}`);
     }
+    if (externalWallet) {
+        console.log(`💼 From External Wallet: ${externalWallet.toBase58()}`);
+    }
     const hasOptions = Object.keys(options).length > 0;
-    const { transaction, userAccountPublicKey, subAccountId } = await centralServerDrift.getCreateAndDepositTxn(wallet.publicKey, amountBN, marketIndex, hasOptions ? options : undefined);
+    const { transaction, userAccountPublicKey, subAccountId } = await centralServerDrift.getCreateAndDepositTxn(authority, amountBN, marketIndex, hasOptions ? options : undefined);
     console.log(`🆔 New User Account: ${userAccountPublicKey.toString()}`);
     console.log(`🧾 Subaccount ID: ${subAccountId}`);
     await executeTransaction(transaction, 'Create User & Deposit');
@@ -741,8 +762,9 @@ function showUsage() {
     console.log('  Example (external wallet): ts-node cli.ts deposit --userAccount=11111111111111111111111111111111 --marketIndex=0 --amount=100 --fromWallet=22222222222222222222222222222222');
     console.log('');
     console.log('🆕 createUserAndDeposit');
-    console.log('  ts-node cli.ts createUserAndDeposit --marketIndex=<num> --amount=<num> [--accountName=<string>] [--referrerName=<string>] [--poolId=<num>] [--fromSubAccountId=<num>] [--customMaxMarginRatio=<num>]');
+    console.log('  ts-node cli.ts createUserAndDeposit --marketIndex=<num> --amount=<num> [--accountName=<string>] [--referrerName=<string>] [--poolId=<num>] [--fromSubAccountId=<num>] [--customMaxMarginRatio=<num>] [--fromWallet=<pubkey> --forAuthority=<pubkey>]');
     console.log('  Example: ts-node cli.ts createUserAndDeposit --marketIndex=0 --amount=100 --accountName="Primary"');
+    console.log('  Example (external wallet): ts-node cli.ts createUserAndDeposit --marketIndex=0 --amount=100 --fromWallet=22222222222222222222222222222222 --forAuthority=33333333333333333333333333333333');
     console.log('');
     console.log('💸 withdraw');
     console.log('  ts-node cli.ts withdraw --userAccount=<pubkey> --marketIndex=<num> --amount=<num> [--isBorrow=<bool>] [--isMax=<bool>]');