@drift-labs/sdk 2.86.0-beta.20 → 2.86.0-beta.22

package/VERSION

@@ -1 +1 @@
-2.86.0-beta.20
+2.86.0-beta.22

package/lib/adminClient.d.ts

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

package/lib/adminClient.js

@@ -1667,6 +1667,23 @@ class AdminClient extends driftClient_1.DriftClient {
             },
         });
     }
+    async initUserFuel(user, authority, fuelBonusDeposits, fuelBonusBorrows, fuelBonusTaker, fuelBonusMaker, fuelBonusInsurance) {
+        const updatePerpMarketFuelIx = await this.getInitUserFuelIx(user, authority, fuelBonusDeposits, fuelBonusBorrows, fuelBonusTaker, fuelBonusMaker, fuelBonusInsurance);
+        const tx = await this.buildTransaction(updatePerpMarketFuelIx);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
+    }
+    async getInitUserFuelIx(user, authority, fuelBonusDeposits, fuelBonusBorrows, fuelBonusTaker, fuelBonusMaker, fuelBonusInsurance) {
+        const userStats = await (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, authority);
+        return await this.program.instruction.initUserFuel(fuelBonusDeposits || null, fuelBonusBorrows || null, fuelBonusTaker || null, fuelBonusMaker || null, fuelBonusInsurance || null, {
+            accounts: {
+                admin: this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+                user,
+                userStats,
+            },
+        });
+    }
     async initializePythPullOracle(feedId) {
         const initializePythPullOracleIx = await this.getInitializePythPullOracleIx(feedId);
         const tx = await this.buildTransaction(initializePythPullOracleIx);

package/lib/constants/perpMarkets.js

@@ -342,9 +342,9 @@ exports.MainnetPerpMarkets = [
         symbol: '1MBONK-PERP',
         baseAssetSymbol: '1MBONK',
         marketIndex: 4,
-        oracle: new web3_js_1.PublicKey('8ihFLu5FimgTQ1Unh4dVyEHUGodJ5gJQCrQf4KUVB9bN'),
+        oracle: new web3_js_1.PublicKey('GojbSnJuPdKDT1ZuHuAM5t9oz6bxTo1xhUKpTua2F72p'),
         launchTs: 1677690149000,
-        oracleSource: __1.OracleSource.PYTH_1M,
+        oracleSource: __1.OracleSource.PYTH_1M_PULL,
         pythFeedId: '0x72b021217ca3fe68922a19aaf990109cb9d84e9ad004b4d2025ad6f529314419',
     },
     {
@@ -375,9 +375,9 @@ exports.MainnetPerpMarkets = [
         symbol: 'DOGE-PERP',
         baseAssetSymbol: 'DOGE',
         marketIndex: 7,
-        oracle: new web3_js_1.PublicKey('FsSM3s38PX9K7Dn6eGzuE29S2Dsk1Sss1baytTQdCaQj'),
+        oracle: new web3_js_1.PublicKey('23y63pHVwKfYSCDFdiGRaGbTYWoyr8UzhUE7zukyf6gK'),
         launchTs: 1680808053000,
-        oracleSource: __1.OracleSource.PYTH,
+        oracleSource: __1.OracleSource.PYTH_PULL,
         pythFeedId: '0xdcef50dd0a4cd2dcc17e45df1676dcb336a11a61c69df7a0299b0150c672d25c',
     },
     {
@@ -397,9 +397,9 @@ exports.MainnetPerpMarkets = [
         symbol: 'SUI-PERP',
         baseAssetSymbol: 'SUI',
         marketIndex: 9,
-        oracle: new web3_js_1.PublicKey('3Qub3HaAJaa2xNY7SUqPKd3vVwTqDfDDkEUMPjXD2c1q'),
+        oracle: new web3_js_1.PublicKey('HBordkz5YxjzNURmKUY4vfEYFG9fZyZNeNF1VDLMoemT'),
         launchTs: 1683125906000,
-        oracleSource: __1.OracleSource.PYTH,
+        oracleSource: __1.OracleSource.PYTH_PULL,
         pythFeedId: '0x23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744',
     },
     {
@@ -408,9 +408,9 @@ exports.MainnetPerpMarkets = [
         symbol: '1MPEPE-PERP',
         baseAssetSymbol: '1MPEPE',
         marketIndex: 10,
-        oracle: new web3_js_1.PublicKey('FSfxunDmjjbDV2QxpyxFCAPKmYJHSLnLuvQXDLkMzLBm'),
+        oracle: new web3_js_1.PublicKey('CLxofhtzvLiErpn25wvUzpZXEqBhuZ6WMEckEraxyuGt'),
         launchTs: 1683781239000,
-        oracleSource: __1.OracleSource.PYTH_1M,
+        oracleSource: __1.OracleSource.PYTH_1M_PULL,
         pythFeedId: '0xd69731a2e74ac1ce884fc3890f7ee324b6deb66147055249568869ed700882e4',
     },
     {
@@ -430,9 +430,9 @@ exports.MainnetPerpMarkets = [
         symbol: 'RNDR-PERP',
         baseAssetSymbol: 'RNDR',
         marketIndex: 12,
-        oracle: new web3_js_1.PublicKey('CYGfrBJB9HgLf9iZyN4aH5HvUAi2htQ4MjPxeXMf4Egn'),
+        oracle: new web3_js_1.PublicKey('F3mPHRtJqqq57JPDBmUwUVhpyPLmjE5dAzDfpVgpFkug'),
         launchTs: 1687201081000,
-        oracleSource: __1.OracleSource.PYTH,
+        oracleSource: __1.OracleSource.PYTH_PULL,
         pythFeedId: '0xab7347771135fc733f8f38db462ba085ed3309955f42554a14fa13e855ac0e2f',
     },
     {
@@ -463,9 +463,9 @@ exports.MainnetPerpMarkets = [
         symbol: 'INJ-PERP',
         baseAssetSymbol: 'INJ',
         marketIndex: 15,
-        oracle: new web3_js_1.PublicKey('9EdtbaivHQYA4Nh3XzGR6DwRaoorqXYnmpfsnFhvwuVj'),
+        oracle: new web3_js_1.PublicKey('BfXcyDWJmYADa5eZD7gySSDd6giqgjvm7xsAhQ239SUD'),
         launchTs: 1698074659000,
-        oracleSource: __1.OracleSource.PYTH,
+        oracleSource: __1.OracleSource.PYTH_PULL,
         pythFeedId: '0x7a5bc1d2b56ad029048cd63964b3ad2776eadf812edc1a43a31406cb54bff592',
     },
     {

package/lib/constants/spotMarkets.js

@@ -182,8 +182,8 @@ exports.MainnetSpotMarkets = [
     {
         symbol: 'RNDR',
         marketIndex: 12,
-        oracle: new web3_js_1.PublicKey('CYGfrBJB9HgLf9iZyN4aH5HvUAi2htQ4MjPxeXMf4Egn'),
-        oracleSource: __1.OracleSource.PYTH,
+        oracle: new web3_js_1.PublicKey('F3mPHRtJqqq57JPDBmUwUVhpyPLmjE5dAzDfpVgpFkug'),
+        oracleSource: __1.OracleSource.PYTH_PULL,
         mint: new web3_js_1.PublicKey('rndrizKT3MK1iimdxRdWabcF7Zg7AR5T4nud4EkHBof'),
         precision: new __1.BN(10).pow(numericConstants_1.EIGHT),
         precisionExp: numericConstants_1.EIGHT,

package/lib/idl/drift.json

@@ -5207,6 +5207,63 @@
                 }
             ]
         },
+        {
+            "name": "initUserFuel",
+            "accounts": [
+                {
+                    "name": "admin",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "user",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "userStats",
+                    "isMut": true,
+                    "isSigner": false
+                }
+            ],
+            "args": [
+                {
+                    "name": "fuelBoostDeposits",
+                    "type": {
+                        "option": "u32"
+                    }
+                },
+                {
+                    "name": "fuelBoostBorrows",
+                    "type": {
+                        "option": "u32"
+                    }
+                },
+                {
+                    "name": "fuelBoostTaker",
+                    "type": {
+                        "option": "u32"
+                    }
+                },
+                {
+                    "name": "fuelBoostMaker",
+                    "type": {
+                        "option": "u32"
+                    }
+                },
+                {
+                    "name": "fuelBoostInsurance",
+                    "type": {
+                        "option": "u32"
+                    }
+                }
+            ]
+        },
         {
             "name": "updateAdmin",
             "accounts": [

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/package.json

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

package/src/adminClient.ts

@@ -30,6 +30,7 @@ import {
 	getProtocolIfSharesTransferConfigPublicKey,
 	getPrelaunchOraclePublicKey,
 	getPythPullOraclePublicKey,
+	getUserStatsAccountPublicKey,
 } from './addresses/pda';
 import { squareRootBN } from './math/utils';
 import { TOKEN_PROGRAM_ID } from '@solana/spl-token';
@@ -3633,6 +3634,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/constants/perpMarkets.ts

@@ -384,9 +384,9 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		symbol: '1MBONK-PERP',
 		baseAssetSymbol: '1MBONK',
 		marketIndex: 4,
-		oracle: new PublicKey('8ihFLu5FimgTQ1Unh4dVyEHUGodJ5gJQCrQf4KUVB9bN'),
+		oracle: new PublicKey('GojbSnJuPdKDT1ZuHuAM5t9oz6bxTo1xhUKpTua2F72p'),
 		launchTs: 1677690149000,
-		oracleSource: OracleSource.PYTH_1M,
+		oracleSource: OracleSource.PYTH_1M_PULL,
 		pythFeedId:
 			'0x72b021217ca3fe68922a19aaf990109cb9d84e9ad004b4d2025ad6f529314419',
 	},
@@ -420,9 +420,9 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		symbol: 'DOGE-PERP',
 		baseAssetSymbol: 'DOGE',
 		marketIndex: 7,
-		oracle: new PublicKey('FsSM3s38PX9K7Dn6eGzuE29S2Dsk1Sss1baytTQdCaQj'),
+		oracle: new PublicKey('23y63pHVwKfYSCDFdiGRaGbTYWoyr8UzhUE7zukyf6gK'),
 		launchTs: 1680808053000,
-		oracleSource: OracleSource.PYTH,
+		oracleSource: OracleSource.PYTH_PULL,
 		pythFeedId:
 			'0xdcef50dd0a4cd2dcc17e45df1676dcb336a11a61c69df7a0299b0150c672d25c',
 	},
@@ -444,9 +444,9 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		symbol: 'SUI-PERP',
 		baseAssetSymbol: 'SUI',
 		marketIndex: 9,
-		oracle: new PublicKey('3Qub3HaAJaa2xNY7SUqPKd3vVwTqDfDDkEUMPjXD2c1q'),
+		oracle: new PublicKey('HBordkz5YxjzNURmKUY4vfEYFG9fZyZNeNF1VDLMoemT'),
 		launchTs: 1683125906000,
-		oracleSource: OracleSource.PYTH,
+		oracleSource: OracleSource.PYTH_PULL,
 		pythFeedId:
 			'0x23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744',
 	},
@@ -456,9 +456,9 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		symbol: '1MPEPE-PERP',
 		baseAssetSymbol: '1MPEPE',
 		marketIndex: 10,
-		oracle: new PublicKey('FSfxunDmjjbDV2QxpyxFCAPKmYJHSLnLuvQXDLkMzLBm'),
+		oracle: new PublicKey('CLxofhtzvLiErpn25wvUzpZXEqBhuZ6WMEckEraxyuGt'),
 		launchTs: 1683781239000,
-		oracleSource: OracleSource.PYTH_1M,
+		oracleSource: OracleSource.PYTH_1M_PULL,
 		pythFeedId:
 			'0xd69731a2e74ac1ce884fc3890f7ee324b6deb66147055249568869ed700882e4',
 	},
@@ -480,9 +480,9 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		symbol: 'RNDR-PERP',
 		baseAssetSymbol: 'RNDR',
 		marketIndex: 12,
-		oracle: new PublicKey('CYGfrBJB9HgLf9iZyN4aH5HvUAi2htQ4MjPxeXMf4Egn'),
+		oracle: new PublicKey('F3mPHRtJqqq57JPDBmUwUVhpyPLmjE5dAzDfpVgpFkug'),
 		launchTs: 1687201081000,
-		oracleSource: OracleSource.PYTH,
+		oracleSource: OracleSource.PYTH_PULL,
 		pythFeedId:
 			'0xab7347771135fc733f8f38db462ba085ed3309955f42554a14fa13e855ac0e2f',
 	},
@@ -516,9 +516,9 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		symbol: 'INJ-PERP',
 		baseAssetSymbol: 'INJ',
 		marketIndex: 15,
-		oracle: new PublicKey('9EdtbaivHQYA4Nh3XzGR6DwRaoorqXYnmpfsnFhvwuVj'),
+		oracle: new PublicKey('BfXcyDWJmYADa5eZD7gySSDd6giqgjvm7xsAhQ239SUD'),
 		launchTs: 1698074659000,
-		oracleSource: OracleSource.PYTH,
+		oracleSource: OracleSource.PYTH_PULL,
 		pythFeedId:
 			'0x7a5bc1d2b56ad029048cd63964b3ad2776eadf812edc1a43a31406cb54bff592',
 	},

package/src/constants/spotMarkets.ts

@@ -237,8 +237,8 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 	{
 		symbol: 'RNDR',
 		marketIndex: 12,
-		oracle: new PublicKey('CYGfrBJB9HgLf9iZyN4aH5HvUAi2htQ4MjPxeXMf4Egn'),
-		oracleSource: OracleSource.PYTH,
+		oracle: new PublicKey('F3mPHRtJqqq57JPDBmUwUVhpyPLmjE5dAzDfpVgpFkug'),
+		oracleSource: OracleSource.PYTH_PULL,
 		mint: new PublicKey('rndrizKT3MK1iimdxRdWabcF7Zg7AR5T4nud4EkHBof'),
 		precision: new BN(10).pow(EIGHT),
 		precisionExp: EIGHT,

package/src/idl/drift.json

@@ -5207,6 +5207,63 @@
         }
       ]
     },
