@drift-labs/sdk 2.86.0-beta.18 → 2.86.0-beta.19

package/VERSION

@@ -1 +1 @@
-2.86.0-beta.18
+2.86.0-beta.19

package/lib/adminClient.d.ts

@@ -179,8 +179,8 @@ 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>;
+    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>;
     initializePythPullOracle(feedId: string): Promise<TransactionSignature>;

package/lib/adminClient.js

@@ -1631,15 +1631,15 @@ 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);
+    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) {
+    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, {
+        return await this.program.instruction.updateSpotMarketFuel(fuelBoostDeposits || null, fuelBoostBorrows || null, fuelBoostTaker || null, fuelBoostMaker || null, fuelBoostInsurance || null, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin

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;

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.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.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));
@@ -70,4 +71,4 @@ 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(1715745600); // unix timestamp
+exports.FUEL_START_TS = new __1.BN(1722384000); // unix timestamp

package/lib/idl/drift.json

@@ -5198,6 +5198,12 @@
                     "type": {
                         "option": "u8"
                     }
+                },
+                {
+                    "name": "fuelBoostInsurance",
+                    "type": {
+                        "option": "u8"
+                    }
                 }
             ]
         },
@@ -6554,12 +6560,20 @@
                         ],
                         "type": "u8"
                     },
+                    {
+                        "name": "fuelBoostInsurance",
+                        "docs": [
+                            "fuel multiplier for spot insurance stake",
+                            "precision: 10"
+                        ],
+                        "type": "u8"
+                    },
                     {
                         "name": "padding",
                         "type": {
                             "array": [
                                 "u8",
-                                43
+                                42
                             ]
                         }
                     }
@@ -6918,14 +6932,14 @@
                     },
                     {
                         "name": "lastFuelBonusUpdateTs",
-                        "type": "i64"
+                        "type": "u32"
                     },
                     {
                         "name": "padding",
                         "type": {
                             "array": [
                                 "u8",
-                                8
+                                12
                             ]
                         }
                     }
@@ -7051,21 +7065,28 @@
                         "type": {
                             "array": [
                                 "u8",
-                                6
+                                2
                             ]
                         }
                     },
+                    {
+                        "name": "fuelInsurance",
+                        "docs": [
+                            "accumulated fuel for token amounts of insurance"
+                        ],
+                        "type": "u32"
+                    },
                     {
                         "name": "fuelDeposits",
                         "docs": [
-                            "sub account id for spot deposit, borrow fuel tracking"
+                            "accumulated fuel for notional of deposits"
                         ],
                         "type": "u32"
                     },
                     {
                         "name": "fuelBorrows",
                         "docs": [
-                            "accumulate fuel bonus for epoch"
+                            "accumulate fuel bonus for notional of borrows"
                         ],
                         "type": "u32"
                     },
@@ -7079,14 +7100,14 @@
                     {
                         "name": "fuelTaker",
                         "docs": [
-                            "accumulate fuel bonus for epoch"
+                            "accumulate fuel bonus for taker volume"
                         ],
                         "type": "u32"
                     },
                     {
                         "name": "fuelMaker",
                         "docs": [
-                            "accumulate fuel bonus for epoch"
+                            "accumulate fuel bonus for maker volume"
                         ],
                         "type": "u32"
                     },
@@ -7097,12 +7118,19 @@
                         ],
                         "type": "u64"
                     },
+                    {
+                        "name": "lastFuelIfBonusUpdateTs",
+                        "docs": [
+                            "last unix ts user stats data was used to update if fuel (u32 to save space)"
+                        ],
+                        "type": "u32"
+                    },
                     {
                         "name": "padding",
                         "type": {
                             "array": [
                                 "u8",
-                                16
+                                12
                             ]
                         }
                     }

package/lib/math/fuel.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="bn.js" />
 import { BN } from '@coral-xyz/anchor';
 import { SpotMarketAccount, PerpMarketAccount } from '..';
+export declare function calculateInsuranceFuelBonus(spotMarket: SpotMarketAccount, tokenStakeAmount: BN, fuelBonusNumerator: BN): BN;
 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

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

package/lib/types.d.ts

