@drift-labs/sdk 2.96.0-beta.9 → 2.97.0-beta.1

package/lib/orderParams.js

@@ -3,27 +3,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOrderParams = exports.getMarketOrderParams = exports.getTriggerLimitOrderParams = exports.getTriggerMarketOrderParams = exports.getLimitOrderParams = void 0;
 const types_1 = require("./types");
 function getLimitOrderParams(params) {
-    return Object.assign({}, params, {
+    return getOrderParams(Object.assign({}, params, {
         orderType: types_1.OrderType.LIMIT,
-    });
+    }));
 }
 exports.getLimitOrderParams = getLimitOrderParams;
 function getTriggerMarketOrderParams(params) {
-    return Object.assign({}, params, {
+    return getOrderParams(Object.assign({}, params, {
         orderType: types_1.OrderType.TRIGGER_MARKET,
-    });
+    }));
 }
 exports.getTriggerMarketOrderParams = getTriggerMarketOrderParams;
 function getTriggerLimitOrderParams(params) {
-    return Object.assign({}, params, {
+    return getOrderParams(Object.assign({}, params, {
         orderType: types_1.OrderType.TRIGGER_LIMIT,
-    });
+    }));
 }
 exports.getTriggerLimitOrderParams = getTriggerLimitOrderParams;
 function getMarketOrderParams(params) {
-    return Object.assign({}, params, {
+    return getOrderParams(Object.assign({}, params, {
         orderType: types_1.OrderType.MARKET,
-    });
+    }));
 }
 exports.getMarketOrderParams = getMarketOrderParams;
 /**

package/lib/orderSubscriber/OrderSubscriber.js

@@ -133,12 +133,7 @@ class OrderSubscriber {
             if (newOrders.length > 0) {
                 this.eventEmitter.emit('orderCreated', userAccount, newOrders, new web3_js_1.PublicKey(key), slot, dataType);
             }
-            if (userAccount.hasOpenOrder) {
-                this.usersAccounts.set(key, { slot, userAccount });
-            }
-            else {
-                this.usersAccounts.delete(key);
-            }
+            this.usersAccounts.set(key, { slot, userAccount });
         }
     }
     /**

package/lib/tokenFaucet.js

@@ -31,13 +31,14 @@ const anchor = __importStar(require("@coral-xyz/anchor"));
 const anchor_1 = require("@coral-xyz/anchor");
 const spl_token_1 = require("@solana/spl-token");
 const web3_js_1 = require("@solana/web3.js");
+const _1 = require(".");
 const token_faucet_json_1 = __importDefault(require("./idl/token_faucet.json"));
 class TokenFaucet {
     constructor(connection, wallet, programId, mint, opts, context) {
         this.connection = connection;
         this.context = context;
         this.wallet = wallet;
-        this.opts = opts || anchor_1.AnchorProvider.defaultOptions();
+        this.opts = opts || _1.DEFAULT_CONFIRMATION_OPTS;
         // @ts-ignore
         const provider = new anchor_1.AnchorProvider(context ? context.connection.toConnection() : this.connection, 
         // @ts-ignore

package/lib/tx/baseTxSender.d.ts

@@ -48,7 +48,6 @@ export declare abstract class BaseTxSender implements TxSender {
     addAdditionalConnection(newConnection: Connection): void;
     getTimeoutCount(): number;
     checkConfirmationResultForError(txSig: string, result: SignatureResult): Promise<void>;
-    reportTransactionError(txSig: string): Promise<any>;
     getTxLandRate(): number;
     private defaultLandRateToFeeFunc;
     getSuggestedPriorityFeeMultiplier(): number;

package/lib/tx/baseTxSender.js

@@ -5,18 +5,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseTxSender = void 0;
 const types_1 = require("./types");
-const web3_js_1 = require("@solana/web3.js");
-const anchor_1 = require("@coral-xyz/anchor");
 const assert_1 = __importDefault(require("assert"));
 const bs58_1 = __importDefault(require("bs58"));
 const txHandler_1 = require("./txHandler");
 const node_cache_1 = __importDefault(require("node-cache"));
+const config_1 = require("../config");
+const txConstants_1 = require("../constants/txConstants");
+const reportTransactionError_1 = require("./reportTransactionError");
 const BASELINE_TX_LAND_RATE = 0.9;
 const DEFAULT_TIMEOUT = 35000;
 const DEFAULT_TX_LAND_RATE_LOOKBACK_WINDOW_MINUTES = 10;
-const NOT_CONFIRMED_ERROR_CODE = -1001;
 class BaseTxSender {
-    constructor({ connection, wallet, opts = anchor_1.AnchorProvider.defaultOptions(), 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, }) {
         this.timeoutCount = 0;
         this.txLandRate = 0;
         this.lastPriorityFeeSuggestion = 1;
@@ -166,7 +166,7 @@ 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.`, NOT_CONFIRMED_ERROR_CODE);
+            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 +192,7 @@ 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.`, NOT_CONFIRMED_ERROR_CODE);
+        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 ||
@@ -243,30 +243,12 @@ class BaseTxSender {
         return this.timeoutCount;
     }
     async checkConfirmationResultForError(txSig, result) {
+        var _a;
         if (result.err) {
-            await this.reportTransactionError(txSig);
+            await (0, reportTransactionError_1.throwTransactionError)(txSig, this.connection, (_a = this.opts) === null || _a === void 0 ? void 0 : _a.commitment);
         }
         return;
     }
-    async reportTransactionError(txSig) {
-        var _a, _b;
-        const transactionResult = await this.connection.getTransaction(txSig, {
-            maxSupportedTransactionVersion: 0,
-        });
-        if (!((_a = transactionResult === null || transactionResult === void 0 ? void 0 : transactionResult.meta) === null || _a === void 0 ? void 0 : _a.err)) {
-            return undefined;
-        }
-        const logs = transactionResult.meta.logMessages;
-        const lastLog = logs[logs.length - 1];
-        const friendlyMessage = (_b = lastLog === null || lastLog === void 0 ? void 0 : lastLog.match(/(failed:) (.+)/)) === null || _b === void 0 ? void 0 : _b[2];
-        // @ts-ignore
-        throw new web3_js_1.SendTransactionError({
-            action: 'send',
-            signature: txSig,
-            transactionMessage: `Transaction Failed${friendlyMessage ? `: ${friendlyMessage}` : ''}`,
-            logs,
-        });
-    }
     getTxLandRate() {
         if (!this.trackTxLandRate) {
             console.warn('trackTxLandRate is false, returning default land rate of 0');

package/lib/tx/fastSingleTxSender.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FastSingleTxSender = void 0;
 const types_1 = require("./types");
-const anchor_1 = require("@coral-xyz/anchor");
 const baseTxSender_1 = require("./baseTxSender");
+const config_1 = require("../config");
 const DEFAULT_TIMEOUT = 35000;
 const DEFAULT_BLOCKHASH_REFRESH = 10000;
 class FastSingleTxSender extends baseTxSender_1.BaseTxSender {
-    constructor({ connection, wallet, opts = { ...anchor_1.AnchorProvider.defaultOptions(), 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, }) {
         super({
             connection,
             wallet,

package/lib/tx/forwardOnlyTxSender.js

@@ -4,15 +4,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ForwardOnlyTxSender = void 0;
-const anchor_1 = require("@coral-xyz/anchor");
 const web3_js_1 = require("@solana/web3.js");
 const bs58_1 = __importDefault(require("bs58"));
 const baseTxSender_1 = require("./baseTxSender");
 const types_1 = require("./types");
+const config_1 = require("../config");
 const DEFAULT_TIMEOUT = 35000;
 const DEFAULT_RETRY = 5000;
 class ForwardOnlyTxSender extends baseTxSender_1.BaseTxSender {
-    constructor({ connection, wallet, opts = { ...anchor_1.AnchorProvider.defaultOptions(), 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, }) {
         super({
             connection,
             wallet,

package/lib/tx/reportTransactionError.d.ts

@@ -0,0 +1,20 @@
+import { Commitment, Connection, SendTransactionError, VersionedTransactionResponse } from '@solana/web3.js';
+/**
+ * THROWS if there is an error
+ *
+ * Should only be used for a txSig that is confirmed has an error. There is a race-condition where sometimes the transaction is not instantly available to fetch after the confirmation has already failed with an error, so this method has retry logic which we don't want to do wastefully. This method will throw a generic error if it can't get the transaction result after a retry period.
+ * @param txSig
+ * @param connection
+ * @returns
+ */
+export declare const throwTransactionError: (txSig: string, connection: Connection, commitment?: Commitment) => Promise<void>;
+/**
+ * RETURNS an error if there is one
+ *
+ * Should only be used for a txSig that is confirmed has an error. There is a race-condition where sometimes the transaction is not instantly available to fetch after the confirmation has already failed with an error, so this method has retry logic which we don't want to do wastefully. This method will throw a generic error if it can't get the transaction result after a retry period.
+ * @param txSig
+ * @param connection
+ * @returns
+ */
+export declare const getTransactionErrorFromTxSig: (txSig: string, connection: Connection, commitment?: Commitment) => Promise<SendTransactionError>;
+export declare const getTransactionError: (transactionResult: VersionedTransactionResponse) => SendTransactionError;

