@drift-labs/sdk 2.86.0-beta.4 → 2.86.0-beta.6

package/VERSION

@@ -1 +1 @@
-2.86.0-beta.4
+2.86.0-beta.6

package/lib/adminClient.d.ts

@@ -179,6 +179,10 @@ 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): Promise<TransactionSignature>;
+    getUpdateSpotMarketFuelIx(spotMarketIndex: number, fuelBoostDeposits?: number, fuelBoostBorrows?: number, fuelBoostTaker?: number, fuelBoostMaker?: 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>;
     initializePythPullOracle(feedId: string): Promise<TransactionSignature>;
     getInitializePythPullOracleIx(feedId: string): Promise<TransactionInstruction>;
 }

package/lib/adminClient.js

@@ -1631,6 +1631,42 @@ class AdminClient extends driftClient_1.DriftClient {
             },
         });
     }
+    async updateSpotMarketFuel(spotMarketIndex, fuelBoostDeposits, fuelBoostBorrows, fuelBoostTaker, fuelBoostMaker) {
+        const updateSpotMarketFuelIx = await this.getUpdateSpotMarketFuelIx(spotMarketIndex, fuelBoostDeposits || null, fuelBoostBorrows || null, fuelBoostTaker || null, fuelBoostMaker || null);
+        const tx = await this.buildTransaction(updateSpotMarketFuelIx);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
+    }
+    async getUpdateSpotMarketFuelIx(spotMarketIndex, fuelBoostDeposits, fuelBoostBorrows, fuelBoostTaker, fuelBoostMaker) {
+        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, {
+            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 initializePythPullOracle(feedId) {
         const initializePythPullOracleIx = await this.getInitializePythPullOracleIx(feedId);
         const tx = await this.buildTransaction(initializePythPullOracleIx);

package/lib/constants/numericConstants.d.ts

@@ -65,3 +65,4 @@ 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;

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_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.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);
@@ -69,3 +69,4 @@ 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

package/lib/constants/spotMarkets.js

@@ -271,13 +271,13 @@ exports.MainnetSpotMarkets = [
     {
         symbol: 'POPCAT',
         marketIndex: 20,
-        oracle: new web3_js_1.PublicKey('2stQe1XLGkuTZ22gQrgZKsb93iG9mWXSLfANMPRjs5Ky'),
+        oracle: new web3_js_1.PublicKey('3GjpjC8TWsPqjyFSiR7saGxgzD8zqYJNsBnWpenZPEBy'),
         oracleSource: __1.OracleSource.SWITCHBOARD,
         mint: new web3_js_1.PublicKey('7GCihgDB8fe6KNjn2MYtkzZcRjQy3t9GHdC8uHYmW2hr'),
         precision: new __1.BN(10).pow(numericConstants_1.NINE),
         precisionExp: numericConstants_1.NINE,
         launchTs: 1720013054000,
-        phoenixMarket: new web3_js_1.PublicKey('3GjpjC8TWsPqjyFSiR7saGxgzD8zqYJNsBnWpenZPEBy'),
+        phoenixMarket: new web3_js_1.PublicKey('31XgvAQ1HgFQEk31KdszbPkVXKaQqB1bgYZPoDrFpSR2'),
     },
 ];
 exports.SpotMarkets = {

package/lib/idl/drift.json

@@ -2244,6 +2244,42 @@
             ],
             "args": []
         },
+        {
+            "name": "updateUserGovTokenInsuranceStake",
+            "accounts": [
+                {
+                    "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "spotMarket",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "insuranceFundStake",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "userStats",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "authority",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "insuranceFundVault",
+                    "isMut": true,
+                    "isSigner": false
+                }
+            ],
+            "args": []
+        },
         {
             "name": "initializeInsuranceFundStake",
             "accounts": [
@@ -5079,6 +5115,92 @@
                 }
             ]
         },
