@drift-labs/common 1.0.59 → 1.0.61

package/lib/index.js

@@ -17,54 +17,69 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DriftErrors = exports.JupV6Errors = exports.JupV4Errors = exports.millify = void 0;
-__exportStar(require("./Config"), exports);
-__exportStar(require("./chartConstants"), exports);
-__exportStar(require("./types"), exports);
-__exportStar(require("./EnvironmentConstants"), exports);
+exports.DriftErrors = exports.JupV6Errors = exports.JupV4Errors = exports.USER_UTILS = exports.ORDER_COMMON_UTILS = exports.MARKET_UTILS = exports.TRADING_UTILS = exports.EQUALITY_CHECKS = exports.COMMON_MATH = exports.COMMON_UI_UTILS = exports.COMMON_UTILS = exports.MultiplexWebSocket = exports.ResultSlotIncrementer = exports.getSwiftConfirmationTimeoutMs = exports.millify = void 0;
+// Domain modules (via utils barrel)
 __exportStar(require("./utils"), exports);
-__exportStar(require("./utils/index"), exports);
-__exportStar(require("./utils/s3Buckets"), exports);
-__exportStar(require("./serializableTypes"), exports);
-__exportStar(require("./utils/candles/Candle"), exports);
+// Non-domain utils that stay at utils/ level
+__exportStar(require("./utils/logger"), exports);
 __exportStar(require("./utils/featureFlags"), exports);
-__exportStar(require("./utils/WalletConnectionState"), exports);
+__exportStar(require("./utils/candles/Candle"), exports);
 __exportStar(require("./utils/rpcLatency"), exports);
-__exportStar(require("./utils/token"), exports);
-__exportStar(require("./utils/math"), exports);
-__exportStar(require("./utils/logger"), exports);
-__exportStar(require("./utils/equalityChecks"), exports);
-__exportStar(require("./common-ui-utils"), exports);
-__exportStar(require("./constants"), exports);
-__exportStar(require("./actions/actionHelpers/actionHelpers"), exports);
 __exportStar(require("./utils/SharedInterval"), exports);
 __exportStar(require("./utils/Stopwatch"), exports);
 __exportStar(require("./utils/priority-fees"), exports);
 __exportStar(require("./utils/superstake"), exports);
-__exportStar(require("./utils/fetch"), exports);
 __exportStar(require("./utils/priceImpact"), exports);
 __exportStar(require("./utils/dlob-server/DlobServerWebsocketUtils"), exports);
-__exportStar(require("./common-ui-utils/settings/settings"), exports);
-__exportStar(require("./utils/priority-fees"), exports);
 __exportStar(require("./utils/orderbook"), exports);
-__exportStar(require("./clients/candleClient"), exports);
-__exportStar(require("./clients/marketDataFeed"), exports);
-__exportStar(require("./clients/swiftClient"), exports);
-__exportStar(require("./clients/tvFeed"), exports);
-__exportStar(require("./clients/DlobWebsocketClient"), exports);
 __exportStar(require("./utils/pollingSequenceGuard"), exports);
 __exportStar(require("./utils/driftEvents"), exports);
-__exportStar(require("./utils/MultiplexWebSocket"), exports);
 __exportStar(require("./utils/SlotBasedResultValidator"), exports);
 __exportStar(require("./utils/CircularBuffers"), exports);
 __exportStar(require("./utils/rxjs"), exports);
 __exportStar(require("./utils/priorityFees"), exports);
 __exportStar(require("./utils/NumLib"), exports);
-__exportStar(require("./utils/strings"), exports);
-__exportStar(require("./utils/validation"), exports);
+__exportStar(require("./utils/s3Buckets"), exports);
+__exportStar(require("./utils/insuranceFund"), exports);
+__exportStar(require("./utils/settings/settings"), exports);
 var millify_1 = require("./utils/millify");
 Object.defineProperty(exports, "millify", { enumerable: true, get: function () { return __importDefault(millify_1).default; } });
