@drift-labs/sdk 2.86.0-beta.0 → 2.86.0-beta.10

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,9 @@ export type PerpMarketAccount = {
     quoteSpotMarketIndex: number;
     feeAdjustment: number;
     pausedOperations: number;
+    fuelBoostPosition: number;
+    fuelBoostMaker: number;
+    fuelBoostTaker: number;
 };
 export type HistoricalOracleData = {
     lastOraclePrice: BN;
@@ -812,6 +815,10 @@ export type SpotMarketAccount = {
     ifPausedOperations: number;
     maxTokenBorrowsFraction: number;
     minBorrowRate: number;
+    fuelBoostDeposits: number;
+    fuelBoostBorrows: number;
+    fuelBoostMaker: number;
+    fuelBoostTaker: number;
 };
 export type PoolBalance = {
     scaledBalance: BN;
@@ -939,6 +946,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 +980,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,53 @@ 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.add(new _1.BN(userStats.fuelTaker));
+            result.makerFuel = result.makerFuel.add(new _1.BN(userStats.fuelMaker));
+            result.depositFuel = result.depositFuel.add(new _1.BN(userStats.fuelDeposits));
+            result.borrowFuel = result.borrowFuel.add(new _1.BN(userStats.fuelBorrows));
+            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);
+            if (fuelBonusNumerator.gt(numericConstants_1.ZERO)) {
+                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.0",
+	"version": "2.86.0-beta.10",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",
@@ -73,5 +73,8 @@
 	"description": "SDK for Drift Protocol",
 	"engines": {
 		"node": ">=18"
+	},
+	"resolutions": {
+		"@solana/errors": "2.0.0-preview.4"
 	}
 }

package/src/accounts/pollingDriftClientAccountSubscriber.ts

@@ -101,7 +101,7 @@ export class PollingDriftClientAccountSubscriber
 		}
 
 		await this.updateAccountsToPoll();
-		await this.updateOraclesToPoll();
+		this.updateOraclesToPoll();
 		await this.addToAccountLoader();
 
 		let subscriptionSucceeded = false;
@@ -116,8 +116,7 @@ export class PollingDriftClientAccountSubscriber
 			this.eventEmitter.emit('update');
 		}
 
-		await this.setPerpOracleMap();
-		await this.setSpotOracleMap();
+		await Promise.all([this.setPerpOracleMap(), this.setSpotOracleMap()]);
 
 		this.isSubscribing = false;
 		this.isSubscribed = subscriptionSucceeded;
@@ -141,14 +140,18 @@ export class PollingDriftClientAccountSubscriber
 			eventType: 'stateAccountUpdate',
 		});
 
-		await this.updatePerpMarketAccountsToPoll();
-		await this.updateSpotMarketAccountsToPoll();
+		await Promise.all([
+			this.updatePerpMarketAccountsToPoll(),
+			this.updateSpotMarketAccountsToPoll(),
+		]);
 	}
 
 	async updatePerpMarketAccountsToPoll(): Promise<boolean> {
-		for (const marketIndex of this.perpMarketIndexes) {
-			await this.addPerpMarketAccountToPoll(marketIndex);
-		}
+		await Promise.all(
+			this.perpMarketIndexes.map((marketIndex) => {
+				return this.addPerpMarketAccountToPoll(marketIndex);
+			})
+		);
 		return true;
 	}
 
@@ -169,9 +172,11 @@ export class PollingDriftClientAccountSubscriber
 	}
 
 	async updateSpotMarketAccountsToPoll(): Promise<boolean> {
-		for (const marketIndex of this.spotMarketIndexes) {
-			await this.addSpotMarketAccountToPoll(marketIndex);
-		}
+		await Promise.all(
+			this.spotMarketIndexes.map(async (marketIndex) => {
+				await this.addSpotMarketAccountToPoll(marketIndex);
+			})
+		);
 
 		return true;
 	}
@@ -209,16 +214,19 @@ export class PollingDriftClientAccountSubscriber
 
 		return true;
 	}
-
 	async addToAccountLoader(): Promise<void> {
+		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);
 		});
@@ -446,37 +454,44 @@ export class PollingDriftClientAccountSubscriber
 		}
 		console.log(`Pausing to find oracle ${oracle} failed`);
 	}
-
 	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({
-					publicKey: oracle,
-					source: perpMarketAccount.amm.oracleSource,
-				});
+				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({
-					publicKey: oracle,
-					source: spotMarketAccount.oracleSource,
-				});
+				oraclePromises.push(
+					this.addOracle({
+						publicKey: oracle,
+						source: spotMarketAccount.oracleSource,
+					})
+				);
 			}
 			this.spotOracleMap.set(spotMarketIndex, oracle);
 		}
+		await Promise.all(oraclePromises);
 	}
 
 	assertIsSubscribed(): void {