@velocity-exchange/sdk 0.0.5 → 0.1.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;
         this.users = new Map();
         this._isSubscribed = false;
         this.perpMarketLastSlotCache = new Map();
@@ -213,18 +213,18 @@ class VelocityClient {
             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,
+            const accountSubscriberClass = (_11 = (_10 = config.accountSubscription) === null || _10 === void 0 ? void 0 : _10.velocityClientAccountSubscriber) !== null && _11 !== void 0 ? _11 : grpcVelocityClientAccountSubscriber_1.grpcVelocityClientAccountSubscriber;
+            this.accountSubscriber = new accountSubscriberClass(config.accountSubscription.grpcConfigs, this.program, (_12 = config.perpMarketIndexes) !== null && _12 !== void 0 ? _12 : [], (_13 = config.spotMarketIndexes) !== null && _13 !== void 0 ? _13 : [], (_14 = config.oracleInfos) !== null && _14 !== void 0 ? _14 : [], noMarketsAndOraclesSpecified, delistedMarketSetting, {
+                resubTimeoutMs: (_15 = config.accountSubscription) === null || _15 === void 0 ? void 0 : _15.resubTimeoutMs,
+                logResubMessages: (_16 = config.accountSubscription) === null || _16 === void 0 ? void 0 : _16.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 = (_18 = (_17 = config.accountSubscription) === null || _17 === void 0 ? void 0 : _17.velocityClientAccountSubscriber) !== null && _18 !== void 0 ? _18 : webSocketVelocityClientAccountSubscriber_1.WebSocketVelocityClientAccountSubscriber;
+            this.accountSubscriber = new accountSubscriberClass(this.program, (_19 = config.perpMarketIndexes) !== null && _19 !== void 0 ? _19 : [], (_20 = config.spotMarketIndexes) !== null && _20 !== void 0 ? _20 : [], (_21 = config.oracleInfos) !== null && _21 !== void 0 ? _21 : [], noMarketsAndOraclesSpecified, delistedMarketSetting, {
+                resubTimeoutMs: (_22 = config.accountSubscription) === null || _22 === void 0 ? void 0 : _22.resubTimeoutMs,
+                logResubMessages: (_23 = config.accountSubscription) === null || _23 === void 0 ? void 0 : _23.logResubMessages,
+            }, (_24 = config.accountSubscription) === null || _24 === void 0 ? void 0 : _24.commitment);
         }
         this.eventEmitter = this.accountSubscriber.eventEmitter;
         this.metricsEventEmitter = new events_1.EventEmitter();
@@ -232,7 +232,7 @@ class VelocityClient {
             this.enableMetricsEvents = true;
         }
         this.txSender =
-            (_29 = config.txSender) !== null && _29 !== void 0 ? _29 : new retryTxSender_1.RetryTxSender({
+            (_25 = config.txSender) !== null && _25 !== void 0 ? _25 : new retryTxSender_1.RetryTxSender({
                 connection: this.connection,
                 wallet: this.wallet,
                 opts: this.opts,
@@ -393,7 +393,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
@@ -528,7 +528,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;
@@ -1013,6 +1013,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);
@@ -1219,7 +1232,7 @@ class VelocityClient {
                 userStats,
                 authority,
                 state: await this.getStatePublicKey(),
-                driftSigner: this.getSignerPublicKey(),
+                velocitySigner: this.getSignerPublicKey(),
                 keeper: this.wallet.publicKey,
             },
             remainingAccounts,
@@ -1380,7 +1393,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
@@ -1404,9 +1417,9 @@ class VelocityClient {
             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,
         });
@@ -1429,20 +1442,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) {
@@ -1914,7 +1934,7 @@ class VelocityClient {
             state: await this.getStatePublicKey(),
             spotMarket: spotMarketAccount.pubkey,
             spotMarketVault: spotMarketAccount.vault,
-            driftSigner: this.getSignerPublicKey(),
+            velocitySigner: this.getSignerPublicKey(),
             user,
             userStats: this.getUserStatsAccountPublicKey(),
             userTokenAccount,
@@ -1972,6 +1992,46 @@ class VelocityClient {
             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.spotMarketLastSlotCache.set(marketIndex, slot);
+        }
+        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);
+        if (this.users.has(userMapKey)) {
+            remainingAccounts = this.getRemainingAccounts({
+                userAccounts: [this.users.get(userMapKey).getUserAccount()],
+                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.getSpotMarketAccount(marketIndex).vault,
+            },
+            remainingAccounts,
+        });
+    }
     async transferPools(depositFromMarketIndex, depositToMarketIndex, borrowFromMarketIndex, borrowToMarketIndex, depositAmount, borrowAmount, fromSubAccountId, toSubAccountId, txParams) {
         const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(await this.getTransferPoolsIx(depositFromMarketIndex, depositToMarketIndex, borrowFromMarketIndex, borrowToMarketIndex, depositAmount, borrowAmount, fromSubAccountId, toSubAccountId), txParams), [], this.opts);
         if (fromSubAccountId === this.activeSubAccountId ||
@@ -2023,7 +2083,7 @@ class VelocityClient {
                 depositToSpotMarketVault: this.getSpotMarketAccount(depositToMarketIndex).vault,
                 borrowFromSpotMarketVault: this.getSpotMarketAccount(borrowFromMarketIndex).vault,
                 borrowToSpotMarketVault: this.getSpotMarketAccount(borrowToMarketIndex).vault,
-                driftSigner: this.getSignerPublicKey(),
+                velocitySigner: this.getSignerPublicKey(),
             },
             remainingAccounts,
         });
@@ -2193,7 +2253,7 @@ class VelocityClient {
                 authority: this.wallet.publicKey,
                 userTokenAccount: userTokenAccount,
                 tokenProgram: this.getTokenProgramForSpotMarket(spotMarketAccount),
-                driftSigner: this.getSignerPublicKey(),
+                velocitySigner: this.getSignerPublicKey(),
             },
             remainingAccounts,
         });
