@drift-labs/sdk 2.97.0-beta.9 → 2.98.0-beta.0

package/lib/{math → browser/math}/position.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasOpenOrders = exports.isEmptyPosition = exports.positionCurrentDirection = exports.findDirectionToClose = exports.calculateCostBasis = exports.calculateEntryPrice = exports.calculateBreakEvenPrice = exports.positionIsAvailable = exports.calculatePositionFundingPNL = exports.calculateClaimablePnl = exports.calculatePositionPNL = exports.calculateBaseAssetValue = void 0;
+exports.hasOpenOrders = exports.isEmptyPosition = exports.positionCurrentDirection = exports.findDirectionToClose = exports.calculateCostBasis = exports.calculateEntryPrice = exports.calculateBreakEvenPrice = exports.positionIsAvailable = exports.calculatePositionFundingPNL = exports.calculateUnsettledFundingPnl = exports.calculateFeesAndFundingPnl = exports.calculateClaimablePnl = exports.calculatePositionPNL = exports.calculateBaseAssetValue = void 0;
 const __1 = require("../");
 const numericConstants_1 = require("../constants/numericConstants");
 const types_1 = require("../types");
@@ -75,7 +75,7 @@ function calculatePositionPNL(market, perpPosition, withFunding = false, oracleP
         .mul(baseAssetValueSign)
         .add(perpPosition.quoteAssetAmount);
     if (withFunding) {
-        const fundingRatePnL = calculatePositionFundingPNL(market, perpPosition);
+        const fundingRatePnL = calculateUnsettledFundingPnl(market, perpPosition);
         pnl = pnl.add(fundingRatePnL);
     }
     return pnl;
@@ -93,12 +93,32 @@ function calculateClaimablePnl(market, spotMarket, perpPosition, oraclePriceData
 }
 exports.calculateClaimablePnl = calculateClaimablePnl;
 /**
+ * Returns total fees and funding pnl for a position
+ *
+ * @param market
+ * @param PerpPosition
+ * @param includeUnsettled include unsettled funding in return value (default: true)
+ * @returns — // QUOTE_PRECISION
+ */
+function calculateFeesAndFundingPnl(market, perpPosition, includeUnsettled = true) {
+    const settledFundingAndFeesPnl = perpPosition.quoteBreakEvenAmount.sub(perpPosition.quoteEntryAmount);
+    if (!includeUnsettled) {
+        return settledFundingAndFeesPnl;
+    }
+    const unsettledFundingPnl = calculateUnsettledFundingPnl(market, perpPosition);
+    return settledFundingAndFeesPnl.add(unsettledFundingPnl);
+}
+exports.calculateFeesAndFundingPnl = calculateFeesAndFundingPnl;
+/**
+ * Returns unsettled funding pnl for the position
+ *
+ * To calculate all fees and funding pnl including settled, use calculateFeesAndFundingPnl
  *
  * @param market
  * @param PerpPosition
  * @returns // QUOTE_PRECISION
  */
-function calculatePositionFundingPNL(market, perpPosition) {
+function calculateUnsettledFundingPnl(market, perpPosition) {
     if (perpPosition.baseAssetAmount.eq(numericConstants_1.ZERO)) {
         return numericConstants_1.ZERO;
     }
@@ -117,6 +137,13 @@ function calculatePositionFundingPNL(market, perpPosition) {
         .mul(new __1.BN(-1));
     return perPositionFundingRate;
 }
+exports.calculateUnsettledFundingPnl = calculateUnsettledFundingPnl;
+/**
+ * @deprecated use calculateUnsettledFundingPnl or calculateFeesAndFundingPnl instead
+ */
+function calculatePositionFundingPNL(market, perpPosition) {
+    return calculateUnsettledFundingPnl(market, perpPosition);
+}
 exports.calculatePositionFundingPNL = calculatePositionFundingPNL;
 function positionIsAvailable(position) {
     return (position.baseAssetAmount.eq(numericConstants_1.ZERO) &&

package/lib/{oracles → browser/oracles}/prelaunchOracleClient.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { Connection, PublicKey } from '@solana/web3.js';
 import { OracleClient, OraclePriceData } from './types';
 import { Program } from '@coral-xyz/anchor';

package/lib/{oracles → browser/oracles}/pythClient.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="bn.js" />
 /// <reference types="node" />
+/// <reference types="node" />
 import { Connection, PublicKey } from '@solana/web3.js';
 import { OracleClient, OraclePriceData } from './types';
 import { BN } from '@coral-xyz/anchor';
@@ -11,4 +12,3 @@ export declare class PythClient implements OracleClient {
     getOraclePriceData(pricePublicKey: PublicKey): Promise<OraclePriceData>;
     getOraclePriceDataFromBuffer(buffer: Buffer): OraclePriceData;
 }
-export declare function convertPythPrice(price: number, exponent: number, multiple: BN): BN;

package/lib/{oracles → browser/oracles}/pythClient.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertPythPrice = exports.PythClient = void 0;
+exports.PythClient = void 0;
 const client_1 = require("@pythnetwork/client");
 const anchor_1 = require("@coral-xyz/anchor");
 const numericConstants_1 = require("../constants/numericConstants");
@@ -40,7 +40,6 @@ function convertPythPrice(price, exponent, multiple) {
         .mul(numericConstants_1.PRICE_PRECISION)
         .div(pythPrecision);
 }
-exports.convertPythPrice = convertPythPrice;
 const fiveBPS = new anchor_1.BN(500);
 function getStableCoinPrice(price, confidence) {
     if (price.sub(numericConstants_1.QUOTE_PRECISION).abs().lt(anchor_1.BN.min(confidence, fiveBPS))) {

package/lib/{oracles → browser/oracles}/pythPullClient.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 /// <reference types="bn.js" />
 import { Connection, PublicKey } from '@solana/web3.js';
 import { OracleClient, OraclePriceData } from './types';

package/lib/{oracles → browser/oracles}/quoteAssetOracleClient.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { PublicKey } from '@solana/web3.js';
 import { OracleClient, OraclePriceData } from './types';
 export declare const QUOTE_ORACLE_PRICE_DATA: OraclePriceData;

package/lib/{oracles → browser/oracles}/switchboardClient.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { Connection, PublicKey } from '@solana/web3.js';
 import { OracleClient, OraclePriceData } from './types';
 import { BorshAccountsCoder } from '@coral-xyz/anchor';

package/lib/{oracles → browser/oracles}/switchboardOnDemandClient.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { Connection, PublicKey } from '@solana/web3.js';
 import { OracleClient, OraclePriceData } from './types';
 import { BorshAccountsCoder as BorshAccountsCoder30 } from '@coral-xyz/anchor-30';

package/lib/{oracles → browser/oracles}/types.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="bn.js" />
 /// <reference types="node" />
+/// <reference types="node" />
 import { BN } from '@coral-xyz/anchor';
 import { PublicKey } from '@solana/web3.js';
 import { OracleSource } from '../types';

package/lib/{orderSubscriber → browser/orderSubscriber}/OrderSubscriber.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node" />
+/// <reference types="node" />
 import { DriftClient } from '../driftClient';
 import { UserAccount } from '../types';
 import { Commitment } from '@solana/web3.js';
@@ -10,13 +11,14 @@ import { PollingSubscription } from './PollingSubscription';
 import { WebsocketSubscription } from './WebsocketSubscription';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
+import { grpcSubscription } from './grpcSubscription';
 export declare class OrderSubscriber {
     driftClient: DriftClient;
     usersAccounts: Map<string, {
         slot: number;
         userAccount: UserAccount;
     }>;
-    subscription: PollingSubscription | WebsocketSubscription;
+    subscription: PollingSubscription | WebsocketSubscription | grpcSubscription;
     commitment: Commitment;
     eventEmitter: StrictEventEmitter<EventEmitter, OrderSubscriberEvents>;
     fetchPromise?: Promise<void>;

package/lib/{orderSubscriber → browser/orderSubscriber}/OrderSubscriber.js

@@ -10,9 +10,10 @@ const WebsocketSubscription_1 = require("./WebsocketSubscription");
 const events_1 = require("events");
 const index_1 = require("../index");
 const user_1 = require("../decode/user");
+const grpcSubscription_1 = require("./grpcSubscription");
 class OrderSubscriber {
     constructor(config) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         this.usersAccounts = new Map();
         this.driftClient = config.driftClient;
         this.commitment = config.subscriptionConfig.commitment || 'processed';
@@ -22,20 +23,33 @@ class OrderSubscriber {
                 frequency: config.subscriptionConfig.frequency,
             });
         }
+        else if (config.subscriptionConfig.type === 'grpc') {
+            this.subscription = new grpcSubscription_1.grpcSubscription({
+                orderSubscriber: this,
+                grpcConfigs: config.subscriptionConfig.grpcConfigs,
+                skipInitialLoad: config.subscriptionConfig.skipInitialLoad,
+                resubOpts: {
+                    resubTimeoutMs: (_a = config.subscriptionConfig) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs,
+                    logResubMessages: (_b = config.subscriptionConfig) === null || _b === void 0 ? void 0 : _b.logResubMessages,
+                },
+                resyncIntervalMs: config.subscriptionConfig.resyncIntervalMs,
+                decoded: config.decodeData,
+            });
+        }
         else {
             this.subscription = new WebsocketSubscription_1.WebsocketSubscription({
                 orderSubscriber: this,
                 commitment: this.commitment,
                 skipInitialLoad: config.subscriptionConfig.skipInitialLoad,
                 resubOpts: {
-                    resubTimeoutMs: (_a = config.subscriptionConfig) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs,
-                    logResubMessages: (_b = config.subscriptionConfig) === null || _b === void 0 ? void 0 : _b.logResubMessages,
+                    resubTimeoutMs: (_c = config.subscriptionConfig) === null || _c === void 0 ? void 0 : _c.resubTimeoutMs,
+                    logResubMessages: (_d = config.subscriptionConfig) === null || _d === void 0 ? void 0 : _d.logResubMessages,
                 },
                 resyncIntervalMs: config.subscriptionConfig.resyncIntervalMs,
                 decoded: config.decodeData,
             });
         }
-        if ((_c = config.fastDecode) !== null && _c !== void 0 ? _c : true) {
+        if ((_e = config.fastDecode) !== null && _e !== void 0 ? _e : true) {
             this.decodeFn = (name, data) => (0, user_1.decodeUser)(data);
         }
         else {
@@ -69,21 +83,12 @@ class OrderSubscriber {
             await this.driftClient.connection._rpcRequest('getProgramAccounts', rpcRequestArgs);
             const rpcResponseAndContext = rpcJSONResponse.result;
             const slot = rpcResponseAndContext.context.slot;
-            const programAccountSet = new Set();
             for (const programAccount of rpcResponseAndContext.value) {
                 const key = programAccount.pubkey.toString();
-                programAccountSet.add(key);
                 this.tryUpdateUserAccount(key, 'raw', programAccount.account.data, slot);
                 // give event loop a chance to breathe
                 await new Promise((resolve) => setTimeout(resolve, 0));
             }
-            for (const key of this.usersAccounts.keys()) {
-                if (!programAccountSet.has(key)) {
-                    this.usersAccounts.delete(key);
-                }
-                // give event loop a chance to breathe
-                await new Promise((resolve) => setTimeout(resolve, 0));
-            }
         }
         catch (e) {
             console.error(e);

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

@@ -0,0 +1,22 @@
+import { OrderSubscriber } from './OrderSubscriber';
+import { GrpcConfigs, ResubOpts } from '../accounts/types';
+export declare class grpcSubscription {
+    private orderSubscriber;
+    private skipInitialLoad;
+    private resubOpts?;
+    private resyncIntervalMs?;
+    private subscriber?;
+    private resyncTimeoutId?;
+    private decoded?;
+    private grpcConfigs;
+    constructor({ grpcConfigs, orderSubscriber, skipInitialLoad, resubOpts, resyncIntervalMs, decoded, }: {
+        grpcConfigs: GrpcConfigs;
+        orderSubscriber: OrderSubscriber;
+        skipInitialLoad?: boolean;
+        resubOpts?: ResubOpts;
+        resyncIntervalMs?: number;
+        decoded?: boolean;
+    });
+    subscribe(): Promise<void>;
+    unsubscribe(): Promise<void>;
+}

package/lib/browser/orderSubscriber/grpcSubscription.js

@@ -0,0 +1,66 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.grpcSubscription = void 0;
+const grpcProgramAccountSubscriber_1 = require("../accounts/grpcProgramAccountSubscriber");
+const memcmp_1 = require("../memcmp");
+class grpcSubscription {
+    constructor({ grpcConfigs, orderSubscriber, skipInitialLoad = false, resubOpts, resyncIntervalMs, decoded = true, }) {
+        this.orderSubscriber = orderSubscriber;
+        this.skipInitialLoad = skipInitialLoad;
+        this.resubOpts = resubOpts;
+        this.resyncIntervalMs = resyncIntervalMs;
+        this.decoded = decoded;
+        this.grpcConfigs = grpcConfigs;
+    }
+    async subscribe() {
+        if (this.subscriber) {
+            return;
+        }
+        this.subscriber = new grpcProgramAccountSubscriber_1.grpcProgramAccountSubscriber(this.grpcConfigs, 'OrderSubscriber', 'User', this.orderSubscriber.driftClient.program, this.orderSubscriber.decodeFn, {
+            filters: [(0, memcmp_1.getUserFilter)(), (0, memcmp_1.getNonIdleUserFilter)()],
+        }, this.resubOpts);
+        await this.subscriber.subscribe((accountId, account, context, buffer) => {
+            var _a;
+            const userKey = accountId.toBase58();
+            if ((_a = this.decoded) !== null && _a !== void 0 ? _a : true) {
+                this.orderSubscriber.tryUpdateUserAccount(userKey, 'decoded', account, context.slot);
+            }
+            else {
+                this.orderSubscriber.tryUpdateUserAccount(userKey, 'buffer', buffer, context.slot);
+            }
+        });
+        if (!this.skipInitialLoad) {
+            await this.orderSubscriber.fetch();
+        }
+        if (this.resyncIntervalMs) {
+            const recursiveResync = () => {
+                this.resyncTimeoutId = setTimeout(() => {
+                    this.orderSubscriber
+                        .fetch()
+                        .catch((e) => {
+                        console.error('Failed to resync in OrderSubscriber');
+                        console.log(e);
+                    })
+                        .finally(() => {
+                        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+                        if (!this.resyncTimeoutId)
+                            return;
+                        recursiveResync();
+                    });
+                }, this.resyncIntervalMs);
+            };
+            recursiveResync();
+        }
+    }
+    async unsubscribe() {
+        if (!this.subscriber)
+            return;
+        await this.subscriber.unsubscribe();
+        this.subscriber = undefined;
+        if (this.resyncTimeoutId !== undefined) {
+            clearTimeout(this.resyncTimeoutId);
+            this.resyncTimeoutId = undefined;
+        }
+    }
+}
+exports.grpcSubscription = grpcSubscription;

package/lib/{orderSubscriber → browser/orderSubscriber}/types.d.ts

@@ -1,6 +1,7 @@
 import { Commitment, PublicKey } from '@solana/web3.js';
 import { Order, UserAccount } from '../types';
 import { DriftClient } from '../driftClient';
+import { GrpcConfigs } from '../accounts/types';
 export type OrderSubscriberConfig = {
     driftClient: DriftClient;
     subscriptionConfig: {
@@ -14,6 +15,14 @@ export type OrderSubscriberConfig = {
         logResubMessages?: boolean;
         resyncIntervalMs?: number;
         commitment?: Commitment;
+    } | {
+        type: 'grpc';
+        grpcConfigs: GrpcConfigs;
+        skipInitialLoad?: boolean;
+        resubTimeoutMs?: number;
+        logResubMessages?: boolean;
+        resyncIntervalMs?: number;
+        commitment?: Commitment;
     };
     fastDecode?: boolean;
     decodeData?: boolean;

package/lib/{token → browser/token}/index.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { Account } from '@solana/spl-token';
 import { PublicKey } from '@solana/web3.js';
 export declare function parseTokenAccount(data: Buffer, pubkey: PublicKey): Account;

package/lib/{tx → browser/tx}/baseTxSender.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { ConfirmationStrategy, TxSender, TxSigAndSlot } from './types';
 import { Commitment, ConfirmOptions, RpcResponseAndContext, Signer, SignatureResult, Transaction, TransactionSignature, Connection, VersionedTransaction, TransactionInstruction, AddressLookupTableAccount, BlockhashWithExpiryBlockHeight } from '@solana/web3.js';
 import { TxHandler } from './txHandler';
@@ -15,12 +16,13 @@ export declare abstract class BaseTxSender implements TxSender {
     additionalTxSenderCallbacks: ((base58EncodedTx: string) => void)[];
     txHandler: TxHandler;
     trackTxLandRate?: boolean;
+    throwOnTimeoutError: boolean;
     lookbackWindowMinutes: number;
     txSigCache?: NodeCache;
     txLandRate: number;
     lastPriorityFeeSuggestion: number;
     landRateToFeeFunc: (landRate: number) => number;
-    constructor({ connection, wallet, opts, timeout, additionalConnections, confirmationStrategy, additionalTxSenderCallbacks, trackTxLandRate, txHandler, txLandRateLookbackWindowMinutes, landRateToFeeFunc, }: {
+    constructor({ connection, wallet, opts, timeout, additionalConnections, confirmationStrategy, additionalTxSenderCallbacks, trackTxLandRate, txHandler, txLandRateLookbackWindowMinutes, landRateToFeeFunc, throwOnTimeoutError, }: {
         connection: Connection;
         wallet: IWallet;
         opts?: ConfirmOptions;
@@ -32,6 +34,7 @@ export declare abstract class BaseTxSender implements TxSender {
         trackTxLandRate?: boolean;
         txLandRateLookbackWindowMinutes?: number;
         landRateToFeeFunc?: (landRate: number) => number;
+        throwOnTimeoutError?: boolean;
     });
     send(tx: Transaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean): Promise<TxSigAndSlot>;
     prepareTx(tx: Transaction, additionalSigners: Array<Signer>, opts: ConfirmOptions, preSigned?: boolean): Promise<Transaction>;

package/lib/{tx → browser/tx}/baseTxSender.js

@@ -16,7 +16,7 @@ const BASELINE_TX_LAND_RATE = 0.9;
 const DEFAULT_TIMEOUT = 35000;
 const DEFAULT_TX_LAND_RATE_LOOKBACK_WINDOW_MINUTES = 10;
 class BaseTxSender {
-    constructor({ connection, wallet, opts = config_1.DEFAULT_CONFIRMATION_OPTS, timeout = DEFAULT_TIMEOUT, additionalConnections = new Array(), confirmationStrategy = types_1.ConfirmationStrategy.Combo, additionalTxSenderCallbacks, trackTxLandRate, txHandler, txLandRateLookbackWindowMinutes = DEFAULT_TX_LAND_RATE_LOOKBACK_WINDOW_MINUTES, landRateToFeeFunc, }) {
+    constructor({ connection, wallet, opts = config_1.DEFAULT_CONFIRMATION_OPTS, timeout = DEFAULT_TIMEOUT, additionalConnections = new Array(), confirmationStrategy = types_1.ConfirmationStrategy.Combo, additionalTxSenderCallbacks, trackTxLandRate, txHandler, txLandRateLookbackWindowMinutes = DEFAULT_TX_LAND_RATE_LOOKBACK_WINDOW_MINUTES, landRateToFeeFunc, throwOnTimeoutError = true, }) {
         this.timeoutCount = 0;
         this.txLandRate = 0;
         this.lastPriorityFeeSuggestion = 1;
@@ -43,6 +43,7 @@ class BaseTxSender {
         }
         this.landRateToFeeFunc =
             landRateToFeeFunc !== null && landRateToFeeFunc !== void 0 ? landRateToFeeFunc : this.defaultLandRateToFeeFunc.bind(this);
+        this.throwOnTimeoutError = throwOnTimeoutError;
     }
     async send(tx, additionalSigners, opts, preSigned) {
         if (additionalSigners === undefined) {
@@ -166,7 +167,9 @@ class BaseTxSender {
             }
             this.timeoutCount += 1;
             const duration = (Date.now() - start) / 1000;
-            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);
+            if (this.throwOnTimeoutError) {
+                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;
     }
@@ -192,7 +195,9 @@ class BaseTxSender {
         // Transaction not confirmed within 30 seconds
         this.timeoutCount += 1;
         const duration = (Date.now() - start) / 1000;
-        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);
+        if (this.throwOnTimeoutError) {
+            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);
+        }
     }
     async confirmTransaction(signature, commitment) {
         if (this.confirmationStrategy === types_1.ConfirmationStrategy.WebSocket ||
@@ -244,7 +249,7 @@ class BaseTxSender {
     }
     async checkConfirmationResultForError(txSig, result) {
         var _a;
-        if (result.err) {
+        if (result === null || result === void 0 ? void 0 : result.err) {
             await (0, reportTransactionError_1.throwTransactionError)(txSig, this.connection, (_a = this.opts) === null || _a === void 0 ? void 0 : _a.commitment);
         }
         return;

package/lib/{tx → browser/tx}/fastSingleTxSender.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node" />
+/// <reference types="node" />
 import { ConfirmationStrategy, TxSigAndSlot } from './types';
 import { ConfirmOptions, Connection, Commitment, BlockhashWithExpiryBlockHeight } from '@solana/web3.js';
 import { BaseTxSender } from './baseTxSender';
@@ -18,7 +19,7 @@ export declare class FastSingleTxSender extends BaseTxSender {
     confirmInBackground: boolean;
     blockhashCommitment: Commitment;
     blockhashIntervalId: NodeJS.Timer;
-    constructor({ connection, wallet, opts, timeout, blockhashRefreshInterval, additionalConnections, skipConfirmation, confirmInBackground, blockhashCommitment, confirmationStrategy, trackTxLandRate, txHandler, txLandRateLookbackWindowMinutes, landRateToFeeFunc, }: {
+    constructor({ connection, wallet, opts, timeout, blockhashRefreshInterval, additionalConnections, skipConfirmation, confirmInBackground, blockhashCommitment, confirmationStrategy, trackTxLandRate, txHandler, txLandRateLookbackWindowMinutes, landRateToFeeFunc, throwOnTimeoutError, }: {
         connection: Connection;
         wallet: IWallet;
         opts?: ConfirmOptions;
@@ -33,6 +34,7 @@ export declare class FastSingleTxSender extends BaseTxSender {
         txHandler?: TxHandler;
         txLandRateLookbackWindowMinutes?: number;
         landRateToFeeFunc?: (landRate: number) => number;
+        throwOnTimeoutError?: boolean;
     });
     startBlockhashRefreshLoop(): void;
     sendRawTransaction(rawTransaction: Buffer | Uint8Array, opts: ConfirmOptions): Promise<TxSigAndSlot>;

package/lib/{tx → browser/tx}/fastSingleTxSender.js

@@ -7,7 +7,7 @@ const config_1 = require("../config");
 const DEFAULT_TIMEOUT = 35000;
 const DEFAULT_BLOCKHASH_REFRESH = 10000;
 class FastSingleTxSender extends baseTxSender_1.BaseTxSender {
-    constructor({ connection, wallet, opts = { ...config_1.DEFAULT_CONFIRMATION_OPTS, maxRetries: 0 }, timeout = DEFAULT_TIMEOUT, blockhashRefreshInterval = DEFAULT_BLOCKHASH_REFRESH, additionalConnections = new Array(), skipConfirmation = false, confirmInBackground = false, blockhashCommitment = 'finalized', confirmationStrategy = types_1.ConfirmationStrategy.Combo, trackTxLandRate, txHandler, txLandRateLookbackWindowMinutes, landRateToFeeFunc, }) {
+    constructor({ connection, wallet, opts = { ...config_1.DEFAULT_CONFIRMATION_OPTS, maxRetries: 0 }, timeout = DEFAULT_TIMEOUT, blockhashRefreshInterval = DEFAULT_BLOCKHASH_REFRESH, additionalConnections = new Array(), skipConfirmation = false, confirmInBackground = false, blockhashCommitment = 'finalized', confirmationStrategy = types_1.ConfirmationStrategy.Combo, trackTxLandRate, txHandler, txLandRateLookbackWindowMinutes, landRateToFeeFunc, throwOnTimeoutError = true, }) {
         super({
             connection,
             wallet,
@@ -19,6 +19,7 @@ class FastSingleTxSender extends baseTxSender_1.BaseTxSender {
             trackTxLandRate,
             txLandRateLookbackWindowMinutes,
             landRateToFeeFunc,
+            throwOnTimeoutError,
         });
         this.timoutCount = 0;
         this.connection = connection;
@@ -45,7 +46,7 @@ class FastSingleTxSender extends baseTxSender_1.BaseTxSender {
         }
     }
     async sendRawTransaction(rawTransaction, opts) {
-        var _a, _b;
+        var _a, _b, _c;
         let txid;
         try {
             txid = await this.connection.sendRawTransaction(rawTransaction, opts);
@@ -63,15 +64,15 @@ 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.value);
+                        await this.checkConfirmationResultForError(txid, result === null || result === void 0 ? void 0 : 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.value);
-                    slot = result.context.slot;
+                    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;
                 }
             }
             catch (e) {

package/lib/{tx → browser/tx}/forwardOnlyTxSender.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { ConfirmOptions, Connection } from '@solana/web3.js';
 import { BaseTxSender } from './baseTxSender';
 import { ConfirmationStrategy, TxSigAndSlot } from './types';
@@ -15,7 +16,7 @@ export declare class ForwardOnlyTxSender extends BaseTxSender {
     retrySleep: number;
     additionalConnections: Connection[];
     timoutCount: number;
-    constructor({ connection, wallet, opts, timeout, retrySleep, confirmationStrategy, additionalTxSenderCallbacks, txHandler, trackTxLandRate, txLandRateLookbackWindowMinutes, landRateToFeeFunc, }: {
+    constructor({ connection, wallet, opts, timeout, retrySleep, confirmationStrategy, additionalTxSenderCallbacks, txHandler, trackTxLandRate, txLandRateLookbackWindowMinutes, landRateToFeeFunc, throwOnTimeoutError, }: {
         connection: Connection;
         wallet: IWallet;
         opts?: ConfirmOptions;
@@ -27,6 +28,7 @@ export declare class ForwardOnlyTxSender extends BaseTxSender {
         trackTxLandRate?: boolean;
         txLandRateLookbackWindowMinutes?: number;
         landRateToFeeFunc?: (landRate: number) => number;
+        throwOnTimeoutError?: boolean;
     });
     sleep(reference: ResolveReference): Promise<void>;
     sendToAdditionalConnections(rawTx: Buffer | Uint8Array, _opts: ConfirmOptions): void;

package/lib/{tx → browser/tx}/forwardOnlyTxSender.js

@@ -12,7 +12,7 @@ const config_1 = require("../config");
 const DEFAULT_TIMEOUT = 35000;
 const DEFAULT_RETRY = 5000;
 class ForwardOnlyTxSender extends baseTxSender_1.BaseTxSender {
-    constructor({ connection, wallet, opts = { ...config_1.DEFAULT_CONFIRMATION_OPTS, maxRetries: 0 }, timeout = DEFAULT_TIMEOUT, retrySleep = DEFAULT_RETRY, confirmationStrategy = types_1.ConfirmationStrategy.Combo, additionalTxSenderCallbacks = [], txHandler, trackTxLandRate, txLandRateLookbackWindowMinutes, landRateToFeeFunc, }) {
+    constructor({ connection, wallet, opts = { ...config_1.DEFAULT_CONFIRMATION_OPTS, maxRetries: 0 }, timeout = DEFAULT_TIMEOUT, retrySleep = DEFAULT_RETRY, confirmationStrategy = types_1.ConfirmationStrategy.Combo, additionalTxSenderCallbacks = [], txHandler, trackTxLandRate, txLandRateLookbackWindowMinutes, landRateToFeeFunc, throwOnTimeoutError = true, }) {
         super({
             connection,
             wallet,
@@ -25,6 +25,7 @@ class ForwardOnlyTxSender extends baseTxSender_1.BaseTxSender {
             trackTxLandRate,
             txLandRateLookbackWindowMinutes,
             landRateToFeeFunc,
+            throwOnTimeoutError,
         });
         this.timoutCount = 0;
         this.connection = connection;
@@ -47,7 +48,7 @@ class ForwardOnlyTxSender extends baseTxSender_1.BaseTxSender {
         });
     }
     async sendRawTransaction(rawTransaction, opts) {
-        var _a, _b;
+        var _a, _b, _c;
         const deserializedTx = web3_js_1.VersionedTransaction.deserialize(rawTransaction);
         const txSig = deserializedTx.signatures[0];
         const encodedTxSig = bs58_1.default.encode(txSig);
@@ -75,8 +76,8 @@ class ForwardOnlyTxSender extends baseTxSender_1.BaseTxSender {
         let slot;
         try {
             const result = await this.confirmTransaction(encodedTxSig, opts.commitment);
-            slot = result.context.slot;
-            (_b = this.txSigCache) === null || _b === void 0 ? void 0 : _b.set(encodedTxSig, true);
+            slot = (_b = result === null || result === void 0 ? void 0 : result.context) === null || _b === void 0 ? void 0 : _b.slot;
+            (_c = this.txSigCache) === null || _c === void 0 ? void 0 : _c.set(encodedTxSig, true);
             // eslint-disable-next-line no-useless-catch
         }
         catch (e) {

package/lib/{tx → browser/tx}/retryTxSender.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { ConfirmationStrategy, TxSigAndSlot } from './types';
 import { ConfirmOptions, Connection } from '@solana/web3.js';
 import { BaseTxSender } from './baseTxSender';
@@ -15,7 +16,7 @@ export declare class RetryTxSender extends BaseTxSender {
     retrySleep: number;
     additionalConnections: Connection[];
     timoutCount: number;
-    constructor({ connection, wallet, opts, timeout, retrySleep, additionalConnections, confirmationStrategy, additionalTxSenderCallbacks, txHandler, trackTxLandRate, txLandRateLookbackWindowMinutes, landRateToFeeFunc, }: {
+    constructor({ connection, wallet, opts, timeout, retrySleep, additionalConnections, confirmationStrategy, additionalTxSenderCallbacks, txHandler, trackTxLandRate, txLandRateLookbackWindowMinutes, landRateToFeeFunc, throwOnTimeoutError, }: {
         connection: Connection;
         wallet: IWallet;
         opts?: ConfirmOptions;
@@ -28,6 +29,7 @@ export declare class RetryTxSender extends BaseTxSender {
         trackTxLandRate?: boolean;
         txLandRateLookbackWindowMinutes?: number;
         landRateToFeeFunc?: (landRate: number) => number;
+        throwOnTimeoutError?: boolean;
     });
     sleep(reference: ResolveReference): Promise<void>;
     sendRawTransaction(rawTransaction: Buffer | Uint8Array, opts: ConfirmOptions): Promise<TxSigAndSlot>;

package/lib/{tx → browser/tx}/retryTxSender.js

@@ -7,7 +7,7 @@ const config_1 = require("../config");
 const DEFAULT_TIMEOUT = 35000;
 const DEFAULT_RETRY = 2000;
 class RetryTxSender extends baseTxSender_1.BaseTxSender {
-    constructor({ connection, wallet, opts = { ...config_1.DEFAULT_CONFIRMATION_OPTS, maxRetries: 0 }, timeout = DEFAULT_TIMEOUT, retrySleep = DEFAULT_RETRY, additionalConnections = new Array(), confirmationStrategy = types_1.ConfirmationStrategy.Combo, additionalTxSenderCallbacks = [], txHandler, trackTxLandRate, txLandRateLookbackWindowMinutes, landRateToFeeFunc, }) {
+    constructor({ connection, wallet, opts = { ...config_1.DEFAULT_CONFIRMATION_OPTS, maxRetries: 0 }, timeout = DEFAULT_TIMEOUT, retrySleep = DEFAULT_RETRY, additionalConnections = new Array(), confirmationStrategy = types_1.ConfirmationStrategy.Combo, additionalTxSenderCallbacks = [], txHandler, trackTxLandRate, txLandRateLookbackWindowMinutes, landRateToFeeFunc, throwOnTimeoutError = true, }) {
         super({
             connection,
             wallet,
@@ -20,6 +20,7 @@ class RetryTxSender extends baseTxSender_1.BaseTxSender {
             trackTxLandRate,
             txLandRateLookbackWindowMinutes,
             landRateToFeeFunc,
+            throwOnTimeoutError,
         });
         this.timoutCount = 0;
         this.connection = connection;
@@ -36,7 +37,7 @@ class RetryTxSender extends baseTxSender_1.BaseTxSender {
         });
     }
     async sendRawTransaction(rawTransaction, opts) {
-        var _a, _b;
+        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);
@@ -69,8 +70,8 @@ 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.value);
-            slot = result.context.slot;
+            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;
             // eslint-disable-next-line no-useless-catch
         }
         catch (e) {

package/lib/{tx → browser/tx}/types.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { AddressLookupTableAccount, BlockhashWithExpiryBlockHeight, ConfirmOptions, Signer, Transaction, TransactionInstruction, TransactionSignature, VersionedTransaction } from '@solana/web3.js';
 import { IWallet } from '../types';
 export declare enum ConfirmationStrategy {