@velocity-exchange/sdk 0.1.0 → 0.2.1

package/lib/node/tx/retryTxSender.js

@@ -70,8 +70,10 @@ class RetryTxSender extends baseTxSender_1.BaseTxSender {
         try {
             const result = await this.confirmTransaction(txid, opts.commitment);
             (_b = this.txSigCache) === null || _b === void 0 ? void 0 : _b.set(txid, true);
-            await this.checkConfirmationResultForError(txid, result === null || result === void 0 ? void 0 : result.value);
-            slot = (_c = result === null || result === void 0 ? void 0 : result.context) === null || _c === void 0 ? void 0 : _c.slot;
+            if (result) {
+                await this.checkConfirmationResultForError(txid, result.value);
+                slot = (_c = result.context) === null || _c === void 0 ? void 0 : _c.slot;
+            }
             // eslint-disable-next-line no-useless-catch
         }
         catch (e) {

package/lib/node/tx/txHandler.d.ts

@@ -17,7 +17,7 @@ export type TxBuildingProps = {
     instructions: TransactionInstruction | TransactionInstruction[];
     txVersion: TransactionVersion;
     connection: Connection;
-    preFlightCommitment: Commitment;
+    preFlightCommitment?: Commitment;
     fetchAllMarketLookupTableAccounts: () => Promise<AddressLookupTableAccount[]>;
     lookupTables?: AddressLookupTableAccount[];
     forceVersionedTransaction?: boolean;
@@ -73,7 +73,13 @@ export declare class TxHandler {
     getLatestBlockhashForTransaction(): Promise<Readonly<{
         blockhash: string;
         lastValidBlockHeight: number;
-    }>>;
+    }> | undefined>;
+    /**
+     * Resolves a usable recent blockhash, preferring a caller-provided one and
+     * otherwise fetching the latest. Throws if no blockhash can be obtained,
+     * since a transaction cannot be built or signed without one.
+     */
+    private resolveRecentBlockhash;
     /**
      * Applies recent blockhash and signs a given transaction
      * @param tx
@@ -109,7 +115,7 @@ export declare class TxHandler {
      */
     buildBulkTransactions(props: Omit<TxBuildingProps, 'instructions'> & {
         instructions: (TransactionInstruction | TransactionInstruction[])[];
-    }): Promise<(Transaction | VersionedTransaction)[]>;
+    }): Promise<(Transaction | VersionedTransaction | undefined)[]>;
     /**
      *
      * @param instructions

package/lib/node/tx/txHandler.d.ts.map

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

package/lib/node/tx/txHandler.js

@@ -39,24 +39,24 @@ const RECENT_BLOCKHASH_STALE_TIME_MS = 2000; // Reuse blockhashes within this ti
  */
 class TxHandler {
     constructor(props) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
         this.blockHashToLastValidBlockHeightLookup = {};
         this.returnBlockHeightsWithSignedTxCallbackData = false;
-        this.blockhashCommitment = config_1.DEFAULT_CONFIRMATION_OPTS.commitment;
+        this.blockhashCommitment = (_a = config_1.DEFAULT_CONFIRMATION_OPTS.commitment) !== null && _a !== void 0 ? _a : 'confirmed';
         this.getProps = (wallet, confirmationOpts) => [wallet !== null && wallet !== void 0 ? wallet : this.wallet, confirmationOpts !== null && confirmationOpts !== void 0 ? confirmationOpts : this.confirmationOptions];
         this.connection = props.connection;
         this.wallet = props.wallet;
         this.confirmationOptions = props.confirmationOptions;
         this.blockhashCommitment =
-            (_e = (_d = (_b = (_a = props.confirmationOptions) === null || _a === void 0 ? void 0 : _a.preflightCommitment) !== null && _b !== void 0 ? _b : (_c = props === null || props === void 0 ? void 0 : props.connection) === null || _c === void 0 ? void 0 : _c.commitment) !== null && _d !== void 0 ? _d : this.blockhashCommitment) !== null && _e !== void 0 ? _e : 'confirmed';
-        this.blockHashFetcher = ((_f = props === null || props === void 0 ? void 0 : props.config) === null || _f === void 0 ? void 0 : _f.blockhashCachingEnabled)
-            ? new cachedBlockhashFetcher_1.CachedBlockhashFetcher(this.connection, this.blockhashCommitment, (_j = (_h = (_g = props === null || props === void 0 ? void 0 : props.config) === null || _g === void 0 ? void 0 : _g.blockhashCachingConfig) === null || _h === void 0 ? void 0 : _h.retryCount) !== null && _j !== void 0 ? _j : BLOCKHASH_FETCH_RETRY_COUNT, (_m = (_l = (_k = props === null || props === void 0 ? void 0 : props.config) === null || _k === void 0 ? void 0 : _k.blockhashCachingConfig) === null || _l === void 0 ? void 0 : _l.retrySleepTimeMs) !== null && _m !== void 0 ? _m : BLOCKHASH_FETCH_RETRY_SLEEP, (_q = (_p = (_o = props === null || props === void 0 ? void 0 : props.config) === null || _o === void 0 ? void 0 : _o.blockhashCachingConfig) === null || _p === void 0 ? void 0 : _p.staleCacheTimeMs) !== null && _q !== void 0 ? _q : RECENT_BLOCKHASH_STALE_TIME_MS)
+            (_f = (_e = (_c = (_b = props.confirmationOptions) === null || _b === void 0 ? void 0 : _b.preflightCommitment) !== null && _c !== void 0 ? _c : (_d = props === null || props === void 0 ? void 0 : props.connection) === null || _d === void 0 ? void 0 : _d.commitment) !== null && _e !== void 0 ? _e : this.blockhashCommitment) !== null && _f !== void 0 ? _f : 'confirmed';
+        this.blockHashFetcher = ((_g = props === null || props === void 0 ? void 0 : props.config) === null || _g === void 0 ? void 0 : _g.blockhashCachingEnabled)
+            ? new cachedBlockhashFetcher_1.CachedBlockhashFetcher(this.connection, this.blockhashCommitment, (_k = (_j = (_h = props === null || props === void 0 ? void 0 : props.config) === null || _h === void 0 ? void 0 : _h.blockhashCachingConfig) === null || _j === void 0 ? void 0 : _j.retryCount) !== null && _k !== void 0 ? _k : BLOCKHASH_FETCH_RETRY_COUNT, (_o = (_m = (_l = props === null || props === void 0 ? void 0 : props.config) === null || _l === void 0 ? void 0 : _l.blockhashCachingConfig) === null || _m === void 0 ? void 0 : _m.retrySleepTimeMs) !== null && _o !== void 0 ? _o : BLOCKHASH_FETCH_RETRY_SLEEP, (_r = (_q = (_p = props === null || props === void 0 ? void 0 : props.config) === null || _p === void 0 ? void 0 : _p.blockhashCachingConfig) === null || _q === void 0 ? void 0 : _q.staleCacheTimeMs) !== null && _r !== void 0 ? _r : RECENT_BLOCKHASH_STALE_TIME_MS)
             : new baseBlockhashFetcher_1.BaseBlockhashFetcher(this.connection, this.blockhashCommitment);
         // #Optionals
         this.returnBlockHeightsWithSignedTxCallbackData =
-            (_s = (_r = props.opts) === null || _r === void 0 ? void 0 : _r.returnBlockHeightsWithSignedTxCallbackData) !== null && _s !== void 0 ? _s : false;
-        this.onSignedCb = (_t = props.opts) === null || _t === void 0 ? void 0 : _t.onSignedCb;
-        this.preSignedCb = (_u = props.opts) === null || _u === void 0 ? void 0 : _u.preSignedCb;
+            (_t = (_s = props.opts) === null || _s === void 0 ? void 0 : _s.returnBlockHeightsWithSignedTxCallbackData) !== null && _t !== void 0 ? _t : false;
+        this.onSignedCb = (_u = props.opts) === null || _u === void 0 ? void 0 : _u.onSignedCb;
+        this.preSignedCb = (_v = props.opts) === null || _v === void 0 ? void 0 : _v.preSignedCb;
     }
     getWallet() {
         return this.wallet;
@@ -80,6 +80,18 @@ class TxHandler {
     async getLatestBlockhashForTransaction() {
         return this.blockHashFetcher.getLatestBlockhash();
     }
+    /**
+     * Resolves a usable recent blockhash, preferring a caller-provided one and
+     * otherwise fetching the latest. Throws if no blockhash can be obtained,
+     * since a transaction cannot be built or signed without one.
+     */
+    async resolveRecentBlockhash(recentBlockhash) {
+        const resolved = recentBlockhash !== null && recentBlockhash !== void 0 ? recentBlockhash : (await this.getLatestBlockhashForTransaction());
+        if (!resolved) {
+            throw new Error('TxHandler: failed to fetch a recent blockhash');
+        }
+        return resolved;
+    }
     /**
      * Applies recent blockhash and signs a given transaction
      * @param tx
@@ -96,14 +108,12 @@ class TxHandler {
         }
         [wallet, confirmationOpts] = this.getProps(wallet, confirmationOpts);
         tx.feePayer = wallet.publicKey;
-        recentBlockhash = recentBlockhash
-            ? recentBlockhash
-            : await this.getLatestBlockhashForTransaction();
-        tx.recentBlockhash = recentBlockhash.blockhash;
-        this.addHashAndExpiryToLookup(recentBlockhash);
+        const resolvedBlockhash = await this.resolveRecentBlockhash(recentBlockhash);
+        tx.recentBlockhash = resolvedBlockhash.blockhash;
+        this.addHashAndExpiryToLookup(resolvedBlockhash);
         const signedTx = await this.signTx(tx, additionalSigners);
         // @ts-ignore
-        signedTx.SIGNATURE_BLOCK_AND_EXPIRY = recentBlockhash;
+        signedTx.SIGNATURE_BLOCK_AND_EXPIRY = resolvedBlockhash;
         return signedTx;
     }
     isVersionedTransaction(tx) {
@@ -117,16 +127,21 @@ class TxHandler {
             return bs58_1.default.encode(Buffer.from(signedTx.signatures[0]));
         }
         else {
-            return bs58_1.default.encode(Buffer.from(signedTx.signature));
+            const signature = signedTx.signature;
+            if (!signature) {
+                throw new Error('TxHandler: cannot derive txSig from an unsigned legacy transaction');
+            }
+            return bs58_1.default.encode(Buffer.from(signature));
         }
     }
     getBlockhashFromSignedTx(signedTx) {
-        if (this.isVersionedTransaction(signedTx)) {
-            return signedTx.message.recentBlockhash;
-        }
-        else {
-            return signedTx.recentBlockhash;
+        const blockHash = this.isVersionedTransaction(signedTx)
+            ? signedTx.message.recentBlockhash
+            : signedTx.recentBlockhash;
+        if (!blockHash) {
+            throw new Error('TxHandler: signed transaction is missing a recentBlockhash');
         }
+        return blockHash;
     }
     async signTx(tx, additionalSigners, wallet) {
         var _a;
@@ -180,7 +195,7 @@ class TxHandler {
             if (this.onSignedCb) {
                 this.onSignedCb(txData);
             }
-            return;
+            return [];
         }
         const signedTxData = txData.map((tx) => {
             const lastValidBlockHeight = this.blockHashToLastValidBlockHeightLookup[tx.blockHash];
@@ -200,7 +215,7 @@ class TxHandler {
      * @returns
      */
     async getProcessedTransactionParams(txBuildingProps) {
-        var _a, _b;
+        var _a, _b, _c, _d, _e, _f;
         const baseTxParams = {
             computeUnits: (_a = txBuildingProps === null || txBuildingProps === void 0 ? void 0 : txBuildingProps.txParams) === null || _a === void 0 ? void 0 : _a.computeUnits,
             computeUnitsPrice: (_b = txBuildingProps === null || txBuildingProps === void 0 ? void 0 : txBuildingProps.txParams) === null || _b === void 0 ? void 0 : _b.computeUnitsPrice,
@@ -216,11 +231,10 @@ class TxHandler {
                 });
             },
             processConfig: {
-                useSimulatedComputeUnits: txBuildingProps.txParams.useSimulatedComputeUnits,
-                computeUnitsBufferMultiplier: txBuildingProps.txParams.computeUnitsBufferMultiplier,
-                useSimulatedComputeUnitsForCUPriceCalculation: txBuildingProps.txParams
-                    .useSimulatedComputeUnitsForCUPriceCalculation,
-                getCUPriceFromComputeUnits: txBuildingProps.txParams.getCUPriceFromComputeUnits,
+                useSimulatedComputeUnits: (_c = txBuildingProps.txParams) === null || _c === void 0 ? void 0 : _c.useSimulatedComputeUnits,
+                computeUnitsBufferMultiplier: (_d = txBuildingProps.txParams) === null || _d === void 0 ? void 0 : _d.computeUnitsBufferMultiplier,
+                useSimulatedComputeUnitsForCUPriceCalculation: (_e = txBuildingProps.txParams) === null || _e === void 0 ? void 0 : _e.useSimulatedComputeUnitsForCUPriceCalculation,
+                getCUPriceFromComputeUnits: (_f = txBuildingProps.txParams) === null || _f === void 0 ? void 0 : _f.getCUPriceFromComputeUnits,
             },
             processParams: {
                 connection: this.connection,
@@ -270,8 +284,7 @@ class TxHandler {
      * @returns
      */
     async buildBulkTransactions(props) {
-        var _a;
-        const recentBlockhash = (_a = props === null || props === void 0 ? void 0 : props.recentBlockhash) !== null && _a !== void 0 ? _a : (await this.getLatestBlockhashForTransaction());
+        const recentBlockhash = await this.resolveRecentBlockhash(props === null || props === void 0 ? void 0 : props.recentBlockhash);
         return await Promise.all(props.instructions.map((ix) => {
             if (!ix)
                 return undefined;
@@ -292,7 +305,6 @@ class TxHandler {
      * @returns
      */
     async buildTransaction(props) {
-        var _a;
         const { txVersion, txParams, connection: _connection, preFlightCommitment: _preFlightCommitment, fetchAllMarketLookupTableAccounts, forceVersionedTransaction, instructions, } = props;
         let { lookupTables } = props;
         const marketLookupTables = await fetchAllMarketLookupTableAccounts();
@@ -339,7 +351,9 @@ class TxHandler {
         // # Create Tx Instructions
         const allIx = [];
         const computeUnits = baseTxParams === null || baseTxParams === void 0 ? void 0 : baseTxParams.computeUnits;
-        if (computeUnits > 0 && !hasSetComputeUnitLimitIx) {
+        if (computeUnits !== undefined &&
+            computeUnits > 0 &&
+            !hasSetComputeUnitLimitIx) {
             allIx.push(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
                 units: computeUnits,
             }));
@@ -350,13 +364,15 @@ class TxHandler {
                 microLamports: 0,
             }));
         }
-        else if (computeUnitsPrice > 0 && !hasSetComputeUnitPriceIx) {
+        else if (computeUnitsPrice !== undefined &&
+            computeUnitsPrice > 0 &&
+            !hasSetComputeUnitPriceIx) {
             allIx.push(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
                 microLamports: computeUnitsPrice,
             }));
         }
         allIx.push(...instructionsToUse);
-        const recentBlockhash = (_a = props === null || props === void 0 ? void 0 : props.recentBlockhash) !== null && _a !== void 0 ? _a : (await this.getLatestBlockhashForTransaction());
+        const recentBlockhash = await this.resolveRecentBlockhash(props === null || props === void 0 ? void 0 : props.recentBlockhash);
         // # Create and return Transaction
         if (txVersion === 'legacy') {
             if (forceVersionedTransaction) {
@@ -399,17 +415,15 @@ class TxHandler {
      */
     async getPreparedAndSignedLegacyTransactionMap(txsMap, wallet, commitment, recentBlockhash) {
         var _a, _b;
-        recentBlockhash = recentBlockhash
-            ? recentBlockhash
-            : await this.getLatestBlockhashForTransaction();
-        this.addHashAndExpiryToLookup(recentBlockhash);
+        const resolvedBlockhash = await this.resolveRecentBlockhash(recentBlockhash);
+        this.addHashAndExpiryToLookup(resolvedBlockhash);
         for (const tx of Object.values(txsMap)) {
             if (!tx)
                 continue;
-            tx.recentBlockhash = recentBlockhash.blockhash;
+            tx.recentBlockhash = resolvedBlockhash.blockhash;
             tx.feePayer = (_a = wallet === null || wallet === void 0 ? void 0 : wallet.publicKey) !== null && _a !== void 0 ? _a : (_b = this.wallet) === null || _b === void 0 ? void 0 : _b.publicKey;
             // @ts-ignore
-            tx.SIGNATURE_BLOCK_AND_EXPIRY = recentBlockhash;
+            tx.SIGNATURE_BLOCK_AND_EXPIRY = resolvedBlockhash;
         }
         return this.getSignedTransactionMap(txsMap, wallet);
     }
@@ -429,7 +443,7 @@ class TxHandler {
             acc[key] = undefined;
             return acc;
         }, {});
-        const filteredTxEntries = txsToSignEntries.filter(([_, tx]) => !!tx);
+        const filteredTxEntries = txsToSignEntries.filter((entry) => !!entry[1]);
         // Extra handling for legacy transactions
         for (const [_key, tx] of filteredTxEntries) {
             if (this.isLegacyTransaction(tx)) {

package/lib/node/tx/txParamProcessor.d.ts

@@ -10,8 +10,11 @@ export declare class TransactionParamProcessor {
     private static getComputeUnitsFromSim;
     static getTxSimComputeUnits(tx: VersionedTransaction, connection: Connection, bufferMultiplier: number, // Making this a mandatory param to force the user to remember that simulated CU's can be inaccurate and a buffer should be applied
     lowerBoundCu?: number, simulatedTx?: SimulatedTransactionResponse): Promise<{
-        success: boolean;
+        success: true;
         computeUnits: number;
+    } | {
+        success: false;
+        computeUnits: undefined;
     }>;
     static process(props: {
         baseTxParams: BaseTxParams;

package/lib/node/tx/txParamProcessor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"txParamProcessor.d.ts","sourceRoot":"","sources":["../../../src/tx/txParamProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,UAAU,EAEV,4BAA4B,EAC5B,oBAAoB,EACpB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAO5D,KAAK,wBAAwB,GAAG;IAC/B,QAAQ,EAAE,YAAY,CAAC;CACvB,CAAC;AAEF;;GAEG;AACH,qBAAa,yBAAyB;mBAChB,sBAAsB;WAUvB,oBAAoB,CACvC,EAAE,EAAE,oBAAoB,EACxB,UAAU,EAAE,UAAU,EACtB,gBAAgB,EAAE,MAAM,EAAE,mIAAmI;IAC7J,YAAY,CAAC,EAAE,MAAM,EACrB,WAAW,CAAC,EAAE,4BAA4B,GACxC,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,YAAY,EAAE,MAAM,CAAA;KAAE,CAAC;WAiDzC,OAAO,CAAC,KAAK,EAAE;QAC3B,YAAY,EAAE,YAAY,CAAC;QAC3B,aAAa,EAAE,kBAAkB,CAAC;QAClC,aAAa,EAAE;YACd,UAAU,EAAE,UAAU,CAAC;YACvB,WAAW,CAAC,EAAE,4BAA4B,CAAC;SAC3C,CAAC;QACF,SAAS,EAAE,CACV,oBAAoB,EAAE,wBAAwB,KAC1C,OAAO,CAAC,oBAAoB,CAAC,CAAC;KACnC,GAAG,OAAO,CAAC,YAAY,CAAC;CAkEzB"}
+{"version":3,"file":"txParamProcessor.d.ts","sourceRoot":"","sources":["../../../src/tx/txParamProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,UAAU,EAEV,4BAA4B,EAC5B,oBAAoB,EACpB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAO5D,KAAK,wBAAwB,GAAG;IAC/B,QAAQ,EAAE,YAAY,CAAC;CACvB,CAAC;AAEF;;GAEG;AACH,qBAAa,yBAAyB;mBAChB,sBAAsB;WAUvB,oBAAoB,CACvC,EAAE,EAAE,oBAAoB,EACxB,UAAU,EAAE,UAAU,EACtB,gBAAgB,EAAE,MAAM,EAAE,mIAAmI;IAC7J,YAAY,CAAC,EAAE,MAAM,EACrB,WAAW,CAAC,EAAE,4BAA4B,GACxC,OAAO,CACP;QAAE,OAAO,EAAE,IAAI,CAAC;QAAC,YAAY,EAAE,MAAM,CAAA;KAAE,GACvC;QAAE,OAAO,EAAE,KAAK,CAAC;QAAC,YAAY,EAAE,SAAS,CAAA;KAAE,CAC7C;WAuDY,OAAO,CAAC,KAAK,EAAE;QAC3B,YAAY,EAAE,YAAY,CAAC;QAC3B,aAAa,EAAE,kBAAkB,CAAC;QAClC,aAAa,EAAE;YACd,UAAU,EAAE,UAAU,CAAC;YACvB,WAAW,CAAC,EAAE,4BAA4B,CAAC;SAC3C,CAAC;QACF,SAAS,EAAE,CACV,oBAAoB,EAAE,wBAAwB,KAC1C,OAAO,CAAC,oBAAoB,CAAC,CAAC;KACnC,GAAG,OAAO,CAAC,YAAY,CAAC;CAwEzB"}

package/lib/node/tx/txParamProcessor.js

@@ -32,6 +32,9 @@ class TransactionParamProcessor {
                 throw (_b = simTxResult === null || simTxResult === void 0 ? void 0 : simTxResult.value) === null || _b === void 0 ? void 0 : _b.err;
             }
             const computeUnits = await this.getComputeUnitsFromSim(simTxResult);
+            if (computeUnits === undefined) {
+                throw new Error('TransactionParamProcessor: simulation did not return units consumed');
+            }
             // Apply the buffer, but round down to the MAX_COMPUTE_UNITS, and round up to the nearest whole number
             let bufferedComputeUnits = Math.ceil(Math.min(computeUnits * bufferMultiplier, MAX_COMPUTE_UNITS));
             // If a lower bound CU is passed then enforce it
@@ -81,6 +84,9 @@ class TransactionParamProcessor {
                 throw new Error(`encountered useSimulatedComputeUnitsForFees=true, but getComputeUnitPriceFromUnitsToUse helper method is undefined`);
             }
             const simulatedComputeUnits = finalTxParams.computeUnits;
+            if (simulatedComputeUnits === undefined) {
+                throw new Error(`encountered useSimulatedComputeUnitsForFees=true, but simulated compute units are unavailable (simulation likely failed)`);
+            }
             const computeUnitPrice = processConfig.getCUPriceFromComputeUnits(simulatedComputeUnits);
             console.debug(`🔧:: Adjusting compute unit price for simulated compute unit budget :: ${finalTxParams.computeUnitsPrice}=>${computeUnitPrice}`);
             finalTxParams.computeUnitsPrice = computeUnitPrice;

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

@@ -9,7 +9,7 @@ export declare enum ConfirmationStrategy {
 }
 export type TxSigAndSlot = {
     txSig: TransactionSignature;
-    slot: number;
+    slot: number | undefined;
 };
 export interface TxSender {
     wallet: IWallet;

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/tx/types.ts"],"names":[],"mappings":";;AAAA,OAAO,EACN,yBAAyB,EACzB,8BAA8B,EAC9B,cAAc,EACd,MAAM,EACN,WAAW,EACX,sBAAsB,EACtB,oBAAoB,EACpB,oBAAoB,EACpB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAEnC,oBAAY,oBAAoB;IAC/B,SAAS,cAAc;IACvB,OAAO,YAAY;IACnB,KAAK,UAAU;CACf;AAED,MAAM,MAAM,YAAY,GAAG;IAC1B,KAAK,EAAE,oBAAoB,CAAC;IAC5B,IAAI,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,MAAM,WAAW,QAAQ;IACxB,MAAM,EAAE,OAAO,CAAC;IAEhB,IAAI,CACH,EAAE,EAAE,WAAW,EACf,iBAAiB,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,EACjC,IAAI,CAAC,EAAE,cAAc,EACrB,SAAS,CAAC,EAAE,OAAO,GACjB,OAAO,CAAC,YAAY,CAAC,CAAC;IAEzB,wBAAwB,CACvB,EAAE,EAAE,oBAAoB,EACxB,iBAAiB,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,EACjC,IAAI,CAAC,EAAE,cAAc,EACrB,SAAS,CAAC,EAAE,OAAO,GACjB,OAAO,CAAC,YAAY,CAAC,CAAC;IAEzB,uBAAuB,CACtB,GAAG,EAAE,sBAAsB,EAAE,EAC7B,mBAAmB,EAAE,yBAAyB,EAAE,EAChD,iBAAiB,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,EACjC,IAAI,CAAC,EAAE,cAAc,EACrB,SAAS,CAAC,EAAE,8BAA8B,GACxC,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAEjC,kBAAkB,CACjB,cAAc,EAAE,MAAM,GAAG,UAAU,EACnC,IAAI,EAAE,cAAc,GAClB,OAAO,CAAC,YAAY,CAAC,CAAC;IAEzB,mBAAmB,CAAC,EAAE,EAAE,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAEhE,eAAe,IAAI,MAAM,CAAC;IAC1B,iCAAiC,IAAI,MAAM,CAAC;IAC5C,aAAa,IAAI,MAAM,CAAC;CACxB;AAED,qBAAa,WAAY,SAAQ,KAAK;IAE7B,OAAO,EAAE,MAAM;IACf,IAAI,EAAE,MAAM;gBADZ,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM;CAOpB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/tx/types.ts"],"names":[],"mappings":";;AAAA,OAAO,EACN,yBAAyB,EACzB,8BAA8B,EAC9B,cAAc,EACd,MAAM,EACN,WAAW,EACX,sBAAsB,EACtB,oBAAoB,EACpB,oBAAoB,EACpB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAEnC,oBAAY,oBAAoB;IAC/B,SAAS,cAAc;IACvB,OAAO,YAAY;IACnB,KAAK,UAAU;CACf;AAED,MAAM,MAAM,YAAY,GAAG;IAC1B,KAAK,EAAE,oBAAoB,CAAC;IAC5B,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;CACzB,CAAC;AAEF,MAAM,WAAW,QAAQ;IACxB,MAAM,EAAE,OAAO,CAAC;IAEhB,IAAI,CACH,EAAE,EAAE,WAAW,EACf,iBAAiB,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,EACjC,IAAI,CAAC,EAAE,cAAc,EACrB,SAAS,CAAC,EAAE,OAAO,GACjB,OAAO,CAAC,YAAY,CAAC,CAAC;IAEzB,wBAAwB,CACvB,EAAE,EAAE,oBAAoB,EACxB,iBAAiB,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,EACjC,IAAI,CAAC,EAAE,cAAc,EACrB,SAAS,CAAC,EAAE,OAAO,GACjB,OAAO,CAAC,YAAY,CAAC,CAAC;IAEzB,uBAAuB,CACtB,GAAG,EAAE,sBAAsB,EAAE,EAC7B,mBAAmB,EAAE,yBAAyB,EAAE,EAChD,iBAAiB,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,EACjC,IAAI,CAAC,EAAE,cAAc,EACrB,SAAS,CAAC,EAAE,8BAA8B,GACxC,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAEjC,kBAAkB,CACjB,cAAc,EAAE,MAAM,GAAG,UAAU,EACnC,IAAI,EAAE,cAAc,GAClB,OAAO,CAAC,YAAY,CAAC,CAAC;IAEzB,mBAAmB,CAAC,EAAE,EAAE,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAEhE,eAAe,IAAI,MAAM,CAAC;IAC1B,iCAAiC,IAAI,MAAM,CAAC;IAC5C,aAAa,IAAI,MAAM,CAAC;CACxB;AAED,qBAAa,WAAY,SAAQ,KAAK;IAE7B,OAAO,EAAE,MAAM;IACf,IAAI,EAAE,MAAM;gBADZ,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM;CAOpB"}

package/lib/node/tx/whileValidTxSender.d.ts

@@ -9,12 +9,7 @@ type ResolveReference = {
     resolve?: () => void;
 };
 export declare class WhileValidTxSender extends BaseTxSender {
-    connection: Connection;
-    wallet: IWallet;
-    opts: ConfirmOptions;
-    timeout: number;
     retrySleep: number;
-    additionalConnections: Connection[];
     timoutCount: number;
     untilValid: Map<string, {
         blockhash: string;
@@ -27,7 +22,7 @@ export declare class WhileValidTxSender extends BaseTxSender {
         wallet: IWallet;
         opts?: ConfirmOptions;
         retrySleep?: number;
-        additionalConnections?: any;
+        additionalConnections?: Connection[];
         additionalTxSenderCallbacks?: ((base58EncodedTx: string) => void)[];
         confirmationStrategy?: ConfirmationStrategy;
         txHandler?: TxHandler;

package/lib/node/tx/whileValidTxSender.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"whileValidTxSender.d.ts","sourceRoot":"","sources":["../../../src/tx/whileValidTxSender.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC7D,OAAO,EACN,cAAc,EACd,UAAU,EAEV,MAAM,EACN,WAAW,EACX,oBAAoB,EACpB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAKnC,KAAK,gBAAgB,GAAG;IACvB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;CACrB,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,YAAY;IACnD,UAAU,EAAE,UAAU,CAAC;IACvB,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,cAAc,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,qBAAqB,EAAE,UAAU,EAAE,CAAC;IACpC,WAAW,SAAK;IAChB,UAAU;mBAEI,MAAM;8BAAwB,MAAM;OAC9C;IAEJ,oBAAoB,UAAQ;YAEd,+BAA+B;gBAsB1B,EAClB,UAAU,EACV,MAAM,EACN,IAAsD,EACtD,UAA0B,EAC1B,qBAA+C,EAC/C,oBAAiD,EACjD,2BAAgC,EAChC,SAAS,EACT,eAAe,EACf,+BAA+B,EAC/B,iBAAiB,EACjB,mBAA0B,EAC1B,uBAA8B,GAC9B,EAAE;QACF,UAAU,EAAE,UAAU,CAAC;QACvB,MAAM,EAAE,OAAO,CAAC;QAChB,IAAI,CAAC,EAAE,cAAc,CAAC;QACtB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,qBAAqB,CAAC,MAAC;QACvB,2BAA2B,CAAC,EAAE,CAAC,CAAC,eAAe,EAAE,MAAM,KAAK,IAAI,CAAC,EAAE,CAAC;QACpE,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;QAC5C,SAAS,CAAC,EAAE,SAAS,CAAC;QACtB,eAAe,CAAC,EAAE,OAAO,CAAC;QAC1B,+BAA+B,CAAC,EAAE,MAAM,CAAC;QACzC,iBAAiB,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC;QACjD,mBAAmB,CAAC,EAAE,OAAO,CAAC;QAC9B,uBAAuB,CAAC,EAAE,OAAO,CAAC;KAClC;IAoBK,KAAK,CAAC,SAAS,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAOjD,SAAS,CACd,EAAE,EAAE,WAAW,EACf,iBAAiB,EAAE,KAAK,CAAC,MAAM,CAAC,EAChC,IAAI,EAAE,cAAc,EACpB,SAAS,CAAC,EAAE,OAAO,GACjB,OAAO,CAAC,WAAW,CAAC;IAiCjB,wBAAwB,CAC7B,EAAE,EAAE,oBAAoB,EACxB,iBAAiB,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,EACjC,IAAI,CAAC,EAAE,cAAc,EACrB,SAAS,CAAC,EAAE,OAAO,GACjB,OAAO,CAAC,YAAY,CAAC;IA6ClB,kBAAkB,CACvB,cAAc,EAAE,MAAM,GAAG,UAAU,EACnC,IAAI,EAAE,cAAc,GAClB,OAAO,CAAC,YAAY,CAAC;CA6DxB"}
+{"version":3,"file":"whileValidTxSender.d.ts","sourceRoot":"","sources":["../../../src/tx/whileValidTxSender.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC7D,OAAO,EACN,cAAc,EACd,UAAU,EAEV,MAAM,EACN,WAAW,EACX,oBAAoB,EACpB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAKnC,KAAK,gBAAgB,GAAG;IACvB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;CACrB,CAAC;AAEF,qBAAa,kBAAmB,SAAQ,YAAY;IACnD,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,SAAK;IAChB,UAAU;mBAEI,MAAM;8BAAwB,MAAM;OAC9C;IAEJ,oBAAoB,UAAQ;YAEd,+BAA+B;gBAsB1B,EAClB,UAAU,EACV,MAAM,EACN,IAAsD,EACtD,UAA0B,EAC1B,qBAA+C,EAC/C,oBAAiD,EACjD,2BAAgC,EAChC,SAAS,EACT,eAAe,EACf,+BAA+B,EAC/B,iBAAiB,EACjB,mBAA0B,EAC1B,uBAA8B,GAC9B,EAAE;QACF,UAAU,EAAE,UAAU,CAAC;QACvB,MAAM,EAAE,OAAO,CAAC;QAChB,IAAI,CAAC,EAAE,cAAc,CAAC;QACtB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,qBAAqB,CAAC,EAAE,UAAU,EAAE,CAAC;QACrC,2BAA2B,CAAC,EAAE,CAAC,CAAC,eAAe,EAAE,MAAM,KAAK,IAAI,CAAC,EAAE,CAAC;QACpE,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;QAC5C,SAAS,CAAC,EAAE,SAAS,CAAC;QACtB,eAAe,CAAC,EAAE,OAAO,CAAC;QAC1B,+BAA+B,CAAC,EAAE,MAAM,CAAC;QACzC,iBAAiB,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC;QACjD,mBAAmB,CAAC,EAAE,OAAO,CAAC;QAC9B,uBAAuB,CAAC,EAAE,OAAO,CAAC;KAClC;IAoBK,KAAK,CAAC,SAAS,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAOjD,SAAS,CACd,EAAE,EAAE,WAAW,EACf,iBAAiB,EAAE,KAAK,CAAC,MAAM,CAAC,EAChC,IAAI,EAAE,cAAc,EACpB,SAAS,CAAC,EAAE,OAAO,GACjB,OAAO,CAAC,WAAW,CAAC;IAgDjB,wBAAwB,CAC7B,EAAE,EAAE,oBAAoB,EACxB,iBAAiB,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,EACjC,IAAI,CAAC,EAAE,cAAc,EACrB,SAAS,CAAC,EAAE,OAAO,GACjB,OAAO,CAAC,YAAY,CAAC;IA8DlB,kBAAkB,CACvB,cAAc,EAAE,MAAM,GAAG,UAAU,EACnC,IAAI,EAAE,cAAc,GAClB,OAAO,CAAC,YAAY,CAAC;CA+DxB"}

package/lib/node/tx/whileValidTxSender.js

@@ -60,6 +60,9 @@ class WhileValidTxSender extends baseTxSender_1.BaseTxSender {
     async prepareTx(tx, additionalSigners, opts, preSigned) {
         var _a;
         let latestBlockhash = await this.txHandler.getLatestBlockhashForTransaction();
+        if (!latestBlockhash) {
+            throw new Error('WhileValidTxSender: failed to fetch latest blockhash for transaction');
+        }
         // handle tx
         let signedTx = tx;
         if (!preSigned) {
@@ -72,12 +75,22 @@ class WhileValidTxSender extends baseTxSender_1.BaseTxSender {
             latestBlockhash = tx.SIGNATURE_BLOCK_AND_EXPIRY;
         }
         // handle subclass-specific side effects
-        const txSig = bs58_1.default.encode((signedTx === null || signedTx === void 0 ? void 0 : signedTx.signature) || ((_a = signedTx.signatures[0]) === null || _a === void 0 ? void 0 : _a.signature));
+        const signature = (signedTx === null || signedTx === void 0 ? void 0 : signedTx.signature) || ((_a = signedTx.signatures[0]) === null || _a === void 0 ? void 0 : _a.signature);
+        if (!signature) {
+            throw new Error('WhileValidTxSender: signed transaction is missing a signature');
+        }
+        const txSig = bs58_1.default.encode(signature);
+        if (!latestBlockhash) {
+            throw new Error('WhileValidTxSender: failed to resolve latest blockhash for transaction');
+        }
         this.untilValid.set(txSig, latestBlockhash);
         return signedTx;
     }
     async sendVersionedTransaction(tx, additionalSigners, opts, preSigned) {
         let latestBlockhash = await this.txHandler.getLatestBlockhashForTransaction();
+        if (!latestBlockhash) {
+            throw new Error('WhileValidTxSender: failed to fetch latest blockhash for transaction');
+        }
         let signedTx;
         if (preSigned) {
             signedTx = tx;
@@ -100,17 +113,24 @@ class WhileValidTxSender extends baseTxSender_1.BaseTxSender {
             additionalSigners === null || additionalSigners === void 0 ? void 0 : additionalSigners.filter((s) => s !== undefined).forEach((kp) => {
                 tx.sign([kp]);
             });
-            signedTx = await this.txHandler.signVersionedTx(tx, additionalSigners, latestBlockhash);
+            signedTx = await this.txHandler.signVersionedTx(tx, additionalSigners !== null && additionalSigners !== void 0 ? additionalSigners : [], latestBlockhash);
         }
         if (opts === undefined) {
             opts = this.opts;
         }
-        const txSig = bs58_1.default.encode(signedTx.signatures[0]);
+        const signature = signedTx.signatures[0];
+        if (!signature) {
+            throw new Error('WhileValidTxSender: signed transaction is missing a signature');
+        }
+        const txSig = bs58_1.default.encode(signature);
+        if (!latestBlockhash) {
+            throw new Error('WhileValidTxSender: failed to resolve latest blockhash for transaction');
+        }
         this.untilValid.set(txSig, latestBlockhash);
         return this.sendRawTransaction(signedTx.serialize(), opts);
     }
     async sendRawTransaction(rawTransaction, opts) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         const startTime = this.getTimestamp();
         const txid = await this.connection.sendRawTransaction(rawTransaction, opts);
         (_a = this.txSigCache) === null || _a === void 0 ? void 0 : _a.set(txid, false);
@@ -143,16 +163,18 @@ class WhileValidTxSender extends baseTxSender_1.BaseTxSender {
         try {
             const result = await this.confirmTransaction(txid, opts.commitment);
             (_b = this.txSigCache) === null || _b === void 0 ? void 0 : _b.set(txid, true);
-            await this.checkConfirmationResultForError(txid, result === null || result === void 0 ? void 0 : result.value);
-            if (((_c = result === null || result === void 0 ? void 0 : result.value) === null || _c === void 0 ? void 0 : _c.err) && this.throwOnTransactionError) {
-                // Fallback error handling if there's a problem reporting the error in checkConfirmationResultForError
-                throw new web3_js_1.SendTransactionError({
-                    action: 'send',
-                    signature: txid,
-                    transactionMessage: `Transaction Failed`,
-                });
+            if (result) {
+                await this.checkConfirmationResultForError(txid, result.value);
+                if (((_c = result.value) === null || _c === void 0 ? void 0 : _c.err) && this.throwOnTransactionError) {
+                    // Fallback error handling if there's a problem reporting the error in checkConfirmationResultForError
+                    throw new web3_js_1.SendTransactionError({
+                        action: 'send',
+                        signature: txid,
+                        transactionMessage: `Transaction Failed`,
+                    });
+                }
+                slot = result.context.slot;
             }
-            slot = (_d = result === null || result === void 0 ? void 0 : result.context) === null || _d === void 0 ? void 0 : _d.slot;
             // eslint-disable-next-line no-useless-catch
         }
         catch (e) {