@velocity-exchange/sdk 0.0.2 → 0.0.5

package/lib/node/userMap/referrerMap.js

@@ -10,12 +10,16 @@ const memcmp_1 = require("../memcmp");
 const bs58_1 = __importDefault(require("bs58"));
 const DEFAULT_PUBLIC_KEY = web3_js_1.PublicKey.default.toBase58();
 class ReferrerMap {
+    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
+    get driftClient() {
+        return this.velocityClient;
+    }
     /**
      * Creates a new UserStatsMap instance.
      *
-     * @param {VelocityClient} driftClient - The VelocityClient instance.
+     * @param {VelocityClient} velocityClient - The VelocityClient instance.
      */
-    constructor(driftClient, parallelSync) {
+    constructor(velocityClient, parallelSync) {
         /**
          * map from authority pubkey to referrer pubkey.
          */
@@ -25,7 +29,7 @@ class ReferrerMap {
          * Will be undefined if the referrer is not in the map yet.
          */
         this.referrerReferrerInfoMap = new Map();
-        this.driftClient = driftClient;
+        this.velocityClient = velocityClient;
         this.parallelSync = parallelSync !== undefined ? parallelSync : true;
     }
     /**
@@ -35,7 +39,7 @@ class ReferrerMap {
         if (this.size() > 0) {
             return;
         }
-        await this.driftClient.subscribe();
+        await this.velocityClient.subscribe();
         await this.sync();
     }
     has(authorityPublicKey) {
@@ -49,8 +53,8 @@ class ReferrerMap {
             this.authorityReferrerMap.set(authority, referrer);
         }
         else if (referrer === undefined) {
-            const userStatsAccountPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.driftClient.program.programId, new web3_js_1.PublicKey(authority));
-            const buffer = (await this.driftClient.connection.getAccountInfo(userStatsAccountPublicKey, 'processed')).data;
+            const userStatsAccountPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.velocityClient.program.programId, new web3_js_1.PublicKey(authority));
+            const buffer = (await this.velocityClient.connection.getAccountInfo(userStatsAccountPublicKey, 'processed')).data;
             const referrer = bs58_1.default.encode(buffer.subarray(40, 72));
             this.addReferrer(authority, referrer);
         }
@@ -81,8 +85,8 @@ class ReferrerMap {
         }
         const referrerKey = new web3_js_1.PublicKey(referrer);
         const referrerInfo = {
-            referrer: (0, pda_1.getUserAccountPublicKeySync)(this.driftClient.program.programId, referrerKey, 0),
-            referrerStats: (0, pda_1.getUserStatsAccountPublicKey)(this.driftClient.program.programId, referrerKey),
+            referrer: (0, pda_1.getUserAccountPublicKeySync)(this.velocityClient.program.programId, referrerKey, 0),
+            referrerStats: (0, pda_1.getUserStatsAccountPublicKey)(this.velocityClient.program.programId, referrerKey),
         };
         this.referrerReferrerInfoMap.set(referrer, referrerInfo);
         return referrerInfo;
@@ -121,9 +125,9 @@ class ReferrerMap {
     }
     async syncAll() {
         const rpcRequestArgs = [
-            this.driftClient.program.programId.toBase58(),
+            this.velocityClient.program.programId.toBase58(),
             {
-                commitment: this.driftClient.opts.commitment,
+                commitment: this.velocityClient.opts.commitment,
                 filters: [(0, memcmp_1.getUserStatsFilter)()],
                 encoding: 'base64',
                 dataSlice: {
@@ -135,7 +139,7 @@ class ReferrerMap {
         ];
         const rpcJSONResponse = 
         // @ts-ignore
-        await this.driftClient.connection._rpcRequest('getProgramAccounts', rpcRequestArgs);
+        await this.velocityClient.connection._rpcRequest('getProgramAccounts', rpcRequestArgs);
         const rpcResponseAndContext = rpcJSONResponse.result;
         for (const account of rpcResponseAndContext.value) {
             // only add if it isn't already in the map
@@ -147,9 +151,9 @@ class ReferrerMap {
     }
     async syncReferrer(referrerFilter) {
         const rpcRequestArgs = [
-            this.driftClient.program.programId.toBase58(),
+            this.velocityClient.program.programId.toBase58(),
             {
-                commitment: this.driftClient.opts.commitment,
+                commitment: this.velocityClient.opts.commitment,
                 filters: [(0, memcmp_1.getUserStatsFilter)(), referrerFilter],
                 encoding: 'base64',
                 dataSlice: {
@@ -161,7 +165,7 @@ class ReferrerMap {
         ];
         const rpcJSONResponse = 
         // @ts-ignore
-        await this.driftClient.connection._rpcRequest('getProgramAccounts', rpcRequestArgs);
+        await this.velocityClient.connection._rpcRequest('getProgramAccounts', rpcRequestArgs);
         const rpcResponseAndContext = rpcJSONResponse.result;
         const batchSize = 1000;
         for (let i = 0; i < rpcResponseAndContext.value.length; i += batchSize) {

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

@@ -5,17 +5,19 @@ export declare class RevenueShareEscrowMap {
      * map from authority pubkey to RevenueShareEscrow account data.
      */
     private authorityEscrowMap;
-    private driftClient;
+    private velocityClient;
+    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
+    private get driftClient();
     private parallelSync;
     private fetchPromise?;
     private fetchPromiseResolver;
     /**
      * Creates a new RevenueShareEscrowMap instance.
      *
-     * @param {VelocityClient} driftClient - The VelocityClient instance.
+     * @param {VelocityClient} velocityClient - The VelocityClient instance.
      * @param {boolean} parallelSync - Whether to sync accounts in parallel.
      */
-    constructor(driftClient: VelocityClient, parallelSync?: boolean);
+    constructor(velocityClient: VelocityClient, parallelSync?: boolean);
     /**
      * Subscribe to all RevenueShareEscrow accounts.
      */

package/lib/node/userMap/revenueShareEscrowMap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"revenueShareEscrowMap.d.ts","sourceRoot":"","sources":["../../../src/userMap/revenueShareEscrowMap.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AAIrD,qBAAa,qBAAqB;IACjC;;OAEG;IACH,OAAO,CAAC,kBAAkB,CAAgD;IAC1E,OAAO,CAAC,WAAW,CAAiB;IACpC,OAAO,CAAC,YAAY,CAAU;IAE9B,OAAO,CAAC,YAAY,CAAC,CAAgB;IACrC,OAAO,CAAC,oBAAoB,CAAa;IAEzC;;;;;OAKG;gBACS,WAAW,EAAE,cAAc,EAAE,YAAY,CAAC,EAAE,OAAO;IAK/D;;OAEG;IACU,SAAS;IASf,GAAG,CAAC,kBAAkB,EAAE,MAAM,GAAG,OAAO;IAIxC,GAAG,CACT,kBAAkB,EAAE,MAAM,GACxB,yBAAyB,GAAG,SAAS;IAIxC;;;;;OAKG;IACU,OAAO,CACnB,kBAAkB,EAAE,MAAM,GACxB,OAAO,CAAC,yBAAyB,GAAG,SAAS,CAAC;IAOpC,qBAAqB,CAAC,SAAS,EAAE,MAAM;IA8B7C,IAAI,IAAI,MAAM;IAIR,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBlC;;;OAGG;IACU,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAsBzB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA4FrC;;OAEG;IACI,MAAM,IAAI,GAAG,CAAC,MAAM,EAAE,yBAAyB,CAAC;IAIvD;;OAEG;IACI,cAAc,IAAI,MAAM,EAAE;IAIjC;;OAEG;IACI,+BAA+B,IAAI,GAAG,CAC5C,MAAM,EACN,yBAAyB,CACzB;IAUD;;OAEG;IACI,oBAAoB,IAAI,GAAG,CAAC,MAAM,EAAE,yBAAyB,CAAC;IAUrE;;OAEG;IACI,aAAa,CACnB,iBAAiB,EAAE,MAAM,GACvB,yBAAyB,GAAG,SAAS;IASxC;;OAEG;IACI,gBAAgB,CACtB,iBAAiB,EAAE,MAAM,GACvB,yBAAyB,EAAE;IAUjB,WAAW;CAGxB"}
+{"version":3,"file":"revenueShareEscrowMap.d.ts","sourceRoot":"","sources":["../../../src/userMap/revenueShareEscrowMap.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AAIrD,qBAAa,qBAAqB;IACjC;;OAEG;IACH,OAAO,CAAC,kBAAkB,CAAgD;IAC1E,OAAO,CAAC,cAAc,CAAiB;IACvC,iGAAiG;IACjG,OAAO,KAAK,WAAW,GAEtB;IACD,OAAO,CAAC,YAAY,CAAU;IAE9B,OAAO,CAAC,YAAY,CAAC,CAAgB;IACrC,OAAO,CAAC,oBAAoB,CAAa;IAEzC;;;;;OAKG;gBACS,cAAc,EAAE,cAAc,EAAE,YAAY,CAAC,EAAE,OAAO;IAKlE;;OAEG;IACU,SAAS;IASf,GAAG,CAAC,kBAAkB,EAAE,MAAM,GAAG,OAAO;IAIxC,GAAG,CACT,kBAAkB,EAAE,MAAM,GACxB,yBAAyB,GAAG,SAAS;IAIxC;;;;;OAKG;IACU,OAAO,CACnB,kBAAkB,EAAE,MAAM,GACxB,OAAO,CAAC,yBAAyB,GAAG,SAAS,CAAC;IAOpC,qBAAqB,CAAC,SAAS,EAAE,MAAM;IA8B7C,IAAI,IAAI,MAAM;IAIR,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBlC;;;OAGG;IACU,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAsBzB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA4FrC;;OAEG;IACI,MAAM,IAAI,GAAG,CAAC,MAAM,EAAE,yBAAyB,CAAC;IAIvD;;OAEG;IACI,cAAc,IAAI,MAAM,EAAE;IAIjC;;OAEG;IACI,+BAA+B,IAAI,GAAG,CAC5C,MAAM,EACN,yBAAyB,CACzB;IAUD;;OAEG;IACI,oBAAoB,IAAI,GAAG,CAAC,MAAM,EAAE,yBAAyB,CAAC;IAUrE;;OAEG;IACI,aAAa,CACnB,iBAAiB,EAAE,MAAM,GACvB,yBAAyB,GAAG,SAAS;IASxC;;OAEG;IACI,gBAAgB,CACtB,iBAAiB,EAAE,MAAM,GACvB,yBAAyB,EAAE;IAUjB,WAAW;CAGxB"}

package/lib/node/userMap/revenueShareEscrowMap.js

@@ -5,18 +5,22 @@ const web3_js_1 = require("@solana/web3.js");
 const pda_1 = require("../addresses/pda");
 const memcmp_1 = require("../memcmp");
 class RevenueShareEscrowMap {
+    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
+    get driftClient() {
+        return this.velocityClient;
+    }
     /**
      * Creates a new RevenueShareEscrowMap instance.
      *
-     * @param {VelocityClient} driftClient - The VelocityClient instance.
+     * @param {VelocityClient} velocityClient - The VelocityClient instance.
      * @param {boolean} parallelSync - Whether to sync accounts in parallel.
      */
-    constructor(driftClient, parallelSync) {
+    constructor(velocityClient, parallelSync) {
         /**
          * map from authority pubkey to RevenueShareEscrow account data.
          */
         this.authorityEscrowMap = new Map();
-        this.driftClient = driftClient;
+        this.velocityClient = velocityClient;
         this.parallelSync = parallelSync !== undefined ? parallelSync : true;
     }
     /**
@@ -26,7 +30,7 @@ class RevenueShareEscrowMap {
         if (this.size() > 0) {
             return;
         }
-        await this.driftClient.subscribe();
+        await this.velocityClient.subscribe();
         await this.sync();
     }
     has(authorityPublicKey) {
@@ -48,11 +52,11 @@ class RevenueShareEscrowMap {
         return this.get(authorityPublicKey);
     }
     async addRevenueShareEscrow(authority) {
-        const escrowAccountPublicKey = (0, pda_1.getRevenueShareEscrowAccountPublicKey)(this.driftClient.program.programId, new web3_js_1.PublicKey(authority));
+        const escrowAccountPublicKey = (0, pda_1.getRevenueShareEscrowAccountPublicKey)(this.velocityClient.program.programId, new web3_js_1.PublicKey(authority));
         try {
-            const accountInfo = await this.driftClient.connection.getAccountInfo(escrowAccountPublicKey, 'processed');
+            const accountInfo = await this.velocityClient.connection.getAccountInfo(escrowAccountPublicKey, 'processed');
             if (accountInfo && accountInfo.data) {
-                const escrow = this.driftClient.program.account.revenueShareEscrow.coder.accounts.decode('revenueShareEscrow', accountInfo.data);
+                const escrow = this.velocityClient.program.account.revenueShareEscrow.coder.accounts.decode('revenueShareEscrow', accountInfo.data);
                 this.authorityEscrowMap.set(authority, escrow);
             }
         }
@@ -88,16 +92,16 @@ class RevenueShareEscrowMap {
             return this.fetchPromise;
         }
         for (const authority of this.authorityEscrowMap.keys()) {
-            const accountInfo = await this.driftClient.connection.getAccountInfo((0, pda_1.getRevenueShareEscrowAccountPublicKey)(this.driftClient.program.programId, new web3_js_1.PublicKey(authority)), 'confirmed');
-            const escrowNew = this.driftClient.program.account.revenueShareEscrow.coder.accounts.decode('revenueShareEscrow', accountInfo.data);
+            const accountInfo = await this.velocityClient.connection.getAccountInfo((0, pda_1.getRevenueShareEscrowAccountPublicKey)(this.velocityClient.program.programId, new web3_js_1.PublicKey(authority)), 'confirmed');
+            const escrowNew = this.velocityClient.program.account.revenueShareEscrow.coder.accounts.decode('revenueShareEscrow', accountInfo.data);
             this.authorityEscrowMap.set(authority, escrowNew);
         }
     }
     async syncAll() {
         const rpcRequestArgs = [
-            this.driftClient.program.programId.toBase58(),
+            this.velocityClient.program.programId.toBase58(),
             {
-                commitment: this.driftClient.opts.commitment,
+                commitment: this.velocityClient.opts.commitment,
                 filters: [(0, memcmp_1.getRevenueShareEscrowFilter)()],
                 encoding: 'base64',
                 withContext: true,
@@ -105,7 +109,7 @@ class RevenueShareEscrowMap {
         ];
         const rpcJSONResponse = 
         // @ts-ignore
-        await this.driftClient.connection._rpcRequest('getProgramAccounts', rpcRequestArgs);
+        await this.velocityClient.connection._rpcRequest('getProgramAccounts', rpcRequestArgs);
         const rpcResponseAndContext = rpcJSONResponse.result;
         const batchSize = 100;
         for (let i = 0; i < rpcResponseAndContext.value.length; i += batchSize) {
@@ -115,7 +119,7 @@ class RevenueShareEscrowMap {
                     try {
                         // @ts-ignore
                         const buffer = Buffer.from(programAccount.account.data[0], programAccount.account.data[1]);
-                        const escrow = this.driftClient.program.account.revenueShareEscrow.coder.accounts.decode('revenueShareEscrow', buffer);
+                        const escrow = this.velocityClient.program.account.revenueShareEscrow.coder.accounts.decode('revenueShareEscrow', buffer);
                         // Extract authority from the account data
                         const authorityKey = escrow.authority.toBase58();
                         this.authorityEscrowMap.set(authorityKey, escrow);
@@ -130,7 +134,7 @@ class RevenueShareEscrowMap {
                     try {
                         // @ts-ignore
                         const buffer = Buffer.from(programAccount.account.data[0], programAccount.account.data[1]);
-                        const escrow = this.driftClient.program.account.revenueShareEscrow.coder.accounts.decode('revenueShareEscrow', buffer);
+                        const escrow = this.velocityClient.program.account.revenueShareEscrow.coder.accounts.decode('revenueShareEscrow', buffer);
                         // Extract authority from the account data
                         const authorityKey = escrow.authority.toBase58();
                         this.authorityEscrowMap.set(authorityKey, escrow);

package/lib/node/userMap/userMap.d.ts

@@ -29,7 +29,9 @@ export interface UserMapInterface {
 }
 export declare class UserMap implements UserMapInterface {
     private userMap;
-    driftClient: VelocityClient;
+    velocityClient: VelocityClient;
+    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
+    get driftClient(): VelocityClient;
     eventEmitter: StrictEventEmitter<EventEmitter, UserEvents>;
     private connection;
     private commitment;

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

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

package/lib/node/userMap/userMap.js

@@ -15,11 +15,15 @@ const grpcSubscription_1 = require("./grpcSubscription");
 const events_1 = require("events");
 const MAX_USER_ACCOUNT_SIZE_BYTES = 4376;
 class UserMap {
+    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
+    get driftClient() {
+        return this.velocityClient;
+    }
     /**
      * Constructs a new UserMap instance.
      */
     constructor(config) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g;
         this.userMap = new Map();
         this.stateAccountUpdateCallback = async (state) => {
             if (!state.numberOfSubAccounts.eq(this.lastNumberOfSubAccounts)) {
@@ -28,29 +32,30 @@ class UserMap {
             }
         };
         this.mostRecentSlot = 0;
-        this.driftClient = config.driftClient;
+        // Type-system guarantees at least one of the two is supplied.
+        this.velocityClient = ((_a = config.velocityClient) !== null && _a !== void 0 ? _a : config.driftClient);
         if (config.connection) {
             this.connection = config.connection;
         }
         else {
-            this.connection = this.driftClient.connection;
+            this.connection = this.velocityClient.connection;
         }
         this.commitment =
             config.subscriptionConfig.type === 'websocket' ||
                 config.subscriptionConfig.type === 'polling'
-                ? (_a = config.subscriptionConfig.commitment) !== null && _a !== void 0 ? _a : this.driftClient.opts.commitment
-                : this.driftClient.opts.commitment;
-        this.includeIdle = (_b = config.includeIdle) !== null && _b !== void 0 ? _b : false;
+                ? (_b = config.subscriptionConfig.commitment) !== null && _b !== void 0 ? _b : this.velocityClient.opts.commitment
+                : this.velocityClient.opts.commitment;
+        this.includeIdle = (_c = config.includeIdle) !== null && _c !== void 0 ? _c : false;
         this.filterByPoolId = config.filterByPoolId;
         this.additionalFilters = config.additionalFilters;
         this.disableSyncOnTotalAccountsChange =
-            (_c = config.disableSyncOnTotalAccountsChange) !== null && _c !== void 0 ? _c : false;
+            (_d = config.disableSyncOnTotalAccountsChange) !== null && _d !== void 0 ? _d : false;
         let decodeFn;
-        if ((_d = config.fastDecode) !== null && _d !== void 0 ? _d : true) {
+        if ((_e = config.fastDecode) !== null && _e !== void 0 ? _e : true) {
             decodeFn = (name, buffer) => (0, user_2.decodeUser)(buffer);
         }
         else {
-            decodeFn = this.driftClient.program.account.user.coder.accounts.decodeUnchecked.bind(this.driftClient.program.account.user.coder.accounts);
+            decodeFn = this.velocityClient.program.account.user.coder.accounts.decodeUnchecked.bind(this.velocityClient.program.account.user.coder.accounts);
         }
         this.decode = decodeFn;
         if (config.subscriptionConfig.type === 'polling') {
@@ -84,34 +89,34 @@ class UserMap {
                 decodeFn,
             });
         }
-        this.syncConfig = (_e = config.syncConfig) !== null && _e !== void 0 ? _e : {
+        this.syncConfig = (_f = config.syncConfig) !== null && _f !== void 0 ? _f : {
             type: 'default',
         };
         // Whether to throw an error if the userMap fails to sync. Defaults to false.
-        this.throwOnFailedSync = (_f = config.throwOnFailedSync) !== null && _f !== void 0 ? _f : false;
+        this.throwOnFailedSync = (_g = config.throwOnFailedSync) !== null && _g !== void 0 ? _g : false;
         this.eventEmitter = new events_1.EventEmitter();
     }
     async subscribe() {
         if (this.size() > 0) {
             return;
         }
-        await this.driftClient.subscribe();
+        await this.velocityClient.subscribe();
         this.lastNumberOfSubAccounts =
-            this.driftClient.getStateAccount().numberOfSubAccounts;
+            this.velocityClient.getStateAccount().numberOfSubAccounts;
         if (!this.disableSyncOnTotalAccountsChange) {
-            this.driftClient.eventEmitter.on('stateAccountUpdate', this.stateAccountUpdateCallback);
+            this.velocityClient.eventEmitter.on('stateAccountUpdate', this.stateAccountUpdateCallback);
         }
         await this.subscription.subscribe();
     }
     async addPubkey(userAccountPublicKey, userAccount, slot, accountSubscription) {
         var _a;
         const user = new user_1.User({
-            driftClient: this.driftClient,
+            velocityClient: this.velocityClient,
             userAccountPublicKey,
             accountSubscription: accountSubscription !== null && accountSubscription !== void 0 ? accountSubscription : {
                 type: 'custom',
                 // OneShotUserAccountSubscriber used here so we don't load up the RPC with AccountSubscribes
-                userAccountSubscriber: new oneShotUserAccountSubscriber_1.OneShotUserAccountSubscriber(this.driftClient.program, userAccountPublicKey, userAccount, slot, this.commitment),
+                userAccountSubscriber: new oneShotUserAccountSubscriber_1.OneShotUserAccountSubscriber(this.velocityClient.program, userAccountPublicKey, userAccount, slot, this.commitment),
             },
         });
         await user.subscribe(userAccount);
@@ -292,7 +297,7 @@ class UserMap {
         });
         try {
             const rpcRequestArgs = [
-                this.driftClient.program.programId.toBase58(),
+                this.velocityClient.program.programId.toBase58(),
                 {
                     commitment: this.commitment,
                     filters: this.getFilters(),
@@ -364,7 +369,7 @@ class UserMap {
             this.syncPromiseResolver = resolve;
         });
         try {
-            const accountsPrefetch = await this.connection.getProgramAccounts(this.driftClient.program.programId, {
+            const accountsPrefetch = await this.connection.getProgramAccounts(this.velocityClient.program.programId, {
                 dataSlice: { offset: 0, length: 0 },
                 filters: this.getFilters(),
             });
@@ -454,7 +459,7 @@ class UserMap {
         }
         if (this.lastNumberOfSubAccounts) {
             if (!this.disableSyncOnTotalAccountsChange) {
-                this.driftClient.eventEmitter.removeListener('stateAccountUpdate', this.stateAccountUpdateCallback);
+                this.velocityClient.eventEmitter.removeListener('stateAccountUpdate', this.stateAccountUpdateCallback);
             }
             this.lastNumberOfSubAccounts = undefined;
         }

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

@@ -1,6 +1,7 @@
 import { Commitment, Connection, MemcmpFilter } from '@solana/web3.js';
 import { VelocityClient } from '../velocityClient';
 import { GrpcConfigs } from '../accounts/types';
+import { AtLeastOne } from '../util/deprecatedAlias';
 export type UserAccountFilterCriteria = {
     hasOpenOrders: boolean;
 };
@@ -11,8 +12,7 @@ export type SyncConfig = {
     chunkSize?: number;
     concurrencyLimit?: number;
 };
-export type UserMapConfig = {
-    driftClient: VelocityClient;
+type UserMapConfigBase = {
     connection?: Connection;
     subscriptionConfig: {
         type: 'polling';
@@ -38,4 +38,6 @@ export type UserMapConfig = {
     filterByPoolId?: number;
     additionalFilters?: MemcmpFilter[];
 };
+export type UserMapConfig = UserMapConfigBase & AtLeastOne<'velocityClient', 'driftClient', VelocityClient>;
+export {};
 //# sourceMappingURL=userMapConfig.d.ts.map

package/lib/node/userMap/userMapConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"userMapConfig.d.ts","sourceRoot":"","sources":["../../../src/userMap/userMapConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGhD,MAAM,MAAM,yBAAyB,GAAG;IAEvC,aAAa,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,UAAU,GACnB;IACA,IAAI,EAAE,SAAS,CAAC;CACf,GACD;IACA,IAAI,EAAE,WAAW,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEL,MAAM,MAAM,aAAa,GAAG;IAC3B,WAAW,EAAE,cAAc,CAAC;IAE5B,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,kBAAkB,EACf;QACA,IAAI,EAAE,SAAS,CAAC;QAChB,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,CAAC,EAAE,UAAU,CAAC;KACvB,GACD;QACA,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,EAAE,WAAW,CAAC;QACzB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,gBAAgB,CAAC,EAAE,OAAO,CAAC;KAC1B,GACD;QACA,IAAI,EAAE,WAAW,CAAC;QAClB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,gBAAgB,CAAC,EAAE,OAAO,CAAC;QAC3B,UAAU,CAAC,EAAE,UAAU,CAAC;KACvB,CAAC;IAGL,eAAe,CAAC,EAAE,OAAO,CAAC;IAG1B,WAAW,CAAC,EAAE,OAAO,CAAC;IAGtB,UAAU,CAAC,EAAE,OAAO,CAAC;IAIrB,gCAAgC,CAAC,EAAE,OAAO,CAAC;IAE3C,UAAU,CAAC,EAAE,UAAU,CAAC;IAGxB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAG5B,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB,iBAAiB,CAAC,EAAE,YAAY,EAAE,CAAC;CACnC,CAAC"}
+{"version":3,"file":"userMapConfig.d.ts","sourceRoot":"","sources":["../../../src/userMap/userMapConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAGrD,MAAM,MAAM,yBAAyB,GAAG;IAEvC,aAAa,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,UAAU,GACnB;IACA,IAAI,EAAE,SAAS,CAAC;CACf,GACD;IACA,IAAI,EAAE,WAAW,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEL,KAAK,iBAAiB,GAAG;IAExB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,kBAAkB,EACf;QACA,IAAI,EAAE,SAAS,CAAC;QAChB,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,CAAC,EAAE,UAAU,CAAC;KACvB,GACD;QACA,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,EAAE,WAAW,CAAC;QACzB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,gBAAgB,CAAC,EAAE,OAAO,CAAC;KAC1B,GACD;QACA,IAAI,EAAE,WAAW,CAAC;QAClB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,gBAAgB,CAAC,EAAE,OAAO,CAAC;QAC3B,UAAU,CAAC,EAAE,UAAU,CAAC;KACvB,CAAC;IAGL,eAAe,CAAC,EAAE,OAAO,CAAC;IAG1B,WAAW,CAAC,EAAE,OAAO,CAAC;IAGtB,UAAU,CAAC,EAAE,OAAO,CAAC;IAIrB,gCAAgC,CAAC,EAAE,OAAO,CAAC;IAE3C,UAAU,CAAC,EAAE,UAAU,CAAC;IAGxB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAG5B,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB,iBAAiB,CAAC,EAAE,YAAY,EAAE,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,iBAAiB,GAC5C,UAAU,CAAC,gBAAgB,EAAE,aAAa,EAAE,cAAc,CAAC,CAAC"}

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

@@ -11,7 +11,9 @@ export declare class UserStatsMap {
      * map from authority pubkey to UserStats
      */
     private userStatsMap;
-    private driftClient;
+    private velocityClient;
+    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
+    private get driftClient();
     private bulkAccountLoader;
     private decode;
     private syncConfig;
@@ -20,10 +22,10 @@ export declare class UserStatsMap {
     /**
      * Creates a new UserStatsMap instance.
      *
-     * @param {VelocityClient} driftClient - The VelocityClient instance.
+     * @param {VelocityClient} velocityClient - The VelocityClient instance.
      * @param {BulkAccountLoader} [bulkAccountLoader] - If not provided, a new BulkAccountLoader with polling disabled will be created.
      */
-    constructor(driftClient: VelocityClient, bulkAccountLoader?: BulkAccountLoader, syncConfig?: SyncConfig);
+    constructor(velocityClient: VelocityClient, bulkAccountLoader?: BulkAccountLoader, syncConfig?: SyncConfig);
     subscribe(authorities: PublicKey[]): Promise<void>;
     /**
      *

package/lib/node/userMap/userStatsMap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"userStatsMap.d.ts","sourceRoot":"","sources":["../../../src/userMap/userStatsMap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,EACN,WAAW,EACX,gBAAgB,EAQhB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAElE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,qBAAa,YAAY;IACxB;;OAEG;IACH,OAAO,CAAC,YAAY,CAAgC;IACpD,OAAO,CAAC,WAAW,CAAiB;IACpC,OAAO,CAAC,iBAAiB,CAAoB;IAC7C,OAAO,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,UAAU,CAAa;IAE/B,OAAO,CAAC,WAAW,CAAC,CAAgB;IACpC,OAAO,CAAC,mBAAmB,CAAa;IAExC;;;;;OAKG;gBAEF,WAAW,EAAE,cAAc,EAC3B,iBAAiB,CAAC,EAAE,iBAAiB,EACrC,UAAU,CAAC,EAAE,UAAU;IAuBX,SAAS,CAAC,WAAW,EAAE,SAAS,EAAE;IAS/C;;;;;OAKG;IACU,WAAW,CACvB,SAAS,EAAE,SAAS,EACpB,gBAAgB,CAAC,EAAE,gBAAgB,EACnC,SAAS,CAAC,EAAE,OAAO;IAwBP,qBAAqB,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO;IAO3D,qBAAqB,CACjC,MAAM,EAAE,YAAY,CAAC,GAAG,CAAC,EACzB,OAAO,CAAC,EAAE,OAAO;IA0DX,GAAG,CAAC,kBAAkB,EAAE,MAAM,GAAG,OAAO;IAIxC,GAAG,CAAC,kBAAkB,EAAE,MAAM,GAAG,SAAS;IAIjD;;;;;OAKG;IACU,OAAO,CAAC,kBAAkB,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;IAW7D,MAAM,IAAI,gBAAgB,CAAC,SAAS,CAAC;IAIrC,IAAI,IAAI,MAAM;IAIrB;;;;OAIG;IACU,IAAI,CAAC,WAAW,EAAE,SAAS,EAAE;IAQ1C;;;;OAIG;YACW,WAAW;IASzB;;;OAGG;YACW,aAAa;IA8Gd,WAAW;CAMxB"}
+{"version":3,"file":"userStatsMap.d.ts","sourceRoot":"","sources":["../../../src/userMap/userStatsMap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,EACN,WAAW,EACX,gBAAgB,EAQhB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAElE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,qBAAa,YAAY;IACxB;;OAEG;IACH,OAAO,CAAC,YAAY,CAAgC;IACpD,OAAO,CAAC,cAAc,CAAiB;IACvC,iGAAiG;IACjG,OAAO,KAAK,WAAW,GAEtB;IACD,OAAO,CAAC,iBAAiB,CAAoB;IAC7C,OAAO,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,UAAU,CAAa;IAE/B,OAAO,CAAC,WAAW,CAAC,CAAgB;IACpC,OAAO,CAAC,mBAAmB,CAAa;IAExC;;;;;OAKG;gBAEF,cAAc,EAAE,cAAc,EAC9B,iBAAiB,CAAC,EAAE,iBAAiB,EACrC,UAAU,CAAC,EAAE,UAAU;IAuBX,SAAS,CAAC,WAAW,EAAE,SAAS,EAAE;IAS/C;;;;;OAKG;IACU,WAAW,CACvB,SAAS,EAAE,SAAS,EACpB,gBAAgB,CAAC,EAAE,gBAAgB,EACnC,SAAS,CAAC,EAAE,OAAO;IAwBP,qBAAqB,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO;IAO3D,qBAAqB,CACjC,MAAM,EAAE,YAAY,CAAC,GAAG,CAAC,EACzB,OAAO,CAAC,EAAE,OAAO;IA0DX,GAAG,CAAC,kBAAkB,EAAE,MAAM,GAAG,OAAO;IAIxC,GAAG,CAAC,kBAAkB,EAAE,MAAM,GAAG,SAAS;IAIjD;;;;;OAKG;IACU,OAAO,CAAC,kBAAkB,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;IAW7D,MAAM,IAAI,gBAAgB,CAAC,SAAS,CAAC;IAIrC,IAAI,IAAI,MAAM;IAIrB;;;;OAIG;IACU,IAAI,CAAC,WAAW,EAAE,SAAS,EAAE;IAQ1C;;;;OAIG;YACW,WAAW;IASzB;;;OAGG;YACW,aAAa;IA8Gd,WAAW;CAMxB"}

package/lib/node/userMap/userStatsMap.js

@@ -7,32 +7,36 @@ const bulkAccountLoader_1 = require("../accounts/bulkAccountLoader");
 const memcmp_1 = require("../memcmp");
 const web3_js_1 = require("@solana/web3.js");
 class UserStatsMap {
+    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
+    get driftClient() {
+        return this.velocityClient;
+    }
     /**
      * Creates a new UserStatsMap instance.
      *
-     * @param {VelocityClient} driftClient - The VelocityClient instance.
+     * @param {VelocityClient} velocityClient - The VelocityClient instance.
      * @param {BulkAccountLoader} [bulkAccountLoader] - If not provided, a new BulkAccountLoader with polling disabled will be created.
      */
-    constructor(driftClient, bulkAccountLoader, syncConfig) {
+    constructor(velocityClient, bulkAccountLoader, syncConfig) {
         /**
          * map from authority pubkey to UserStats
          */
         this.userStatsMap = new Map();
-        this.driftClient = driftClient;
+        this.velocityClient = velocityClient;
         if (!bulkAccountLoader) {
-            bulkAccountLoader = new bulkAccountLoader_1.BulkAccountLoader(driftClient.connection, driftClient.opts.commitment, 0);
+            bulkAccountLoader = new bulkAccountLoader_1.BulkAccountLoader(velocityClient.connection, velocityClient.opts.commitment, 0);
         }
         this.bulkAccountLoader = bulkAccountLoader;
         this.syncConfig = syncConfig !== null && syncConfig !== void 0 ? syncConfig : {
             type: 'default',
         };
-        this.decode = this.driftClient.program.account.userStats.coder.accounts.decodeUnchecked.bind(this.driftClient.program.account.userStats.coder.accounts);
+        this.decode = this.velocityClient.program.account.userStats.coder.accounts.decodeUnchecked.bind(this.velocityClient.program.account.userStats.coder.accounts);
     }
     async subscribe(authorities) {
         if (this.size() > 0) {
             return;
         }
-        await this.driftClient.subscribe();
+        await this.velocityClient.subscribe();
         await this.sync(authorities);
     }
     /**
@@ -43,8 +47,8 @@ class UserStatsMap {
      */
     async addUserStat(authority, userStatsAccount, skipFetch) {
         const userStat = new userStats_1.UserStats({
-            driftClient: this.driftClient,
-            userStatsAccountPublicKey: (0, pda_1.getUserStatsAccountPublicKey)(this.driftClient.program.programId, authority),
+            velocityClient: this.velocityClient,
+            userStatsAccountPublicKey: (0, pda_1.getUserStatsAccountPublicKey)(this.velocityClient.program.programId, authority),
             accountSubscription: {
                 type: 'polling',
                 accountLoader: this.bulkAccountLoader,
@@ -182,7 +186,7 @@ class UserStatsMap {
         try {
             let accountsToLoad = authorities;
             if (authorities.length === 0) {
-                const accountsPrefetch = await this.driftClient.connection.getProgramAccounts(this.driftClient.program.programId, {
+                const accountsPrefetch = await this.velocityClient.connection.getProgramAccounts(this.velocityClient.program.programId, {
                     dataSlice: { offset: 0, length: 0 },
                     filters: [(0, memcmp_1.getUserStatsFilter)()],
                 });
@@ -216,8 +220,8 @@ class UserStatsMap {
             for (let i = 0; i < accountsToLoad.length; i += chunkSize) {
                 const chunk = accountsToLoad.slice(i, i + chunkSize);
                 tasks.push(async () => {
-                    const accountInfos = await this.driftClient.connection.getMultipleAccountsInfoAndContext(chunk, {
-                        commitment: this.driftClient.opts.commitment,
+                    const accountInfos = await this.velocityClient.connection.getMultipleAccountsInfoAndContext(chunk, {
+                        commitment: this.velocityClient.opts.commitment,
                     });
                     for (let j = 0; j < accountInfos.value.length; j += 1) {
                         const accountInfo = accountInfos.value[j];

package/lib/node/userStats.d.ts

@@ -9,7 +9,9 @@ import { DataAndSlot, UserStatsAccountSubscriber } from './accounts/types';
 import { UserStatsConfig } from './userStatsConfig';
 import { ReferrerInfo, UserStatsAccount } from './types';
 export declare class UserStats {
-    driftClient: VelocityClient;
+    velocityClient: VelocityClient;
+    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
+    get driftClient(): VelocityClient;
     userStatsAccountPublicKey: PublicKey;
     accountSubscriber: UserStatsAccountSubscriber;
     isSubscribed: boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"userStats.d.ts","sourceRoot":"","sources":["../../src/userStats.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGpD,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAOzD,qBAAa,SAAS;IACrB,WAAW,EAAE,cAAc,CAAC;IAC5B,yBAAyB,EAAE,SAAS,CAAC;IACrC,iBAAiB,EAAE,0BAA0B,CAAC;IAC9C,YAAY,EAAE,OAAO,CAAC;gBAEH,MAAM,EAAE,eAAe;IAyC7B,SAAS,CACrB,gBAAgB,CAAC,EAAE,gBAAgB,GACjC,OAAO,CAAC,OAAO,CAAC;IAON,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAKlC,iBAAiB,IAAI,WAAW,CAAC,gBAAgB,CAAC;IAIlD,UAAU,IAAI,gBAAgB;IAI9B,eAAe,IAAI,YAAY,GAAG,SAAS;WAkBpC,iBAAiB,CAAC,OAAO,EAAE,gBAAgB,GAAG,MAAM;CAOlE"}
+{"version":3,"file":"userStats.d.ts","sourceRoot":"","sources":["../../src/userStats.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGpD,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAOzD,qBAAa,SAAS;IACrB,cAAc,EAAE,cAAc,CAAC;IAC/B,iGAAiG;IACjG,IAAW,WAAW,IAAI,cAAc,CAEvC;IACD,yBAAyB,EAAE,SAAS,CAAC;IACrC,iBAAiB,EAAE,0BAA0B,CAAC;IAC9C,YAAY,EAAE,OAAO,CAAC;gBAEH,MAAM,EAAE,eAAe;IA2C7B,SAAS,CACrB,gBAAgB,CAAC,EAAE,gBAAgB,GACjC,OAAO,CAAC,OAAO,CAAC;IAON,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAKlC,iBAAiB,IAAI,WAAW,CAAC,gBAAgB,CAAC;IAIlD,UAAU,IAAI,gBAAgB;IAI9B,eAAe,IAAI,YAAY,GAAG,SAAS;WAkBpC,iBAAiB,CAAC,OAAO,EAAE,gBAAgB,GAAG,MAAM;CAOlE"}

package/lib/node/userStats.js

@@ -7,26 +7,32 @@ const webSocketUserStatsAccountSubsriber_1 = require("./accounts/webSocketUserSt
 const pda_1 = require("./addresses/pda");
 const grpcUserStatsAccountSubscriber_1 = require("./accounts/grpcUserStatsAccountSubscriber");
 class UserStats {
+    /** @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, _f, _g, _h;
-        this.driftClient = config.driftClient;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        // Type-system guarantees at least one of the two is supplied.
+        const velocityClient = ((_a = config.velocityClient) !== null && _a !== void 0 ? _a : config.driftClient);
+        this.velocityClient = velocityClient;
         this.userStatsAccountPublicKey = config.userStatsAccountPublicKey;
-        if (((_a = config.accountSubscription) === null || _a === void 0 ? void 0 : _a.type) === 'polling') {
-            this.accountSubscriber = new pollingUserStatsAccountSubscriber_1.PollingUserStatsAccountSubscriber(config.driftClient.program, config.userStatsAccountPublicKey, config.accountSubscription.accountLoader);
+        if (((_b = config.accountSubscription) === null || _b === void 0 ? void 0 : _b.type) === 'polling') {
+            this.accountSubscriber = new pollingUserStatsAccountSubscriber_1.PollingUserStatsAccountSubscriber(velocityClient.program, config.userStatsAccountPublicKey, config.accountSubscription.accountLoader);
         }
-        else if (((_b = config.accountSubscription) === null || _b === void 0 ? void 0 : _b.type) === 'grpc') {
-            this.accountSubscriber = new grpcUserStatsAccountSubscriber_1.grpcUserStatsAccountSubscriber(config.accountSubscription.grpcConfigs, config.driftClient.program, config.userStatsAccountPublicKey, {
-                resubTimeoutMs: (_c = config.accountSubscription) === null || _c === void 0 ? void 0 : _c.resubTimeoutMs,
-                logResubMessages: (_d = config.accountSubscription) === null || _d === void 0 ? void 0 : _d.logResubMessages,
+        else if (((_c = config.accountSubscription) === null || _c === void 0 ? void 0 : _c.type) === 'grpc') {
+            this.accountSubscriber = new grpcUserStatsAccountSubscriber_1.grpcUserStatsAccountSubscriber(config.accountSubscription.grpcConfigs, velocityClient.program, config.userStatsAccountPublicKey, {
+                resubTimeoutMs: (_d = config.accountSubscription) === null || _d === void 0 ? void 0 : _d.resubTimeoutMs,
+                logResubMessages: (_e = config.accountSubscription) === null || _e === void 0 ? void 0 : _e.logResubMessages,
             });
         }
-        else if (((_e = config.accountSubscription) === null || _e === void 0 ? void 0 : _e.type) === 'websocket') {
-            this.accountSubscriber = new webSocketUserStatsAccountSubsriber_1.WebSocketUserStatsAccountSubscriber(config.driftClient.program, config.userStatsAccountPublicKey, {
-                resubTimeoutMs: (_f = config.accountSubscription) === null || _f === void 0 ? void 0 : _f.resubTimeoutMs,
-                logResubMessages: (_g = config.accountSubscription) === null || _g === void 0 ? void 0 : _g.logResubMessages,
+        else if (((_f = config.accountSubscription) === null || _f === void 0 ? void 0 : _f.type) === 'websocket') {
+            this.accountSubscriber = new webSocketUserStatsAccountSubsriber_1.WebSocketUserStatsAccountSubscriber(velocityClient.program, config.userStatsAccountPublicKey, {
+                resubTimeoutMs: (_g = config.accountSubscription) === null || _g === void 0 ? void 0 : _g.resubTimeoutMs,
+                logResubMessages: (_h = config.accountSubscription) === null || _h === void 0 ? void 0 : _h.logResubMessages,
             }, config.accountSubscription.commitment);
         }
-        else if (((_h = config.accountSubscription) === null || _h === void 0 ? void 0 : _h.type) === 'custom') {
+        else if (((_j = config.accountSubscription) === null || _j === void 0 ? void 0 : _j.type) === 'custom') {
             this.accountSubscriber =
                 config.accountSubscription.userStatsAccountSubscriber;
         }
@@ -58,8 +64,8 @@ class UserStats {
         }
         else {
             return {
-                referrer: (0, pda_1.getUserAccountPublicKeySync)(this.driftClient.program.programId, this.getAccount().referrer, 0),
-                referrerStats: (0, pda_1.getUserStatsAccountPublicKey)(this.driftClient.program.programId, this.getAccount().referrer),
+                referrer: (0, pda_1.getUserAccountPublicKeySync)(this.velocityClient.program.programId, this.getAccount().referrer, 0),
+                referrerStats: (0, pda_1.getUserStatsAccountPublicKey)(this.velocityClient.program.programId, this.getAccount().referrer),
             };
         }
     }

package/lib/node/userStatsConfig.d.ts

@@ -2,11 +2,12 @@ import { VelocityClient } from './velocityClient';
 import { Commitment, PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from './accounts/bulkAccountLoader';
 import { GrpcConfigs, UserStatsAccountSubscriber } from './accounts/types';
-export type UserStatsConfig = {
+import { AtLeastOne } from './util/deprecatedAlias';
+type UserStatsConfigBase = {
     accountSubscription?: UserStatsSubscriptionConfig;
-    driftClient: VelocityClient;
     userStatsAccountPublicKey: PublicKey;
 };
+export type UserStatsConfig = UserStatsConfigBase & AtLeastOne<'velocityClient', 'driftClient', VelocityClient>;
 export type UserStatsSubscriptionConfig = {
     type: 'websocket';
     resubTimeoutMs?: number;
@@ -24,4 +25,5 @@ export type UserStatsSubscriptionConfig = {
     logResubMessages?: boolean;
     grpcConfigs: GrpcConfigs;
 };
+export {};
 //# sourceMappingURL=userStatsConfig.d.ts.map