+        {
+            "name": "updatePerpMarketFuel",
+            "accounts": [
+                {
+                    "name": "admin",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "perpMarket",
+                    "isMut": true,
+                    "isSigner": false
+                }
+            ],
+            "args": [
+                {
+                    "name": "fuelBoostTaker",
+                    "type": {
+                        "option": "u8"
+                    }
+                },
+                {
+                    "name": "fuelBoostMaker",
+                    "type": {
+                        "option": "u8"
+                    }
+                },
+                {
+                    "name": "fuelBoostPosition",
+                    "type": {
+                        "option": "u8"
+                    }
+                }
+            ]
+        },
+        {
+            "name": "updateSpotMarketFuel",
+            "accounts": [
+                {
+                    "name": "admin",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "spotMarket",
+                    "isMut": true,
+                    "isSigner": false
+                }
+            ],
+            "args": [
+                {
+                    "name": "fuelBoostDeposits",
+                    "type": {
+                        "option": "u8"
+                    }
+                },
+                {
+                    "name": "fuelBoostBorrows",
+                    "type": {
+                        "option": "u8"
+                    }
+                },
+                {
+                    "name": "fuelBoostTaker",
+                    "type": {
+                        "option": "u8"
+                    }
+                },
+                {
+                    "name": "fuelBoostMaker",
+                    "type": {
+                        "option": "u8"
+                    }
+                }
+            ]
+        },
         {
             "name": "updateAdmin",
             "accounts": [
@@ -5918,12 +6040,36 @@
                         ],
                         "type": "i16"
                     },
+                    {
+                        "name": "fuelBoostPosition",
+                        "docs": [
+                            "fuel multiplier for perp funding",
+                            "precision: 10"
+                        ],
+                        "type": "u8"
+                    },
+                    {
+                        "name": "fuelBoostTaker",
+                        "docs": [
+                            "fuel multiplier for perp taker",
+                            "precision: 10"
+                        ],
+                        "type": "u8"
+                    },
+                    {
+                        "name": "fuelBoostMaker",
+                        "docs": [
+                            "fuel multiplier for perp maker",
+                            "precision: 10"
+                        ],
+                        "type": "u8"
+                    },
                     {
                         "name": "padding",
                         "type": {
                             "array": [
                                 "u8",
-                                46
+                                43
                             ]
                         }
                     }
@@ -6376,12 +6522,44 @@
                         ],
                         "type": "u8"
                     },
+                    {
+                        "name": "fuelBoostDeposits",
+                        "docs": [
+                            "fuel multiplier for spot deposits",
+                            "precision: 10"
+                        ],
+                        "type": "u8"
+                    },
+                    {
+                        "name": "fuelBoostBorrows",
+                        "docs": [
+                            "fuel multiplier for spot borrows",
+                            "precision: 10"
+                        ],
+                        "type": "u8"
+                    },
+                    {
+                        "name": "fuelBoostTaker",
+                        "docs": [
+                            "fuel multiplier for spot taker",
+                            "precision: 10"
+                        ],
+                        "type": "u8"
+                    },
+                    {
+                        "name": "fuelBoostMaker",
+                        "docs": [
+                            "fuel multiplier for spot maker",
+                            "precision: 10"
+                        ],
+                        "type": "u8"
+                    },
                     {
                         "name": "padding",
                         "type": {
                             "array": [
                                 "u8",
-                                47
+                                43
                             ]
                         }
                     }
@@ -6729,12 +6907,25 @@
                         ],
                         "type": "bool"
                     },
+                    {
+                        "name": "padding1",
+                        "type": {
+                            "array": [
+                                "u8",
+                                5
+                            ]
+                        }
+                    },
+                    {
+                        "name": "lastFuelBonusUpdateTs",
+                        "type": "i64"
+                    },
                     {
                         "name": "padding",
                         "type": {
                             "array": [
                                 "u8",
-                                21
+                                8
                             ]
                         }
                     }
@@ -6855,12 +7046,63 @@
                         "name": "disableUpdatePerpBidAskTwap",
                         "type": "bool"
                     },
+                    {
+                        "name": "padding1",
+                        "type": {
+                            "array": [
+                                "u8",
+                                6
+                            ]
+                        }
+                    },
+                    {
+                        "name": "fuelDeposits",
+                        "docs": [
+                            "sub account id for spot deposit, borrow fuel tracking"
+                        ],
+                        "type": "u32"
+                    },
+                    {
+                        "name": "fuelBorrows",
+                        "docs": [
+                            "accumulate fuel bonus for epoch"
+                        ],
+                        "type": "u32"
+                    },
+                    {
+                        "name": "fuelPositions",
+                        "docs": [
+                            "accumulated fuel for perp open interest"
+                        ],
+                        "type": "u32"
+                    },
+                    {
+                        "name": "fuelTaker",
+                        "docs": [
+                            "accumulate fuel bonus for epoch"
+                        ],
+                        "type": "u32"
+                    },
+                    {
+                        "name": "fuelMaker",
+                        "docs": [
+                            "accumulate fuel bonus for epoch"
+                        ],
+                        "type": "u32"
+                    },
+                    {
+                        "name": "ifStakedGovTokenAmount",
+                        "docs": [
+                            "The amount of tokens staked in the governance spot markets if"
+                        ],
+                        "type": "u64"
+                    },
                     {
                         "name": "padding",
                         "type": {
                             "array": [
                                 "u8",
-                                50
+                                16
                             ]
                         }
                     }

