@velocity-exchange/sdk 0.0.2 → 0.0.3

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

@@ -13,7 +13,9 @@ import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { grpcSubscription } from './grpcSubscription';
 export declare class OrderSubscriber {
-    driftClient: VelocityClient;
+    velocityClient: VelocityClient;
+    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
+    get driftClient(): VelocityClient;
     usersAccounts: Map<string, {
         slot: number;
         userAccount: UserAccount;

package/lib/browser/orderSubscriber/OrderSubscriber.js

@@ -14,10 +14,18 @@ const grpcSubscription_1 = require("./grpcSubscription");
 const orders_1 = require("../math/orders");
 const numericConstants_1 = require("../constants/numericConstants");
 class OrderSubscriber {
+    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
+    get driftClient() {
+        return this.velocityClient;
+    }
     constructor(config) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         this.usersAccounts = new Map();
-        this.driftClient = config.driftClient;
+        const velocityClient = (_a = config.velocityClient) !== null && _a !== void 0 ? _a : config.driftClient;
+        if (!velocityClient) {
+            throw new Error('OrderSubscriber: velocityClient (or deprecated driftClient) must be provided');
+        }
+        this.velocityClient = velocityClient;
         this.commitment = config.subscriptionConfig.commitment || 'processed';
         if (config.subscriptionConfig.type === 'polling') {
             this.subscription = new PollingSubscription_1.PollingSubscription({
@@ -31,8 +39,8 @@ class OrderSubscriber {
                 grpcConfigs: config.subscriptionConfig.grpcConfigs,
                 skipInitialLoad: config.subscriptionConfig.skipInitialLoad,
                 resubOpts: {
-                    resubTimeoutMs: (_a = config.subscriptionConfig) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs,
-                    logResubMessages: (_b = config.subscriptionConfig) === null || _b === void 0 ? void 0 : _b.logResubMessages,
+                    resubTimeoutMs: (_b = config.subscriptionConfig) === null || _b === void 0 ? void 0 : _b.resubTimeoutMs,
+                    logResubMessages: (_c = config.subscriptionConfig) === null || _c === void 0 ? void 0 : _c.logResubMessages,
                 },
                 resyncIntervalMs: config.subscriptionConfig.resyncIntervalMs,
                 decoded: config.decodeData,
@@ -44,18 +52,18 @@ class OrderSubscriber {
                 commitment: this.commitment,
                 skipInitialLoad: config.subscriptionConfig.skipInitialLoad,
                 resubOpts: {
-                    resubTimeoutMs: (_c = config.subscriptionConfig) === null || _c === void 0 ? void 0 : _c.resubTimeoutMs,
-                    logResubMessages: (_d = config.subscriptionConfig) === null || _d === void 0 ? void 0 : _d.logResubMessages,
+                    resubTimeoutMs: (_d = config.subscriptionConfig) === null || _d === void 0 ? void 0 : _d.resubTimeoutMs,
+                    logResubMessages: (_e = config.subscriptionConfig) === null || _e === void 0 ? void 0 : _e.logResubMessages,
                 },
                 resyncIntervalMs: config.subscriptionConfig.resyncIntervalMs,
                 decoded: config.decodeData,
             });
         }
-        if ((_e = config.fastDecode) !== null && _e !== void 0 ? _e : true) {
+        if ((_f = config.fastDecode) !== null && _f !== void 0 ? _f : true) {
             this.decodeFn = (name, data) => (0, user_1.decodeUser)(data);
         }
         else {
-            this.decodeFn = this.driftClient.program.account.user.coder.accounts.decodeUnchecked.bind(this.driftClient.program.account.user.coder.accounts);
+            this.decodeFn = this.velocityClient.program.account.user.coder.accounts.decodeUnchecked.bind(this.velocityClient.program.account.user.coder.accounts);
         }
         this.eventEmitter = new events_1.EventEmitter();
         this.fetchAllNonIdleUsers = config.fetchAllNonIdleUsers;
@@ -75,7 +83,7 @@ class OrderSubscriber {
             : [(0, memcmp_1.getUserFilter)(), (0, memcmp_1.getUserWithOrderFilter)()];
         try {
             const rpcRequestArgs = [
-                this.driftClient.program.programId.toBase58(),
+                this.velocityClient.program.programId.toBase58(),
                 {
                     commitment: this.commitment,
                     filters,
@@ -85,7 +93,7 @@ class OrderSubscriber {
             ];
             const rpcJSONResponse = 
             // @ts-ignore
-            await this.driftClient.connection._rpcRequest('getProgramAccounts', rpcRequestArgs);
+            await this.velocityClient.connection._rpcRequest('getProgramAccounts', rpcRequestArgs);
             const rpcResponseAndContext = rpcJSONResponse.result;
             const slot = rpcResponseAndContext.context.slot;
             for (const programAccount of rpcResponseAndContext.value) {
@@ -174,7 +182,7 @@ class OrderSubscriber {
         return (_a = this.mostRecentSlot) !== null && _a !== void 0 ? _a : 0;
     }
     async addPubkey(userAccountPublicKey) {
-        const accountInfo = await this.driftClient.connection.getAccountInfoAndContext(userAccountPublicKey, this.commitment);
+        const accountInfo = await this.velocityClient.connection.getAccountInfoAndContext(userAccountPublicKey, this.commitment);
         if (accountInfo) {
             this.tryUpdateUserAccount(userAccountPublicKey.toString(), 'buffer', accountInfo.value.data, accountInfo.context.slot);
         }

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

@@ -3,7 +3,9 @@ import { Order, UserAccount } from '../types';
 import { VelocityClient } from '../velocityClient';
 import { GrpcConfigs } from '../accounts/types';
 export type OrderSubscriberConfig = {
-    driftClient: VelocityClient;
+    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

@@ -8,7 +8,9 @@ export declare class PriorityFeeSubscriber {
     connection: Connection;
     frequencyMs: number;
     addresses: string[];
-    driftMarkets?: VelocityMarketInfo[];
+    velocityMarkets?: VelocityMarketInfo[];
+    /** @deprecated Use `velocityMarkets` instead. `driftMarkets` will be removed in a future major. */
+    get driftMarkets(): VelocityMarketInfo[] | undefined;
     customStrategy?: PriorityFeeStrategy;
     averageStrategy: AverageOverSlotsStrategy;
     maxStrategy: MaxOverSlotsStrategy;
@@ -44,5 +46,5 @@ export declare class PriorityFeeSubscriber {
     load(): Promise<void>;
     unsubscribe(): Promise<void>;
     updateAddresses(addresses: PublicKey[]): void;
-    updateMarketTypeAndIndex(driftMarkets: VelocityMarketInfo[]): void;
+    updateMarketTypeAndIndex(velocityMarkets: VelocityMarketInfo[]): void;
 }

package/lib/browser/priorityFee/priorityFeeSubscriber.js

@@ -8,12 +8,16 @@ 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;
+        var _a, _b, _c, _d, _e;
         this.averageStrategy = new averageOverSlotsStrategy_1.AverageOverSlotsStrategy();
         this.maxStrategy = new maxOverSlotsStrategy_1.MaxOverSlotsStrategy();
         this.priorityFeeMethod = types_1.PriorityFeeMethod.SOLANA;
@@ -28,14 +32,14 @@ class PriorityFeeSubscriber {
         this.addresses = config.addresses
             ? config.addresses.map((address) => address.toBase58())
             : [];
-        this.driftMarkets = config.driftMarkets;
+        this.velocityMarkets = (_b = config.velocityMarkets) !== null && _b !== void 0 ? _b : config.driftMarkets;
         if (config.customStrategy) {
             this.customStrategy = config.customStrategy;
         }
         else {
             this.customStrategy = this.averageStrategy;
         }
-        this.lookbackDistance = (_b = config.slotsToCheck) !== null && _b !== void 0 ? _b : 50;
+        this.lookbackDistance = (_c = config.slotsToCheck) !== null && _c !== void 0 ? _c : 50;
         if (config.priorityFeeMethod) {
             this.priorityFeeMethod = config.priorityFeeMethod;
             if (this.priorityFeeMethod === types_1.PriorityFeeMethod.HELIUS) {
@@ -51,9 +55,9 @@ class PriorityFeeSubscriber {
                     this.heliusRpcUrl = config.heliusRpcUrl;
                 }
             }
-            else if (this.priorityFeeMethod === types_1.PriorityFeeMethod.DRIFT) {
+            else if (this.priorityFeeMethod === types_1.PriorityFeeMethod.VELOCITY) {
                 this.velocityPriorityFeeEndpoint =
-                    (_c = config.velocityPriorityFeeEndpoint) !== null && _c !== void 0 ? _c : config.driftPriorityFeeEndpoint;
+                    (_d = config.velocityPriorityFeeEndpoint) !== null && _d !== void 0 ? _d : config.driftPriorityFeeEndpoint;
             }
         }
         if (this.priorityFeeMethod === types_1.PriorityFeeMethod.SOLANA) {
@@ -62,7 +66,7 @@ class PriorityFeeSubscriber {
             }
         }
         this.maxFeeMicroLamports = config.maxFeeMicroLamports;
-        this.priorityFeeMultiplier = (_d = config.priorityFeeMultiplier) !== null && _d !== void 0 ? _d : 1.0;
+        this.priorityFeeMultiplier = (_e = config.priorityFeeMultiplier) !== null && _e !== void 0 ? _e : 1.0;
     }
     async subscribe() {
         if (this.intervalId) {
@@ -98,10 +102,10 @@ class PriorityFeeSubscriber {
         }
     }
     async loadForDrift() {
-        if (!this.driftMarkets) {
+        if (!this.velocityMarkets) {
             return;
         }
-        const sample = await (0, velocityPriorityFeeMethod_1.fetchVelocityPriorityFee)(this.velocityPriorityFeeEndpoint, this.driftMarkets.map((m) => m.marketType), this.driftMarkets.map((m) => m.marketIndex));
+        const sample = await (0, velocityPriorityFeeMethod_1.fetchVelocityPriorityFee)(this.velocityPriorityFeeEndpoint, this.velocityMarkets.map((m) => m.marketType), this.velocityMarkets.map((m) => m.marketIndex));
         if (sample.length > 0) {
             this.lastAvgStrategyResult = sample[heliusPriorityFeeMethod_1.HeliusPriorityLevel.MEDIUM];
             this.lastMaxStrategyResult = sample[heliusPriorityFeeMethod_1.HeliusPriorityLevel.UNSAFE_MAX];
@@ -164,7 +168,7 @@ class PriorityFeeSubscriber {
             else if (this.priorityFeeMethod === types_1.PriorityFeeMethod.HELIUS) {
                 await this.loadForHelius();
             }
-            else if (this.priorityFeeMethod === types_1.PriorityFeeMethod.DRIFT) {
+            else if (this.priorityFeeMethod === types_1.PriorityFeeMethod.VELOCITY) {
                 await this.loadForDrift();
             }
             else {
@@ -186,8 +190,8 @@ class PriorityFeeSubscriber {
     updateAddresses(addresses) {
         this.addresses = addresses.map((k) => k.toBase58());
     }
-    updateMarketTypeAndIndex(driftMarkets) {
-        this.driftMarkets = driftMarkets;
+    updateMarketTypeAndIndex(velocityMarkets) {
+        this.velocityMarkets = velocityMarkets;
     }
 }
 exports.PriorityFeeSubscriber = PriorityFeeSubscriber;

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

@@ -1,42 +1,44 @@
 import { VelocityMarketInfo, VelocityPriorityFeeLevels } from './velocityPriorityFeeMethod';
 import { PriorityFeeSubscriberMapConfig } from './types';
 /**
- * takes advantage of /batchPriorityFees endpoint from drift hosted priority fee service
+ * takes advantage of /batchPriorityFees endpoint from Velocity hosted priority fee service
  */
 export declare class PriorityFeeSubscriberMap {
     frequencyMs: number;
     intervalId?: ReturnType<typeof setTimeout>;
-    driftMarkets?: VelocityMarketInfo[];
-    velocityPriorityFeeEndpoint?: string;
+    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 | undefined;
+    get driftPriorityFeeEndpoint(): string;
     feesMap: Map<string, Map<number, VelocityPriorityFeeLevels>>;
     constructor(config: PriorityFeeSubscriberMapConfig);
     private updateFeesMap;
     subscribe(): Promise<void>;
     unsubscribe(): Promise<void>;
     load(): Promise<void>;
-    updateMarketTypeAndIndex(driftMarkets: VelocityMarketInfo[]): void;
+    updateMarketTypeAndIndex(velocityMarkets: VelocityMarketInfo[]): void;
     getPriorityFees(marketType: string, marketIndex: number): VelocityPriorityFeeLevels | undefined;
 }
 /** Example usage:
 async function main() {
-    const driftMarkets: VelocityMarketInfo[] = [
+    const velocityMarkets: VelocityMarketInfo[] = [
         { marketType: 'perp', marketIndex: 0 },
         { marketType: 'perp', marketIndex: 1 },
         { marketType: 'spot', marketIndex: 2 }
     ];
 
     const subscriber = new PriorityFeeSubscriberMap({
-        velocityPriorityFeeEndpoint: 'https://dlob.drift.trade',
+        velocityPriorityFeeEndpoint: 'https://dlob.velocity.trade',
         frequencyMs: 5000,
-        driftMarkets
+        velocityMarkets
     });
     await subscriber.subscribe();
 
     for (let i = 0; i < 20; i++) {
         await new Promise(resolve => setTimeout(resolve, 1000));
-        driftMarkets.forEach(market => {
+        velocityMarkets.forEach(market => {
             const fees = subscriber.getPriorityFees(market.marketType, market.marketIndex);
             console.log(`Priority fees for ${market.marketType} market ${market.marketIndex}:`, fees);
         });

package/lib/browser/priorityFee/priorityFeeSubscriberMap.js

@@ -4,24 +4,24 @@ exports.PriorityFeeSubscriberMap = void 0;
 const velocityPriorityFeeMethod_1 = require("./velocityPriorityFeeMethod");
 const types_1 = require("./types");
 /**
- * takes advantage of /batchPriorityFees endpoint from drift hosted priority fee service
+ * 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;
-        this.frequencyMs = config.frequencyMs;
+        var _a, _b, _c;
         this.frequencyMs =
             (_a = config.frequencyMs) !== null && _a !== void 0 ? _a : types_1.DEFAULT_PRIORITY_FEE_MAP_FREQUENCY_MS;
-        const endpoint = (_b = config.velocityPriorityFeeEndpoint) !== null && _b !== void 0 ? _b : config.driftPriorityFeeEndpoint;
-        if (!endpoint) {
-            throw new Error('PriorityFeeSubscriberMap: velocityPriorityFeeEndpoint (or deprecated driftPriorityFeeEndpoint) must be provided');
-        }
-        this.velocityPriorityFeeEndpoint = endpoint;
-        this.driftMarkets = config.driftMarkets;
+        // 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.feesMap = new Map();
         this.feesMap.set('perp', new Map());
         this.feesMap.set('spot', new Map());
@@ -46,18 +46,18 @@ class PriorityFeeSubscriberMap {
     }
     async load() {
         try {
-            if (!this.driftMarkets) {
+            if (!this.velocityMarkets) {
                 return;
             }
-            const fees = await (0, velocityPriorityFeeMethod_1.fetchVelocityPriorityFee)(this.velocityPriorityFeeEndpoint, this.driftMarkets.map((m) => m.marketType), this.driftMarkets.map((m) => m.marketIndex));
+            const fees = await (0, velocityPriorityFeeMethod_1.fetchVelocityPriorityFee)(this.velocityPriorityFeeEndpoint, this.velocityMarkets.map((m) => m.marketType), this.velocityMarkets.map((m) => m.marketIndex));
             this.updateFeesMap(fees);
         }
         catch (e) {
-            console.error('Error fetching drift priority fees', e);
+            console.error('Error fetching priority fees', e);
         }
     }
-    updateMarketTypeAndIndex(driftMarkets) {
-        this.driftMarkets = driftMarkets;
+    updateMarketTypeAndIndex(velocityMarkets) {
+        this.velocityMarkets = velocityMarkets;
     }
     getPriorityFees(marketType, marketIndex) {
         var _a;
@@ -67,22 +67,22 @@ class PriorityFeeSubscriberMap {
 exports.PriorityFeeSubscriberMap = PriorityFeeSubscriberMap;
 /** Example usage:
 async function main() {
-    const driftMarkets: VelocityMarketInfo[] = [
+    const velocityMarkets: VelocityMarketInfo[] = [
         { marketType: 'perp', marketIndex: 0 },
         { marketType: 'perp', marketIndex: 1 },
         { marketType: 'spot', marketIndex: 2 }
     ];
 
     const subscriber = new PriorityFeeSubscriberMap({
-        velocityPriorityFeeEndpoint: 'https://dlob.drift.trade',
+        velocityPriorityFeeEndpoint: 'https://dlob.velocity.trade',
         frequencyMs: 5000,
-        driftMarkets
+        velocityMarkets
     });
     await subscriber.subscribe();
 
     for (let i = 0; i < 20; i++) {
         await new Promise(resolve => setTimeout(resolve, 1000));
-        driftMarkets.forEach(market => {
+        velocityMarkets.forEach(market => {
             const fees = subscriber.getPriorityFees(market.marketType, market.marketIndex);
             console.log(`Priority fees for ${market.marketType} market ${market.marketIndex}:`, fees);
         });

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

@@ -2,6 +2,7 @@ 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;
@@ -9,12 +10,14 @@ export interface PriorityFeeStrategy {
 export declare enum PriorityFeeMethod {
     SOLANA = "solana",
     HELIUS = "helius",
-    DRIFT = "drift"
+    VELOCITY = "velocity"
 }
 export type PriorityFeeSubscriberConfig = {
     connection?: Connection;
     frequencyMs?: number;
     addresses?: PublicKey[];
+    velocityMarkets?: VelocityMarketInfo[];
+    /** @deprecated Use `velocityMarkets` instead. `driftMarkets` will be removed in a future major. */
     driftMarkets?: VelocityMarketInfo[];
     customStrategy?: PriorityFeeStrategy;
     priorityFeeMethod?: PriorityFeeMethod;
@@ -26,10 +29,11 @@ export type PriorityFeeSubscriberConfig = {
     maxFeeMicroLamports?: number;
     priorityFeeMultiplier?: number;
 };
-export type PriorityFeeSubscriberMapConfig = {
+type PriorityFeeSubscriberMapConfigBase = {
     frequencyMs?: number;
+    velocityMarkets?: VelocityMarketInfo[];
+    /** @deprecated Use `velocityMarkets` instead. `driftMarkets` will be removed in a future major. */
     driftMarkets?: VelocityMarketInfo[];
-    velocityPriorityFeeEndpoint?: string;
-    /** @deprecated Use `velocityPriorityFeeEndpoint` instead. `driftPriorityFeeEndpoint` will be removed in a future major. */
-    driftPriorityFeeEndpoint?: string;
 };
+export type PriorityFeeSubscriberMapConfig = PriorityFeeSubscriberMapConfigBase & AtLeastOne<'velocityPriorityFeeEndpoint', 'driftPriorityFeeEndpoint', string>;
+export {};

package/lib/browser/priorityFee/types.js

@@ -6,5 +6,5 @@ var PriorityFeeMethod;
 (function (PriorityFeeMethod) {
     PriorityFeeMethod["SOLANA"] = "solana";
     PriorityFeeMethod["HELIUS"] = "helius";
-    PriorityFeeMethod["DRIFT"] = "drift";
+    PriorityFeeMethod["VELOCITY"] = "velocity";
 })(PriorityFeeMethod || (exports.PriorityFeeMethod = PriorityFeeMethod = {}));

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

@@ -1,21 +1,12 @@
-/// <reference types="node" />
-/// <reference types="node" />
-import { Commitment } from '@solana/web3.js';
 import { grpcProgramAccountSubscriber } from '../accounts/grpcProgramAccountSubscriber';
-import { GrpcConfigs, ResubOpts } from '../accounts/types';
+import { GrpcConfigs } from '../accounts/types';
 import { SignedMsgUserOrdersAccount } from '../types';
-import { SignedMsgUserOrdersAccountSubscriber } from './signedMsgUserAccountSubscriber';
-import { VelocityClient } from '../velocityClient';
+import { SignedMsgUserOrdersAccountSubscriber, SignedMsgUserOrdersAccountSubscriberConfig } from './signedMsgUserAccountSubscriber';
 export declare class grpcSignedMsgUserOrdersAccountSubscriber extends SignedMsgUserOrdersAccountSubscriber {
     private grpcConfigs;
     subscriber: grpcProgramAccountSubscriber<SignedMsgUserOrdersAccount>;
-    constructor({ grpcConfigs, driftClient, commitment, resubOpts, decodeFn, resyncIntervalMs, }: {
+    constructor({ grpcConfigs, ...rest }: SignedMsgUserOrdersAccountSubscriberConfig & {
         grpcConfigs: GrpcConfigs;
-        driftClient: VelocityClient;
-        commitment?: Commitment;
-        resubOpts?: ResubOpts;
-        decodeFn?: (name: string, data: Buffer) => SignedMsgUserOrdersAccount;
-        resyncIntervalMs?: number;
     });
     subscribe(): Promise<void>;
     unsubscribe(): Promise<void>;

package/lib/browser/swift/grpcSignedMsgUserAccountSubscriber.js

@@ -5,20 +5,14 @@ const grpcProgramAccountSubscriber_1 = require("../accounts/grpcProgramAccountSu
 const memcmp_1 = require("../memcmp");
 const signedMsgUserAccountSubscriber_1 = require("./signedMsgUserAccountSubscriber");
 class grpcSignedMsgUserOrdersAccountSubscriber extends signedMsgUserAccountSubscriber_1.SignedMsgUserOrdersAccountSubscriber {
-    constructor({ grpcConfigs, driftClient, commitment, resubOpts, decodeFn, resyncIntervalMs, }) {
-        super({
-            driftClient,
-            commitment,
-            resubOpts,
-            decodeFn,
-            resyncIntervalMs,
-        });
+    constructor({ grpcConfigs, ...rest }) {
+        super(rest);
         this.grpcConfigs = grpcConfigs;
     }
     async subscribe() {
         if (!this.subscriber) {
             this.subscriber =
-                await grpcProgramAccountSubscriber_1.grpcProgramAccountSubscriber.create(this.grpcConfigs, 'SingedMsgUserOrdersAccountMap', 'signedMsgUserOrders', this.driftClient.program, this.decodeFn, {
+                await grpcProgramAccountSubscriber_1.grpcProgramAccountSubscriber.create(this.grpcConfigs, 'SingedMsgUserOrdersAccountMap', 'signedMsgUserOrders', this.velocityClient.program, this.decodeFn, {
                     filters: [(0, memcmp_1.getSignedMsgUserOrdersFilter)()],
                 }, this.resubOpts);
         }

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

@@ -6,14 +6,23 @@ 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 = {
+    commitment?: Commitment;
+    resubOpts?: ResubOpts;
+    decodeFn?: (name: string, data: Buffer) => SignedMsgUserOrdersAccount;
+    resyncIntervalMs?: number;
+} & AtLeastOne<'velocityClient', 'driftClient', 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 driftClient: VelocityClient;
+    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>;
@@ -28,13 +37,7 @@ export declare class SignedMsgUserOrdersAccountSubscriber {
     fetchPromiseResolver: () => void;
     protected subscriber: WebSocketProgramAccountSubscriber<SignedMsgUserOrdersAccount>;
     eventEmitter: StrictEventEmitter<EventEmitter, SignedMsgUserOrdersAccountSubscriberEvents>;
-    constructor({ driftClient, commitment, resubOpts, decodeFn, resyncIntervalMs, }: {
-        driftClient: VelocityClient;
-        commitment?: Commitment;
-        resubOpts?: ResubOpts;
-        decodeFn?: (name: string, data: Buffer) => SignedMsgUserOrdersAccount;
-        resyncIntervalMs?: number;
-    });
+    constructor({ velocityClient, driftClient, 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,13 +5,18 @@ const memcmp_1 = require("../memcmp");
 const webSocketProgramAccountSubscriber_1 = require("../accounts/webSocketProgramAccountSubscriber");
 const events_1 = require("events");
 class SignedMsgUserOrdersAccountSubscriber {
-    constructor({ driftClient, commitment, resubOpts, decodeFn, resyncIntervalMs, }) {
+    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
+    get driftClient() {
+        return this.velocityClient;
+    }
+    constructor({ velocityClient, driftClient, commitment, resubOpts, decodeFn, resyncIntervalMs, }) {
         this.signedMsgUserOrderAccounts = new Map();
         this.commitment = commitment !== null && commitment !== void 0 ? commitment : 'confirmed';
         this.resubOpts = resubOpts;
-        this.driftClient = driftClient;
+        // Type-system guarantees at least one of the two is supplied.
+        this.velocityClient = (velocityClient !== null && velocityClient !== void 0 ? velocityClient : driftClient);
         this.decodeFn =
-            decodeFn !== null && decodeFn !== void 0 ? decodeFn : this.driftClient.program.account.signedMsgUserOrders.coder.accounts.decodeUnchecked.bind(this.driftClient.program.account.signedMsgUserOrders.coder
+            decodeFn !== null && decodeFn !== void 0 ? decodeFn : this.velocityClient.program.account.signedMsgUserOrders.coder.accounts.decodeUnchecked.bind(this.velocityClient.program.account.signedMsgUserOrders.coder
                 .accounts);
         this.resyncIntervalMs = resyncIntervalMs;
         this.eventEmitter = new events_1.EventEmitter();
@@ -21,7 +26,7 @@ class SignedMsgUserOrdersAccountSubscriber {
         if (!this.subscriber) {
             const filters = [(0, memcmp_1.getSignedMsgUserOrdersFilter)()];
             this.subscriber =
-                new webSocketProgramAccountSubscriber_1.WebSocketProgramAccountSubscriber('SingedMsgUserOrdersAccountMap', 'signedMsgUserOrders', this.driftClient.program, this.decodeFn, {
+                new webSocketProgramAccountSubscriber_1.WebSocketProgramAccountSubscriber('SingedMsgUserOrdersAccountMap', 'signedMsgUserOrders', this.velocityClient.program, this.decodeFn, {
                     filters,
                     commitment: this.commitment,
                 }, this.resubOpts);
@@ -57,7 +62,7 @@ class SignedMsgUserOrdersAccountSubscriber {
         });
         const skipEventEmitting = this.signedMsgUserOrderAccounts.size === 0;
         try {
-            const rpcResponseAndContext = await this.driftClient.connection.getProgramAccounts(this.driftClient.program.programId, {
+            const rpcResponseAndContext = await this.velocityClient.connection.getProgramAccounts(this.velocityClient.program.programId, {
                 commitment: this.commitment,
                 filters: [(0, memcmp_1.getSignedMsgUserOrdersFilter)()],
                 encoding: 'base64',

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

@@ -1,14 +1,13 @@
 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 {
     mustGetUserAccount(publicKey: string): Promise<UserAccount>;
 }
-export type SwiftOrderSubscriberConfig = {
-    driftClient: VelocityClient;
+type SwiftOrderSubscriberConfigBase = {
     userAccountGetter?: AccountGetter;
-    driftEnv: VelocityEnv;
     endpoint?: string;
     marketIndexes: number[];
     /**
@@ -18,6 +17,7 @@ export type SwiftOrderSubscriberConfig = {
     */
     keypair: Keypair;
 };
+export type SwiftOrderSubscriberConfig = SwiftOrderSubscriberConfigBase & AtLeastOne<'velocityEnv', 'driftEnv', VelocityEnv> & AtLeastOne<'velocityClient', 'driftClient', VelocityClient>;
 /**
  * Swift order message received from WebSocket
  */
@@ -47,7 +47,9 @@ export declare class SwiftOrderSubscriber {
     private heartbeatTimeout;
     private readonly heartbeatIntervalMs;
     private ws;
-    private driftClient;
+    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;
@@ -61,3 +63,4 @@ export declare class SwiftOrderSubscriber {
     private startHeartbeatTimer;
     private reconnect;
 }
+export {};