@velocity-exchange/sdk 0.0.5 → 0.1.0

package/lib/browser/types.d.ts

@@ -2,14 +2,14 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /**
- * Shared TypeScript types for the Drift SDK.
+ * Shared TypeScript types for the Velocity SDK.
  *
  * Contains TypeScript mirrors of all on-chain account structs (UserAccount, PerpMarketAccount,
  * SpotMarketAccount, StateAccount, OracleData, etc.), instruction parameter types (OrderParams,
  * ModifyOrderParams), enums (MarketType, OrderType, PositionDirection, OracleSource), and
  * precision constants used throughout the SDK.
  *
- * The authoritative layout source is `sdk/src/idl/drift.json` (generated from the program).
+ * The authoritative layout source is `sdk/src/idl/velocity.json` (generated from the program).
  * Do not edit struct shapes here without a corresponding on-chain change.
  */
 import { Keypair, PublicKey, Transaction, TransactionVersion, VersionedTransaction } from '@solana/web3.js';
@@ -477,9 +477,8 @@ export type SpotInterestRecord = {
     optimalBorrowRate: number;
     maxBorrowRate: number;
 };
-export type CurveRecord = {
+export type AmmCurveChanged = {
     ts: BN;
-    recordId: BN;
     marketIndex: number;
     pegMultiplierBefore: BN;
     baseAssetReserveBefore: BN;
@@ -489,15 +488,9 @@ export type CurveRecord = {
     baseAssetReserveAfter: BN;
     quoteAssetReserveAfter: BN;
     sqrtKAfter: BN;
-    baseAssetAmountLong: BN;
-    baseAssetAmountShort: BN;
-    baseAssetAmountWithAmm: BN;
-    totalFee: BN;
-    totalFeeMinusDistributions: BN;
     adjustmentCost: BN;
-    numberOfUsers: BN;
+    totalFeeMinusDistributionsAfter: BN;
     oraclePrice: BN;
-    fillRecord: BN;
 };
 export declare type InsuranceFundRecord = {
     ts: BN;
@@ -536,7 +529,6 @@ export type FundingRateRecord = {
     cumulativeFundingRateShort: BN;
     oraclePriceTwap: BN;
     markPriceTwap: BN;
-    periodRevenue: BN;
     baseAssetAmountWithAmm: BN;
 };
 export type FundingPaymentRecord = {
@@ -882,13 +874,13 @@ export type PerpMarketAccount = {
     pubkey: PublicKey;
     name: number[];
     amm: AMM;
+    marketStats: MarketStats;
     numberOfUsersWithBase: number;
     numberOfUsers: number;
     marginRatioInitial: number;
     marginRatioMaintenance: number;
     nextFillRecordId: BN;
     nextFundingRateRecordId: BN;
-    nextCurveRecordId: BN;
     pnlPool: PoolBalance;
     liquidatorFee: number;
     ifLiquidationFee: number;
@@ -908,12 +900,39 @@ export type PerpMarketAccount = {
     feeAdjustment: number;
     pausedOperations: number;
     lastFillPrice: BN;
-    lpPoolId: number;
-    lpFeeTransferScalar: number;
-    lpExchangeFeeExcluscionScalar: number;
-    lpStatus: number;
-    lpPausedOperations: number;
+    hedgeConfig: {
+        poolId: number;
+        status: number;
+        pausedOperations: number;
+        exchangeFeeExclusionScalar: number;
+        feeTransferScalar: number;
+    };
     marketConfig: number;
+    oracle: PublicKey;
+    oracleSource: OracleSource;
+    oracleSlotDelayOverride: number;
+    oracleLowRiskSlotDelayOverride: number;
+    baseAssetAmountLong: BN;
+    baseAssetAmountShort: BN;
+    quoteAssetAmount: BN;
+    quoteEntryAmountLong: BN;
+    quoteEntryAmountShort: BN;
+    quoteBreakEvenAmountLong: BN;
+    quoteBreakEvenAmountShort: BN;
+    totalSocialLoss: BN;
+    maxOpenInterest: BN;
+    totalExchangeFee: BN;
+    totalLiquidationFee: BN;
+    cumulativeFundingRateLong: BN;
+    cumulativeFundingRateShort: BN;
+    lastFundingRate: BN;
+    lastFundingRateLong: BN;
+    lastFundingRateShort: BN;
+    lastFundingRateTs: BN;
+    netUnsettledFundingPnl: BN;
+    lastFundingOracleTwap: BN;
+    orderStepSize: BN;
+    orderTickSize: BN;
 };
 export type HistoricalOracleData = {
     lastOraclePrice: BN;
@@ -1003,86 +1022,57 @@ export type PoolBalance = {
     marketIndex: number;
 };
 export type AMM = {
+    feePool: PoolBalance;
     baseAssetReserve: BN;
-    sqrtK: BN;
-    cumulativeFundingRate: BN;
-    lastFundingRate: BN;
-    lastFundingRateTs: BN;
-    lastMarkPriceTwap: BN;
-    lastMarkPriceTwap5Min: BN;
-    lastMarkPriceTwapTs: BN;
-    lastTradeTs: BN;
-    oracle: PublicKey;
-    oracleSource: OracleSource;
-    historicalOracleData: HistoricalOracleData;
-    lastOracleReservePriceSpreadPct: BN;
-    lastOracleConfPct: BN;
-    fundingPeriod: BN;
     quoteAssetReserve: BN;
+    concentrationCoef: BN;
+    minBaseAssetReserve: BN;
+    maxBaseAssetReserve: BN;
+    sqrtK: BN;
     pegMultiplier: BN;
-    cumulativeFundingRateLong: BN;
-    cumulativeFundingRateShort: BN;
-    last24HAvgFundingRate: BN;
-    lastFundingRateShort: BN;
-    lastFundingRateLong: BN;
-    totalLiquidationFee: BN;
+    terminalQuoteAssetReserve: BN;
+    baseAssetAmountWithAmm: BN;
+    totalFee: BN;
+    totalMmFee: BN;
     totalFeeMinusDistributions: BN;
     totalFeeWithdrawn: BN;
-    totalFee: BN;
-    mmOracleSequenceId: BN;
-    orderStepSize: BN;
-    orderTickSize: BN;
+    lastUpdateSlot: BN;
+    netRevenueSinceLastFunding: BN;
+    lastCumulativeFundingRateLong: BN;
+    lastCumulativeFundingRateShort: BN;
+    baseSpread: number;
+    maxSpread: number;
     maxFillReserveFraction: number;
     maxSlippageRatio: number;
-    baseSpread: number;
     curveUpdateIntensity: number;
-    baseAssetAmountWithAmm: BN;
-    baseAssetAmountLong: BN;
-    baseAssetAmountShort: BN;
-    quoteAssetAmount: BN;
-    terminalQuoteAssetReserve: BN;
-    concentrationCoef: BN;
-    feePool: PoolBalance;
-    totalExchangeFee: BN;
-    totalMmFee: BN;
-    netRevenueSinceLastFunding: BN;
-    lastUpdateSlot: BN;
-    lastOracleNormalisedPrice: BN;
-    lastOracleValid: boolean;
+    ammJitIntensity: number;
+    ammSpreadAdjustment: number;
+    ammInventorySpreadAdjustment: number;
+    referencePriceOffsetDeadbandPct: number;
+};
+export type MarketStats = {
+    lastMarkPriceTwap: BN;
+    lastMarkPriceTwap5Min: BN;
+    lastMarkPriceTwapTs: BN;
     lastBidPriceTwap: BN;
     lastAskPriceTwap: BN;
-    longSpread: number;
-    shortSpread: number;
-    maxSpread: number;
-    ammJitIntensity: number;
-    maxOpenInterest: BN;
-    maxBaseAssetReserve: BN;
-    minBaseAssetReserve: BN;
-    totalSocialLoss: BN;
-    quoteBreakEvenAmountLong: BN;
-    quoteBreakEvenAmountShort: BN;
-    quoteEntryAmountLong: BN;
-    quoteEntryAmountShort: BN;
     markStd: BN;
     oracleStd: BN;
+    lastOracleConfPct: BN;
+    volume24H: BN;
     longIntensityVolume: BN;
     shortIntensityVolume: BN;
-    volume24H: BN;
+    lastTradeTs: BN;
+    last24HAvgFundingRate: BN;
+    fundingPeriod: BN;
     minOrderSize: BN;
     mmOraclePrice: BN;
     mmOracleSlot: BN;
-    bidBaseAssetReserve: BN;
-    bidQuoteAssetReserve: BN;
-    askBaseAssetReserve: BN;
-    askQuoteAssetReserve: BN;
-    netUnsettledFundingPnl: BN;
-    referencePriceOffset: number;
-    oracleLowRiskSlotDelayOverride: number;
-    oracleSlotDelayOverride: number;
-    ammSpreadAdjustment: number;
-    ammInventorySpreadAdjustment: number;
-    lastFundingOracleTwap: BN;
-    referencePriceOffsetDeadbandPct: number;
+    mmOracleSequenceId: BN;
+    lastOracleNormalisedPrice: BN;
+    lastReferencePriceOffset: number;
+    lastOracleValid: boolean;
+    historicalOracleData: HistoricalOracleData;
 };
 export type PerpPosition = {
     baseAssetAmount: BN;
@@ -1115,14 +1105,13 @@ export type UserStatsAccount = {
         totalFeeRebate: BN;
         totalTokenDiscount: BN;
         totalRefereeDiscount: BN;
-        totalReferrerReward: BN;
-        current_epoch_referrer_reward: BN;
     };
     referrer: PublicKey;
     referrerStatus: number;
     authority: PublicKey;
     ifStakedQuoteAssetAmount: BN;
     ifStakedGovTokenAmount: BN;
+    delegatePermissions: number;
 };
 export type UserAccount = {
     authority: PublicKey;
@@ -1208,6 +1197,10 @@ export type OrderParams = {
     maxTs: BN | null;
     auctionStartPrice: BN | null;
     auctionEndPrice: BN | null;
+    /** index into the placing user's RevenueShareEscrow.approved_builders list (non-swift builder codes) */
+    builderIdx?: number | null;
+    /** builder fee on this order, in tenths of a bps, e.g. 100 = 0.01% */
+    builderFeeTenthBps?: number | null;
 };
 export declare class PostOnlyParams {
     static readonly NONE: {
@@ -1336,7 +1329,9 @@ export type ReferrerInfo = {
 };
 export declare enum ReferrerStatus {
     IsReferrer = 1,
-    IsReferred = 2
+    IsReferred = 2,
+    /** set when the user's RevenueShareEscrow was initialized with a referrer */
+    BuilderReferral = 4
 }
 export declare enum PlaceAndTakeOrderSuccessCondition {
     PartialFill = 1,
@@ -1485,9 +1480,6 @@ export interface VelocityClientMetricsEvents {
     txSigned: SignedTxData[];
     preTxSigned: void;
 }
-/** @deprecated Use `VelocityClientMetricsEvents` instead. `DriftClientMetricsEvents` will be removed in a future major. */
-export interface DriftClientMetricsEvents extends VelocityClientMetricsEvents {
-}
 export type SignedTxData = {
     txSig: string;
     signedTx: Transaction | VersionedTransaction;
@@ -1548,10 +1540,6 @@ export type RevenueShareAccount = {
 export type RevenueShareEscrowAccount = {
     authority: PublicKey;
     referrer: PublicKey;
-    referrerBoostExpireTs: number;
-    referrerRewardOffset: number;
-    refereeFeeNumeratorOffset: number;
-    referrerBoostNumerator: number;
     reservedFixed: number[];
     orders: RevenueShareOrder[];
     approvedBuilders: BuilderInfo[];

package/lib/browser/types.js

@@ -381,11 +381,15 @@ exports.DefaultOrderParams = {
     maxTs: null,
     auctionStartPrice: null,
     auctionEndPrice: null,
+    builderIdx: null,
+    builderFeeTenthBps: null,
 };
 var ReferrerStatus;
 (function (ReferrerStatus) {
     ReferrerStatus[ReferrerStatus["IsReferrer"] = 1] = "IsReferrer";
     ReferrerStatus[ReferrerStatus["IsReferred"] = 2] = "IsReferred";
+    /** set when the user's RevenueShareEscrow was initialized with a referrer */
+    ReferrerStatus[ReferrerStatus["BuilderReferral"] = 4] = "BuilderReferral";
 })(ReferrerStatus || (exports.ReferrerStatus = ReferrerStatus = {}));
 var PlaceAndTakeOrderSuccessCondition;
 (function (PlaceAndTakeOrderSuccessCondition) {

package/lib/browser/user.d.ts

@@ -4,7 +4,7 @@
  * User — read-oriented abstraction over the on-chain `User` account.
  *
  * Responsibilities:
- *   - Margin and free-collateral calculations (mirrors `programs/drift/src/math/margin.rs`).
+ *   - Margin and free-collateral calculations (mirrors `programs/velocity/src/math/margin.rs`).
  *   - Position accessors: perp positions, spot positions, unrealized PnL, leverage.
  *   - Open order queries and filtering.
  *   - Health factor and liquidation threshold checks.
@@ -28,8 +28,6 @@ import { IsolatedMarginCalculation, MarginCalculation } from './marginCalculatio
 export type MarginType = 'Cross' | 'Isolated';
 export declare class User {
     velocityClient: VelocityClient;
-    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
-    get driftClient(): VelocityClient;
     userAccountPublicKey: PublicKey;
     accountSubscriber: UserAccountSubscriber;
     _isSubscribed: boolean;

package/lib/browser/user.js

@@ -27,10 +27,6 @@ const strictOraclePrice_1 = require("./oracles/strictOraclePrice");
 const grpcUserAccountSubscriber_1 = require("./accounts/grpcUserAccountSubscriber");
 const marginCalculation_1 = require("./marginCalculation");
 class User {
-    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
-    get driftClient() {
-        return this.velocityClient;
-    }
     get isSubscribed() {
         return this._isSubscribed && this.accountSubscriber.isSubscribed;
     }
@@ -38,40 +34,40 @@ class User {
         this._isSubscribed = val;
     }
     constructor(config) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         this._isSubscribed = false;
         // Type-system guarantees at least one of the two is supplied.
-        const velocityClient = ((_a = config.velocityClient) !== null && _a !== void 0 ? _a : config.driftClient);
+        const velocityClient = config.velocityClient;
         this.velocityClient = velocityClient;
         this.userAccountPublicKey = config.userAccountPublicKey;
-        if (((_b = config.accountSubscription) === null || _b === void 0 ? void 0 : _b.type) === 'polling') {
+        if (((_a = config.accountSubscription) === null || _a === void 0 ? void 0 : _a.type) === 'polling') {
             this.accountSubscriber = new pollingUserAccountSubscriber_1.PollingUserAccountSubscriber(velocityClient.connection, config.userAccountPublicKey, config.accountSubscription.accountLoader, this.velocityClient.program.account.user.coder.accounts.decodeUnchecked.bind(this.velocityClient.program.account.user.coder.accounts));
         }
-        else if (((_c = config.accountSubscription) === null || _c === void 0 ? void 0 : _c.type) === 'custom') {
+        else if (((_b = config.accountSubscription) === null || _b === void 0 ? void 0 : _b.type) === 'custom') {
             this.accountSubscriber = config.accountSubscription.userAccountSubscriber;
         }
-        else if (((_d = config.accountSubscription) === null || _d === void 0 ? void 0 : _d.type) === 'grpc') {
+        else if (((_c = config.accountSubscription) === null || _c === void 0 ? void 0 : _c.type) === 'grpc') {
             if (config.accountSubscription.grpcMultiUserAccountSubscriber) {
                 this.accountSubscriber =
                     config.accountSubscription.grpcMultiUserAccountSubscriber.forUser(config.userAccountPublicKey);
             }
             else {
                 this.accountSubscriber = new grpcUserAccountSubscriber_1.grpcUserAccountSubscriber(config.accountSubscription.grpcConfigs, velocityClient.program, config.userAccountPublicKey, {
-                    resubTimeoutMs: (_e = config.accountSubscription) === null || _e === void 0 ? void 0 : _e.resubTimeoutMs,
-                    logResubMessages: (_f = config.accountSubscription) === null || _f === void 0 ? void 0 : _f.logResubMessages,
+                    resubTimeoutMs: (_d = config.accountSubscription) === null || _d === void 0 ? void 0 : _d.resubTimeoutMs,
+                    logResubMessages: (_e = config.accountSubscription) === null || _e === void 0 ? void 0 : _e.logResubMessages,
                 });
             }
         }
         else {
-            if (((_g = config.accountSubscription) === null || _g === void 0 ? void 0 : _g.type) === 'websocket' &&
-                ((_h = config.accountSubscription) === null || _h === void 0 ? void 0 : _h.programUserAccountSubscriber)) {
+            if (((_f = config.accountSubscription) === null || _f === void 0 ? void 0 : _f.type) === 'websocket' &&
+                ((_g = config.accountSubscription) === null || _g === void 0 ? void 0 : _g.programUserAccountSubscriber)) {
                 this.accountSubscriber = new websocketProgramUserAccountSubscriber_1.WebSocketProgramUserAccountSubscriber(velocityClient.program, config.userAccountPublicKey, config.accountSubscription.programUserAccountSubscriber);
             }
             else {
                 this.accountSubscriber = new webSocketUserAccountSubscriber_1.WebSocketUserAccountSubscriber(velocityClient.program, config.userAccountPublicKey, {
-                    resubTimeoutMs: (_j = config.accountSubscription) === null || _j === void 0 ? void 0 : _j.resubTimeoutMs,
-                    logResubMessages: (_k = config.accountSubscription) === null || _k === void 0 ? void 0 : _k.logResubMessages,
-                }, (_l = config.accountSubscription) === null || _l === void 0 ? void 0 : _l.commitment);
+                    resubTimeoutMs: (_h = config.accountSubscription) === null || _h === void 0 ? void 0 : _h.resubTimeoutMs,
+                    logResubMessages: (_j = config.accountSubscription) === null || _j === void 0 ? void 0 : _j.logResubMessages,
+                }, (_k = config.accountSubscription) === null || _k === void 0 ? void 0 : _k.commitment);
             }
         }
         this.eventEmitter = this.accountSubscriber.eventEmitter;
@@ -1102,8 +1098,8 @@ class User {
                 continue;
             }
             const market = this.velocityClient.getPerpMarketAccount(userPosition.marketIndex);
-            if (market.amm.cumulativeFundingRateLong.eq(userPosition.lastCumulativeFundingRate) ||
-                market.amm.cumulativeFundingRateShort.eq(userPosition.lastCumulativeFundingRate)) {
+            if (market.cumulativeFundingRateLong.eq(userPosition.lastCumulativeFundingRate) ||
+                market.cumulativeFundingRateShort.eq(userPosition.lastCumulativeFundingRate)) {
                 continue;
             }
             return true;
@@ -1133,14 +1129,14 @@ class User {
         const oracle = market.oracle;
         const perpMarketWithSameOracle = this.velocityClient
             .getPerpMarketAccounts()
-            .find((market) => market.amm.oracle.equals(oracle));
+            .find((market) => market.oracle.equals(oracle));
         const oraclePrice = this.velocityClient.getOracleDataForSpotMarket(marketIndex).price;
         if (perpMarketWithSameOracle) {
             const perpPosition = this.getPerpPositionOrEmpty(perpMarketWithSameOracle.marketIndex);
             if (perpPosition) {
                 let freeCollateralDeltaForPerp = this.calculateFreeCollateralDeltaForPerp(perpMarketWithSameOracle, perpPosition, numericConstants_1.ZERO, oraclePrice);
                 if (freeCollateralDeltaForPerp) {
-                    const { numerator, denominator } = (0, oracles_1.getMultipleBetweenOracleSources)(market.oracleSource, perpMarketWithSameOracle.amm.oracleSource);
+                    const { numerator, denominator } = (0, oracles_1.getMultipleBetweenOracleSources)(market.oracleSource, perpMarketWithSameOracle.oracleSource);
                     freeCollateralDeltaForPerp = freeCollateralDeltaForPerp
                         .mul(numerator)
                         .div(denominator);
@@ -1172,7 +1168,7 @@ class User {
      */
     liquidationPrice(marketIndex, positionBaseSizeChange = numericConstants_1.ZERO, estimatedEntryPrice = numericConstants_1.ZERO, marginCategory = 'Maintenance', includeOpenOrders = false, offsetCollateral = numericConstants_1.ZERO, marginType) {
         const market = this.velocityClient.getPerpMarketAccount(marketIndex);
-        const oracle = this.velocityClient.getPerpMarketAccount(marketIndex).amm.oracle;
+        const oracle = this.velocityClient.getPerpMarketAccount(marketIndex).oracle;
         const oraclePrice = this.velocityClient.getOracleDataForPerpMarket(marketIndex).price;
         const currentPerpPosition = this.getPerpPositionOrEmpty(marketIndex);
         if (marginType === 'Isolated') {
@@ -1201,7 +1197,7 @@ class User {
         const totalCollateral = this.getTotalCollateral(marginCategory, false, includeOpenOrders);
         const marginRequirement = this.getMarginRequirement(marginCategory, undefined, false, includeOpenOrders);
         let freeCollateral = anchor_1.BN.max(numericConstants_1.ZERO, totalCollateral.sub(marginRequirement)).add(offsetCollateral);
-        positionBaseSizeChange = (0, orders_1.standardizeBaseAssetAmount)(positionBaseSizeChange, market.amm.orderStepSize);
+        positionBaseSizeChange = (0, orders_1.standardizeBaseAssetAmount)(positionBaseSizeChange, market.orderStepSize);
         const freeCollateralChangeFromNewPosition = this.calculateEntriesEffectOnFreeCollateral(market, oraclePrice, currentPerpPosition, positionBaseSizeChange, estimatedEntryPrice, includeOpenOrders);
         freeCollateral = freeCollateral.add(freeCollateralChangeFromNewPosition);
         let freeCollateralDelta = this.calculateFreeCollateralDeltaForPerp(market, currentPerpPosition, positionBaseSizeChange, oraclePrice, marginCategory, includeOpenOrders);
@@ -1217,7 +1213,7 @@ class User {
                 const signedTokenAmount = (0, spotBalance_1.getSignedTokenAmount)((0, spotBalance_2.getTokenAmount)(spotPosition.scaledBalance, spotMarketWithSameOracle, spotPosition.balanceType), spotPosition.balanceType);
                 let spotFreeCollateralDelta = this.calculateFreeCollateralDeltaForSpot(spotMarketWithSameOracle, signedTokenAmount, marginCategory);
                 if (spotFreeCollateralDelta) {
-                    const { numerator, denominator } = (0, oracles_1.getMultipleBetweenOracleSources)(market.amm.oracleSource, spotMarketWithSameOracle.oracleSource);
+                    const { numerator, denominator } = (0, oracles_1.getMultipleBetweenOracleSources)(market.oracleSource, spotMarketWithSameOracle.oracleSource);
                     spotFreeCollateralDelta = spotFreeCollateralDelta
                         .mul(numerator)
                         .div(denominator);

package/lib/browser/userConfig.d.ts

@@ -5,12 +5,13 @@ import { GrpcConfigs, UserAccountSubscriber } from './accounts/types';
 import { WebSocketProgramAccountSubscriber } from './accounts/webSocketProgramAccountSubscriber';
 import { UserAccount } from './types';
 import { grpcMultiUserAccountSubscriber } from './accounts/grpcMultiUserAccountSubscriber';
-import { AtLeastOne } from './util/deprecatedAlias';
 type UserConfigBase = {
     accountSubscription?: UserSubscriptionConfig;
     userAccountPublicKey: PublicKey;
 };
-export type UserConfig = UserConfigBase & AtLeastOne<'velocityClient', 'driftClient', VelocityClient>;
+export type UserConfig = UserConfigBase & {
+    velocityClient: VelocityClient;
+};
 export type UserSubscriptionConfig = {
     type: 'grpc';
     resubTimeoutMs?: number;

package/lib/browser/userMap/WebsocketSubscription.js

@@ -22,7 +22,7 @@ class WebsocketSubscription {
             if (this.additionalFilters) {
                 filters.push(...this.additionalFilters);
             }
-            this.subscriber = new webSocketProgramAccountSubscriber_1.WebSocketProgramAccountSubscriber('UserMap', 'user', this.userMap.driftClient.program, this.decodeFn, {
+            this.subscriber = new webSocketProgramAccountSubscriber_1.WebSocketProgramAccountSubscriber('UserMap', 'user', this.userMap.velocityClient.program, this.decodeFn, {
                 filters,
                 commitment: this.commitment,
             }, this.resubOpts);

package/lib/browser/userMap/grpcSubscription.js

@@ -22,7 +22,7 @@ class grpcSubscription {
             if (this.additionalFilters) {
                 filters.push(...this.additionalFilters);
             }
-            this.subscriber = await grpcProgramAccountSubscriber_1.grpcProgramAccountSubscriber.create(this.grpcConfigs, 'UserMap', 'user', this.userMap.driftClient.program, this.decodeFn, {
+            this.subscriber = await grpcProgramAccountSubscriber_1.grpcProgramAccountSubscriber.create(this.grpcConfigs, 'UserMap', 'user', this.userMap.velocityClient.program, this.decodeFn, {
                 filters,
             }, this.resubOpts);
         }

package/lib/browser/userMap/referrerMap.d.ts

@@ -12,8 +12,6 @@ export declare class ReferrerMap {
      */
     private referrerReferrerInfoMap;
     private velocityClient;
-    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
-    private get driftClient();
     private parallelSync;
     private fetchPromise?;
     private fetchPromiseResolver;

package/lib/browser/userMap/referrerMap.js

@@ -10,10 +10,6 @@ const memcmp_1 = require("../memcmp");
 const bs58_1 = __importDefault(require("bs58"));
 const DEFAULT_PUBLIC_KEY = web3_js_1.PublicKey.default.toBase58();
 class ReferrerMap {
-    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
-    get driftClient() {
-        return this.velocityClient;
-    }
     /**
      * Creates a new UserStatsMap instance.
      *

package/lib/browser/userMap/revenueShareEscrowMap.d.ts

@@ -6,8 +6,6 @@ export declare class RevenueShareEscrowMap {
      */
     private authorityEscrowMap;
     private velocityClient;
-    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
-    private get driftClient();
     private parallelSync;
     private fetchPromise?;
     private fetchPromiseResolver;

package/lib/browser/userMap/revenueShareEscrowMap.js

@@ -5,10 +5,6 @@ const web3_js_1 = require("@solana/web3.js");
 const pda_1 = require("../addresses/pda");
 const memcmp_1 = require("../memcmp");
 class RevenueShareEscrowMap {
-    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
-    get driftClient() {
-        return this.velocityClient;
-    }
     /**
      * Creates a new RevenueShareEscrowMap instance.
      *

package/lib/browser/userMap/userMap.d.ts

@@ -30,8 +30,6 @@ export interface UserMapInterface {
 export declare class UserMap implements UserMapInterface {
     private userMap;
     velocityClient: VelocityClient;
-    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
-    get driftClient(): VelocityClient;
     eventEmitter: StrictEventEmitter<EventEmitter, UserEvents>;
     private connection;
     private commitment;
@@ -99,13 +97,13 @@ export declare class UserMap implements UserMapInterface {
     private getFilters;
     /**
      * Syncs the UserMap using the default sync method (single getProgramAccounts call with filters).
-     * This method may fail when drift has too many users. (nodejs response size limits)
+     * This method may fail when velocity has too many users. (nodejs response size limits)
      * @returns
      */
     private defaultSync;
     /**
      * Syncs the UserMap using the paginated sync method (multiple getMultipleAccounts calls with filters).
-     * This method is more reliable when drift has many users.
+     * This method is more reliable when velocity has many users.
      * @returns
      */
     private paginatedSync;

package/lib/browser/userMap/userMap.js

@@ -15,15 +15,11 @@ const grpcSubscription_1 = require("./grpcSubscription");
 const events_1 = require("events");
 const MAX_USER_ACCOUNT_SIZE_BYTES = 4376;
 class UserMap {
-    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
-    get driftClient() {
-        return this.velocityClient;
-    }
     /**
      * Constructs a new UserMap instance.
      */
     constructor(config) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f;
         this.userMap = new Map();
         this.stateAccountUpdateCallback = async (state) => {
             if (!state.numberOfSubAccounts.eq(this.lastNumberOfSubAccounts)) {
@@ -33,7 +29,7 @@ class UserMap {
         };
         this.mostRecentSlot = 0;
         // Type-system guarantees at least one of the two is supplied.
-        this.velocityClient = ((_a = config.velocityClient) !== null && _a !== void 0 ? _a : config.driftClient);
+        this.velocityClient = config.velocityClient;
         if (config.connection) {
             this.connection = config.connection;
         }
@@ -43,15 +39,15 @@ class UserMap {
         this.commitment =
             config.subscriptionConfig.type === 'websocket' ||
                 config.subscriptionConfig.type === 'polling'
-                ? (_b = config.subscriptionConfig.commitment) !== null && _b !== void 0 ? _b : this.velocityClient.opts.commitment
+                ? (_a = config.subscriptionConfig.commitment) !== null && _a !== void 0 ? _a : this.velocityClient.opts.commitment
                 : this.velocityClient.opts.commitment;
-        this.includeIdle = (_c = config.includeIdle) !== null && _c !== void 0 ? _c : false;
+        this.includeIdle = (_b = config.includeIdle) !== null && _b !== void 0 ? _b : false;
         this.filterByPoolId = config.filterByPoolId;
         this.additionalFilters = config.additionalFilters;
         this.disableSyncOnTotalAccountsChange =
-            (_d = config.disableSyncOnTotalAccountsChange) !== null && _d !== void 0 ? _d : false;
+            (_c = config.disableSyncOnTotalAccountsChange) !== null && _c !== void 0 ? _c : false;
         let decodeFn;
-        if ((_e = config.fastDecode) !== null && _e !== void 0 ? _e : true) {
+        if ((_d = config.fastDecode) !== null && _d !== void 0 ? _d : true) {
             decodeFn = (name, buffer) => (0, user_2.decodeUser)(buffer);
         }
         else {
@@ -89,11 +85,11 @@ class UserMap {
                 decodeFn,
             });
         }
-        this.syncConfig = (_f = config.syncConfig) !== null && _f !== void 0 ? _f : {
+        this.syncConfig = (_e = config.syncConfig) !== null && _e !== void 0 ? _e : {
             type: 'default',
         };
         // Whether to throw an error if the userMap fails to sync. Defaults to false.
-        this.throwOnFailedSync = (_g = config.throwOnFailedSync) !== null && _g !== void 0 ? _g : false;
+        this.throwOnFailedSync = (_f = config.throwOnFailedSync) !== null && _f !== void 0 ? _f : false;
         this.eventEmitter = new events_1.EventEmitter();
     }
     async subscribe() {
@@ -284,7 +280,7 @@ class UserMap {
     }
     /**
      * Syncs the UserMap using the default sync method (single getProgramAccounts call with filters).
-     * This method may fail when drift has too many users. (nodejs response size limits)
+     * This method may fail when velocity has too many users. (nodejs response size limits)
      * @returns
      */
     async defaultSync() {
@@ -357,7 +353,7 @@ class UserMap {
     }
     /**
      * Syncs the UserMap using the paginated sync method (multiple getMultipleAccounts calls with filters).
-     * This method is more reliable when drift has many users.
+     * This method is more reliable when velocity has many users.
      * @returns
      */
     async paginatedSync() {

package/lib/browser/userMap/userMapConfig.d.ts

@@ -1,7 +1,6 @@
 import { Commitment, Connection, MemcmpFilter } from '@solana/web3.js';
 import { VelocityClient } from '../velocityClient';
 import { GrpcConfigs } from '../accounts/types';
-import { AtLeastOne } from '../util/deprecatedAlias';
 export type UserAccountFilterCriteria = {
     hasOpenOrders: boolean;
 };
@@ -38,5 +37,7 @@ type UserMapConfigBase = {
     filterByPoolId?: number;
     additionalFilters?: MemcmpFilter[];
 };
-export type UserMapConfig = UserMapConfigBase & AtLeastOne<'velocityClient', 'driftClient', VelocityClient>;
+export type UserMapConfig = UserMapConfigBase & {
+    velocityClient: VelocityClient;
+};
 export {};

package/lib/browser/userMap/userStatsMap.d.ts

@@ -12,8 +12,6 @@ export declare class UserStatsMap {
      */
     private userStatsMap;
     private velocityClient;
-    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
-    private get driftClient();
     private bulkAccountLoader;
     private decode;
     private syncConfig;