package/lib/index.d.ts

@@ -64,6 +64,7 @@ export * from './slot/SlotSubscriber';
 export * from './wallet';
 export * from './types';
 export * from './math/utils';
+export * from './math/fuel';
 export * from './config';
 export * from './constants/numericConstants';
 export * from './serum/serumSubscriber';

package/lib/index.js

@@ -87,6 +87,7 @@ __exportStar(require("./slot/SlotSubscriber"), exports);
 __exportStar(require("./wallet"), exports);
 __exportStar(require("./types"), exports);
 __exportStar(require("./math/utils"), exports);
+__exportStar(require("./math/fuel"), exports);
 __exportStar(require("./config"), exports);
 __exportStar(require("./constants/numericConstants"), exports);
 __exportStar(require("./serum/serumSubscriber"), exports);

package/lib/math/fuel.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="bn.js" />
+import { BN } from '@coral-xyz/anchor';
+import { SpotMarketAccount, PerpMarketAccount } from '..';
+export declare function calculateSpotFuelBonus(spotMarket: SpotMarketAccount, signedTokenValue: BN, fuelBonusNumerator: BN): BN;
+export declare function calculatePerpFuelBonus(perpMarket: PerpMarketAccount, baseAssetValue: BN, fuelBonusNumerator: BN): BN;

package/lib/math/fuel.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.calculatePerpFuelBonus = exports.calculateSpotFuelBonus = void 0;
+const anchor_1 = require("@coral-xyz/anchor");
+const numericConstants_1 = require("../constants/numericConstants");
+function calculateSpotFuelBonus(spotMarket, signedTokenValue, fuelBonusNumerator) {
+    let result;
+    if (signedTokenValue.abs().lt(new anchor_1.BN(1))) {
+        result = numericConstants_1.ZERO;
+    }
+    else if (signedTokenValue.gt(new anchor_1.BN(0))) {
+        result = signedTokenValue
+            .abs()
+            .mul(fuelBonusNumerator)
+            .mul(new anchor_1.BN(spotMarket.fuelBoostDeposits))
+            .div(numericConstants_1.FUEL_WINDOW)
+            .div(numericConstants_1.QUOTE_PRECISION.div(new anchor_1.BN(10)));
+    }
+    else {
+        result = signedTokenValue
+            .abs()
+            .mul(fuelBonusNumerator)
+            .mul(new anchor_1.BN(spotMarket.fuelBoostBorrows))
+            .div(numericConstants_1.FUEL_WINDOW)
+            .div(numericConstants_1.QUOTE_PRECISION.div(new anchor_1.BN(10)));
+    }
+    return result;
+}
+exports.calculateSpotFuelBonus = calculateSpotFuelBonus;
+function calculatePerpFuelBonus(perpMarket, baseAssetValue, fuelBonusNumerator) {
+    let result;
+    if (baseAssetValue.abs().lte(numericConstants_1.QUOTE_PRECISION)) {
+        result = new anchor_1.BN(0);
+    }
+    else {
+        result = baseAssetValue
+            .abs()
+            .mul(fuelBonusNumerator)
+            .mul(new anchor_1.BN(perpMarket.fuelBoostPosition))
+            .div(numericConstants_1.FUEL_WINDOW)
+            .div(numericConstants_1.QUOTE_PRECISION.div(new anchor_1.BN(10)));
+    }
+    return result;
+}
+exports.calculatePerpFuelBonus = calculatePerpFuelBonus;

package/lib/types.d.ts