@@ -2223,13 +2283,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 +2323,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,8 +2344,8 @@ 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);
@@ -2307,6 +2367,48 @@ class VelocityClient {
         this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
         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;
@@ -2323,6 +2425,10 @@ class VelocityClient {
                 ? [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,
@@ -2348,7 +2454,7 @@ class VelocityClient {
                 isSigner: false,
             });
             oracleAccountInfos.push({
-                pubkey: market.amm.oracle,
+                pubkey: market.oracle,
                 isWritable: false,
                 isSigner: false,
             });
@@ -2439,7 +2545,7 @@ 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 oracle = this.getPerpMarketAccount(order.marketIndex).oracle;
         const remainingAccounts = this.getRemainingAccounts({
             userAccounts: [this.getUserAccount(subAccountId)],
             useMarketLastSlotCache: true,
@@ -2581,6 +2687,15 @@ class VelocityClient {
         });
         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,
@@ -2679,11 +2794,16 @@ 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) {
         const userStatsPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, userAccount.authority);
         let filler;
         if (fillerAuthority) {
@@ -2727,22 +2847,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,12 +2865,9 @@ 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);
         }
         const orderId = isSignedMsg ? null : order.orderId;
         return await VelocityCore_1.VelocityCore.buildFillPerpOrderInstruction({
@@ -2802,14 +2903,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 +2921,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
@@ -2929,7 +3030,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,
@@ -3012,7 +3113,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
@@ -3079,7 +3180,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 +3196,7 @@ class VelocityClient {
                 inTokenAccount,
                 outTokenAccount,
                 tokenProgram: inTokenProgram,
-                driftSigner: this.getStateAccount().signer,
+                velocitySigner: this.getStateAccount().signer,
                 instructions: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
             },
             remainingAccounts,
@@ -3141,7 +3242,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,
@@ -3328,12 +3429,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);
+    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.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
         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 +3447,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)) {
@@ -3409,8 +3510,8 @@ 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;
         }
@@ -3425,8 +3526,13 @@ class VelocityClient {
             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);
@@ -3456,28 +3562,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,12 +3583,17 @@ 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);
+    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.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
         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);
@@ -3506,25 +3605,10 @@ class VelocityClient {
             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 +3634,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
      *
@@ -3611,8 +3695,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,13 +3724,17 @@ 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);
         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();
@@ -3660,28 +3747,12 @@ class VelocityClient {
             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 +3772,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 +3802,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.
@@ -3968,7 +4039,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 +4153,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);
                     }
                 }
@@ -4227,7 +4298,7 @@ class VelocityClient {
             remainingAccounts,
         });
     }
