@velocity-exchange/sdk 0.0.5 → 0.2.0

package/lib/browser/velocityClient.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DriftClient = exports.VelocityClient = void 0;
+exports.VelocityClient = void 0;
 /**
  * VelocityClient — main SDK entry point for all trading and keeper operations.
  *
@@ -90,7 +90,7 @@ class VelocityClient {
         this._isSubscribed = val;
     }
     constructor(config) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26;
         this.users = new Map();
         this._isSubscribed = false;
         this.perpMarketLastSlotCache = new Map();
@@ -197,34 +197,28 @@ class VelocityClient {
                 accountSubscription: this.userAccountSubscriptionConfig,
             });
         }
-        this.marketLookupTable = config.marketLookupTable;
-        if (!this.marketLookupTable) {
-            this.marketLookupTable = new web3_js_1.PublicKey(config_1.configs[this.env].MARKET_LOOKUP_TABLE);
-        }
-        this.marketLookupTables = config.marketLookupTables;
-        if (!this.marketLookupTables) {
-            this.marketLookupTables = config_1.configs[this.env].MARKET_LOOKUP_TABLES.map((tableAddr) => new web3_js_1.PublicKey(tableAddr));
-        }
+        this.marketLookupTables =
+            (_5 = config.marketLookupTables) !== null && _5 !== void 0 ? _5 : config_1.configs[this.env].MARKET_LOOKUP_TABLES.map((tableAddr) => new web3_js_1.PublicKey(tableAddr));
         const delistedMarketSetting = config.delistedMarketSetting || types_2.DelistedMarketSetting.Unsubscribe;
         const noMarketsAndOraclesSpecified = config.perpMarketIndexes === undefined &&
             config.spotMarketIndexes === undefined &&
             config.oracleInfos === undefined;
-        if (((_5 = config.accountSubscription) === null || _5 === void 0 ? void 0 : _5.type) === 'polling') {
-            this.accountSubscriber = new pollingVelocityClientAccountSubscriber_1.PollingVelocityClientAccountSubscriber(this.program, config.accountSubscription.accountLoader, (_6 = config.perpMarketIndexes) !== null && _6 !== void 0 ? _6 : [], (_7 = config.spotMarketIndexes) !== null && _7 !== void 0 ? _7 : [], (_8 = config.oracleInfos) !== null && _8 !== void 0 ? _8 : [], noMarketsAndOraclesSpecified, delistedMarketSetting);
-        }
-        else if (((_9 = config.accountSubscription) === null || _9 === void 0 ? void 0 : _9.type) === 'grpc') {
-            const accountSubscriberClass = (_13 = (_11 = (_10 = config.accountSubscription) === null || _10 === void 0 ? void 0 : _10.velocityClientAccountSubscriber) !== null && _11 !== void 0 ? _11 : (_12 = config.accountSubscription) === null || _12 === void 0 ? void 0 : _12.driftClientAccountSubscriber) !== null && _13 !== void 0 ? _13 : grpcVelocityClientAccountSubscriber_1.grpcVelocityClientAccountSubscriber;
-            this.accountSubscriber = new accountSubscriberClass(config.accountSubscription.grpcConfigs, this.program, (_14 = config.perpMarketIndexes) !== null && _14 !== void 0 ? _14 : [], (_15 = config.spotMarketIndexes) !== null && _15 !== void 0 ? _15 : [], (_16 = config.oracleInfos) !== null && _16 !== void 0 ? _16 : [], noMarketsAndOraclesSpecified, delistedMarketSetting, {
-                resubTimeoutMs: (_17 = config.accountSubscription) === null || _17 === void 0 ? void 0 : _17.resubTimeoutMs,
-                logResubMessages: (_18 = config.accountSubscription) === null || _18 === void 0 ? void 0 : _18.logResubMessages,
+        if (((_6 = config.accountSubscription) === null || _6 === void 0 ? void 0 : _6.type) === 'polling') {
+            this.accountSubscriber = new pollingVelocityClientAccountSubscriber_1.PollingVelocityClientAccountSubscriber(this.program, config.accountSubscription.accountLoader, (_7 = config.perpMarketIndexes) !== null && _7 !== void 0 ? _7 : [], (_8 = config.spotMarketIndexes) !== null && _8 !== void 0 ? _8 : [], (_9 = config.oracleInfos) !== null && _9 !== void 0 ? _9 : [], noMarketsAndOraclesSpecified, delistedMarketSetting);
+        }
+        else if (((_10 = config.accountSubscription) === null || _10 === void 0 ? void 0 : _10.type) === 'grpc') {
+            const accountSubscriberClass = (_12 = (_11 = config.accountSubscription) === null || _11 === void 0 ? void 0 : _11.velocityClientAccountSubscriber) !== null && _12 !== void 0 ? _12 : grpcVelocityClientAccountSubscriber_1.grpcVelocityClientAccountSubscriber;
+            this.accountSubscriber = new accountSubscriberClass(config.accountSubscription.grpcConfigs, this.program, (_13 = config.perpMarketIndexes) !== null && _13 !== void 0 ? _13 : [], (_14 = config.spotMarketIndexes) !== null && _14 !== void 0 ? _14 : [], (_15 = config.oracleInfos) !== null && _15 !== void 0 ? _15 : [], noMarketsAndOraclesSpecified, delistedMarketSetting, {
+                resubTimeoutMs: (_16 = config.accountSubscription) === null || _16 === void 0 ? void 0 : _16.resubTimeoutMs,
+                logResubMessages: (_17 = config.accountSubscription) === null || _17 === void 0 ? void 0 : _17.logResubMessages,
             });
         }
         else {
-            const accountSubscriberClass = (_22 = (_20 = (_19 = config.accountSubscription) === null || _19 === void 0 ? void 0 : _19.velocityClientAccountSubscriber) !== null && _20 !== void 0 ? _20 : (_21 = config.accountSubscription) === null || _21 === void 0 ? void 0 : _21.driftClientAccountSubscriber) !== null && _22 !== void 0 ? _22 : webSocketVelocityClientAccountSubscriber_1.WebSocketVelocityClientAccountSubscriber;
-            this.accountSubscriber = new accountSubscriberClass(this.program, (_23 = config.perpMarketIndexes) !== null && _23 !== void 0 ? _23 : [], (_24 = config.spotMarketIndexes) !== null && _24 !== void 0 ? _24 : [], (_25 = config.oracleInfos) !== null && _25 !== void 0 ? _25 : [], noMarketsAndOraclesSpecified, delistedMarketSetting, {
-                resubTimeoutMs: (_26 = config.accountSubscription) === null || _26 === void 0 ? void 0 : _26.resubTimeoutMs,
-                logResubMessages: (_27 = config.accountSubscription) === null || _27 === void 0 ? void 0 : _27.logResubMessages,
-            }, (_28 = config.accountSubscription) === null || _28 === void 0 ? void 0 : _28.commitment);
+            const accountSubscriberClass = (_19 = (_18 = config.accountSubscription) === null || _18 === void 0 ? void 0 : _18.velocityClientAccountSubscriber) !== null && _19 !== void 0 ? _19 : webSocketVelocityClientAccountSubscriber_1.WebSocketVelocityClientAccountSubscriber;
+            this.accountSubscriber = new accountSubscriberClass(this.program, (_20 = config.perpMarketIndexes) !== null && _20 !== void 0 ? _20 : [], (_21 = config.spotMarketIndexes) !== null && _21 !== void 0 ? _21 : [], (_22 = config.oracleInfos) !== null && _22 !== void 0 ? _22 : [], noMarketsAndOraclesSpecified, delistedMarketSetting, {
+                resubTimeoutMs: (_23 = config.accountSubscription) === null || _23 === void 0 ? void 0 : _23.resubTimeoutMs,
+                logResubMessages: (_24 = config.accountSubscription) === null || _24 === void 0 ? void 0 : _24.logResubMessages,
+            }, (_25 = config.accountSubscription) === null || _25 === void 0 ? void 0 : _25.commitment);
         }
         this.eventEmitter = this.accountSubscriber.eventEmitter;
         this.metricsEventEmitter = new events_1.EventEmitter();
@@ -232,7 +226,7 @@ class VelocityClient {
             this.enableMetricsEvents = true;
         }
         this.txSender =
-            (_29 = config.txSender) !== null && _29 !== void 0 ? _29 : new retryTxSender_1.RetryTxSender({
+            (_26 = config.txSender) !== null && _26 !== void 0 ? _26 : new retryTxSender_1.RetryTxSender({
                 connection: this.connection,
                 wallet: this.wallet,
                 opts: this.opts,
@@ -312,6 +306,17 @@ class VelocityClient {
         var _a;
         return (_a = this.accountSubscriber.getMarketAccountAndSlot(marketIndex)) === null || _a === void 0 ? void 0 : _a.data;
     }
+    /**
+     * Like {@link getPerpMarketAccount} but throws if the market is not loaded,
+     * for call sites that require a guaranteed account.
+     */
+    getPerpMarketAccountOrThrow(marketIndex) {
+        const perpMarketAccount = this.getPerpMarketAccount(marketIndex);
+        if (!perpMarketAccount) {
+            throw new Error(`Perp market ${marketIndex} not found`);
+        }
+        return perpMarketAccount;
+    }
     /**
      * Forces a fetch to rpc before returning accounts. Useful for anchor tests.
      * @param marketIndex
@@ -335,15 +340,28 @@ class VelocityClient {
             .map((value) => value.data);
     }
     getSpotMarketAccount(marketIndex) {
-        return this.accountSubscriber.getSpotMarketAccountAndSlot(marketIndex).data;
+        var _a;
+        return (_a = this.accountSubscriber.getSpotMarketAccountAndSlot(marketIndex)) === null || _a === void 0 ? void 0 : _a.data;
+    }
+    /**
+     * Like {@link getSpotMarketAccount} but throws if the market is not loaded,
+     * for call sites that require a guaranteed account.
+     */
+    getSpotMarketAccountOrThrow(marketIndex) {
+        const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
+        if (!spotMarketAccount) {
+            throw new Error(`Spot market ${marketIndex} not found`);
+        }
+        return spotMarketAccount;
     }
     /**
      * Forces a fetch to rpc before returning accounts. Useful for anchor tests.
      * @param marketIndex
      */
     async forceGetSpotMarketAccount(marketIndex) {
+        var _a;
         await this.accountSubscriber.fetch();
-        return this.accountSubscriber.getSpotMarketAccountAndSlot(marketIndex).data;
+        return (_a = this.accountSubscriber.getSpotMarketAccountAndSlot(marketIndex)) === null || _a === void 0 ? void 0 : _a.data;
     }
     getSpotMarketAccounts() {
         return this.accountSubscriber
@@ -352,23 +370,11 @@ class VelocityClient {
             .map((value) => value.data);
     }
     getQuoteSpotMarketAccount() {
-        return this.accountSubscriber.getSpotMarketAccountAndSlot(numericConstants_1.QUOTE_SPOT_MARKET_INDEX).data;
+        return this.getSpotMarketAccountOrThrow(numericConstants_1.QUOTE_SPOT_MARKET_INDEX);
     }
     getOraclePriceDataAndSlot(oraclePublicKey, oracleSource) {
         return this.accountSubscriber.getOraclePriceDataAndSlot((0, oracleId_1.getOracleId)(oraclePublicKey, oracleSource));
     }
-    /** @deprecated use fetchAllLookupTableAccounts() */
-    async fetchMarketLookupTableAccount() {
-        if (this.lookupTableAccount)
-            return this.lookupTableAccount;
-        if (!this.marketLookupTable) {
-            console.log('Market lookup table address not set');
-            return;
-        }
-        const lookupTableAccount = (await this.connection.getAddressLookupTable(this.marketLookupTable)).value;
-        this.lookupTableAccount = lookupTableAccount;
-        return lookupTableAccount;
-    }
     async fetchAllLookupTableAccounts() {
         if (this.lookupTableAccounts)
             return this.lookupTableAccounts;
@@ -393,7 +399,7 @@ class VelocityClient {
         return walletSupportsVersionedTxns ? 0 : 'legacy';
     }
     /**
-     * Update the wallet to use for drift transactions and linked user account
+     * Update the wallet to use for velocity transactions and linked user account
      * @param newWallet
      * @param subAccountIds
      * @param activeSubAccountId
@@ -493,7 +499,8 @@ class VelocityClient {
         const authorityChanged = authority && !((_a = this.authority) === null || _a === void 0 ? void 0 : _a.equals(authority));
         this.activeSubAccountId = subAccountId;
         this.authority = authority !== null && authority !== void 0 ? authority : this.authority;
-        this.userStatsAccountPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, this.authority);
+        const userStatsAccountPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, this.authority);
+        this.userStatsAccountPublicKey = userStatsAccountPublicKey;
         /* If changing the user authority ie switching from delegate to non-delegate account, need to re-subscribe to the user stats account */
         if (authorityChanged && this.userStats) {
             if (this.userStats.isSubscribed) {
@@ -501,16 +508,17 @@ class VelocityClient {
             }
             this.userStats = new userStats_1.UserStats({
                 velocityClient: this,
-                userStatsAccountPublicKey: this.userStatsAccountPublicKey,
+                userStatsAccountPublicKey: userStatsAccountPublicKey,
                 accountSubscription: this.userStatsAccountSubscriptionConfig,
             });
             this.userStats.subscribe();
         }
     }
     async addUser(subAccountId, authority, userAccount) {
+        var _a;
         authority = authority !== null && authority !== void 0 ? authority : this.authority;
         const userKey = this.getUserMapKey(subAccountId, authority);
-        if (this.users.has(userKey) && this.users.get(userKey).isSubscribed) {
+        if (this.users.has(userKey) && ((_a = this.users.get(userKey)) === null || _a === void 0 ? void 0 : _a.isSubscribed)) {
             return true;
         }
         const user = this.createUser(subAccountId, this.userAccountSubscriptionConfig, authority);
@@ -528,7 +536,7 @@ class VelocityClient {
      */
     async addAndSubscribeToUsers(authority) {
         var _a, _b, _c, _d, _e, _f, _g;
-        // save the rpc calls if driftclient is initialized without a real wallet
+        // save the rpc calls if velocityclient is initialized without a real wallet
         if (this.skipLoadUsers)
             return true;
         let result = true;
@@ -887,7 +895,16 @@ class VelocityClient {
             userStatsAccount = await (0, fetch_1.fetchUserStatsAccount)(this.connection, this.program, this.wallet.publicKey);
         }
         else {
-            userStatsAccount = userStats.getAccount();
+            const account = userStats.getAccount();
+            if (!account) {
+                userStatsAccount = await (0, fetch_1.fetchUserStatsAccount)(this.connection, this.program, this.wallet.publicKey);
+            }
+            else {
+                userStatsAccount = account;
+            }
+        }
+        if (!userStatsAccount) {
+            throw new Error('UserStats account does not exist');
         }
         return userStatsAccount.numberOfSubAccountsCreated;
     }
@@ -969,7 +986,7 @@ class VelocityClient {
         let remainingAccounts;
         try {
             remainingAccounts = this.getRemainingAccounts({
-                userAccounts: [this.getUserAccount(subAccountId)],
+                userAccounts: [this.getUserAccountOrThrow(subAccountId)],
             });
         }
         catch (err) {
@@ -1013,6 +1030,19 @@ class VelocityClient {
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
+    async getUpdateUserAllowDelegateTransferIx(allowDelegateTransfer) {
+        return await this.program.instruction.updateUserAllowDelegateTransfer(allowDelegateTransfer, {
+            accounts: {
+                userStats: this.getUserStatsAccountPublicKey(),
+                authority: this.wallet.publicKey,
+            },
+        });
+    }
+    async updateUserAllowDelegateTransfer(allowDelegateTransfer) {
+        const tx = await this.buildTransaction(await this.getUpdateUserAllowDelegateTransferIx(allowDelegateTransfer), this.txParams);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
+    }
     async updateUserAdvancedLp(updates) {
         const ixs = await Promise.all(updates.map(async ({ advancedLp, subAccountId }) => {
             return await this.getUpdateAdvancedDlpIx(advancedLp, subAccountId);
@@ -1188,7 +1218,7 @@ class VelocityClient {
             if ((0, spotPosition_1.isSpotPositionAvailable)(spotPosition)) {
                 continue;
             }
-            const spotMarket = this.getSpotMarketAccount(spotPosition.marketIndex);
+            const spotMarket = this.getSpotMarketAccountOrThrow(spotPosition.marketIndex);
             remainingAccounts.push({
                 isSigner: false,
                 isWritable: true,
@@ -1219,7 +1249,7 @@ class VelocityClient {
                 userStats,
                 authority,
                 state: await this.getStatePublicKey(),
-                driftSigner: this.getSignerPublicKey(),
+                velocitySigner: this.getSignerPublicKey(),
                 keeper: this.wallet.publicKey,
             },
             remainingAccounts,
@@ -1274,27 +1304,44 @@ class VelocityClient {
     getUser(subAccountId, authority) {
         subAccountId = subAccountId !== null && subAccountId !== void 0 ? subAccountId : this.activeSubAccountId;
         authority = authority !== null && authority !== void 0 ? authority : this.authority;
+        if (subAccountId === undefined || authority === undefined) {
+            throw new Error('Subaccount ID and authority are required');
+        }
         const userMapKey = this.getUserMapKey(subAccountId, authority);
-        if (!this.users.has(userMapKey)) {
+        const user = this.users.get(userMapKey);
+        if (!user) {
             throw new Error(`VelocityClient has no user for user id ${userMapKey}`);
         }
-        return this.users.get(userMapKey);
+        return user;
     }
     hasUser(subAccountId, authority) {
         subAccountId = subAccountId !== null && subAccountId !== void 0 ? subAccountId : this.activeSubAccountId;
         authority = authority !== null && authority !== void 0 ? authority : this.authority;
+        if (subAccountId === undefined || authority === undefined) {
+            throw new Error('Subaccount ID and authority are required');
+        }
         const userMapKey = this.getUserMapKey(subAccountId, authority);
         return this.users.has(userMapKey);
     }
     getUsers() {
         // delegate users get added to the end
         return [...this.users.values()]
-            .filter((acct) => acct.getUserAccount().authority.equals(this.wallet.publicKey))
-            .concat([...this.users.values()].filter((acct) => !acct.getUserAccount().authority.equals(this.wallet.publicKey)));
+            .filter((acct) => { var _a; return (_a = acct.getUserAccount()) === null || _a === void 0 ? void 0 : _a.authority.equals(this.wallet.publicKey); })
+            .concat([...this.users.values()].filter((acct) => { var _a; return !((_a = acct.getUserAccount()) === null || _a === void 0 ? void 0 : _a.authority.equals(this.wallet.publicKey)); }));
     }
     getUserStats() {
         return this.userStats;
     }
+    /**
+     * Like {@link getUserStats} but throws if there is no UserStats
+     * subscription, for call sites that require a guaranteed account.
+     */
+    getUserStatsOrThrow() {
+        if (!this.userStats) {
+            throw new Error('VelocityClient has no UserStats subscription');
+        }
+        return this.userStats;
+    }
     async fetchReferrerNameAccount(name) {
         const nameBuffer = (0, userName_1.encodeName)(name);
         const referrerNameAccountPublicKey = (0, pda_1.getReferrerNamePublicKeySync)(this.program.programId, nameBuffer);
@@ -1313,6 +1360,14 @@ class VelocityClient {
     getUserAccount(subAccountId, authority) {
         return this.getUser(subAccountId, authority).getUserAccount();
     }
+    /**
+     * Like {@link getUserAccount} but throws a named error instead of returning
+     * `undefined` when the account has not been loaded yet. Use at call sites
+     * that structurally require a loaded account.
+     */
+    getUserAccountOrThrow(subAccountId, authority) {
+        return this.getUser(subAccountId, authority).getUserAccountOrThrow();
+    }
     /**
      * Forces a fetch to rpc before returning accounts. Useful for anchor tests.
      * @param subAccountId
@@ -1325,7 +1380,7 @@ class VelocityClient {
         return this.getUser(subAccountId, authority).getUserAccountAndSlot();
     }
     getSpotPosition(marketIndex, subAccountId) {
-        return this.getUserAccount(subAccountId).spotPositions.find((spotPosition) => spotPosition.marketIndex === marketIndex);
+        return this.getUserAccountOrThrow(subAccountId).spotPositions.find((spotPosition) => spotPosition.marketIndex === marketIndex);
     }
     getQuoteAssetTokenAmount() {
         return this.getTokenAmount(numericConstants_1.QUOTE_SPOT_MARKET_INDEX);
@@ -1343,7 +1398,7 @@ class VelocityClient {
         if (spotPosition === undefined) {
             return numericConstants_1.ZERO;
         }
-        const spotMarket = this.getSpotMarketAccount(marketIndex);
+        const spotMarket = this.getSpotMarketAccountOrThrow(marketIndex);
         return (0, spotBalance_1.getSignedTokenAmount)((0, spotBalance_1.getTokenAmount)(spotPosition.scaledBalance, spotMarket, spotPosition.balanceType), spotPosition.balanceType);
     }
     /**
@@ -1352,7 +1407,7 @@ class VelocityClient {
      * @param amount
      */
     convertToSpotPrecision(marketIndex, amount) {
-        const spotMarket = this.getSpotMarketAccount(marketIndex);
+        const spotMarket = this.getSpotMarketAccountOrThrow(marketIndex);
         return (0, spotMarket_1.castNumberToSpotPrecision)(amount, spotMarket);
     }
     /**
@@ -1380,7 +1435,7 @@ class VelocityClient {
         }
     }
     /**
-     * Each drift instruction must include perp and sport market accounts in the ix remaining accounts.
+     * Each velocity instruction must include perp and sport market accounts in the ix remaining accounts.
      * Use this function to force a subset of markets to be included in the remaining accounts for every ix
      *
      * @param perpMarketIndexes
@@ -1394,26 +1449,56 @@ class VelocityClient {
             this.mustIncludeSpotMarketIndexes.add(spotMarketIndex);
         });
     }
+    cachePerpMarketSlot(slot, ...marketIndexes) {
+        for (const marketIndex of marketIndexes) {
+            if (slot !== undefined) {
+                this.perpMarketLastSlotCache.set(marketIndex, slot);
+            }
+            else {
+                this.perpMarketLastSlotCache.delete(marketIndex);
+            }
+        }
+    }
+    cacheSpotMarketSlot(slot, ...marketIndexes) {
+        for (const marketIndex of marketIndexes) {
+            if (slot !== undefined) {
+                this.spotMarketLastSlotCache.set(marketIndex, slot);
+            }
+            else {
+                this.spotMarketLastSlotCache.delete(marketIndex);
+            }
+        }
+    }
     getRemainingAccounts(params) {
-        return VelocityCore_1.VelocityCore.remainingAccounts.getRemainingAccounts(this, params);
+        return VelocityCore_1.VelocityCore.remainingAccounts.getRemainingAccounts({
+            getPerpMarketAccount: (marketIndex) => this.getPerpMarketAccountOrThrow(marketIndex),
+            getSpotMarketAccount: (marketIndex) => this.getSpotMarketAccountOrThrow(marketIndex),
+            getUserAccountAndSlot: (subAccountId, authority) => this.getUserAccountAndSlot(subAccountId, authority),
+            activeSubAccountId: this.activeSubAccountId,
+            authority: this.authority,
+            perpMarketLastSlotCache: this.perpMarketLastSlotCache,
+            spotMarketLastSlotCache: this.spotMarketLastSlotCache,
+            mustIncludePerpMarketIndexes: this.mustIncludePerpMarketIndexes,
+            mustIncludeSpotMarketIndexes: this.mustIncludeSpotMarketIndexes,
+        }, params);
     }
     addPerpMarketToRemainingAccountMaps(marketIndex, writable, oracleAccountMap, spotMarketAccountMap, perpMarketAccountMap) {
-        const perpMarketAccount = this.getPerpMarketAccount(marketIndex);
+        const perpMarketAccount = this.getPerpMarketAccountOrThrow(marketIndex);
         perpMarketAccountMap.set(marketIndex, {
             pubkey: perpMarketAccount.pubkey,
             isSigner: false,
             isWritable: writable,
         });
-        const oracleWritable = writable && (0, types_1.isVariant)(perpMarketAccount.amm.oracleSource, 'prelaunch');
-        oracleAccountMap.set(perpMarketAccount.amm.oracle.toString(), {
-            pubkey: perpMarketAccount.amm.oracle,
+        const oracleWritable = writable && (0, types_1.isVariant)(perpMarketAccount.oracleSource, 'prelaunch');
+        oracleAccountMap.set(perpMarketAccount.oracle.toString(), {
+            pubkey: perpMarketAccount.oracle,
             isSigner: false,
             isWritable: oracleWritable,
         });
         this.addSpotMarketToRemainingAccountMaps(perpMarketAccount.quoteSpotMarketIndex, false, oracleAccountMap, spotMarketAccountMap);
     }
     addSpotMarketToRemainingAccountMaps(marketIndex, writable, oracleAccountMap, spotMarketAccountMap) {
-        const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
+        const spotMarketAccount = this.getSpotMarketAccountOrThrow(marketIndex);
         spotMarketAccountMap.set(spotMarketAccount.marketIndex, {
             pubkey: spotMarketAccount.pubkey,
             isSigner: false,
@@ -1429,20 +1514,27 @@ class VelocityClient {
     }
     addBuilderToRemainingAccounts(builders, remainingAccounts) {
         for (const builder of builders) {
-            // Add User account for the builder
+            // Add User account for the builder. Dedupe by pubkey: an authority may be
+            // both a builder and the referrer, in which case its User + RevenueShare
+            // accounts would otherwise be pushed twice. On-chain `load_revenue_share_map`
+            // rejects duplicates, which would silently abort the entire sweep.
             const builderUserAccount = (0, pda_1.getUserAccountPublicKeySync)(this.program.programId, builder, 0 // subAccountId 0 for builder user account
             );
-            remainingAccounts.push({
-                pubkey: builderUserAccount,
-                isSigner: false,
-                isWritable: true,
-            });
+            if (!remainingAccounts.find((a) => a.pubkey.equals(builderUserAccount))) {
+                remainingAccounts.push({
+                    pubkey: builderUserAccount,
+                    isSigner: false,
+                    isWritable: true,
+                });
+            }
             const builderAccount = (0, pda_1.getRevenueShareAccountPublicKey)(this.program.programId, builder);
-            remainingAccounts.push({
-                pubkey: builderAccount,
-                isSigner: false,
-                isWritable: true,
-            });
+            if (!remainingAccounts.find((a) => a.pubkey.equals(builderAccount))) {
+                remainingAccounts.push({
+                    pubkey: builderAccount,
+                    isSigner: false,
+                    isWritable: true,
+                });
+            }
         }
     }
     getRemainingAccountMapsForUsers(userAccounts) {
@@ -1471,10 +1563,32 @@ class VelocityClient {
             perpMarketAccountMap,
         };
     }
+    /**
+     * Look up an open order by its program-assigned order ID from the cached user account.
+     *
+     * `orderId` is the monotonically incrementing u32 counter that the program assigns at
+     * placement time — it is not known until the place instruction executes on-chain. Use
+     * {@link getOrderByUserId} when you need to look up an order by the caller-supplied
+     * `userOrderId` instead.
+     *
+     * Returns `undefined` when the order is not found (already filled, cancelled, or the
+     * account cache is stale).
+     */
     getOrder(orderId, subAccountId) {
         var _a;
         return (_a = this.getUserAccount(subAccountId)) === null || _a === void 0 ? void 0 : _a.orders.find((order) => order.orderId === orderId);
     }
+    /**
+     * Look up an open order by the caller-supplied `userOrderId` from the cached user account.
+     *
+     * `userOrderId` is a 1-255 slot chosen by the caller in {@link OrderParams} and is stable
+     * across the life of the order — useful when you need to reference an order before the
+     * program-assigned {@link Order.orderId} is known (e.g. immediately after placing without
+     * waiting for confirmation). Use {@link getOrder} when you have the program-assigned ID.
+     *
+     * Returns `undefined` when the order is not found (already filled, cancelled, or the
+     * account cache is stale).
+     */
     getOrderByUserId(userOrderId, subAccountId) {
         var _a;
         return (_a = this.getUserAccount(subAccountId)) === null || _a === void 0 ? void 0 : _a.orders.find((order) => order.userOrderId === userOrderId);
@@ -1486,7 +1600,7 @@ class VelocityClient {
      * @param tokenProgram
      */
     async getAssociatedTokenAccount(marketIndex, useNative = true, tokenProgram = spl_token_1.TOKEN_PROGRAM_ID, authority = this.wallet.publicKey, allowOwnerOffCurve = false) {
-        const spotMarket = this.getSpotMarketAccount(marketIndex);
+        const spotMarket = this.getSpotMarketAccountOrThrow(marketIndex);
         if (useNative && spotMarket.mint.equals(spotMarkets_1.WRAPPED_SOL_MINT)) {
             return authority;
         }
@@ -1513,7 +1627,7 @@ class VelocityClient {
     }
     async getDepositTxnIx(amount, marketIndex, associatedTokenAccount, subAccountId, reduceOnly = false, overrides) {
         var _a;
-        const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
+        const spotMarketAccount = this.getSpotMarketAccountOrThrow(marketIndex);
         const isSolMarket = spotMarketAccount.mint.equals(spotMarkets_1.WRAPPED_SOL_MINT);
         const signer = (_a = overrides === null || overrides === void 0 ? void 0 : overrides.authority) !== null && _a !== void 0 ? _a : this.wallet.publicKey;
         const createWSOLTokenAccount = isSolMarket && associatedTokenAccount.equals(signer);
@@ -1574,7 +1688,7 @@ class VelocityClient {
     async deposit(amount, marketIndex, associatedTokenAccount, subAccountId, reduceOnly = false, txParams, initSwiftAccount = false, overrides) {
         const tx = await this.createDepositTxn(amount, marketIndex, associatedTokenAccount, subAccountId, reduceOnly, txParams, initSwiftAccount, overrides);
         const { txSig, slot } = await this.sendTransaction(tx, [], this.opts);
-        this.spotMarketLastSlotCache.set(marketIndex, slot);
+        this.cacheSpotMarketSlot(slot, marketIndex);
         return txSig;
     }
     async getDepositInstruction(amount, marketIndex, userTokenAccount, subAccountId, reduceOnly = false, userInitialized = true, overrides) {
@@ -1582,8 +1696,12 @@ class VelocityClient {
         const userAccountPublicKey = await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.authority, subAccountId !== null && subAccountId !== void 0 ? subAccountId : this.activeSubAccountId);
         let remainingAccounts = [];
         if (userInitialized) {
+            const userAccount = await this.forceGetUserAccount(subAccountId);
+            if (!userAccount) {
+                throw new Error('User account not loaded after force fetch');
+            }
             remainingAccounts = this.getRemainingAccounts({
-                userAccounts: [await this.forceGetUserAccount(subAccountId)],
+                userAccounts: [userAccount],
                 useMarketLastSlotCache: true,
                 writableSpotMarketIndexes: [marketIndex],
             });
@@ -1594,7 +1712,7 @@ class VelocityClient {
                 writableSpotMarketIndexes: [marketIndex],
             });
         }
-        const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
+        const spotMarketAccount = this.getSpotMarketAccountOrThrow(marketIndex);
         this.addTokenMintToRemainingAccounts(spotMarketAccount, remainingAccounts);
         if (this.isTransferHook(spotMarketAccount)) {
             await this.addExtraAccountMetasToRemainingAccounts(spotMarketAccount.mint, remainingAccounts);
@@ -1683,7 +1801,11 @@ class VelocityClient {
             return;
         }
         const extraAccountMetasAddress = (0, spl_token_1.getExtraAccountMetaAddress)(mint, hookAccount.programId);
-        const extraAccountMetas = (0, spl_token_1.getExtraAccountMetas)(await this.connection.getAccountInfo(extraAccountMetasAddress));
+        const extraAccountMetasAccount = await this.connection.getAccountInfo(extraAccountMetasAddress);
+        if (!extraAccountMetasAccount) {
+            throw new Error('Extra account metas account not found for transfer hook');
+        }
+        const extraAccountMetas = (0, spl_token_1.getExtraAccountMetas)(extraAccountMetasAccount);
         for (const acc of extraAccountMetas) {
             // assuming it's an extra account meta that does not rely on ix data
             const resolvedAcc = await (0, spl_token_1.resolveExtraAccountMeta)(this.connection, acc, remainingAccounts, Buffer.from([]), hookAccount.programId);
@@ -1713,7 +1835,7 @@ class VelocityClient {
             const [, initializeSignedMsgUserOrdersAccountIx] = await this.getInitializeSignedMsgUserOrdersAccountIx(this.authority, 8, overrides);
             ixs.push(initializeSignedMsgUserOrdersAccountIx);
         }
-        const spotMarket = this.getSpotMarketAccount(marketIndex);
+        const spotMarket = this.getSpotMarketAccountOrThrow(marketIndex);
         const isSolMarket = spotMarket.mint.equals(spotMarkets_1.WRAPPED_SOL_MINT);
         // Use external wallet for deposit source if provided, otherwise use the wallet
         const depositSource = (_a = overrides === null || overrides === void 0 ? void 0 : overrides.externalWallet) !== null && _a !== void 0 ? _a : this.wallet.publicKey;
@@ -1764,6 +1886,9 @@ class VelocityClient {
         }
         ixs.push(depositCollateralIx);
         if (!donateAmount.eq(numericConstants_1.ZERO)) {
+            if (!wsolTokenAccount) {
+                throw new Error('wsolTokenAccount is required to donate to rev pool');
+            }
             const donateIx = await this.getDepositIntoSpotMarketRevenuePoolIx(1, donateAmount, wsolTokenAccount);
             ixs.push(donateIx);
         }
@@ -1775,6 +1900,9 @@ class VelocityClient {
         // Close the wrapped sol account at the end of the transaction
         // Return funds to the deposit source (external wallet if provided)
         if (createWSOLTokenAccount) {
+            if (!wsolTokenAccount) {
+                throw new Error('wsolTokenAccount was not created');
+            }
             ixs.push((0, spl_token_1.createCloseAccountInstruction)(wsolTokenAccount, depositSource, depositSource, []));
         }
         return {
@@ -1807,7 +1935,7 @@ class VelocityClient {
         const [tx, userAccountPublicKey] = await this.createInitializeUserAccountAndDepositCollateral(amount, userTokenAccount, marketIndex, subAccountId, name, fromSubAccountId, referrerInfo, donateAmount, txParams, customMaxMarginRatio, poolId, overrides);
         const additionalSigners = [];
         const { txSig, slot } = await this.sendTransaction(tx, additionalSigners, this.opts);
-        this.spotMarketLastSlotCache.set(marketIndex, slot);
+        this.cacheSpotMarketSlot(slot, marketIndex);
         await this.addUser(subAccountId);
         return [txSig, userAccountPublicKey];
     }
@@ -1830,7 +1958,7 @@ class VelocityClient {
     }
     async getWithdrawalIxs(amount, marketIndex, associatedTokenAddress, reduceOnly = false, subAccountId) {
         const withdrawIxs = [];
-        const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
+        const spotMarketAccount = this.getSpotMarketAccountOrThrow(marketIndex);
         const isSolMarket = spotMarketAccount.mint.equals(spotMarkets_1.WRAPPED_SOL_MINT);
         const authority = this.wallet.publicKey;
         const createWSOLTokenAccount = isSolMarket && associatedTokenAddress.equals(authority);
@@ -1866,7 +1994,7 @@ class VelocityClient {
         const withdrawIxs = await this.getWithdrawalIxs(amount, marketIndex, associatedTokenAddress, reduceOnly, subAccountId);
         const tx = await this.buildTransaction(withdrawIxs, txParams !== null && txParams !== void 0 ? txParams : this.txParams);
         const { txSig, slot } = await this.sendTransaction(tx, additionalSigners, this.opts);
-        this.spotMarketLastSlotCache.set(marketIndex, slot);
+        this.cacheSpotMarketSlot(slot, marketIndex);
         return txSig;
     }
     async withdrawAllDustPositions(subAccountId, txParams, opts) {
@@ -1895,12 +2023,12 @@ class VelocityClient {
     async getWithdrawIx(amount, marketIndex, userTokenAccount, reduceOnly = false, subAccountId) {
         const user = await this.getUserAccountPublicKey(subAccountId);
         const remainingAccounts = this.getRemainingAccounts({
-            userAccounts: [this.getUserAccount(subAccountId)],
+            userAccounts: [this.getUserAccountOrThrow(subAccountId)],
             useMarketLastSlotCache: true,
             writableSpotMarketIndexes: [marketIndex],
             readableSpotMarketIndexes: [numericConstants_1.QUOTE_SPOT_MARKET_INDEX],
         });
-        const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
+        const spotMarketAccount = this.getSpotMarketAccountOrThrow(marketIndex);
         this.addTokenMintToRemainingAccounts(spotMarketAccount, remainingAccounts);
         if (this.isTransferHook(spotMarketAccount)) {
             await this.addExtraAccountMetasToRemainingAccounts(spotMarketAccount.mint, remainingAccounts);
@@ -1914,7 +2042,7 @@ class VelocityClient {
             state: await this.getStatePublicKey(),
             spotMarket: spotMarketAccount.pubkey,
             spotMarketVault: spotMarketAccount.vault,
-            driftSigner: this.getSignerPublicKey(),
+            velocitySigner: this.getSignerPublicKey(),
             user,
             userStats: this.getUserStatsAccountPublicKey(),
             userTokenAccount,
@@ -1935,7 +2063,7 @@ class VelocityClient {
         const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(await this.getTransferDepositIx(amount, marketIndex, fromSubAccountId, toSubAccountId), txParams), [], this.opts);
         if (fromSubAccountId === this.activeSubAccountId ||
             toSubAccountId === this.activeSubAccountId) {
-            this.spotMarketLastSlotCache.set(marketIndex, slot);
+            this.cacheSpotMarketSlot(slot, marketIndex);
         }
         return txSig;
     }
@@ -1944,9 +2072,10 @@ class VelocityClient {
         const toUser = await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.wallet.publicKey, toSubAccountId);
         let remainingAccounts;
         const userMapKey = this.getUserMapKey(fromSubAccountId, this.wallet.publicKey);
-        if (this.users.has(userMapKey)) {
+        const mapUser = this.users.get(userMapKey);
+        if (mapUser) {
             remainingAccounts = this.getRemainingAccounts({
-                userAccounts: [this.users.get(userMapKey).getUserAccount()],
+                userAccounts: [mapUser.getUserAccountOrThrow()],
                 useMarketLastSlotCache: true,
                 writableSpotMarketIndexes: [marketIndex],
             });
@@ -1967,7 +2096,48 @@ class VelocityClient {
                 toUser,
                 userStats: this.getUserStatsAccountPublicKey(),
                 state: await this.getStatePublicKey(),
-                spotMarketVault: this.getSpotMarketAccount(marketIndex).vault,
+                spotMarketVault: this.getSpotMarketAccountOrThrow(marketIndex).vault,
+            },
+            remainingAccounts,
+        });
+    }
+    async transferDepositByDelegate(amount, marketIndex, fromSubAccountId, toSubAccountId, txParams) {
+        const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(await this.getTransferDepositByDelegateIx(amount, marketIndex, fromSubAccountId, toSubAccountId), txParams), [], this.opts);
+        if (fromSubAccountId === this.activeSubAccountId ||
+            toSubAccountId === this.activeSubAccountId) {
+            this.cacheSpotMarketSlot(slot, marketIndex);
+        }
+        return txSig;
+    }
+    async getTransferDepositByDelegateIx(amount, marketIndex, fromSubAccountId, toSubAccountId) {
+        const fromUser = await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.authority, fromSubAccountId);
+        const toUser = await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.authority, toSubAccountId);
+        let remainingAccounts;
+        const userMapKey = this.getUserMapKey(fromSubAccountId, this.authority);
+        const mapUser = this.users.get(userMapKey);
+        if (mapUser) {
+            remainingAccounts = this.getRemainingAccounts({
+                userAccounts: [mapUser.getUserAccountOrThrow()],
+                useMarketLastSlotCache: true,
+                writableSpotMarketIndexes: [marketIndex],
+            });
+        }
+        else {
+            const fromUserAccount = (await this.program.account.user.fetch(fromUser));
+            remainingAccounts = this.getRemainingAccounts({
+                userAccounts: [fromUserAccount],
+                useMarketLastSlotCache: true,
+                writableSpotMarketIndexes: [marketIndex],
+            });
+        }
+        return await this.program.instruction.transferDepositByDelegate(marketIndex, amount, {
+            accounts: {
+                delegate: this.wallet.publicKey,
+                fromUser,
+                toUser,
+                userStats: this.getUserStatsAccountPublicKey(),
+                state: await this.getStatePublicKey(),
+                spotMarketVault: this.getSpotMarketAccountOrThrow(marketIndex).vault,
             },
             remainingAccounts,
         });
@@ -1976,19 +2146,16 @@ class VelocityClient {
         const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(await this.getTransferPoolsIx(depositFromMarketIndex, depositToMarketIndex, borrowFromMarketIndex, borrowToMarketIndex, depositAmount, borrowAmount, fromSubAccountId, toSubAccountId), txParams), [], this.opts);
         if (fromSubAccountId === this.activeSubAccountId ||
             toSubAccountId === this.activeSubAccountId) {
-            this.spotMarketLastSlotCache.set(depositFromMarketIndex, slot);
-            this.spotMarketLastSlotCache.set(depositToMarketIndex, slot);
-            this.spotMarketLastSlotCache.set(borrowFromMarketIndex, slot);
-            this.spotMarketLastSlotCache.set(borrowToMarketIndex, slot);
+            this.cacheSpotMarketSlot(slot, depositFromMarketIndex, depositToMarketIndex, borrowFromMarketIndex, borrowToMarketIndex);
         }
         return txSig;
     }
     async getTransferPoolsIx(depositFromMarketIndex, depositToMarketIndex, borrowFromMarketIndex, borrowToMarketIndex, depositAmount, borrowAmount, fromSubAccountId, toSubAccountId, isToNewSubAccount) {
         const fromUser = await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.wallet.publicKey, fromSubAccountId);
         const toUser = await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.wallet.publicKey, toSubAccountId);
-        const userAccounts = [this.getUserAccount(fromSubAccountId)];
+        const userAccounts = [this.getUserAccountOrThrow(fromSubAccountId)];
         if (!isToNewSubAccount) {
-            userAccounts.push(this.getUserAccount(toSubAccountId));
+            userAccounts.push(this.getUserAccountOrThrow(toSubAccountId));
         }
         const remainingAccounts = this.getRemainingAccounts({
             userAccounts,
@@ -2001,8 +2168,8 @@ class VelocityClient {
             ],
         });
         const tokenPrograms = new Set();
-        const depositFromSpotMarket = this.getSpotMarketAccount(depositFromMarketIndex);
-        const borrowFromSpotMarket = this.getSpotMarketAccount(borrowFromMarketIndex);
+        const depositFromSpotMarket = this.getSpotMarketAccountOrThrow(depositFromMarketIndex);
+        const borrowFromSpotMarket = this.getSpotMarketAccountOrThrow(borrowFromMarketIndex);
         tokenPrograms.add(this.getTokenProgramForSpotMarket(depositFromSpotMarket).toBase58());
         tokenPrograms.add(this.getTokenProgramForSpotMarket(borrowFromSpotMarket).toBase58());
         for (const tokenProgram of tokenPrograms) {
@@ -2019,11 +2186,11 @@ class VelocityClient {
                 toUser,
                 userStats: this.getUserStatsAccountPublicKey(),
                 state: await this.getStatePublicKey(),
-                depositFromSpotMarketVault: this.getSpotMarketAccount(depositFromMarketIndex).vault,
-                depositToSpotMarketVault: this.getSpotMarketAccount(depositToMarketIndex).vault,
-                borrowFromSpotMarketVault: this.getSpotMarketAccount(borrowFromMarketIndex).vault,
-                borrowToSpotMarketVault: this.getSpotMarketAccount(borrowToMarketIndex).vault,
-                driftSigner: this.getSignerPublicKey(),
+                depositFromSpotMarketVault: this.getSpotMarketAccountOrThrow(depositFromMarketIndex).vault,
+                depositToSpotMarketVault: this.getSpotMarketAccountOrThrow(depositToMarketIndex).vault,
+                borrowFromSpotMarketVault: this.getSpotMarketAccountOrThrow(borrowFromMarketIndex).vault,
+                borrowToSpotMarketVault: this.getSpotMarketAccountOrThrow(borrowToMarketIndex).vault,
+                velocitySigner: this.getSignerPublicKey(),
             },
             remainingAccounts,
         });
@@ -2037,8 +2204,8 @@ class VelocityClient {
         const toUser = await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.authority, toSubAccountId);
         const remainingAccounts = this.getRemainingAccounts({
             userAccounts: [
-                this.getUserAccount(fromSubAccountId),
-                this.getUserAccount(toSubAccountId),
+                this.getUserAccountOrThrow(fromSubAccountId),
+                this.getUserAccountOrThrow(toSubAccountId),
             ],
             useMarketLastSlotCache: true,
             writablePerpMarketIndexes: [marketIndex],
@@ -2080,9 +2247,9 @@ class VelocityClient {
     }
     async getDepositIntoIsolatedPerpPositionIx(amount, perpMarketIndex, userTokenAccount, subAccountId) {
         const userAccountPublicKey = await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.authority, subAccountId !== null && subAccountId !== void 0 ? subAccountId : this.activeSubAccountId);
-        const perpMarketAccount = this.getPerpMarketAccount(perpMarketIndex);
+        const perpMarketAccount = this.getPerpMarketAccountOrThrow(perpMarketIndex);
         const spotMarketIndex = perpMarketAccount.quoteSpotMarketIndex;
-        const spotMarketAccount = this.getSpotMarketAccount(spotMarketIndex);
+        const spotMarketAccount = this.getSpotMarketAccountOrThrow(spotMarketIndex);
         const remainingAccounts = this.getRemainingAccounts({
             userAccounts: [],
             writableSpotMarketIndexes: [spotMarketIndex],
@@ -2108,7 +2275,7 @@ class VelocityClient {
         const transferIx = await this.getTransferIsolatedPerpPositionDepositIx(amount, perpMarketIndex, subAccountId, noBuffer);
         const needsToSettle = amount.lt(tokenAmountDeposited.neg()) || amount.eq(numericConstants_1.MIN_I64) || trySettle;
         if (needsToSettle) {
-            const settleIx = await this.settleMultiplePNLsIx(await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.authority, subAccountId !== null && subAccountId !== void 0 ? subAccountId : this.activeSubAccountId), this.getUserAccount(subAccountId), [perpMarketIndex], types_1.SettlePnlMode.TRY_SETTLE);
+            const settleIx = await this.settleMultiplePNLsIx(await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.authority, subAccountId !== null && subAccountId !== void 0 ? subAccountId : this.activeSubAccountId), this.getUserAccountOrThrow(subAccountId), [perpMarketIndex], types_1.SettlePnlMode.TRY_SETTLE);
             ixs.push(settleIx);
         }
         ixs.push(transferIx);
@@ -2121,10 +2288,10 @@ class VelocityClient {
     }
     async getTransferIsolatedPerpPositionDepositIx(amount, perpMarketIndex, subAccountId, noAmountBuffer, signingAuthority) {
         const userAccountPublicKey = await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.authority, subAccountId !== null && subAccountId !== void 0 ? subAccountId : this.activeSubAccountId);
-        const perpMarketAccount = this.getPerpMarketAccount(perpMarketIndex);
+        const perpMarketAccount = this.getPerpMarketAccountOrThrow(perpMarketIndex);
         const spotMarketIndex = perpMarketAccount.quoteSpotMarketIndex;
-        const spotMarketAccount = this.getSpotMarketAccount(spotMarketIndex);
-        const user = await this.getUserAccount(subAccountId);
+        const spotMarketAccount = this.getSpotMarketAccountOrThrow(spotMarketIndex);
+        const user = await this.getUserAccountOrThrow(subAccountId);
         const remainingAccounts = this.getRemainingAccounts({
             userAccounts: [user],
             writableSpotMarketIndexes: [spotMarketIndex],
@@ -2151,16 +2318,20 @@ class VelocityClient {
     }
     async getWithdrawFromIsolatedPerpPositionIxsBundle(amount, perpMarketIndex, subAccountId, userTokenAccount) {
         const userAccountPublicKey = await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.authority, subAccountId !== null && subAccountId !== void 0 ? subAccountId : this.activeSubAccountId);
-        const userAccount = this.getUserAccount(subAccountId);
+        const userAccount = this.getUserAccountOrThrow(subAccountId);
         const tokenAmountDeposited = this.getIsolatedPerpPositionTokenAmount(perpMarketIndex);
-        const isolatedPositionUnrealizedPnl = (0, position_1.calculateClaimablePnl)(this.getPerpMarketAccount(perpMarketIndex), this.getSpotMarketAccount(this.getPerpMarketAccount(perpMarketIndex).quoteSpotMarketIndex), userAccount.perpPositions.find((p) => p.marketIndex === perpMarketIndex), this.getOracleDataForSpotMarket(this.getPerpMarketAccount(perpMarketIndex).quoteSpotMarketIndex));
+        const isolatedPerpPosition = userAccount.perpPositions.find((p) => p.marketIndex === perpMarketIndex);
+        if (!isolatedPerpPosition) {
+            throw new Error(`No perp position found for market index ${perpMarketIndex}`);
+        }
+        const isolatedPositionUnrealizedPnl = (0, position_1.calculateClaimablePnl)(this.getPerpMarketAccountOrThrow(perpMarketIndex), this.getSpotMarketAccountOrThrow(this.getPerpMarketAccountOrThrow(perpMarketIndex).quoteSpotMarketIndex), isolatedPerpPosition, this.getOracleDataForSpotMarket(this.getPerpMarketAccountOrThrow(perpMarketIndex).quoteSpotMarketIndex));
         const depositAmountPlusUnrealizedPnl = tokenAmountDeposited.add(isolatedPositionUnrealizedPnl);
         const amountToWithdraw = amount.gt(depositAmountPlusUnrealizedPnl)
             ? numericConstants_1.MIN_I64 // min i64
             : amount;
         let associatedTokenAccount = userTokenAccount;
         if (!associatedTokenAccount) {
-            const perpMarketAccount = this.getPerpMarketAccount(perpMarketIndex);
+            const perpMarketAccount = this.getPerpMarketAccountOrThrow(perpMarketIndex);
             const quoteSpotMarketIndex = perpMarketAccount.quoteSpotMarketIndex;
             associatedTokenAccount = await this.getAssociatedTokenAccount(quoteSpotMarketIndex);
         }
@@ -2176,11 +2347,11 @@ class VelocityClient {
     }
     async getWithdrawFromIsolatedPerpPositionIx(amount, perpMarketIndex, userTokenAccount, subAccountId) {
         const userAccountPublicKey = await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.authority, subAccountId !== null && subAccountId !== void 0 ? subAccountId : this.activeSubAccountId);
-        const perpMarketAccount = this.getPerpMarketAccount(perpMarketIndex);
+        const perpMarketAccount = this.getPerpMarketAccountOrThrow(perpMarketIndex);
         const spotMarketIndex = perpMarketAccount.quoteSpotMarketIndex;
-        const spotMarketAccount = this.getSpotMarketAccount(spotMarketIndex);
+        const spotMarketAccount = this.getSpotMarketAccountOrThrow(spotMarketIndex);
         const remainingAccounts = this.getRemainingAccounts({
-            userAccounts: [this.getUserAccount(subAccountId)],
+            userAccounts: [this.getUserAccountOrThrow(subAccountId)],
             writableSpotMarketIndexes: [spotMarketIndex],
             readablePerpMarketIndex: [perpMarketIndex],
         });
@@ -2193,7 +2364,7 @@ class VelocityClient {
                 authority: this.wallet.publicKey,
                 userTokenAccount: userTokenAccount,
                 tokenProgram: this.getTokenProgramForSpotMarket(spotMarketAccount),
-                driftSigner: this.getSignerPublicKey(),
+                velocitySigner: this.getSignerPublicKey(),
             },
             remainingAccounts,
         });
@@ -2203,7 +2374,7 @@ class VelocityClient {
         return txSig;
     }
     async updateSpotMarketCumulativeInterestIx(marketIndex) {
-        const spotMarket = this.getSpotMarketAccount(marketIndex);
+        const spotMarket = this.getSpotMarketAccountOrThrow(marketIndex);
         return await this.program.instruction.updateSpotMarketCumulativeInterest({
             accounts: {
                 state: await this.getStatePublicKey(),
@@ -2223,13 +2394,13 @@ class VelocityClient {
             direction,
             baseAssetAmount: amount,
             price: limitPrice,
-        }, undefined, undefined, undefined, undefined, undefined, subAccountId);
+        }, undefined, undefined, undefined, undefined, subAccountId);
     }
     async sendSignedTx(tx, opts) {
         const { txSig } = await this.sendTransaction(tx, undefined, opts !== null && opts !== void 0 ? opts : this.opts, true);
         return txSig;
     }
-    async prepareMarketOrderTxs(orderParams, userAccountPublicKey, userAccount, makerInfo, txParams, bracketOrdersParams = new Array(), referrerInfo, cancelExistingOrders, settlePnl, positionMaxLev, isolatedPositionDepositAmount) {
+    async prepareMarketOrderTxs(orderParams, userAccountPublicKey, userAccount, makerInfo, txParams, bracketOrdersParams = new Array(), cancelExistingOrders, settlePnl, positionMaxLev, isolatedPositionDepositAmount) {
         const marketIndex = orderParams.marketIndex;
         const orderId = userAccount.nextOrderId;
         const ixPromisesForTxs = {
@@ -2263,7 +2434,7 @@ class VelocityClient {
             ixPromisesForTxs.fillTx = this.getFillPerpOrderIx(userAccountPublicKey, userAccount, {
                 orderId,
                 marketIndex,
-            }, makerInfo, referrerInfo, userAccount.subAccountId);
+            }, makerInfo, userAccount.subAccountId);
         }
         const ixs = await Promise.all(Object.values(ixPromisesForTxs));
         const ixsMap = ixs.reduce((acc, ix, i) => {
@@ -2284,11 +2455,11 @@ class VelocityClient {
      * @param cancelExistingOrders - Builds and returns an extra transaciton to cancel the existing orders in the same perp market. Intended use is to auto-cancel TP/SL orders when closing a position. Ignored if orderParams.marketType is not MarketType.PERP
      * @returns
      */
-    async sendMarketOrderAndGetSignedFillTx(orderParams, userAccountPublicKey, userAccount, makerInfo, txParams, bracketOrdersParams = new Array(), referrerInfo, cancelExistingOrders, settlePnl) {
-        const preppedTxs = await this.prepareMarketOrderTxs(orderParams, userAccountPublicKey, userAccount, makerInfo, txParams, bracketOrdersParams, referrerInfo, cancelExistingOrders, settlePnl);
+    async sendMarketOrderAndGetSignedFillTx(orderParams, userAccountPublicKey, userAccount, makerInfo, txParams, bracketOrdersParams = new Array(), cancelExistingOrders, settlePnl) {
+        const preppedTxs = await this.prepareMarketOrderTxs(orderParams, userAccountPublicKey, userAccount, makerInfo, txParams, bracketOrdersParams, cancelExistingOrders, settlePnl);
         const signedTxs = (await this.txHandler.getSignedTransactionMap(preppedTxs, this.wallet)).signedTxMap;
         const { txSig, slot } = await this.sendTransaction(signedTxs.marketOrderTx, [], this.opts, true);
-        this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
+        this.cachePerpMarketSlot(slot, orderParams.marketIndex);
         return {
             txSig,
             signedFillTx: signedTxs.fillTx,
@@ -2304,9 +2475,51 @@ class VelocityClient {
             preIxs.push(await this.getTransferIsolatedPerpPositionDepositIx(isolatedPositionDepositAmount, orderParams.marketIndex, subAccountId));
         }
         const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(await this.getPlacePerpOrderIx(orderParams, subAccountId), txParams, undefined, undefined, undefined, undefined, preIxs), [], this.opts);
-        this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
+        this.cachePerpMarketSlot(slot, orderParams.marketIndex);
         return txSig;
     }
+    /**
+     * Returns the RevenueShareEscrow account meta for the placing user when `orderParams`
+     * carries a builder code (`builderIdx` + `builderFeeTenthBps`), otherwise `undefined`.
+     * The on-chain handlers peek for this account last in `remaining_accounts`, so callers
+     * must push it after the market/oracle/maker accounts.
+     */
+    getBuilderEscrowAccountMeta(orderParams, subAccountId) {
+        var _a, _b;
+        if (!(0, builder_1.hasBuilderParams)(orderParams)) {
+            return undefined;
+        }
+        const authority = (_b = (_a = this.getUserAccount(subAccountId)) === null || _a === void 0 ? void 0 : _a.authority) !== null && _b !== void 0 ? _b : this.authority;
+        return {
+            pubkey: (0, pda_1.getRevenueShareEscrowAccountPublicKey)(this.program.programId, authority),
+            isWritable: true,
+            isSigner: false,
+        };
+    }
+    /**
+     * Returns the AccountMeta for the taker's RevenueShareEscrow when a fill of the
+     * taker's order must include it: the order carries a builder code, or the taker
+     * is referred (their escrow was initialized with a referrer). Returns `undefined`
+     * when neither applies so no account meta is added to the transaction. The
+     * on-chain handlers peek for this account last in `remaining_accounts`, so
+     * callers must push it after the market/oracle/maker accounts.
+     *
+     * Throws when `takerEscrow` does not belong to `takerAuthority`.
+     */
+    getTakerEscrowAccountMeta(takerAuthority, orderHasBuilder, takerEscrow) {
+        if (takerEscrow && !takerEscrow.authority.equals(takerAuthority)) {
+            throw new Error('takerEscrow.authority does not match the taker user account authority');
+        }
+        const takerIsReferred = takerEscrow && (0, builder_1.escrowHasReferrer)(takerEscrow);
+        if (!orderHasBuilder && !takerIsReferred) {
+            return undefined;
+        }
+        return {
+            pubkey: (0, pda_1.getRevenueShareEscrowAccountPublicKey)(this.program.programId, takerAuthority),
+            isWritable: true,
+            isSigner: false,
+        };
+    }
     async getPlacePerpOrderIx(orderParams, subAccountId, depositToTradeArgs) {
         orderParams = (0, orderParams_1.getOrderParams)(orderParams, { marketType: types_1.MarketType.PERP });
         const isDepositToTradeTx = depositToTradeArgs !== undefined;
@@ -2316,13 +2529,17 @@ class VelocityClient {
         const remainingAccounts = this.getRemainingAccounts({
             userAccounts: (depositToTradeArgs === null || depositToTradeArgs === void 0 ? void 0 : depositToTradeArgs.isMakingNewAccount)
                 ? []
-                : [this.getUserAccount(subAccountId)],
+                : [this.getUserAccountOrThrow(subAccountId)],
             useMarketLastSlotCache: false,
             readablePerpMarketIndex: orderParams.marketIndex,
             readableSpotMarketIndexes: isDepositToTradeTx
                 ? [depositToTradeArgs === null || depositToTradeArgs === void 0 ? void 0 : depositToTradeArgs.depositMarketIndex]
                 : undefined,
         });
+        const builderEscrow = this.getBuilderEscrowAccountMeta(orderParams, subAccountId);
+        if (builderEscrow) {
+            remainingAccounts.push(builderEscrow);
+        }
         return await VelocityCore_1.VelocityCore.buildPlacePerpOrderInstruction({
             program: this.program,
             orderParams,
@@ -2341,14 +2558,14 @@ class VelocityClient {
         const marketAccountInfos = [];
         const oracleAccountInfos = [];
         for (const marketIndex of marketIndexes) {
-            const market = this.getPerpMarketAccount(marketIndex);
+            const market = this.getPerpMarketAccountOrThrow(marketIndex);
             marketAccountInfos.push({
                 pubkey: market.pubkey,
                 isWritable: true,
                 isSigner: false,
             });
             oracleAccountInfos.push({
-                pubkey: market.amm.oracle,
+                pubkey: market.oracle,
                 isWritable: false,
                 isSigner: false,
             });
@@ -2402,6 +2619,20 @@ class VelocityClient {
             },
         });
     }
+    /**
+     * Cancel an open order and broadcast the transaction.
+     *
+     * When `orderId` is `undefined` (omitted or passed explicitly), the instruction is
+     * sent with a `null` order ID and the program cancels the most recently placed order
+     * on-chain via `get_last_order_id`. This is safe to use in a composed transaction
+     * where a place instruction runs first and the assigned order ID is not yet known.
+     *
+     * Note: when `orderId` is `undefined` and `overrides.withdrawIsolatedDepositAmount`
+     * is also provided, `getOrder` will return `undefined` (the ID is unknown client-side),
+     * causing the withdraw path to throw — supply an explicit `orderId` in that case.
+     *
+     * @see {@link getCancelOrderIx} to obtain the instruction without sending.
+     */
     async cancelOrder(orderId, txParams, subAccountId, overrides) {
         const cancelIx = await this.getCancelOrderIx(orderId, subAccountId);
         const instructions = [cancelIx];
@@ -2410,6 +2641,9 @@ class VelocityClient {
             const perpMarketIndex = order === null || order === void 0 ? void 0 : order.marketIndex;
             const withdrawAmount = overrides.withdrawIsolatedDepositAmount;
             if (withdrawAmount.gt(numericConstants_1.ZERO)) {
+                if (perpMarketIndex === undefined) {
+                    throw new Error(`Order ${orderId} not found when withdrawing isolated deposit`);
+                }
                 const withdrawIxs = await this.getWithdrawFromIsolatedPerpPositionIxsBundle(withdrawAmount, perpMarketIndex, subAccountId);
                 instructions.push(...withdrawIxs);
             }
@@ -2417,10 +2651,25 @@ class VelocityClient {
         const { txSig } = await this.sendTransaction(await this.buildTransaction(instructions, txParams), [], this.opts);
         return txSig;
     }
+    /**
+     * Build a `cancelOrder` instruction for the given order.
+     *
+     * When `orderId` is `undefined` (omitted or passed explicitly), the instruction is
+     * built with a `null` order ID (`orderId ?? null`). The program interprets a `null`
+     * ID as "cancel the user's most recently placed order" (via `get_last_order_id`
+     * on-chain). This is useful when composing a multi-instruction transaction where a
+     * place instruction precedes the cancel and the program-assigned order ID is not yet
+     * known at build time.
+     *
+     * When `orderId` is supplied, only that specific order is cancelled.
+     *
+     * @see {@link cancelOrder} to send the transaction directly.
+     * @see {@link getCancelOrderByUserIdIx} to cancel by the caller-supplied `userOrderId`.
+     */
     async getCancelOrderIx(orderId, subAccountId) {
         const user = await this.getUserAccountPublicKey(subAccountId);
         const remainingAccounts = this.getRemainingAccounts({
-            userAccounts: [this.getUserAccount(subAccountId)],
+            userAccounts: [this.getUserAccountOrThrow(subAccountId)],
             useMarketLastSlotCache: true,
         });
         return await VelocityCore_1.VelocityCore.buildCancelOrderInstruction({
@@ -2438,10 +2687,13 @@ class VelocityClient {
     }
     async getCancelOrderByUserIdIx(userOrderId, subAccountId) {
         const user = await this.getUserAccountPublicKey(subAccountId);
-        const order = this.getOrderByUserId(userOrderId);
-        const oracle = this.getPerpMarketAccount(order.marketIndex).amm.oracle;
+        const order = this.getOrderByUserId(userOrderId, subAccountId);
+        if (!order) {
+            throw new Error(`Order with user order id ${userOrderId} not found`);
+        }
+        const oracle = this.getPerpMarketAccountOrThrow(order.marketIndex).oracle;
         const remainingAccounts = this.getRemainingAccounts({
-            userAccounts: [this.getUserAccount(subAccountId)],
+            userAccounts: [this.getUserAccountOrThrow(subAccountId)],
             useMarketLastSlotCache: true,
         });
         return await VelocityCore_1.VelocityCore.buildCancelOrderByUserIdInstruction({
@@ -2478,7 +2730,7 @@ class VelocityClient {
     async getCancelOrdersByIdsIx(orderIds, subAccountId, user, overrides) {
         var _a, _b, _c;
         const userAccountPubKey = (_a = user === null || user === void 0 ? void 0 : user.userAccountPublicKey) !== null && _a !== void 0 ? _a : (await this.getUserAccountPublicKey(subAccountId));
-        const userAccount = (_b = user === null || user === void 0 ? void 0 : user.getUserAccount()) !== null && _b !== void 0 ? _b : this.getUserAccount(subAccountId);
+        const userAccount = (_b = user === null || user === void 0 ? void 0 : user.getUserAccount()) !== null && _b !== void 0 ? _b : this.getUserAccountOrThrow(subAccountId);
         const remainingAccounts = this.getRemainingAccounts({
             userAccounts: [userAccount],
             useMarketLastSlotCache: true,
@@ -2510,7 +2762,7 @@ class VelocityClient {
             }
         }
         const remainingAccounts = this.getRemainingAccounts({
-            userAccounts: [this.getUserAccount(subAccountId)],
+            userAccounts: [this.getUserAccountOrThrow(subAccountId)],
             readablePerpMarketIndex,
             readableSpotMarketIndexes,
             useMarketLastSlotCache: true,
@@ -2574,13 +2826,22 @@ class VelocityClient {
             }
         }
         const remainingAccounts = this.getRemainingAccounts({
-            userAccounts: [this.getUserAccount(subAccountId)],
+            userAccounts: [this.getUserAccountOrThrow(subAccountId)],
             readablePerpMarketIndex,
             readableSpotMarketIndexes,
             useMarketLastSlotCache: true,
         });
         const formattedParams = params.map((item) => (0, orderParams_1.getOrderParams)(item));
         const authority = (_a = overrides === null || overrides === void 0 ? void 0 : overrides.authority) !== null && _a !== void 0 ? _a : this.wallet.publicKey;
+        // The handler loads a single RevenueShareEscrow for the placing user, so push it once
+        // if any order in the batch carries a builder code.
+        const builderParam = formattedParams.find((p) => (0, builder_1.hasBuilderParams)(p));
+        if (builderParam) {
+            const builderEscrow = this.getBuilderEscrowAccountMeta(builderParam, subAccountId);
+            if (builderEscrow) {
+                remainingAccounts.push(builderEscrow);
+            }
+        }
         return await VelocityCore_1.VelocityCore.buildPlaceOrdersInstruction({
             program: this.program,
             formattedParams,
@@ -2607,7 +2868,7 @@ class VelocityClient {
             }
         }
         const remainingAccounts = this.getRemainingAccounts({
-            userAccounts: [this.getUserAccount(subAccountId)],
+            userAccounts: [this.getUserAccountOrThrow(subAccountId)],
             readablePerpMarketIndex,
             readableSpotMarketIndexes,
             useMarketLastSlotCache: true,
@@ -2650,7 +2911,7 @@ class VelocityClient {
         const user = await this.getUserAccountPublicKey(subAccountId);
         const isPerp = (0, types_1.isVariant)(params.marketType, 'perp');
         const remainingAccounts = this.getRemainingAccounts({
-            userAccounts: [this.getUserAccount(subAccountId)],
+            userAccounts: [this.getUserAccountOrThrow(subAccountId)],
             readablePerpMarketIndex: isPerp ? [params.marketIndex] : [],
             readableSpotMarketIndexes: isPerp ? [] : [params.marketIndex],
             useMarketLastSlotCache: true,
@@ -2679,11 +2940,17 @@ class VelocityClient {
             remainingAccounts,
         });
     }
-    async fillPerpOrder(userAccountPublicKey, user, order, makerInfo, referrerInfo, txParams, fillerSubAccountId, fillerAuthority, hasBuilderFee) {
-        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getFillPerpOrderIx(userAccountPublicKey, user, order, makerInfo, referrerInfo, fillerSubAccountId, undefined, fillerAuthority, hasBuilderFee), txParams), [], this.opts);
+    async fillPerpOrder(userAccountPublicKey, user, order, makerInfo, txParams, fillerSubAccountId, fillerAuthority, hasBuilderFee, takerEscrow) {
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getFillPerpOrderIx(userAccountPublicKey, user, order, makerInfo, fillerSubAccountId, undefined, fillerAuthority, hasBuilderFee, takerEscrow), txParams), [], this.opts);
         return txSig;
     }
-    async getFillPerpOrderIx(userAccountPublicKey, userAccount, order, makerInfo, referrerInfo, fillerSubAccountId, isSignedMsg, fillerAuthority, hasBuilderFee) {
+    async getFillPerpOrderIx(userAccountPublicKey, userAccount, order, makerInfo, fillerSubAccountId, isSignedMsg, fillerAuthority, hasBuilderFee, 
+    // The program rejects fills that omit the taker's RevenueShareEscrow when the
+    // order has a builder OR the taker is referred with an escrow. The builder case
+    // is detected from the order bitflags; pass the taker's decoded escrow (e.g.
+    // from a RevenueShareEscrowMap) so referred takers also get it attached.
+    takerEscrow) {
+        var _a;
         const userStatsPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, userAccount.authority);
         let filler;
         if (fillerAuthority) {
@@ -2701,7 +2968,10 @@ class VelocityClient {
         }
         const marketIndex = order
             ? order.marketIndex
-            : userAccount.orders.find((order) => order.orderId === userAccount.nextOrderId - 1).marketIndex;
+            : (_a = userAccount.orders.find((order) => order.orderId === userAccount.nextOrderId - 1)) === null || _a === void 0 ? void 0 : _a.marketIndex;
+        if (marketIndex === undefined) {
+            throw new Error('No order found to fill');
+        }
         makerInfo = Array.isArray(makerInfo)
             ? makerInfo
             : makerInfo
@@ -2727,22 +2997,6 @@ class VelocityClient {
                 isSigner: false,
             });
         }
-        if (referrerInfo) {
-            const referrerIsMaker = makerInfo.find((maker) => maker.maker.equals(referrerInfo.referrer)) !==
-                undefined;
-            if (!referrerIsMaker) {
-                remainingAccounts.push({
-                    pubkey: referrerInfo.referrer,
-                    isWritable: true,
-                    isSigner: false,
-                });
-                remainingAccounts.push({
-                    pubkey: referrerInfo.referrerStats,
-                    isWritable: true,
-                    isSigner: false,
-                });
-            }
-        }
         let withBuilder = false;
         if (hasBuilderFee) {
             withBuilder = true;
@@ -2761,14 +3015,17 @@ class VelocityClient {
                 withBuilder = true;
             }
         }
-        if (withBuilder) {
-            remainingAccounts.push({
-                pubkey: (0, pda_1.getRevenueShareEscrowAccountPublicKey)(this.program.programId, userAccount.authority),
-                isWritable: true,
-                isSigner: false,
-            });
+        const takerEscrowMeta = this.getTakerEscrowAccountMeta(userAccount.authority, withBuilder, takerEscrow);
+        if (takerEscrowMeta) {
+            remainingAccounts.push(takerEscrowMeta);
+        }
+        let orderId = null;
+        if (!isSignedMsg) {
+            if (!order) {
+                throw new Error('order is required to fill a non-signedMsg order');
+            }
+            orderId = order.orderId;
         }
-        const orderId = isSignedMsg ? null : order.orderId;
         return await VelocityCore_1.VelocityCore.buildFillPerpOrderInstruction({
             program: this.program,
             orderId,
@@ -2802,14 +3059,14 @@ class VelocityClient {
     async getPlaceSpotOrderIx(_orderParams, _subAccountId, _overrides) {
         throw new Error(SPOT_DLOB_TRADING_DISABLED_MSG);
     }
-    async fillSpotOrder(_userAccountPublicKey, _user, _order, _fulfillmentConfig, _makerInfo, _referrerInfo, _txParams) {
+    async fillSpotOrder(_userAccountPublicKey, _user, _order, _fulfillmentConfig, _makerInfo, _txParams) {
         throw new Error(SPOT_DLOB_TRADING_DISABLED_MSG);
     }
-    async getFillSpotOrderIx(_userAccountPublicKey, _userAccount, _order, _fulfillmentConfig, _makerInfo, _referrerInfo, _fillerPublicKey) {
+    async getFillSpotOrderIx(_userAccountPublicKey, _userAccount, _order, _fulfillmentConfig, _makerInfo, _fillerPublicKey) {
         throw new Error(SPOT_DLOB_TRADING_DISABLED_MSG);
     }
     /**
-     * Swap tokens in drift account using titan or jupiter
+     * Swap tokens in velocity account using titan or jupiter
      * @param swapClient swap client to find routes and instructions (Titan or Jupiter)
      * @param jupiterClient @deprecated Use swapClient instead. Legacy parameter for backward compatibility
      * @param outMarketIndex the market index of the token you're buying
@@ -2820,7 +3077,7 @@ class VelocityClient {
      * @param slippageBps the max slippage passed to the swap provider api
      * @param swapMode swap provider swapMode (ExactIn or ExactOut), default is ExactIn
      * @param route the swap provider route to use for the swap
-     * @param reduceOnly specify if In or Out token on the drift account must reduceOnly, checked at end of swap
+     * @param reduceOnly specify if In or Out token on the velocity account must reduceOnly, checked at end of swap
      * @param v6 pass in the quote response from swap provider quote's API (deprecated, use quote instead)
      * @param quote pass in the quote response from swap provider quote's API
      * @param txParams
@@ -2886,13 +3143,12 @@ class VelocityClient {
         const lookupTables = res.lookupTables;
         const tx = (await this.buildTransaction(ixs, txParams, 0, lookupTables));
         const { txSig, slot } = await this.sendTransaction(tx);
-        this.spotMarketLastSlotCache.set(outMarketIndex, slot);
-        this.spotMarketLastSlotCache.set(inMarketIndex, slot);
+        this.cacheSpotMarketSlot(slot, outMarketIndex, inMarketIndex);
         return txSig;
     }
     async getTitanSwapIx({ titanClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, onlyDirectRoutes, reduceOnly, userAccountPublicKey, }) {
-        const outMarket = this.getSpotMarketAccount(outMarketIndex);
-        const inMarket = this.getSpotMarketAccount(inMarketIndex);
+        const outMarket = this.getSpotMarketAccountOrThrow(outMarketIndex);
+        const inMarket = this.getSpotMarketAccountOrThrow(inMarketIndex);
         const isExactOut = swapMode === 'ExactOut';
         const exactOutBufferedAmountIn = amount.muln(1001).divn(1000); // Add 10bp buffer
         const preInstructions = [];
@@ -2929,7 +3185,7 @@ class VelocityClient {
             slippageBps,
             swapMode: isExactOut ? titanClient_1.SwapMode.ExactOut : titanClient_1.SwapMode.ExactIn,
             onlyDirectRoutes,
-            sizeConstraint: utils_2.MAX_TX_BYTE_SIZE - 375, // buffer for drift instructions
+            sizeConstraint: utils_2.MAX_TX_BYTE_SIZE - 375, // buffer for velocity instructions
         });
         const titanInstructions = titanClient.getTitanInstructions({
             transactionMessage,
@@ -2945,8 +3201,8 @@ class VelocityClient {
         return { ixs, lookupTables };
     }
     async getJupiterSwapIxV6({ jupiterClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, onlyDirectRoutes, quote, reduceOnly, userAccountPublicKey, }) {
-        const outMarket = this.getSpotMarketAccount(outMarketIndex);
-        const inMarket = this.getSpotMarketAccount(inMarketIndex);
+        const outMarket = this.getSpotMarketAccountOrThrow(outMarketIndex);
+        const inMarket = this.getSpotMarketAccountOrThrow(inMarketIndex);
         if (!quote) {
             const fetchedQuote = await jupiterClient.getQuote({
                 inputMint: inMarket.mint,
@@ -3012,7 +3268,7 @@ class VelocityClient {
         return { ixs, lookupTables };
     }
     /**
-     * Get the drift begin_swap and end_swap instructions
+     * Get the velocity begin_swap and end_swap instructions
      *
      * @param outMarketIndex the market index of the token you're buying
      * @param inMarketIndex the market index of the token you're selling
@@ -3027,8 +3283,11 @@ class VelocityClient {
         const userAccountPublicKeyToUse = userAccountPublicKey || (await this.getUserAccountPublicKey());
         const userAccounts = [];
         try {
-            if (this.hasUser() && this.getUser().getUserAccountAndSlot()) {
-                userAccounts.push(this.getUser().getUserAccountAndSlot().data);
+            const userAccount = this.hasUser()
+                ? this.getUser().getUserAccount()
+                : undefined;
+            if (userAccount) {
+                userAccounts.push(userAccount);
             }
         }
         catch (err) {
@@ -3039,8 +3298,8 @@ class VelocityClient {
             writableSpotMarketIndexes: [outMarketIndex, inMarketIndex],
             readableSpotMarketIndexes: [numericConstants_1.QUOTE_SPOT_MARKET_INDEX],
         });
-        const outSpotMarket = this.getSpotMarketAccount(outMarketIndex);
-        const inSpotMarket = this.getSpotMarketAccount(inMarketIndex);
+        const outSpotMarket = this.getSpotMarketAccountOrThrow(outMarketIndex);
+        const inSpotMarket = this.getSpotMarketAccountOrThrow(inMarketIndex);
         const outTokenProgram = this.getTokenProgramForSpotMarket(outSpotMarket);
         const inTokenProgram = this.getTokenProgramForSpotMarket(inSpotMarket);
         if (!outTokenProgram.equals(inTokenProgram)) {
@@ -3079,7 +3338,7 @@ class VelocityClient {
                 inTokenAccount,
                 outTokenAccount,
                 tokenProgram: inTokenProgram,
-                driftSigner: this.getStateAccount().signer,
+                velocitySigner: this.getStateAccount().signer,
                 instructions: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
             },
             remainingAccounts,
@@ -3095,7 +3354,7 @@ class VelocityClient {
                 inTokenAccount,
                 outTokenAccount,
                 tokenProgram: inTokenProgram,
-                driftSigner: this.getStateAccount().signer,
+                velocitySigner: this.getStateAccount().signer,
                 instructions: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
             },
             remainingAccounts,
@@ -3104,8 +3363,8 @@ class VelocityClient {
     }
     async getSwapIxV2({ swapClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, onlyDirectRoutes, reduceOnly, quote, v6, userAccountPublicKey, }) {
         // Get market accounts to determine mints
-        const outMarket = this.getSpotMarketAccount(outMarketIndex);
-        const inMarket = this.getSpotMarketAccount(inMarketIndex);
+        const outMarket = this.getSpotMarketAccountOrThrow(outMarketIndex);
+        const inMarket = this.getSpotMarketAccountOrThrow(inMarketIndex);
         const isExactOut = swapMode === 'ExactOut';
         const preInstructions = [];
         // Handle token accounts if not provided
@@ -3141,7 +3400,7 @@ class VelocityClient {
         else {
             amountInForBeginSwap = amount;
         }
-        // Get drift swap instructions for begin and end
+        // Get velocity swap instructions for begin and end
         const { beginSwapIx, endSwapIx } = await this.getSwapIx({
             outMarketIndex,
             inMarketIndex,
@@ -3179,7 +3438,7 @@ class VelocityClient {
         return this.sendTransaction(tx);
     }
     async getStakeForMSOLIx({ amount, userAccountPublicKey, }) {
-        const wSOLMint = this.getSpotMarketAccount(1).mint;
+        const wSOLMint = this.getSpotMarketAccountOrThrow(1).mint;
         const mSOLAccount = await this.getAssociatedTokenAccount(2);
         const wSOLAccount = await this.getAssociatedTokenAccount(1, false);
         const wSOLAccountExists = await this.checkIfAccountExists(wSOLAccount);
@@ -3328,12 +3587,12 @@ class VelocityClient {
             remainingAccounts,
         });
     }
-    async placeAndTakePerpOrder(orderParams, makerInfo, referrerInfo, successCondition, auctionDurationPercentage, txParams, subAccountId) {
-        const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(await this.getPlaceAndTakePerpOrderIx(orderParams, makerInfo, referrerInfo, successCondition, auctionDurationPercentage, subAccountId), txParams), [], this.opts);
-        this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
+    async placeAndTakePerpOrder(orderParams, makerInfo, successCondition, auctionDurationPercentage, txParams, subAccountId, takerEscrow) {
+        const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(await this.getPlaceAndTakePerpOrderIx(orderParams, makerInfo, successCondition, auctionDurationPercentage, subAccountId, undefined, takerEscrow), txParams), [], this.opts);
+        this.cachePerpMarketSlot(slot, orderParams.marketIndex);
         return txSig;
     }
-    async preparePlaceAndTakePerpOrderWithAdditionalOrders(orderParams, makerInfo, referrerInfo, bracketOrdersParams = new Array(), txParams, subAccountId, cancelExistingOrders, settlePnl, exitEarlyIfSimFails, auctionDurationPercentage, optionalIxs, isolatedPositionDepositAmount) {
+    async preparePlaceAndTakePerpOrderWithAdditionalOrders(orderParams, makerInfo, bracketOrdersParams = new Array(), txParams, subAccountId, cancelExistingOrders, settlePnl, exitEarlyIfSimFails, auctionDurationPercentage, optionalIxs, isolatedPositionDepositAmount) {
         const placeAndTakeIxs = [];
         const txsToSign = {
             placeAndTakeTx: undefined,
@@ -3346,7 +3605,7 @@ class VelocityClient {
         let earlyExitFailedPlaceAndTakeSim = false;
         const prepPlaceAndTakeTx = async () => {
             var _a, _b;
-            const placeAndTakeIx = await this.getPlaceAndTakePerpOrderIx(orderParams, makerInfo, referrerInfo, undefined, auctionDurationPercentage, subAccountId);
+            const placeAndTakeIx = await this.getPlaceAndTakePerpOrderIx(orderParams, makerInfo, undefined, auctionDurationPercentage, subAccountId);
             if ((0, types_1.isVariant)(orderParams.marketType, 'perp') &&
                 ((_a = isolatedPositionDepositAmount === null || isolatedPositionDepositAmount === void 0 ? void 0 : isolatedPositionDepositAmount.gt) === null || _a === void 0 ? void 0 : _a.call(isolatedPositionDepositAmount, numericConstants_1.ZERO)) &&
                 this.isOrderIncreasingPosition(orderParams, subAccountId)) {
@@ -3368,6 +3627,9 @@ class VelocityClient {
                 useSimulatedComputeUnits: false,
             };
             if (shouldUseSimulationComputeUnits || shouldExitIfSimulationFails) {
+                if (!txParams) {
+                    throw new Error('txParams is required when simulating compute units or exiting early on failed simulation');
+                }
                 const placeAndTakeTxToSim = (await this.buildTransaction(placeAndTakeIxs, txParams, undefined, lookupTableAccounts, true, recentBlockHash, optionalIxs));
                 const simulationResult = await txParamProcessor_1.TransactionParamProcessor.getTxSimComputeUnits(placeAndTakeTxToSim, this.connection, (_b = txParams.computeUnitsBufferMultiplier) !== null && _b !== void 0 ? _b : 1.2, txParams.lowerBoundCu);
                 if (shouldExitIfSimulationFails && !simulationResult.success) {
@@ -3394,7 +3656,7 @@ class VelocityClient {
         const prepSettlePnlTx = async () => {
             if (settlePnl && (0, types_1.isVariant)(orderParams.marketType, 'perp')) {
                 const userAccountPublicKey = await this.getUserAccountPublicKey(subAccountId);
-                const settlePnlIx = await this.settlePNLIx(userAccountPublicKey, this.getUserAccount(subAccountId), orderParams.marketIndex);
+                const settlePnlIx = await this.settlePNLIx(userAccountPublicKey, this.getUserAccountOrThrow(subAccountId), orderParams.marketIndex);
                 txsToSign.settlePnlTx = await this.buildTransaction([settlePnlIx], txParams, this.txVersion, lookupTableAccounts, undefined, recentBlockHash, optionalIxs);
             }
             return;
@@ -3409,24 +3671,32 @@ class VelocityClient {
         }
         return txsToSign;
     }
-    async placeAndTakePerpWithAdditionalOrders(orderParams, makerInfo, referrerInfo, bracketOrdersParams = new Array(), txParams, subAccountId, cancelExistingOrders, settlePnl, exitEarlyIfSimFails) {
-        const txsToSign = await this.preparePlaceAndTakePerpOrderWithAdditionalOrders(orderParams, makerInfo, referrerInfo, bracketOrdersParams, txParams, subAccountId, cancelExistingOrders, settlePnl, exitEarlyIfSimFails);
+    async placeAndTakePerpWithAdditionalOrders(orderParams, makerInfo, bracketOrdersParams = new Array(), txParams, subAccountId, cancelExistingOrders, settlePnl, exitEarlyIfSimFails) {
+        const txsToSign = await this.preparePlaceAndTakePerpOrderWithAdditionalOrders(orderParams, makerInfo, bracketOrdersParams, txParams, subAccountId, cancelExistingOrders, settlePnl, exitEarlyIfSimFails);
         if (!txsToSign) {
             return null;
         }
         const signedTxs = (await this.txHandler.getSignedTransactionMap(txsToSign, 
         // @ts-ignore
         this.provider.wallet)).signedTxMap;
+        if (!signedTxs.placeAndTakeTx) {
+            throw new Error('placeAndTakeTx was not built');
+        }
         const { txSig, slot } = await this.sendTransaction(signedTxs.placeAndTakeTx, [], this.opts, true);
-        this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
+        this.cachePerpMarketSlot(slot, orderParams.marketIndex);
         return {
             txSig,
             signedCancelExistingOrdersTx: signedTxs.cancelExistingOrdersTx,
             signedSettlePnlTx: signedTxs.settlePnlTx,
         };
     }
-    async getPlaceAndTakePerpOrderIx(orderParams, makerInfo, referrerInfo, successCondition, auctionDurationPercentage, subAccountId, overrides) {
-        var _a;
+    async getPlaceAndTakePerpOrderIx(orderParams, makerInfo, successCondition, auctionDurationPercentage, subAccountId, overrides, 
+    // place_and_take fills the placing user's (the taker's) order in-instruction, so
+    // their RevenueShareEscrow must be attached for BOTH builder fees and referrer
+    // revenue share. The builder case is detected from orderParams; pass the user's
+    // decoded escrow (e.g. from a RevenueShareEscrowMap) to cover the referred case.
+    takerEscrow) {
+        var _a, _b, _c;
         orderParams = (0, orderParams_1.getOrderParams)(orderParams, { marketType: types_1.MarketType.PERP });
         const userStatsPublicKey = await this.getUserStatsAccountPublicKey();
         const user = await this.getUserAccountPublicKey(subAccountId);
@@ -3435,7 +3705,7 @@ class VelocityClient {
             : makerInfo
                 ? [makerInfo]
                 : [];
-        const userAccounts = [this.getUserAccount(subAccountId)];
+        const userAccounts = [this.getUserAccountOrThrow(subAccountId)];
         for (const maker of makerInfo) {
             userAccounts.push(maker.makerUserAccount);
         }
@@ -3456,28 +3726,16 @@ class VelocityClient {
                 isSigner: false,
             });
         }
-        if (referrerInfo) {
-            const referrerIsMaker = makerInfo.find((maker) => maker.maker.equals(referrerInfo.referrer)) !==
-                undefined;
-            if (!referrerIsMaker) {
-                remainingAccounts.push({
-                    pubkey: referrerInfo.referrer,
-                    isWritable: true,
-                    isSigner: false,
-                });
-                remainingAccounts.push({
-                    pubkey: referrerInfo.referrerStats,
-                    isWritable: true,
-                    isSigner: false,
-                });
-            }
+        const takerEscrowMeta = this.getTakerEscrowAccountMeta((_b = (_a = this.getUserAccount(subAccountId)) === null || _a === void 0 ? void 0 : _a.authority) !== null && _b !== void 0 ? _b : this.authority, (0, builder_1.hasBuilderParams)(orderParams), takerEscrow);
+        if (takerEscrowMeta) {
+            remainingAccounts.push(takerEscrowMeta);
         }
         let optionalParams = null;
         if (auctionDurationPercentage || successCondition) {
             optionalParams =
                 ((auctionDurationPercentage !== null && auctionDurationPercentage !== void 0 ? auctionDurationPercentage : 100) << 8) | (successCondition !== null && successCondition !== void 0 ? successCondition : 0);
         }
-        const authority = (_a = overrides === null || overrides === void 0 ? void 0 : overrides.authority) !== null && _a !== void 0 ? _a : this.wallet.publicKey;
+        const authority = (_c = overrides === null || overrides === void 0 ? void 0 : overrides.authority) !== null && _c !== void 0 ? _c : this.wallet.publicKey;
         return await VelocityCore_1.VelocityCore.buildPlaceAndTakePerpOrderInstruction({
             program: this.program,
             orderParams,
@@ -3489,42 +3747,32 @@ class VelocityClient {
             remainingAccounts,
         });
     }
-    async placeAndMakePerpOrder(orderParams, takerInfo, referrerInfo, txParams, subAccountId) {
-        const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(await this.getPlaceAndMakePerpOrderIx(orderParams, takerInfo, referrerInfo, subAccountId), txParams), [], this.opts);
-        this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
+    async placeAndMakePerpOrder(orderParams, takerInfo, txParams, subAccountId, takerEscrow) {
+        const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(await this.getPlaceAndMakePerpOrderIx(orderParams, takerInfo, subAccountId, takerEscrow), txParams), [], this.opts);
+        this.cachePerpMarketSlot(slot, orderParams.marketIndex);
         return txSig;
     }
-    async getPlaceAndMakePerpOrderIx(orderParams, takerInfo, referrerInfo, subAccountId) {
+    async getPlaceAndMakePerpOrderIx(orderParams, takerInfo, subAccountId, 
+    // place_and_make fills the taker's order in-instruction, so the TAKER's
+    // RevenueShareEscrow must be attached when their order has a builder or they
+    // are referred with an escrow. The builder case is detected from the taker
+    // order bitflags; pass the taker's decoded escrow to cover the referred case.
+    takerEscrow) {
         orderParams = (0, orderParams_1.getOrderParams)(orderParams, { marketType: types_1.MarketType.PERP });
         const userStatsPublicKey = this.getUserStatsAccountPublicKey();
         const user = await this.getUserAccountPublicKey(subAccountId);
         const remainingAccounts = this.getRemainingAccounts({
             userAccounts: [
-                this.getUserAccount(subAccountId),
+                this.getUserAccountOrThrow(subAccountId),
                 takerInfo.takerUserAccount,
             ],
             useMarketLastSlotCache: true,
             writablePerpMarketIndexes: [orderParams.marketIndex],
         });
-        if (referrerInfo) {
-            remainingAccounts.push({
-                pubkey: referrerInfo.referrer,
-                isWritable: true,
-                isSigner: false,
-            });
-            remainingAccounts.push({
-                pubkey: referrerInfo.referrerStats,
-                isWritable: true,
-                isSigner: false,
-            });
-        }
         const takerOrderId = takerInfo.order.orderId;
-        if ((0, orders_1.hasBuilder)(takerInfo.order)) {
-            remainingAccounts.push({
-                pubkey: (0, pda_1.getRevenueShareEscrowAccountPublicKey)(this.program.programId, takerInfo.takerUserAccount.authority),
-                isWritable: true,
-                isSigner: false,
-            });
+        const takerEscrowMeta = this.getTakerEscrowAccountMeta(takerInfo.takerUserAccount.authority, (0, orders_1.hasBuilder)(takerInfo.order), takerEscrow);
+        if (takerEscrowMeta) {
+            remainingAccounts.push(takerEscrowMeta);
         }
         return await VelocityCore_1.VelocityCore.buildPlaceAndMakePerpOrderInstruction({
             program: this.program,
@@ -3550,7 +3798,7 @@ class VelocityClient {
     /**
      * Builds a deposit and place request for Swift service
      *
-     * @param depositTx - The signed tx containing a drift deposit (e.g. see `buildSwiftDepositTx`)
+     * @param depositTx - The signed tx containing a velocity deposit (e.g. see `buildSwiftDepositTx`)
      * @param orderParamsMessage - The order parameters message to sign
      * @param delegateSigner - Whether this is a delegate signer
      *
@@ -3590,6 +3838,9 @@ class VelocityClient {
         });
     }
     signMessage(message, keypair = this.wallet.payer) {
+        if (!keypair) {
+            throw new Error('No keypair available to sign message');
+        }
         return Buffer.from(tweetnacl_1.default.sign.detached(message, keypair.secretKey));
     }
     async placeSignedMsgTakerOrder(signedSignedMsgOrderParams, marketIndex, takerInfo, precedingIxs = [], overrideCustomIxIndex, txParams) {
@@ -3611,8 +3862,7 @@ class VelocityClient {
             readablePerpMarketIndex: marketIndex,
             writableSpotMarketIndexes,
         });
-        if (signedMessage.builderFeeTenthBps !== null &&
-            signedMessage.builderIdx !== null) {
+        if ((0, builder_1.hasBuilderParams)(signedMessage)) {
             remainingAccounts.push({
                 pubkey: (0, pda_1.getRevenueShareEscrowAccountPublicKey)(this.program.programId, takerInfo.takerUserAccount.authority),
                 isWritable: true,
@@ -3641,47 +3891,35 @@ class VelocityClient {
         });
         return [signedMsgOrderParamsSignatureIx, placeTakerSignedMsgPerpOrderIx];
     }
-    async placeAndMakeSignedMsgPerpOrder(signedSignedMsgOrderParams, signedMsgOrderUuid, takerInfo, orderParams, referrerInfo, txParams, subAccountId, precedingIxs = [], overrideCustomIxIndex) {
-        const ixs = await this.getPlaceAndMakeSignedMsgPerpOrderIxs(signedSignedMsgOrderParams, signedMsgOrderUuid, takerInfo, orderParams, referrerInfo, subAccountId, precedingIxs, overrideCustomIxIndex);
+    async placeAndMakeSignedMsgPerpOrder(signedSignedMsgOrderParams, signedMsgOrderUuid, takerInfo, orderParams, txParams, subAccountId, precedingIxs = [], overrideCustomIxIndex, takerEscrow) {
+        const ixs = await this.getPlaceAndMakeSignedMsgPerpOrderIxs(signedSignedMsgOrderParams, signedMsgOrderUuid, takerInfo, orderParams, subAccountId, precedingIxs, overrideCustomIxIndex, takerEscrow);
         const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(ixs, txParams), [], this.opts);
-        this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
+        this.cachePerpMarketSlot(slot, orderParams.marketIndex);
         return txSig;
     }
-    async getPlaceAndMakeSignedMsgPerpOrderIxs(signedSignedMsgOrderParams, signedMsgOrderUuid, takerInfo, orderParams, referrerInfo, subAccountId, precedingIxs = [], overrideCustomIxIndex) {
+    async getPlaceAndMakeSignedMsgPerpOrderIxs(signedSignedMsgOrderParams, signedMsgOrderUuid, takerInfo, orderParams, subAccountId, precedingIxs = [], overrideCustomIxIndex, 
+    // fills the taker's order in-instruction; pass the taker's decoded escrow so a
+    // referred taker's escrow is attached even when the signed order carries no
+    // builder fee
+    takerEscrow) {
         const [signedMsgOrderSignatureIx, placeTakerSignedMsgPerpOrderIx] = await this.getPlaceSignedMsgTakerPerpOrderIxs(signedSignedMsgOrderParams, orderParams.marketIndex, takerInfo, precedingIxs, overrideCustomIxIndex);
         orderParams = (0, orderParams_1.getOrderParams)(orderParams, { marketType: types_1.MarketType.PERP });
         const userStatsPublicKey = this.getUserStatsAccountPublicKey();
         const user = await this.getUserAccountPublicKey(subAccountId);
         const remainingAccounts = this.getRemainingAccounts({
             userAccounts: [
-                this.getUserAccount(subAccountId),
+                this.getUserAccountOrThrow(subAccountId),
                 takerInfo.takerUserAccount,
             ],
             useMarketLastSlotCache: false,
             writablePerpMarketIndexes: [orderParams.marketIndex],
         });
-        if (referrerInfo) {
-            remainingAccounts.push({
-                pubkey: referrerInfo.referrer,
-                isWritable: true,
-                isSigner: false,
-            });
-            remainingAccounts.push({
-                pubkey: referrerInfo.referrerStats,
-                isWritable: true,
-                isSigner: false,
-            });
-        }
         const isDelegateSigner = takerInfo.signingAuthority.equals(takerInfo.takerUserAccount.delegate);
         const borshBuf = Buffer.from(signedSignedMsgOrderParams.orderParams.toString(), 'hex');
         const signedMessage = this.decodeSignedMsgOrderParamsMessage(borshBuf, isDelegateSigner);
-        if (signedMessage.builderFeeTenthBps !== null &&
-            signedMessage.builderIdx !== null) {
-            remainingAccounts.push({
-                pubkey: (0, pda_1.getRevenueShareEscrowAccountPublicKey)(this.program.programId, takerInfo.takerUserAccount.authority),
-                isWritable: true,
-                isSigner: false,
-            });
+        const takerEscrowMeta = this.getTakerEscrowAccountMeta(takerInfo.takerUserAccount.authority, (0, builder_1.hasBuilderParams)(signedMessage), takerEscrow);
+        if (takerEscrowMeta) {
+            remainingAccounts.push(takerEscrowMeta);
         }
         const placeAndMakeIx = await this.program.instruction.placeAndMakeSignedMsgPerpOrder(orderParams, signedMsgOrderUuid, {
             accounts: {
@@ -3701,19 +3939,19 @@ class VelocityClient {
             placeAndMakeIx,
         ];
     }
-    async preparePlaceAndTakeSpotOrder(_orderParams, _fulfillmentConfig, _makerInfo, _referrerInfo, _txParams, _subAccountId) {
+    async preparePlaceAndTakeSpotOrder(_orderParams, _fulfillmentConfig, _makerInfo, _txParams, _subAccountId) {
         throw new Error(SPOT_DLOB_TRADING_DISABLED_MSG);
     }
-    async placeAndTakeSpotOrder(_orderParams, _fulfillmentConfig, _makerInfo, _referrerInfo, _txParams, _subAccountId) {
+    async placeAndTakeSpotOrder(_orderParams, _fulfillmentConfig, _makerInfo, _txParams, _subAccountId) {
         throw new Error(SPOT_DLOB_TRADING_DISABLED_MSG);
     }
-    async getPlaceAndTakeSpotOrderIx(_orderParams, _fulfillmentConfig, _makerInfo, _referrerInfo, _subAccountId) {
+    async getPlaceAndTakeSpotOrderIx(_orderParams, _fulfillmentConfig, _makerInfo, _subAccountId) {
         throw new Error(SPOT_DLOB_TRADING_DISABLED_MSG);
     }
-    async placeAndMakeSpotOrder(_orderParams, _takerInfo, _fulfillmentConfig, _referrerInfo, _txParams, _subAccountId) {
+    async placeAndMakeSpotOrder(_orderParams, _takerInfo, _fulfillmentConfig, _txParams, _subAccountId) {
         throw new Error(SPOT_DLOB_TRADING_DISABLED_MSG);
     }
-    async getPlaceAndMakeSpotOrderIx(_orderParams, _takerInfo, _fulfillmentConfig, _referrerInfo, _subAccountId) {
+    async getPlaceAndMakeSpotOrderIx(_orderParams, _takerInfo, _fulfillmentConfig, _subAccountId) {
         throw new Error(SPOT_DLOB_TRADING_DISABLED_MSG);
     }
     /**
@@ -3731,7 +3969,7 @@ class VelocityClient {
             baseAssetAmount: userPosition.baseAssetAmount.abs(),
             reduceOnly: true,
             price: limitPrice,
-        }, undefined, undefined, undefined, undefined, undefined, subAccountId);
+        }, undefined, undefined, undefined, undefined, subAccountId);
     }
     /**
      * Modifies an open order by closing it and replacing it with a new order.
@@ -3796,9 +4034,13 @@ class VelocityClient {
      * @returns
      */
     async getModifyOrderIx({ orderId, newDirection, newBaseAmount, newLimitPrice, newOraclePriceOffset, newTriggerPrice, newTriggerCondition, auctionDuration, auctionStartPrice, auctionEndPrice, reduceOnly, postOnly, bitFlags, maxTs, policy, }, subAccountId, overrides) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e;
         const userPubKey = (_b = (_a = overrides === null || overrides === void 0 ? void 0 : overrides.user) === null || _a === void 0 ? void 0 : _a.getUserAccountPublicKey()) !== null && _b !== void 0 ? _b : (await this.getUserAccountPublicKey(subAccountId));
-        const userAccount = (_d = (_c = overrides === null || overrides === void 0 ? void 0 : overrides.user) === null || _c === void 0 ? void 0 : _c.getUserAccount()) !== null && _d !== void 0 ? _d : this.getUserAccount(subAccountId);
+        const overrideUserAccount = (_c = overrides === null || overrides === void 0 ? void 0 : overrides.user) === null || _c === void 0 ? void 0 : _c.getUserAccount();
+        if ((overrides === null || overrides === void 0 ? void 0 : overrides.user) && !overrideUserAccount) {
+            throw new Error('modifyOrder: override user account is not loaded');
+        }
+        const userAccount = overrideUserAccount !== null && overrideUserAccount !== void 0 ? overrideUserAccount : this.getUserAccountOrThrow(subAccountId);
         const remainingAccounts = this.getRemainingAccounts({
             userAccounts: [userAccount],
             useMarketLastSlotCache: true,
@@ -3819,7 +4061,7 @@ class VelocityClient {
             policy: policy || null,
             maxTs: maxTs || null,
         };
-        const authority = (_g = (_e = overrides === null || overrides === void 0 ? void 0 : overrides.authority) !== null && _e !== void 0 ? _e : (_f = overrides === null || overrides === void 0 ? void 0 : overrides.user) === null || _f === void 0 ? void 0 : _f.getUserAccount().authority) !== null && _g !== void 0 ? _g : this.wallet.publicKey;
+        const authority = (_e = (_d = overrides === null || overrides === void 0 ? void 0 : overrides.authority) !== null && _d !== void 0 ? _d : overrideUserAccount === null || overrideUserAccount === void 0 ? void 0 : overrideUserAccount.authority) !== null && _e !== void 0 ? _e : this.wallet.publicKey;
         return await VelocityCore_1.VelocityCore.buildModifyOrderInstruction({
             program: this.program,
             orderId,
@@ -3856,7 +4098,7 @@ class VelocityClient {
     async getModifyOrderByUserIdIx({ userOrderId, newDirection, newBaseAmount, newLimitPrice, newOraclePriceOffset, newTriggerPrice, newTriggerCondition, auctionDuration, auctionStartPrice, auctionEndPrice, reduceOnly, postOnly, bitFlags, maxTs, policy, }, subAccountId) {
         const user = await this.getUserAccountPublicKey(subAccountId);
         const remainingAccounts = this.getRemainingAccounts({
-            userAccounts: [this.getUserAccount(subAccountId)],
+            userAccounts: [this.getUserAccountOrThrow(subAccountId)],
             useMarketLastSlotCache: true,
         });
         const orderParams = {
@@ -3894,7 +4136,7 @@ class VelocityClient {
             : marketIndexes;
         if (filterInvalidMarkets) {
             for (const marketIndex of marketIndexes) {
-                const perpMarketAccount = this.getPerpMarketAccount(marketIndex);
+                const perpMarketAccount = this.getPerpMarketAccountOrThrow(marketIndex);
                 const oraclePriceData = this.getOracleDataForPerpMarket(marketIndex);
                 const stateAccountAndSlot = this.accountSubscriber.getStateAccountAndSlot();
                 const oracleGuardRails = stateAccountAndSlot.data.oracleGuardRails;
@@ -3968,7 +4210,7 @@ class VelocityClient {
                             isWritable: true,
                         });
                     }
-                    if (!escrow.referrer.equals(web3_js_1.PublicKey.default)) {
+                    if ((0, builder_1.escrowHasReferrer)(escrow)) {
                         this.addBuilderToRemainingAccounts([escrow.referrer], remainingAccounts);
                     }
                 }
@@ -4082,7 +4324,7 @@ class VelocityClient {
                         });
                     }
                     // Add referrer's User and RevenueShare accounts
-                    if (!escrow.referrer.equals(web3_js_1.PublicKey.default)) {
+                    if ((0, builder_1.escrowHasReferrer)(escrow)) {
                         this.addBuilderToRemainingAccounts([escrow.referrer], remainingAccounts);
                     }
                 }
@@ -4134,7 +4376,7 @@ class VelocityClient {
     }
     async liquidatePerp(userAccountPublicKey, userAccount, marketIndex, maxBaseAssetAmount, limitPrice, txParams, liquidatorSubAccountId) {
         const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(await this.getLiquidatePerpIx(userAccountPublicKey, userAccount, marketIndex, maxBaseAssetAmount, limitPrice, liquidatorSubAccountId), txParams), [], this.opts);
-        this.perpMarketLastSlotCache.set(marketIndex, slot);
+        this.cachePerpMarketSlot(slot, marketIndex);
         return txSig;
     }
     async getLiquidatePerpIx(userAccountPublicKey, userAccount, marketIndex, maxBaseAssetAmount, limitPrice, liquidatorSubAccountId) {
@@ -4142,7 +4384,10 @@ class VelocityClient {
         const liquidator = await this.getUserAccountPublicKey(liquidatorSubAccountId);
         const liquidatorStatsPublicKey = this.getUserStatsAccountPublicKey();
         const remainingAccounts = this.getRemainingAccounts({
-            userAccounts: [this.getUserAccount(liquidatorSubAccountId), userAccount],
+            userAccounts: [
+                this.getUserAccountOrThrow(liquidatorSubAccountId),
+                userAccount,
+            ],
             useMarketLastSlotCache: true,
             writablePerpMarketIndexes: [marketIndex],
         });
@@ -4162,7 +4407,7 @@ class VelocityClient {
     }
     async liquidatePerpWithFill(userAccountPublicKey, userAccount, marketIndex, makerInfos, txParams, liquidatorSubAccountId) {
         const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(await this.getLiquidatePerpWithFillIx(userAccountPublicKey, userAccount, marketIndex, makerInfos, liquidatorSubAccountId), txParams), [], this.opts);
-        this.perpMarketLastSlotCache.set(marketIndex, slot);
+        this.cachePerpMarketSlot(slot, marketIndex);
         return txSig;
     }
     async getLiquidatePerpWithFillIx(userAccountPublicKey, userAccount, marketIndex, makerInfos, liquidatorSubAccountId) {
@@ -4202,8 +4447,7 @@ class VelocityClient {
     }
     async liquidateSpot(userAccountPublicKey, userAccount, assetMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, limitPrice, txParams, liquidatorSubAccountId) {
         const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(await this.getLiquidateSpotIx(userAccountPublicKey, userAccount, assetMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, limitPrice, liquidatorSubAccountId), txParams), [], this.opts);
-        this.spotMarketLastSlotCache.set(assetMarketIndex, slot);
-        this.spotMarketLastSlotCache.set(liabilityMarketIndex, slot);
+        this.cacheSpotMarketSlot(slot, assetMarketIndex, liabilityMarketIndex);
         return txSig;
     }
     async getLiquidateSpotIx(userAccountPublicKey, userAccount, assetMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, limitPrice, liquidatorSubAccountId) {
@@ -4211,7 +4455,10 @@ class VelocityClient {
         const liquidator = await this.getUserAccountPublicKey(liquidatorSubAccountId);
         const liquidatorStatsPublicKey = this.getUserStatsAccountPublicKey();
         const remainingAccounts = this.getRemainingAccounts({
-            userAccounts: [this.getUserAccount(liquidatorSubAccountId), userAccount],
+            userAccounts: [
+                this.getUserAccountOrThrow(liquidatorSubAccountId),
+                userAccount,
+            ],
             useMarketLastSlotCache: true,
             writableSpotMarketIndexes: [liabilityMarketIndex, assetMarketIndex],
         });
@@ -4227,9 +4474,9 @@ class VelocityClient {
             remainingAccounts,
         });
     }
-    async getJupiterLiquidateSpotWithSwapIxV6({ jupiterClient, liabilityMarketIndex, assetMarketIndex, swapAmount, assetTokenAccount, liabilityTokenAccount, slippageBps, swapMode, onlyDirectRoutes, quote, userAccount, userAccountPublicKey, userStatsAccountPublicKey, liquidatorSubAccountId, maxAccounts, }) {
-        const liabilityMarket = this.getSpotMarketAccount(liabilityMarketIndex);
-        const assetMarket = this.getSpotMarketAccount(assetMarketIndex);
+    async getJupiterLiquidateSpotWithSwapIxV6({ jupiterClient, liabilityMarketIndex, assetMarketIndex, swapAmount, assetTokenAccount, liabilityTokenAccount, slippageBps, swapMode, onlyDirectRoutes, quote, userAccount, userAccountPublicKey, liquidatorSubAccountId, maxAccounts, }) {
+        const liabilityMarket = this.getSpotMarketAccountOrThrow(liabilityMarketIndex);
+        const assetMarket = this.getSpotMarketAccountOrThrow(assetMarketIndex);
         if (!quote) {
             const fetchedQuote = await jupiterClient.getQuote({
                 inputMint: assetMarket.mint,
@@ -4278,7 +4525,6 @@ class VelocityClient {
             liabilityTokenAccount,
             userAccount,
             userAccountPublicKey,
-            userStatsAccountPublicKey,
             liquidatorSubAccountId,
         });
         const ixs = [
@@ -4290,7 +4536,7 @@ class VelocityClient {
         return { ixs, lookupTables };
     }
     /**
-     * Get the drift liquidate_spot_with_swap instructions
+     * Get the velocity liquidate_spot_with_swap instructions
      *
      * @param liabilityMarketIndex the market index of the token you're buying
      * @param assetMarketIndex the market index of the token you're selling
@@ -4299,19 +4545,17 @@ class VelocityClient {
      * @param liabilityTokenAccount the token account to receive the tokens being bought
      * @param userAccount
      * @param userAccountPublicKey
-     * @param userStatsAccountPublicKey
      */
-    async getLiquidateSpotWithSwapIx({ liabilityMarketIndex, assetMarketIndex, swapAmount: swapAmount, assetTokenAccount, liabilityTokenAccount, userAccount, userAccountPublicKey, userStatsAccountPublicKey, liquidatorSubAccountId, }) {
+    async getLiquidateSpotWithSwapIx({ liabilityMarketIndex, assetMarketIndex, swapAmount: swapAmount, assetTokenAccount, liabilityTokenAccount, userAccount, userAccountPublicKey, liquidatorSubAccountId, }) {
         const liquidatorAccountPublicKey = await this.getUserAccountPublicKey(liquidatorSubAccountId);
-        const liquidatorStatsPublicKey = this.getUserStatsAccountPublicKey();
         const userAccounts = [userAccount];
         const remainingAccounts = this.getRemainingAccounts({
             userAccounts,
             writableSpotMarketIndexes: [liabilityMarketIndex, assetMarketIndex],
             readableSpotMarketIndexes: [numericConstants_1.QUOTE_SPOT_MARKET_INDEX],
         });
-        const liabilitySpotMarket = this.getSpotMarketAccount(liabilityMarketIndex);
-        const assetSpotMarket = this.getSpotMarketAccount(assetMarketIndex);
+        const liabilitySpotMarket = this.getSpotMarketAccountOrThrow(liabilityMarketIndex);
+        const assetSpotMarket = this.getSpotMarketAccountOrThrow(assetMarketIndex);
         const liabilityTokenProgram = this.getTokenProgramForSpotMarket(liabilitySpotMarket);
         const assetTokenProgram = this.getTokenProgramForSpotMarket(assetSpotMarket);
         if (!liabilityTokenProgram.equals(assetTokenProgram)) {
@@ -4344,16 +4588,14 @@ class VelocityClient {
             accounts: {
                 state: await this.getStatePublicKey(),
                 user: userAccountPublicKey,
-                userStats: userStatsAccountPublicKey,
                 liquidator: liquidatorAccountPublicKey,
-                liquidatorStats: liquidatorStatsPublicKey,
                 authority: this.wallet.publicKey,
                 liabilitySpotMarketVault: liabilitySpotMarket.vault,
                 assetSpotMarketVault: assetSpotMarket.vault,
                 assetTokenAccount: assetTokenAccount,
                 liabilityTokenAccount: liabilityTokenAccount,
                 tokenProgram: assetTokenProgram,
-                driftSigner: this.getStateAccount().signer,
+                velocitySigner: this.getStateAccount().signer,
                 instructions: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
             },
             remainingAccounts,
@@ -4362,74 +4604,14 @@ class VelocityClient {
             accounts: {
                 state: await this.getStatePublicKey(),
                 user: userAccountPublicKey,
-                userStats: userStatsAccountPublicKey,
                 liquidator: liquidatorAccountPublicKey,
-                liquidatorStats: liquidatorStatsPublicKey,
                 authority: this.wallet.publicKey,
                 liabilitySpotMarketVault: liabilitySpotMarket.vault,
                 assetSpotMarketVault: assetSpotMarket.vault,
                 assetTokenAccount: assetTokenAccount,
                 liabilityTokenAccount: liabilityTokenAccount,
                 tokenProgram: assetTokenProgram,
-                driftSigner: this.getStateAccount().signer,
-                instructions: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-            },
-            remainingAccounts,
-        });
-        return { beginSwapIx, endSwapIx };
-    }
-    async getInsuranceFundSwapIx({ inMarketIndex, outMarketIndex, amountIn, inTokenAccount, outTokenAccount, }) {
-        const remainingAccounts = await this.getRemainingAccounts({
-            userAccounts: [],
-            writableSpotMarketIndexes: [inMarketIndex, outMarketIndex],
-        });
-        const inSpotMarket = this.getSpotMarketAccount(inMarketIndex);
-        const outSpotMarket = this.getSpotMarketAccount(outMarketIndex);
-        if (this.isToken2022(inSpotMarket) || this.isToken2022(outSpotMarket)) {
-            remainingAccounts.push({
-                pubkey: inSpotMarket.mint,
-                isWritable: false,
-                isSigner: false,
-            });
-            remainingAccounts.push({
-                pubkey: outSpotMarket.mint,
-                isWritable: false,
-                isSigner: false,
-            });
-            if (this.isTransferHook(inSpotMarket)) {
-                this.addExtraAccountMetasToRemainingAccounts(inSpotMarket.mint, remainingAccounts);
-            }
-            if (this.isTransferHook(outSpotMarket)) {
-                this.addExtraAccountMetasToRemainingAccounts(outSpotMarket.mint, remainingAccounts);
-            }
-        }
-        const ifRebalanceConfig = (0, pda_1.getIfRebalanceConfigPublicKey)(this.program.programId, inMarketIndex, outMarketIndex);
-        const beginSwapIx = await this.program.instruction.beginInsuranceFundSwap(inMarketIndex, outMarketIndex, amountIn, {
-            accounts: {
-                state: await this.getStatePublicKey(),
-                authority: this.wallet.publicKey,
-                outInsuranceFundVault: outSpotMarket.insuranceFund.vault,
-                inInsuranceFundVault: inSpotMarket.insuranceFund.vault,
-                outTokenAccount,
-                inTokenAccount,
-                ifRebalanceConfig: ifRebalanceConfig,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                driftSigner: this.getStateAccount().signer,
-                instructions: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-            },
-            remainingAccounts,
-        });
-        const endSwapIx = await this.program.instruction.endInsuranceFundSwap(inMarketIndex, outMarketIndex, {
-            accounts: {
-                state: await this.getStatePublicKey(),
-                authority: this.wallet.publicKey,
-                outInsuranceFundVault: outSpotMarket.insuranceFund.vault,
-                inInsuranceFundVault: inSpotMarket.insuranceFund.vault,
-                outTokenAccount,
-                inTokenAccount,
-                ifRebalanceConfig: ifRebalanceConfig,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                driftSigner: this.getStateAccount().signer,
+                velocitySigner: this.getStateAccount().signer,
                 instructions: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
             },
             remainingAccounts,
@@ -4438,8 +4620,8 @@ class VelocityClient {
     }
     async liquidateBorrowForPerpPnl(userAccountPublicKey, userAccount, perpMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, limitPrice, txParams, liquidatorSubAccountId) {
         const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(await this.getLiquidateBorrowForPerpPnlIx(userAccountPublicKey, userAccount, perpMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, limitPrice, liquidatorSubAccountId), txParams), [], this.opts);
-        this.perpMarketLastSlotCache.set(perpMarketIndex, slot);
-        this.spotMarketLastSlotCache.set(liabilityMarketIndex, slot);
+        this.cachePerpMarketSlot(slot, perpMarketIndex);
+        this.cacheSpotMarketSlot(slot, liabilityMarketIndex);
         return txSig;
     }
     async getLiquidateBorrowForPerpPnlIx(userAccountPublicKey, userAccount, perpMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, limitPrice, liquidatorSubAccountId) {
@@ -4447,7 +4629,10 @@ class VelocityClient {
         const liquidator = await this.getUserAccountPublicKey(liquidatorSubAccountId);
         const liquidatorStatsPublicKey = this.getUserStatsAccountPublicKey();
         const remainingAccounts = this.getRemainingAccounts({
-            userAccounts: [this.getUserAccount(liquidatorSubAccountId), userAccount],
+            userAccounts: [
+                this.getUserAccountOrThrow(liquidatorSubAccountId),
+                userAccount,
+            ],
             writablePerpMarketIndexes: [perpMarketIndex],
             writableSpotMarketIndexes: [liabilityMarketIndex],
         });
@@ -4465,8 +4650,8 @@ class VelocityClient {
     }
     async liquidatePerpPnlForDeposit(userAccountPublicKey, userAccount, perpMarketIndex, assetMarketIndex, maxPnlTransfer, limitPrice, txParams, liquidatorSubAccountId) {
         const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(await this.getLiquidatePerpPnlForDepositIx(userAccountPublicKey, userAccount, perpMarketIndex, assetMarketIndex, maxPnlTransfer, limitPrice, liquidatorSubAccountId), txParams), [], this.opts);
-        this.perpMarketLastSlotCache.set(perpMarketIndex, slot);
-        this.spotMarketLastSlotCache.set(assetMarketIndex, slot);
+        this.cachePerpMarketSlot(slot, perpMarketIndex);
+        this.cacheSpotMarketSlot(slot, assetMarketIndex);
         return txSig;
     }
     async getLiquidatePerpPnlForDepositIx(userAccountPublicKey, userAccount, perpMarketIndex, assetMarketIndex, maxPnlTransfer, limitPrice, liquidatorSubAccountId) {
@@ -4474,7 +4659,10 @@ class VelocityClient {
         const liquidator = await this.getUserAccountPublicKey(liquidatorSubAccountId);
         const liquidatorStatsPublicKey = this.getUserStatsAccountPublicKey();
         const remainingAccounts = this.getRemainingAccounts({
-            userAccounts: [this.getUserAccount(liquidatorSubAccountId), userAccount],
+            userAccounts: [
+                this.getUserAccountOrThrow(liquidatorSubAccountId),
+                userAccount,
+            ],
             writablePerpMarketIndexes: [perpMarketIndex],
             writableSpotMarketIndexes: [assetMarketIndex],
         });
@@ -4499,7 +4687,10 @@ class VelocityClient {
         const liquidator = await this.getUserAccountPublicKey(liquidatorSubAccountId);
         const liquidatorStatsPublicKey = this.getUserStatsAccountPublicKey();
         const remainingAccounts = this.getRemainingAccounts({
-            userAccounts: [this.getUserAccount(liquidatorSubAccountId), userAccount],
+            userAccounts: [
+                this.getUserAccountOrThrow(liquidatorSubAccountId),
+                userAccount,
+            ],
             writablePerpMarketIndexes: [marketIndex],
             writableSpotMarketIndexes: [numericConstants_1.QUOTE_SPOT_MARKET_INDEX],
         });
@@ -4514,7 +4705,7 @@ class VelocityClient {
                 liquidatorStats: liquidatorStatsPublicKey,
                 spotMarketVault: spotMarket.vault,
                 insuranceFundVault: spotMarket.insuranceFund.vault,
-                driftSigner: this.getSignerPublicKey(),
+                velocitySigner: this.getSignerPublicKey(),
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             },
             remainingAccounts: remainingAccounts,
@@ -4529,10 +4720,13 @@ class VelocityClient {
         const liquidator = await this.getUserAccountPublicKey(liquidatorSubAccountId);
         const liquidatorStatsPublicKey = this.getUserStatsAccountPublicKey();
         const remainingAccounts = this.getRemainingAccounts({
-            userAccounts: [this.getUserAccount(liquidatorSubAccountId), userAccount],
+            userAccounts: [
+                this.getUserAccountOrThrow(liquidatorSubAccountId),
+                userAccount,
+            ],
             writableSpotMarketIndexes: [marketIndex],
         });
-        const spotMarket = this.getSpotMarketAccount(marketIndex);
+        const spotMarket = this.getSpotMarketAccountOrThrow(marketIndex);
         const tokenProgramId = this.getTokenProgramForSpotMarket(spotMarket);
         this.addTokenMintToRemainingAccounts(spotMarket, remainingAccounts);
         if (this.isTransferHook(spotMarket)) {
@@ -4548,7 +4742,7 @@ class VelocityClient {
                 liquidator,
                 spotMarketVault: spotMarket.vault,
                 insuranceFundVault: spotMarket.insuranceFund.vault,
-                driftSigner: this.getSignerPublicKey(),
+                velocitySigner: this.getSignerPublicKey(),
                 tokenProgram: tokenProgramId,
             },
             remainingAccounts: remainingAccounts,
@@ -4573,15 +4767,15 @@ class VelocityClient {
         return txSig;
     }
     async getUpdatePrelaunchOracleIx(perpMarketIndex) {
-        const perpMarket = this.getPerpMarketAccount(perpMarketIndex);
-        if (!(0, types_1.isVariant)(perpMarket.amm.oracleSource, 'prelaunch')) {
-            throw new Error(`Wrong oracle source ${perpMarket.amm.oracleSource}`);
+        const perpMarket = this.getPerpMarketAccountOrThrow(perpMarketIndex);
+        if (!(0, types_1.isVariant)(perpMarket.oracleSource, 'prelaunch')) {
+            throw new Error(`Wrong oracle source ${perpMarket.oracleSource}`);
         }
         return await this.program.instruction.updatePrelaunchOracle({
             accounts: {
                 state: await this.getStatePublicKey(),
                 perpMarket: perpMarket.pubkey,
-                oracle: perpMarket.amm.oracle,
+                oracle: perpMarket.oracle,
             },
         });
     }
@@ -4590,7 +4784,7 @@ class VelocityClient {
         return txSig;
     }
     async getUpdatePerpBidAskTwapIx(perpMarketIndex, makers) {
-        const perpMarket = this.getPerpMarketAccount(perpMarketIndex);
+        const perpMarket = this.getPerpMarketAccountOrThrow(perpMarketIndex);
         const remainingAccounts = [];
         for (const [maker, makerStats] of makers) {
             remainingAccounts.push({
@@ -4608,7 +4802,7 @@ class VelocityClient {
             accounts: {
                 state: await this.getStatePublicKey(),
                 perpMarket: perpMarket.pubkey,
-                oracle: perpMarket.amm.oracle,
+                oracle: perpMarket.oracle,
                 authority: this.wallet.publicKey,
                 keeperStats: this.getUserStatsAccountPublicKey(),
             },
@@ -4643,44 +4837,49 @@ class VelocityClient {
         this.eventEmitter.emit(eventName, data);
     }
     getOracleDataForPerpMarket(marketIndex) {
-        return this.accountSubscriber.getOraclePriceDataAndSlotForPerpMarket(marketIndex).data;
+        const oraclePriceDataAndSlot = this.accountSubscriber.getOraclePriceDataAndSlotForPerpMarket(marketIndex);
+        if (!oraclePriceDataAndSlot) {
+            throw new Error(`No oracle price data for perp market ${marketIndex}`);
+        }
+        return oraclePriceDataAndSlot.data;
     }
     getMMOracleDataForPerpMarket(marketIndex) {
-        const perpMarket = this.getPerpMarketAccount(marketIndex);
+        const perpMarket = this.getPerpMarketAccountOrThrow(marketIndex);
         const oracleData = this.getOracleDataForPerpMarket(marketIndex);
         const stateAccountAndSlot = this.accountSubscriber.getStateAccountAndSlot();
-        const isMMOracleActive = !perpMarket.amm.mmOracleSlot.eq(numericConstants_1.ZERO);
-        const pctDiff = perpMarket.amm.mmOraclePrice
+        const isMMOracleActive = !perpMarket.marketStats.mmOracleSlot.eq(numericConstants_1.ZERO);
+        const pctDiff = perpMarket.marketStats.mmOraclePrice
             .sub(oracleData.price)
             .abs()
             .mul(numericConstants_1.PERCENTAGE_PRECISION)
             .div(anchor_1.BN.max(oracleData.price, numericConstants_1.ONE));
-        const mmOracleSequenceId = perpMarket.amm.mmOracleSequenceId;
+        const mmOracleSequenceId = perpMarket.marketStats.mmOracleSequenceId;
         // Do slot check for recency if sequence ids are zero or they're too divergent
         const doSlotCheckForRecency = oracleData.sequenceId == null ||
             oracleData.sequenceId.eq(numericConstants_1.ZERO) ||
             mmOracleSequenceId.eq(numericConstants_1.ZERO) ||
             oracleData.sequenceId
-                .sub(perpMarket.amm.mmOracleSequenceId)
+                .sub(perpMarket.marketStats.mmOracleSequenceId)
                 .abs()
                 .gt(oracleData.sequenceId.div(new anchor_1.BN(10000)));
         let isExchangeOracleMoreRecent = true;
         if (doSlotCheckForRecency &&
-            oracleData.slot <= perpMarket.amm.mmOracleSlot) {
+            oracleData.slot.lte(perpMarket.marketStats.mmOracleSlot)) {
             isExchangeOracleMoreRecent = false;
         }
         else if (!doSlotCheckForRecency &&
-            oracleData.sequenceId < mmOracleSequenceId) {
+            oracleData.sequenceId != null &&
+            oracleData.sequenceId.lt(mmOracleSequenceId)) {
             isExchangeOracleMoreRecent = false;
         }
-        const conf = (0, utils_3.getOracleConfidenceFromMMOracleData)(perpMarket.amm.mmOraclePrice, oracleData);
-        if ((0, oracles_1.isOracleTooDivergent)(perpMarket.amm, {
-            price: perpMarket.amm.mmOraclePrice,
-            slot: perpMarket.amm.mmOracleSlot,
+        const conf = (0, utils_3.getOracleConfidenceFromMMOracleData)(perpMarket.marketStats.mmOraclePrice, oracleData);
+        if ((0, oracles_1.isOracleTooDivergent)(perpMarket.marketStats, {
+            price: perpMarket.marketStats.mmOraclePrice,
+            slot: perpMarket.marketStats.mmOracleSlot,
             confidence: conf,
             hasSufficientNumberOfDataPoints: true,
         }, stateAccountAndSlot.data.oracleGuardRails) ||
-            perpMarket.amm.mmOraclePrice.eq(numericConstants_1.ZERO) ||
+            perpMarket.marketStats.mmOraclePrice.eq(numericConstants_1.ZERO) ||
             isExchangeOracleMoreRecent ||
             pctDiff.gt(numericConstants_1.PERCENTAGE_PRECISION.divn(100)) // 1% threshold
         ) {
@@ -4688,8 +4887,8 @@ class VelocityClient {
         }
         else {
             return {
-                price: perpMarket.amm.mmOraclePrice,
-                slot: perpMarket.amm.mmOracleSlot,
+                price: perpMarket.marketStats.mmOraclePrice,
+                slot: perpMarket.marketStats.mmOracleSlot,
                 confidence: conf,
                 hasSufficientNumberOfDataPoints: true,
                 isMMOracleActive,
@@ -4697,7 +4896,11 @@ class VelocityClient {
         }
     }
     getOracleDataForSpotMarket(marketIndex) {
-        return this.accountSubscriber.getOraclePriceDataAndSlotForSpotMarket(marketIndex).data;
+        const oraclePriceDataAndSlot = this.accountSubscriber.getOraclePriceDataAndSlotForSpotMarket(marketIndex);
+        if (!oraclePriceDataAndSlot) {
+            throw new Error(`No oracle price data for spot market ${marketIndex}`);
+        }
+        return oraclePriceDataAndSlot.data;
     }
     async initializeInsuranceFundStake(marketIndex, txParams) {
         const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getInitializeInsuranceFundStakeIx(marketIndex), txParams), [], this.opts);
@@ -4707,7 +4910,7 @@ class VelocityClient {
         const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, this.wallet.publicKey, marketIndex);
         const accounts = {
             insuranceFundStake: ifStakeAccountPublicKey,
-            spotMarket: this.getSpotMarketAccount(marketIndex).pubkey,
+            spotMarket: this.getSpotMarketAccountOrThrow(marketIndex).pubkey,
             userStats: (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, this.wallet.publicKey // only allow payer to initialize own insurance fund stake account
             ),
             authority: this.wallet.publicKey,
@@ -4721,7 +4924,7 @@ class VelocityClient {
         });
     }
     async getAddInsuranceFundStakeIx(marketIndex, amount, collateralAccountPublicKey) {
-        const spotMarket = this.getSpotMarketAccount(marketIndex);
+        const spotMarket = this.getSpotMarketAccountOrThrow(marketIndex);
         const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, this.wallet.publicKey, marketIndex);
         const remainingAccounts = [];
         this.addTokenMintToRemainingAccounts(spotMarket, remainingAccounts);
@@ -4739,7 +4942,7 @@ class VelocityClient {
                 authority: this.wallet.publicKey,
                 spotMarketVault: spotMarket.vault,
                 insuranceFundVault: spotMarket.insuranceFund.vault,
-                driftSigner: this.getSignerPublicKey(),
+                velocitySigner: this.getSignerPublicKey(),
                 userTokenAccount: collateralAccountPublicKey,
                 tokenProgram,
             },
@@ -4768,7 +4971,7 @@ class VelocityClient {
      */
     async getAddInsuranceFundStakeIxs({ marketIndex, amount, collateralAccountPublicKey, initializeStakeAccount, fromSubaccount, }) {
         const addIfStakeIxs = [];
-        const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
+        const spotMarketAccount = this.getSpotMarketAccountOrThrow(marketIndex);
         const isSolMarket = spotMarketAccount.mint.equals(spotMarkets_1.WRAPPED_SOL_MINT);
         const createWSOLTokenAccount = isSolMarket && collateralAccountPublicKey.equals(this.wallet.publicKey);
         const tokenProgramId = this.getTokenProgramForSpotMarket(spotMarketAccount);
@@ -4806,7 +5009,7 @@ class VelocityClient {
         return addIfStakeIxs;
     }
     async requestRemoveInsuranceFundStake(marketIndex, amount, txParams) {
-        const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
+        const spotMarketAccount = this.getSpotMarketAccountOrThrow(marketIndex);
         const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, this.wallet.publicKey, marketIndex);
         const ix = await this.program.instruction.requestRemoveInsuranceFundStake(marketIndex, amount, {
             accounts: {
@@ -4824,7 +5027,7 @@ class VelocityClient {
         return txSig;
     }
     async cancelRequestRemoveInsuranceFundStake(marketIndex, txParams) {
-        const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
+        const spotMarketAccount = this.getSpotMarketAccountOrThrow(marketIndex);
         const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, this.wallet.publicKey, marketIndex);
         const ix = await this.program.instruction.cancelRequestRemoveInsuranceFundStake(marketIndex, {
             accounts: {
@@ -4843,7 +5046,7 @@ class VelocityClient {
     }
     async removeInsuranceFundStake(marketIndex, collateralAccountPublicKey, txParams) {
         const removeIfStakeIxs = [];
-        const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
+        const spotMarketAccount = this.getSpotMarketAccountOrThrow(marketIndex);
         const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, this.wallet.publicKey, marketIndex);
         const additionalSigners = [];
         const isSolMarket = spotMarketAccount.mint.equals(spotMarkets_1.WRAPPED_SOL_MINT);
@@ -4880,7 +5083,7 @@ class VelocityClient {
                 ),
                 authority: this.wallet.publicKey,
                 insuranceFundVault: spotMarketAccount.insuranceFund.vault,
-                driftSigner: this.getSignerPublicKey(),
+                velocitySigner: this.getSignerPublicKey(),
                 userTokenAccount: tokenAccount,
                 tokenProgram,
             },
@@ -4902,7 +5105,7 @@ class VelocityClient {
     }
     async getUpdateUserQuoteAssetInsuranceStakeIx(authority) {
         const marketIndex = numericConstants_1.QUOTE_SPOT_MARKET_INDEX;
-        const spotMarket = this.getSpotMarketAccount(marketIndex);
+        const spotMarket = this.getSpotMarketAccountOrThrow(marketIndex);
         const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, authority, marketIndex);
         const userStatsPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, authority);
         const ix = this.program.instruction.updateUserQuoteAssetInsuranceStake({
@@ -4917,36 +5120,13 @@ class VelocityClient {
         });
         return ix;
     }
-    async updateUserGovTokenInsuranceStake(authority, txParams) {
-        const ix = await this.getUpdateUserGovTokenInsuranceStakeIx(authority);
-        const tx = await this.buildTransaction(ix, txParams);
-        const { txSig } = await this.sendTransaction(tx, [], this.opts);
-        return txSig;
-    }
-    async getUpdateUserGovTokenInsuranceStakeIx(authority) {
-        const marketIndex = numericConstants_1.GOV_SPOT_MARKET_INDEX;
-        const spotMarket = this.getSpotMarketAccount(marketIndex);
-        const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, authority, marketIndex);
-        const userStatsPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, authority);
-        const ix = this.program.instruction.updateUserGovTokenInsuranceStake({
-            accounts: {
-                state: await this.getStatePublicKey(),
-                spotMarket: spotMarket.pubkey,
-                insuranceFundStake: ifStakeAccountPublicKey,
-                userStats: userStatsPublicKey,
-                signer: this.wallet.publicKey,
-                insuranceFundVault: spotMarket.insuranceFund.vault,
-            },
-        });
-        return ix;
-    }
     async settleRevenueToInsuranceFund(spotMarketIndex, txParams) {
         const tx = await this.buildTransaction(await this.getSettleRevenueToInsuranceFundIx(spotMarketIndex), txParams);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
     async getSettleRevenueToInsuranceFundIx(spotMarketIndex) {
-        const spotMarketAccount = this.getSpotMarketAccount(spotMarketIndex);
+        const spotMarketAccount = this.getSpotMarketAccountOrThrow(spotMarketIndex);
         const tokenProgramId = this.getTokenProgramForSpotMarket(spotMarketAccount);
         const remainingAccounts = [];
         this.addTokenMintToRemainingAccounts(spotMarketAccount, remainingAccounts);
@@ -4958,7 +5138,7 @@ class VelocityClient {
                 state: await this.getStatePublicKey(),
                 spotMarket: spotMarketAccount.pubkey,
                 spotMarketVault: spotMarketAccount.vault,
-                driftSigner: this.getSignerPublicKey(),
+                velocitySigner: this.getSignerPublicKey(),
                 insuranceFundVault: spotMarketAccount.insuranceFund.vault,
                 tokenProgram: tokenProgramId,
             },
@@ -4966,17 +5146,35 @@ class VelocityClient {
         });
         return ix;
     }
+    async sweepPerpMarketFees(perpMarketIndex, txParams) {
+        const tx = await this.buildTransaction(await this.getSweepPerpMarketFeesIx(perpMarketIndex), txParams);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
+    }
+    async getSweepPerpMarketFeesIx(perpMarketIndex) {
+        const perpMarketAccount = this.getPerpMarketAccountOrThrow(perpMarketIndex);
+        const spotMarketAccount = this.getSpotMarketAccountOrThrow(perpMarketAccount.quoteSpotMarketIndex);
+        const ix = await this.program.instruction.sweepPerpMarketFees(perpMarketIndex, {
+            accounts: {
+                state: await this.getStatePublicKey(),
+                perpMarket: perpMarketAccount.pubkey,
+                spotMarket: spotMarketAccount.pubkey,
+                oracle: perpMarketAccount.oracle,
+            },
+        });
+        return ix;
+    }
     async resolvePerpPnlDeficit(spotMarketIndex, perpMarketIndex, txParams) {
         const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getResolvePerpPnlDeficitIx(spotMarketIndex, perpMarketIndex), txParams), [], this.opts);
         return txSig;
     }
     async getResolvePerpPnlDeficitIx(spotMarketIndex, perpMarketIndex) {
         const remainingAccounts = this.getRemainingAccounts({
-            userAccounts: [this.getUserAccount()],
+            userAccounts: [],
             writablePerpMarketIndexes: [perpMarketIndex],
             writableSpotMarketIndexes: [spotMarketIndex],
         });
-        const spotMarket = this.getSpotMarketAccount(spotMarketIndex);
+        const spotMarket = this.getSpotMarketAccountOrThrow(spotMarketIndex);
         const tokenProgramId = this.getTokenProgramForSpotMarket(spotMarket);
         return await this.program.instruction.resolvePerpPnlDeficit(spotMarketIndex, perpMarketIndex, {
             accounts: {
@@ -4984,14 +5182,14 @@ class VelocityClient {
                 authority: this.wallet.publicKey,
                 spotMarketVault: spotMarket.vault,
                 insuranceFundVault: spotMarket.insuranceFund.vault,
-                driftSigner: this.getSignerPublicKey(),
+                velocitySigner: this.getSignerPublicKey(),
                 tokenProgram: tokenProgramId,
             },
             remainingAccounts: remainingAccounts,
         });
     }
     async getDepositIntoSpotMarketRevenuePoolIx(marketIndex, amount, userTokenAccountPublicKey) {
-        const spotMarket = await this.getSpotMarketAccount(marketIndex);
+        const spotMarket = await this.getSpotMarketAccountOrThrow(marketIndex);
         const remainingAccounts = [];
         this.addTokenMintToRemainingAccounts(spotMarket, remainingAccounts);
         if (this.isTransferHook(spotMarket)) {
@@ -5011,7 +5209,7 @@ class VelocityClient {
         return ix;
     }
     /**
-     * This ix will donate your funds to drift revenue pool. It does not deposit into your user account
+     * This ix will donate your funds to velocity revenue pool. It does not deposit into your user account
      * @param marketIndex
      * @param amount
      * @param userTokenAccountPublicKey
@@ -5025,11 +5223,11 @@ class VelocityClient {
     }
     getPerpMarketExtendedInfo(marketIndex) {
         var _a, _b;
-        const marketAccount = this.getPerpMarketAccount(marketIndex);
-        const quoteAccount = this.getSpotMarketAccount(numericConstants_1.QUOTE_SPOT_MARKET_INDEX);
+        const marketAccount = this.getPerpMarketAccountOrThrow(marketIndex);
+        const quoteAccount = this.getSpotMarketAccountOrThrow(numericConstants_1.QUOTE_SPOT_MARKET_INDEX);
         const extendedInfo = {
             marketIndex,
-            minOrderSize: (_a = marketAccount.amm) === null || _a === void 0 ? void 0 : _a.minOrderSize,
+            minOrderSize: (_a = marketAccount.marketStats) === null || _a === void 0 ? void 0 : _a.minOrderSize,
             marginMaintenance: marketAccount.marginRatioMaintenance,
             pnlPoolValue: (0, spotBalance_1.getTokenAmount)((_b = marketAccount.pnlPool) === null || _b === void 0 ? void 0 : _b.scaledBalance, quoteAccount, types_1.SpotBalanceType.DEPOSIT),
             contractTier: marketAccount.contractTier,
@@ -5057,12 +5255,12 @@ class VelocityClient {
         let takerFee = feeTier.feeNumerator / feeTier.feeDenominator;
         let makerFee = feeTier.makerRebateNumerator / feeTier.makerRebateDenominator;
         if (marketIndex !== undefined) {
-            let marketAccount = null;
+            let marketAccount;
             if ((0, types_1.isVariant)(marketType, 'perp')) {
-                marketAccount = this.getPerpMarketAccount(marketIndex);
+                marketAccount = this.getPerpMarketAccountOrThrow(marketIndex);
             }
             else {
-                marketAccount = this.getSpotMarketAccount(marketIndex);
+                marketAccount = this.getSpotMarketAccountOrThrow(marketIndex);
             }
             takerFee += (takerFee * marketAccount.feeAdjustment) / 100;
             makerFee += (makerFee * marketAccount.feeAdjustment) / 100;
@@ -5125,7 +5323,7 @@ class VelocityClient {
         return [verifyIx, ix];
     }
     async getPauseSpotMarketDepositWithdrawIx(spotMarketIndex) {
-        const spotMarket = await this.getSpotMarketAccount(spotMarketIndex);
+        const spotMarket = await this.getSpotMarketAccountOrThrow(spotMarketIndex);
         return this.program.instruction.pauseSpotMarketDepositWithdraw({
             accounts: {
                 state: await this.getStatePublicKey(),
@@ -5159,7 +5357,7 @@ class VelocityClient {
             programId: this.program.programId,
             keys: [
                 {
-                    pubkey: this.getPerpMarketAccount(marketIndex).pubkey,
+                    pubkey: this.getPerpMarketAccountOrThrow(marketIndex).pubkey,
                     isWritable: true,
                     isSigner: false,
                 },
@@ -5202,7 +5400,7 @@ class VelocityClient {
             programId: this.program.programId,
             keys: [
                 {
-                    pubkey: this.getPerpMarketAccount(marketIndex).pubkey,
+                    pubkey: this.getPerpMarketAccountOrThrow(marketIndex).pubkey,
                     isWritable: true,
                     isSigner: false,
                 },
@@ -5296,7 +5494,7 @@ class VelocityClient {
                 state: await this.getStatePublicKey(),
                 keeper: this.wallet.publicKey,
                 ammCache: (0, pda_1.getAmmCachePublicKey)(this.program.programId),
-                quoteMarket: this.getSpotMarketAccount(0).pubkey,
+                quoteMarket: this.getSpotMarketAccountOrThrow(0).pubkey,
             },
             remainingAccounts,
         });
@@ -5306,7 +5504,7 @@ class VelocityClient {
         return txSig;
     }
     async getUpdateConstituentOracleInfoIx(constituent) {
-        const spotMarket = this.getSpotMarketAccount(constituent.spotMarketIndex);
+        const spotMarket = this.getSpotMarketAccountOrThrow(constituent.spotMarketIndex);
         return this.program.instruction.updateConstituentOracleInfo({
             accounts: {
                 keeper: this.wallet.publicKey,
@@ -5328,12 +5526,12 @@ class VelocityClient {
         });
         const constituentInTokenAccount = (0, pda_1.getConstituentVaultPublicKey)(this.program.programId, lpPool, inMarketIndex);
         const constituentOutTokenAccount = (0, pda_1.getConstituentVaultPublicKey)(this.program.programId, lpPool, outMarketIndex);
-        const userInTokenAccount = await (0, spl_token_1.getAssociatedTokenAddress)(this.getSpotMarketAccount(inMarketIndex).mint, userAuthority);
-        const userOutTokenAccount = await (0, spl_token_1.getAssociatedTokenAddress)(this.getSpotMarketAccount(outMarketIndex).mint, userAuthority);
+        const userInTokenAccount = await (0, spl_token_1.getAssociatedTokenAddress)(this.getSpotMarketAccountOrThrow(inMarketIndex).mint, userAuthority);
+        const userOutTokenAccount = await (0, spl_token_1.getAssociatedTokenAddress)(this.getSpotMarketAccountOrThrow(outMarketIndex).mint, userAuthority);
         const inConstituent = (0, pda_1.getConstituentPublicKey)(this.program.programId, lpPool, inMarketIndex);
         const outConstituent = (0, pda_1.getConstituentPublicKey)(this.program.programId, lpPool, outMarketIndex);
-        const inMarketMint = this.getSpotMarketAccount(inMarketIndex).mint;
-        const outMarketMint = this.getSpotMarketAccount(outMarketIndex).mint;
+        const inMarketMint = this.getSpotMarketAccountOrThrow(inMarketIndex).mint;
+        const outMarketMint = this.getSpotMarketAccountOrThrow(outMarketIndex).mint;
         const constituentTargetBase = (0, pda_1.getConstituentTargetBasePublicKey)(this.program.programId, lpPool);
         return this.program.instruction.lpPoolSwap(inMarketIndex, outMarketIndex, inAmount, minOutAmount, {
             remainingAccounts,
@@ -5367,7 +5565,7 @@ class VelocityClient {
         return this.program.instruction.viewLpPoolSwapFees(inMarketIndex, outMarketIndex, inAmount, inTargetWeight, outTargetWeight, {
             remainingAccounts,
             accounts: {
-                driftSigner: this.getSignerPublicKey(),
+                velocitySigner: this.getSignerPublicKey(),
                 state: await this.getStatePublicKey(),
                 lpPool,
                 constituentTargetBase,
@@ -5405,7 +5603,7 @@ class VelocityClient {
             userAccounts: [],
             writableSpotMarketIndexes: [inMarketIndex],
         });
-        const spotMarket = this.getSpotMarketAccount(inMarketIndex);
+        const spotMarket = this.getSpotMarketAccountOrThrow(inMarketIndex);
         const inMarketMint = spotMarket.mint;
         const isSolMarket = inMarketMint.equals(spotMarkets_1.WRAPPED_SOL_MINT);
         let wSolTokenAccount;
@@ -5467,7 +5665,7 @@ class VelocityClient {
             userAccounts: [],
             readableSpotMarketIndexes: [inMarketIndex],
         });
-        const spotMarket = this.getSpotMarketAccount(inMarketIndex);
+        const spotMarket = this.getSpotMarketAccountOrThrow(inMarketIndex);
         const inMarketMint = spotMarket.mint;
         const inConstituent = (0, pda_1.getConstituentPublicKey)(this.program.programId, lpPool.pubkey, inMarketIndex);
         const lpMint = lpPool.mint;
@@ -5500,7 +5698,7 @@ class VelocityClient {
             userAccounts: [],
             writableSpotMarketIndexes: [outMarketIndex],
         });
-        const spotMarket = this.getSpotMarketAccount(outMarketIndex);
+        const spotMarket = this.getSpotMarketAccountOrThrow(outMarketIndex);
         const outMarketMint = spotMarket.mint;
         const outConstituent = (0, pda_1.getConstituentPublicKey)(this.program.programId, lpPool.pubkey, outMarketIndex);
         if (outMarketMint.equals(spotMarkets_1.WRAPPED_SOL_MINT)) {
@@ -5514,7 +5712,7 @@ class VelocityClient {
         ixs.push(this.program.instruction.lpPoolRemoveLiquidity(outMarketIndex, lpToBurn, minAmountOut, {
             remainingAccounts,
             accounts: {
-                driftSigner: this.getSignerPublicKey(),
+                velocitySigner: this.getSignerPublicKey(),
                 state: await this.getStatePublicKey(),
                 lpPool: lpPool.pubkey,
                 authority: this.wallet.publicKey,
@@ -5546,7 +5744,7 @@ class VelocityClient {
             userAccounts: [],
             writableSpotMarketIndexes: [outMarketIndex],
         });
-        const spotMarket = this.getSpotMarketAccount(outMarketIndex);
+        const spotMarket = this.getSpotMarketAccountOrThrow(outMarketIndex);
         const outMarketMint = spotMarket.mint;
         const outConstituent = (0, pda_1.getConstituentPublicKey)(this.program.programId, lpPool.pubkey, outMarketIndex);
         const lpMint = lpPool.mint;
@@ -5587,7 +5785,7 @@ class VelocityClient {
     async getAllLpPoolRemoveLiquidityIxs({ outMarketIndex, lpToBurn, minAmountOut, lpPool, }, constituentMap, includeUpdateConstituentOracleInfo = true, view = false) {
         const ixs = [];
         ixs.push(...(await this.getAllSettlePerpToLpPoolIxs(lpPool.lpPoolId, this.getPerpMarketAccounts()
-            .filter((marketAccount) => marketAccount.lpStatus > 0)
+            .filter((marketAccount) => marketAccount.hedgeConfig.status > 0)
             .map((marketAccount) => marketAccount.marketIndex))));
         ixs.push(...(await this.getAllUpdateLpPoolAumIxs(lpPool, constituentMap, includeUpdateConstituentOracleInfo)));
         if (view) {
@@ -5646,7 +5844,7 @@ class VelocityClient {
         const remainingAccounts = [];
         remainingAccounts.push(...perpMarketIndexes.map((index) => {
             return {
-                pubkey: this.getPerpMarketAccount(index).pubkey,
+                pubkey: this.getPerpMarketAccountOrThrow(index).pubkey,
                 isSigner: false,
                 isWritable: true,
             };
@@ -5655,7 +5853,7 @@ class VelocityClient {
         const lpPool = (0, pda_1.getLpPoolPublicKey)(this.program.programId, lpPoolId);
         return this.program.instruction.settlePerpToLpPool({
             accounts: {
-                driftSigner: this.getSignerPublicKey(),
+                velocitySigner: this.getSignerPublicKey(),
                 state: await this.getStatePublicKey(),
                 keeper: this.wallet.publicKey,
                 ammCache: (0, pda_1.getAmmCachePublicKey)(this.program.programId),
@@ -5760,7 +5958,7 @@ class VelocityClient {
         });
     }
     isOrderIncreasingPosition(orderParams, subAccountId) {
-        const userAccount = this.getUserAccount(subAccountId);
+        const userAccount = this.getUserAccountOrThrow(subAccountId);
         const perpPosition = userAccount.perpPositions.find((p) => p.marketIndex === orderParams.marketIndex);
         if (!perpPosition)
             return true;
@@ -5774,5 +5972,3 @@ class VelocityClient {
     }
 }
 exports.VelocityClient = VelocityClient;
-/** @deprecated Use `VelocityClient` instead. `DriftClient` will be removed in a future major. */
-exports.DriftClient = VelocityClient;