-__exportStar(require("./utils/markets/precisions"), exports);
+var signedMsgs_1 = require("./utils/signedMsgs");
+Object.defineProperty(exports, "getSwiftConfirmationTimeoutMs", { enumerable: true, get: function () { return signedMsgs_1.getSwiftConfirmationTimeoutMs; } });
+var ResultSlotIncrementer_1 = require("./utils/ResultSlotIncrementer");
+Object.defineProperty(exports, "ResultSlotIncrementer", { enumerable: true, get: function () { return ResultSlotIncrementer_1.ResultSlotIncrementer; } });
+var MultiplexWebSocket_1 = require("./utils/MultiplexWebSocket");
+Object.defineProperty(exports, "MultiplexWebSocket", { enumerable: true, get: function () { return MultiplexWebSocket_1.MultiplexWebSocket; } });
+// Deprecation facades
+var utils_1 = require("./_deprecated/utils");
+Object.defineProperty(exports, "COMMON_UTILS", { enumerable: true, get: function () { return utils_1.COMMON_UTILS; } });
+var common_ui_utils_1 = require("./_deprecated/common-ui-utils");
+Object.defineProperty(exports, "COMMON_UI_UTILS", { enumerable: true, get: function () { return common_ui_utils_1.COMMON_UI_UTILS; } });
+var common_math_1 = require("./_deprecated/common-math");
+Object.defineProperty(exports, "COMMON_MATH", { enumerable: true, get: function () { return common_math_1.COMMON_MATH; } });
+var equality_checks_1 = require("./_deprecated/equality-checks");
+Object.defineProperty(exports, "EQUALITY_CHECKS", { enumerable: true, get: function () { return equality_checks_1.EQUALITY_CHECKS; } });
+var trading_utils_1 = require("./_deprecated/trading-utils");
+Object.defineProperty(exports, "TRADING_UTILS", { enumerable: true, get: function () { return trading_utils_1.TRADING_UTILS; } });
+var market_utils_1 = require("./_deprecated/market-utils");
+Object.defineProperty(exports, "MARKET_UTILS", { enumerable: true, get: function () { return market_utils_1.MARKET_UTILS; } });
+var order_utils_1 = require("./_deprecated/order-utils");
+Object.defineProperty(exports, "ORDER_COMMON_UTILS", { enumerable: true, get: function () { return order_utils_1.ORDER_COMMON_UTILS; } });
+var user_utils_1 = require("./_deprecated/user-utils");
+Object.defineProperty(exports, "USER_UTILS", { enumerable: true, get: function () { return user_utils_1.USER_UTILS; } });
+// Non-utils modules
+__exportStar(require("./Config"), exports);
+__exportStar(require("./chartConstants"), exports);
+__exportStar(require("./types"), exports);
+__exportStar(require("./EnvironmentConstants"), exports);
+__exportStar(require("./serializableTypes"), exports);
+__exportStar(require("./constants"), exports);
+__exportStar(require("./actions/actionHelpers/actionHelpers"), exports);
+__exportStar(require("./clients/candleClient"), exports);
+__exportStar(require("./clients/marketDataFeed"), exports);
+__exportStar(require("./clients/swiftClient"), exports);
+__exportStar(require("./clients/tvFeed"), exports);
+__exportStar(require("./clients/DlobWebsocketClient"), exports);
 __exportStar(require("./drift"), exports);
 // External Program Errors
 const jup_v4_error_codes_json_1 = __importDefault(require("./constants/autogenerated/jup-v4-error-codes.json"));

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,2CAAyB;AACzB,mDAAiC;AACjC,0CAAwB;AACxB,yDAAuC;AACvC,0CAAwB;AACxB,gDAA8B;AAC9B,oDAAkC;AAClC,sDAAoC;AACpC,yDAAuC;AACvC,uDAAqC;AACrC,gEAA8C;AAC9C,qDAAmC;AACnC,gDAA8B;AAC9B,+CAA6B;AAC7B,iDAA+B;AAC/B,yDAAuC;AACvC,oDAAkC;AAClC,8CAA4B;AAC5B,wEAAsD;AACtD,yDAAuC;AACvC,oDAAkC;AAClC,wDAAsC;AACtC,qDAAmC;AACnC,gDAA8B;AAC9B,sDAAoC;AACpC,+EAA6D;AAC7D,sEAAoD;AACpD,wDAAsC;AACtC,oDAAkC;AAClC,yDAAuC;AACvC,2DAAyC;AACzC,wDAAsC;AACtC,mDAAiC;AACjC,gEAA8C;AAC9C,+DAA6C;AAC7C,sDAAoC;AACpC,6DAA2C;AAC3C,mEAAiD;AACjD,0DAAwC;AACxC,+CAA6B;AAC7B,uDAAqC;AACrC,iDAA+B;AAC/B,kDAAgC;AAChC,qDAAmC;AACnC,2CAAqD;AAA5C,mHAAA,OAAO,OAAW;AAC3B,6DAA2C;AAC3C,0CAAwB;AAExB,0BAA0B;AAC1B,gHAA4E;AAEnE,sBAFF,iCAAW,CAEE;AADpB,gHAA4E;AACtD,sBADf,iCAAW,CACe;AAEjC,kGAAqE;AAC5D,sBADF,0BAAW,CACE","sourcesContent":["export * from './Config';\nexport * from './chartConstants';\nexport * from './types';\nexport * from './EnvironmentConstants';\nexport * from './utils';\nexport * from './utils/index';\nexport * from './utils/s3Buckets';\nexport * from './serializableTypes';\nexport * from './utils/candles/Candle';\nexport * from './utils/featureFlags';\nexport * from './utils/WalletConnectionState';\nexport * from './utils/rpcLatency';\nexport * from './utils/token';\nexport * from './utils/math';\nexport * from './utils/logger';\nexport * from './utils/equalityChecks';\nexport * from './common-ui-utils';\nexport * from './constants';\nexport * from './actions/actionHelpers/actionHelpers';\nexport * from './utils/SharedInterval';\nexport * from './utils/Stopwatch';\nexport * from './utils/priority-fees';\nexport * from './utils/superstake';\nexport * from './utils/fetch';\nexport * from './utils/priceImpact';\nexport * from './utils/dlob-server/DlobServerWebsocketUtils';\nexport * from './common-ui-utils/settings/settings';\nexport * from './utils/priority-fees';\nexport * from './utils/orderbook';\nexport * from './clients/candleClient';\nexport * from './clients/marketDataFeed';\nexport * from './clients/swiftClient';\nexport * from './clients/tvFeed';\nexport * from './clients/DlobWebsocketClient';\nexport * from './utils/pollingSequenceGuard';\nexport * from './utils/driftEvents';\nexport * from './utils/MultiplexWebSocket';\nexport * from './utils/SlotBasedResultValidator';\nexport * from './utils/CircularBuffers';\nexport * from './utils/rxjs';\nexport * from './utils/priorityFees';\nexport * from './utils/NumLib';\nexport * from './utils/strings';\nexport * from './utils/validation';\nexport { default as millify } from './utils/millify';\nexport * from './utils/markets/precisions';\nexport * from './drift';\n\n// External Program Errors\nimport JupV4Errors from './constants/autogenerated/jup-v4-error-codes.json';\nimport JupV6Errors from './constants/autogenerated/jup-v6-error-codes.json';\nexport { JupV4Errors, JupV6Errors };\n\nimport DriftErrors from './constants/autogenerated/driftErrors.json';\nexport { DriftErrors };\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,oCAAoC;AACpC,0CAAwB;AAExB,6CAA6C;AAC7C,iDAA+B;AAC/B,uDAAqC;AACrC,yDAAuC;AACvC,qDAAmC;AACnC,yDAAuC;AACvC,oDAAkC;AAClC,wDAAsC;AACtC,qDAAmC;AACnC,sDAAoC;AACpC,+EAA6D;AAC7D,oDAAkC;AAClC,+DAA6C;AAC7C,sDAAoC;AACpC,mEAAiD;AACjD,0DAAwC;AACxC,+CAA6B;AAC7B,uDAAqC;AACrC,iDAA+B;AAC/B,oDAAkC;AAClC,wDAAsC;AACtC,4DAA0C;AAC1C,2CAAqD;AAA5C,mHAAA,OAAO,OAAW;AAC3B,iDAAmE;AAA1D,2HAAA,6BAA6B,OAAA;AACtC,uEAAsE;AAA7D,8HAAA,qBAAqB,OAAA;AAC9B,iEAAgE;AAAvD,wHAAA,kBAAkB,OAAA;AAE3B,sBAAsB;AACtB,6CAAmD;AAA1C,qGAAA,YAAY,OAAA;AACrB,iEAAgE;AAAvD,kHAAA,eAAe,OAAA;AACxB,yDAAwD;AAA/C,0GAAA,WAAW,OAAA;AACpB,iEAAgE;AAAvD,kHAAA,eAAe,OAAA;AACxB,6DAA4D;AAAnD,8GAAA,aAAa,OAAA;AACtB,2DAA0D;AAAjD,4GAAA,YAAY,OAAA;AACrB,yDAA+D;AAAtD,iHAAA,kBAAkB,OAAA;AAC3B,uDAAsD;AAA7C,wGAAA,UAAU,OAAA;AAEnB,oBAAoB;AACpB,2CAAyB;AACzB,mDAAiC;AACjC,0CAAwB;AACxB,yDAAuC;AACvC,sDAAoC;AACpC,8CAA4B;AAC5B,wEAAsD;AACtD,yDAAuC;AACvC,2DAAyC;AACzC,wDAAsC;AACtC,mDAAiC;AACjC,gEAA8C;AAC9C,0CAAwB;AAExB,0BAA0B;AAC1B,gHAA4E;AAEnE,sBAFF,iCAAW,CAEE;AADpB,gHAA4E;AACtD,sBADf,iCAAW,CACe;AAEjC,kGAAqE;AAC5D,sBADF,0BAAW,CACE","sourcesContent":["// Domain modules (via utils barrel)\nexport * from './utils';\n\n// Non-domain utils that stay at utils/ level\nexport * from './utils/logger';\nexport * from './utils/featureFlags';\nexport * from './utils/candles/Candle';\nexport * from './utils/rpcLatency';\nexport * from './utils/SharedInterval';\nexport * from './utils/Stopwatch';\nexport * from './utils/priority-fees';\nexport * from './utils/superstake';\nexport * from './utils/priceImpact';\nexport * from './utils/dlob-server/DlobServerWebsocketUtils';\nexport * from './utils/orderbook';\nexport * from './utils/pollingSequenceGuard';\nexport * from './utils/driftEvents';\nexport * from './utils/SlotBasedResultValidator';\nexport * from './utils/CircularBuffers';\nexport * from './utils/rxjs';\nexport * from './utils/priorityFees';\nexport * from './utils/NumLib';\nexport * from './utils/s3Buckets';\nexport * from './utils/insuranceFund';\nexport * from './utils/settings/settings';\nexport { default as millify } from './utils/millify';\nexport { getSwiftConfirmationTimeoutMs } from './utils/signedMsgs';\nexport { ResultSlotIncrementer } from './utils/ResultSlotIncrementer';\nexport { MultiplexWebSocket } from './utils/MultiplexWebSocket';\n\n// Deprecation facades\nexport { COMMON_UTILS } from './_deprecated/utils';\nexport { COMMON_UI_UTILS } from './_deprecated/common-ui-utils';\nexport { COMMON_MATH } from './_deprecated/common-math';\nexport { EQUALITY_CHECKS } from './_deprecated/equality-checks';\nexport { TRADING_UTILS } from './_deprecated/trading-utils';\nexport { MARKET_UTILS } from './_deprecated/market-utils';\nexport { ORDER_COMMON_UTILS } from './_deprecated/order-utils';\nexport { USER_UTILS } from './_deprecated/user-utils';\n\n// Non-utils modules\nexport * from './Config';\nexport * from './chartConstants';\nexport * from './types';\nexport * from './EnvironmentConstants';\nexport * from './serializableTypes';\nexport * from './constants';\nexport * from './actions/actionHelpers/actionHelpers';\nexport * from './clients/candleClient';\nexport * from './clients/marketDataFeed';\nexport * from './clients/swiftClient';\nexport * from './clients/tvFeed';\nexport * from './clients/DlobWebsocketClient';\nexport * from './drift';\n\n// External Program Errors\nimport JupV4Errors from './constants/autogenerated/jup-v4-error-codes.json';\nimport JupV6Errors from './constants/autogenerated/jup-v6-error-codes.json';\nexport { JupV4Errors, JupV6Errors };\n\nimport DriftErrors from './constants/autogenerated/driftErrors.json';\nexport { DriftErrors };\n"]}

