@drift-labs/sdk 2.82.0-beta.2 → 2.82.0-beta.20

package/lib/index.d.ts

@@ -101,4 +101,6 @@ export * from './auctionSubscriber/types';
 export * from './memcmp';
 export * from './decode/user';
 export * from './blockhashSubscriber';
+export * from './util/chainClock';
+export * from './clock/clockSubscriber';
 export { BN, PublicKey, pyth };

package/lib/index.js

@@ -124,3 +124,5 @@ __exportStar(require("./auctionSubscriber/types"), exports);
 __exportStar(require("./memcmp"), exports);
 __exportStar(require("./decode/user"), exports);
 __exportStar(require("./blockhashSubscriber"), exports);
+__exportStar(require("./util/chainClock"), exports);
+__exportStar(require("./clock/clockSubscriber"), exports);

package/lib/jupiter/jupiterClient.d.ts

@@ -206,8 +206,9 @@ export declare class JupiterClient {
     url: string;
     connection: Connection;
     lookupTableCahce: Map<string, AddressLookupTableAccount>;
-    constructor({ connection }: {
+    constructor({ connection, url }: {
         connection: Connection;
+        url?: string;
     });
     /**
      * ** @deprecated - use getQuote

package/lib/jupiter/jupiterClient.js

@@ -7,10 +7,10 @@ exports.JupiterClient = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const node_fetch_1 = __importDefault(require("node-fetch"));
 class JupiterClient {
-    constructor({ connection }) {
-        this.url = 'https://quote-api.jup.ag';
+    constructor({ connection, url }) {
         this.lookupTableCahce = new Map();
         this.connection = connection;
+        this.url = url !== null && url !== void 0 ? url : 'https://quote-api.jup.ag';
     }
     /**
      * ** @deprecated - use getQuote
@@ -31,7 +31,8 @@ class JupiterClient {
             swapMode,
             onlyDirectRoutes: onlyDirectRoutes.toString(),
         }).toString();
-        const { data: routes } = await (await (0, node_fetch_1.default)(`${this.url}/v4/quote?${params}`)).json();
+        const apiVersionParam = this.url === 'https://quote-api.jup.ag' ? '/v4' : '';
+        const { data: routes } = await (await (0, node_fetch_1.default)(`${this.url}${apiVersionParam}/quote?${params}`)).json();
         return routes;
     }
     /**
@@ -58,7 +59,8 @@ class JupiterClient {
         if (swapMode === 'ExactOut') {
             params.delete('maxAccounts');
         }
-        const quote = await (await (0, node_fetch_1.default)(`${this.url}/v6/quote?${params.toString()}`)).json();
+        const apiVersionParam = this.url === 'https://quote-api.jup.ag' ? '/v6' : '';
+        const quote = await (await (0, node_fetch_1.default)(`${this.url}${apiVersionParam}/quote?${params.toString()}`)).json();
         return quote;
     }
     /**
@@ -72,7 +74,8 @@ class JupiterClient {
         if (!quote) {
             throw new Error('Jupiter swap quote not provided. Please try again.');
         }
-        const resp = await (await (0, node_fetch_1.default)(`${this.url}/v6/swap`, {
+        const apiVersionParam = this.url === 'https://quote-api.jup.ag' ? '/v6' : '';
+        const resp = await (await (0, node_fetch_1.default)(`${this.url}${apiVersionParam}/swap`, {
             method: 'POST',
             headers: {
                 'Content-Type': 'application/json',
@@ -103,7 +106,8 @@ class JupiterClient {
      * @param slippageBps the slippage tolerance in basis points
      */
     async getSwapTransaction({ route, userPublicKey, slippageBps = 50, }) {
-        const resp = await (await (0, node_fetch_1.default)(`${this.url}/v4/swap`, {
+        const apiVersionParam = this.url === 'https://quote-api.jup.ag' ? '/v4' : '';
+        const resp = await (await (0, node_fetch_1.default)(`${this.url}${apiVersionParam}/swap`, {
             method: 'POST',
             headers: {
                 'Content-Type': 'application/json',

package/lib/math/exchangeStatus.d.ts

@@ -1,6 +1,6 @@
-import { PerpMarketAccount, PerpOperation, SpotMarketAccount, SpotOperation, StateAccount } from '../types';
+import { PerpMarketAccount, PerpOperation, SpotMarketAccount, SpotOperation, StateAccount, InsuranceFundOperation } from '../types';
 export declare function exchangePaused(state: StateAccount): boolean;
 export declare function fillPaused(state: StateAccount, market: PerpMarketAccount | SpotMarketAccount): boolean;
 export declare function ammPaused(state: StateAccount, market: PerpMarketAccount | SpotMarketAccount): boolean;
-export declare function isOperationPaused(pausedOperations: number, operation: PerpOperation | SpotOperation): boolean;
+export declare function isOperationPaused(pausedOperations: number, operation: PerpOperation | SpotOperation | InsuranceFundOperation): boolean;
 export declare function isAmmDrawdownPause(market: PerpMarketAccount): boolean;

package/lib/math/orders.d.ts

@@ -14,7 +14,7 @@ export declare function hasAuctionPrice(order: Order, slot: number): boolean;
 export declare function isFillableByVAMM(order: Order, market: PerpMarketAccount, oraclePriceData: OraclePriceData, slot: number, ts: number, minAuctionDuration: number): boolean;
 export declare function calculateBaseAssetAmountForAmmToFulfill(order: Order, market: PerpMarketAccount, oraclePriceData: OraclePriceData, slot: number): BN;
 export declare function calculateBaseAssetAmountToFillUpToLimitPrice(order: Order, amm: AMM, limitPrice: BN, oraclePriceData: OraclePriceData): BN;
-export declare function isOrderExpired(order: Order, ts: number, enforceBuffer?: boolean): boolean;
+export declare function isOrderExpired(order: Order, ts: number, enforceBuffer?: boolean, bufferSeconds?: number): boolean;
 export declare function isMarketOrder(order: Order): boolean;
 export declare function isLimitOrder(order: Order): boolean;
 export declare function mustBeTriggered(order: Order): boolean;

package/lib/math/orders.js

@@ -168,7 +168,7 @@ function isSameDirection(firstDirection, secondDirection) {
     return (((0, types_1.isVariant)(firstDirection, 'long') && (0, types_1.isVariant)(secondDirection, 'long')) ||
         ((0, types_1.isVariant)(firstDirection, 'short') && (0, types_1.isVariant)(secondDirection, 'short')));
 }
-function isOrderExpired(order, ts, enforceBuffer = false) {
+function isOrderExpired(order, ts, enforceBuffer = false, bufferSeconds = 15) {
     if (mustBeTriggered(order) ||
         !(0, types_1.isVariant)(order.status, 'open') ||
         order.maxTs.eq(numericConstants_1.ZERO)) {
@@ -176,7 +176,7 @@ function isOrderExpired(order, ts, enforceBuffer = false) {
     }
     let maxTs;
     if (enforceBuffer && isLimitOrder(order)) {
-        maxTs = order.maxTs.addn(15);
+        maxTs = order.maxTs.addn(bufferSeconds);
     }
     else {
         maxTs = order.maxTs;

package/lib/orderSubscriber/OrderSubscriber.js

@@ -12,7 +12,7 @@ const index_1 = require("../index");
 const user_1 = require("../decode/user");
 class OrderSubscriber {
     constructor(config) {
-        var _a;
+        var _a, _b, _c;
         this.usersAccounts = new Map();
         this.driftClient = config.driftClient;
         this.commitment = config.subscriptionConfig.commitment || 'processed';
@@ -27,12 +27,15 @@ class OrderSubscriber {
                 orderSubscriber: this,
                 commitment: this.commitment,
                 skipInitialLoad: config.subscriptionConfig.skipInitialLoad,
-                resubTimeoutMs: config.subscriptionConfig.resubTimeoutMs,
+                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,
             });
         }
-        if ((_a = config.fastDecode) !== null && _a !== void 0 ? _a : true) {
+        if ((_c = config.fastDecode) !== null && _c !== void 0 ? _c : true) {
             this.decodeFn = (name, data) => (0, user_1.decodeUser)(data);
         }
         else {

package/lib/orderSubscriber/WebsocketSubscription.d.ts

@@ -1,19 +1,20 @@
 import { OrderSubscriber } from './OrderSubscriber';
 import { Commitment } from '@solana/web3.js';
+import { ResubOpts } from '../accounts/types';
 export declare class WebsocketSubscription {
     private orderSubscriber;
     private commitment;
     private skipInitialLoad;
-    private resubTimeoutMs?;
+    private resubOpts?;
     private resyncIntervalMs?;
     private subscriber?;
     private resyncTimeoutId?;
     private decoded?;
-    constructor({ orderSubscriber, commitment, skipInitialLoad, resubTimeoutMs, resyncIntervalMs, decoded, }: {
+    constructor({ orderSubscriber, commitment, skipInitialLoad, resubOpts, resyncIntervalMs, decoded, }: {
         orderSubscriber: OrderSubscriber;
         commitment: Commitment;
         skipInitialLoad?: boolean;
-        resubTimeoutMs?: number;
+        resubOpts?: ResubOpts;
         resyncIntervalMs?: number;
         decoded?: boolean;
     });

package/lib/orderSubscriber/WebsocketSubscription.js

@@ -4,11 +4,11 @@ exports.WebsocketSubscription = void 0;
 const memcmp_1 = require("../memcmp");
 const webSocketProgramAccountSubscriber_1 = require("../accounts/webSocketProgramAccountSubscriber");
 class WebsocketSubscription {
-    constructor({ orderSubscriber, commitment, skipInitialLoad = false, resubTimeoutMs, resyncIntervalMs, decoded = true, }) {
+    constructor({ orderSubscriber, commitment, skipInitialLoad = false, resubOpts, resyncIntervalMs, decoded = true, }) {
         this.orderSubscriber = orderSubscriber;
         this.commitment = commitment;
         this.skipInitialLoad = skipInitialLoad;
-        this.resubTimeoutMs = resubTimeoutMs;
+        this.resubOpts = resubOpts;
         this.resyncIntervalMs = resyncIntervalMs;
         this.decoded = decoded;
     }
@@ -19,7 +19,7 @@ class WebsocketSubscription {
         this.subscriber = new webSocketProgramAccountSubscriber_1.WebSocketProgramAccountSubscriber('OrderSubscriber', 'User', this.orderSubscriber.driftClient.program, this.orderSubscriber.decodeFn, {
             filters: [(0, memcmp_1.getUserFilter)(), (0, memcmp_1.getNonIdleUserFilter)()],
             commitment: this.commitment,
-        }, this.resubTimeoutMs);
+        }, this.resubOpts);
         await this.subscriber.subscribe((accountId, account, context, buffer) => {
             var _a;
             const userKey = accountId.toBase58();

package/lib/orderSubscriber/types.d.ts

@@ -11,6 +11,7 @@ export type OrderSubscriberConfig = {
         type: 'websocket';
         skipInitialLoad?: boolean;
         resubTimeoutMs?: number;
+        logResubMessages?: boolean;
         resyncIntervalMs?: number;
         commitment?: Commitment;
     };

package/lib/priorityFee/driftPriorityFeeMethod.d.ts

@@ -1,3 +1,13 @@
-import { HeliusPriorityFeeLevels } from './heliusPriorityFeeMethod';
-export type DriftPriorityFeeResponse = HeliusPriorityFeeLevels[];
-export declare function fetchDriftPriorityFee(url: string, marketTypes: string[], marketIndexs: number[]): Promise<DriftPriorityFeeResponse>;
+import { HeliusPriorityLevel } from './heliusPriorityFeeMethod';
+export type DriftMarketInfo = {
+    marketType: string;
+    marketIndex: number;
+};
+export type DriftPriorityFeeLevels = {
+    [key in HeliusPriorityLevel]: number;
+} & {
+    marketType: 'perp' | 'spot';
+    marketIndex: number;
+};
+export type DriftPriorityFeeResponse = DriftPriorityFeeLevels[];
+export declare function fetchDriftPriorityFee(url: string, marketTypes: string[], marketIndexes: number[]): Promise<DriftPriorityFeeResponse>;

package/lib/priorityFee/driftPriorityFeeMethod.js

@@ -5,9 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchDriftPriorityFee = void 0;
 const node_fetch_1 = __importDefault(require("node-fetch"));
-async function fetchDriftPriorityFee(url, marketTypes, marketIndexs) {
+async function fetchDriftPriorityFee(url, marketTypes, marketIndexes) {
     try {
-        const response = await (0, node_fetch_1.default)(`${url}/batchPriorityFees?marketType=${marketTypes.join(',')}&marketIndex=${marketIndexs.join(',')}`);
+        const response = await (0, node_fetch_1.default)(`${url}/batchPriorityFees?marketType=${marketTypes.join(',')}&marketIndex=${marketIndexes.join(',')}`);
         if (!response.ok) {
             throw new Error(`HTTP error! status: ${response.status}`);
         }

package/lib/priorityFee/index.d.ts

@@ -4,6 +4,8 @@ export * from './ewmaStrategy';
 export * from './maxOverSlotsStrategy';
 export * from './maxStrategy';
 export * from './priorityFeeSubscriber';
+export * from './priorityFeeSubscriberMap';
 export * from './solanaPriorityFeeMethod';
 export * from './heliusPriorityFeeMethod';
+export * from './driftPriorityFeeMethod';
 export * from './types';

package/lib/priorityFee/index.js

@@ -20,6 +20,8 @@ __exportStar(require("./ewmaStrategy"), exports);
 __exportStar(require("./maxOverSlotsStrategy"), exports);
 __exportStar(require("./maxStrategy"), exports);
 __exportStar(require("./priorityFeeSubscriber"), exports);
+__exportStar(require("./priorityFeeSubscriberMap"), exports);
 __exportStar(require("./solanaPriorityFeeMethod"), exports);
 __exportStar(require("./heliusPriorityFeeMethod"), exports);
+__exportStar(require("./driftPriorityFeeMethod"), exports);
 __exportStar(require("./types"), exports);

package/lib/priorityFee/priorityFeeSubscriber.d.ts

@@ -3,10 +3,7 @@ import { PriorityFeeMethod, PriorityFeeStrategy, PriorityFeeSubscriberConfig } f
 import { AverageOverSlotsStrategy } from './averageOverSlotsStrategy';
 import { MaxOverSlotsStrategy } from './maxOverSlotsStrategy';
 import { HeliusPriorityFeeLevels, HeliusPriorityLevel } from './heliusPriorityFeeMethod';
-export type DriftMarketInfo = {
-    marketType: string;
-    marketIndex: number;
-};
+import { DriftMarketInfo } from './driftPriorityFeeMethod';
 export declare class PriorityFeeSubscriber {
     connection: Connection;
     frequencyMs: number;

package/lib/priorityFee/priorityFeeSubscriber.js

@@ -9,7 +9,7 @@ const heliusPriorityFeeMethod_1 = require("./heliusPriorityFeeMethod");
 const driftPriorityFeeMethod_1 = require("./driftPriorityFeeMethod");
 class PriorityFeeSubscriber {
     constructor(config) {
-        var _a, _b;
+        var _a, _b, _c;
         this.averageStrategy = new averageOverSlotsStrategy_1.AverageOverSlotsStrategy();
         this.maxStrategy = new maxOverSlotsStrategy_1.MaxOverSlotsStrategy();
         this.priorityFeeMethod = types_1.PriorityFeeMethod.SOLANA;
@@ -19,7 +19,8 @@ class PriorityFeeSubscriber {
         this.lastMaxStrategyResult = 0;
         this.lastSlotSeen = 0;
         this.connection = config.connection;
-        this.frequencyMs = config.frequencyMs;
+        this.frequencyMs =
+            (_a = config.frequencyMs) !== null && _a !== void 0 ? _a : types_1.DEFAULT_PRIORITY_FEE_MAP_FREQUENCY_MS;
         this.addresses = config.addresses
             ? config.addresses.map((address) => address.toBase58())
             : [];
@@ -30,7 +31,7 @@ class PriorityFeeSubscriber {
         else {
             this.customStrategy = this.averageStrategy;
         }
-        this.lookbackDistance = (_a = config.slotsToCheck) !== null && _a !== void 0 ? _a : 50;
+        this.lookbackDistance = (_b = config.slotsToCheck) !== null && _b !== void 0 ? _b : 50;
         if (config.priorityFeeMethod) {
             this.priorityFeeMethod = config.priorityFeeMethod;
             if (this.priorityFeeMethod === types_1.PriorityFeeMethod.HELIUS) {
@@ -56,7 +57,7 @@ class PriorityFeeSubscriber {
             }
         }
         this.maxFeeMicroLamports = config.maxFeeMicroLamports;
-        this.priorityFeeMultiplier = (_b = config.priorityFeeMultiplier) !== null && _b !== void 0 ? _b : 1.0;
+        this.priorityFeeMultiplier = (_c = config.priorityFeeMultiplier) !== null && _c !== void 0 ? _c : 1.0;
     }
     async subscribe() {
         if (this.intervalId) {

package/lib/priorityFee/priorityFeeSubscriberMap.d.ts

@@ -0,0 +1,48 @@
+import { DriftMarketInfo, DriftPriorityFeeLevels } from './driftPriorityFeeMethod';
+import { PriorityFeeSubscriberMapConfig } from './types';
+/**
+ * takes advantage of /batchPriorityFees endpoint from drift hosted priority fee service
+ */
+export declare class PriorityFeeSubscriberMap {
+    frequencyMs: number;
+    intervalId?: ReturnType<typeof setTimeout>;
+    driftMarkets?: DriftMarketInfo[];
+    driftPriorityFeeEndpoint?: string;
+    feesMap: Map<string, Map<number, DriftPriorityFeeLevels>>;
+    constructor(config: PriorityFeeSubscriberMapConfig);
+    private updateFeesMap;
+    subscribe(): Promise<void>;
+    unsubscribe(): Promise<void>;
+    load(): Promise<void>;
+    updateMarketTypeAndIndex(driftMarkets: DriftMarketInfo[]): void;
+    getPriorityFees(marketType: string, marketIndex: number): DriftPriorityFeeLevels | undefined;
+}
+/** Example usage:
+async function main() {
+    const driftMarkets: DriftMarketInfo[] = [
+        { marketType: 'perp', marketIndex: 0 },
+        { marketType: 'perp', marketIndex: 1 },
+        { marketType: 'spot', marketIndex: 2 }
+    ];
+
+    const subscriber = new PriorityFeeSubscriberMap({
+        driftPriorityFeeEndpoint: 'https://dlob.drift.trade',
+        frequencyMs: 5000,
+        driftMarkets
+    });
+    await subscriber.subscribe();
+
+    for (let i = 0; i < 20; i++) {
+        await new Promise(resolve => setTimeout(resolve, 1000));
+        driftMarkets.forEach(market => {
+            const fees = subscriber.getPriorityFees(market.marketType, market.marketIndex);
+            console.log(`Priority fees for ${market.marketType} market ${market.marketIndex}:`, fees);
+        });
+    }
+
+
+    await subscriber.unsubscribe();
+}
+
+main().catch(console.error);
+*/

package/lib/priorityFee/priorityFeeSubscriberMap.js

@@ -0,0 +1,88 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PriorityFeeSubscriberMap = void 0;
+const driftPriorityFeeMethod_1 = require("./driftPriorityFeeMethod");
+const types_1 = require("./types");
+/**
+ * takes advantage of /batchPriorityFees endpoint from drift hosted priority fee service
+ */
+class PriorityFeeSubscriberMap {
+    constructor(config) {
+        var _a;
+        this.frequencyMs = config.frequencyMs;
+        this.frequencyMs =
+            (_a = config.frequencyMs) !== null && _a !== void 0 ? _a : types_1.DEFAULT_PRIORITY_FEE_MAP_FREQUENCY_MS;
+        this.driftPriorityFeeEndpoint = config.driftPriorityFeeEndpoint;
+        this.driftMarkets = config.driftMarkets;
+        this.feesMap = new Map();
+        this.feesMap.set('perp', new Map());
+        this.feesMap.set('spot', new Map());
+    }
+    updateFeesMap(driftPriorityFeeResponse) {
+        driftPriorityFeeResponse.forEach((fee) => {
+            this.feesMap.get(fee.marketType).set(fee.marketIndex, fee);
+        });
+    }
+    async subscribe() {
+        if (this.intervalId) {
+            return;
+        }
+        await this.load();
+        this.intervalId = setInterval(this.load.bind(this), this.frequencyMs);
+    }
+    async unsubscribe() {
+        if (this.intervalId) {
+            clearInterval(this.intervalId);
+            this.intervalId = undefined;
+        }
+    }
+    async load() {
+        try {
+            if (!this.driftMarkets) {
+                return;
+            }
+            const fees = await (0, driftPriorityFeeMethod_1.fetchDriftPriorityFee)(this.driftPriorityFeeEndpoint, this.driftMarkets.map((m) => m.marketType), this.driftMarkets.map((m) => m.marketIndex));
+            this.updateFeesMap(fees);
+        }
+        catch (e) {
+            console.error('Error fetching drift priority fees', e);
+        }
+    }
+    updateMarketTypeAndIndex(driftMarkets) {
+        this.driftMarkets = driftMarkets;
+    }
+    getPriorityFees(marketType, marketIndex) {
+        var _a;
+        return (_a = this.feesMap.get(marketType)) === null || _a === void 0 ? void 0 : _a.get(marketIndex);
+    }
+}
+exports.PriorityFeeSubscriberMap = PriorityFeeSubscriberMap;
+/** Example usage:
+async function main() {
+    const driftMarkets: DriftMarketInfo[] = [
+        { marketType: 'perp', marketIndex: 0 },
+        { marketType: 'perp', marketIndex: 1 },
+        { marketType: 'spot', marketIndex: 2 }
+    ];
+
+    const subscriber = new PriorityFeeSubscriberMap({
+        driftPriorityFeeEndpoint: 'https://dlob.drift.trade',
+        frequencyMs: 5000,
+        driftMarkets
+    });
+    await subscriber.subscribe();
+
+    for (let i = 0; i < 20; i++) {
+        await new Promise(resolve => setTimeout(resolve, 1000));
+        driftMarkets.forEach(market => {
+            const fees = subscriber.getPriorityFees(market.marketType, market.marketIndex);
+            console.log(`Priority fees for ${market.marketType} market ${market.marketIndex}:`, fees);
+        });
+    }
+
+
+    await subscriber.unsubscribe();
+}
+
+main().catch(console.error);
+*/

package/lib/priorityFee/types.d.ts

@@ -1,8 +1,8 @@
 import { Connection, PublicKey } from '@solana/web3.js';
 import { SolanaPriorityFeeResponse } from './solanaPriorityFeeMethod';
 import { HeliusPriorityFeeResponse } from './heliusPriorityFeeMethod';
-import { DriftMarketInfo } from './priorityFeeSubscriber';
-import { DriftPriorityFeeResponse } from './driftPriorityFeeMethod';
+import { DriftMarketInfo, DriftPriorityFeeResponse } from './driftPriorityFeeMethod';
+export declare const DEFAULT_PRIORITY_FEE_MAP_FREQUENCY_MS = 10000;
 export interface PriorityFeeStrategy {
     calculate(samples: SolanaPriorityFeeResponse[] | HeliusPriorityFeeResponse | DriftPriorityFeeResponse): number;
 }
@@ -13,7 +13,7 @@ export declare enum PriorityFeeMethod {
 }
 export type PriorityFeeSubscriberConfig = {
     connection?: Connection;
-    frequencyMs: number;
+    frequencyMs?: number;
     addresses?: PublicKey[];
     driftMarkets?: DriftMarketInfo[];
     customStrategy?: PriorityFeeStrategy;
@@ -24,3 +24,8 @@ export type PriorityFeeSubscriberConfig = {
     maxFeeMicroLamports?: number;
     priorityFeeMultiplier?: number;
 };
+export type PriorityFeeSubscriberMapConfig = {
+    frequencyMs?: number;
+    driftMarkets?: DriftMarketInfo[];
+    driftPriorityFeeEndpoint: string;
+};

package/lib/priorityFee/types.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PriorityFeeMethod = void 0;
+exports.PriorityFeeMethod = exports.DEFAULT_PRIORITY_FEE_MAP_FREQUENCY_MS = void 0;
+exports.DEFAULT_PRIORITY_FEE_MAP_FREQUENCY_MS = 10000;
 var PriorityFeeMethod;
 (function (PriorityFeeMethod) {
     PriorityFeeMethod["SOLANA"] = "solana";

package/lib/tx/baseTxSender.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
-import { ConfirmationStrategy, ExtraConfirmationOptions, TxSender, TxSigAndSlot } from './types';
-import { Commitment, ConfirmOptions, RpcResponseAndContext, Signer, SignatureResult, Transaction, TransactionSignature, Connection, VersionedTransaction, TransactionInstruction, AddressLookupTableAccount } from '@solana/web3.js';
+import { ConfirmationStrategy, TxSender, TxSigAndSlot } from './types';
+import { Commitment, ConfirmOptions, RpcResponseAndContext, Signer, SignatureResult, Transaction, TransactionSignature, Connection, VersionedTransaction } from '@solana/web3.js';
+import { TxHandler } from './txHandler';
 import { IWallet } from '../types';
 export declare abstract class BaseTxSender implements TxSender {
     connection: Connection;
@@ -11,7 +12,8 @@ export declare abstract class BaseTxSender implements TxSender {
     timeoutCount: number;
     confirmationStrategy: ConfirmationStrategy;
     additionalTxSenderCallbacks: ((base58EncodedTx: string) => void)[];
-    constructor({ connection, wallet, opts, timeout, additionalConnections, confirmationStrategy, additionalTxSenderCallbacks, }: {
+    txHandler: TxHandler;
+    constructor({ connection, wallet, opts, timeout, additionalConnections, confirmationStrategy, additionalTxSenderCallbacks, txHandler, }: {
         connection: Connection;
         wallet: IWallet;
         opts?: ConfirmOptions;
@@ -19,11 +21,11 @@ export declare abstract class BaseTxSender implements TxSender {
         additionalConnections?: any;
         confirmationStrategy?: ConfirmationStrategy;
         additionalTxSenderCallbacks?: ((base58EncodedTx: string) => void)[];
+        txHandler: TxHandler;
     });
-    send(tx: Transaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean, extraConfirmationOptions?: ExtraConfirmationOptions): Promise<TxSigAndSlot>;
+    send(tx: Transaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean): Promise<TxSigAndSlot>;
     prepareTx(tx: Transaction, additionalSigners: Array<Signer>, opts: ConfirmOptions, preSigned?: boolean): Promise<Transaction>;
-    getVersionedTransaction(ixs: TransactionInstruction[], lookupTableAccounts: AddressLookupTableAccount[], additionalSigners?: Array<Signer>, opts?: ConfirmOptions, blockhash?: string): Promise<VersionedTransaction>;
-    sendVersionedTransaction(tx: VersionedTransaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean, extraConfirmationOptions?: ExtraConfirmationOptions): Promise<TxSigAndSlot>;
+    sendVersionedTransaction(tx: VersionedTransaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean): Promise<TxSigAndSlot>;
     sendRawTransaction(rawTransaction: Buffer | Uint8Array, opts: ConfirmOptions): Promise<TxSigAndSlot>;
     simulateTransaction(tx: VersionedTransaction): Promise<boolean>;
     confirmTransactionWebSocket(signature: TransactionSignature, commitment?: Commitment): Promise<RpcResponseAndContext<SignatureResult>>;

package/lib/tx/baseTxSender.js

@@ -5,13 +5,13 @@ 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 DEFAULT_TIMEOUT = 35000;
+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, }) {
+    constructor({ connection, wallet, opts = anchor_1.AnchorProvider.defaultOptions(), timeout = DEFAULT_TIMEOUT, additionalConnections = new Array(), confirmationStrategy = types_1.ConfirmationStrategy.Combo, additionalTxSenderCallbacks, txHandler, }) {
         this.timeoutCount = 0;
         this.connection = connection;
         this.wallet = wallet;
@@ -20,8 +20,9 @@ class BaseTxSender {
         this.additionalConnections = additionalConnections;
         this.confirmationStrategy = confirmationStrategy;
         this.additionalTxSenderCallbacks = additionalTxSenderCallbacks;
+        this.txHandler = txHandler;
     }
-    async send(tx, additionalSigners, opts, preSigned, extraConfirmationOptions) {
+    async send(tx, additionalSigners, opts, preSigned) {
         if (additionalSigners === undefined) {
             additionalSigners = [];
         }
@@ -29,48 +30,12 @@ class BaseTxSender {
             opts = this.opts;
         }
         const signedTx = await this.prepareTx(tx, additionalSigners, opts, preSigned);
-        if (extraConfirmationOptions === null || extraConfirmationOptions === void 0 ? void 0 : extraConfirmationOptions.onSignedCb) {
-            extraConfirmationOptions.onSignedCb();
-        }
         return this.sendRawTransaction(signedTx.serialize(), opts);
     }
     async prepareTx(tx, additionalSigners, opts, preSigned) {
-        if (preSigned) {
-            return tx;
-        }
-        tx.feePayer = this.wallet.publicKey;
-        tx.recentBlockhash = (await this.connection.getLatestBlockhash(opts.preflightCommitment)).blockhash;
-        additionalSigners
-            .filter((s) => s !== undefined)
-            .forEach((kp) => {
-            tx.partialSign(kp);
-        });
-        const signedTx = await this.wallet.signTransaction(tx);
-        return signedTx;
+        return this.txHandler.prepareTx(tx, additionalSigners, undefined, opts, preSigned);
     }
-    async getVersionedTransaction(ixs, lookupTableAccounts, additionalSigners, opts, blockhash) {
-        if (additionalSigners === undefined) {
-            additionalSigners = [];
-        }
-        if (opts === undefined) {
-            opts = this.opts;
-        }
-        let recentBlockhash = '';
-        if (blockhash) {
-            recentBlockhash = blockhash;
-        }
-        else {
-            recentBlockhash = (await this.connection.getLatestBlockhash(opts.preflightCommitment)).blockhash;
-        }
-        const message = new web3_js_1.TransactionMessage({
-            payerKey: this.wallet.publicKey,
-            recentBlockhash,
-            instructions: ixs,
-        }).compileToV0Message(lookupTableAccounts);
-        const tx = new web3_js_1.VersionedTransaction(message);
-        return tx;
-    }
-    async sendVersionedTransaction(tx, additionalSigners, opts, preSigned, extraConfirmationOptions) {
+    async sendVersionedTransaction(tx, additionalSigners, opts, preSigned) {
         let signedTx;
         if (preSigned) {
             signedTx = tx;
@@ -82,14 +47,7 @@ class BaseTxSender {
             signedTx = tx;
         }
         else {
-            additionalSigners === null || additionalSigners === void 0 ? void 0 : additionalSigners.filter((s) => s !== undefined).forEach((kp) => {
-                tx.sign([kp]);
-            });
-            // @ts-ignore
-            signedTx = await this.wallet.signTransaction(tx);
-        }
-        if (extraConfirmationOptions === null || extraConfirmationOptions === void 0 ? void 0 : extraConfirmationOptions.onSignedCb) {
-            extraConfirmationOptions.onSignedCb();
+            signedTx = await this.txHandler.signVersionedTx(tx, additionalSigners, undefined, this.wallet);
         }
         if (opts === undefined) {
             opts = this.opts;
@@ -181,7 +139,7 @@ class BaseTxSender {
             }
             this.timeoutCount += 1;
             const duration = (Date.now() - start) / 1000;
-            throw new Error(`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.`);
+            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);
         }
         return response;
     }
@@ -203,7 +161,7 @@ class BaseTxSender {
         // Transaction not confirmed within 30 seconds
         this.timeoutCount += 1;
         const duration = (Date.now() - start) / 1000;
-        throw new Error(`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.`);
+        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);
     }
     async confirmTransaction(signature, commitment) {
         if (this.confirmationStrategy === types_1.ConfirmationStrategy.WebSocket ||