@velocity-exchange/sdk 0.0.2 → 0.0.3

package/lib/browser/velocityClient.js

@@ -192,7 +192,7 @@ class VelocityClient {
         }
         if (config.userStats) {
             this.userStats = new userStats_1.UserStats({
-                driftClient: this,
+                velocityClient: this,
                 userStatsAccountPublicKey: (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, this.authority),
                 accountSubscription: this.userAccountSubscriptionConfig,
             });
@@ -245,7 +245,7 @@ class VelocityClient {
     createUser(subAccountId, accountSubscriptionConfig, authority) {
         const userAccountPublicKey = (0, pda_1.getUserAccountPublicKeySync)(this.program.programId, authority !== null && authority !== void 0 ? authority : this.authority, subAccountId);
         return new user_1.User({
-            driftClient: this,
+            velocityClient: this,
             userAccountPublicKey,
             accountSubscription: accountSubscriptionConfig,
         });
@@ -437,7 +437,7 @@ class VelocityClient {
         }
         this.userStats = undefined;
         this.userStats = new userStats_1.UserStats({
-            driftClient: this,
+            velocityClient: this,
             userStatsAccountPublicKey: this.getUserStatsAccountPublicKey(),
             accountSubscription: this.userStatsAccountSubscriptionConfig,
         });
@@ -475,7 +475,7 @@ class VelocityClient {
         }
         this.userStats = undefined;
         this.userStats = new userStats_1.UserStats({
-            driftClient: this,
+            velocityClient: this,
             userStatsAccountPublicKey: this.getUserStatsAccountPublicKey(),
             accountSubscription: this.userStatsAccountSubscriptionConfig,
         });
@@ -500,7 +500,7 @@ class VelocityClient {
                 await this.userStats.unsubscribe();
             }
             this.userStats = new userStats_1.UserStats({
-                driftClient: this,
+                velocityClient: this,
                 userStatsAccountPublicKey: this.userStatsAccountPublicKey,
                 accountSubscription: this.userStatsAccountSubscriptionConfig,
             });

package/lib/browser/velocityClientConfig.d.ts

@@ -56,14 +56,16 @@ export type VelocityClientConfig = {
 };
 /** @deprecated Use `VelocityClientConfig` instead. `DriftClientConfig` will be removed in a future major. */
 export type DriftClientConfig = VelocityClientConfig;
+type GrpcVelocityClientAccountSubscriberCtor = new (grpcConfigs: GrpcConfigs, program: Program, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean, delistedMarketSetting: DelistedMarketSetting) => grpcVelocityClientAccountSubscriberV2 | grpcVelocityClientAccountSubscriber;
+type WsVelocityClientAccountSubscriberCtor = new (program: Program, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean, delistedMarketSetting: DelistedMarketSetting) => WebSocketVelocityClientAccountSubscriber | WebSocketVelocityClientAccountSubscriberV2;
 export type VelocityClientSubscriptionConfig = {
     type: 'grpc';
     grpcConfigs: GrpcConfigs;
     resubTimeoutMs?: number;
     logResubMessages?: boolean;
-    velocityClientAccountSubscriber?: new (grpcConfigs: GrpcConfigs, program: Program, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean, delistedMarketSetting: DelistedMarketSetting) => grpcVelocityClientAccountSubscriberV2 | grpcVelocityClientAccountSubscriber;
+    velocityClientAccountSubscriber?: GrpcVelocityClientAccountSubscriberCtor;
     /** @deprecated Use `velocityClientAccountSubscriber` instead. `driftClientAccountSubscriber` will be removed in a future major. */
-    driftClientAccountSubscriber?: new (grpcConfigs: GrpcConfigs, program: Program, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean, delistedMarketSetting: DelistedMarketSetting) => grpcVelocityClientAccountSubscriberV2 | grpcVelocityClientAccountSubscriber;
+    driftClientAccountSubscriber?: GrpcVelocityClientAccountSubscriberCtor;
     grpcMultiUserAccountSubscriber?: grpcMultiUserAccountSubscriber;
 } | {
     type: 'websocket';
@@ -73,12 +75,13 @@ export type VelocityClientSubscriptionConfig = {
     programUserAccountSubscriber?: WebSocketProgramAccountSubscriber<UserAccount>;
     perpMarketAccountSubscriber?: new (accountName: string, program: Program, accountPublicKey: PublicKey, decodeBuffer?: (buffer: Buffer) => any, resubOpts?: ResubOpts, commitment?: Commitment) => WebSocketAccountSubscriberV2<any> | WebSocketAccountSubscriber<any>;
     /** If you use V2 here, whatever you pass for perpMarketAccountSubscriber will be ignored and it will use v2 under the hood regardless */
-    velocityClientAccountSubscriber?: new (program: Program, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean, delistedMarketSetting: DelistedMarketSetting) => WebSocketVelocityClientAccountSubscriber | WebSocketVelocityClientAccountSubscriberV2;
+    velocityClientAccountSubscriber?: WsVelocityClientAccountSubscriberCtor;
     /** @deprecated Use `velocityClientAccountSubscriber` instead. `driftClientAccountSubscriber` will be removed in a future major. */
-    driftClientAccountSubscriber?: new (program: Program, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean, delistedMarketSetting: DelistedMarketSetting) => WebSocketVelocityClientAccountSubscriber | WebSocketVelocityClientAccountSubscriberV2;
+    driftClientAccountSubscriber?: WsVelocityClientAccountSubscriberCtor;
 } | {
     type: 'polling';
     accountLoader: BulkAccountLoader;
 };
 /** @deprecated Use `VelocityClientSubscriptionConfig` instead. `DriftClientSubscriptionConfig` will be removed in a future major. */
 export type DriftClientSubscriptionConfig = VelocityClientSubscriptionConfig;
+export {};

package/lib/node/auctionSubscriber/auctionSubscriber.d.ts

@@ -3,12 +3,14 @@ import { AuctionSubscriberConfig, AuctionSubscriberEvents } from './types';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 export declare class AuctionSubscriber {
-    private driftClient;
+    private velocityClient;
+    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
+    private get driftClient();
     private opts;
     private resubOpts?;
     eventEmitter: StrictEventEmitter<EventEmitter, AuctionSubscriberEvents>;
     private subscriber;
-    constructor({ driftClient, opts, resubTimeoutMs, logResubMessages, }: AuctionSubscriberConfig);
+    constructor({ velocityClient, driftClient, opts, resubTimeoutMs, logResubMessages, }: AuctionSubscriberConfig);
     subscribe(): Promise<void>;
     unsubscribe(): Promise<void>;
 }

package/lib/node/auctionSubscriber/auctionSubscriber.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auctionSubscriber.d.ts","sourceRoot":"","sources":["../../../src/auctionSubscriber/auctionSubscriber.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,MAAM,SAAS,CAAC;AAG3E,OAAO,kBAAkB,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAMtC,qBAAa,iBAAiB;IAC7B,OAAO,CAAC,WAAW,CAAiB;IACpC,OAAO,CAAC,IAAI,CAAiB;IAC7B,OAAO,CAAC,SAAS,CAAC,CAAY;IAE9B,YAAY,EAAE,kBAAkB,CAAC,YAAY,EAAE,uBAAuB,CAAC,CAAC;IACxE,OAAO,CAAC,UAAU,CAAiD;gBAEvD,EACX,WAAW,EACX,IAAI,EACJ,cAAc,EACd,gBAAgB,GAChB,EAAE,uBAAuB;IAOb,SAAS;IA+BT,WAAW;CAMxB"}
+{"version":3,"file":"auctionSubscriber.d.ts","sourceRoot":"","sources":["../../../src/auctionSubscriber/auctionSubscriber.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,MAAM,SAAS,CAAC;AAG3E,OAAO,kBAAkB,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAMtC,qBAAa,iBAAiB;IAC7B,OAAO,CAAC,cAAc,CAAiB;IACvC,iGAAiG;IACjG,OAAO,KAAK,WAAW,GAEtB;IACD,OAAO,CAAC,IAAI,CAAiB;IAC7B,OAAO,CAAC,SAAS,CAAC,CAAY;IAE9B,YAAY,EAAE,kBAAkB,CAAC,YAAY,EAAE,uBAAuB,CAAC,CAAC;IACxE,OAAO,CAAC,UAAU,CAAiD;gBAEvD,EACX,cAAc,EACd,WAAW,EACX,IAAI,EACJ,cAAc,EACd,gBAAgB,GAChB,EAAE,uBAAuB;IAQb,SAAS;IA+BT,WAAW;CAMxB"}

package/lib/node/auctionSubscriber/auctionSubscriber.js

@@ -5,15 +5,20 @@ const memcmp_1 = require("../memcmp");
 const events_1 = require("events");
 const webSocketProgramAccountSubscriber_1 = require("../accounts/webSocketProgramAccountSubscriber");
 class AuctionSubscriber {
-    constructor({ driftClient, opts, resubTimeoutMs, logResubMessages, }) {
-        this.driftClient = driftClient;
-        this.opts = opts || this.driftClient.opts;
+    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
+    get driftClient() {
+        return this.velocityClient;
+    }
+    constructor({ velocityClient, driftClient, opts, resubTimeoutMs, logResubMessages, }) {
+        // Type-system guarantees at least one of the two is supplied.
+        this.velocityClient = (velocityClient !== null && velocityClient !== void 0 ? velocityClient : driftClient);
+        this.opts = opts || this.velocityClient.opts;
         this.eventEmitter = new events_1.EventEmitter();
         this.resubOpts = { resubTimeoutMs, logResubMessages };
     }
     async subscribe() {
         if (!this.subscriber) {
-            this.subscriber = new webSocketProgramAccountSubscriber_1.WebSocketProgramAccountSubscriber('AuctionSubscriber', 'user', this.driftClient.program, this.driftClient.program.account.user.coder.accounts.decode.bind(this.driftClient.program.account.user.coder.accounts), {
+            this.subscriber = new webSocketProgramAccountSubscriber_1.WebSocketProgramAccountSubscriber('AuctionSubscriber', 'user', this.velocityClient.program, this.velocityClient.program.account.user.coder.accounts.decode.bind(this.velocityClient.program.account.user.coder.accounts), {
                 filters: [(0, memcmp_1.getUserFilter)(), (0, memcmp_1.getUserWithAuctionFilter)()],
                 commitment: this.opts.commitment,
             }, this.resubOpts);

package/lib/node/auctionSubscriber/auctionSubscriberGrpc.d.ts

@@ -3,13 +3,15 @@ import { AuctionSubscriberConfig, AuctionSubscriberEvents } from './types';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 export declare class AuctionSubscriberGrpc {
-    private driftClient;
+    private velocityClient;
+    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
+    private get driftClient();
     private opts;
     private resubOpts?;
     private grpcConfigs?;
     eventEmitter: StrictEventEmitter<EventEmitter, AuctionSubscriberEvents>;
     private subscriber;
-    constructor({ driftClient, opts, grpcConfigs, resubTimeoutMs, logResubMessages, }: AuctionSubscriberConfig);
+    constructor({ velocityClient, driftClient, opts, grpcConfigs, resubTimeoutMs, logResubMessages, }: AuctionSubscriberConfig);
     subscribe(): Promise<void>;
     unsubscribe(): Promise<void>;
 }

package/lib/node/auctionSubscriber/auctionSubscriberGrpc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auctionSubscriberGrpc.d.ts","sourceRoot":"","sources":["../../../src/auctionSubscriber/auctionSubscriberGrpc.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,MAAM,SAAS,CAAC;AAG3E,OAAO,kBAAkB,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAOtC,qBAAa,qBAAqB;IACjC,OAAO,CAAC,WAAW,CAAiB;IACpC,OAAO,CAAC,IAAI,CAAiB;IAC7B,OAAO,CAAC,SAAS,CAAC,CAAY;IAC9B,OAAO,CAAC,WAAW,CAAC,CAAc;IAElC,YAAY,EAAE,kBAAkB,CAAC,YAAY,EAAE,uBAAuB,CAAC,CAAC;IACxE,OAAO,CAAC,UAAU,CAAiD;gBAEvD,EACX,WAAW,EACX,IAAI,EACJ,WAAW,EACX,cAAc,EACd,gBAAgB,GAChB,EAAE,uBAAuB;IAQb,SAAS;IA+BT,WAAW;CAMxB"}
+{"version":3,"file":"auctionSubscriberGrpc.d.ts","sourceRoot":"","sources":["../../../src/auctionSubscriber/auctionSubscriberGrpc.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,MAAM,SAAS,CAAC;AAG3E,OAAO,kBAAkB,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAOtC,qBAAa,qBAAqB;IACjC,OAAO,CAAC,cAAc,CAAiB;IACvC,iGAAiG;IACjG,OAAO,KAAK,WAAW,GAEtB;IACD,OAAO,CAAC,IAAI,CAAiB;IAC7B,OAAO,CAAC,SAAS,CAAC,CAAY;IAC9B,OAAO,CAAC,WAAW,CAAC,CAAc;IAElC,YAAY,EAAE,kBAAkB,CAAC,YAAY,EAAE,uBAAuB,CAAC,CAAC;IACxE,OAAO,CAAC,UAAU,CAAiD;gBAEvD,EACX,cAAc,EACd,WAAW,EACX,IAAI,EACJ,WAAW,EACX,cAAc,EACd,gBAAgB,GAChB,EAAE,uBAAuB;IASb,SAAS;IA+BT,WAAW;CAMxB"}

package/lib/node/auctionSubscriber/auctionSubscriberGrpc.js

@@ -5,16 +5,21 @@ const memcmp_1 = require("../memcmp");
 const events_1 = require("events");
 const grpcProgramAccountSubscriber_1 = require("../accounts/grpcProgramAccountSubscriber");
 class AuctionSubscriberGrpc {
-    constructor({ driftClient, opts, grpcConfigs, resubTimeoutMs, logResubMessages, }) {
-        this.driftClient = driftClient;
-        this.opts = opts || this.driftClient.opts;
+    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
+    get driftClient() {
+        return this.velocityClient;
+    }
+    constructor({ velocityClient, driftClient, opts, grpcConfigs, resubTimeoutMs, logResubMessages, }) {
+        // Type-system guarantees at least one of the two is supplied.
+        this.velocityClient = (velocityClient !== null && velocityClient !== void 0 ? velocityClient : driftClient);
+        this.opts = opts || this.velocityClient.opts;
         this.eventEmitter = new events_1.EventEmitter();
         this.resubOpts = { resubTimeoutMs, logResubMessages };
         this.grpcConfigs = grpcConfigs;
     }
     async subscribe() {
         if (!this.subscriber) {
-            this.subscriber = await grpcProgramAccountSubscriber_1.grpcProgramAccountSubscriber.create(this.grpcConfigs, 'AuctionSubscriber', 'user', this.driftClient.program, this.driftClient.program.account.user.coder.accounts.decode.bind(this.driftClient.program.account.user.coder.accounts), {
+            this.subscriber = await grpcProgramAccountSubscriber_1.grpcProgramAccountSubscriber.create(this.grpcConfigs, 'AuctionSubscriber', 'user', this.velocityClient.program, this.velocityClient.program.account.user.coder.accounts.decode.bind(this.velocityClient.program.account.user.coder.accounts), {
                 filters: [(0, memcmp_1.getUserFilter)(), (0, memcmp_1.getUserWithAuctionFilter)()],
             }, this.resubOpts);
         }

package/lib/node/auctionSubscriber/types.d.ts

@@ -2,14 +2,16 @@ import { GrpcConfigs } from '../accounts/types';
 import { VelocityClient } from '../velocityClient';
 import { UserAccount } from '../types';
 import { ConfirmOptions, PublicKey } from '@solana/web3.js';
-export type AuctionSubscriberConfig = {
-    driftClient: VelocityClient;
+import { AtLeastOne } from '../util/deprecatedAlias';
+type AuctionSubscriberConfigBase = {
     opts?: ConfirmOptions;
     resubTimeoutMs?: number;
     logResubMessages?: boolean;
     grpcConfigs?: GrpcConfigs;
 };
+export type AuctionSubscriberConfig = AuctionSubscriberConfigBase & AtLeastOne<'velocityClient', 'driftClient', VelocityClient>;
 export interface AuctionSubscriberEvents {
     onAccountUpdate: (account: UserAccount, pubkey: PublicKey, slot: number) => void;
 }
+export {};
 //# sourceMappingURL=types.d.ts.map

package/lib/node/auctionSubscriber/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/auctionSubscriber/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5D,MAAM,MAAM,uBAAuB,GAAG;IACrC,WAAW,EAAE,cAAc,CAAC;IAC5B,IAAI,CAAC,EAAE,cAAc,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,WAAW,CAAC,EAAE,WAAW,CAAC;CAC1B,CAAC;AAEF,MAAM,WAAW,uBAAuB;IACvC,eAAe,EAAE,CAChB,OAAO,EAAE,WAAW,EACpB,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,MAAM,KACR,IAAI,CAAC;CACV"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/auctionSubscriber/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD,KAAK,2BAA2B,GAAG;IAClC,IAAI,CAAC,EAAE,cAAc,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,WAAW,CAAC,EAAE,WAAW,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG,2BAA2B,GAChE,UAAU,CAAC,gBAAgB,EAAE,aAAa,EAAE,cAAc,CAAC,CAAC;AAE7D,MAAM,WAAW,uBAAuB;IACvC,eAAe,EAAE,CAChB,OAAO,EAAE,WAAW,EACpB,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,MAAM,KACR,IAAI,CAAC;CACV"}

package/lib/node/config.d.ts

@@ -11,6 +11,8 @@ export type DriftProgram = VelocityProgram;
 export type VelocityEnv = 'devnet' | 'mainnet-beta';
 /** @deprecated Use `VelocityEnv` instead. `DriftEnv` will be removed in a future major. */
 export type DriftEnv = VelocityEnv;
+/** Widened env type accepted by `initialize()`; `'master'` is a legacy alias for `'devnet'`. */
+export type LegacyVelocityEnv = VelocityEnv | 'master';
 export interface VelocityConfig {
     ENV: VelocityEnv;
     PYTH_ORACLE_MAPPING_ADDRESS: string;
@@ -50,15 +52,8 @@ export declare const configs: {
     [key in VelocityEnv]: VelocityConfig;
 };
 export declare const getConfig: () => VelocityConfig;
-/**
- * Allows customization of the SDK's environment and endpoints. You can pass individual settings to override the settings with your own presets.
- *
- * Defaults to master environment if you don't use this function.
- * @param props
- * @returns
- */
 export declare const initialize: (props: {
-    env: VelocityEnv;
+    env: LegacyVelocityEnv;
     overrideEnv?: Partial<VelocityConfig>;
 }) => VelocityConfig;
 export declare function getMarketsAndOraclesForSubscription(env: VelocityEnv, perpMarkets?: PerpMarketConfig[], spotMarkets?: SpotMarketConfig[]): {

package/lib/node/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"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"}

package/lib/node/config.js

@@ -75,31 +75,23 @@ exports.getConfig = getConfig;
  * @param props
  * @returns
  */
+/**
+ * Mirror a canonical/deprecated alias pair so the resolved config carries the
+ * same value under both keys regardless of which one the caller overrode.
+ */
+const mirrorAlias = (merged, override, canon, deprecated) => {
+    var _a, _b;
+    const value = (_b = (_a = override[canon]) !== null && _a !== void 0 ? _a : override[deprecated]) !== null && _b !== void 0 ? _b : merged[canon];
+    merged[canon] = value;
+    merged[deprecated] = value;
+};
 const initialize = (props) => {
     var _a;
     const override = (_a = props.overrideEnv) !== null && _a !== void 0 ? _a : {};
-    //@ts-ignore
-    const base = props.env === 'master' ? exports.configs['devnet'] : exports.configs[props.env];
-    const merged = { ...base, ...override };
-    const overrodeVelocity = 'VELOCITY_PROGRAM_ID' in override;
-    const overrodeDrift = 'DRIFT_PROGRAM_ID' in override;
-    if (overrodeVelocity && !overrodeDrift) {
-        merged.DRIFT_PROGRAM_ID = merged.VELOCITY_PROGRAM_ID;
-    }
-    else if (overrodeDrift && !overrodeVelocity) {
-        merged.VELOCITY_PROGRAM_ID = merged.DRIFT_PROGRAM_ID;
-    }
-    const overrodeVelocityOracleReceiver = 'VELOCITY_ORACLE_RECEIVER_ID' in override;
-    const overrodeDriftOracleReceiver = 'DRIFT_ORACLE_RECEIVER_ID' in override;
-    if (overrodeVelocityOracleReceiver && !overrodeDriftOracleReceiver) {
-        merged.DRIFT_ORACLE_RECEIVER_ID = merged.VELOCITY_ORACLE_RECEIVER_ID;
-    }
-    else if (overrodeDriftOracleReceiver && !overrodeVelocityOracleReceiver) {
-        merged.VELOCITY_ORACLE_RECEIVER_ID = merged.DRIFT_ORACLE_RECEIVER_ID;
-    }
-    //@ts-ignore
-    if (props.env === 'master')
-        return merged;
+    const normalizedEnv = props.env === 'master' ? 'devnet' : props.env;
+    const merged = { ...exports.configs[normalizedEnv], ...override };
+    mirrorAlias(merged, override, 'VELOCITY_PROGRAM_ID', 'DRIFT_PROGRAM_ID');
+    mirrorAlias(merged, override, 'VELOCITY_ORACLE_RECEIVER_ID', 'DRIFT_ORACLE_RECEIVER_ID');
     currentConfig = merged;
     return currentConfig;
 };

package/lib/node/constituentMap/constituentMap.d.ts

@@ -3,7 +3,9 @@ import { DataAndSlot } from '../accounts/types';
 import { ConstituentAccount } from '../types';
 import { VelocityClient } from '../velocityClient';
 export type ConstituentMapConfig = {
-    driftClient: VelocityClient;
+    velocityClient?: VelocityClient;
+    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
+    driftClient?: VelocityClient;
     connection?: Connection;
     subscriptionConfig: {
         type: 'polling';
@@ -31,7 +33,7 @@ export interface ConstituentMapInterface {
     mustGetWithSlot(key: string): Promise<DataAndSlot<ConstituentAccount>>;
 }
 export declare class ConstituentMap implements ConstituentMapInterface {
-    private driftClient;
+    private velocityClient;
     private constituentMap;
     private constituentAccountSubscriber;
     private additionalFilters?;

package/lib/node/constituentMap/constituentMap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constituentMap.d.ts","sourceRoot":"","sources":["../../../src/constituentMap/constituentMap.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"constituentMap.d.ts","sourceRoot":"","sources":["../../../src/constituentMap/constituentMap.ts"],"names":[],"mappings":"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"}

package/lib/node/constituentMap/constituentMap.js

@@ -9,23 +9,27 @@ const pda_1 = require("../addresses/pda");
 const MAX_CONSTITUENT_SIZE_BYTES = 480; // TODO: update this when account is finalized
 class ConstituentMap {
     constructor(config) {
-        var _a, _b;
+        var _a, _b, _c;
         this.constituentMap = new Map();
         this.constituentIndexToKeyMap = new Map();
         this.spotMarketIndexToKeyMap = new Map();
-        this.driftClient = config.driftClient;
+        const velocityClient = (_a = config.velocityClient) !== null && _a !== void 0 ? _a : config.driftClient;
+        if (!velocityClient) {
+            throw new Error('ConstituentMap: velocityClient (or deprecated driftClient) must be provided');
+        }
+        this.velocityClient = velocityClient;
         this.additionalFilters = config.additionalFilters;
         this.commitment = config.subscriptionConfig.commitment;
-        this.connection = config.connection || this.driftClient.connection;
-        this.lpPoolId = (_a = config.lpPoolId) !== null && _a !== void 0 ? _a : 0;
-        this.decoder = (_b = config.decoder) !== null && _b !== void 0 ? _b : 'base64+zstd';
+        this.connection = config.connection || this.velocityClient.connection;
+        this.lpPoolId = (_b = config.lpPoolId) !== null && _b !== void 0 ? _b : 0;
+        this.decoder = (_c = config.decoder) !== null && _c !== void 0 ? _c : 'base64+zstd';
         if (config.subscriptionConfig.type === 'polling') {
             this.constituentAccountSubscriber =
-                new pollingConstituentAccountSubscriber_1.PollingConstituentAccountSubscriber(this, this.driftClient.program, config.subscriptionConfig.frequency, config.subscriptionConfig.commitment, this.getFilters());
+                new pollingConstituentAccountSubscriber_1.PollingConstituentAccountSubscriber(this, this.velocityClient.program, config.subscriptionConfig.frequency, config.subscriptionConfig.commitment, this.getFilters());
         }
         else if (config.subscriptionConfig.type === 'websocket') {
             this.constituentAccountSubscriber =
-                new webSocketConstituentAccountSubscriber_1.WebSocketConstituentAccountSubscriber(this, this.driftClient.program, config.subscriptionConfig.resubTimeoutMs, config.subscriptionConfig.commitment, this.getFilters());
+                new webSocketConstituentAccountSubscriber_1.WebSocketConstituentAccountSubscriber(this, this.velocityClient.program, config.subscriptionConfig.resubTimeoutMs, config.subscriptionConfig.commitment, this.getFilters());
         }
         // Listen for account updates from the subscriber
         this.constituentAccountSubscriber.eventEmitter.on('onAccountUpdate', (account, pubkey, slot) => {
@@ -35,7 +39,7 @@ class ConstituentMap {
     getFilters() {
         const filters = [
             (0, memcmp_1.getConstituentFilter)(),
-            (0, memcmp_1.getConstituentLpPoolFilter)((0, pda_1.getLpPoolPublicKey)(this.driftClient.program.programId, this.lpPoolId)),
+            (0, memcmp_1.getConstituentLpPoolFilter)((0, pda_1.getLpPoolPublicKey)(this.velocityClient.program.programId, this.lpPoolId)),
         ];
         if (this.additionalFilters) {
             filters.push(...this.additionalFilters);
@@ -43,12 +47,12 @@ class ConstituentMap {
         return filters;
     }
     decode(name, buffer) {
-        return this.driftClient.program.account.constituent.coder.accounts.decodeUnchecked(name, buffer);
+        return this.velocityClient.program.account.constituent.coder.accounts.decodeUnchecked(name, buffer);
     }
     async sync() {
         try {
             const rpcRequestArgs = [
-                this.driftClient.program.programId.toBase58(),
+                this.velocityClient.program.programId.toBase58(),
                 {
                     commitment: this.commitment,
                     filters: this.getFilters(),

package/lib/node/core/VelocityCore.d.ts

@@ -224,4 +224,8 @@ export declare class VelocityCore {
      */
     static buildInstructions(_ctx: VelocityCoreContext): TransactionInstruction[];
 }
+/** @deprecated Use `VelocityCore` instead. `DriftCore` will be removed in a future major. */
+export declare const DriftCore: typeof VelocityCore;
+/** @deprecated Use `VelocityCore` instead. `DriftCore` will be removed in a future major. */
+export type DriftCore = VelocityCore;
 //# sourceMappingURL=VelocityCore.d.ts.map

package/lib/node/core/VelocityCore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VelocityCore.d.ts","sourceRoot":"","sources":["../../../src/core/VelocityCore.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"VelocityCore.d.ts","sourceRoot":"","sources":["../../../src/core/VelocityCore.ts"],"names":[],"mappings":"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"}

package/lib/node/core/VelocityCore.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VelocityCore = void 0;
+exports.DriftCore = exports.VelocityCore = void 0;
 const pdas = __importStar(require("../addresses/pda"));
 const constants = __importStar(require("../constants"));
 const user_1 = require("../decode/user");
@@ -136,3 +136,5 @@ VelocityCore.constants = constants;
 /** Re-export remaining-accounts logic (pure). */
 VelocityCore.remainingAccounts = remainingAccounts;
 VelocityCore.signedMsg = signedMsg;
+/** @deprecated Use `VelocityCore` instead. `DriftCore` will be removed in a future major. */
+exports.DriftCore = VelocityCore;

package/lib/node/dlob/DLOBSubscriber.d.ts

@@ -9,7 +9,9 @@ import { MarketType } from '../types';
 import { L2OrderBook, L2OrderBookGenerator, L3OrderBook } from './orderBookLevels';
 import { BN } from '../isomorphic/anchor';
 export declare class DLOBSubscriber {
-    driftClient: VelocityClient;
+    velocityClient: VelocityClient;
+    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
+    get driftClient(): VelocityClient;
     dlobSource: DLOBSource;
     slotSource: SlotSource;
     updateFrequency: number;

package/lib/node/dlob/DLOBSubscriber.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DLOBSubscriber.d.ts","sourceRoot":"","sources":["../../../src/dlob/DLOBSubscriber.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,kBAAkB,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EACN,UAAU,EACV,oBAAoB,EACpB,sBAAsB,EACtB,UAAU,EACV,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAa,UAAU,EAAE,MAAM,UAAU,CAAC;AACjD,OAAO,EAIN,WAAW,EACX,oBAAoB,EACpB,WAAW,EACX,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,EAAE,EAAE,MAAM,sBAAsB,CAAC;AAE1C,qBAAa,cAAc;IAC1B,WAAW,EAAE,cAAc,CAAC;IAC5B,UAAU,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,UAAU,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;IAC3C,IAAI,EAAE,IAAI,CAAC;IACJ,YAAY,EAAE,kBAAkB,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC;gBAChE,MAAM,EAAE,sBAAsB;IAS7B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBjC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1B,OAAO,IAAI,IAAI;IAItB;;;;;;;;;;OAUG;IACI,KAAK,CAAC,EACZ,UAAU,EACV,WAAW,EACX,UAAU,EACV,KAAU,EACV,WAAmB,EACnB,aAAa,EACb,oBAAyB,EACzB,UAAU,GACV,EAAE;QACF,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,UAAU,CAAC;QACxB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,oBAAoB,CAAC,EAAE,oBAAoB,EAAE,CAAC;QAC9C,UAAU,CAAC,EAAE,EAAE,CAAC;KAChB,GAAG,WAAW;IA8Df;;;;;;OAMG;IACI,KAAK,CAAC,EACZ,UAAU,EACV,WAAW,EACX,UAAU,GACV,EAAE;QACF,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,UAAU,CAAC;KACxB,GAAG,WAAW;IAmCF,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAMzC"}
+{"version":3,"file":"DLOBSubscriber.d.ts","sourceRoot":"","sources":["../../../src/dlob/DLOBSubscriber.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,kBAAkB,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EACN,UAAU,EACV,oBAAoB,EACpB,sBAAsB,EACtB,UAAU,EACV,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAa,UAAU,EAAE,MAAM,UAAU,CAAC;AACjD,OAAO,EAIN,WAAW,EACX,oBAAoB,EACpB,WAAW,EACX,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,EAAE,EAAE,MAAM,sBAAsB,CAAC;AAE1C,qBAAa,cAAc;IAC1B,cAAc,EAAE,cAAc,CAAC;IAC/B,iGAAiG;IACjG,IAAW,WAAW,IAAI,cAAc,CAEvC;IACD,UAAU,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,UAAU,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;IAC3C,IAAI,EAAE,IAAI,CAAC;IACJ,YAAY,EAAE,kBAAkB,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC;gBAChE,MAAM,EAAE,sBAAsB;IAe7B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBjC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1B,OAAO,IAAI,IAAI;IAItB;;;;;;;;;;OAUG;IACI,KAAK,CAAC,EACZ,UAAU,EACV,WAAW,EACX,UAAU,EACV,KAAU,EACV,WAAmB,EACnB,aAAa,EACb,oBAAyB,EACzB,UAAU,GACV,EAAE;QACF,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,UAAU,CAAC;QACxB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,oBAAoB,CAAC,EAAE,oBAAoB,EAAE,CAAC;QAC9C,UAAU,CAAC,EAAE,EAAE,CAAC;KAChB,GAAG,WAAW;IA8Df;;;;;;OAMG;IACI,KAAK,CAAC,EACZ,UAAU,EACV,WAAW,EACX,UAAU,GACV,EAAE;QACF,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,UAAU,CAAC;KACxB,GAAG,WAAW;IAmCF,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAMzC"}

package/lib/node/dlob/DLOBSubscriber.js

@@ -6,8 +6,17 @@ const events_1 = require("events");
 const types_1 = require("../types");
 const orderBookLevels_1 = require("./orderBookLevels");
 class DLOBSubscriber {
+    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
+    get driftClient() {
+        return this.velocityClient;
+    }
     constructor(config) {
-        this.driftClient = config.driftClient;
+        var _a;
+        const velocityClient = (_a = config.velocityClient) !== null && _a !== void 0 ? _a : config.driftClient;
+        if (!velocityClient) {
+            throw new Error('DLOBSubscriber: velocityClient (or deprecated driftClient) must be provided');
+        }
+        this.velocityClient = velocityClient;
         this.dlobSource = config.dlobSource;
         this.slotSource = config.slotSource;
         this.updateFrequency = config.updateFrequency;
@@ -48,7 +57,7 @@ class DLOBSubscriber {
      */
     getL2({ marketName, marketIndex, marketType, depth = 10, includeVamm = false, numVammOrders, fallbackL2Generators = [], latestSlot, }) {
         if (marketName) {
-            const derivedMarketInfo = this.driftClient.getMarketIndexAndType(marketName);
+            const derivedMarketInfo = this.velocityClient.getMarketIndexAndType(marketName);
             if (!derivedMarketInfo) {
                 throw new Error(`Market ${marketName} not found`);
             }
@@ -63,12 +72,12 @@ class DLOBSubscriber {
         let oraclePriceData;
         const isPerp = (0, types_1.isVariant)(marketType, 'perp');
         if (isPerp) {
-            const perpMarketAccount = this.driftClient.getPerpMarketAccount(marketIndex);
-            oraclePriceData = this.driftClient.getOracleDataForPerpMarket(perpMarketAccount.marketIndex);
+            const perpMarketAccount = this.velocityClient.getPerpMarketAccount(marketIndex);
+            oraclePriceData = this.velocityClient.getOracleDataForPerpMarket(perpMarketAccount.marketIndex);
         }
         else {
             oraclePriceData =
-                this.driftClient.getOracleDataForSpotMarket(marketIndex);
+                this.velocityClient.getOracleDataForSpotMarket(marketIndex);
         }
         if (isPerp && includeVamm) {
             if (fallbackL2Generators.length > 0) {
@@ -76,8 +85,8 @@ class DLOBSubscriber {
             }
             fallbackL2Generators = [
                 (0, orderBookLevels_1.getVammL2Generator)({
-                    marketAccount: this.driftClient.getPerpMarketAccount(marketIndex),
-                    mmOraclePriceData: this.driftClient.getMMOracleDataForPerpMarket(marketIndex),
+                    marketAccount: this.velocityClient.getPerpMarketAccount(marketIndex),
+                    mmOraclePriceData: this.velocityClient.getMMOracleDataForPerpMarket(marketIndex),
                     numOrders: numVammOrders !== null && numVammOrders !== void 0 ? numVammOrders : depth,
                     topOfBookQuoteAmounts: marketIndex < 3
                         ? orderBookLevels_1.MAJORS_TOP_OF_BOOK_QUOTE_AMOUNTS
@@ -104,7 +113,7 @@ class DLOBSubscriber {
      */
     getL3({ marketName, marketIndex, marketType, }) {
         if (marketName) {
-            const derivedMarketInfo = this.driftClient.getMarketIndexAndType(marketName);
+            const derivedMarketInfo = this.velocityClient.getMarketIndexAndType(marketName);
             if (!derivedMarketInfo) {
                 throw new Error(`Market ${marketName} not found`);
             }
@@ -120,11 +129,11 @@ class DLOBSubscriber {
         const isPerp = (0, types_1.isVariant)(marketType, 'perp');
         if (isPerp) {
             oraclePriceData =
-                this.driftClient.getOracleDataForPerpMarket(marketIndex);
+                this.velocityClient.getOracleDataForPerpMarket(marketIndex);
         }
         else {
             oraclePriceData =
-                this.driftClient.getOracleDataForSpotMarket(marketIndex);
+                this.velocityClient.getOracleDataForSpotMarket(marketIndex);
         }
         return this.dlob.getL3({
             marketIndex,

package/lib/node/dlob/types.d.ts

@@ -1,7 +1,9 @@
 import { DLOB } from './DLOB';
 import { VelocityClient } from '../velocityClient';
 export type DLOBSubscriptionConfig = {
-    driftClient: VelocityClient;
+    velocityClient?: VelocityClient;
+    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
+    driftClient?: VelocityClient;
     dlobSource: DLOBSource;
     slotSource: SlotSource;
     updateFrequency: number;

package/lib/node/dlob/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/dlob/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,MAAM,MAAM,sBAAsB,GAAG;IACpC,WAAW,EAAE,cAAc,CAAC;IAC5B,UAAU,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,UAAU,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,WAAW,oBAAoB;IACpC,MAAM,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;IAC7B,KAAK,EAAE,CAAC,CAAC,EAAE,KAAK,KAAK,IAAI,CAAC;CAC1B;AAED,MAAM,WAAW,UAAU;IAC1B,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACrC;AAED,MAAM,WAAW,UAAU;IAC1B,OAAO,IAAI,MAAM,CAAC;CAClB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/dlob/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,MAAM,MAAM,sBAAsB,GAAG;IACpC,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,iGAAiG;IACjG,WAAW,CAAC,EAAE,cAAc,CAAC;IAC7B,UAAU,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,UAAU,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,WAAW,oBAAoB;IACpC,MAAM,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;IAC7B,KAAK,EAAE,CAAC,CAAC,EAAE,KAAK,KAAK,IAAI,CAAC;CAC1B;AAED,MAAM,WAAW,UAAU;IAC1B,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACrC;AAED,MAAM,WAAW,UAAU;IAC1B,OAAO,IAAI,MAAM,CAAC;CAClB"}