@@ -731,6 +731,7 @@ export type PerpMarketAccount = {
     quoteSpotMarketIndex: number;
     feeAdjustment: number;
     pausedOperations: number;
+    fuelBoostPosition: number;
 };
 export type HistoricalOracleData = {
     lastOraclePrice: BN;
@@ -812,6 +813,8 @@ export type SpotMarketAccount = {
     ifPausedOperations: number;
     maxTokenBorrowsFraction: number;
     minBorrowRate: number;
+    fuelBoostDeposits: number;
+    fuelBoostBorrows: number;
 };
 export type PoolBalance = {
     scaledBalance: BN;
@@ -939,6 +942,12 @@ export type UserStatsAccount = {
     isReferrer: boolean;
     authority: PublicKey;
     ifStakedQuoteAssetAmount: BN;
+    fuelDeposits: number;
+    fuelBorrows: number;
+    fuelPositions: number;
+    fuelTaker: number;
+    fuelMaker: number;
+    ifStakedGovTokenAmount: BN;
 };
 export type UserAccount = {
     authority: PublicKey;
@@ -967,6 +976,7 @@ export type UserAccount = {
     hasOpenOrder: boolean;
     openAuctions: number;
     hasOpenAuction: boolean;
+    lastFuelBonusUpdateTs: BN;
 };
 export type SpotPosition = {
     marketIndex: number;

package/lib/user.d.ts

@@ -136,6 +136,13 @@ export declare class User {
      * @returns : Precision QUOTE_PRECISION
      */
     getUnrealizedFundingPNL(marketIndex?: number): BN;
+    getFuelBonus(now: BN, includeSettled?: boolean, includeUnsettled?: boolean): {
+        depositFuel: any;
+        borrowFuel: any;
+        positionFuel: any;
+        takerFuel: any;
+        makerFuel: any;
+    };
     getSpotMarketAssetAndLiabilityValue(marketIndex?: number, marginCategory?: MarginCategory, liquidationBuffer?: BN, includeOpenOrders?: boolean, strict?: boolean, now?: BN): {
         totalAssetValue: BN;
         totalLiabilityValue: BN;

package/lib/user.js

@@ -14,6 +14,7 @@ const spotPosition_1 = require("./math/spotPosition");
 const oracles_1 = require("./math/oracles");
 const tiers_1 = require("./math/tiers");
 const strictOraclePrice_1 = require("./oracles/strictOraclePrice");
+const fuel_1 = require("./math/fuel");
 class User {
     get isSubscribed() {
         return this._isSubscribed && this.accountSubscriber.isSubscribed;
@@ -539,6 +540,51 @@ class User {
             return pnl.add((0, _1.calculatePositionFundingPNL)(market, perpPosition));
         }, numericConstants_1.ZERO);
     }
+    getFuelBonus(now, includeSettled = true, includeUnsettled = true) {
+        const userAccount = this.getUserAccount();
+        const result = {
+            takerFuel: numericConstants_1.ZERO,
+            makerFuel: numericConstants_1.ZERO,
+            depositFuel: numericConstants_1.ZERO,
+            borrowFuel: numericConstants_1.ZERO,
+            positionFuel: numericConstants_1.ZERO,
+        };
+        if (includeSettled) {
+            const userStats = this.driftClient
+                .getUserStats()
+                .getAccount();
+            result.takerFuel = result.takerFuel.addn(userStats.fuelTaker);
+            result.makerFuel = result.makerFuel.addn(userStats.fuelMaker);
+            result.depositFuel = result.depositFuel.addn(userStats.fuelDeposits);
+            result.borrowFuel = result.borrowFuel.addn(userStats.fuelBorrows);
+            result.positionFuel = result.positionFuel.addn(userStats.fuelPositions);
+        }
+        if (includeUnsettled) {
+            const fuelBonusNumerator = now.sub(userAccount.lastFuelBonusUpdateTs);
+            for (const spotPosition of this.getActiveSpotPositions()) {
+                const spotMarketAccount = this.driftClient.getSpotMarketAccount(spotPosition.marketIndex);
+                const tokenAmount = this.getTokenAmount(spotPosition.marketIndex);
+                const oraclePriceData = this.getOracleDataForSpotMarket(spotPosition.marketIndex);
+                const twap5min = (0, oracles_1.calculateLiveOracleTwap)(spotMarketAccount.historicalOracleData, oraclePriceData, now, numericConstants_1.FIVE_MINUTE // 5MIN
+                );
+                const strictOraclePrice = new strictOraclePrice_1.StrictOraclePrice(oraclePriceData.price, twap5min);
+                const signedTokenValue = (0, _1.getStrictTokenValue)(tokenAmount, spotMarketAccount.decimals, strictOraclePrice);
+                if (signedTokenValue.gt(numericConstants_1.ZERO)) {
+                    result.depositFuel = result.depositFuel.add((0, fuel_1.calculateSpotFuelBonus)(spotMarketAccount, signedTokenValue, fuelBonusNumerator));
+                }
+                else {
+                    result.borrowFuel = result.borrowFuel.add((0, fuel_1.calculateSpotFuelBonus)(spotMarketAccount, signedTokenValue, fuelBonusNumerator));
+                }
+            }
+            for (const perpPosition of this.getActivePerpPositions()) {
+                const oraclePriceData = this.getOracleDataForPerpMarket(perpPosition.marketIndex);
+                const perpMarketAccount = this.driftClient.getPerpMarketAccount(perpPosition.marketIndex);
+                const baseAssetValue = this.getPerpPositionValue(perpPosition.marketIndex, oraclePriceData, false);
+                result.positionFuel = result.positionFuel.add((0, fuel_1.calculatePerpFuelBonus)(perpMarketAccount, baseAssetValue, fuelBonusNumerator));
+            }
+        }
+        return result;
+    }
     getSpotMarketAssetAndLiabilityValue(marketIndex, marginCategory, liquidationBuffer, includeOpenOrders, strict = false, now) {
         now = now || new _1.BN(new Date().getTime() / 1000);
         let netQuoteValue = numericConstants_1.ZERO;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.86.0-beta.4",
+	"version": "2.86.0-beta.6",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/adminClient.ts

@@ -3533,6 +3533,102 @@ export class AdminClient extends DriftClient {
 		});
 	}
 
+	public async updateSpotMarketFuel(
+		spotMarketIndex: number,
+		fuelBoostDeposits?: number,
+		fuelBoostBorrows?: number,
+		fuelBoostTaker?: number,
+		fuelBoostMaker?: number
+	): Promise<TransactionSignature> {
+		const updateSpotMarketFuelIx = await this.getUpdateSpotMarketFuelIx(
+			spotMarketIndex,
+			fuelBoostDeposits || null,
+			fuelBoostBorrows || null,
+			fuelBoostTaker || null,
+			fuelBoostMaker || null
+		);
+
+		const tx = await this.buildTransaction(updateSpotMarketFuelIx);
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
+		return txSig;
+	}
+
+	public async getUpdateSpotMarketFuelIx(
+		spotMarketIndex: number,
+		fuelBoostDeposits?: number,
+		fuelBoostBorrows?: number,
+		fuelBoostTaker?: number,
+		fuelBoostMaker?: number
+	): Promise<TransactionInstruction> {
+		const spotMarketPublicKey = await getSpotMarketPublicKey(
+			this.program.programId,
+			spotMarketIndex
+		);
+
+		return await this.program.instruction.updateSpotMarketFuel(
+			fuelBoostDeposits || null,
+			fuelBoostBorrows || null,
+			fuelBoostTaker || null,
+			fuelBoostMaker || null,
+			{
+				accounts: {
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					spotMarket: spotMarketPublicKey,
+				},
+			}
+		);
+	}
+
+	public async updatePerpMarketFuel(
+		perpMarketIndex: number,
+		fuelBoostTaker?: number,
+		fuelBoostMaker?: number,
+		fuelBoostPosition?: number
+	): Promise<TransactionSignature> {
+		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;
+	}
+
+	public async getUpdatePerpMarketFuelIx(
+		perpMarketIndex: number,
+		fuelBoostTaker?: number,
+		fuelBoostMaker?: number,
+		fuelBoostPosition?: number
+	): Promise<TransactionInstruction> {
+		const perpMarketPublicKey = await 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,
+				},
+			}
+		);
+	}
+
 	public async initializePythPullOracle(
 		feedId: string
 	): Promise<TransactionSignature> {

package/src/constants/numericConstants.ts

@@ -105,3 +105,5 @@ export const IDLE_TIME_SLOTS = 9000;
 export const SLOT_TIME_ESTIMATE_MS = 400;
 
 export const DUST_POSITION_SIZE = QUOTE_PRECISION.divn(100); // Dust position is any position smaller than 1c
+
+export const FUEL_WINDOW = new BN(60 * 60 * 24 * 28); // 28 days

package/src/constants/spotMarkets.ts

@@ -337,14 +337,14 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 	{
 		symbol: 'POPCAT',
 		marketIndex: 20,
-		oracle: new PublicKey('2stQe1XLGkuTZ22gQrgZKsb93iG9mWXSLfANMPRjs5Ky'),
+		oracle: new PublicKey('3GjpjC8TWsPqjyFSiR7saGxgzD8zqYJNsBnWpenZPEBy'),
 		oracleSource: OracleSource.SWITCHBOARD,
 		mint: new PublicKey('7GCihgDB8fe6KNjn2MYtkzZcRjQy3t9GHdC8uHYmW2hr'),
 		precision: new BN(10).pow(NINE),
 		precisionExp: NINE,
 		launchTs: 1720013054000,
 		phoenixMarket: new PublicKey(
-			'3GjpjC8TWsPqjyFSiR7saGxgzD8zqYJNsBnWpenZPEBy'
+			'31XgvAQ1HgFQEk31KdszbPkVXKaQqB1bgYZPoDrFpSR2'
 		),
 	},
 ];

package/src/idl/drift.json

@@ -2244,6 +2244,42 @@
       ],
       "args": []
     },
