@velocity-exchange/sdk 0.0.5 → 0.1.0

package/lib/browser/orderSubscriber/grpcSubscription.js

@@ -19,12 +19,12 @@ class grpcSubscription {
         }
         if (this.grpcConfigs.client === 'laser') {
             this.subscriber =
-                await laserProgramAccountSubscriber_1.LaserstreamProgramAccountSubscriber.create(this.grpcConfigs, 'OrderSubscriber', 'user', this.orderSubscriber.driftClient.program, this.orderSubscriber.decodeFn, {
+                await laserProgramAccountSubscriber_1.LaserstreamProgramAccountSubscriber.create(this.grpcConfigs, 'OrderSubscriber', 'user', this.orderSubscriber.velocityClient.program, this.orderSubscriber.decodeFn, {
                     filters: [(0, memcmp_1.getUserFilter)(), (0, memcmp_1.getNonIdleUserFilter)()],
                 }, this.resubOpts);
         }
         else {
-            this.subscriber = await grpcProgramAccountSubscriber_1.grpcProgramAccountSubscriber.create(this.grpcConfigs, 'OrderSubscriber', 'user', this.orderSubscriber.driftClient.program, this.orderSubscriber.decodeFn, {
+            this.subscriber = await grpcProgramAccountSubscriber_1.grpcProgramAccountSubscriber.create(this.grpcConfigs, 'OrderSubscriber', 'user', this.orderSubscriber.velocityClient.program, this.orderSubscriber.decodeFn, {
                 filters: [(0, memcmp_1.getUserFilter)(), (0, memcmp_1.getNonIdleUserFilter)()],
             }, this.resubOpts);
         }

package/lib/browser/orderSubscriber/types.d.ts

@@ -4,8 +4,6 @@ import { VelocityClient } from '../velocityClient';
 import { GrpcConfigs } from '../accounts/types';
 export type OrderSubscriberConfig = {
     velocityClient?: VelocityClient;
-    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
-    driftClient?: VelocityClient;
     subscriptionConfig: {
         type: 'polling';
         frequency: number;

package/lib/browser/priorityFee/priorityFeeSubscriber.d.ts

@@ -9,8 +9,6 @@ export declare class PriorityFeeSubscriber {
     frequencyMs: number;
     addresses: string[];
     velocityMarkets?: VelocityMarketInfo[];
-    /** @deprecated Use `velocityMarkets` instead. `driftMarkets` will be removed in a future major. */
-    get driftMarkets(): VelocityMarketInfo[] | undefined;
     customStrategy?: PriorityFeeStrategy;
     averageStrategy: AverageOverSlotsStrategy;
     maxStrategy: MaxOverSlotsStrategy;
@@ -19,8 +17,6 @@ export declare class PriorityFeeSubscriber {
     maxFeeMicroLamports?: number;
     priorityFeeMultiplier?: number;
     velocityPriorityFeeEndpoint?: string;
-    /** @deprecated Use `velocityPriorityFeeEndpoint` instead. `driftPriorityFeeEndpoint` will be removed in a future major. */
-    get driftPriorityFeeEndpoint(): string | undefined;
     heliusRpcUrl?: string;
     lastHeliusSample?: HeliusPriorityFeeLevels;
     intervalId?: ReturnType<typeof setTimeout>;
@@ -33,7 +29,7 @@ export declare class PriorityFeeSubscriber {
     subscribe(): Promise<void>;
     private loadForSolana;
     private loadForHelius;
-    private loadForDrift;
+    private loadForVelocity;
     getMaxPriorityFee(): number | undefined;
     updateMaxPriorityFee(newMaxFee: number | undefined): void;
     getPriorityFeeMultiplier(): number;

package/lib/browser/priorityFee/priorityFeeSubscriber.js

@@ -8,16 +8,8 @@ const solanaPriorityFeeMethod_1 = require("./solanaPriorityFeeMethod");
 const heliusPriorityFeeMethod_1 = require("./heliusPriorityFeeMethod");
 const velocityPriorityFeeMethod_1 = require("./velocityPriorityFeeMethod");
 class PriorityFeeSubscriber {
-    /** @deprecated Use `velocityMarkets` instead. `driftMarkets` will be removed in a future major. */
-    get driftMarkets() {
-        return this.velocityMarkets;
-    }
-    /** @deprecated Use `velocityPriorityFeeEndpoint` instead. `driftPriorityFeeEndpoint` will be removed in a future major. */
-    get driftPriorityFeeEndpoint() {
-        return this.velocityPriorityFeeEndpoint;
-    }
     constructor(config) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d;
         this.averageStrategy = new averageOverSlotsStrategy_1.AverageOverSlotsStrategy();
         this.maxStrategy = new maxOverSlotsStrategy_1.MaxOverSlotsStrategy();
         this.priorityFeeMethod = types_1.PriorityFeeMethod.SOLANA;
@@ -32,14 +24,14 @@ class PriorityFeeSubscriber {
         this.addresses = config.addresses
             ? config.addresses.map((address) => address.toBase58())
             : [];
-        this.velocityMarkets = (_b = config.velocityMarkets) !== null && _b !== void 0 ? _b : config.driftMarkets;
+        this.velocityMarkets = config.velocityMarkets;
         if (config.customStrategy) {
             this.customStrategy = config.customStrategy;
         }
         else {
             this.customStrategy = this.averageStrategy;
         }
-        this.lookbackDistance = (_c = config.slotsToCheck) !== null && _c !== void 0 ? _c : 50;
+        this.lookbackDistance = (_b = config.slotsToCheck) !== null && _b !== void 0 ? _b : 50;
         if (config.priorityFeeMethod) {
             this.priorityFeeMethod = config.priorityFeeMethod;
             if (this.priorityFeeMethod === types_1.PriorityFeeMethod.HELIUS) {
@@ -57,7 +49,7 @@ class PriorityFeeSubscriber {
             }
             else if (this.priorityFeeMethod === types_1.PriorityFeeMethod.VELOCITY) {
                 this.velocityPriorityFeeEndpoint =
-                    (_d = config.velocityPriorityFeeEndpoint) !== null && _d !== void 0 ? _d : config.driftPriorityFeeEndpoint;
+                    (_c = config.velocityPriorityFeeEndpoint) !== null && _c !== void 0 ? _c : config.velocityPriorityFeeEndpoint;
             }
         }
         if (this.priorityFeeMethod === types_1.PriorityFeeMethod.SOLANA) {
@@ -66,7 +58,7 @@ class PriorityFeeSubscriber {
             }
         }
         this.maxFeeMicroLamports = config.maxFeeMicroLamports;
-        this.priorityFeeMultiplier = (_e = config.priorityFeeMultiplier) !== null && _e !== void 0 ? _e : 1.0;
+        this.priorityFeeMultiplier = (_d = config.priorityFeeMultiplier) !== null && _d !== void 0 ? _d : 1.0;
     }
     async subscribe() {
         if (this.intervalId) {
@@ -101,7 +93,7 @@ class PriorityFeeSubscriber {
             }
         }
     }
-    async loadForDrift() {
+    async loadForVelocity() {
         if (!this.velocityMarkets) {
             return;
         }
@@ -169,7 +161,7 @@ class PriorityFeeSubscriber {
                 await this.loadForHelius();
             }
             else if (this.priorityFeeMethod === types_1.PriorityFeeMethod.VELOCITY) {
-                await this.loadForDrift();
+                await this.loadForVelocity();
             }
             else {
                 throw new Error(`${this.priorityFeeMethod} load not implemented`);

package/lib/browser/priorityFee/priorityFeeSubscriberMap.d.ts

@@ -7,11 +7,7 @@ export declare class PriorityFeeSubscriberMap {
     frequencyMs: number;
     intervalId?: ReturnType<typeof setTimeout>;
     velocityMarkets?: VelocityMarketInfo[];
-    /** @deprecated Use `velocityMarkets` instead. `driftMarkets` will be removed in a future major. */
-    get driftMarkets(): VelocityMarketInfo[] | undefined;
     velocityPriorityFeeEndpoint: string;
-    /** @deprecated Use `velocityPriorityFeeEndpoint` instead. `driftPriorityFeeEndpoint` will be removed in a future major. */
-    get driftPriorityFeeEndpoint(): string;
     feesMap: Map<string, Map<number, VelocityPriorityFeeLevels>>;
     constructor(config: PriorityFeeSubscriberMapConfig);
     private updateFeesMap;

package/lib/browser/priorityFee/priorityFeeSubscriberMap.js

@@ -7,21 +7,13 @@ const types_1 = require("./types");
  * takes advantage of /batchPriorityFees endpoint from Velocity hosted priority fee service
  */
 class PriorityFeeSubscriberMap {
-    /** @deprecated Use `velocityMarkets` instead. `driftMarkets` will be removed in a future major. */
-    get driftMarkets() {
-        return this.velocityMarkets;
-    }
-    /** @deprecated Use `velocityPriorityFeeEndpoint` instead. `driftPriorityFeeEndpoint` will be removed in a future major. */
-    get driftPriorityFeeEndpoint() {
-        return this.velocityPriorityFeeEndpoint;
-    }
     constructor(config) {
-        var _a, _b, _c;
+        var _a, _b;
         this.frequencyMs =
             (_a = config.frequencyMs) !== null && _a !== void 0 ? _a : types_1.DEFAULT_PRIORITY_FEE_MAP_FREQUENCY_MS;
         // Type-system guarantees at least one of the two is supplied.
-        this.velocityPriorityFeeEndpoint = ((_b = config.velocityPriorityFeeEndpoint) !== null && _b !== void 0 ? _b : config.driftPriorityFeeEndpoint);
-        this.velocityMarkets = (_c = config.velocityMarkets) !== null && _c !== void 0 ? _c : config.driftMarkets;
+        this.velocityPriorityFeeEndpoint = ((_b = config.velocityPriorityFeeEndpoint) !== null && _b !== void 0 ? _b : config.velocityPriorityFeeEndpoint);
+        this.velocityMarkets = config.velocityMarkets;
         this.feesMap = new Map();
         this.feesMap.set('perp', new Map());
         this.feesMap.set('spot', new Map());

package/lib/browser/priorityFee/types.d.ts

@@ -2,7 +2,6 @@ import { Connection, PublicKey } from '@solana/web3.js';
 import { SolanaPriorityFeeResponse } from './solanaPriorityFeeMethod';
 import { HeliusPriorityFeeResponse } from './heliusPriorityFeeMethod';
 import { VelocityMarketInfo, VelocityPriorityFeeResponse } from './velocityPriorityFeeMethod';
-import { AtLeastOne } from '../util/deprecatedAlias';
 export declare const DEFAULT_PRIORITY_FEE_MAP_FREQUENCY_MS = 10000;
 export interface PriorityFeeStrategy {
     calculate(samples: SolanaPriorityFeeResponse[] | HeliusPriorityFeeResponse | VelocityPriorityFeeResponse): number;
@@ -17,23 +16,19 @@ export type PriorityFeeSubscriberConfig = {
     frequencyMs?: number;
     addresses?: PublicKey[];
     velocityMarkets?: VelocityMarketInfo[];
-    /** @deprecated Use `velocityMarkets` instead. `driftMarkets` will be removed in a future major. */
-    driftMarkets?: VelocityMarketInfo[];
     customStrategy?: PriorityFeeStrategy;
     priorityFeeMethod?: PriorityFeeMethod;
     slotsToCheck?: number;
     heliusRpcUrl?: string;
     velocityPriorityFeeEndpoint?: string;
-    /** @deprecated Use `velocityPriorityFeeEndpoint` instead. `driftPriorityFeeEndpoint` will be removed in a future major. */
-    driftPriorityFeeEndpoint?: string;
     maxFeeMicroLamports?: number;
     priorityFeeMultiplier?: number;
 };
 type PriorityFeeSubscriberMapConfigBase = {
     frequencyMs?: number;
     velocityMarkets?: VelocityMarketInfo[];
-    /** @deprecated Use `velocityMarkets` instead. `driftMarkets` will be removed in a future major. */
-    driftMarkets?: VelocityMarketInfo[];
 };
-export type PriorityFeeSubscriberMapConfig = PriorityFeeSubscriberMapConfigBase & AtLeastOne<'velocityPriorityFeeEndpoint', 'driftPriorityFeeEndpoint', string>;
+export type PriorityFeeSubscriberMapConfig = PriorityFeeSubscriberMapConfigBase & {
+    velocityPriorityFeeEndpoint: string;
+};
 export {};

package/lib/browser/priorityFee/velocityPriorityFeeMethod.d.ts

@@ -3,19 +3,11 @@ export type VelocityMarketInfo = {
     marketType: string;
     marketIndex: number;
 };
-/** @deprecated Use `VelocityMarketInfo` instead. `DriftMarketInfo` will be removed in a future major. */
-export type DriftMarketInfo = VelocityMarketInfo;
 export type VelocityPriorityFeeLevels = {
     [key in HeliusPriorityLevel]: number;
 } & {
     marketType: 'perp' | 'spot';
     marketIndex: number;
 };
-/** @deprecated Use `VelocityPriorityFeeLevels` instead. `DriftPriorityFeeLevels` will be removed in a future major. */
-export type DriftPriorityFeeLevels = VelocityPriorityFeeLevels;
 export type VelocityPriorityFeeResponse = VelocityPriorityFeeLevels[];
-/** @deprecated Use `VelocityPriorityFeeResponse` instead. `DriftPriorityFeeResponse` will be removed in a future major. */
-export type DriftPriorityFeeResponse = VelocityPriorityFeeResponse;
 export declare function fetchVelocityPriorityFee(url: string, marketTypes: string[], marketIndexes: number[]): Promise<VelocityPriorityFeeResponse>;
-/** @deprecated Use `fetchVelocityPriorityFee` instead. `fetchDriftPriorityFee` will be removed in a future major. */
-export declare const fetchDriftPriorityFee: typeof fetchVelocityPriorityFee;

package/lib/browser/priorityFee/velocityPriorityFeeMethod.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.fetchDriftPriorityFee = exports.fetchVelocityPriorityFee = void 0;
+exports.fetchVelocityPriorityFee = void 0;
 const node_fetch_1 = __importDefault(require("node-fetch"));
 async function fetchVelocityPriorityFee(url, marketTypes, marketIndexes) {
     try {
@@ -24,5 +24,3 @@ async function fetchVelocityPriorityFee(url, marketTypes, marketIndexes) {
     return [];
 }
 exports.fetchVelocityPriorityFee = fetchVelocityPriorityFee;
-/** @deprecated Use `fetchVelocityPriorityFee` instead. `fetchDriftPriorityFee` will be removed in a future major. */
-exports.fetchDriftPriorityFee = fetchVelocityPriorityFee;

package/lib/browser/pyth/pythLazerSubscriber.d.ts

@@ -39,7 +39,7 @@ export declare class PythLazerSubscriber {
      * @param endpoints - Array of WebSocket endpoint URLs for Pyth Lazer
      * @param token - Authentication token for Pyth Lazer API
      * @param priceFeedArrays - Array of price feed configurations to subscribe to
-     * @param env - Drift environment (mainnet-beta, devnet, etc.)
+     * @param env - Velocity environment (mainnet-beta, devnet, etc.)
      * @param resubTimeoutMs - Milliseconds to wait before resubscribing on data timeout
      * @param sdkLogging - Whether to log Pyth SDK logs to the console. This is very noisy but could be useful for debugging.
      * @param feedProperties - Price feed properties to request. Must include both 'price' and 'exponent' (required for getPriceFromMarketIndex). Defaults to ['price', 'bestAskPrice', 'bestBidPrice', 'exponent']. Stored by copy so caller mutation does not affect this instance.

package/lib/browser/pyth/pythLazerSubscriber.js

@@ -13,7 +13,7 @@ class PythLazerSubscriber {
      * @param endpoints - Array of WebSocket endpoint URLs for Pyth Lazer
      * @param token - Authentication token for Pyth Lazer API
      * @param priceFeedArrays - Array of price feed configurations to subscribe to
-     * @param env - Drift environment (mainnet-beta, devnet, etc.)
+     * @param env - Velocity environment (mainnet-beta, devnet, etc.)
      * @param resubTimeoutMs - Milliseconds to wait before resubscribing on data timeout
      * @param sdkLogging - Whether to log Pyth SDK logs to the console. This is very noisy but could be useful for debugging.
      * @param feedProperties - Price feed properties to request. Must include both 'price' and 'exponent' (required for getPriceFromMarketIndex). Defaults to ['price', 'bestAskPrice', 'bestBidPrice', 'exponent']. Stored by copy so caller mutation does not affect this instance.

package/lib/browser/swap/UnifiedSwapClient.js

@@ -140,7 +140,7 @@ class UnifiedSwapClient {
                 slippageBps,
                 swapMode: isExactOut ? titanClient_1.SwapMode.ExactOut : titanClient_1.SwapMode.ExactIn,
                 onlyDirectRoutes,
-                sizeConstraint: sizeConstraint || 1280 - 375, // MAX_TX_BYTE_SIZE - buffer for drift instructions
+                sizeConstraint: sizeConstraint || 1280 - 375, // MAX_TX_BYTE_SIZE - buffer for velocity instructions
             });
             swapInstructions = titanClient.getTitanInstructions({
                 transactionMessage,

package/lib/browser/swift/signedMsgUserAccountSubscriber.d.ts

@@ -6,7 +6,6 @@ import { SignedMsgOrderId, SignedMsgUserOrdersAccount } from '../types';
 import { Commitment, PublicKey } from '@solana/web3.js';
 import { ResubOpts } from '../accounts/types';
 import { VelocityClient } from '../velocityClient';
-import { AtLeastOne } from '../util/deprecatedAlias';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 export type SignedMsgUserOrdersAccountSubscriberConfig = {
@@ -14,15 +13,15 @@ export type SignedMsgUserOrdersAccountSubscriberConfig = {
     resubOpts?: ResubOpts;
     decodeFn?: (name: string, data: Buffer) => SignedMsgUserOrdersAccount;
     resyncIntervalMs?: number;
-} & AtLeastOne<'velocityClient', 'driftClient', VelocityClient>;
+} & {
+    velocityClient: VelocityClient;
+};
 export interface SignedMsgUserOrdersAccountSubscriberEvents {
     onAccountUpdate: (activeSignedMsgOrderIds: SignedMsgOrderId[], authorityPubkey: PublicKey, slot: number) => void;
     newSignedMsgOrderIds: (newSignedMsgOrderIds: SignedMsgOrderId[], authorityPubkey: PublicKey, slot: number) => void;
 }
 export declare class SignedMsgUserOrdersAccountSubscriber {
     protected velocityClient: VelocityClient;
-    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
-    protected get driftClient(): VelocityClient;
     protected commitment: Commitment;
     protected resubOpts?: ResubOpts;
     protected resyncTimeoutId?: ReturnType<typeof setTimeout>;
@@ -37,7 +36,7 @@ export declare class SignedMsgUserOrdersAccountSubscriber {
     fetchPromiseResolver: () => void;
     protected subscriber: WebSocketProgramAccountSubscriber<SignedMsgUserOrdersAccount>;
     eventEmitter: StrictEventEmitter<EventEmitter, SignedMsgUserOrdersAccountSubscriberEvents>;
-    constructor({ velocityClient, driftClient, commitment, resubOpts, decodeFn, resyncIntervalMs, }: SignedMsgUserOrdersAccountSubscriberConfig);
+    constructor({ velocityClient, commitment, resubOpts, decodeFn, resyncIntervalMs, }: SignedMsgUserOrdersAccountSubscriberConfig);
     subscribe(): Promise<void>;
     fetch(): Promise<void>;
     tryUpdateSignedMsgUserOrdersAccount(data: Buffer | SignedMsgUserOrdersAccount, dataType: 'buffer' | 'decoded', slot: number, skipEventEmitting?: boolean): void;

package/lib/browser/swift/signedMsgUserAccountSubscriber.js

@@ -5,16 +5,12 @@ const memcmp_1 = require("../memcmp");
 const webSocketProgramAccountSubscriber_1 = require("../accounts/webSocketProgramAccountSubscriber");
 const events_1 = require("events");
 class SignedMsgUserOrdersAccountSubscriber {
-    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
-    get driftClient() {
-        return this.velocityClient;
-    }
-    constructor({ velocityClient, driftClient, commitment, resubOpts, decodeFn, resyncIntervalMs, }) {
+    constructor({ velocityClient, commitment, resubOpts, decodeFn, resyncIntervalMs, }) {
         this.signedMsgUserOrderAccounts = new Map();
         this.commitment = commitment !== null && commitment !== void 0 ? commitment : 'confirmed';
         this.resubOpts = resubOpts;
         // Type-system guarantees at least one of the two is supplied.
-        this.velocityClient = (velocityClient !== null && velocityClient !== void 0 ? velocityClient : driftClient);
+        this.velocityClient = velocityClient;
         this.decodeFn =
             decodeFn !== null && decodeFn !== void 0 ? decodeFn : this.velocityClient.program.account.signedMsgUserOrders.coder.accounts.decodeUnchecked.bind(this.velocityClient.program.account.signedMsgUserOrders.coder
                 .accounts);

package/lib/browser/swift/swiftOrderSubscriber.d.ts

@@ -1,6 +1,5 @@
 import { VelocityClient } from '../velocityClient';
 import { VelocityEnv } from '../config';
-import { AtLeastOne } from '../util/deprecatedAlias';
 import { OptionalOrderParams, SignedMsgOrderParamsDelegateMessage, SignedMsgOrderParamsMessage, UserAccount } from '../types';
 import { Keypair, TransactionInstruction } from '@solana/web3.js';
 export interface AccountGetter {
@@ -11,13 +10,17 @@ type SwiftOrderSubscriberConfigBase = {
     endpoint?: string;
     marketIndexes: number[];
     /**
-        In the future, this will be used for verifying $DRIFT stake as we add
+        In the future, this will be used for verifying $VELOCITY stake as we add
         authentication for delegate signers
         For now, pass a new keypair or a keypair to an empty wallet
     */
     keypair: Keypair;
 };
-export type SwiftOrderSubscriberConfig = SwiftOrderSubscriberConfigBase & AtLeastOne<'velocityEnv', 'driftEnv', VelocityEnv> & AtLeastOne<'velocityClient', 'driftClient', VelocityClient>;
+export type SwiftOrderSubscriberConfig = SwiftOrderSubscriberConfigBase & {
+    velocityEnv: VelocityEnv;
+} & {
+    velocityClient: VelocityClient;
+};
 /**
  * Swift order message received from WebSocket
  */
@@ -48,8 +51,6 @@ export declare class SwiftOrderSubscriber {
     private readonly heartbeatIntervalMs;
     private ws;
     private velocityClient;
-    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
-    private get driftClient();
     userAccountGetter?: AccountGetter;
     onOrder: (orderMessageRaw: SwiftOrderMessage, signedMessage: SignedMsgOrderParamsMessage | SignedMsgOrderParamsDelegateMessage, isDelegateSigner?: boolean) => Promise<void>;
     subscribed: boolean;

package/lib/browser/swift/swiftOrderSubscriber.js

@@ -13,19 +13,14 @@ const tweetnacl_util_1 = require("tweetnacl-util");
 const ws_1 = __importDefault(require("ws"));
 const sha256_1 = require("@noble/hashes/sha256");
 class SwiftOrderSubscriber {
-    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
-    get driftClient() {
-        return this.velocityClient;
-    }
     constructor(config) {
-        var _a;
         this.config = config;
         this.heartbeatTimeout = null;
         this.heartbeatIntervalMs = 60000;
         this.ws = null;
         this.subscribed = false;
         // 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;
         this.userAccountGetter = config.userAccountGetter;
     }
     unsubscribe() {
@@ -37,8 +32,7 @@ class SwiftOrderSubscriber {
         }
     }
     getSymbolForMarketIndex(marketIndex) {
-        var _a;
-        const env = (_a = this.config.velocityEnv) !== null && _a !== void 0 ? _a : this.config.driftEnv;
+        const env = this.config.velocityEnv;
         const markets = env === 'devnet' ? perpMarkets_1.DevnetPerpMarkets : perpMarkets_1.MainnetPerpMarkets;
         return markets[marketIndex].symbol;
     }
@@ -72,10 +66,10 @@ class SwiftOrderSubscriber {
         }
     }
     async subscribe(onOrder, acceptSanitized = false, acceptDepositTrade = false) {
-        var _a, _b;
+        var _a;
         this.onOrder = onOrder;
-        const env = (_a = this.config.velocityEnv) !== null && _a !== void 0 ? _a : this.config.driftEnv;
-        const endpoint = (_b = this.config.endpoint) !== null && _b !== void 0 ? _b : (env === 'devnet'
+        const env = this.config.velocityEnv;
+        const endpoint = (_a = this.config.endpoint) !== null && _a !== void 0 ? _a : (env === 'devnet'
             ? 'wss://master.swift.drift.trade/ws'
             : 'wss://swift.drift.trade/ws');
         const ws = new ws_1.default(endpoint + '?pubkey=' + this.config.keypair.publicKey.toBase58());