package/lib/utils/accounts/index.d.ts

@@ -0,0 +1,6 @@
+export * from './init';
+export * from './keys';
+export * from './subaccounts';
+export * from './wallet';
+export * from './signature';
+export * from './multiple';

package/lib/utils/accounts/index.js

@@ -0,0 +1,23 @@
+"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("./init"), exports);
+__exportStar(require("./keys"), exports);
+__exportStar(require("./subaccounts"), exports);
+__exportStar(require("./wallet"), exports);
+__exportStar(require("./signature"), exports);
+__exportStar(require("./multiple"), exports);
+//# sourceMappingURL=index.js.map

package/lib/utils/accounts/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/accounts/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yCAAuB;AACvB,yCAAuB;AACvB,gDAA8B;AAC9B,2CAAyB;AACzB,8CAA4B;AAC5B,6CAA2B","sourcesContent":["export * from './init';\nexport * from './keys';\nexport * from './subaccounts';\nexport * from './wallet';\nexport * from './signature';\nexport * from './multiple';\n"]}

package/lib/utils/accounts/init.d.ts

@@ -0,0 +1,22 @@
+import { DriftClient, PublicKey } from '@drift-labs/sdk';
+declare const ACCOUNT_INITIALIZATION_RETRY_DELAY_MS = 1000;
+declare const ACCOUNT_INITIALIZATION_RETRY_ATTEMPTS = 5;
+declare const awaitAccountInitializationChainState: (driftClient: DriftClient, userId: number, authority: PublicKey) => Promise<boolean>;
+/**
+ * Using your own callback to do the account initialization, this method will run the initialization step, switch to the drift user, await for the account to be available on chain, subscribe to the user account, and switch to the user account using the drift client.
+ *
+ * It provides extra callbacks to handle steps directly after the initialiation tx, and after fully initializing+subscribing to the account.
+ *
+ * Callbacks available:
+ * - initializationStep: This callback should send the transaction to initialize the user account
+ * - postInitializationStep: This callback will run after the successful initialization transaction, but before trying to load/subscribe to the new account
+ * - handleSuccessStep: This callback will run after everything has initialized+subscribed successfully
+ *
+ * // TODO : Need to do the subscription step
+ */
+declare const initializeAndSubscribeToNewUserAccount: (driftClient: DriftClient, userIdToInit: number, authority: PublicKey, callbacks: {
+    initializationStep: () => Promise<boolean>;
+    postInitializationStep?: () => Promise<boolean>;
+    handleSuccessStep?: (accountAlreadyExisted: boolean) => Promise<boolean>;
+}) => Promise<'ok' | 'failed_initializationStep' | 'failed_postInitializationStep' | 'failed_awaitAccountInitializationChainState' | 'failed_handleSuccessStep'>;
+export { ACCOUNT_INITIALIZATION_RETRY_DELAY_MS, ACCOUNT_INITIALIZATION_RETRY_ATTEMPTS, awaitAccountInitializationChainState, initializeAndSubscribeToNewUserAccount, };

package/lib/utils/accounts/init.js

@@ -0,0 +1,90 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.initializeAndSubscribeToNewUserAccount = exports.awaitAccountInitializationChainState = exports.ACCOUNT_INITIALIZATION_RETRY_ATTEMPTS = exports.ACCOUNT_INITIALIZATION_RETRY_DELAY_MS = void 0;
+const async_1 = require("../core/async");
+// When creating an account, try 5 times over 5 seconds to wait for the new account to hit the blockchain.
+const ACCOUNT_INITIALIZATION_RETRY_DELAY_MS = 1000;
+exports.ACCOUNT_INITIALIZATION_RETRY_DELAY_MS = ACCOUNT_INITIALIZATION_RETRY_DELAY_MS;
+const ACCOUNT_INITIALIZATION_RETRY_ATTEMPTS = 5;
+exports.ACCOUNT_INITIALIZATION_RETRY_ATTEMPTS = ACCOUNT_INITIALIZATION_RETRY_ATTEMPTS;
+const awaitAccountInitializationChainState = async (driftClient, userId, authority) => {
+    var _a;
+    const user = driftClient.getUser(userId, authority);
+    if (!user.isSubscribed) {
+        await user.subscribe();
+    }
+    let retryCount = 0;
+    do {
+        try {
+            await updateUserAccount(user);
+            if (((_a = user === null || user === void 0 ? void 0 : user.getUserAccountAndSlot()) === null || _a === void 0 ? void 0 : _a.data) !== undefined) {
+                return true;
+            }
+        }
+        catch (err) {
+            retryCount++;
+            await (0, async_1.sleep)(ACCOUNT_INITIALIZATION_RETRY_DELAY_MS);
+        }
+    } while (retryCount < ACCOUNT_INITIALIZATION_RETRY_ATTEMPTS);
+    throw new Error('awaitAccountInitializationFailed');
+};
+exports.awaitAccountInitializationChainState = awaitAccountInitializationChainState;
+/**
+ * Using your own callback to do the account initialization, this method will run the initialization step, switch to the drift user, await for the account to be available on chain, subscribe to the user account, and switch to the user account using the drift client.
+ *
+ * It provides extra callbacks to handle steps directly after the initialiation tx, and after fully initializing+subscribing to the account.
+ *
+ * Callbacks available:
+ * - initializationStep: This callback should send the transaction to initialize the user account
+ * - postInitializationStep: This callback will run after the successful initialization transaction, but before trying to load/subscribe to the new account
+ * - handleSuccessStep: This callback will run after everything has initialized+subscribed successfully
+ *
+ * // TODO : Need to do the subscription step
+ */
+const initializeAndSubscribeToNewUserAccount = async (driftClient, userIdToInit, authority, callbacks) => {
+    var _a;
+    await driftClient.addUser(userIdToInit, authority);
+    const accountAlreadyExisted = await ((_a = driftClient
+        .getUser(userIdToInit)) === null || _a === void 0 ? void 0 : _a.exists());
+    // Do the account initialization step
+    let result = await callbacks.initializationStep();
+    // Fetch account to make sure it's loaded
+    await updateUserAccount(driftClient.getUser(userIdToInit));
+    if (!result) {
+        return 'failed_initializationStep';
+    }
+    // Do the post-initialization step
+    result = callbacks.postInitializationStep
+        ? await callbacks.postInitializationStep()
+        : result;
+    if (!result) {
+        return 'failed_postInitializationStep';
+    }
+    // Await the account initialization step to update the blockchain
+    result = await awaitAccountInitializationChainState(driftClient, userIdToInit, authority);
+    if (!result) {
+        return 'failed_awaitAccountInitializationChainState';
+    }
+    await driftClient.switchActiveUser(userIdToInit, authority);
+    // Do the subscription step
+    // Run the success handler
+    result = callbacks.handleSuccessStep
+        ? await callbacks.handleSuccessStep(accountAlreadyExisted)
+        : result;
+    if (!result) {
+        return 'failed_handleSuccessStep';
+    }
+    return 'ok';
+};
+exports.initializeAndSubscribeToNewUserAccount = initializeAndSubscribeToNewUserAccount;
+async function updateUserAccount(user) {
+    const publicKey = user.userAccountPublicKey;
+    try {
+        const dataAndContext = await user.driftClient.program.account.user.fetchAndContext(publicKey, 'processed');
+        user.accountSubscriber.updateData(dataAndContext.data, dataAndContext.context.slot);
+    }
+    catch (e) {
+        // noop
+    }
+}
+//# sourceMappingURL=init.js.map

