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

package/VERSION

@@ -1 +1 @@
-2.86.0-beta.2
+2.86.0-beta.21

package/lib/accounts/pollingDriftClientAccountSubscriber.js

@@ -47,7 +47,7 @@ class PollingDriftClientAccountSubscriber {
             this.oracleInfos = oracleInfos;
         }
         await this.updateAccountsToPoll();
-        await this.updateOraclesToPoll();
+        this.updateOraclesToPoll();
         await this.addToAccountLoader();
         let subscriptionSucceeded = false;
         let retries = 0;
@@ -59,8 +59,7 @@ class PollingDriftClientAccountSubscriber {
         if (subscriptionSucceeded) {
             this.eventEmitter.emit('update');
         }
-        await this.setPerpOracleMap();
-        await this.setSpotOracleMap();
+        await Promise.all([this.setPerpOracleMap(), this.setSpotOracleMap()]);
         this.isSubscribing = false;
         this.isSubscribed = subscriptionSucceeded;
         this.subscriptionPromiseResolver(subscriptionSucceeded);
@@ -76,13 +75,15 @@ class PollingDriftClientAccountSubscriber {
             publicKey: statePublicKey,
             eventType: 'stateAccountUpdate',
         });
-        await this.updatePerpMarketAccountsToPoll();
-        await this.updateSpotMarketAccountsToPoll();
+        await Promise.all([
+            this.updatePerpMarketAccountsToPoll(),
+            this.updateSpotMarketAccountsToPoll(),
+        ]);
     }
     async updatePerpMarketAccountsToPoll() {
-        for (const marketIndex of this.perpMarketIndexes) {
-            await this.addPerpMarketAccountToPoll(marketIndex);
-        }
+        await Promise.all(this.perpMarketIndexes.map((marketIndex) => {
+            return this.addPerpMarketAccountToPoll(marketIndex);
+        }));
         return true;
     }
     async addPerpMarketAccountToPoll(marketIndex) {
@@ -96,9 +97,9 @@ class PollingDriftClientAccountSubscriber {
         return true;
     }
     async updateSpotMarketAccountsToPoll() {
-        for (const marketIndex of this.spotMarketIndexes) {
+        await Promise.all(this.spotMarketIndexes.map(async (marketIndex) => {
             await this.addSpotMarketAccountToPoll(marketIndex);
-        }
+        }));
         return true;
     }
     async addSpotMarketAccountToPoll(marketIndex) {
@@ -127,12 +128,15 @@ class PollingDriftClientAccountSubscriber {
         return true;
     }
     async addToAccountLoader() {
+        const accountPromises = [];
         for (const [_, accountToPoll] of this.accountsToPoll) {
-            await this.addAccountToAccountLoader(accountToPoll);
+            accountPromises.push(this.addAccountToAccountLoader(accountToPoll));
         }
+        const oraclePromises = [];
         for (const [_, oracleToPoll] of this.oraclesToPoll) {
-            await this.addOracleToAccountLoader(oracleToPoll);
+            oraclePromises.push(this.addOracleToAccountLoader(oracleToPoll));
         }
+        await Promise.all([...accountPromises, ...oraclePromises]);
         this.errorCallbackId = this.accountLoader.addErrorCallbacks((error) => {
             this.eventEmitter.emit('error', error);
         });
@@ -284,33 +288,37 @@ class PollingDriftClientAccountSubscriber {
     }
     async setPerpOracleMap() {
         const perpMarkets = this.getMarketAccountsAndSlots();
+        const oraclePromises = [];
         for (const perpMarket of perpMarkets) {
             const perpMarketAccount = perpMarket.data;
             const perpMarketIndex = perpMarketAccount.marketIndex;
             const oracle = perpMarketAccount.amm.oracle;
             if (!this.oracles.has(oracle.toBase58())) {
-                await this.addOracle({
+                oraclePromises.push(this.addOracle({
                     publicKey: oracle,
                     source: perpMarketAccount.amm.oracleSource,
-                });
+                }));
             }
             this.perpOracleMap.set(perpMarketIndex, oracle);
         }
+        await Promise.all(oraclePromises);
     }
     async setSpotOracleMap() {
         const spotMarkets = this.getSpotMarketAccountsAndSlots();
+        const oraclePromises = [];
         for (const spotMarket of spotMarkets) {
             const spotMarketAccount = spotMarket.data;
             const spotMarketIndex = spotMarketAccount.marketIndex;
             const oracle = spotMarketAccount.oracle;
             if (!this.oracles.has(oracle.toBase58())) {
-                await this.addOracle({
+                oraclePromises.push(this.addOracle({
                     publicKey: oracle,
                     source: spotMarketAccount.oracleSource,
-                });
+                }));
             }
             this.spotOracleMap.set(spotMarketIndex, oracle);
         }
+        await Promise.all(oraclePromises);
     }
     assertIsSubscribed() {
         if (!this.isSubscribed) {

package/lib/accounts/webSocketDriftClientAccountSubscriber.js

@@ -52,24 +52,23 @@ class WebSocketDriftClientAccountSubscriber {
             this.eventEmitter.emit('stateAccountUpdate', data);
             this.eventEmitter.emit('update');
         });
-        // subscribe to market accounts
-        await this.subscribeToPerpMarketAccounts();
-        // subscribe to spot market accounts
-        await this.subscribeToSpotMarketAccounts();
-        // subscribe to oracles
-        await this.subscribeToOracles();
+        await Promise.all([
+            // subscribe to market accounts
+            this.subscribeToPerpMarketAccounts(),
+            // subscribe to spot market accounts
+            this.subscribeToSpotMarketAccounts(),
+            // subscribe to oracles
+            this.subscribeToOracles(),
+        ]);
         this.eventEmitter.emit('update');
-        await this.setPerpOracleMap();
-        await this.setSpotOracleMap();
+        await Promise.all([this.setPerpOracleMap(), this.setSpotOracleMap()]);
         this.isSubscribing = false;
         this.isSubscribed = true;
         this.subscriptionPromiseResolver(true);
         return true;
     }
     async subscribeToPerpMarketAccounts() {
-        for (const marketIndex of this.perpMarketIndexes) {
-            await this.subscribeToPerpMarketAccount(marketIndex);
-        }
+        await Promise.all(this.perpMarketIndexes.map((marketIndex) => this.subscribeToPerpMarketAccount(marketIndex)));
         return true;
     }
     async subscribeToPerpMarketAccount(marketIndex) {
@@ -83,9 +82,7 @@ class WebSocketDriftClientAccountSubscriber {
         return true;
     }
     async subscribeToSpotMarketAccounts() {
-        for (const marketIndex of this.spotMarketIndexes) {
-            await this.subscribeToSpotMarketAccount(marketIndex);
-        }
+        await Promise.all(this.spotMarketIndexes.map((marketIndex) => this.subscribeToSpotMarketAccount(marketIndex)));
         return true;
     }
     async subscribeToSpotMarketAccount(marketIndex) {
@@ -99,11 +96,9 @@ class WebSocketDriftClientAccountSubscriber {
         return true;
     }
     async subscribeToOracles() {
-        for (const oracleInfo of this.oracleInfos) {
-            if (!oracleInfo.publicKey.equals(web3_js_1.PublicKey.default)) {
-                await this.subscribeToOracle(oracleInfo);
-            }
-        }
+        await Promise.all(this.oracleInfos
+            .filter((oracleInfo) => !oracleInfo.publicKey.equals(web3_js_1.PublicKey.default))
+            .map((oracleInfo) => this.subscribeToOracle(oracleInfo)));
         return true;
     }
     async subscribeToOracle(oracleInfo) {
@@ -119,19 +114,13 @@ class WebSocketDriftClientAccountSubscriber {
         return true;
     }
     async unsubscribeFromMarketAccounts() {
-        for (const accountSubscriber of this.perpMarketAccountSubscribers.values()) {
-            await accountSubscriber.unsubscribe();
-        }
+        await Promise.all(Array.from(this.perpMarketAccountSubscribers.values()).map((accountSubscriber) => accountSubscriber.unsubscribe()));
     }
     async unsubscribeFromSpotMarketAccounts() {
-        for (const accountSubscriber of this.spotMarketAccountSubscribers.values()) {
-            await accountSubscriber.unsubscribe();
-        }
+        await Promise.all(Array.from(this.spotMarketAccountSubscribers.values()).map((accountSubscriber) => accountSubscriber.unsubscribe()));
     }
     async unsubscribeFromOracles() {
-        for (const accountSubscriber of this.oracleSubscribers.values()) {
-            await accountSubscriber.unsubscribe();
-        }
+        await Promise.all(Array.from(this.oracleSubscribers.values()).map((accountSubscriber) => accountSubscriber.unsubscribe()));
     }
     async fetch() {
         if (!this.isSubscribed) {
@@ -179,6 +168,7 @@ class WebSocketDriftClientAccountSubscriber {
     }
     async setPerpOracleMap() {
         const perpMarkets = this.getMarketAccountsAndSlots();
+        const addOraclePromises = [];
         for (const perpMarket of perpMarkets) {
             if (!perpMarket) {
                 continue;
@@ -187,16 +177,18 @@ class WebSocketDriftClientAccountSubscriber {
             const perpMarketIndex = perpMarketAccount.marketIndex;
             const oracle = perpMarketAccount.amm.oracle;
             if (!this.oracleSubscribers.has(oracle.toBase58())) {
-                await this.addOracle({
+                addOraclePromises.push(this.addOracle({
                     publicKey: oracle,
                     source: perpMarket.data.amm.oracleSource,
-                });
+                }));
             }
             this.perpOracleMap.set(perpMarketIndex, oracle);
         }
+        await Promise.all(addOraclePromises);
     }
     async setSpotOracleMap() {
         const spotMarkets = this.getSpotMarketAccountsAndSlots();
+        const addOraclePromises = [];
         for (const spotMarket of spotMarkets) {
             if (!spotMarket) {
                 continue;
@@ -205,13 +197,14 @@ class WebSocketDriftClientAccountSubscriber {
             const spotMarketIndex = spotMarketAccount.marketIndex;
             const oracle = spotMarketAccount.oracle;
             if (!this.oracleSubscribers.has(oracle.toBase58())) {
-                await this.addOracle({
+                addOraclePromises.push(this.addOracle({
                     publicKey: oracle,
                     source: spotMarketAccount.oracleSource,
-                });
+                }));
             }
             this.spotOracleMap.set(spotMarketIndex, oracle);
         }
+        await Promise.all(addOraclePromises);
     }
     assertIsSubscribed() {
         if (!this.isSubscribed) {

package/lib/adminClient.d.ts

@@ -179,6 +179,12 @@ export declare class AdminClient extends DriftClient {
     getUpdatePrelaunchOracleParamsIx(perpMarketIndex: number, price?: BN, maxPrice?: BN): Promise<TransactionInstruction>;
     deletePrelaunchOracle(perpMarketIndex: number): Promise<TransactionSignature>;
     getDeletePrelaunchOracleIx(perpMarketIndex: number, price?: BN, maxPrice?: BN): Promise<TransactionInstruction>;
+    updateSpotMarketFuel(spotMarketIndex: number, fuelBoostDeposits?: number, fuelBoostBorrows?: number, fuelBoostTaker?: number, fuelBoostMaker?: number, fuelBoostInsurance?: number): Promise<TransactionSignature>;
+    getUpdateSpotMarketFuelIx(spotMarketIndex: number, fuelBoostDeposits?: number, fuelBoostBorrows?: number, fuelBoostTaker?: number, fuelBoostMaker?: number, fuelBoostInsurance?: number): Promise<TransactionInstruction>;
+    updatePerpMarketFuel(perpMarketIndex: number, fuelBoostTaker?: number, fuelBoostMaker?: number, fuelBoostPosition?: number): Promise<TransactionSignature>;
+    getUpdatePerpMarketFuelIx(perpMarketIndex: number, fuelBoostTaker?: number, fuelBoostMaker?: number, fuelBoostPosition?: number): Promise<TransactionInstruction>;
+    initUserFuel(user: PublicKey, authority: PublicKey, fuelBonusDeposits?: number, fuelBonusBorrows?: number, fuelBonusTaker?: number, fuelBonusMaker?: number, fuelBonusInsurance?: number): Promise<TransactionSignature>;
+    getInitUserFuelIx(user: PublicKey, authority: PublicKey, fuelBonusDeposits?: number, fuelBonusBorrows?: number, fuelBonusTaker?: number, fuelBonusMaker?: number, fuelBonusInsurance?: number): Promise<TransactionInstruction>;
     initializePythPullOracle(feedId: string): Promise<TransactionSignature>;
     getInitializePythPullOracleIx(feedId: string): Promise<TransactionInstruction>;
 }

package/lib/adminClient.js

@@ -1631,6 +1631,61 @@ class AdminClient extends driftClient_1.DriftClient {
             },
         });
     }
+    async updateSpotMarketFuel(spotMarketIndex, fuelBoostDeposits, fuelBoostBorrows, fuelBoostTaker, fuelBoostMaker, fuelBoostInsurance) {
+        const updateSpotMarketFuelIx = await this.getUpdateSpotMarketFuelIx(spotMarketIndex, fuelBoostDeposits || null, fuelBoostBorrows || null, fuelBoostTaker || null, fuelBoostMaker || null, fuelBoostInsurance || null);
+        const tx = await this.buildTransaction(updateSpotMarketFuelIx);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
+    }
+    async getUpdateSpotMarketFuelIx(spotMarketIndex, fuelBoostDeposits, fuelBoostBorrows, fuelBoostTaker, fuelBoostMaker, fuelBoostInsurance) {
+        const spotMarketPublicKey = await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex);
+        return await this.program.instruction.updateSpotMarketFuel(fuelBoostDeposits || null, fuelBoostBorrows || null, fuelBoostTaker || null, fuelBoostMaker || null, fuelBoostInsurance || null, {
+            accounts: {
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+                spotMarket: spotMarketPublicKey,
+            },
+        });
+    }
+    async updatePerpMarketFuel(perpMarketIndex, fuelBoostTaker, fuelBoostMaker, fuelBoostPosition) {
+        const updatePerpMarketFuelIx = await this.getUpdatePerpMarketFuelIx(perpMarketIndex, fuelBoostTaker || null, fuelBoostMaker || null, fuelBoostPosition || null);
+        const tx = await this.buildTransaction(updatePerpMarketFuelIx);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
+    }
+    async getUpdatePerpMarketFuelIx(perpMarketIndex, fuelBoostTaker, fuelBoostMaker, fuelBoostPosition) {
+        const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex);
+        return await this.program.instruction.updatePerpMarketFuel(fuelBoostTaker || null, fuelBoostMaker || null, fuelBoostPosition || null, {
+            accounts: {
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+                perpMarket: perpMarketPublicKey,
+            },
+        });
+    }
+    async initUserFuel(user, authority, fuelBonusDeposits, fuelBonusBorrows, fuelBonusTaker, fuelBonusMaker, fuelBonusInsurance) {
+        const updatePerpMarketFuelIx = await this.getInitUserFuelIx(user, authority, fuelBonusDeposits, fuelBonusBorrows, fuelBonusTaker, fuelBonusMaker, fuelBonusInsurance);
+        const tx = await this.buildTransaction(updatePerpMarketFuelIx);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
+    }
+    async getInitUserFuelIx(user, authority, fuelBonusDeposits, fuelBonusBorrows, fuelBonusTaker, fuelBonusMaker, fuelBonusInsurance) {
+        const userStats = await (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, authority);
+        return await this.program.instruction.initUserFuel(fuelBonusDeposits || null, fuelBonusBorrows || null, fuelBonusTaker || null, fuelBonusMaker || null, fuelBonusInsurance || null, {
+            accounts: {
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+                user,
+                userStats,
+            },
+        });
+    }
     async initializePythPullOracle(feedId) {
         const initializePythPullOracleIx = await this.getInitializePythPullOracleIx(feedId);
         const tx = await this.buildTransaction(initializePythPullOracleIx);

package/lib/bankrun/bankrunConnection.d.ts

@@ -26,6 +26,7 @@ export declare class BankrunContextWrapper {
     getLatestBlockhash(): Promise<Blockhash>;
     printTxLogs(signature: string): void;
     moveTimeForward(increment: number): Promise<void>;
+    setTimestamp(unix_timestamp: number): Promise<void>;
 }
 export declare class BankrunConnection {
     private readonly _banksClient;

package/lib/bankrun/bankrunConnection.js

@@ -53,6 +53,12 @@ class BankrunContextWrapper {
         const newClock = new solana_bankrun_1.Clock(currentClock.slot, currentClock.epochStartTimestamp, currentClock.epoch, currentClock.leaderScheduleEpoch, newUnixTimestamp);
         await this.context.setClock(newClock);
     }
+    async setTimestamp(unix_timestamp) {
+        const currentClock = await this.context.banksClient.getClock();
+        const newUnixTimestamp = BigInt(unix_timestamp);
+        const newClock = new solana_bankrun_1.Clock(currentClock.slot, currentClock.epochStartTimestamp, currentClock.epoch, currentClock.leaderScheduleEpoch, newUnixTimestamp);
+        await this.context.setClock(newClock);
+    }
 }
 exports.BankrunContextWrapper = BankrunContextWrapper;
 class BankrunConnection {

package/lib/constants/numericConstants.d.ts

@@ -57,6 +57,7 @@ export declare const FIVE_MINUTE: BN;
 export declare const ONE_HOUR: BN;
 export declare const ONE_YEAR: BN;
 export declare const QUOTE_SPOT_MARKET_INDEX = 0;
+export declare const GOV_SPOT_MARKET_INDEX = 15;
 export declare const LAMPORTS_PRECISION: BN;
 export declare const LAMPORTS_EXP: BN;
 export declare const OPEN_ORDER_MARGIN_REQUIREMENT: BN;
@@ -65,3 +66,5 @@ export declare const ACCOUNT_AGE_DELETION_CUTOFF_SECONDS: number;
 export declare const IDLE_TIME_SLOTS = 9000;
 export declare const SLOT_TIME_ESTIMATE_MS = 400;
 export declare const DUST_POSITION_SIZE: BN;
+export declare const FUEL_WINDOW: BN;
+export declare const FUEL_START_TS: BN;

package/lib/constants/numericConstants.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MARGIN_PRECISION = exports.AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO = exports.PRICE_TO_QUOTE_PRECISION = exports.PRICE_DIV_PEG = exports.AMM_TO_QUOTE_PRECISION_RATIO = exports.BASE_PRECISION_EXP = exports.BASE_PRECISION = exports.AMM_RESERVE_PRECISION = exports.PEG_PRECISION = exports.FUNDING_RATE_BUFFER_PRECISION = exports.FUNDING_RATE_PRECISION = exports.PRICE_PRECISION = exports.QUOTE_PRECISION = exports.LIQUIDATION_FEE_PRECISION = exports.SPOT_MARKET_IMF_PRECISION = exports.SPOT_MARKET_IMF_PRECISION_EXP = exports.SPOT_MARKET_BALANCE_PRECISION = exports.SPOT_MARKET_BALANCE_PRECISION_EXP = exports.SPOT_MARKET_WEIGHT_PRECISION = exports.SPOT_MARKET_UTILIZATION_PRECISION = exports.SPOT_MARKET_UTILIZATION_PRECISION_EXP = exports.SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION = exports.SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION_EXP = exports.SPOT_MARKET_RATE_PRECISION = exports.SPOT_MARKET_RATE_PRECISION_EXP = exports.AMM_RESERVE_PRECISION_EXP = exports.PEG_PRECISION_EXP = exports.FUNDING_RATE_PRECISION_EXP = exports.PRICE_PRECISION_EXP = exports.FUNDING_RATE_BUFFER_PRECISION_EXP = exports.QUOTE_PRECISION_EXP = exports.CONCENTRATION_PRECISION = exports.PERCENTAGE_PRECISION = exports.PERCENTAGE_PRECISION_EXP = exports.MAX_LEVERAGE_ORDER_SIZE = exports.MAX_LEVERAGE = exports.TEN_MILLION = exports.BN_MAX = exports.TEN_THOUSAND = exports.TEN = exports.NINE = exports.EIGHT = exports.SEVEN = exports.SIX = exports.FIVE = exports.FOUR = exports.THREE = exports.TWO = exports.ONE = exports.ZERO = void 0;
-exports.DUST_POSITION_SIZE = exports.SLOT_TIME_ESTIMATE_MS = exports.IDLE_TIME_SLOTS = exports.ACCOUNT_AGE_DELETION_CUTOFF_SECONDS = exports.DEFAULT_REVENUE_SINCE_LAST_FUNDING_SPREAD_RETREAT = exports.OPEN_ORDER_MARGIN_REQUIREMENT = exports.LAMPORTS_EXP = exports.LAMPORTS_PRECISION = exports.QUOTE_SPOT_MARKET_INDEX = exports.ONE_YEAR = exports.ONE_HOUR = exports.FIVE_MINUTE = exports.FUNDING_RATE_OFFSET_DENOMINATOR = exports.LIQUIDATION_PCT_PRECISION = exports.BID_ASK_SPREAD_PRECISION = void 0;
+exports.FUEL_START_TS = exports.FUEL_WINDOW = exports.DUST_POSITION_SIZE = exports.SLOT_TIME_ESTIMATE_MS = exports.IDLE_TIME_SLOTS = exports.ACCOUNT_AGE_DELETION_CUTOFF_SECONDS = exports.DEFAULT_REVENUE_SINCE_LAST_FUNDING_SPREAD_RETREAT = exports.OPEN_ORDER_MARGIN_REQUIREMENT = exports.LAMPORTS_EXP = exports.LAMPORTS_PRECISION = exports.GOV_SPOT_MARKET_INDEX = exports.QUOTE_SPOT_MARKET_INDEX = exports.ONE_YEAR = exports.ONE_HOUR = exports.FIVE_MINUTE = exports.FUNDING_RATE_OFFSET_DENOMINATOR = exports.LIQUIDATION_PCT_PRECISION = exports.BID_ASK_SPREAD_PRECISION = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const __1 = require("../");
 exports.ZERO = new __1.BN(0);
@@ -61,6 +61,7 @@ exports.FIVE_MINUTE = new __1.BN(60 * 5);
 exports.ONE_HOUR = new __1.BN(60 * 60);
 exports.ONE_YEAR = new __1.BN(31536000);
 exports.QUOTE_SPOT_MARKET_INDEX = 0;
+exports.GOV_SPOT_MARKET_INDEX = 15;
 exports.LAMPORTS_PRECISION = new __1.BN(web3_js_1.LAMPORTS_PER_SOL);
 exports.LAMPORTS_EXP = new __1.BN(Math.log10(web3_js_1.LAMPORTS_PER_SOL));
 exports.OPEN_ORDER_MARGIN_REQUIREMENT = exports.QUOTE_PRECISION.div(new __1.BN(100));
@@ -69,3 +70,5 @@ exports.ACCOUNT_AGE_DELETION_CUTOFF_SECONDS = 60 * 60 * 24 * 13; // 13 days
 exports.IDLE_TIME_SLOTS = 9000;
 exports.SLOT_TIME_ESTIMATE_MS = 400;
 exports.DUST_POSITION_SIZE = exports.QUOTE_PRECISION.divn(100); // Dust position is any position smaller than 1c
+exports.FUEL_WINDOW = new __1.BN(60 * 60 * 24 * 28); // 28 days
+exports.FUEL_START_TS = new __1.BN(1722384000); // unix timestamp