@drift-labs/sdk 2.96.0-beta.2 → 2.96.0-beta.21

package/lib/idl/drift.json

@@ -554,7 +554,7 @@
                     }
                 },
                 {
-                    "name": "makerOrderId",
+                    "name": "successCondition",
                     "type": {
                         "option": "u32"
                     }
@@ -608,6 +608,60 @@
                 }
             ]
         },
+        {
+            "name": "placeSwiftTakerOrder",
+            "accounts": [
+                {
+                    "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "user",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "userStats",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "authority",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "ixSysvar",
+                    "isMut": false,
+                    "isSigner": false,
+                    "docs": [
+                        "the supplied Sysvar could be anything else.",
+                        "The Instruction Sysvar has not been implemented",
+                        "in the Anchor framework yet, so this is the safe approach."
+                    ]
+                }
+            ],
+            "args": [
+                {
+                    "name": "swiftMessageBytes",
+                    "type": "bytes"
+                },
+                {
+                    "name": "swiftOrderParamsMessageBytes",
+                    "type": "bytes"
+                },
+                {
+                    "name": "swiftMessageSignature",
+                    "type": {
+                        "array": [
+                            "u8",
+                            64
+                        ]
+                    }
+                }
+            ]
+        },
         {
             "name": "placeSpotOrder",
             "accounts": [
@@ -8050,6 +8104,81 @@
                 ]
             }
         },
+        {
+            "name": "SwiftServerMessage",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "swiftOrderSignature",
+                        "type": {
+                            "array": [
+                                "u8",
+                                64
+                            ]
+                        }
+                    },
+                    {
+                        "name": "slot",
+                        "type": "u64"
+                    }
+                ]
+            }
+        },
+        {
+            "name": "SwiftOrderParamsMessage",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "swiftOrderParams",
+                        "type": {
+                            "defined": "OrderParams"
+                        }
+                    },
+                    {
+                        "name": "expectedOrderId",
+                        "type": "i32"
+                    },
+                    {
+                        "name": "subAccountId",
+                        "type": "u16"
+                    },
+                    {
+                        "name": "takeProfitOrderParams",
+                        "type": {
+                            "option": {
+                                "defined": "SwiftTriggerOrderParams"
+                            }
+                        }
+                    },
+                    {
+                        "name": "stopLossOrderParams",
+                        "type": {
+                            "option": {
+                                "defined": "SwiftTriggerOrderParams"
+                            }
+                        }
+                    }
+                ]
+            }
+        },
+        {
+            "name": "SwiftTriggerOrderParams",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "triggerPrice",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "baseAssetAmount",
+                        "type": "u64"
+                    }
+                ]
+            }
+        },
         {
             "name": "ModifyOrderParams",
             "type": {
@@ -10122,6 +10251,20 @@
                 ]
             }
         },