+    {
+      "name": "updateUserGovTokenInsuranceStake",
+      "accounts": [
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "spotMarket",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "insuranceFundStake",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "userStats",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "authority",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "insuranceFundVault",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": []
+    },
     {
       "name": "initializeInsuranceFundStake",
       "accounts": [
@@ -5079,6 +5115,92 @@
         }
       ]
     },
+    {
+      "name": "updatePerpMarketFuel",
+      "accounts": [
+        {
+          "name": "admin",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "perpMarket",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "fuelBoostTaker",
+          "type": {
+            "option": "u8"
+          }
+        },
+        {
+          "name": "fuelBoostMaker",
+          "type": {
+            "option": "u8"
+          }
+        },
+        {
+          "name": "fuelBoostPosition",
+          "type": {
+            "option": "u8"
+          }
+        }
+      ]
+    },
+    {
+      "name": "updateSpotMarketFuel",
+      "accounts": [
+        {
+          "name": "admin",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "spotMarket",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "fuelBoostDeposits",
+          "type": {
+            "option": "u8"
+          }
+        },
+        {
+          "name": "fuelBoostBorrows",
+          "type": {
+            "option": "u8"
+          }
+        },
+        {
+          "name": "fuelBoostTaker",
+          "type": {
+            "option": "u8"
+          }
+        },
+        {
+          "name": "fuelBoostMaker",
+          "type": {
+            "option": "u8"
+          }
+        }
+      ]
+    },
     {
       "name": "updateAdmin",
       "accounts": [
@@ -5918,12 +6040,36 @@
             ],
             "type": "i16"
           },