@@ -731,9 +731,9 @@ export type PerpMarketAccount = {
     quoteSpotMarketIndex: number;
     feeAdjustment: number;
     pausedOperations: number;
-    fuelBoostPosition: number;
-    fuelBoostMaker: number;
     fuelBoostTaker: number;
+    fuelBoostMaker: number;
+    fuelBoostPosition: number;
 };
 export type HistoricalOracleData = {
     lastOraclePrice: BN;
@@ -817,8 +817,9 @@ export type SpotMarketAccount = {
     minBorrowRate: number;
     fuelBoostDeposits: number;
     fuelBoostBorrows: number;
-    fuelBoostMaker: number;
     fuelBoostTaker: number;
+    fuelBoostMaker: number;
+    fuelBoostInsurance: number;
 };
 export type PoolBalance = {
     scaledBalance: BN;
@@ -946,6 +947,8 @@ export type UserStatsAccount = {
     isReferrer: boolean;
     authority: PublicKey;
     ifStakedQuoteAssetAmount: BN;
+    lastFuelBonusUpdateTs: number;
+    fuelInsurance: number;
     fuelDeposits: number;
     fuelBorrows: number;
     fuelPositions: number;
@@ -980,7 +983,7 @@ export type UserAccount = {
     hasOpenOrder: boolean;
     openAuctions: number;
     hasOpenAuction: boolean;
-    lastFuelBonusUpdateTs: BN;
+    lastFuelBonusUpdateTs: number;
 };
 export type SpotPosition = {
     marketIndex: number;

package/lib/user.js

@@ -543,6 +543,7 @@ class User {
     getFuelBonus(now, includeSettled = true, includeUnsettled = true) {
         const userAccount = this.getUserAccount();
         const result = {
+            insuranceFuel: numericConstants_1.ZERO,
             takerFuel: numericConstants_1.ZERO,
             makerFuel: numericConstants_1.ZERO,
             depositFuel: numericConstants_1.ZERO,
@@ -560,7 +561,7 @@ class User {
             result.positionFuel = result.positionFuel.add(new _1.BN(userStats.fuelPositions));
         }
         if (includeUnsettled) {
-            const fuelBonusNumerator = _1.BN.max(now.sub(_1.BN.max(userAccount.lastFuelBonusUpdateTs, numericConstants_1.FUEL_START_TS)), numericConstants_1.ZERO);
+            const fuelBonusNumerator = _1.BN.max(now.sub(_1.BN.max(new _1.BN(userAccount.lastFuelBonusUpdateTs), numericConstants_1.FUEL_START_TS)), numericConstants_1.ZERO);
             if (fuelBonusNumerator.gt(numericConstants_1.ZERO)) {
                 for (const spotPosition of this.getActiveSpotPositions()) {
                     const spotMarketAccount = this.driftClient.getSpotMarketAccount(spotPosition.marketIndex);
@@ -584,6 +585,15 @@ class User {
                     result.positionFuel = result.positionFuel.add((0, fuel_1.calculatePerpFuelBonus)(perpMarketAccount, baseAssetValue, fuelBonusNumerator));
                 }
             }
+            const userStats = this.driftClient
+                .getUserStats()
+                .getAccount();
+            // todo: get real time ifStakedGovTokenAmount using ifStakeAccount
+            if (userStats.ifStakedGovTokenAmount.gt(numericConstants_1.ZERO)) {
+                const spotMarketAccount = this.driftClient.getSpotMarketAccount(numericConstants_1.GOV_SPOT_MARKET_INDEX);
+                const fuelBonusNumeratorUserStats = now.sub(new _1.BN(userStats.lastFuelBonusUpdateTs));
+                result.insuranceFuel = result.insuranceFuel.add((0, fuel_1.calculateInsuranceFuelBonus)(spotMarketAccount, userStats.ifStakedGovTokenAmount, fuelBonusNumeratorUserStats));
+            }
         }
         return result;
     }

package/package.json

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

package/src/adminClient.ts

@@ -3538,14 +3538,16 @@ export class AdminClient extends DriftClient {
 		fuelBoostDeposits?: number,
 		fuelBoostBorrows?: number,
 		fuelBoostTaker?: number,
-		fuelBoostMaker?: number
+		fuelBoostMaker?: number,
+		fuelBoostInsurance?: number
 	): Promise<TransactionSignature> {
 		const updateSpotMarketFuelIx = await this.getUpdateSpotMarketFuelIx(
 			spotMarketIndex,
 			fuelBoostDeposits || null,
 			fuelBoostBorrows || null,
 			fuelBoostTaker || null,
-			fuelBoostMaker || null
+			fuelBoostMaker || null,
+			fuelBoostInsurance || null
 		);
 
 		const tx = await this.buildTransaction(updateSpotMarketFuelIx);
@@ -3559,7 +3561,8 @@ export class AdminClient extends DriftClient {
 		fuelBoostDeposits?: number,
 		fuelBoostBorrows?: number,
 		fuelBoostTaker?: number,
-		fuelBoostMaker?: number
+		fuelBoostMaker?: number,
+		fuelBoostInsurance?: number
 	): Promise<TransactionInstruction> {
 		const spotMarketPublicKey = await getSpotMarketPublicKey(
 			this.program.programId,
@@ -3571,6 +3574,7 @@ export class AdminClient extends DriftClient {
 			fuelBoostBorrows || null,
 			fuelBoostTaker || null,
 			fuelBoostMaker || null,
+			fuelBoostInsurance || null,
 			{
 				accounts: {
 					admin: this.isSubscribed

package/src/bankrun/bankrunConnection.ts

@@ -118,6 +118,19 @@ export class BankrunContextWrapper {
 		);
 		await this.context.setClock(newClock);
 	}
+
+	async setTimestamp(unix_timestamp: number): Promise<void> {
+		const currentClock = await this.context.banksClient.getClock();
+		const newUnixTimestamp = BigInt(unix_timestamp);
+		const newClock = new Clock(
+			currentClock.slot,
+			currentClock.epochStartTimestamp,
+			currentClock.epoch,
+			currentClock.leaderScheduleEpoch,
+			newUnixTimestamp
+		);
+		await this.context.setClock(newClock);
+	}
 }
 
 export class BankrunConnection {

package/src/constants/numericConstants.ts

@@ -90,6 +90,7 @@ export const ONE_HOUR = new BN(60 * 60);
 export const ONE_YEAR = new BN(31536000);
 
 export const QUOTE_SPOT_MARKET_INDEX = 0;
+export const GOV_SPOT_MARKET_INDEX = 15;
 
 export const LAMPORTS_PRECISION = new BN(LAMPORTS_PER_SOL);
 export const LAMPORTS_EXP = new BN(Math.log10(LAMPORTS_PER_SOL));
@@ -107,4 +108,4 @@ 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
-export const FUEL_START_TS = new BN(1715745600); // unix timestamp
+export const FUEL_START_TS = new BN(1722384000); // unix timestamp

package/src/idl/drift.json

@@ -5198,6 +5198,12 @@
           "type": {
             "option": "u8"
           }
+        },
+        {
+          "name": "fuelBoostInsurance",
+          "type": {
+            "option": "u8"
+          }
         }
       ]
     },
@@ -6554,12 +6560,20 @@
             ],
             "type": "u8"
           },
+          {
+            "name": "fuelBoostInsurance",
+            "docs": [
+              "fuel multiplier for spot insurance stake",
+              "precision: 10"
+            ],
+            "type": "u8"
+          },
           {
             "name": "padding",
             "type": {
               "array": [
                 "u8",
-                43
+                42
               ]
             }
           }
@@ -6918,14 +6932,14 @@
           },
           {
             "name": "lastFuelBonusUpdateTs",
-            "type": "i64"
+            "type": "u32"
           },
           {
             "name": "padding",
             "type": {
               "array": [
                 "u8",
-                8
+                12
               ]
             }
           }
@@ -7051,21 +7065,28 @@
             "type": {
               "array": [
                 "u8",
-                6
+                2
               ]
             }
           },
+          {
+            "name": "fuelInsurance",
+            "docs": [
+              "accumulated fuel for token amounts of insurance"
+            ],
+            "type": "u32"
+          },
           {
             "name": "fuelDeposits",
             "docs": [
-              "sub account id for spot deposit, borrow fuel tracking"
+              "accumulated fuel for notional of deposits"
             ],
             "type": "u32"
           },
           {
             "name": "fuelBorrows",
             "docs": [
-              "accumulate fuel bonus for epoch"
+              "accumulate fuel bonus for notional of borrows"
             ],
             "type": "u32"
           },
@@ -7079,14 +7100,14 @@
           {
             "name": "fuelTaker",
             "docs": [
-              "accumulate fuel bonus for epoch"
+              "accumulate fuel bonus for taker volume"
             ],
             "type": "u32"
           },
           {
             "name": "fuelMaker",
             "docs": [
-              "accumulate fuel bonus for epoch"
+              "accumulate fuel bonus for maker volume"
             ],
             "type": "u32"
           },
@@ -7097,12 +7118,19 @@
             ],
             "type": "u64"
           },
+          {
+            "name": "lastFuelIfBonusUpdateTs",
+            "docs": [
+              "last unix ts user stats data was used to update if fuel (u32 to save space)"
+            ],
+            "type": "u32"
+          },
           {
             "name": "padding",
             "type": {
               "array": [
                 "u8",
-                16
+                12
               ]
             }
           }

package/src/math/fuel.ts

@@ -6,6 +6,20 @@ import {
 	FUEL_WINDOW,
 } from '../constants/numericConstants';
 
+export function calculateInsuranceFuelBonus(
+	spotMarket: SpotMarketAccount,
+	tokenStakeAmount: BN,
+	fuelBonusNumerator: BN
+): BN {
+	const result = tokenStakeAmount
+		.abs()
+		.mul(fuelBonusNumerator)
+		.mul(new BN(spotMarket.fuelBoostInsurance))
+		.div(FUEL_WINDOW)
+		.div(QUOTE_PRECISION.div(new BN(10)));
+	return result;
+}
+
 export function calculateSpotFuelBonus(
 	spotMarket: SpotMarketAccount,
 	signedTokenValue: BN,
@@ -13,7 +27,7 @@ export function calculateSpotFuelBonus(
 ): BN {
 	let result: BN;
 
-	if (signedTokenValue.abs().lt(new BN(1))) {
+	if (signedTokenValue.abs().lte(QUOTE_PRECISION)) {
 		result = ZERO;
 	} else if (signedTokenValue.gt(new BN(0))) {
 		result = signedTokenValue

package/src/types.ts

@@ -637,9 +637,9 @@ export type PerpMarketAccount = {
 	feeAdjustment: number;
 	pausedOperations: number;
 
-	fuelBoostPosition: number;
-	fuelBoostMaker: number;
 	fuelBoostTaker: number;
+	fuelBoostMaker: number;
+	fuelBoostPosition: number;
 };
 
 export type HistoricalOracleData = {
@@ -741,8 +741,9 @@ export type SpotMarketAccount = {
 
 	fuelBoostDeposits: number;
 	fuelBoostBorrows: number;
-	fuelBoostMaker: number;
 	fuelBoostTaker: number;
+	fuelBoostMaker: number;
+	fuelBoostInsurance: number;
 };
 
 export type PoolBalance = {
@@ -886,6 +887,9 @@ export type UserStatsAccount = {
 	authority: PublicKey;
 	ifStakedQuoteAssetAmount: BN;
 
+	lastFuelBonusUpdateTs: number; // u32 onchain
+
+	fuelInsurance: number;
 	fuelDeposits: number;
 	fuelBorrows: number;
 	fuelPositions: number;
@@ -922,8 +926,7 @@ export type UserAccount = {
 	hasOpenOrder: boolean;
 	openAuctions: number;
 	hasOpenAuction: boolean;
-
-	lastFuelBonusUpdateTs: BN;
+	lastFuelBonusUpdateTs: number;
 };
 
 export type SpotPosition = {

package/src/user.ts

@@ -31,6 +31,7 @@ import {
 	QUOTE_PRECISION_EXP,
 	QUOTE_SPOT_MARKET_INDEX,
 	SPOT_MARKET_WEIGHT_PRECISION,
+	GOV_SPOT_MARKET_INDEX,
 	TEN,
 	TEN_THOUSAND,
 	TWO,
@@ -89,7 +90,11 @@ import { calculateLiveOracleTwap } from './math/oracles';
 import { getPerpMarketTierNumber, getSpotMarketTierNumber } from './math/tiers';
 import { StrictOraclePrice } from './oracles/strictOraclePrice';
 
-import { calculateSpotFuelBonus, calculatePerpFuelBonus } from './math/fuel';
+import {
+	calculateSpotFuelBonus,
+	calculatePerpFuelBonus,
+	calculateInsuranceFuelBonus,
+} from './math/fuel';
 
 export class User {
 	driftClient: DriftClient;
@@ -890,6 +895,7 @@ export class User {
 		const userAccount: UserAccount = this.getUserAccount();
 
 		const result = {
+			insuranceFuel: ZERO,
 			takerFuel: ZERO,
 			makerFuel: ZERO,
 			depositFuel: ZERO,
@@ -914,7 +920,9 @@ export class User {
 
 		if (includeUnsettled) {
 			const fuelBonusNumerator = BN.max(
-				now.sub(BN.max(userAccount.lastFuelBonusUpdateTs, FUEL_START_TS)),
+				now.sub(
+					BN.max(new BN(userAccount.lastFuelBonusUpdateTs), FUEL_START_TS)
+				),
 				ZERO
 			);
 
@@ -988,6 +996,28 @@ export class User {
 					);
 				}
 			}
+
+			const userStats: UserStatsAccount = this.driftClient
+				.getUserStats()
+				.getAccount();
+
+			// todo: get real time ifStakedGovTokenAmount using ifStakeAccount
+			if (userStats.ifStakedGovTokenAmount.gt(ZERO)) {
+				const spotMarketAccount: SpotMarketAccount =
+					this.driftClient.getSpotMarketAccount(GOV_SPOT_MARKET_INDEX);
+
+				const fuelBonusNumeratorUserStats = now.sub(
+					new BN(userStats.lastFuelBonusUpdateTs)
+				);
+
+				result.insuranceFuel = result.insuranceFuel.add(
+					calculateInsuranceFuelBonus(
+						spotMarketAccount,
+						userStats.ifStakedGovTokenAmount,
+						fuelBonusNumeratorUserStats
+					)
+				);
+			}
 		}
 
 		return result;

package/tests/dlob/helpers.ts

@@ -187,6 +187,9 @@ export const mockPerpMarkets: Array<PerpMarketAccount> = [
 		quoteSpotMarketIndex: 0,
 		feeAdjustment: 0,
 		pausedOperations: 0,
+		fuelBoostPosition: 0,
+		fuelBoostMaker: 0,
+		fuelBoostTaker: 0,
 	},
 	{
 		status: MarketStatus.INITIALIZED,
@@ -226,6 +229,9 @@ export const mockPerpMarkets: Array<PerpMarketAccount> = [
 		quoteSpotMarketIndex: 0,
 		feeAdjustment: 0,
 		pausedOperations: 0,
+		fuelBoostPosition: 0,
+		fuelBoostMaker: 0,
+		fuelBoostTaker: 0,
 	},
 	{
 		status: MarketStatus.INITIALIZED,
@@ -265,6 +271,9 @@ export const mockPerpMarkets: Array<PerpMarketAccount> = [
 		quoteSpotMarketIndex: 0,
 		feeAdjustment: 0,
 		pausedOperations: 0,
+		fuelBoostPosition: 0,
+		fuelBoostMaker: 0,
+		fuelBoostTaker: 0,
 	},
 ];
 
@@ -351,6 +360,13 @@ export const mockSpotMarkets: Array<SpotMarketAccount> = [
 		},
 		pausedOperations: 0,
 		ifPausedOperations: 0,
+		maxTokenBorrowsFraction: 0,
+		minBorrowRate: 0,
+		fuelBoostDeposits: 0,
+		fuelBoostBorrows: 0,
+		fuelBoostTaker: 0,
+		fuelBoostMaker: 0,
+		fuelBoostInsurance: 0,
 	},
 	{
 		status: MarketStatus.ACTIVE,
@@ -434,6 +450,13 @@ export const mockSpotMarkets: Array<SpotMarketAccount> = [
 		},
 		pausedOperations: 0,
 		ifPausedOperations: 0,
+		maxTokenBorrowsFraction: 0,
+		minBorrowRate: 0,
+		fuelBoostDeposits: 0,
+		fuelBoostBorrows: 0,
+		fuelBoostTaker: 0,
+		fuelBoostMaker: 0,
+		fuelBoostInsurance: 0,
 	},
 	{
 		status: MarketStatus.ACTIVE,
@@ -517,6 +540,13 @@ export const mockSpotMarkets: Array<SpotMarketAccount> = [
 		},
 		pausedOperations: 0,
 		ifPausedOperations: 0,
+		maxTokenBorrowsFraction: 0,
+		minBorrowRate: 0,
+		fuelBoostDeposits: 0,
+		fuelBoostBorrows: 0,
+		fuelBoostTaker: 0,
+		fuelBoostMaker: 0,
+		fuelBoostInsurance: 0,
 	},
 ];
 

package/tests/user/helpers.ts

@@ -85,4 +85,5 @@ export const mockUserAccount: UserAccount = {
 	hasOpenOrder: false,
 	openAuctions: 0,
 	hasOpenAuction: false,
+	lastFuelBonusUpdateTs: 0,
 };

package/tests/user/test.ts

@@ -35,6 +35,8 @@ async function makeMockUser(
 	const mockUser: User = await umap.mustGet('1');
 	mockUser._isSubscribed = true;
 	mockUser.driftClient._isSubscribed = true;
+	mockUser.driftClient.accountSubscriber.isSubscribed = true;
+
 	const oraclePriceMap = {};
 	// console.log(perpOraclePriceList, myMockPerpMarkets.length);
 	// console.log(spotOraclePriceList, myMockSpotMarkets.length);