+        {
+            "name": "PlaceAndTakeOrderSuccessCondition",
+            "type": {
+                "kind": "enum",
+                "variants": [
+                    {
+                        "name": "PartialFill"
+                    },
+                    {
+                        "name": "FullFill"
+                    }
+                ]
+            }
+        },
         {
             "name": "PerpOperation",
             "type": {
@@ -12958,6 +13101,31 @@
             "code": 6284,
             "name": "InvalidPredictionMarketOrder",
             "msg": "Invalid prediction market order"
+        },
+        {
+            "code": 6285,
+            "name": "InvalidVerificationIxIndex",
+            "msg": "Ed25519 Ix must be before place and make swift order ix"
+        },
+        {
+            "code": 6286,
+            "name": "SigVerificationFailed",
+            "msg": "Swift message verificaiton failed"
+        },
+        {
+            "code": 6287,
+            "name": "MismatchedSwiftOrderParamsMarketIndex",
+            "msg": "Market index mismatched b/w taker and maker swift order params"
+        },
+        {
+            "code": 6288,
+            "name": "InvalidSwiftOrderParam",
+            "msg": "Swift only available for market/oracle perp orders"
+        },
+        {
+            "code": 6289,
+            "name": "PlaceAndTakeOrderSuccessConditionFailed",
+            "msg": "Place and take order success condition failed"
         }
     ],
     "metadata": {

package/lib/index.d.ts

@@ -107,5 +107,6 @@ export * from './memcmp';
 export * from './decode/user';
 export * from './blockhashSubscriber';
 export * from './util/chainClock';
+export * from './util/TransactionConfirmationManager';
 export * from './clock/clockSubscriber';
 export { BN, PublicKey, pyth };

package/lib/index.js

@@ -130,4 +130,5 @@ __exportStar(require("./memcmp"), exports);
 __exportStar(require("./decode/user"), exports);
 __exportStar(require("./blockhashSubscriber"), exports);
 __exportStar(require("./util/chainClock"), exports);
+__exportStar(require("./util/TransactionConfirmationManager"), exports);
 __exportStar(require("./clock/clockSubscriber"), exports);

package/lib/math/margin.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="bn.js" />
 import { BN } from '@coral-xyz/anchor';
 import { OraclePriceData } from '../oracles/types';
-import { PerpMarketAccount, PerpPosition } from '..';
+import { DriftClient, PerpMarketAccount, PerpPosition } from '..';
 export declare function calculateSizePremiumLiabilityWeight(size: BN, // AMM_RESERVE_PRECISION
 imfFactor: BN, liabilityWeight: BN, precision: BN): BN;
 export declare function calculateSizeDiscountAssetWeight(size: BN, // AMM_RESERVE_PRECISION
@@ -22,3 +22,18 @@ export declare function calculateWorstCasePerpLiabilityValue(perpPosition: PerpP
     worstCaseLiabilityValue: BN;
 };
 export declare function calculatePerpLiabilityValue(baseAssetAmount: BN, oraclePrice: BN, isPredictionMarket: boolean): BN;
+/**
+ * Calculates the margin required to open a trade, in quote amount. Only accounts for the trade size as a scalar value, does not account for the trade direction or current open positions and whether the trade would _actually_ be risk-increasing and use any extra collateral.
+ * @param targetMarketIndex
+ * @param baseSize
+ * @returns
+ */
+export declare function calculateMarginUSDCRequiredForTrade(driftClient: DriftClient, targetMarketIndex: number, baseSize: BN, userMaxMarginRatio?: number): BN;
+/**
+ * Similar to calculatetMarginUSDCRequiredForTrade, but calculates how much of a given collateral is required to cover the margin requirements for a given trade. Basically does the same thing as getMarginUSDCRequiredForTrade but also accounts for asset weight of the selected collateral.
+ *
+ * Returns collateral required in the precision of the target collateral market.
+ */
+export declare function calculateCollateralDepositRequiredForTrade(driftClient: DriftClient, targetMarketIndex: number, baseSize: BN, collateralIndex: number, userMaxMarginRatio?: number): BN;
+export declare function calculateCollateralValueOfDeposit(driftClient: DriftClient, collateralIndex: number, baseSize: BN): BN;
+export declare function calculateLiquidationPrice(freeCollateral: BN, freeCollateralDelta: BN, oraclePrice: BN): BN;

package/lib/math/margin.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculatePerpLiabilityValue = exports.calculateWorstCasePerpLiabilityValue = exports.calculateWorstCaseBaseAssetAmount = exports.calculateBaseAssetValueWithOracle = exports.calculateOraclePriceForPerpMargin = exports.calculateSizeDiscountAssetWeight = exports.calculateSizePremiumLiabilityWeight = void 0;
+exports.calculateLiquidationPrice = exports.calculateCollateralValueOfDeposit = exports.calculateCollateralDepositRequiredForTrade = exports.calculateMarginUSDCRequiredForTrade = exports.calculatePerpLiabilityValue = exports.calculateWorstCasePerpLiabilityValue = exports.calculateWorstCaseBaseAssetAmount = exports.calculateBaseAssetValueWithOracle = exports.calculateOraclePriceForPerpMargin = exports.calculateSizeDiscountAssetWeight = exports.calculateSizePremiumLiabilityWeight = void 0;
 const utils_1 = require("./utils");
 const numericConstants_1 = require("../constants/numericConstants");
 const anchor_1 = require("@coral-xyz/anchor");
+const __1 = require("..");
 const types_1 = require("../types");
 const assert_1 = require("../assert/assert");
 function calculateSizePremiumLiabilityWeight(size, // AMM_RESERVE_PRECISION
@@ -116,3 +117,68 @@ function calculatePerpLiabilityValue(baseAssetAmount, oraclePrice, isPredictionM
     }
 }
 exports.calculatePerpLiabilityValue = calculatePerpLiabilityValue;
+/**
+ * Calculates the margin required to open a trade, in quote amount. Only accounts for the trade size as a scalar value, does not account for the trade direction or current open positions and whether the trade would _actually_ be risk-increasing and use any extra collateral.
+ * @param targetMarketIndex
+ * @param baseSize
+ * @returns
+ */
+function calculateMarginUSDCRequiredForTrade(driftClient, targetMarketIndex, baseSize, userMaxMarginRatio) {
+    const targetMarket = driftClient.getPerpMarketAccount(targetMarketIndex);
+    const oracleData = driftClient.getOracleDataForPerpMarket(targetMarket.marketIndex);
+    const perpLiabilityValue = calculatePerpLiabilityValue(baseSize, oracleData.price, (0, types_1.isVariant)(targetMarket.contractType, 'prediction'));
+    const marginRequired = new anchor_1.BN((0, __1.calculateMarketMarginRatio)(targetMarket, baseSize.abs(), 'Initial', userMaxMarginRatio))
+        .mul(perpLiabilityValue)
+        .div(numericConstants_1.MARGIN_PRECISION);
+    return marginRequired;
+}
+exports.calculateMarginUSDCRequiredForTrade = calculateMarginUSDCRequiredForTrade;
+/**
+ * Similar to calculatetMarginUSDCRequiredForTrade, but calculates how much of a given collateral is required to cover the margin requirements for a given trade. Basically does the same thing as getMarginUSDCRequiredForTrade but also accounts for asset weight of the selected collateral.
+ *
+ * Returns collateral required in the precision of the target collateral market.
+ */
+function calculateCollateralDepositRequiredForTrade(driftClient, targetMarketIndex, baseSize, collateralIndex, userMaxMarginRatio) {
+    const marginRequiredUsdc = calculateMarginUSDCRequiredForTrade(driftClient, targetMarketIndex, baseSize, userMaxMarginRatio);
+    const collateralMarket = driftClient.getSpotMarketAccount(collateralIndex);
+    const collateralOracleData = driftClient.getOracleDataForSpotMarket(collateralIndex);
+    const scaledAssetWeight = (0, __1.calculateScaledInitialAssetWeight)(collateralMarket, collateralOracleData.price);
+    // Base amount required to deposit = (marginRequiredUsdc / priceOfAsset) / assetWeight .. (E.g. $100 required / $10000 price / 0.5 weight)
+    const baseAmountRequired = driftClient
+        .convertToSpotPrecision(collateralIndex, marginRequiredUsdc)
+        .mul(numericConstants_1.PRICE_PRECISION) // adjust for division by oracle price
+        .mul(numericConstants_1.SPOT_MARKET_WEIGHT_PRECISION) // adjust for division by scaled asset weight
+        .div(collateralOracleData.price)
+        .div(scaledAssetWeight)
+        .div(numericConstants_1.QUOTE_PRECISION); // adjust for marginRequiredUsdc value's QUOTE_PRECISION
+    // TODO : Round by step size?
+    return baseAmountRequired;
+}
+exports.calculateCollateralDepositRequiredForTrade = calculateCollateralDepositRequiredForTrade;
+function calculateCollateralValueOfDeposit(driftClient, collateralIndex, baseSize) {
+    const collateralMarket = driftClient.getSpotMarketAccount(collateralIndex);
+    const collateralOracleData = driftClient.getOracleDataForSpotMarket(collateralIndex);
+    const scaledAssetWeight = (0, __1.calculateScaledInitialAssetWeight)(collateralMarket, collateralOracleData.price);
+    // CollateralBaseValue = oracle price * collateral base amount (and shift to QUOTE_PRECISION)
+    const collateralBaseValue = collateralOracleData.price
+        .mul(baseSize)
+        .mul(numericConstants_1.QUOTE_PRECISION)
+        .div(numericConstants_1.PRICE_PRECISION)
+        .div(new anchor_1.BN(10).pow(new anchor_1.BN(collateralMarket.decimals)));
+    const depositCollateralValue = collateralBaseValue
+        .mul(scaledAssetWeight)
+        .div(numericConstants_1.SPOT_MARKET_WEIGHT_PRECISION);
+    return depositCollateralValue;
+}
+exports.calculateCollateralValueOfDeposit = calculateCollateralValueOfDeposit;
+function calculateLiquidationPrice(freeCollateral, freeCollateralDelta, oraclePrice) {
+    const liqPriceDelta = freeCollateral
+        .mul(numericConstants_1.QUOTE_PRECISION)
+        .div(freeCollateralDelta);
+    const liqPrice = oraclePrice.sub(liqPriceDelta);
+    if (liqPrice.lt(numericConstants_1.ZERO)) {
+        return new anchor_1.BN(-1);
+    }
+    return liqPrice;
+}
+exports.calculateLiquidationPrice = calculateLiquidationPrice;

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.d.ts

@@ -10,14 +10,13 @@ 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 | grpcSubscription;
+    subscription: PollingSubscription | WebsocketSubscription;
     commitment: Commitment;
     eventEmitter: StrictEventEmitter<EventEmitter, OrderSubscriberEvents>;
     fetchPromise?: Promise<void>;

package/lib/orderSubscriber/OrderSubscriber.js

@@ -10,10 +10,9 @@ 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, _d, _e;
+        var _a, _b, _c;
         this.usersAccounts = new Map();
         this.driftClient = config.driftClient;
         this.commitment = config.subscriptionConfig.commitment || 'processed';
@@ -23,34 +22,20 @@ class OrderSubscriber {
                 frequency: config.subscriptionConfig.frequency,
             });
         }