+          {
+            "name": "fuelBoostPosition",
+            "docs": [
+              "fuel multiplier for perp funding",
+              "precision: 10"
+            ],
+            "type": "u8"
+          },
+          {
+            "name": "fuelBoostTaker",
+            "docs": [
+              "fuel multiplier for perp taker",
+              "precision: 10"
+            ],
+            "type": "u8"
+          },
+          {
+            "name": "fuelBoostMaker",
+            "docs": [
+              "fuel multiplier for perp maker",
+              "precision: 10"
+            ],
+            "type": "u8"
+          },
           {
             "name": "padding",
             "type": {
               "array": [
                 "u8",
-                46
+                43
               ]
             }
           }
@@ -6376,12 +6522,44 @@
             ],
             "type": "u8"
           },
+          {
+            "name": "fuelBoostDeposits",
+            "docs": [
+              "fuel multiplier for spot deposits",
+              "precision: 10"
+            ],
+            "type": "u8"
+          },
+          {
+            "name": "fuelBoostBorrows",
+            "docs": [
+              "fuel multiplier for spot borrows",
+              "precision: 10"
+            ],
+            "type": "u8"
+          },
+          {
+            "name": "fuelBoostTaker",
+            "docs": [
+              "fuel multiplier for spot taker",
+              "precision: 10"
+            ],
+            "type": "u8"
+          },
+          {
+            "name": "fuelBoostMaker",
+            "docs": [
+              "fuel multiplier for spot maker",
+              "precision: 10"
+            ],
+            "type": "u8"
+          },
           {
             "name": "padding",
             "type": {
               "array": [
                 "u8",
-                47
+                43
               ]
             }
           }
@@ -6729,12 +6907,25 @@
             ],
             "type": "bool"
           },
+          {
+            "name": "padding1",
+            "type": {
+              "array": [
+                "u8",
+                5
+              ]
+            }
+          },
+          {
+            "name": "lastFuelBonusUpdateTs",
+            "type": "i64"
+          },
           {
             "name": "padding",
             "type": {
               "array": [
                 "u8",
-                21
+                8
               ]
             }
           }
@@ -6855,12 +7046,63 @@
             "name": "disableUpdatePerpBidAskTwap",
             "type": "bool"
           },
