@velocity-exchange/sdk 0.0.5 → 0.2.0

package/lib/node/userStats.js

@@ -7,32 +7,29 @@ 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, _j;
+        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 = ((_a = config.velocityClient) !== null && _a !== void 0 ? _a : config.driftClient);
+        const velocityClient = config.velocityClient;
         this.velocityClient = velocityClient;
         this.userStatsAccountPublicKey = config.userStatsAccountPublicKey;
-        if (((_b = config.accountSubscription) === null || _b === void 0 ? void 0 : _b.type) === 'polling') {
+        if (((_a = config.accountSubscription) === null || _a === void 0 ? void 0 : _a.type) === 'polling') {
             this.accountSubscriber = new pollingUserStatsAccountSubscriber_1.PollingUserStatsAccountSubscriber(velocityClient.program, config.userStatsAccountPublicKey, config.accountSubscription.accountLoader);
         }
-        else if (((_c = config.accountSubscription) === null || _c === void 0 ? void 0 : _c.type) === 'grpc') {
+        else if (((_b = config.accountSubscription) === null || _b === void 0 ? void 0 : _b.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,
+                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 (((_f = config.accountSubscription) === null || _f === void 0 ? void 0 : _f.type) === 'websocket') {
+        else if (((_e = config.accountSubscription) === null || _e === void 0 ? void 0 : _e.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,
+                resubTimeoutMs: (_f = config.accountSubscription) === null || _f === void 0 ? void 0 : _f.resubTimeoutMs,
+                logResubMessages: (_g = config.accountSubscription) === null || _g === void 0 ? void 0 : _g.logResubMessages,
             }, config.accountSubscription.commitment);
         }
-        else if (((_j = config.accountSubscription) === null || _j === void 0 ? void 0 : _j.type) === 'custom') {
+        else if (((_h = config.accountSubscription) === null || _h === void 0 ? void 0 : _h.type) === 'custom') {
             this.accountSubscriber =
                 config.accountSubscription.userStatsAccountSubscriber;
         }
@@ -56,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/node/userStatsConfig.d.ts

@@ -2,12 +2,13 @@ import { VelocityClient } from './velocityClient';
 import { Commitment, PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from './accounts/bulkAccountLoader';
 import { GrpcConfigs, UserStatsAccountSubscriber } from './accounts/types';
-import { AtLeastOne } from './util/deprecatedAlias';
 type UserStatsConfigBase = {
     accountSubscription?: UserStatsSubscriptionConfig;
     userStatsAccountPublicKey: PublicKey;
 };
-export type UserStatsConfig = UserStatsConfigBase & AtLeastOne<'velocityClient', 'driftClient', VelocityClient>;
+export type UserStatsConfig = UserStatsConfigBase & {
+    velocityClient: VelocityClient;
+};
 export type UserStatsSubscriptionConfig = {
     type: 'websocket';
     resubTimeoutMs?: number;

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

@@ -1 +1 @@
-{"version":3,"file":"userStatsConfig.d.ts","sourceRoot":"","sources":["../../src/userStatsConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEpD,KAAK,mBAAmB,GAAG;IAC1B,mBAAmB,CAAC,EAAE,2BAA2B,CAAC;IAClD,yBAAyB,EAAE,SAAS,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,mBAAmB,GAChD,UAAU,CAAC,gBAAgB,EAAE,aAAa,EAAE,cAAc,CAAC,CAAC;AAE7D,MAAM,MAAM,2BAA2B,GACpC;IACA,IAAI,EAAE,WAAW,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,UAAU,CAAC,EAAE,UAAU,CAAC;CACvB,GACD;IACA,IAAI,EAAE,SAAS,CAAC;IAChB,aAAa,EAAE,iBAAiB,CAAC;CAChC,GACD;IACA,IAAI,EAAE,QAAQ,CAAC;IACf,0BAA0B,EAAE,0BAA0B,CAAC;CACtD,GACD;IACA,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,WAAW,EAAE,WAAW,CAAC;CACxB,CAAC"}
+{"version":3,"file":"userStatsConfig.d.ts","sourceRoot":"","sources":["../../src/userStatsConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC;AAE3E,KAAK,mBAAmB,GAAG;IAC1B,mBAAmB,CAAC,EAAE,2BAA2B,CAAC;IAClD,yBAAyB,EAAE,SAAS,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,mBAAmB,GAAG;IACnD,cAAc,EAAE,cAAc,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,2BAA2B,GACpC;IACA,IAAI,EAAE,WAAW,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,UAAU,CAAC,EAAE,UAAU,CAAC;CACvB,GACD;IACA,IAAI,EAAE,SAAS,CAAC;IAChB,aAAa,EAAE,iBAAiB,CAAC;CAChC,GACD;IACA,IAAI,EAAE,QAAQ,CAAC;IACf,0BAA0B,EAAE,0BAA0B,CAAC;CACtD,GACD;IACA,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,WAAW,EAAE,WAAW,CAAC;CACxB,CAAC"}

package/lib/node/util/TransactionConfirmationManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TransactionConfirmationManager.d.ts","sourceRoot":"","sources":["../../../src/util/TransactionConfirmationManager.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,UAAU,EAEV,qBAAqB,EACrB,eAAe,EACf,eAAe,EACf,6BAA6B,EAC7B,MAAM,iBAAiB,CAAC;AAiCzB;;GAEG;AACH,qBAAa,8BAA8B;IAC1C,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,oBAAoB,CACjB;IACX,OAAO,CAAC,UAAU,CAA8C;gBAEpD,UAAU,EAAE,UAAU;IAI5B,2BAA2B,CAChC,KAAK,EAAE,MAAM,EACb,OAAO,SAAQ,EACf,yBAAyB,gCAAwE,GAC/F,OAAO,CAAC,qBAAqB,CAAC,eAAe,CAAC,CAAC;IAsG5C,yBAAyB,CAC9B,KAAK,EAAE,MAAM,EACb,yBAAyB,gCAAwE,EACjG,OAAO,SAAQ,EACf,YAAY,SAAO,EACnB,wBAAwB,UAAQ,GAC9B,OAAO,CAAC,eAAe,CAAC;IA0B3B,OAAO,CAAC,qBAAqB;YAIf,yBAAyB;IA2BvC,OAAO,CAAC,2CAA2C;YAerC,wBAAwB;CAsDtC"}
+{"version":3,"file":"TransactionConfirmationManager.d.ts","sourceRoot":"","sources":["../../../src/util/TransactionConfirmationManager.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,UAAU,EAEV,qBAAqB,EACrB,eAAe,EACf,eAAe,EACf,6BAA6B,EAC7B,MAAM,iBAAiB,CAAC;AAiCzB;;GAEG;AACH,qBAAa,8BAA8B;IAC1C,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,oBAAoB,CACjB;IACX,OAAO,CAAC,UAAU,CAA8C;gBAEpD,UAAU,EAAE,UAAU;IAI5B,2BAA2B,CAChC,KAAK,EAAE,MAAM,EACb,OAAO,SAAQ,EACf,yBAAyB,gCAAwE,GAC/F,OAAO,CAAC,qBAAqB,CAAC,eAAe,CAAC,CAAC;IAsG5C,yBAAyB,CAC9B,KAAK,EAAE,MAAM,EACb,yBAAyB,gCAAwE,EACjG,OAAO,SAAQ,EACf,YAAY,SAAO,EACnB,wBAAwB,UAAQ,GAC9B,OAAO,CAAC,eAAe,CAAC;IA0B3B,OAAO,CAAC,qBAAqB;YAIf,yBAAyB;IA2BvC,OAAO,CAAC,2CAA2C;YAerC,wBAAwB;CA8DtC"}

package/lib/node/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/node/util/chainClock.d.ts

@@ -13,6 +13,6 @@ export declare class ChainClock {
     private _state;
     constructor(props: ChainClickInitialisationProps);
     update(props: ChainClockUpdateProps): void;
-    getState(commitment: Commitment): ChainClockProgress;
+    getState(commitment: Commitment): ChainClockProgress | undefined;
 }
 //# sourceMappingURL=chainClock.d.ts.map

package/lib/node/util/chainClock.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chainClock.d.ts","sourceRoot":"","sources":["../../../src/util/chainClock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,MAAM,MAAM,kBAAkB,GAAG;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;CACZ,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IACnC,UAAU,EAAE,UAAU,CAAC;CACvB,GAAG,kBAAkB,CAAC;AAEvB,MAAM,MAAM,eAAe,GAAG,GAAG,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAC;AAElE,MAAM,MAAM,6BAA6B,GAAG,qBAAqB,EAAE,CAAC;AAEpE,qBAAa,UAAU;IACtB,OAAO,CAAC,MAAM,CAAkB;gBAEpB,KAAK,EAAE,6BAA6B;IAOhD,MAAM,CAAC,KAAK,EAAE,qBAAqB,GAAG,IAAI;IAWnC,QAAQ,CAAC,UAAU,EAAE,UAAU,GAAG,kBAAkB;CAG3D"}
+{"version":3,"file":"chainClock.d.ts","sourceRoot":"","sources":["../../../src/util/chainClock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,MAAM,MAAM,kBAAkB,GAAG;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;CACZ,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IACnC,UAAU,EAAE,UAAU,CAAC;CACvB,GAAG,kBAAkB,CAAC;AAEvB,MAAM,MAAM,eAAe,GAAG,GAAG,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAC;AAElE,MAAM,MAAM,6BAA6B,GAAG,qBAAqB,EAAE,CAAC;AAEpE,qBAAa,UAAU;IACtB,OAAO,CAAC,MAAM,CAAkB;gBAEpB,KAAK,EAAE,6BAA6B;IAOhD,MAAM,CAAC,KAAK,EAAE,qBAAqB,GAAG,IAAI;IAWnC,QAAQ,CAAC,UAAU,EAAE,UAAU,GAAG,kBAAkB,GAAG,SAAS;CAGvE"}

package/lib/node/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/node/util/computeUnits.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"computeUnits.d.ts","sourceRoot":"","sources":["../../../src/util/computeUnits.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,UAAU,EACV,QAAQ,EACR,SAAS,EACT,sBAAsB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,wBAAsB,0BAA0B,CAC/C,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,MAAM,EACnB,UAAU,GAAE,QAAsB,GAChC,OAAO,CAAC,MAAM,EAAE,CAAC,CAanB;AAED,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,sBAAsB,GAAG,OAAO,CAYvE;AAED,wBAAgB,uBAAuB,CAAC,EAAE,EAAE,sBAAsB,GAAG,OAAO,CAY3E;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,sBAAsB,EAAE,GAAG;IACtE,wBAAwB,EAAE,OAAO,CAAC;IAClC,wBAAwB,EAAE,OAAO,CAAC;CAClC,CAKA"}
+{"version":3,"file":"computeUnits.d.ts","sourceRoot":"","sources":["../../../src/util/computeUnits.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,UAAU,EACV,QAAQ,EACR,SAAS,EACT,sBAAsB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,wBAAsB,0BAA0B,CAC/C,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,MAAM,EACnB,UAAU,GAAE,QAAsB,GAChC,OAAO,CAAC,MAAM,EAAE,CAAC,CAiBnB;AAED,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,sBAAsB,GAAG,OAAO,CAYvE;AAED,wBAAgB,uBAAuB,CAAC,EAAE,EAAE,sBAAsB,GAAG,OAAO,CAY3E;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,sBAAsB,EAAE,GAAG;IACtE,wBAAwB,EAAE,OAAO,CAAC;IAClC,wBAAwB,EAAE,OAAO,CAAC;CAClC,CAKA"}

package/lib/node/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]);

package/lib/node/util/ed25519Utils.d.ts

@@ -1,7 +1,7 @@
 import { TransactionInstruction } from '@solana/web3.js';
 /**
  * Constructs a minimal Ed25519 verification instruction that references the data
- * inside the drift custom instruction (e.g. postPythLazerOracleUpdate, placeSignedMsgTakerOrder).
+ * inside the velocity custom instruction (e.g. postPythLazerOracleUpdate, placeSignedMsgTakerOrder).
  *
  * @param customInstructionIndex The index of the custom instruction in the transaction (e.g. if tx contains compute budget limit, compute budget price, ed25519 verify, custom ix, this would be 3).
  * @param messageOffset The offset within the custom instruction data where the signed message begins.

package/lib/node/util/ed25519Utils.js

@@ -47,7 +47,7 @@ const ED25519_INSTRUCTION_LAYOUT = BufferLayout.struct([
 ]);
 /**
  * Constructs a minimal Ed25519 verification instruction that references the data
- * inside the drift custom instruction (e.g. postPythLazerOracleUpdate, placeSignedMsgTakerOrder).
+ * inside the velocity custom instruction (e.g. postPythLazerOracleUpdate, placeSignedMsgTakerOrder).
  *
  * @param customInstructionIndex The index of the custom instruction in the transaction (e.g. if tx contains compute budget limit, compute budget price, ed25519 verify, custom ix, this would be 3).
  * @param messageOffset The offset within the custom instruction data where the signed message begins.