package/lib/utils/accounts/init.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/utils/accounts/init.ts"],"names":[],"mappings":";;;AACA,yCAAsC;AAEtC,0GAA0G;AAC1G,MAAM,qCAAqC,GAAG,IAAI,CAAC;AAiIlD,sFAAqC;AAhItC,MAAM,qCAAqC,GAAG,CAAC,CAAC;AAiI/C,sFAAqC;AA/HtC,MAAM,oCAAoC,GAAG,KAAK,EACjD,WAAwB,EACxB,MAAc,EACd,SAAoB,EACnB,EAAE;;IACH,MAAM,IAAI,GAAG,WAAW,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAEpD,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;QACxB,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;IACxB,CAAC;IAED,IAAI,UAAU,GAAG,CAAC,CAAC;IAEnB,GAAG,CAAC;QACH,IAAI,CAAC;YACJ,MAAM,iBAAiB,CAAC,IAAI,CAAC,CAAC;YAC9B,IAAI,CAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,qBAAqB,EAAE,0CAAE,IAAI,MAAK,SAAS,EAAE,CAAC;gBACvD,OAAO,IAAI,CAAC;YACb,CAAC;QACF,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACd,UAAU,EAAE,CAAC;YACb,MAAM,IAAA,aAAK,EAAC,qCAAqC,CAAC,CAAC;QACpD,CAAC;IACF,CAAC,QAAQ,UAAU,GAAG,qCAAqC,EAAE;IAE7D,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;AACrD,CAAC,CAAC;AAsGD,oFAAoC;AApGrC;;;;;;;;;;;GAWG;AACH,MAAM,sCAAsC,GAAG,KAAK,EACnD,WAAwB,EACxB,YAAoB,EACpB,SAAoB,EACpB,SAIC,EAOA,EAAE;;IACH,MAAM,WAAW,CAAC,OAAO,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;IAEnD,MAAM,qBAAqB,GAAG,MAAM,CAAA,MAAA,WAAW;SAC7C,OAAO,CAAC,YAAY,CAAC,0CACpB,MAAM,EAAE,CAAA,CAAC;IAEZ,qCAAqC;IACrC,IAAI,MAAM,GAAG,MAAM,SAAS,CAAC,kBAAkB,EAAE,CAAC;IAElD,yCAAyC;IACzC,MAAM,iBAAiB,CAAC,WAAW,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC;IAE3D,IAAI,CAAC,MAAM,EAAE,CAAC;QACb,OAAO,2BAA2B,CAAC;IACpC,CAAC;IAED,kCAAkC;IAClC,MAAM,GAAG,SAAS,CAAC,sBAAsB;QACxC,CAAC,CAAC,MAAM,SAAS,CAAC,sBAAsB,EAAE;QAC1C,CAAC,CAAC,MAAM,CAAC;IAEV,IAAI,CAAC,MAAM,EAAE,CAAC;QACb,OAAO,+BAA+B,CAAC;IACxC,CAAC;IAED,iEAAiE;IACjE,MAAM,GAAG,MAAM,oCAAoC,CAClD,WAAW,EACX,YAAY,EACZ,SAAS,CACT,CAAC;IAEF,IAAI,CAAC,MAAM,EAAE,CAAC;QACb,OAAO,6CAA6C,CAAC;IACtD,CAAC;IAED,MAAM,WAAW,CAAC,gBAAgB,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;IAE5D,2BAA2B;IAE3B,0BAA0B;IAC1B,MAAM,GAAG,SAAS,CAAC,iBAAiB;QACnC,CAAC,CAAC,MAAM,SAAS,CAAC,iBAAiB,CAAC,qBAAqB,CAAC;QAC1D,CAAC,CAAC,MAAM,CAAC;IAEV,IAAI,CAAC,MAAM,EAAE,CAAC;QACb,OAAO,0BAA0B,CAAC;IACnC,CAAC;IAED,OAAO,IAAI,CAAC;AACb,CAAC,CAAC;AAuBD,wFAAsC;AArBvC,KAAK,UAAU,iBAAiB,CAAC,IAAU;IAC1C,MAAM,SAAS,GAAG,IAAI,CAAC,oBAAoB,CAAC;IAC5C,IAAI,CAAC;QACJ,MAAM,cAAc,GACnB,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAC1D,SAAS,EACT,WAAW,CACX,CAAC;QACH,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAChC,cAAc,CAAC,IAAmB,EAClC,cAAc,CAAC,OAAO,CAAC,IAAI,CAC3B,CAAC;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACZ,OAAO;IACR,CAAC;AACF,CAAC","sourcesContent":["import { DriftClient, PublicKey, User, UserAccount } from '@drift-labs/sdk';\nimport { sleep } from '../core/async';\n\n// When creating an account, try 5 times over 5 seconds to wait for the new account to hit the blockchain.\nconst ACCOUNT_INITIALIZATION_RETRY_DELAY_MS = 1000;\nconst ACCOUNT_INITIALIZATION_RETRY_ATTEMPTS = 5;\n\nconst awaitAccountInitializationChainState = async (\n\tdriftClient: DriftClient,\n\tuserId: number,\n\tauthority: PublicKey\n) => {\n\tconst user = driftClient.getUser(userId, authority);\n\n\tif (!user.isSubscribed) {\n\t\tawait user.subscribe();\n\t}\n\n\tlet retryCount = 0;\n\n\tdo {\n\t\ttry {\n\t\t\tawait updateUserAccount(user);\n\t\t\tif (user?.getUserAccountAndSlot()?.data !== undefined) {\n\t\t\t\treturn true;\n\t\t\t}\n\t\t} catch (err) {\n\t\t\tretryCount++;\n\t\t\tawait sleep(ACCOUNT_INITIALIZATION_RETRY_DELAY_MS);\n\t\t}\n\t} while (retryCount < ACCOUNT_INITIALIZATION_RETRY_ATTEMPTS);\n\n\tthrow new Error('awaitAccountInitializationFailed');\n};\n\n/**\n * Using your own callback to do the account initialization, this method will run the initialization step, switch to the drift user, await for the account to be available on chain, subscribe to the user account, and switch to the user account using the drift client.\n *\n * It provides extra callbacks to handle steps directly after the initialiation tx, and after fully initializing+subscribing to the account.\n *\n * Callbacks available:\n * - initializationStep: This callback should send the transaction to initialize the user account\n * - postInitializationStep: This callback will run after the successful initialization transaction, but before trying to load/subscribe to the new account\n * - handleSuccessStep: This callback will run after everything has initialized+subscribed successfully\n *\n * // TODO : Need to do the subscription step\n */\nconst initializeAndSubscribeToNewUserAccount = async (\n\tdriftClient: DriftClient,\n\tuserIdToInit: number,\n\tauthority: PublicKey,\n\tcallbacks: {\n\t\tinitializationStep: () => Promise<boolean>;\n\t\tpostInitializationStep?: () => Promise<boolean>;\n\t\thandleSuccessStep?: (accountAlreadyExisted: boolean) => Promise<boolean>;\n\t}\n): Promise<\n\t| 'ok'\n\t| 'failed_initializationStep'\n\t| 'failed_postInitializationStep'\n\t| 'failed_awaitAccountInitializationChainState'\n\t| 'failed_handleSuccessStep'\n> => {\n\tawait driftClient.addUser(userIdToInit, authority);\n\n\tconst accountAlreadyExisted = await driftClient\n\t\t.getUser(userIdToInit)\n\t\t?.exists();\n\n\t// Do the account initialization step\n\tlet result = await callbacks.initializationStep();\n\n\t// Fetch account to make sure it's loaded\n\tawait updateUserAccount(driftClient.getUser(userIdToInit));\n\n\tif (!result) {\n\t\treturn 'failed_initializationStep';\n\t}\n\n\t// Do the post-initialization step\n\tresult = callbacks.postInitializationStep\n\t\t? await callbacks.postInitializationStep()\n\t\t: result;\n\n\tif (!result) {\n\t\treturn 'failed_postInitializationStep';\n\t}\n\n\t// Await the account initialization step to update the blockchain\n\tresult = await awaitAccountInitializationChainState(\n\t\tdriftClient,\n\t\tuserIdToInit,\n\t\tauthority\n\t);\n\n\tif (!result) {\n\t\treturn 'failed_awaitAccountInitializationChainState';\n\t}\n\n\tawait driftClient.switchActiveUser(userIdToInit, authority);\n\n\t// Do the subscription step\n\n\t// Run the success handler\n\tresult = callbacks.handleSuccessStep\n\t\t? await callbacks.handleSuccessStep(accountAlreadyExisted)\n\t\t: result;\n\n\tif (!result) {\n\t\treturn 'failed_handleSuccessStep';\n\t}\n\n\treturn 'ok';\n};\n\nasync function updateUserAccount(user: User): Promise<void> {\n\tconst publicKey = user.userAccountPublicKey;\n\ttry {\n\t\tconst dataAndContext =\n\t\t\tawait user.driftClient.program.account.user.fetchAndContext(\n\t\t\t\tpublicKey,\n\t\t\t\t'processed'\n\t\t\t);\n\t\tuser.accountSubscriber.updateData(\n\t\t\tdataAndContext.data as UserAccount,\n\t\t\tdataAndContext.context.slot\n\t\t);\n\t} catch (e) {\n\t\t// noop\n\t}\n}\n\nexport {\n\tACCOUNT_INITIALIZATION_RETRY_DELAY_MS,\n\tACCOUNT_INITIALIZATION_RETRY_ATTEMPTS,\n\tawaitAccountInitializationChainState,\n\tinitializeAndSubscribeToNewUserAccount,\n};\n"]}

