@velocity-exchange/sdk 0.0.5 → 0.2.0

package/lib/browser/swift/swiftOrderSubscriber.js

@@ -13,32 +13,27 @@ const tweetnacl_util_1 = require("tweetnacl-util");
 const ws_1 = __importDefault(require("ws"));
 const sha256_1 = require("@noble/hashes/sha256");
 class SwiftOrderSubscriber {
-    /** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
-    get driftClient() {
-        return this.velocityClient;
-    }
     constructor(config) {
-        var _a;
         this.config = config;
         this.heartbeatTimeout = null;
         this.heartbeatIntervalMs = 60000;
         this.ws = null;
         this.subscribed = false;
         // Type-system guarantees at least one of the two is supplied.
-        this.velocityClient = ((_a = config.velocityClient) !== null && _a !== void 0 ? _a : config.driftClient);
+        this.velocityClient = config.velocityClient;
         this.userAccountGetter = config.userAccountGetter;
     }
     unsubscribe() {
+        var _a, _b;
         if (this.subscribed) {
-            this.ws.removeAllListeners();
-            this.ws.terminate();
+            (_a = this.ws) === null || _a === void 0 ? void 0 : _a.removeAllListeners();
+            (_b = this.ws) === null || _b === void 0 ? void 0 : _b.terminate();
             this.ws = null;
             this.subscribed = false;
         }
     }
     getSymbolForMarketIndex(marketIndex) {
-        var _a;
-        const env = (_a = this.config.velocityEnv) !== null && _a !== void 0 ? _a : this.config.driftEnv;
+        const env = this.config.velocityEnv;
         const markets = env === 'devnet' ? perpMarkets_1.DevnetPerpMarkets : perpMarkets_1.MainnetPerpMarkets;
         return markets[marketIndex].symbol;
     }
@@ -72,10 +67,10 @@ class SwiftOrderSubscriber {
         }
     }
     async subscribe(onOrder, acceptSanitized = false, acceptDepositTrade = false) {
-        var _a, _b;
+        var _a;
         this.onOrder = onOrder;
-        const env = (_a = this.config.velocityEnv) !== null && _a !== void 0 ? _a : this.config.driftEnv;
-        const endpoint = (_b = this.config.endpoint) !== null && _b !== void 0 ? _b : (env === 'devnet'
+        const env = this.config.velocityEnv;
+        const endpoint = (_a = this.config.endpoint) !== null && _a !== void 0 ? _a : (env === 'devnet'
             ? 'wss://master.swift.drift.trade/ws'
             : 'wss://swift.drift.trade/ws');
         const ws = new ws_1.default(endpoint + '?pubkey=' + this.config.keypair.publicKey.toBase58());
@@ -130,8 +125,8 @@ class SwiftOrderSubscriber {
                 this.reconnect();
             }, 5000);
         });
-        ws.on('error', async (request, response) => {
-            console.error('WS closed from error, reconnecting in 1s:', response.statusCode);
+        ws.on('error', async (error) => {
+            console.error('WS closed from error, reconnecting in 1s:', error);
             setTimeout(() => {
                 if (this.heartbeatTimeout)
                     clearTimeout(this.heartbeatTimeout);
@@ -187,8 +182,12 @@ class SwiftOrderSubscriber {
             this.ws.terminate();
         }
         console.log('Reconnecting to WebSocket...');
+        const onOrder = this.onOrder;
+        if (!onOrder) {
+            throw new Error('onOrder callback function must be set');
+        }
         setTimeout(() => {
-            this.subscribe(this.onOrder);
+            this.subscribe(onOrder);
         }, 1000);
     }
 }

package/lib/browser/testClient.js

@@ -4,8 +4,9 @@ exports.TestClient = void 0;
 const adminClient_1 = require("./adminClient");
 class TestClient extends adminClient_1.AdminClient {
     constructor(config) {
+        var _a;
         config.txVersion = 'legacy';
-        if (config.accountSubscription.type !== 'polling') {
+        if (((_a = config.accountSubscription) === null || _a === void 0 ? void 0 : _a.type) !== 'polling') {
             throw new Error('Test client must be polling');
         }
         super(config);
@@ -14,7 +15,7 @@ class TestClient extends adminClient_1.AdminClient {
         const { txSig, slot } = await super.sendTransaction(tx, additionalSigners, opts, preSigned);
         let lastFetchedSlot = this.accountSubscriber.accountLoader.mostRecentSlot;
         await this.fetchAccounts();
-        while (lastFetchedSlot < slot) {
+        while (slot !== undefined && lastFetchedSlot < slot) {
             await this.fetchAccounts();
             lastFetchedSlot = this.accountSubscriber.accountLoader.mostRecentSlot;
         }

package/lib/browser/tokenFaucet.js

@@ -75,6 +75,9 @@ class TokenFaucet {
             },
         });
         const tx = new web3_js_1.Transaction().add(ix);
+        if (!this.context) {
+            throw new Error('TokenFaucet: initialize() requires a BankrunContextWrapper context');
+        }
         const txSig = await this.context.sendTransaction(tx);
         return txSig;
     }
@@ -99,6 +102,9 @@ class TokenFaucet {
             return await this.context.sendTransaction(tx);
         }
         else {
+            if (!this.program.provider.sendAndConfirm) {
+                throw new Error('TokenFaucet: program provider does not support sendAndConfirm');
+            }
             return await this.program.provider.sendAndConfirm(tx, [], this.opts);
         }
     }
@@ -132,7 +138,9 @@ class TokenFaucet {
         const [associatedTokenPublicKey, createAssociatedAccountIx, mintToTx] = await this.createAssociatedTokenAccountAndMintToInstructions(userPublicKey, amount);
         let associatedTokenAccountExists = false;
         try {
-            const assosciatedTokenAccount = await this.context.connection.getAccountInfo(associatedTokenPublicKey);
+            const assosciatedTokenAccount = this.context
+                ? await this.context.connection.getAccountInfo(associatedTokenPublicKey)
+                : await this.connection.getAccountInfo(associatedTokenPublicKey);
             associatedTokenAccountExists = !!assosciatedTokenAccount;
         }
         catch (e) {
@@ -148,6 +156,9 @@ class TokenFaucet {
             txSig = await this.context.sendTransaction(tx);
         }
         else {
+            if (!this.program.provider.sendAndConfirm) {
+                throw new Error('TokenFaucet: program provider does not support sendAndConfirm');
+            }
             txSig = await this.program.provider.sendAndConfirm(tx, [], this.opts);
         }
         return [associatedTokenPublicKey, txSig];
@@ -175,7 +186,10 @@ class TokenFaucet {
             const tokenAccountKey = await this.getAssosciatedMockUSDMintAddress(props);
             props.callback(await this.getTokenAccountInfo(props));
             // Couldn't find a way to do it using anchor framework subscription — fall back to onAccountChange.
-            this.context.connection.onAccountChange(tokenAccountKey, async (_accountInfo /* accountInfo is a buffer which we don't know how to deserialize */) => {
+            const subscribeConnection = this.context
+                ? this.context.connection
+                : this.connection;
+            subscribeConnection.onAccountChange(tokenAccountKey, async (_accountInfo /* accountInfo is a buffer which we don't know how to deserialize */) => {
                 props.callback(await this.getTokenAccountInfo(props));
             });
             return true;

package/lib/browser/tx/baseTxSender.d.ts

@@ -13,7 +13,7 @@ export declare abstract class BaseTxSender implements TxSender {
     additionalConnections: Connection[];
     timeoutCount: number;
     confirmationStrategy: ConfirmationStrategy;
-    additionalTxSenderCallbacks: ((base58EncodedTx: string) => void)[];
+    additionalTxSenderCallbacks?: ((base58EncodedTx: string) => void)[];
     txHandler: TxHandler;
     trackTxLandRate?: boolean;
     throwOnTimeoutError: boolean;
@@ -28,7 +28,7 @@ export declare abstract class BaseTxSender implements TxSender {
         wallet: IWallet;
         opts?: ConfirmOptions;
         timeout?: number;
-        additionalConnections?: any;
+        additionalConnections?: Connection[];
         confirmationStrategy?: ConfirmationStrategy;
         additionalTxSenderCallbacks?: ((base58EncodedTx: string) => void)[];
         txHandler?: TxHandler;
@@ -44,9 +44,9 @@ export declare abstract class BaseTxSender implements TxSender {
     sendVersionedTransaction(tx: VersionedTransaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean): Promise<TxSigAndSlot>;
     sendRawTransaction(rawTransaction: Buffer | Uint8Array, opts: ConfirmOptions): Promise<TxSigAndSlot>;
     simulateTransaction(tx: VersionedTransaction): Promise<boolean>;
-    confirmTransactionWebSocket(signature: TransactionSignature, commitment?: Commitment): Promise<RpcResponseAndContext<SignatureResult>>;
+    confirmTransactionWebSocket(signature: TransactionSignature, commitment?: Commitment): Promise<RpcResponseAndContext<SignatureResult> | undefined>;
     confirmTransactionPolling(signature: TransactionSignature, commitment?: Commitment): Promise<RpcResponseAndContext<SignatureResult> | undefined>;
-    confirmTransaction(signature: TransactionSignature, commitment?: Commitment): Promise<RpcResponseAndContext<SignatureResult>>;
+    confirmTransaction(signature: TransactionSignature, commitment?: Commitment): Promise<RpcResponseAndContext<SignatureResult> | undefined>;
     getTimestamp(): number;
     promiseTimeout<T>(promises: Promise<T>[], timeoutMs: number): Promise<T | null>;
     sendToAdditionalConnections(rawTx: Buffer | Uint8Array, opts: ConfirmOptions): void;

package/lib/browser/tx/baseTxSender.js

@@ -74,7 +74,7 @@ class BaseTxSender {
             signedTx = tx;
         }
         else {
-            signedTx = await this.txHandler.signVersionedTx(tx, additionalSigners, undefined, this.wallet);
+            signedTx = await this.txHandler.signVersionedTx(tx, additionalSigners !== null && additionalSigners !== void 0 ? additionalSigners : [], undefined, this.wallet);
         }
         if (opts === undefined) {
             opts = this.opts;
@@ -172,7 +172,7 @@ class BaseTxSender {
                 throw new types_1.TxSendError(`Transaction was not confirmed in ${duration.toFixed(2)} seconds. It is unknown if it succeeded or failed. Check signature ${signature} using the Solana Explorer or CLI tools.`, txConstants_1.NOT_CONFIRMED_ERROR_CODE);
             }
         }
-        return response;
+        return response !== null && response !== void 0 ? response : undefined;
     }
     async confirmTransactionPolling(signature, commitment = 'finalized') {
         var _a;
@@ -256,7 +256,7 @@ class BaseTxSender {
         return;
     }
     getTxLandRate() {
-        if (!this.trackTxLandRate) {
+        if (!this.trackTxLandRate || !this.txSigCache) {
             return this.txLandRate;
         }
         const keys = this.txSigCache.keys();
@@ -275,8 +275,9 @@ class BaseTxSender {
         return this.txLandRate;
     }
     defaultLandRateToFeeFunc(txLandRate) {
+        var _a, _b;
         if (txLandRate >= BASELINE_TX_LAND_RATE ||
-            this.txSigCache.keys().length < 3) {
+            ((_b = (_a = this.txSigCache) === null || _a === void 0 ? void 0 : _a.keys().length) !== null && _b !== void 0 ? _b : 0) < 3) {
             return 1;
         }
         const multiplier = 10 * Math.log10(1 + (BASELINE_TX_LAND_RATE - txLandRate) * 5);

package/lib/browser/tx/fastSingleTxSender.d.ts

@@ -14,18 +14,18 @@ export declare class FastSingleTxSender extends BaseTxSender {
     blockhashRefreshInterval: number;
     additionalConnections: Connection[];
     timoutCount: number;
-    recentBlockhash: BlockhashWithExpiryBlockHeight;
+    recentBlockhash?: BlockhashWithExpiryBlockHeight;
     skipConfirmation: boolean;
     confirmInBackground: boolean;
     blockhashCommitment: Commitment;
-    blockhashIntervalId: NodeJS.Timer;
+    blockhashIntervalId?: NodeJS.Timer;
     constructor({ connection, wallet, opts, timeout, blockhashRefreshInterval, additionalConnections, skipConfirmation, confirmInBackground, blockhashCommitment, confirmationStrategy, trackTxLandRate, txHandler, txLandRateLookbackWindowMinutes, landRateToFeeFunc, throwOnTimeoutError, }: {
         connection: Connection;
         wallet: IWallet;
         opts?: ConfirmOptions;
         timeout?: number;
         blockhashRefreshInterval?: number;
-        additionalConnections?: any;
+        additionalConnections?: Connection[];
         skipConfirmation?: boolean;
         confirmInBackground?: boolean;
         blockhashCommitment?: Commitment;

package/lib/browser/tx/fastSingleTxSender.js

@@ -46,7 +46,7 @@ class FastSingleTxSender extends baseTxSender_1.BaseTxSender {
         }
     }
     async sendRawTransaction(rawTransaction, opts) {
-        var _a, _b, _c;
+        var _a, _b;
         let txid;
         try {
             txid = await this.connection.sendRawTransaction(rawTransaction, opts);
@@ -64,15 +64,19 @@ class FastSingleTxSender extends baseTxSender_1.BaseTxSender {
                     this.confirmTransaction(txid, opts.commitment).then(async (result) => {
                         var _a;
                         (_a = this.txSigCache) === null || _a === void 0 ? void 0 : _a.set(txid, true);
-                        await this.checkConfirmationResultForError(txid, result === null || result === void 0 ? void 0 : result.value);
-                        slot = result.context.slot;
+                        if (result) {
+                            await this.checkConfirmationResultForError(txid, result.value);
+                            slot = result.context.slot;
+                        }
                     });
                 }
                 else {
                     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 = result.context.slot;
+                    }
                 }
             }
             catch (e) {

package/lib/browser/tx/reportTransactionError.d.ts

@@ -16,5 +16,5 @@ export declare const throwTransactionError: (txSig: string, connection: Connecti
  * @param connection
  * @returns
  */
-export declare const getTransactionErrorFromTxSig: (txSig: string, connection: Connection, commitment?: Commitment) => Promise<SendTransactionError>;
-export declare const getTransactionError: (transactionResult: VersionedTransactionResponse) => SendTransactionError;
+export declare const getTransactionErrorFromTxSig: (txSig: string, connection: Connection, commitment?: Commitment) => Promise<SendTransactionError | undefined>;
+export declare const getTransactionError: (transactionResult: VersionedTransactionResponse) => SendTransactionError | undefined;

package/lib/browser/tx/reportTransactionError.js

@@ -19,7 +19,11 @@ const commitmentToFinality = (commitment) => {
     }
 };
 const getTransactionResult = async (txSig, connection, commitment) => {
-    const finality = commitmentToFinality(commitment || connection.commitment || config_1.DEFAULT_CONFIRMATION_OPTS.commitment);
+    const resolvedCommitment = commitment || connection.commitment || config_1.DEFAULT_CONFIRMATION_OPTS.commitment;
+    if (!resolvedCommitment) {
+        throw new Error('No commitment available when reporting transaction error. Provide a commitment, set one on the connection, or configure DEFAULT_CONFIRMATION_OPTS.');
+    }
+    const finality = commitmentToFinality(resolvedCommitment);
     return await connection.getTransaction(txSig, {
         maxSupportedTransactionVersion: 0,
         commitment: finality,

package/lib/browser/tx/retryTxSender.d.ts

@@ -22,7 +22,7 @@ export declare class RetryTxSender extends BaseTxSender {
         opts?: ConfirmOptions;
         timeout?: number;
         retrySleep?: number;
-        additionalConnections?: any;
+        additionalConnections?: Connection[];
         confirmationStrategy?: ConfirmationStrategy;
         additionalTxSenderCallbacks?: ((base58EncodedTx: string) => void)[];
         txHandler?: TxHandler;

package/lib/browser/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/browser/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;
@@ -74,6 +74,12 @@ export declare class TxHandler {
         blockhash: string;
         lastValidBlockHeight: number;
     }>>;
+    /**
+     * 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

package/lib/browser/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/browser/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/browser/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/browser/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/browser/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;