package/lib/tx/reportTransactionError.js

@@ -0,0 +1,103 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getTransactionError = exports.getTransactionErrorFromTxSig = exports.throwTransactionError = void 0;
+const web3_js_1 = require("@solana/web3.js");
+const config_1 = require("../config");
+/**
+ * The new getTransaction method expects a Finality type instead of a Commitment type. The only options for Finality are 'confirmed' and 'finalized'.
+ * @param commitment
+ * @returns
+ */
+const commitmentToFinality = (commitment) => {
+    switch (commitment) {
+        case 'confirmed':
+            return 'confirmed';
+        case 'finalized':
+            return 'finalized';
+        default:
+            throw new Error(`Invalid commitment when reporting transaction error. The commitment must be 'confirmed' or 'finalized' but was given '${commitment}'. If you're using this commitment for a specific reason, you may need to roll your own logic here.`);
+    }
+};
+const getTransactionResult = async (txSig, connection, commitment) => {
+    const finality = commitmentToFinality(commitment || connection.commitment || config_1.DEFAULT_CONFIRMATION_OPTS.commitment);
+    return await connection.getTransaction(txSig, {
+        maxSupportedTransactionVersion: 0,
+        commitment: finality,
+    });
+};
+const getTransactionResultWithRetry = async (txSig, connection, commitment) => {
+    const start = Date.now();
+    const retryTimeout = 3000; // Timeout after 3 seconds
+    const retryInterval = 800; // Retry with 800ms interval
+    const retryCount = 3; // Retry 3 times
+    let currentCount = 0;
+    let transactionResult = await getTransactionResult(txSig, connection, commitment);
+    // Retry 3 times or until timeout as long as we don't have a result yet
+    while (!transactionResult &&
+        Date.now() - start < retryTimeout &&
+        currentCount < retryCount) {
+        // Sleep for 1 second :: Do this first so that we don't run the first loop immediately after the initial fetch above
+        await new Promise((resolve) => setTimeout(resolve, retryInterval));
+        transactionResult = await getTransactionResult(txSig, connection, commitment);
+        currentCount++;
+    }
+    return transactionResult;
+};
+/**
+ * THROWS if there is an error
+ *
+ * Should only be used for a txSig that is confirmed has an error. There is a race-condition where sometimes the transaction is not instantly available to fetch after the confirmation has already failed with an error, so this method has retry logic which we don't want to do wastefully. This method will throw a generic error if it can't get the transaction result after a retry period.
+ * @param txSig
+ * @param connection
+ * @returns
+ */
+const throwTransactionError = async (txSig, connection, commitment) => {
+    const err = await (0, exports.getTransactionErrorFromTxSig)(txSig, connection, commitment);
+    if (err) {
+        throw err;
+    }
+    return;
+};
+exports.throwTransactionError = throwTransactionError;
+/**
+ * RETURNS an error if there is one
+ *
+ * Should only be used for a txSig that is confirmed has an error. There is a race-condition where sometimes the transaction is not instantly available to fetch after the confirmation has already failed with an error, so this method has retry logic which we don't want to do wastefully. This method will throw a generic error if it can't get the transaction result after a retry period.
+ * @param txSig
+ * @param connection
+ * @returns
+ */
+const getTransactionErrorFromTxSig = async (txSig, connection, commitment) => {
+    var _a;
+    const transactionResult = await getTransactionResultWithRetry(txSig, connection, commitment);
+    if (!transactionResult) {
+        // Throw a generic error because we couldn't get the transaction result for the given txSig
+        return new web3_js_1.SendTransactionError({
+            action: 'send',
+            signature: txSig,
+            transactionMessage: `Transaction Failed`,
+        });
+    }
+    if (!((_a = transactionResult === null || transactionResult === void 0 ? void 0 : transactionResult.meta) === null || _a === void 0 ? void 0 : _a.err)) {
+        // Assume that the transaction was successful and we are here erroneously because we have a result with no error
+        return;
+    }
+    return (0, exports.getTransactionError)(transactionResult);
+};
+exports.getTransactionErrorFromTxSig = getTransactionErrorFromTxSig;
+const getTransactionError = (transactionResult) => {
+    var _a, _b, _c, _d, _e, _f;
+    if (!((_a = transactionResult === null || transactionResult === void 0 ? void 0 : transactionResult.meta) === null || _a === void 0 ? void 0 : _a.err)) {
+        return;
+    }
+    const logs = (_c = (_b = transactionResult === null || transactionResult === void 0 ? void 0 : transactionResult.meta) === null || _b === void 0 ? void 0 : _b.logMessages) !== null && _c !== void 0 ? _c : ['No logs'];
+    const lastLog = logs[logs.length - 1];
+    const friendlyMessage = (_d = lastLog === null || lastLog === void 0 ? void 0 : lastLog.match(/(failed:) (.+)/)) === null || _d === void 0 ? void 0 : _d[2];
+    return new web3_js_1.SendTransactionError({
+        action: 'send',
+        signature: (_f = (_e = transactionResult === null || transactionResult === void 0 ? void 0 : transactionResult.transaction) === null || _e === void 0 ? void 0 : _e.signatures) === null || _f === void 0 ? void 0 : _f[0],
+        transactionMessage: `Transaction Failed${friendlyMessage ? `: ${friendlyMessage}` : ''}`,
+        logs,
+    });
+};
+exports.getTransactionError = getTransactionError;

