@drift-labs/sdk 2.86.0-beta.9 → 2.87.0-beta.1

package/lib/types.d.ts

@@ -55,8 +55,9 @@ export declare enum PerpOperation {
 export declare enum SpotOperation {
     UPDATE_CUMULATIVE_INTEREST = 1,
     FILL = 2,
-    WITHDRAW = 4,
-    LIQUIDATION = 8
+    DEPOSIT = 4,
+    WITHDRAW = 8,
+    LIQUIDATION = 16
 }
 export declare enum InsuranceFundOperation {
     INIT = 1,
@@ -731,9 +732,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 +818,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 +948,8 @@ export type UserStatsAccount = {
     isReferrer: boolean;
     authority: PublicKey;
     ifStakedQuoteAssetAmount: BN;
+    lastFuelIfBonusUpdateTs: number;
+    fuelInsurance: number;
     fuelDeposits: number;
     fuelBorrows: number;
     fuelPositions: number;
@@ -980,7 +984,7 @@ export type UserAccount = {
     hasOpenOrder: boolean;
     openAuctions: number;
     hasOpenAuction: boolean;
-    lastFuelBonusUpdateTs: BN;
+    lastFuelBonusUpdateTs: number;
 };
 export type SpotPosition = {
     marketIndex: number;
@@ -1199,6 +1203,21 @@ export type PhoenixV1FulfillmentConfigAccount = {
     fulfillmentType: SpotFulfillmentType;
     status: SpotFulfillmentStatus;
 };
+export type OpenbookV2FulfillmentConfigAccount = {
+    pubkey: PublicKey;
+    openbookV2ProgramId: PublicKey;
+    openbookV2Market: PublicKey;
+    openbookV2MarketAuthority: PublicKey;
+    openbookV2EventHeap: PublicKey;
+    openbookV2Bids: PublicKey;
+    openbookV2Asks: PublicKey;
+    openbookV2BaseVault: PublicKey;
+    openbookV2QuoteVault: PublicKey;
+    marketIndex: number;
+    fulfillmentType: SpotFulfillmentType;
+    status: SpotFulfillmentStatus;
+    remainingAccounts?: PublicKey[];
+};
 export type ReferrerNameAccount = {
     name: number[];
     user: PublicKey;

package/lib/types.js

@@ -40,8 +40,9 @@ var SpotOperation;
 (function (SpotOperation) {
     SpotOperation[SpotOperation["UPDATE_CUMULATIVE_INTEREST"] = 1] = "UPDATE_CUMULATIVE_INTEREST";
     SpotOperation[SpotOperation["FILL"] = 2] = "FILL";
-    SpotOperation[SpotOperation["WITHDRAW"] = 4] = "WITHDRAW";
-    SpotOperation[SpotOperation["LIQUIDATION"] = 8] = "LIQUIDATION";
+    SpotOperation[SpotOperation["DEPOSIT"] = 4] = "DEPOSIT";
+    SpotOperation[SpotOperation["WITHDRAW"] = 8] = "WITHDRAW";
+    SpotOperation[SpotOperation["LIQUIDATION"] = 16] = "LIQUIDATION";
 })(SpotOperation = exports.SpotOperation || (exports.SpotOperation = {}));
 var InsuranceFundOperation;
 (function (InsuranceFundOperation) {

package/lib/user.d.ts

@@ -137,11 +137,12 @@ export declare class User {
      */
     getUnrealizedFundingPNL(marketIndex?: number): BN;
     getFuelBonus(now: BN, includeSettled?: boolean, includeUnsettled?: boolean): {
-        depositFuel: any;
-        borrowFuel: any;
-        positionFuel: any;
-        takerFuel: any;
-        makerFuel: any;
+        depositFuel: BN;
+        borrowFuel: BN;
+        positionFuel: BN;
+        takerFuel: BN;
+        makerFuel: BN;
+        insuranceFuel: BN;
     };
     getSpotMarketAssetAndLiabilityValue(marketIndex?: number, marginCategory?: MarginCategory, liquidationBuffer?: BN, includeOpenOrders?: boolean, strict?: boolean, now?: BN): {
         totalAssetValue: BN;

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,
@@ -553,6 +554,7 @@ class User {
             const userStats = this.driftClient
                 .getUserStats()
                 .getAccount();
+            result.insuranceFuel = result.insuranceFuel.add(new _1.BN(userStats.fuelInsurance));
             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));
@@ -560,27 +562,43 @@ class User {
             result.positionFuel = result.positionFuel.add(new _1.BN(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));
+            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);
+                    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));
+                    }
                 }
-                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));
                 }
             }
