@velocity-exchange/sdk 0.0.5 → 0.2.0

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

@@ -17,4 +17,4 @@ export type HeliusPriorityFeeResponse = {
     };
     id: string;
 };
-export declare function fetchHeliusPriorityFee(heliusRpcUrl: string, lookbackDistance: number, addresses: string[]): Promise<HeliusPriorityFeeResponse>;
+export declare function fetchHeliusPriorityFee(heliusRpcUrl: string, lookbackDistance: number, addresses: string[]): Promise<HeliusPriorityFeeResponse | undefined>;

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

@@ -5,12 +5,10 @@ import { MaxOverSlotsStrategy } from './maxOverSlotsStrategy';
 import { HeliusPriorityFeeLevels, HeliusPriorityLevel } from './heliusPriorityFeeMethod';
 import { VelocityMarketInfo } from './velocityPriorityFeeMethod';
 export declare class PriorityFeeSubscriber {
-    connection: Connection;
+    connection?: Connection;
     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,14 +8,6 @@ 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;
         this.averageStrategy = new averageOverSlotsStrategy_1.AverageOverSlotsStrategy();
@@ -32,19 +24,19 @@ 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) {
                 if (config.heliusRpcUrl === undefined) {
-                    if (this.connection.rpcEndpoint.includes('helius')) {
+                    if ((_c = this.connection) === null || _c === void 0 ? void 0 : _c.rpcEndpoint.includes('helius')) {
                         this.heliusRpcUrl = this.connection.rpcEndpoint;
                     }
                     else {
@@ -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;
+                    (_d = config.velocityPriorityFeeEndpoint) !== null && _d !== void 0 ? _d : config.velocityPriorityFeeEndpoint;
             }
         }
         if (this.priorityFeeMethod === types_1.PriorityFeeMethod.SOLANA) {
@@ -76,7 +68,13 @@ class PriorityFeeSubscriber {
         await this.load();
     }
     async loadForSolana() {
+        if (this.connection === undefined) {
+            throw new Error('connection must be provided to use SOLANA priority fee API');
+        }
         const samples = await (0, solanaPriorityFeeMethod_1.fetchSolanaPriorityFee)(this.connection, this.lookbackDistance, this.addresses);
+        if (samples === undefined) {
+            throw new Error('fetchSolanaPriorityFee returned no samples');
+        }
         if (samples.length > 0) {
             this.latestPriorityFee = samples[0].prioritizationFee;
             this.lastSlotSeen = samples[0].slot;
@@ -89,9 +87,12 @@ class PriorityFeeSubscriber {
     }
     async loadForHelius() {
         var _a, _b;
+        if (this.heliusRpcUrl === undefined) {
+            throw new Error('heliusRpcUrl must be provided to use PriorityFeeMethod.HELIUS');
+        }
         const sample = await (0, heliusPriorityFeeMethod_1.fetchHeliusPriorityFee)(this.heliusRpcUrl, this.lookbackDistance, this.addresses);
         this.lastHeliusSample = (_b = (_a = sample === null || sample === void 0 ? void 0 : sample.result) === null || _a === void 0 ? void 0 : _a.priorityFeeLevels) !== null && _b !== void 0 ? _b : undefined;
-        if (this.lastHeliusSample) {
+        if (sample !== undefined && this.lastHeliusSample) {
             this.lastAvgStrategyResult =
                 this.lastHeliusSample[heliusPriorityFeeMethod_1.HeliusPriorityLevel.MEDIUM];
             this.lastMaxStrategyResult =
@@ -101,16 +102,31 @@ class PriorityFeeSubscriber {
             }
         }
     }
-    async loadForDrift() {
+    async loadForVelocity() {
         if (!this.velocityMarkets) {
             return;
         }
+        if (this.velocityPriorityFeeEndpoint === undefined) {
+            throw new Error('velocityPriorityFeeEndpoint must be provided to use PriorityFeeMethod.VELOCITY');
+        }
         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];
+            // The endpoint returns one fee-level set per requested market. Take the
+            // max level across markets so a transaction touching several markets is
+            // covered by the most expensive one. (Base indexed the array itself with
+            // a string enum key — `sample['medium']` — which yielded `undefined` and
+            // produced NaN strategy results; the missing per-element index is fixed
+            // here.)
+            this.lastAvgStrategyResult = Math.max(...sample.map((s) => s[heliusPriorityFeeMethod_1.HeliusPriorityLevel.MEDIUM]));
+            this.lastMaxStrategyResult = Math.max(...sample.map((s) => s[heliusPriorityFeeMethod_1.HeliusPriorityLevel.UNSAFE_MAX]));
             if (this.customStrategy) {
-                this.lastCustomStrategyResult = this.customStrategy.calculate(sample);
+                // Custom strategies expect `{ slot, prioritizationFee }[]`; map each
+                // market's medium level into that shape so they aggregate real values
+                // instead of summing the absent `prioritizationFee` field (NaN).
+                this.lastCustomStrategyResult = this.customStrategy.calculate(sample.map((s) => ({
+                    slot: 0,
+                    prioritizationFee: s[heliusPriorityFeeMethod_1.HeliusPriorityLevel.MEDIUM],
+                })));
             }
         }
     }
@@ -169,7 +185,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/solanaPriorityFeeMethod.d.ts

@@ -3,4 +3,4 @@ export type SolanaPriorityFeeResponse = {
     slot: number;
     prioritizationFee: number;
 };
-export declare function fetchSolanaPriorityFee(connection: Connection, lookbackDistance: number, addresses: string[]): Promise<SolanaPriorityFeeResponse[]>;
+export declare function fetchSolanaPriorityFee(connection: Connection, lookbackDistance: number, addresses: string[]): Promise<SolanaPriorityFeeResponse[] | undefined>;

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/pyth/types.d.ts

@@ -2222,5 +2222,4 @@ export type PythSolanaReceiver = {
     ];
 };
 export declare const IDL: PythSolanaReceiver;
-export declare const PYTH_SOLANA_RECEIVER_IDL: PythSolanaReceiver;
 export type PriceUpdateAccount = IdlAccounts<PythSolanaReceiver>['priceUpdateV2'];

package/lib/browser/slot/SlotSubscriber.d.ts

@@ -11,7 +11,7 @@ export interface SlotSubscriberEvents {
 export declare class SlotSubscriber {
     private connection;
     currentSlot: number;
-    subscriptionId: number;
+    subscriptionId?: number;
     eventEmitter: StrictEventEmitter<EventEmitter, SlotSubscriberEvents>;
     timeoutId?: ReturnType<typeof setTimeout>;
     resubTimeoutMs?: number;

package/lib/browser/slot/SlotSubscriber.js

@@ -5,11 +5,12 @@ const events_1 = require("events");
 class SlotSubscriber {
     constructor(connection, config) {
         this.connection = connection;
+        this.currentSlot = 0;
         this.isUnsubscribing = false;
         this.receivingData = false;
         this.eventEmitter = new events_1.EventEmitter();
         this.resubTimeoutMs = config === null || config === void 0 ? void 0 : config.resubTimeoutMs;
-        if (this.resubTimeoutMs < 1000) {
+        if (this.resubTimeoutMs !== undefined && this.resubTimeoutMs < 1000) {
             console.log('resubTimeoutMs should be at least 1000ms to avoid spamming resub');
         }
     }

package/lib/browser/slot/SlothashSubscriber.d.ts

@@ -9,8 +9,9 @@ export type Slothash = {
 };
 export declare class SlothashSubscriber {
     private connection;
-    currentSlothash: Slothash;
-    subscriptionId: number;
+    private _currentSlothash?;
+    private get currentSlothash();
+    subscriptionId?: number;
     commitment: Commitment;
     timeoutId?: ReturnType<typeof setTimeout>;
     resubTimeoutMs?: number;

package/lib/browser/slot/SlothashSubscriber.js

@@ -8,6 +8,12 @@ const web3_js_1 = require("@solana/web3.js");
 const bs58_1 = __importDefault(require("bs58"));
 const anchor_1 = require("../isomorphic/anchor");
 class SlothashSubscriber {
+    get currentSlothash() {
+        if (!this._currentSlothash) {
+            throw new Error('SlothashSubscriber: slothash accessed before subscribe()');
+        }
+        return this._currentSlothash;
+    }
     constructor(connection, config) {
         var _a;
         this.connection = connection;
@@ -15,7 +21,7 @@ class SlothashSubscriber {
         this.receivingData = false;
         this.resubTimeoutMs = config === null || config === void 0 ? void 0 : config.resubTimeoutMs;
         this.commitment = (_a = config === null || config === void 0 ? void 0 : config.commitment) !== null && _a !== void 0 ? _a : 'processed';
-        if (this.resubTimeoutMs < 1000) {
+        if (this.resubTimeoutMs != null && this.resubTimeoutMs < 1000) {
             console.log('resubTimeoutMs should be at least 1000ms to avoid spamming resub');
         }
     }
@@ -27,15 +33,16 @@ class SlothashSubscriber {
         if (currentAccountData == null) {
             throw new Error('Failed to retrieve current slot hash');
         }
-        this.currentSlothash = deserializeSlothash(currentAccountData.data);
+        this._currentSlothash = deserializeSlothash(currentAccountData.data);
         this.subscriptionId = this.connection.onAccountChange(web3_js_1.SYSVAR_SLOT_HASHES_PUBKEY, (slothashInfo, context) => {
-            if (!this.currentSlothash || this.currentSlothash.slot < context.slot) {
+            if (!this._currentSlothash ||
+                this._currentSlothash.slot < context.slot) {
                 if (this.resubTimeoutMs && !this.isUnsubscribing) {
                     this.receivingData = true;
                     clearTimeout(this.timeoutId);
                     this.setTimeout();
                 }
-                this.currentSlothash = deserializeSlothash(slothashInfo.data);
+                this._currentSlothash = deserializeSlothash(slothashInfo.data);
             }
         }, this.commitment);
         if (this.resubTimeoutMs) {

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/grpcSignedMsgUserAccountSubscriber.d.ts

@@ -1,10 +1,7 @@
-import { grpcProgramAccountSubscriber } from '../accounts/grpcProgramAccountSubscriber';
 import { GrpcConfigs } from '../accounts/types';
-import { SignedMsgUserOrdersAccount } from '../types';
 import { SignedMsgUserOrdersAccountSubscriber, SignedMsgUserOrdersAccountSubscriberConfig } from './signedMsgUserAccountSubscriber';
 export declare class grpcSignedMsgUserOrdersAccountSubscriber extends SignedMsgUserOrdersAccountSubscriber {
     private grpcConfigs;
-    subscriber: grpcProgramAccountSubscriber<SignedMsgUserOrdersAccount>;
     constructor({ grpcConfigs, ...rest }: SignedMsgUserOrdersAccountSubscriberConfig & {
         grpcConfigs: GrpcConfigs;
     });

package/lib/browser/swift/grpcSignedMsgUserAccountSubscriber.js

@@ -10,8 +10,8 @@ class grpcSignedMsgUserOrdersAccountSubscriber extends signedMsgUserAccountSubsc
         this.grpcConfigs = grpcConfigs;
     }
     async subscribe() {
-        if (!this.subscriber) {
-            this.subscriber =
+        if (!this._subscriber) {
+            this._subscriber =
                 await grpcProgramAccountSubscriber_1.grpcProgramAccountSubscriber.create(this.grpcConfigs, 'SingedMsgUserOrdersAccountMap', 'signedMsgUserOrders', this.velocityClient.program, this.decodeFn, {
                     filters: [(0, memcmp_1.getSignedMsgUserOrdersFilter)()],
                 }, this.resubOpts);
@@ -38,10 +38,10 @@ class grpcSignedMsgUserOrdersAccountSubscriber extends signedMsgUserAccountSubsc
         }
     }
     async unsubscribe() {
-        if (!this.subscriber)
+        if (!this._subscriber)
             return;
-        await this.subscriber.unsubscribe();
-        this.subscriber = undefined;
+        await this._subscriber.unsubscribe();
+        this._subscriber = undefined;
         if (this.resyncTimeoutId !== undefined) {
             clearTimeout(this.resyncTimeoutId);
             this.resyncTimeoutId = undefined;

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>;
@@ -34,10 +33,11 @@ export declare class SignedMsgUserOrdersAccountSubscriber {
     }>;
     mostRecentSlot: number;
     fetchPromise?: Promise<void>;
-    fetchPromiseResolver: () => void;
-    protected subscriber: WebSocketProgramAccountSubscriber<SignedMsgUserOrdersAccount>;
+    private fetchPromiseResolver;
+    protected _subscriber?: WebSocketProgramAccountSubscriber<SignedMsgUserOrdersAccount>;
+    protected get 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,20 @@ 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;
+    get subscriber() {
+        if (!this._subscriber) {
+            throw new Error('SignedMsgUserOrdersAccountSubscriber: subscriber accessed before subscribe()');
+        }
+        return this._subscriber;
     }
-    constructor({ velocityClient, driftClient, commitment, resubOpts, decodeFn, resyncIntervalMs, }) {
+    constructor({ velocityClient, commitment, resubOpts, decodeFn, resyncIntervalMs, }) {
         this.signedMsgUserOrderAccounts = new Map();
+        this.mostRecentSlot = 0;
+        this.fetchPromiseResolver = () => { };
         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);
@@ -23,9 +27,9 @@ class SignedMsgUserOrdersAccountSubscriber {
         this.resubOpts = resubOpts;
     }
     async subscribe() {
-        if (!this.subscriber) {
+        if (!this._subscriber) {
             const filters = [(0, memcmp_1.getSignedMsgUserOrdersFilter)()];
-            this.subscriber =
+            this._subscriber =
                 new webSocketProgramAccountSubscriber_1.WebSocketProgramAccountSubscriber('SingedMsgUserOrdersAccountMap', 'signedMsgUserOrders', this.velocityClient.program, this.decodeFn, {
                     filters,
                     commitment: this.commitment,
@@ -110,10 +114,10 @@ class SignedMsgUserOrdersAccountSubscriber {
         }
     }
     async unsubscribe() {
-        if (!this.subscriber)
+        if (!this._subscriber)
             return;
-        await this.subscriber.unsubscribe();
-        this.subscriber = undefined;
+        await this._subscriber.unsubscribe();
+        this._subscriber = undefined;
         if (this.resyncTimeoutId !== undefined) {
             clearTimeout(this.resyncTimeoutId);
             this.resyncTimeoutId = undefined;

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,10 +51,8 @@ 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>;
+    onOrder?: (orderMessageRaw: SwiftOrderMessage, signedMessage: SignedMsgOrderParamsMessage | SignedMsgOrderParamsDelegateMessage, isDelegateSigner?: boolean) => Promise<void>;
     subscribed: boolean;
     constructor(config: SwiftOrderSubscriberConfig);
     unsubscribe(): void;