+          {
+            "name": "padding1",
+            "type": {
+              "array": [
+                "u8",
+                6
+              ]
+            }
+          },
+          {
+            "name": "fuelDeposits",
+            "docs": [
+              "sub account id for spot deposit, borrow fuel tracking"
+            ],
+            "type": "u32"
+          },
+          {
+            "name": "fuelBorrows",
+            "docs": [
+              "accumulate fuel bonus for epoch"
+            ],
+            "type": "u32"
+          },
+          {
+            "name": "fuelPositions",
+            "docs": [
+              "accumulated fuel for perp open interest"
+            ],
+            "type": "u32"
+          },
+          {
+            "name": "fuelTaker",
+            "docs": [
+              "accumulate fuel bonus for epoch"
+            ],
+            "type": "u32"
+          },
+          {
+            "name": "fuelMaker",
+            "docs": [
+              "accumulate fuel bonus for epoch"
+            ],
+            "type": "u32"
+          },
+          {
+            "name": "ifStakedGovTokenAmount",
+            "docs": [
+              "The amount of tokens staked in the governance spot markets if"
+            ],
+            "type": "u64"
+          },
           {
             "name": "padding",
             "type": {
               "array": [
                 "u8",
-                50
+                16
               ]
             }
           }

package/src/index.ts

@@ -65,6 +65,7 @@ export * from './slot/SlotSubscriber';
 export * from './wallet';
 export * from './types';
 export * from './math/utils';
+export * from './math/fuel';
 export * from './config';
 export * from './constants/numericConstants';
 export * from './serum/serumSubscriber';

package/src/math/fuel.ts

@@ -0,0 +1,56 @@
+import { BN } from '@coral-xyz/anchor';
+import { SpotMarketAccount, PerpMarketAccount } from '..';
+import {
+	QUOTE_PRECISION,
+	ZERO,
+	FUEL_WINDOW,
+} from '../constants/numericConstants';
+
+export function calculateSpotFuelBonus(
+	spotMarket: SpotMarketAccount,
+	signedTokenValue: BN,
+	fuelBonusNumerator: BN
+): BN {
+	let result: BN;
+
+	if (signedTokenValue.abs().lt(new BN(1))) {
+		result = ZERO;
+	} else if (signedTokenValue.gt(new BN(0))) {
+		result = signedTokenValue
+			.abs()
+			.mul(fuelBonusNumerator)
+			.mul(new BN(spotMarket.fuelBoostDeposits))
+			.div(FUEL_WINDOW)
+			.div(QUOTE_PRECISION.div(new BN(10)));
+	} else {
+		result = signedTokenValue
+			.abs()
+			.mul(fuelBonusNumerator)
+			.mul(new BN(spotMarket.fuelBoostBorrows))
+			.div(FUEL_WINDOW)
+			.div(QUOTE_PRECISION.div(new BN(10)));
+	}
+
+	return result;
+}
+
+export function calculatePerpFuelBonus(
+	perpMarket: PerpMarketAccount,
+	baseAssetValue: BN,
+	fuelBonusNumerator: BN
+): BN {
+	let result: BN;
+
+	if (baseAssetValue.abs().lte(QUOTE_PRECISION)) {
+		result = new BN(0);
+	} else {
+		result = baseAssetValue
+			.abs()
+			.mul(fuelBonusNumerator)
+			.mul(new BN(perpMarket.fuelBoostPosition))
+			.div(FUEL_WINDOW)
+			.div(QUOTE_PRECISION.div(new BN(10)));
+	}
+
+	return result;
+}

package/src/types.ts