-            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));
+            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 = _1.BN.max(now.sub(_1.BN.max(new _1.BN(userStats.lastFuelIfBonusUpdateTs), numericConstants_1.FUEL_START_TS)), numericConstants_1.ZERO);
+                result.insuranceFuel = result.insuranceFuel.add((0, fuel_1.calculateInsuranceFuelBonus)(spotMarketAccount, userStats.ifStakedGovTokenAmount, fuelBonusNumeratorUserStats));
+            }
+            if (userStats.ifStakedQuoteAssetAmount.gt(numericConstants_1.ZERO)) {
+                const spotMarketAccount = this.driftClient.getSpotMarketAccount(numericConstants_1.QUOTE_SPOT_MARKET_INDEX);
+                const fuelBonusNumeratorUserStats = _1.BN.max(now.sub(_1.BN.max(new _1.BN(userStats.lastFuelIfBonusUpdateTs), numericConstants_1.FUEL_START_TS)), numericConstants_1.ZERO);
+                result.insuranceFuel = result.insuranceFuel.add((0, fuel_1.calculateInsuranceFuelBonus)(spotMarketAccount, userStats.ifStakedQuoteAssetAmount, fuelBonusNumeratorUserStats));
             }
         }
         return result;

package/package.json

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

package/src/addresses/pda.ts

@@ -202,6 +202,21 @@ export function getPhoenixFulfillmentConfigPublicKey(
 	)[0];
 }
 