+    {
+      "name": "initUserFuel",
+      "accounts": [
+        {
+          "name": "admin",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "user",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "userStats",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "fuelBoostDeposits",
+          "type": {
+            "option": "u32"
+          }
+        },
+        {
+          "name": "fuelBoostBorrows",
+          "type": {
+            "option": "u32"
+          }
+        },
+        {
+          "name": "fuelBoostTaker",
+          "type": {
+            "option": "u32"
+          }
+        },
+        {
+          "name": "fuelBoostMaker",
+          "type": {
+            "option": "u32"
+          }
+        },
+        {
+          "name": "fuelBoostInsurance",
+          "type": {
+            "option": "u32"
+          }
+        }
+      ]
+    },
     {
       "name": "updateAdmin",
       "accounts": [

package/src/user.ts

@@ -886,11 +886,12 @@ export class User {
 		includeSettled = true,
 		includeUnsettled = true
 	): {
-		depositFuel;
-		borrowFuel;
-		positionFuel;
-		takerFuel;
-		makerFuel;
+		depositFuel: BN;
+		borrowFuel: BN;
+		positionFuel: BN;
+		takerFuel: BN;
+		makerFuel: BN;
+		insuranceFuel: BN;
 	} {
 		const userAccount: UserAccount = this.getUserAccount();