@@ -636,6 +636,8 @@ export type PerpMarketAccount = {
 	quoteSpotMarketIndex: number;
 	feeAdjustment: number;
 	pausedOperations: number;
+
+	fuelBoostPosition: number;
 };
 
 export type HistoricalOracleData = {
@@ -734,6 +736,9 @@ export type SpotMarketAccount = {
 
 	maxTokenBorrowsFraction: number;
 	minBorrowRate: number;
+
+	fuelBoostDeposits: number;
+	fuelBoostBorrows: number;
 };
 
 export type PoolBalance = {
@@ -876,6 +881,14 @@ export type UserStatsAccount = {
 	isReferrer: boolean;
 	authority: PublicKey;
 	ifStakedQuoteAssetAmount: BN;
+
+	fuelDeposits: number;
+	fuelBorrows: number;
+	fuelPositions: number;
+	fuelTaker: number;
+	fuelMaker: number;
+
+	ifStakedGovTokenAmount: BN;
 };
 
 export type UserAccount = {
@@ -905,6 +918,8 @@ export type UserAccount = {
 	hasOpenOrder: boolean;
 	openAuctions: number;
 	hasOpenAuction: boolean;
+
+	lastFuelBonusUpdateTs: BN;
 };
 
 export type SpotPosition = {

package/src/user.ts

@@ -88,6 +88,8 @@ import { calculateLiveOracleTwap } from './math/oracles';
 import { getPerpMarketTierNumber, getSpotMarketTierNumber } from './math/tiers';
 import { StrictOraclePrice } from './oracles/strictOraclePrice';
 
+import { calculateSpotFuelBonus, calculatePerpFuelBonus } from './math/fuel';
+
 export class User {
 	driftClient: DriftClient;
 	userAccountPublicKey: PublicKey;
@@ -873,6 +875,113 @@ export class User {
 			}, ZERO);
 	}
 
+	public getFuelBonus(
+		now: BN,
+		includeSettled = true,
+		includeUnsettled = true
+	): {
+		depositFuel;
+		borrowFuel;
+		positionFuel;
+		takerFuel;
+		makerFuel;
+	} {
+		const userAccount: UserAccount = this.getUserAccount();
+
+		const result = {
+			takerFuel: ZERO,
+			makerFuel: ZERO,
+			depositFuel: ZERO,
+			borrowFuel: ZERO,
+			positionFuel: ZERO,
+		};
+
+		if (includeSettled) {
+			const userStats: UserStatsAccount = this.driftClient
+				.getUserStats()
+				.getAccount();
+			result.takerFuel = result.takerFuel.addn(userStats.fuelTaker);
+			result.makerFuel = result.makerFuel.addn(userStats.fuelMaker);
+			result.depositFuel = result.depositFuel.addn(userStats.fuelDeposits);
+			result.borrowFuel = result.borrowFuel.addn(userStats.fuelBorrows);
+			result.positionFuel = result.positionFuel.addn(userStats.fuelPositions);
+		}
+
+		if (includeUnsettled) {
+			const fuelBonusNumerator = now.sub(userAccount.lastFuelBonusUpdateTs);
+			for (const spotPosition of this.getActiveSpotPositions()) {
+				const spotMarketAccount: SpotMarketAccount =
+					this.driftClient.getSpotMarketAccount(spotPosition.marketIndex);
+
+				const tokenAmount = this.getTokenAmount(spotPosition.marketIndex);
+				const oraclePriceData = this.getOracleDataForSpotMarket(
+					spotPosition.marketIndex
+				);
+
+				const twap5min = calculateLiveOracleTwap(
+					spotMarketAccount.historicalOracleData,
+					oraclePriceData,
+					now,
+					FIVE_MINUTE // 5MIN
+				);
+				const strictOraclePrice = new StrictOraclePrice(
+					oraclePriceData.price,
+					twap5min
+				);
+
+				const signedTokenValue = getStrictTokenValue(
+					tokenAmount,
+					spotMarketAccount.decimals,
+					strictOraclePrice
+				);
+
+				if (signedTokenValue.gt(ZERO)) {
+					result.depositFuel = result.depositFuel.add(
+						calculateSpotFuelBonus(
+							spotMarketAccount,
+							signedTokenValue,
+							fuelBonusNumerator
+						)
+					);
+				} else {
+					result.borrowFuel = result.borrowFuel.add(
+						calculateSpotFuelBonus(
+							spotMarketAccount,
+							signedTokenValue,
+							fuelBonusNumerator
+						)
+					);
+				}
+			}
+
+			for (const perpPosition of this.getActivePerpPositions()) {
+				const oraclePriceData = this.getOracleDataForPerpMarket(
+					perpPosition.marketIndex
+				);
+
+				const perpMarketAccount = this.driftClient.getPerpMarketAccount(
+					perpPosition.marketIndex
+				);
+
+				const baseAssetValue = this.getPerpPositionValue(
+					perpPosition.marketIndex,
+					oraclePriceData,
+					false
+				);
+
+				result.positionFuel = result.positionFuel.add(
+					calculatePerpFuelBonus(
+						perpMarketAccount,
+						baseAssetValue,
+						fuelBonusNumerator
+					)
+				);
+			}
+		}
+
+		return result;
+	}
+
 	public getSpotMarketAssetAndLiabilityValue(
 		marketIndex?: number,
 		marginCategory?: MarginCategory,