@velocity-exchange/sdk 0.1.0 → 0.2.0

package/lib/browser/userMap/WebsocketSubscription.d.ts

@@ -12,7 +12,7 @@ export declare class WebsocketSubscription {
     private includeIdle?;
     private additionalFilters?;
     private decodeFn;
-    private subscriber;
+    private subscriber?;
     constructor({ userMap, commitment, skipInitialLoad, resubOpts, includeIdle, decodeFn, additionalFilters, }: {
         userMap: UserMap;
         commitment: Commitment;

package/lib/browser/userMap/grpcSubscription.d.ts

@@ -12,7 +12,7 @@ export declare class grpcSubscription {
     private includeIdle?;
     private additionalFilters?;
     private decodeFn;
-    private subscriber;
+    private subscriber?;
     constructor({ grpcConfigs, userMap, skipInitialLoad, resubOpts, includeIdle, decodeFn, additionalFilters, }: {
         grpcConfigs: GrpcConfigs;
         userMap: UserMap;

package/lib/browser/userMap/referrerMap.js

@@ -25,6 +25,7 @@ class ReferrerMap {
          * Will be undefined if the referrer is not in the map yet.
          */
         this.referrerReferrerInfoMap = new Map();
+        this.fetchPromiseResolver = () => { };
         this.velocityClient = velocityClient;
         this.parallelSync = parallelSync !== undefined ? parallelSync : true;
     }
@@ -50,7 +51,11 @@ class ReferrerMap {
         }
         else if (referrer === undefined) {
             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 accountInfo = await this.velocityClient.connection.getAccountInfo(userStatsAccountPublicKey, 'processed');
+            if (!accountInfo) {
+                throw new Error(`ReferrerMap: UserStats account not found for authority ${authority}`);
+            }
+            const buffer = accountInfo.data;
             const referrer = bs58_1.default.encode(buffer.subarray(40, 72));
             this.addReferrer(authority, referrer);
         }
@@ -120,10 +125,11 @@ class ReferrerMap {
         }
     }
     async syncAll() {
+        var _a;
         const rpcRequestArgs = [
             this.velocityClient.program.programId.toBase58(),
             {
-                commitment: this.velocityClient.opts.commitment,
+                commitment: (_a = this.velocityClient.opts) === null || _a === void 0 ? void 0 : _a.commitment,
                 filters: [(0, memcmp_1.getUserStatsFilter)()],
                 encoding: 'base64',
                 dataSlice: {
@@ -146,10 +152,11 @@ class ReferrerMap {
         }
     }
     async syncReferrer(referrerFilter) {
+        var _a;
         const rpcRequestArgs = [
             this.velocityClient.program.programId.toBase58(),
             {
-                commitment: this.velocityClient.opts.commitment,
+                commitment: (_a = this.velocityClient.opts) === null || _a === void 0 ? void 0 : _a.commitment,
                 filters: [(0, memcmp_1.getUserStatsFilter)(), referrerFilter],
                 encoding: 'base64',
                 dataSlice: {

package/lib/browser/userMap/revenueShareEscrowMap.js

@@ -16,6 +16,7 @@ class RevenueShareEscrowMap {
          * map from authority pubkey to RevenueShareEscrow account data.
          */
         this.authorityEscrowMap = new Map();
+        this.fetchPromiseResolver = () => { };
         this.velocityClient = velocityClient;
         this.parallelSync = parallelSync !== undefined ? parallelSync : true;
     }
@@ -89,6 +90,9 @@ class RevenueShareEscrowMap {
         }
         for (const authority of this.authorityEscrowMap.keys()) {
             const accountInfo = await this.velocityClient.connection.getAccountInfo((0, pda_1.getRevenueShareEscrowAccountPublicKey)(this.velocityClient.program.programId, new web3_js_1.PublicKey(authority)), 'confirmed');
+            if (accountInfo === null) {
+                throw new Error(`RevenueShareEscrow account not found for authority ${authority} during slowSync`);
+            }
             const escrowNew = this.velocityClient.program.account.revenueShareEscrow.coder.accounts.decode('revenueShareEscrow', accountInfo.data);
             this.authorityEscrowMap.set(authority, escrowNew);
         }

package/lib/browser/userMap/userMap.d.ts

@@ -37,7 +37,7 @@ export declare class UserMap implements UserMapInterface {
     private filterByPoolId?;
     private additionalFilters?;
     private disableSyncOnTotalAccountsChange;
-    private lastNumberOfSubAccounts;
+    private lastNumberOfSubAccounts?;
     private subscription;
     private stateAccountUpdateCallback;
     private decode;

package/lib/browser/userMap/userMap.js

@@ -19,15 +19,17 @@ class UserMap {
      * Constructs a new UserMap instance.
      */
     constructor(config) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         this.userMap = new Map();
         this.stateAccountUpdateCallback = async (state) => {
-            if (!state.numberOfSubAccounts.eq(this.lastNumberOfSubAccounts)) {
+            if (this.lastNumberOfSubAccounts === undefined ||
+                !state.numberOfSubAccounts.eq(this.lastNumberOfSubAccounts)) {
                 await this.sync();
                 this.lastNumberOfSubAccounts = state.numberOfSubAccounts;
             }
         };
         this.mostRecentSlot = 0;
+        this.syncPromiseResolver = () => { };
         // Type-system guarantees at least one of the two is supplied.
         this.velocityClient = config.velocityClient;
         if (config.connection) {
@@ -37,18 +39,18 @@ class UserMap {
             this.connection = this.velocityClient.connection;
         }
         this.commitment =
-            config.subscriptionConfig.type === 'websocket' ||
+            (_d = (config.subscriptionConfig.type === 'websocket' ||
                 config.subscriptionConfig.type === 'polling'
-                ? (_a = config.subscriptionConfig.commitment) !== null && _a !== void 0 ? _a : this.velocityClient.opts.commitment
-                : this.velocityClient.opts.commitment;
-        this.includeIdle = (_b = config.includeIdle) !== null && _b !== void 0 ? _b : false;
+                ? (_a = config.subscriptionConfig.commitment) !== null && _a !== void 0 ? _a : (_b = this.velocityClient.opts) === null || _b === void 0 ? void 0 : _b.commitment
+                : (_c = this.velocityClient.opts) === null || _c === void 0 ? void 0 : _c.commitment)) !== null && _d !== void 0 ? _d : 'confirmed';
+        this.includeIdle = (_e = config.includeIdle) !== null && _e !== void 0 ? _e : false;
         this.filterByPoolId = config.filterByPoolId;
         this.additionalFilters = config.additionalFilters;
         this.disableSyncOnTotalAccountsChange =
-            (_c = config.disableSyncOnTotalAccountsChange) !== null && _c !== void 0 ? _c : false;
+            (_f = config.disableSyncOnTotalAccountsChange) !== null && _f !== void 0 ? _f : false;
         let decodeFn;
-        if ((_d = config.fastDecode) !== null && _d !== void 0 ? _d : true) {
-            decodeFn = (name, buffer) => (0, user_2.decodeUser)(buffer);
+        if ((_g = config.fastDecode) !== null && _g !== void 0 ? _g : true) {
+            decodeFn = (_name, buffer) => (0, user_2.decodeUser)(buffer);
         }
         else {
             decodeFn = this.velocityClient.program.account.user.coder.accounts.decodeUnchecked.bind(this.velocityClient.program.account.user.coder.accounts);
@@ -85,11 +87,11 @@ class UserMap {
                 decodeFn,
             });
         }
-        this.syncConfig = (_e = config.syncConfig) !== null && _e !== void 0 ? _e : {
+        this.syncConfig = (_h = config.syncConfig) !== null && _h !== void 0 ? _h : {
             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 = (_j = config.throwOnFailedSync) !== null && _j !== void 0 ? _j : false;
         this.eventEmitter = new events_1.EventEmitter();
     }
     async subscribe() {
@@ -116,9 +118,13 @@ class UserMap {
             },
         });
         await user.subscribe(userAccount);
+        const resolvedSlot = slot !== null && slot !== void 0 ? slot : (_a = user.getUserAccountAndSlot()) === null || _a === void 0 ? void 0 : _a.slot;
+        if (resolvedSlot === undefined) {
+            throw new Error('UserMap.addPubkey: no slot available after subscribing user account');
+        }
         this.userMap.set(userAccountPublicKey.toString(), {
             data: user,
-            slot: slot !== null && slot !== void 0 ? slot : (_a = user.getUserAccountAndSlot()) === null || _a === void 0 ? void 0 : _a.slot,
+            slot: resolvedSlot,
         });
         this.eventEmitter.emit('userUpdate', user);
     }
@@ -146,17 +152,25 @@ class UserMap {
         if (!this.has(key)) {
             await this.addPubkey(new web3_js_1.PublicKey(key), undefined, undefined, accountSubscription);
         }
-        return this.userMap.get(key).data;
+        const userWithSlot = this.userMap.get(key);
+        if (!userWithSlot) {
+            throw new Error(`UserMap.mustGet: no user found for ${key}`);
+        }
+        return userWithSlot.data;
     }
     async mustGetWithSlot(key, accountSubscription) {
         if (!this.has(key)) {
             await this.addPubkey(new web3_js_1.PublicKey(key), undefined, undefined, accountSubscription);
         }
-        return this.userMap.get(key);
+        const userWithSlot = this.userMap.get(key);
+        if (!userWithSlot) {
+            throw new Error(`UserMap.mustGetWithSlot: no user found for ${key}`);
+        }
+        return userWithSlot;
     }
     async mustGetUserAccount(key) {
         const user = await this.mustGet(key);
-        return user.getUserAccount();
+        return user.getUserAccountOrThrow();
     }
     /**
      * gets the Authority for a particular userAccountPublicKey, if no User exists, undefined is returned
@@ -164,11 +178,12 @@ class UserMap {
      * @returns authority PublicKey | undefined
      */
     getUserAuthority(key) {
+        var _a;
         const user = this.userMap.get(key);
         if (!user) {
             return undefined;
         }
-        return user.data.getUserAccount().authority;
+        return (_a = user.data.getUserAccount()) === null || _a === void 0 ? void 0 : _a.authority;
     }
     /**
      * implements the {@link DLOBSource} interface
@@ -247,13 +262,13 @@ class UserMap {
      */
     getUniqueAuthorities(filterCriteria) {
         const usersMeetingCriteria = Array.from(this.values()).filter((user) => {
-            let pass = true;
+            const userAccount = user.getUserAccountOrThrow();
             if (filterCriteria && filterCriteria.hasOpenOrders) {
-                pass = pass && user.getUserAccount().hasOpenOrder;
+                return userAccount.hasOpenOrder;
             }
-            return pass;
+            return true;
         });
-        const userAuths = new Set(usersMeetingCriteria.map((user) => user.getUserAccount().authority.toBase58()));
+        const userAuths = new Set(usersMeetingCriteria.map((user) => user.getUserAccountOrThrow().authority.toBase58()));
         const userAuthKeys = Array.from(userAuths).map((userAuth) => new web3_js_1.PublicKey(userAuth));
         return userAuthKeys;
     }
@@ -441,9 +456,7 @@ class UserMap {
             }
         }
         finally {
-            if (this.syncPromiseResolver) {
-                this.syncPromiseResolver();
-            }
+            this.syncPromiseResolver();
             this.syncPromise = undefined;
         }
     }

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

@@ -35,7 +35,7 @@ export declare class UserStatsMap {
     updateWithOrderRecord(record: OrderRecord, userMap: UserMap): Promise<void>;
     updateWithEventRecord(record: WrappedEvent<any>, userMap?: UserMap): Promise<void>;
     has(authorityPublicKey: string): boolean;
-    get(authorityPublicKey: string): UserStats;
+    get(authorityPublicKey: string): UserStats | undefined;
     /**
      * Enforce that a UserStats will exist for the given authorityPublicKey,
      * reading one from the blockchain if necessary.

package/lib/browser/userMap/userStatsMap.js

@@ -14,13 +14,15 @@ class UserStatsMap {
      * @param {BulkAccountLoader} [bulkAccountLoader] - If not provided, a new BulkAccountLoader with polling disabled will be created.
      */
     constructor(velocityClient, bulkAccountLoader, syncConfig) {
+        var _a, _b;
         /**
          * map from authority pubkey to UserStats
          */
         this.userStatsMap = new Map();
+        this.syncPromiseResolver = () => { };
         this.velocityClient = velocityClient;
         if (!bulkAccountLoader) {
-            bulkAccountLoader = new bulkAccountLoader_1.BulkAccountLoader(velocityClient.connection, velocityClient.opts.commitment, 0);
+            bulkAccountLoader = new bulkAccountLoader_1.BulkAccountLoader(velocityClient.connection, (_b = (_a = velocityClient.opts) === null || _a === void 0 ? void 0 : _a.commitment) !== null && _b !== void 0 ? _b : 'confirmed', 0);
         }
         this.bulkAccountLoader = bulkAccountLoader;
         this.syncConfig = syncConfig !== null && syncConfig !== void 0 ? syncConfig : {
@@ -60,8 +62,8 @@ class UserStatsMap {
     }
     async updateWithOrderRecord(record, userMap) {
         const user = await userMap.mustGet(record.user.toString());
-        if (!this.has(user.getUserAccount().authority.toString())) {
-            await this.addUserStat(user.getUserAccount().authority, undefined, false);
+        if (!this.has(user.getUserAccountOrThrow().authority.toString())) {
+            await this.addUserStat(user.getUserAccountOrThrow().authority, undefined, false);
         }
     }
     async updateWithEventRecord(record, userMap) {
@@ -79,9 +81,9 @@ class UserStatsMap {
             }
             const liqRecord = record;
             const user = await userMap.mustGet(liqRecord.user.toString());
-            await this.mustGet(user.getUserAccount().authority.toString());
+            await this.mustGet(user.getUserAccountOrThrow().authority.toString());
             const liquidatorUser = await userMap.mustGet(liqRecord.liquidator.toString());
-            await this.mustGet(liquidatorUser.getUserAccount().authority.toString());
+            await this.mustGet(liquidatorUser.getUserAccountOrThrow().authority.toString());
         }
         else if (record.eventType === 'OrderRecord') {
             if (!userMap) {
@@ -97,11 +99,11 @@ class UserStatsMap {
             const actionRecord = record;
             if (actionRecord.taker) {
                 const taker = await userMap.mustGet(actionRecord.taker.toString());
-                await this.mustGet(taker.getUserAccount().authority.toString());
+                await this.mustGet(taker.getUserAccountOrThrow().authority.toString());
             }
             if (actionRecord.maker) {
                 const maker = await userMap.mustGet(actionRecord.maker.toString());
-                await this.mustGet(maker.getUserAccount().authority.toString());
+                await this.mustGet(maker.getUserAccountOrThrow().authority.toString());
             }
         }
         else if (record.eventType === 'SettlePnlRecord') {
@@ -110,7 +112,7 @@ class UserStatsMap {
             }
             const settlePnlRecord = record;
             const user = await userMap.mustGet(settlePnlRecord.user.toString());
-            await this.mustGet(user.getUserAccount().authority.toString());
+            await this.mustGet(user.getUserAccountOrThrow().authority.toString());
         }
         else if (record.eventType === 'NewUserRecord') {
             const newUserRecord = record;
@@ -137,7 +139,11 @@ class UserStatsMap {
         if (!this.has(authorityPublicKey)) {
             await this.addUserStat(new web3_js_1.PublicKey(authorityPublicKey), undefined, false);
         }
-        return this.get(authorityPublicKey);
+        const userStats = this.get(authorityPublicKey);
+        if (!userStats) {
+            throw new Error(`UserStatsMap: UserStats missing for authority ${authorityPublicKey} after addUserStat`);
+        }
+        return userStats;
     }
     values() {
         return this.userStatsMap.values();
@@ -216,8 +222,9 @@ class UserStatsMap {
             for (let i = 0; i < accountsToLoad.length; i += chunkSize) {
                 const chunk = accountsToLoad.slice(i, i + chunkSize);
                 tasks.push(async () => {
+                    var _a;
                     const accountInfos = await this.velocityClient.connection.getMultipleAccountsInfoAndContext(chunk, {
-                        commitment: this.velocityClient.opts.commitment,
+                        commitment: (_a = this.velocityClient.opts) === null || _a === void 0 ? void 0 : _a.commitment,
                     });
                     for (let j = 0; j < accountInfos.value.length; j += 1) {
                         const accountInfo = accountInfos.value[j];
@@ -250,9 +257,7 @@ class UserStatsMap {
             console.error(`Error in UserStatsMap.paginatedSync():`, err);
         }
         finally {
-            if (this.syncPromiseResolver) {
-                this.syncPromiseResolver();
-            }
+            this.syncPromiseResolver();
             this.syncPromise = undefined;
         }
     }

package/lib/browser/userStats.d.ts

@@ -17,8 +17,13 @@ export declare class UserStats {
     subscribe(userStatsAccount?: UserStatsAccount): Promise<boolean>;
     fetchAccounts(): Promise<void>;
     unsubscribe(): Promise<void>;
-    getAccountAndSlot(): DataAndSlot<UserStatsAccount>;
-    getAccount(): UserStatsAccount;
+    getAccountAndSlot(): DataAndSlot<UserStatsAccount> | undefined;
+    getAccount(): UserStatsAccount | undefined;
+    /**
+     * Like {@link getAccount} but throws a named error instead of returning
+     * `undefined` when the stats account has not been loaded yet.
+     */
+    getAccountOrThrow(): UserStatsAccount;
     getReferrerInfo(): ReferrerInfo | undefined;
     static getOldestActionTs(account: UserStatsAccount): number;
 }

package/lib/browser/userStats.js

@@ -9,6 +9,7 @@ const grpcUserStatsAccountSubscriber_1 = require("./accounts/grpcUserStatsAccoun
 class UserStats {
     constructor(config) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
+        this.isSubscribed = false;
         // Type-system guarantees at least one of the two is supplied.
         const velocityClient = config.velocityClient;
         this.velocityClient = velocityClient;
@@ -52,16 +53,29 @@ class UserStats {
         return this.accountSubscriber.getUserStatsAccountAndSlot();
     }
     getAccount() {
-        return this.accountSubscriber.getUserStatsAccountAndSlot().data;
+        var _a;
+        return (_a = this.accountSubscriber.getUserStatsAccountAndSlot()) === null || _a === void 0 ? void 0 : _a.data;
+    }
+    /**
+     * Like {@link getAccount} but throws a named error instead of returning
+     * `undefined` when the stats account has not been loaded yet.
+     */
+    getAccountOrThrow() {
+        const account = this.getAccount();
+        if (!account) {
+            throw new Error('UserStats account not loaded');
+        }
+        return account;
     }
     getReferrerInfo() {
-        if (this.getAccount().referrer.equals(web3_js_1.PublicKey.default)) {
+        const account = this.getAccount();
+        if (!account || account.referrer.equals(web3_js_1.PublicKey.default)) {
             return undefined;
         }
         else {
             return {
-                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),
+                referrer: (0, pda_1.getUserAccountPublicKeySync)(this.velocityClient.program.programId, account.referrer, 0),
+                referrerStats: (0, pda_1.getUserStatsAccountPublicKey)(this.velocityClient.program.programId, account.referrer),
             };
         }
     }

package/lib/browser/util/TransactionConfirmationManager.js

@@ -156,10 +156,12 @@ class TransactionConfirmationManager {
             }
             if (status.err) {
                 this.pendingConfirmations.delete(request.txSig);
-                request.reject(await (0, reportTransactionError_1.getTransactionErrorFromTxSig)(request.txSig, this.connection));
+                const txError = await (0, reportTransactionError_1.getTransactionErrorFromTxSig)(request.txSig, this.connection);
+                request.reject(txError !== null && txError !== void 0 ? txError : new Error(`Transaction failed but no error could be resolved for signature ${request.txSig}`));
                 continue;
             }
-            if (confirmationStatusValues[status.confirmationStatus] === undefined ||
+            if (status.confirmationStatus === undefined ||
+                confirmationStatusValues[status.confirmationStatus] === undefined ||
                 confirmationStatusValues[request.desiredConfirmationStatus] ===
                     undefined) {
                 throw new Error(`Invalid confirmation status when awaiting confirmation: ${status.confirmationStatus}`);

package/lib/browser/util/chainClock.d.ts

@@ -13,5 +13,5 @@ export declare class ChainClock {
     private _state;
     constructor(props: ChainClickInitialisationProps);
     update(props: ChainClockUpdateProps): void;
-    getState(commitment: Commitment): ChainClockProgress;
+    getState(commitment: Commitment): ChainClockProgress | undefined;
 }

package/lib/browser/util/computeUnits.d.ts

@@ -1,5 +1,5 @@
 import { Connection, Finality, PublicKey, TransactionInstruction } from '@solana/web3.js';
-export declare function findComputeUnitConsumption(programId: PublicKey, connection: Connection, txSignature: string, commitment?: Finality): Promise<number[]>;
+export declare function findComputeUnitConsumption(programId: PublicKey, connection: Connection, txSignature: string, commitment?: Finality): Promise<string[]>;
 export declare function isSetComputeUnitsIx(ix: TransactionInstruction): boolean;
 export declare function isSetComputeUnitPriceIx(ix: TransactionInstruction): boolean;
 export declare function containsComputeUnitIxs(ixs: TransactionInstruction[]): {

package/lib/browser/util/computeUnits.js

@@ -3,10 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.containsComputeUnitIxs = exports.isSetComputeUnitPriceIx = exports.isSetComputeUnitsIx = exports.findComputeUnitConsumption = void 0;
 const web3_js_1 = require("@solana/web3.js");
 async function findComputeUnitConsumption(programId, connection, txSignature, commitment = 'confirmed') {
+    var _a;
     const tx = await connection.getTransaction(txSignature, { commitment });
     const computeUnits = [];
+    const logMessages = (_a = tx === null || tx === void 0 ? void 0 : tx.meta) === null || _a === void 0 ? void 0 : _a.logMessages;
+    if (!logMessages) {
+        return computeUnits;
+    }
     const regex = new RegExp(`Program ${programId.toString()} consumed ([0-9]{0,6}) of ([0-9]{0,7}) compute units`);
-    tx.meta.logMessages.forEach((logMessage) => {
+    logMessages.forEach((logMessage) => {
         const match = logMessage.match(regex);
         if (match && match[1]) {
             computeUnits.push(match[1]);