-    async getJupiterLiquidateSpotWithSwapIxV6({ jupiterClient, liabilityMarketIndex, assetMarketIndex, swapAmount, assetTokenAccount, liabilityTokenAccount, slippageBps, swapMode, onlyDirectRoutes, quote, userAccount, userAccountPublicKey, userStatsAccountPublicKey, liquidatorSubAccountId, maxAccounts, }) {
+    async getJupiterLiquidateSpotWithSwapIxV6({ jupiterClient, liabilityMarketIndex, assetMarketIndex, swapAmount, assetTokenAccount, liabilityTokenAccount, slippageBps, swapMode, onlyDirectRoutes, quote, userAccount, userAccountPublicKey, liquidatorSubAccountId, maxAccounts, }) {
         const liabilityMarket = this.getSpotMarketAccount(liabilityMarketIndex);
         const assetMarket = this.getSpotMarketAccount(assetMarketIndex);
         if (!quote) {
@@ -4278,7 +4349,6 @@ class VelocityClient {
             liabilityTokenAccount,
             userAccount,
             userAccountPublicKey,
-            userStatsAccountPublicKey,
             liquidatorSubAccountId,
         });
         const ixs = [
@@ -4290,7 +4360,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,11 +4369,9 @@ 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,
@@ -4344,16 +4412,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,16 +4428,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,
@@ -4414,7 +4478,7 @@ class VelocityClient {
                 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,
@@ -4429,7 +4493,7 @@ class VelocityClient {
                 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,
@@ -4514,7 +4578,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,
@@ -4548,7 +4612,7 @@ class VelocityClient {
                 liquidator,
                 spotMarketVault: spotMarket.vault,
                 insuranceFundVault: spotMarket.insuranceFund.vault,
-                driftSigner: this.getSignerPublicKey(),
+                velocitySigner: this.getSignerPublicKey(),
                 tokenProgram: tokenProgramId,
             },
             remainingAccounts: remainingAccounts,
@@ -4574,14 +4638,14 @@ class VelocityClient {
     }
     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}`);
+        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,
             },
         });
     }
@@ -4608,7 +4672,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(),
             },
@@ -4649,38 +4713,38 @@ class VelocityClient {
         const perpMarket = this.getPerpMarketAccount(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 <= perpMarket.marketStats.mmOracleSlot) {
             isExchangeOracleMoreRecent = false;
         }
         else if (!doSlotCheckForRecency &&
             oracleData.sequenceId < 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 +4752,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,
@@ -4739,7 +4803,7 @@ class VelocityClient {
                 authority: this.wallet.publicKey,
                 spotMarketVault: spotMarket.vault,
                 insuranceFundVault: spotMarket.insuranceFund.vault,
-                driftSigner: this.getSignerPublicKey(),
+                velocitySigner: this.getSignerPublicKey(),
                 userTokenAccount: collateralAccountPublicKey,
                 tokenProgram,
             },
@@ -4880,7 +4944,7 @@ class VelocityClient {
                 ),
                 authority: this.wallet.publicKey,
                 insuranceFundVault: spotMarketAccount.insuranceFund.vault,
-                driftSigner: this.getSignerPublicKey(),
+                velocitySigner: this.getSignerPublicKey(),
                 userTokenAccount: tokenAccount,
                 tokenProgram,
             },
@@ -4958,7 +5022,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,
             },
@@ -4984,7 +5048,7 @@ class VelocityClient {
                 authority: this.wallet.publicKey,
                 spotMarketVault: spotMarket.vault,
                 insuranceFundVault: spotMarket.insuranceFund.vault,
-                driftSigner: this.getSignerPublicKey(),
+                velocitySigner: this.getSignerPublicKey(),
                 tokenProgram: tokenProgramId,
             },
             remainingAccounts: remainingAccounts,
@@ -5011,7 +5075,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
@@ -5029,7 +5093,7 @@ class VelocityClient {
         const quoteAccount = this.getSpotMarketAccount(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,
@@ -5367,7 +5431,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,
@@ -5514,7 +5578,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,
@@ -5587,7 +5651,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) {
@@ -5655,7 +5719,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),
@@ -5774,5 +5838,3 @@ class VelocityClient {
     }
 }
 exports.VelocityClient = VelocityClient;
-/** @deprecated Use `VelocityClient` instead. `DriftClient` will be removed in a future major. */
-exports.DriftClient = VelocityClient;