package/lib/utils/accounts/keys.d.ts

@@ -0,0 +1,22 @@
+import { MarketType, PublicKey } from '@drift-labs/sdk';
+/**
+ * Get a unique key for an authority's subaccount
+ * @param userId
+ * @param authority
+ * @returns
+ */
+declare const getUserKey: (userId: number, authority: PublicKey) => string;
+/**
+ * Get the authority and subAccountId from a user's account key
+ * @param key
+ * @returns
+ */
+declare const getIdAndAuthorityFromKey: (key: string) => {
+    userId: number;
+    userAuthority: PublicKey;
+} | {
+    userId: undefined;
+    userAuthority: undefined;
+};
+declare const getMarketKey: (marketIndex: number, marketType: MarketType) => string;
+export { getUserKey, getIdAndAuthorityFromKey, getMarketKey };

package/lib/utils/accounts/keys.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMarketKey = exports.getIdAndAuthorityFromKey = exports.getUserKey = void 0;
+const sdk_1 = require("@drift-labs/sdk");
+const cache_1 = require("../core/cache");
+const enum_1 = require("../enum");
+/**
+ * Get a unique key for an authority's subaccount
+ * @param userId
+ * @param authority
+ * @returns
+ */
+const getUserKey = (userId, authority) => {
+    if (userId == undefined || !authority)
+        return '';
+    return (0, cache_1.getCachedUiString)('userKey', userId, authority.toString());
+};
+exports.getUserKey = getUserKey;
+/**
+ * Get the authority and subAccountId from a user's account key
+ * @param key
+ * @returns
+ */
+const getIdAndAuthorityFromKey = (key) => {
+    const splitKey = key === null || key === void 0 ? void 0 : key.split('_');
+    if (!splitKey || splitKey.length !== 2)
+        return { userId: undefined, userAuthority: undefined };
+    return {
+        userId: Number(splitKey[0]),
+        userAuthority: new sdk_1.PublicKey(splitKey[1]),
+    };
+};
+exports.getIdAndAuthorityFromKey = getIdAndAuthorityFromKey;
+const getMarketKey = (marketIndex, marketType) => (0, cache_1.getCachedUiString)('marketKey', enum_1.ENUM_UTILS.toStr(marketType), marketIndex);
+exports.getMarketKey = getMarketKey;
+//# sourceMappingURL=keys.js.map

package/lib/utils/accounts/keys.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"keys.js","sourceRoot":"","sources":["../../../src/utils/accounts/keys.ts"],"names":[],"mappings":";;;AAAA,yCAAwD;AACxD,yCAAkD;AAClD,kCAAqC;AAErC;;;;;GAKG;AACH,MAAM,UAAU,GAAG,CAAC,MAAc,EAAE,SAAoB,EAAE,EAAE;IAC3D,IAAI,MAAM,IAAI,SAAS,IAAI,CAAC,SAAS;QAAE,OAAO,EAAE,CAAC;IACjD,OAAO,IAAA,yBAAiB,EAAC,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;AACnE,CAAC,CAAC;AA0BO,gCAAU;AAxBnB;;;;GAIG;AACH,MAAM,wBAAwB,GAAG,CAChC,GAAW,EAGuC,EAAE;IACpD,MAAM,QAAQ,GAAG,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAEjC,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QACrC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE,SAAS,EAAE,CAAC;IAExD,OAAO;QACN,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC3B,aAAa,EAAE,IAAI,eAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;KACzC,CAAC;AACH,CAAC,CAAC;AAKmB,4DAAwB;AAH7C,MAAM,YAAY,GAAG,CAAC,WAAmB,EAAE,UAAsB,EAAE,EAAE,CACpE,IAAA,yBAAiB,EAAC,WAAW,EAAE,iBAAU,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,WAAW,CAAC,CAAC;AAE5B,oCAAY","sourcesContent":["import { MarketType, PublicKey } from '@drift-labs/sdk';\nimport { getCachedUiString } from '../core/cache';\nimport { ENUM_UTILS } from '../enum';\n\n/**\n * Get a unique key for an authority's subaccount\n * @param userId\n * @param authority\n * @returns\n */\nconst getUserKey = (userId: number, authority: PublicKey) => {\n\tif (userId == undefined || !authority) return '';\n\treturn getCachedUiString('userKey', userId, authority.toString());\n};\n\n/**\n * Get the authority and subAccountId from a user's account key\n * @param key\n * @returns\n */\nconst getIdAndAuthorityFromKey = (\n\tkey: string\n):\n\t| { userId: number; userAuthority: PublicKey }\n\t| { userId: undefined; userAuthority: undefined } => {\n\tconst splitKey = key?.split('_');\n\n\tif (!splitKey || splitKey.length !== 2)\n\t\treturn { userId: undefined, userAuthority: undefined };\n\n\treturn {\n\t\tuserId: Number(splitKey[0]),\n\t\tuserAuthority: new PublicKey(splitKey[1]),\n\t};\n};\n\nconst getMarketKey = (marketIndex: number, marketType: MarketType) =>\n\tgetCachedUiString('marketKey', ENUM_UTILS.toStr(marketType), marketIndex);\n\nexport { getUserKey, getIdAndAuthorityFromKey, getMarketKey };\n"]}

