@drift-labs/sdk 2.82.0-beta.1 → 2.82.0-beta.11

package/lib/auctionSubscriber/auctionSubscriber.d.ts

@@ -5,10 +5,10 @@ import { EventEmitter } from 'events';
 export declare class AuctionSubscriber {
     private driftClient;
     private opts;
-    private resubTimeoutMs?;
+    private resubOpts?;
     eventEmitter: StrictEventEmitter<EventEmitter, AuctionSubscriberEvents>;
     private subscriber;
-    constructor({ driftClient, opts, resubTimeoutMs }: AuctionSubscriberConfig);
+    constructor({ driftClient, opts, resubTimeoutMs, logResubMessages, }: AuctionSubscriberConfig);
     subscribe(): Promise<void>;
     unsubscribe(): Promise<void>;
 }

package/lib/auctionSubscriber/auctionSubscriber.js

@@ -5,18 +5,18 @@ const memcmp_1 = require("../memcmp");
 const events_1 = require("events");
 const webSocketProgramAccountSubscriber_1 = require("../accounts/webSocketProgramAccountSubscriber");
 class AuctionSubscriber {
-    constructor({ driftClient, opts, resubTimeoutMs }) {
+    constructor({ driftClient, opts, resubTimeoutMs, logResubMessages, }) {
         this.driftClient = driftClient;
         this.opts = opts || this.driftClient.opts;
         this.eventEmitter = new events_1.EventEmitter();
-        this.resubTimeoutMs = resubTimeoutMs;
+        this.resubOpts = { resubTimeoutMs, logResubMessages };
     }
     async subscribe() {
         if (!this.subscriber) {
             this.subscriber = new webSocketProgramAccountSubscriber_1.WebSocketProgramAccountSubscriber('AuctionSubscriber', 'User', this.driftClient.program, this.driftClient.program.account.user.coder.accounts.decode.bind(this.driftClient.program.account.user.coder.accounts), {
                 filters: [(0, memcmp_1.getUserFilter)(), (0, memcmp_1.getUserWithAuctionFilter)()],
                 commitment: this.opts.commitment,
-            }, this.resubTimeoutMs);
+            }, this.resubOpts);
         }
         await this.subscriber.subscribe((accountId, data, context) => {
             this.eventEmitter.emit('onAccountUpdate', data, accountId, context.slot);

package/lib/auctionSubscriber/types.d.ts

@@ -5,6 +5,7 @@ export type AuctionSubscriberConfig = {
     driftClient: DriftClient;
     opts?: ConfirmOptions;
     resubTimeoutMs?: number;
+    logResubMessages?: boolean;
 };
 export interface AuctionSubscriberEvents {
     onAccountUpdate: (account: UserAccount, pubkey: PublicKey, slot: number) => void;

package/lib/constants/perpMarkets.js

@@ -542,9 +542,9 @@ exports.MainnetPerpMarkets = [
         symbol: 'KMNO-PERP',
         baseAssetSymbol: 'KMNO',
         marketIndex: 28,
-        oracle: new web3_js_1.PublicKey('sDAQaZQJQ4RXAxH3x526mbEXyQZT15ktkL84d7hmk7M'),
+        oracle: new web3_js_1.PublicKey('6ynsvjkE2UoiRScbDx7ZxbBsyn7wyvg5P1vENvhtkG1C'),
         launchTs: 1712240681000,
-        oracleSource: __1.OracleSource.Prelaunch,
+        oracleSource: __1.OracleSource.SWITCHBOARD,
     },
     {
         fullName: 'Tensor',

package/lib/driftClient.d.ts

@@ -650,12 +650,23 @@ export declare class DriftClient {
     requestRemoveInsuranceFundStake(marketIndex: number, amount: BN, txParams?: TxParams): Promise<TransactionSignature>;
     cancelRequestRemoveInsuranceFundStake(marketIndex: number, txParams?: TxParams): Promise<TransactionSignature>;
     removeInsuranceFundStake(marketIndex: number, collateralAccountPublicKey: PublicKey, txParams?: TxParams): Promise<TransactionSignature>;
-    settleRevenueToInsuranceFund(marketIndex: number): Promise<TransactionSignature>;
+    settleRevenueToInsuranceFund(spotMarketIndex: number, subAccountId?: number, txParams?: TxParams): Promise<TransactionSignature>;
+    getSettleRevenueToInsuranceFundIx(spotMarketIndex: number, subAccountId?: number): Promise<TransactionInstruction>;
     resolvePerpPnlDeficit(spotMarketIndex: number, perpMarketIndex: number, txParams?: TxParams): Promise<TransactionSignature>;
     getResolvePerpPnlDeficitIx(spotMarketIndex: number, perpMarketIndex: number): Promise<TransactionInstruction>;
     getDepositIntoSpotMarketRevenuePoolIx(marketIndex: number, amount: BN, userTokenAccountPublicKey: PublicKey): Promise<TransactionInstruction>;
     depositIntoSpotMarketRevenuePool(marketIndex: number, amount: BN, userTokenAccountPublicKey: PublicKey): Promise<TransactionSignature>;
     getPerpMarketExtendedInfo(marketIndex: number): PerpMarketExtendedInfo;
+    /**
+     * Calculates taker / maker fee (as a percentage, e.g. .001 = 10 basis points) for particular marketType
+     * @param marketType
+     * @param positionMarketIndex
+     * @returns : {takerFee: number, makerFee: number} Precision None
+     */
+    getMarketFees(marketType: MarketType, marketIndex?: number, user?: User): {
+        takerFee: number;
+        makerFee: number;
+    };
     /**
      * Returns the market index and type for a given market name
      * E.g. "SOL-PERP" -> { marketIndex: 0, marketType: MarketType.PERP }

package/lib/driftClient.js

@@ -70,7 +70,7 @@ class DriftClient {
         this._isSubscribed = val;
     }
     constructor(config) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5;
         this.users = new Map();
         this._isSubscribed = false;
         this.perpMarketLastSlotCache = new Map();
@@ -125,12 +125,14 @@ class DriftClient {
             this.userAccountSubscriptionConfig = {
                 type: 'websocket',
                 resubTimeoutMs: (_p = config.accountSubscription) === null || _p === void 0 ? void 0 : _p.resubTimeoutMs,
-                commitment: (_q = config.accountSubscription) === null || _q === void 0 ? void 0 : _q.commitment,
+                logResubMessages: (_q = config.accountSubscription) === null || _q === void 0 ? void 0 : _q.logResubMessages,
+                commitment: (_r = config.accountSubscription) === null || _r === void 0 ? void 0 : _r.commitment,
             };
             this.userStatsAccountSubscriptionConfig = {
                 type: 'websocket',
-                resubTimeoutMs: (_r = config.accountSubscription) === null || _r === void 0 ? void 0 : _r.resubTimeoutMs,
-                commitment: (_s = config.accountSubscription) === null || _s === void 0 ? void 0 : _s.commitment,
+                resubTimeoutMs: (_s = config.accountSubscription) === null || _s === void 0 ? void 0 : _s.resubTimeoutMs,
+                logResubMessages: (_t = config.accountSubscription) === null || _t === void 0 ? void 0 : _t.logResubMessages,
+                commitment: (_u = config.accountSubscription) === null || _u === void 0 ? void 0 : _u.commitment,
             };
         }
         if (config.userStats) {
@@ -147,11 +149,14 @@ class DriftClient {
         const noMarketsAndOraclesSpecified = config.perpMarketIndexes === undefined &&
             config.spotMarketIndexes === undefined &&
             config.oracleInfos === undefined;
-        if (((_t = config.accountSubscription) === null || _t === void 0 ? void 0 : _t.type) === 'polling') {
-            this.accountSubscriber = new pollingDriftClientAccountSubscriber_1.PollingDriftClientAccountSubscriber(this.program, config.accountSubscription.accountLoader, (_u = config.perpMarketIndexes) !== null && _u !== void 0 ? _u : [], (_v = config.spotMarketIndexes) !== null && _v !== void 0 ? _v : [], (_w = config.oracleInfos) !== null && _w !== void 0 ? _w : [], noMarketsAndOraclesSpecified);
+        if (((_v = config.accountSubscription) === null || _v === void 0 ? void 0 : _v.type) === 'polling') {
+            this.accountSubscriber = new pollingDriftClientAccountSubscriber_1.PollingDriftClientAccountSubscriber(this.program, config.accountSubscription.accountLoader, (_w = config.perpMarketIndexes) !== null && _w !== void 0 ? _w : [], (_x = config.spotMarketIndexes) !== null && _x !== void 0 ? _x : [], (_y = config.oracleInfos) !== null && _y !== void 0 ? _y : [], noMarketsAndOraclesSpecified);
         }
         else {
-            this.accountSubscriber = new webSocketDriftClientAccountSubscriber_1.WebSocketDriftClientAccountSubscriber(this.program, (_x = config.perpMarketIndexes) !== null && _x !== void 0 ? _x : [], (_y = config.spotMarketIndexes) !== null && _y !== void 0 ? _y : [], (_z = config.oracleInfos) !== null && _z !== void 0 ? _z : [], noMarketsAndOraclesSpecified, (_0 = config.accountSubscription) === null || _0 === void 0 ? void 0 : _0.resubTimeoutMs, (_1 = config.accountSubscription) === null || _1 === void 0 ? void 0 : _1.commitment);
+            this.accountSubscriber = new webSocketDriftClientAccountSubscriber_1.WebSocketDriftClientAccountSubscriber(this.program, (_z = config.perpMarketIndexes) !== null && _z !== void 0 ? _z : [], (_0 = config.spotMarketIndexes) !== null && _0 !== void 0 ? _0 : [], (_1 = config.oracleInfos) !== null && _1 !== void 0 ? _1 : [], noMarketsAndOraclesSpecified, {
+                resubTimeoutMs: (_2 = config.accountSubscription) === null || _2 === void 0 ? void 0 : _2.resubTimeoutMs,
+                logResubMessages: (_3 = config.accountSubscription) === null || _3 === void 0 ? void 0 : _3.logResubMessages,
+            }, (_4 = config.accountSubscription) === null || _4 === void 0 ? void 0 : _4.commitment);
         }
         this.eventEmitter = this.accountSubscriber.eventEmitter;
         if (config.enableMetricsEvents) {
@@ -159,7 +164,7 @@ class DriftClient {
             this.metricsEventEmitter = new events_1.EventEmitter();
         }
         this.txSender =
-            (_2 = config.txSender) !== null && _2 !== void 0 ? _2 : new retryTxSender_1.RetryTxSender({
+            (_5 = config.txSender) !== null && _5 !== void 0 ? _5 : new retryTxSender_1.RetryTxSender({
                 connection: this.connection,
                 wallet: this.wallet,
                 opts: this.opts,
@@ -3465,14 +3470,19 @@ class DriftClient {
         const { txSig } = await this.sendTransaction(tx, additionalSigners, this.opts);
         return txSig;
     }
-    async settleRevenueToInsuranceFund(marketIndex) {
-        const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
+    async settleRevenueToInsuranceFund(spotMarketIndex, subAccountId, txParams) {
+        const tx = await this.buildTransaction(await this.getSettleRevenueToInsuranceFundIx(spotMarketIndex, subAccountId), txParams);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
+    }
+    async getSettleRevenueToInsuranceFundIx(spotMarketIndex, subAccountId) {
+        const spotMarketAccount = this.getSpotMarketAccount(spotMarketIndex);
         const remainingAccounts = this.getRemainingAccounts({
-            userAccounts: [this.getUserAccount()],
+            userAccounts: [this.getUserAccount(subAccountId)],
             useMarketLastSlotCache: true,
-            writableSpotMarketIndexes: [marketIndex],
+            writableSpotMarketIndexes: [spotMarketIndex],
         });
-        const ix = await this.program.instruction.settleRevenueToInsuranceFund(marketIndex, {
+        const ix = await this.program.instruction.settleRevenueToInsuranceFund(spotMarketIndex, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 spotMarket: spotMarketAccount.pubkey,
@@ -3483,9 +3493,7 @@ class DriftClient {
             },
             remainingAccounts,
         });
-        const tx = await this.buildTransaction(ix);
-        const { txSig } = await this.sendTransaction(tx, [], this.opts);
-        return txSig;
+        return ix;
     }
     async resolvePerpPnlDeficit(spotMarketIndex, perpMarketIndex, txParams) {
         const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getResolvePerpPnlDeficitIx(spotMarketIndex, perpMarketIndex), txParams), [], this.opts);
@@ -3545,6 +3553,41 @@ class DriftClient {
         };
         return extendedInfo;
     }
+    /**
+     * Calculates taker / maker fee (as a percentage, e.g. .001 = 10 basis points) for particular marketType
+     * @param marketType
+     * @param positionMarketIndex
+     * @returns : {takerFee: number, makerFee: number} Precision None
+     */
+    getMarketFees(marketType, marketIndex, user) {
+        let feeTier;
+        if (user) {
+            feeTier = user.getUserFeeTier(marketType);
+        }
+        else {
+            const state = this.getStateAccount();
+            feeTier = (0, types_1.isVariant)(marketType, 'perp')
+                ? state.perpFeeStructure.feeTiers[0]
+                : state.spotFeeStructure.feeTiers[0];
+        }
+        let takerFee = feeTier.feeNumerator / feeTier.feeDenominator;
+        let makerFee = feeTier.makerRebateNumerator / feeTier.makerRebateDenominator;
+        if (marketIndex !== undefined) {
+            let marketAccount = null;
+            if ((0, types_1.isVariant)(marketType, 'perp')) {
+                marketAccount = this.getPerpMarketAccount(marketIndex);
+            }
+            else {
+                marketAccount = this.getSpotMarketAccount(marketIndex);
+            }
+            takerFee += (takerFee * marketAccount.feeAdjustment) / 100;
+            makerFee += (makerFee * marketAccount.feeAdjustment) / 100;
+        }
+        return {
+            takerFee,
+            makerFee,
+        };
+    }
     /**
      * Returns the market index and type for a given market name
      * E.g. "SOL-PERP" -> { marketIndex: 0, marketType: MarketType.PERP }

package/lib/driftClientConfig.d.ts

@@ -30,6 +30,7 @@ export type DriftClientConfig = {
 export type DriftClientSubscriptionConfig = {
     type: 'websocket';
     resubTimeoutMs?: number;
+    logResubMessages?: boolean;
     commitment?: Commitment;
 } | {
     type: 'polling';

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

@@ -10,6 +10,7 @@ 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, }) {
         this.timeoutCount = 0;
@@ -181,7 +182,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 +204,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 ||

package/lib/tx/types.d.ts

@@ -22,3 +22,8 @@ export interface TxSender {
     simulateTransaction(tx: VersionedTransaction): Promise<boolean>;
     getTimeoutCount(): number;
 }
+export declare class TxSendError extends Error {
+    message: string;
+    code: number;
+    constructor(message: string, code: number);
+}