package/lib/tx/retryTxSender.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RetryTxSender = void 0;
 const types_1 = require("./types");
-const anchor_1 = require("@coral-xyz/anchor");
 const baseTxSender_1 = require("./baseTxSender");
+const config_1 = require("../config");
 const DEFAULT_TIMEOUT = 35000;
 const DEFAULT_RETRY = 2000;
 class RetryTxSender extends baseTxSender_1.BaseTxSender {
-    constructor({ connection, wallet, opts = { ...anchor_1.AnchorProvider.defaultOptions(), 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, }) {
         super({
             connection,
             wallet,

package/lib/tx/txHandler.js

@@ -11,6 +11,7 @@ const computeUnits_1 = require("../util/computeUnits");
 const cachedBlockhashFetcher_1 = require("./blockhashFetcher/cachedBlockhashFetcher");
 const baseBlockhashFetcher_1 = require("./blockhashFetcher/baseBlockhashFetcher");
 const utils_1 = require("./utils");
+const config_1 = require("../config");
 /**
  * Explanation for SIGNATURE_BLOCK_AND_EXPIRY:
  *
@@ -26,22 +27,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;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
         this.blockHashToLastValidBlockHeightLookup = {};
         this.returnBlockHeightsWithSignedTxCallbackData = false;
-        this.blockhashCommitment = 'finalized';
+        this.blockhashCommitment = config_1.DEFAULT_CONFIRMATION_OPTS.commitment;
         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.blockHashFetcher = ((_a = props === null || props === void 0 ? void 0 : props.config) === null || _a === void 0 ? void 0 : _a.blockhashCachingEnabled)
-            ? new cachedBlockhashFetcher_1.CachedBlockhashFetcher(this.connection, this.blockhashCommitment, (_d = (_c = (_b = props === null || props === void 0 ? void 0 : props.config) === null || _b === void 0 ? void 0 : _b.blockhashCachingConfig) === null || _c === void 0 ? void 0 : _c.retryCount) !== null && _d !== void 0 ? _d : BLOCKHASH_FETCH_RETRY_COUNT, (_g = (_f = (_e = props === null || props === void 0 ? void 0 : props.config) === null || _e === void 0 ? void 0 : _e.blockhashCachingConfig) === null || _f === void 0 ? void 0 : _f.retrySleepTimeMs) !== null && _g !== void 0 ? _g : BLOCKHASH_FETCH_RETRY_SLEEP, (_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.staleCacheTimeMs) !== null && _k !== void 0 ? _k : RECENT_BLOCKHASH_STALE_TIME_MS)
+        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)
             : new baseBlockhashFetcher_1.BaseBlockhashFetcher(this.connection, this.blockhashCommitment);
         // #Optionals
         this.returnBlockHeightsWithSignedTxCallbackData =
-            (_m = (_l = props.opts) === null || _l === void 0 ? void 0 : _l.returnBlockHeightsWithSignedTxCallbackData) !== null && _m !== void 0 ? _m : false;
-        this.onSignedCb = (_o = props.opts) === null || _o === void 0 ? void 0 : _o.onSignedCb;
-        this.preSignedCb = (_p = props.opts) === null || _p === void 0 ? void 0 : _p.preSignedCb;
+            (_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;
     }
     addHashAndExpiryToLookup(hashAndExpiry) {
         if (!this.returnBlockHeightsWithSignedTxCallbackData)

package/lib/tx/whileValidTxSender.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
-import { TxSigAndSlot } from './types';
-import { Commitment, ConfirmOptions, Connection, Signer, Transaction, VersionedTransaction } from '@solana/web3.js';
+import { ConfirmationStrategy, TxSigAndSlot } from './types';
+import { ConfirmOptions, Connection, Signer, Transaction, VersionedTransaction } from '@solana/web3.js';
 import { BaseTxSender } from './baseTxSender';
 import { TxHandler } from './txHandler';
 import { IWallet } from '../types';
@@ -19,17 +19,16 @@ export declare class WhileValidTxSender extends BaseTxSender {
         blockhash: string;
         lastValidBlockHeight: number;
     }>;
-    blockhashCommitment: Commitment;
     useBlockHeightOffset: boolean;
     private checkAndSetUseBlockHeightOffset;
-    constructor({ connection, wallet, opts, retrySleep, additionalConnections, additionalTxSenderCallbacks, blockhashCommitment, txHandler, trackTxLandRate, txLandRateLookbackWindowMinutes, landRateToFeeFunc, }: {
+    constructor({ connection, wallet, opts, retrySleep, additionalConnections, confirmationStrategy, additionalTxSenderCallbacks, txHandler, trackTxLandRate, txLandRateLookbackWindowMinutes, landRateToFeeFunc, }: {
         connection: Connection;
         wallet: IWallet;
         opts?: ConfirmOptions;
         retrySleep?: number;
         additionalConnections?: any;
         additionalTxSenderCallbacks?: ((base58EncodedTx: string) => void)[];
-        blockhashCommitment?: Commitment;
+        confirmationStrategy?: ConfirmationStrategy;
         txHandler?: TxHandler;
         trackTxLandRate?: boolean;
         txLandRateLookbackWindowMinutes?: number;

package/lib/tx/whileValidTxSender.js

@@ -4,11 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WhileValidTxSender = void 0;
-const anchor_1 = require("@coral-xyz/anchor");
+const types_1 = require("./types");
+const web3_js_1 = require("@solana/web3.js");
 const baseTxSender_1 = require("./baseTxSender");
 const bs58_1 = __importDefault(require("bs58"));
+const config_1 = require("../config");
 const DEFAULT_RETRY = 2000;
-const VALID_BLOCK_HEIGHT_OFFSET = -150; // This is a bit of weirdness but the lastValidBlockHeight value returned from connection.getLatestBlockhash is always 300 blocks ahead of the current block, even though the transaction actually expires after 150 blocks. This accounts for that so that we can at least accuractely estimate the transaction expiry.
 class WhileValidTxSender extends baseTxSender_1.BaseTxSender {
     async checkAndSetUseBlockHeightOffset() {
         this.connection.getVersion().then((version) => {
@@ -29,7 +30,7 @@ class WhileValidTxSender extends baseTxSender_1.BaseTxSender {
             }
         });
     }
-    constructor({ connection, wallet, opts = { ...anchor_1.AnchorProvider.defaultOptions(), maxRetries: 0 }, retrySleep = DEFAULT_RETRY, additionalConnections = new Array(), additionalTxSenderCallbacks = [], blockhashCommitment = 'finalized', txHandler, trackTxLandRate, txLandRateLookbackWindowMinutes, landRateToFeeFunc, }) {
+    constructor({ connection, wallet, opts = { ...config_1.DEFAULT_CONFIRMATION_OPTS, maxRetries: 0 }, retrySleep = DEFAULT_RETRY, additionalConnections = new Array(), confirmationStrategy = types_1.ConfirmationStrategy.Combo, additionalTxSenderCallbacks = [], txHandler, trackTxLandRate, txLandRateLookbackWindowMinutes, landRateToFeeFunc, }) {
         super({
             connection,
             wallet,
@@ -39,13 +40,13 @@ class WhileValidTxSender extends baseTxSender_1.BaseTxSender {
             txHandler,
             trackTxLandRate,
             txLandRateLookbackWindowMinutes,
+            confirmationStrategy,
             landRateToFeeFunc,
         });
         this.timoutCount = 0;
         this.untilValid = new Map();
         this.useBlockHeightOffset = true;
         this.retrySleep = retrySleep;
-        this.blockhashCommitment = blockhashCommitment;
         this.checkAndSetUseBlockHeightOffset();
     }
     async sleep(reference) {
@@ -69,7 +70,7 @@ class WhileValidTxSender extends baseTxSender_1.BaseTxSender {
             latestBlockhash = tx.SIGNATURE_BLOCK_AND_EXPIRY;
         }
         // handle subclass-specific side effects
-        const txSig = bs58_1.default.encode(((_a = signedTx.signatures[0]) === null || _a === void 0 ? void 0 : _a.signature) || signedTx.signatures[0]);
+        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));
         this.untilValid.set(txSig, latestBlockhash);
         return signedTx;
     }
@@ -107,7 +108,7 @@ class WhileValidTxSender extends baseTxSender_1.BaseTxSender {
         return this.sendRawTransaction(signedTx.serialize(), opts);
     }
     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);
@@ -138,19 +139,17 @@ class WhileValidTxSender extends baseTxSender_1.BaseTxSender {
         })();
         let slot;
         try {
-            const { blockhash, lastValidBlockHeight } = this.untilValid.get(txid);
-            const result = await this.connection.confirmTransaction({
-                signature: txid,
-                blockhash,
-                lastValidBlockHeight: this.useBlockHeightOffset
-                    ? lastValidBlockHeight + VALID_BLOCK_HEIGHT_OFFSET
-                    : lastValidBlockHeight,
-            }, opts === null || opts === void 0 ? void 0 : opts.commitment);
-            if (!result) {
-                throw new Error(`Couldn't get signature status for txid: ${txid}`);
-            }
+            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);
+            if ((_c = result === null || result === void 0 ? void 0 : result.value) === null || _c === void 0 ? void 0 : _c.err) {
+                // 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;
             // eslint-disable-next-line no-useless-catch
         }

package/lib/types.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="bn.js" />
-import { PublicKey, Transaction, VersionedTransaction } from '@solana/web3.js';
+import { Keypair, PublicKey, Transaction, VersionedTransaction } from '@solana/web3.js';
 import { BN } from '.';
 export type MappedRecord<A extends Record<string, unknown>, B> = {
     [K in keyof A]: B;
@@ -1096,6 +1096,21 @@ export declare class ModifyOrderPolicy {
     };
 }
 export declare const DefaultOrderParams: OrderParams;
+export type SwiftServerMessage = {
+    slot: BN;
+    swiftOrderSignature: Uint8Array;
+};
+export type SwiftOrderParamsMessage = {
+    swiftOrderParams: OptionalOrderParams;
+    expectedOrderId: number;
+    subAccountId: number;
+    takeProfitOrderParams: SwiftTriggerOrderParams | null;
+    stopLossOrderParams: SwiftTriggerOrderParams | null;
+};
+export type SwiftTriggerOrderParams = {
+    triggerPrice: BN;
+    baseAssetAmount: BN;
+};
 export type MakerInfo = {
     maker: PublicKey;
     makerStats: PublicKey;
@@ -1112,6 +1127,10 @@ export type ReferrerInfo = {
     referrer: PublicKey;
     referrerStats: PublicKey;
 };
+export declare enum PlaceAndTakeOrderSuccessCondition {
+    PartialFill = 1,
+    FullFill = 2
+}
 type ExactType<T> = Pick<T, keyof T>;
 export type BaseTxParams = ExactType<{
     computeUnits?: number;
@@ -1137,11 +1156,13 @@ export interface IWallet {
     signTransaction(tx: Transaction): Promise<Transaction>;
     signAllTransactions(txs: Transaction[]): Promise<Transaction[]>;
     publicKey: PublicKey;
+    payer?: Keypair;
 }
 export interface IVersionedWallet {
     signVersionedTransaction(tx: VersionedTransaction): Promise<VersionedTransaction>;
     signAllVersionedTransactions(txs: VersionedTransaction[]): Promise<VersionedTransaction[]>;
     publicKey: PublicKey;
+    payer?: Keypair;
 }
 export type FeeStructure = {
     feeTiers: FeeTier[];

package/lib/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SwapReduceOnly = exports.DefaultOrderParams = exports.ModifyOrderPolicy = exports.PostOnlyParams = exports.LiquidationType = exports.LPAction = exports.TradeSide = exports.getVariant = exports.isOneOfVariant = exports.isVariant = exports.SettlePnlMode = exports.StakeAction = exports.SpotFulfillmentConfigStatus = exports.SettlePnlExplanation = exports.DepositExplanation = exports.SpotFulfillmentStatus = exports.SpotFulfillmentType = exports.OrderTriggerCondition = exports.OrderActionExplanation = exports.OrderAction = exports.OrderStatus = exports.MarketType = exports.OrderType = exports.OracleSource = exports.DepositDirection = exports.PositionDirection = exports.SpotBalanceType = exports.SwapDirection = exports.AssetTier = exports.ContractTier = exports.ContractType = exports.UserStatus = exports.InsuranceFundOperation = exports.SpotOperation = exports.PerpOperation = exports.MarketStatus = exports.ExchangeStatus = void 0;
+exports.SwapReduceOnly = exports.PlaceAndTakeOrderSuccessCondition = exports.DefaultOrderParams = exports.ModifyOrderPolicy = exports.PostOnlyParams = exports.LiquidationType = exports.LPAction = exports.TradeSide = exports.getVariant = exports.isOneOfVariant = exports.isVariant = exports.SettlePnlMode = exports.StakeAction = exports.SpotFulfillmentConfigStatus = exports.SettlePnlExplanation = exports.DepositExplanation = exports.SpotFulfillmentStatus = exports.SpotFulfillmentType = exports.OrderTriggerCondition = exports.OrderActionExplanation = exports.OrderAction = exports.OrderStatus = exports.MarketType = exports.OrderType = exports.OracleSource = exports.DepositDirection = exports.PositionDirection = exports.SpotBalanceType = exports.SwapDirection = exports.AssetTier = exports.ContractTier = exports.ContractType = exports.UserStatus = exports.InsuranceFundOperation = exports.SpotOperation = exports.PerpOperation = exports.MarketStatus = exports.ExchangeStatus = void 0;
 const _1 = require(".");
 // # Utility Types / Enums / Constants
 var ExchangeStatus;
@@ -325,6 +325,11 @@ exports.DefaultOrderParams = {
     auctionStartPrice: null,
     auctionEndPrice: null,
 };
+var PlaceAndTakeOrderSuccessCondition;
+(function (PlaceAndTakeOrderSuccessCondition) {
+    PlaceAndTakeOrderSuccessCondition[PlaceAndTakeOrderSuccessCondition["PartialFill"] = 1] = "PartialFill";
+    PlaceAndTakeOrderSuccessCondition[PlaceAndTakeOrderSuccessCondition["FullFill"] = 2] = "FullFill";
+})(PlaceAndTakeOrderSuccessCondition = exports.PlaceAndTakeOrderSuccessCondition || (exports.PlaceAndTakeOrderSuccessCondition = {}));
 class SwapReduceOnly {
 }
 exports.SwapReduceOnly = SwapReduceOnly;

package/lib/util/TransactionConfirmationManager.d.ts

@@ -0,0 +1,16 @@
+import { Connection, RpcResponseAndContext, SignatureResult, SignatureStatus, TransactionConfirmationStatus } from '@solana/web3.js';
+/**
+ * Class to await for transaction confirmations in an optimised manner. It tracks a shared list of all pending transactions and fetches them in bulk in a shared RPC request whenever they have an "overlapping" polling interval. E.g. tx1 with an interval of 200ms and tx2 with an interval of 300ms (if sent at the same time) will be fetched together at at 600ms, 1200ms, 1800ms, etc.
+ */
+export declare class TransactionConfirmationManager {
+    private connection;
+    private pendingConfirmations;
+    private intervalId;
+    constructor(connection: Connection);
+    confirmTransactionWebSocket(txSig: string, timeout?: number, desiredConfirmationStatus?: TransactionConfirmationStatus): Promise<RpcResponseAndContext<SignatureResult>>;
+    confirmTransactionPolling(txSig: string, desiredConfirmationStatus?: TransactionConfirmationStatus, timeout?: number, pollInterval?: number, searchTransactionHistory?: boolean): Promise<SignatureStatus>;
+    private startConfirmationLoop;
+    private checkPendingConfirmations;
+    private checkStatusMatchesDesiredConfirmationStatus;
+    private checkTransactionStatuses;
+}