package/lib/utils/accounts/multiple.d.ts

@@ -0,0 +1,14 @@
+/// <reference types="node" />
+/// <reference types="node" />
+import { PublicKey } from '@drift-labs/sdk';
+import { AccountInfo, Connection } from '@solana/web3.js';
+declare const getMultipleAccounts: (connection: any, keys: string[], commitment: string) => Promise<{
+    keys: string[];
+    array: AccountInfo<Buffer>[];
+}>;
+declare const getMultipleAccountsCore: (connection: any, keys: string[], commitment: string) => Promise<{
+    keys: string[];
+    array: AccountInfo<string[]>[];
+}>;
+declare const getMultipleAccountsInfoChunked: (connection: Connection, accounts: PublicKey[]) => Promise<(AccountInfo<Buffer> | null)[]>;
+export { getMultipleAccounts, getMultipleAccountsCore, getMultipleAccountsInfoChunked, };

package/lib/utils/accounts/multiple.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMultipleAccountsInfoChunked = exports.getMultipleAccountsCore = exports.getMultipleAccounts = void 0;
+const arrays_1 = require("../core/arrays");
+const getMultipleAccounts = async (connection, keys, commitment) => {
+    const result = await Promise.all((0, arrays_1.chunks)(keys, 99).map((chunk) => getMultipleAccountsCore(connection, chunk, commitment)));
+    const array = result
+        .map((a) => a.array
+        .map((acc) => {
+        if (!acc) {
+            return undefined;
+        }
+        const { data, ...rest } = acc;
+        const obj = {
+            ...rest,
+            data: Buffer.from(data[0], 'base64'),
+        };
+        return obj;
+    })
+        .filter((_) => _))
+        .flat();
+    return { keys, array };
+};
+exports.getMultipleAccounts = getMultipleAccounts;
+const getMultipleAccountsCore = async (connection, keys, commitment) => {
+    const args = connection._buildArgs([keys], commitment, 'base64');
+    const unsafeRes = await connection._rpcRequest('getMultipleAccounts', args);
+    if (unsafeRes.error) {
+        throw new Error('failed to get info about account ' + unsafeRes.error.message);
+    }
+    if (unsafeRes.result.value) {
+        const array = unsafeRes.result.value;
+        return { keys, array };
+    }
+    // TODO: fix
+    throw new Error();
+};
+exports.getMultipleAccountsCore = getMultipleAccountsCore;
+const getMultipleAccountsInfoChunked = async (connection, accounts) => {
+    const accountChunks = (0, arrays_1.chunks)(accounts, 100); // 100 is limit for getMultipleAccountsInfo
+    const responses = await Promise.all(accountChunks.map((chunk) => connection.getMultipleAccountsInfo(chunk)));
+    return responses.flat();
+};
+exports.getMultipleAccountsInfoChunked = getMultipleAccountsInfoChunked;
+//# sourceMappingURL=multiple.js.map

package/lib/utils/accounts/multiple.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"multiple.js","sourceRoot":"","sources":["../../../src/utils/accounts/multiple.ts"],"names":[],"mappings":";;;AAEA,2CAAwC;AAExC,MAAM,mBAAmB,GAAG,KAAK,EAChC,UAAe,EACf,IAAc,EACd,UAAkB,EACjB,EAAE;IACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,IAAA,eAAM,EAAC,IAAI,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAC9B,uBAAuB,CAAC,UAAU,EAAE,KAAK,EAAE,UAAU,CAAC,CACtD,CACD,CAAC;IAEF,MAAM,KAAK,GAAG,MAAM;SAClB,GAAG,CACH,CAAC,CAAC,EAAE,EAAE,CACL,CAAC,CAAC,KAAK;SACL,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACZ,IAAI,CAAC,GAAG,EAAE,CAAC;YACV,OAAO,SAAS,CAAC;QAClB,CAAC;QAED,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,GAAG,GAAG,CAAC;QAC9B,MAAM,GAAG,GAAG;YACX,GAAG,IAAI;YACP,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC;SACb,CAAC;QACzB,OAAO,GAAG,CAAC;IACZ,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAA0B,CAC5C;SACA,IAAI,EAAE,CAAC;IACT,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;AACxB,CAAC,CAAC;AAqCD,kDAAmB;AAnCpB,MAAM,uBAAuB,GAAG,KAAK,EACpC,UAAe,EACf,IAAc,EACd,UAAkB,EACjB,EAAE;IACH,MAAM,IAAI,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;IAEjE,MAAM,SAAS,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,qBAAqB,EAAE,IAAI,CAAC,CAAC;IAC5E,IAAI,SAAS,CAAC,KAAK,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CACd,mCAAmC,GAAG,SAAS,CAAC,KAAK,CAAC,OAAO,CAC7D,CAAC;IACH,CAAC;IAED,IAAI,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAC5B,MAAM,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,KAAgC,CAAC;QAChE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;IACxB,CAAC;IAED,YAAY;IACZ,MAAM,IAAI,KAAK,EAAE,CAAC;AACnB,CAAC,CAAC;AAeD,0DAAuB;AAbxB,MAAM,8BAA8B,GAAG,KAAK,EAC3C,UAAsB,EACtB,QAAqB,EACqB,EAAE;IAC5C,MAAM,aAAa,GAAG,IAAA,eAAM,EAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,2CAA2C;IACxF,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,GAAG,CAClC,aAAa,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC,CACvE,CAAC;IACF,OAAO,SAAS,CAAC,IAAI,EAAE,CAAC;AACzB,CAAC,CAAC;AAKD,wEAA8B","sourcesContent":["import { PublicKey } from '@drift-labs/sdk';\nimport { AccountInfo, Connection } from '@solana/web3.js';\nimport { chunks } from '../core/arrays';\n\nconst getMultipleAccounts = async (\n\tconnection: any,\n\tkeys: string[],\n\tcommitment: string\n) => {\n\tconst result = await Promise.all(\n\t\tchunks(keys, 99).map((chunk) =>\n\t\t\tgetMultipleAccountsCore(connection, chunk, commitment)\n\t\t)\n\t);\n\n\tconst array = result\n\t\t.map(\n\t\t\t(a) =>\n\t\t\t\ta.array\n\t\t\t\t\t.map((acc) => {\n\t\t\t\t\t\tif (!acc) {\n\t\t\t\t\t\t\treturn undefined;\n\t\t\t\t\t\t}\n\n\t\t\t\t\t\tconst { data, ...rest } = acc;\n\t\t\t\t\t\tconst obj = {\n\t\t\t\t\t\t\t...rest,\n\t\t\t\t\t\t\tdata: Buffer.from(data[0], 'base64'),\n\t\t\t\t\t\t} as AccountInfo<Buffer>;\n\t\t\t\t\t\treturn obj;\n\t\t\t\t\t})\n\t\t\t\t\t.filter((_) => _) as AccountInfo<Buffer>[]\n\t\t)\n\t\t.flat();\n\treturn { keys, array };\n};\n\nconst getMultipleAccountsCore = async (\n\tconnection: any,\n\tkeys: string[],\n\tcommitment: string\n) => {\n\tconst args = connection._buildArgs([keys], commitment, 'base64');\n\n\tconst unsafeRes = await connection._rpcRequest('getMultipleAccounts', args);\n\tif (unsafeRes.error) {\n\t\tthrow new Error(\n\t\t\t'failed to get info about account ' + unsafeRes.error.message\n\t\t);\n\t}\n\n\tif (unsafeRes.result.value) {\n\t\tconst array = unsafeRes.result.value as AccountInfo<string[]>[];\n\t\treturn { keys, array };\n\t}\n\n\t// TODO: fix\n\tthrow new Error();\n};\n\nconst getMultipleAccountsInfoChunked = async (\n\tconnection: Connection,\n\taccounts: PublicKey[]\n): Promise<(AccountInfo<Buffer> | null)[]> => {\n\tconst accountChunks = chunks(accounts, 100); // 100 is limit for getMultipleAccountsInfo\n\tconst responses = await Promise.all(\n\t\taccountChunks.map((chunk) => connection.getMultipleAccountsInfo(chunk))\n\t);\n\treturn responses.flat();\n};\n\nexport {\n\tgetMultipleAccounts,\n\tgetMultipleAccountsCore,\n\tgetMultipleAccountsInfoChunked,\n};\n"]}