-        else if (config.subscriptionConfig.type === 'grpc') {
-            this.subscription = new grpcSubscription_1.grpcSubscription({
-                grpcConfigs: config.subscriptionConfig.configs,
-                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,
-                },
-                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: (_c = config.subscriptionConfig) === null || _c === void 0 ? void 0 : _c.resubTimeoutMs,
-                    logResubMessages: (_d = config.subscriptionConfig) === null || _d === void 0 ? void 0 : _d.logResubMessages,
+                    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,
             });
         }
-        if ((_e = config.fastDecode) !== null && _e !== void 0 ? _e : true) {
+        if ((_c = config.fastDecode) !== null && _c !== void 0 ? _c : true) {
             this.decodeFn = (name, data) => (0, user_1.decodeUser)(data);
         }
         else {

package/lib/orderSubscriber/types.d.ts

@@ -1,21 +1,12 @@
 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: {
         type: 'polling';
         frequency: number;
         commitment?: Commitment;
-    } | {
-        type: 'grpc';
-        skipInitialLoad?: boolean;
-        resubTimeoutMs?: number;
-        logResubMessages?: boolean;
-        resyncIntervalMs?: number;
-        configs: GrpcConfigs;
-        commitment?: Commitment;
     } | {
         type: 'websocket';
         skipInitialLoad?: boolean;

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.js

@@ -6,17 +6,17 @@ 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 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;

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/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 { ConfirmOptions, Connection, Signer, Transaction, VersionedTransaction } from '@solana/web3.js';
 import { BaseTxSender } from './baseTxSender';
 import { TxHandler } from './txHandler';
 import { IWallet } from '../types';
@@ -19,17 +19,15 @@ 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, additionalTxSenderCallbacks, txHandler, trackTxLandRate, txLandRateLookbackWindowMinutes, landRateToFeeFunc, }: {
         connection: Connection;
         wallet: IWallet;
         opts?: ConfirmOptions;
         retrySleep?: number;
         additionalConnections?: any;
         additionalTxSenderCallbacks?: ((base58EncodedTx: string) => void)[];
-        blockhashCommitment?: Commitment;
         txHandler?: TxHandler;
         trackTxLandRate?: boolean;
         txLandRateLookbackWindowMinutes?: number;