+export function getOpenbookV2FulfillmentConfigPublicKey(
+	programId: PublicKey,
+	market: PublicKey
+): PublicKey {
+	return PublicKey.findProgramAddressSync(
+		[
+			Buffer.from(
+				anchor.utils.bytes.utf8.encode('openbook_v2_fulfillment_config')
+			),
+			market.toBuffer(),
+		],
+		programId
+	)[0];
+}
+
 export function getReferrerNamePublicKeySync(
 	programId: PublicKey,
 	nameBuffer: number[]

package/src/adminClient.ts

@@ -29,7 +29,9 @@ import {
 	getPhoenixFulfillmentConfigPublicKey,
 	getProtocolIfSharesTransferConfigPublicKey,
 	getPrelaunchOraclePublicKey,
+	getOpenbookV2FulfillmentConfigPublicKey,
 	getPythPullOraclePublicKey,
+	getUserStatsAccountPublicKey,
 } from './addresses/pda';
 import { squareRootBN } from './math/utils';
 import { TOKEN_PROGRAM_ID } from '@solana/spl-token';
@@ -48,6 +50,10 @@ import { PROGRAM_ID as PHOENIX_PROGRAM_ID } from '@ellipsis-labs/phoenix-sdk';
 import { DRIFT_ORACLE_RECEIVER_ID } from './config';
 import { getFeedIdUint8Array } from './util/pythPullOracleUtils';
 
+const OPENBOOK_PROGRAM_ID = new PublicKey(
+	'opnb2LAfJYbRMAHHvqjCwQxanZn7ReEHp1k81EohpZb'
+);
+
 export class AdminClient extends DriftClient {
 	public async initialize(
 		usdcMint: PublicKey,
@@ -385,6 +391,52 @@ export class AdminClient extends DriftClient {
 		);
 	}
 
+	public async initializeOpenbookV2FulfillmentConfig(
+		marketIndex: number,
+		openbookMarket: PublicKey
+	): Promise<TransactionSignature> {
+		const initializeIx = await this.getInitializeOpenbookV2FulfillmentConfigIx(
+			marketIndex,
+			openbookMarket
+		);
+
+		const tx = await this.buildTransaction(initializeIx);
+
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
+		return txSig;
+	}
+
+	public async getInitializeOpenbookV2FulfillmentConfigIx(
+		marketIndex: number,
+		openbookMarket: PublicKey
+	): Promise<TransactionInstruction> {
+		const openbookFulfillmentConfig = getOpenbookV2FulfillmentConfigPublicKey(
+			this.program.programId,
+			openbookMarket
+		);
+
+		return this.program.instruction.initializeOpenbookV2FulfillmentConfig(
+			marketIndex,
+			{
+				accounts: {
+					baseSpotMarket: this.getSpotMarketAccount(marketIndex).pubkey,
+					quoteSpotMarket: this.getQuoteSpotMarketAccount().pubkey,
+					state: await this.getStatePublicKey(),
+					openbookV2Program: OPENBOOK_PROGRAM_ID,
+					openbookV2Market: openbookMarket,
+					driftSigner: this.getSignerPublicKey(),
+					openbookV2FulfillmentConfig: openbookFulfillmentConfig,
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
+					rent: SYSVAR_RENT_PUBKEY,
+					systemProgram: anchor.web3.SystemProgram.programId,
+				},
+			}
+		);
+	}
+
 	public async initializePerpMarket(
 		marketIndex: number,
 		priceOracle: PublicKey,
@@ -1818,12 +1870,12 @@ export class AdminClient extends DriftClient {
 
 	public async updateSpotMarketMaxTokenBorrows(
 		spotMarketIndex: number,
-		maxTokenBorrows: BN
+		maxTokenBorrowsFraction: number
 	): Promise<TransactionSignature> {
 		const updateSpotMarketMaxTokenBorrowsIx =
 			await this.getUpdateSpotMarketMaxTokenBorrowsIx(
 				spotMarketIndex,
-				maxTokenBorrows
+				maxTokenBorrowsFraction
 			);
 
 		const tx = await this.buildTransaction(updateSpotMarketMaxTokenBorrowsIx);
@@ -1835,10 +1887,10 @@ export class AdminClient extends DriftClient {
 
 	public async getUpdateSpotMarketMaxTokenBorrowsIx(
 		spotMarketIndex: number,
-		maxTokenBorrows: BN
+		maxTokenBorrowsFraction: number
 	): Promise<TransactionInstruction> {
 		return this.program.instruction.updateSpotMarketMaxTokenBorrows(
-			maxTokenBorrows,
+			maxTokenBorrowsFraction,
 			{
 				accounts: {
 					admin: this.isSubscribed
@@ -3538,14 +3590,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 +3613,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 +3626,7 @@ export class AdminClient extends DriftClient {
 			fuelBoostBorrows || null,
 			fuelBoostTaker || null,
 			fuelBoostMaker || null,
+			fuelBoostInsurance || null,
 			{
 				accounts: {
 					admin: this.isSubscribed
@@ -3629,6 +3685,62 @@ export class AdminClient extends DriftClient {
 		);
 	}
 
+	public async initUserFuel(
+		user: PublicKey,
+		authority: PublicKey,
+		fuelBonusDeposits?: number,
+		fuelBonusBorrows?: number,
+		fuelBonusTaker?: number,
+		fuelBonusMaker?: number,
+		fuelBonusInsurance?: number
+	): Promise<TransactionSignature> {
+		const updatePerpMarketFuelIx = await this.getInitUserFuelIx(
+			user,
+			authority,
+			fuelBonusDeposits,
+			fuelBonusBorrows,
+			fuelBonusTaker,
+			fuelBonusMaker,
+			fuelBonusInsurance
+		);
+
+		const tx = await this.buildTransaction(updatePerpMarketFuelIx);
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
+		return txSig;
+	}
+
+	public async getInitUserFuelIx(
+		user: PublicKey,
+		authority: PublicKey,
+		fuelBonusDeposits?: number,
+		fuelBonusBorrows?: number,
+		fuelBonusTaker?: number,
+		fuelBonusMaker?: number,
+		fuelBonusInsurance?: number
+	): Promise<TransactionInstruction> {
+		const userStats = await getUserStatsAccountPublicKey(
+			this.program.programId,
+			authority
+		);
+
+		return await this.program.instruction.initUserFuel(
+			fuelBonusDeposits || null,
+			fuelBonusBorrows || null,
+			fuelBonusTaker || null,
+			fuelBonusMaker || null,
+			fuelBonusInsurance || null,
+			{
+				accounts: {
+					admin: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					user,
+					userStats,
+				},
+			}
+		);
+	}
+
 	public async initializePythPullOracle(
 		feedId: string
 	): Promise<TransactionSignature> {

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,3 +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(1722384000); // unix timestamp