package/lib/utils/accounts/signature.d.ts

@@ -0,0 +1,6 @@
+import { PublicKey } from '@drift-labs/sdk';
+declare const getSignatureVerificationMessageForSettings: (authority: PublicKey, signTs: number) => Uint8Array;
+declare const verifySignature: (signature: Uint8Array, message: Uint8Array, pubKey: PublicKey) => boolean;
+declare const hashSignature: (signature: string) => Promise<string>;
+declare const compareSignatures: (original: string, hashed: string) => Promise<boolean>;
+export { getSignatureVerificationMessageForSettings, verifySignature, hashSignature, compareSignatures, };

package/lib/utils/accounts/signature.js

@@ -0,0 +1,53 @@
+"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 __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.compareSignatures = exports.hashSignature = exports.verifySignature = exports.getSignatureVerificationMessageForSettings = void 0;
+const bcryptjs_react_1 = __importDefault(require("bcryptjs-react"));
+const tweetnacl_1 = __importStar(require("tweetnacl"));
+const getSignatureVerificationMessageForSettings = (authority, signTs) => {
+    return new TextEncoder().encode(`Verify you are the owner of this wallet to update trade settings: \n${authority.toBase58()}\n\nThis signature will be valid for the next 30 minutes.\n\nTS: ${signTs.toString()}`);
+};
+exports.getSignatureVerificationMessageForSettings = getSignatureVerificationMessageForSettings;
+const verifySignature = (signature, message, pubKey) => {
+    return tweetnacl_1.sign.detached.verify(message, signature, pubKey.toBytes());
+};
+exports.verifySignature = verifySignature;
+const hashSignature = async (signature) => {
+    bcryptjs_react_1.default.setRandomFallback((num) => {
+        return Array.from(tweetnacl_1.default.randomBytes(num));
+    });
+    const hashedSignature = await bcryptjs_react_1.default.hash(signature, bcryptjs_react_1.default.genSaltSync(10));
+    return hashedSignature;
+};
+exports.hashSignature = hashSignature;
+const compareSignatures = async (original, hashed) => {
+    const signaturesMatch = await bcryptjs_react_1.default.compare(original, hashed);
+    return signaturesMatch;
+};
+exports.compareSignatures = compareSignatures;
+//# sourceMappingURL=signature.js.map

package/lib/utils/accounts/signature.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"signature.js","sourceRoot":"","sources":["../../../src/utils/accounts/signature.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,oEAAoC;AACpC,uDAAuC;AAEvC,MAAM,0CAA0C,GAAG,CAClD,SAAoB,EACpB,MAAc,EACD,EAAE;IACf,OAAO,IAAI,WAAW,EAAE,CAAC,MAAM,CAC9B,uEAAuE,SAAS,CAAC,QAAQ,EAAE,oEAAoE,MAAM,CAAC,QAAQ,EAAE,EAAE,CAClL,CAAC;AACH,CAAC,CAAC;AA2BD,gGAA0C;AAzB3C,MAAM,eAAe,GAAG,CACvB,SAAqB,EACrB,OAAmB,EACnB,MAAiB,EACP,EAAE;IACZ,OAAO,gBAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;AACnE,CAAC,CAAC;AAoBD,0CAAe;AAlBhB,MAAM,aAAa,GAAG,KAAK,EAAE,SAAiB,EAAmB,EAAE;IAClE,wBAAM,CAAC,iBAAiB,CAAC,CAAC,GAAW,EAAE,EAAE;QACxC,OAAO,KAAK,CAAC,IAAI,CAAC,mBAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IACH,MAAM,eAAe,GAAG,MAAM,wBAAM,CAAC,IAAI,CAAC,SAAS,EAAE,wBAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7E,OAAO,eAAe,CAAC;AACxB,CAAC,CAAC;AAaD,sCAAa;AAXd,MAAM,iBAAiB,GAAG,KAAK,EAC9B,QAAgB,EAChB,MAAc,EACK,EAAE;IACrB,MAAM,eAAe,GAAG,MAAM,wBAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAC/D,OAAO,eAAe,CAAC;AACxB,CAAC,CAAC;AAMD,8CAAiB","sourcesContent":["import { PublicKey } from '@drift-labs/sdk';\nimport bcrypt from 'bcryptjs-react';\nimport nacl, { sign } from 'tweetnacl';\n\nconst getSignatureVerificationMessageForSettings = (\n\tauthority: PublicKey,\n\tsignTs: number\n): Uint8Array => {\n\treturn new TextEncoder().encode(\n\t\t`Verify you are the owner of this wallet to update trade settings: \\n${authority.toBase58()}\\n\\nThis signature will be valid for the next 30 minutes.\\n\\nTS: ${signTs.toString()}`\n\t);\n};\n\nconst verifySignature = (\n\tsignature: Uint8Array,\n\tmessage: Uint8Array,\n\tpubKey: PublicKey\n): boolean => {\n\treturn sign.detached.verify(message, signature, pubKey.toBytes());\n};\n\nconst hashSignature = async (signature: string): Promise<string> => {\n\tbcrypt.setRandomFallback((num: number) => {\n\t\treturn Array.from(nacl.randomBytes(num));\n\t});\n\tconst hashedSignature = await bcrypt.hash(signature, bcrypt.genSaltSync(10));\n\treturn hashedSignature;\n};\n\nconst compareSignatures = async (\n\toriginal: string,\n\thashed: string\n): Promise<boolean> => {\n\tconst signaturesMatch = await bcrypt.compare(original, hashed);\n\treturn signaturesMatch;\n};\n\nexport {\n\tgetSignatureVerificationMessageForSettings,\n\tverifySignature,\n\thashSignature,\n\tcompareSignatures,\n};\n"]}

package/lib/utils/accounts/subaccounts.d.ts

@@ -0,0 +1,8 @@
+import { DriftClient, PublicKey, User, UserAccount } from '@drift-labs/sdk';
+declare const fetchCurrentSubaccounts: (driftClient: DriftClient) => UserAccount[];
+declare const fetchUserClientsAndAccounts: (driftClient: DriftClient) => {
+    user: User;
+    userAccount: UserAccount;
+}[];
+declare const userExists: (driftClient: DriftClient, userId: number, authority: PublicKey) => Promise<boolean>;
+export { fetchCurrentSubaccounts, fetchUserClientsAndAccounts, userExists };

package/lib/utils/accounts/subaccounts.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.userExists = exports.fetchUserClientsAndAccounts = exports.fetchCurrentSubaccounts = void 0;
+const fetchCurrentSubaccounts = (driftClient) => {
+    return driftClient.getUsers().map((user) => user.getUserAccount());
+};
+exports.fetchCurrentSubaccounts = fetchCurrentSubaccounts;
+const fetchUserClientsAndAccounts = (driftClient) => {
+    const accounts = fetchCurrentSubaccounts(driftClient);
+    const allUsersAndUserAccounts = accounts.map((acct) => {
+        return {
+            user: driftClient.getUser(acct.subAccountId, acct.authority),
+            userAccount: acct,
+        };
+    });
+    return allUsersAndUserAccounts;
+};
+exports.fetchUserClientsAndAccounts = fetchUserClientsAndAccounts;
+const userExists = async (driftClient, userId, authority) => {
+    let userAccountExists = false;
+    try {
+        const user = driftClient.getUser(userId, authority);
+        userAccountExists = await user.exists();
+    }
+    catch (e) {
+        // user account does not exist so we leave userAccountExists false
+    }
+    return userAccountExists;
+};
+exports.userExists = userExists;
+//# sourceMappingURL=subaccounts.js.map

package/lib/utils/accounts/subaccounts.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"subaccounts.js","sourceRoot":"","sources":["../../../src/utils/accounts/subaccounts.ts"],"names":[],"mappings":";;;AAEA,MAAM,uBAAuB,GAAG,CAAC,WAAwB,EAAiB,EAAE;IAC3E,OAAO,WAAW,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;AACpE,CAAC,CAAC;AAiCO,0DAAuB;AA/BhC,MAAM,2BAA2B,GAAG,CACnC,WAAwB,EACqB,EAAE;IAC/C,MAAM,QAAQ,GAAG,uBAAuB,CAAC,WAAW,CAAC,CAAC;IACtD,MAAM,uBAAuB,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACrD,OAAO;YACN,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC;YAC5D,WAAW,EAAE,IAAI;SACjB,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,uBAAuB,CAAC;AAChC,CAAC,CAAC;AAmBgC,kEAA2B;AAjB7D,MAAM,UAAU,GAAG,KAAK,EACvB,WAAwB,EACxB,MAAc,EACd,SAAoB,EACnB,EAAE;IACH,IAAI,iBAAiB,GAAG,KAAK,CAAC;IAE9B,IAAI,CAAC;QACJ,MAAM,IAAI,GAAG,WAAW,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QACpD,iBAAiB,GAAG,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;IACzC,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACZ,kEAAkE;IACnE,CAAC;IAED,OAAO,iBAAiB,CAAC;AAC1B,CAAC,CAAC;AAE6D,gCAAU","sourcesContent":["import { DriftClient, PublicKey, User, UserAccount } from '@drift-labs/sdk';\n\nconst fetchCurrentSubaccounts = (driftClient: DriftClient): UserAccount[] => {\n\treturn driftClient.getUsers().map((user) => user.getUserAccount());\n};\n\nconst fetchUserClientsAndAccounts = (\n\tdriftClient: DriftClient\n): { user: User; userAccount: UserAccount }[] => {\n\tconst accounts = fetchCurrentSubaccounts(driftClient);\n\tconst allUsersAndUserAccounts = accounts.map((acct) => {\n\t\treturn {\n\t\t\tuser: driftClient.getUser(acct.subAccountId, acct.authority),\n\t\t\tuserAccount: acct,\n\t\t};\n\t});\n\n\treturn allUsersAndUserAccounts;\n};\n\nconst userExists = async (\n\tdriftClient: DriftClient,\n\tuserId: number,\n\tauthority: PublicKey\n) => {\n\tlet userAccountExists = false;\n\n\ttry {\n\t\tconst user = driftClient.getUser(userId, authority);\n\t\tuserAccountExists = await user.exists();\n\t} catch (e) {\n\t\t// user account does not exist so we leave userAccountExists false\n\t}\n\n\treturn userAccountExists;\n};\n\nexport { fetchCurrentSubaccounts, fetchUserClientsAndAccounts, userExists };\n"]}

package/lib/utils/{WalletConnectionState.d.ts → accounts/wallet.d.ts}

@@ -1,4 +1,4 @@
-import { PublicKey } from '@drift-labs/sdk';
+import { IWalletV2, PublicKey } from '@drift-labs/sdk';
 export declare enum ConnectionStateSteps {
     NotConnected = 0,
     AdapterConnected = 1,
@@ -29,3 +29,9 @@ export declare class WalletConnectionState {
     get FullyConnected(): boolean;
     get SubaccountsSubscribed(): boolean;
 }
+/**
+ * Creates an IWallet wrapper, with redundant methods. If a `walletPubKey` is passed in,
+ * the `publicKey` will be based on that.
+ */
+declare const createPlaceholderIWallet: (walletPubKey?: PublicKey) => IWalletV2;
+export { createPlaceholderIWallet };

package/lib/utils/{WalletConnectionState.js → accounts/wallet.js}

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WalletConnectionState = exports.ConnectionStates = exports.ConnectionStateSteps = void 0;
+exports.createPlaceholderIWallet = exports.WalletConnectionState = exports.ConnectionStates = exports.ConnectionStateSteps = void 0;
+const web3_js_1 = require("@solana/web3.js");
 var ConnectionStateSteps;
 (function (ConnectionStateSteps) {
     ConnectionStateSteps[ConnectionStateSteps["NotConnected"] = 0] = "NotConnected";
@@ -80,4 +81,33 @@ class WalletConnectionState {
     }
 }
 exports.WalletConnectionState = WalletConnectionState;
-//# sourceMappingURL=WalletConnectionState.js.map
+/**
+ * Creates an IWallet wrapper, with redundant methods. If a `walletPubKey` is passed in,
+ * the `publicKey` will be based on that.
+ */
+const createPlaceholderIWallet = (walletPubKey) => {
+    const newKeypair = walletPubKey
+        ? new web3_js_1.Keypair({
+            publicKey: walletPubKey.toBytes(),
+            secretKey: new web3_js_1.Keypair().publicKey.toBytes(),
+        })
+        : new web3_js_1.Keypair();
+    const newWallet = {
+        publicKey: newKeypair.publicKey,
+        //@ts-ignore
+        signTransaction: () => {
+            return Promise.resolve();
+        },
+        //@ts-ignore
+        signAllTransactions: () => {
+            return Promise.resolve();
+        },
+        //@ts-ignore
+        signMessage: () => {
+            return Promise.resolve();
+        },
+    };
+    return newWallet;
+};
+exports.createPlaceholderIWallet = createPlaceholderIWallet;
+//# sourceMappingURL=wallet.js.map