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

package/src/accounts/webSocketDriftClientAccountSubscriber.ts

@@ -115,19 +115,18 @@ export class WebSocketDriftClientAccountSubscriber
 			this.eventEmitter.emit('update');
 		});
 
-		// subscribe to market accounts
-		await this.subscribeToPerpMarketAccounts();
-
-		// subscribe to spot market accounts
-		await this.subscribeToSpotMarketAccounts();
-
-		// subscribe to oracles
-		await this.subscribeToOracles();
+		await Promise.all([
+			// subscribe to market accounts
+			this.subscribeToPerpMarketAccounts(),
+			// subscribe to spot market accounts
+			this.subscribeToSpotMarketAccounts(),
+			// subscribe to oracles
+			this.subscribeToOracles(),
+		]);
 
 		this.eventEmitter.emit('update');
 
-		await this.setPerpOracleMap();
-		await this.setSpotOracleMap();
+		await Promise.all([this.setPerpOracleMap(), this.setSpotOracleMap()]);
 
 		this.isSubscribing = false;
 		this.isSubscribed = true;
@@ -137,9 +136,11 @@ export class WebSocketDriftClientAccountSubscriber
 	}
 
 	async subscribeToPerpMarketAccounts(): Promise<boolean> {
-		for (const marketIndex of this.perpMarketIndexes) {
-			await this.subscribeToPerpMarketAccount(marketIndex);
-		}
+		await Promise.all(
+			this.perpMarketIndexes.map((marketIndex) =>
+				this.subscribeToPerpMarketAccount(marketIndex)
+			)
+		);
 		return true;
 	}
 
@@ -165,9 +166,11 @@ export class WebSocketDriftClientAccountSubscriber
 	}
 
 	async subscribeToSpotMarketAccounts(): Promise<boolean> {
-		for (const marketIndex of this.spotMarketIndexes) {
-			await this.subscribeToSpotMarketAccount(marketIndex);
-		}
+		await Promise.all(
+			this.spotMarketIndexes.map((marketIndex) =>
+				this.subscribeToSpotMarketAccount(marketIndex)
+			)
+		);
 		return true;
 	}
 
@@ -193,11 +196,11 @@ export class WebSocketDriftClientAccountSubscriber
 	}
 
 	async subscribeToOracles(): Promise<boolean> {
-		for (const oracleInfo of this.oracleInfos) {
-			if (!oracleInfo.publicKey.equals(PublicKey.default)) {
-				await this.subscribeToOracle(oracleInfo);
-			}
-		}
+		await Promise.all(
+			this.oracleInfos
+				.filter((oracleInfo) => !oracleInfo.publicKey.equals(PublicKey.default))
+				.map((oracleInfo) => this.subscribeToOracle(oracleInfo))
+		);
 
 		return true;
 	}
@@ -232,21 +235,27 @@ export class WebSocketDriftClientAccountSubscriber
 	}
 
 	async unsubscribeFromMarketAccounts(): Promise<void> {
-		for (const accountSubscriber of this.perpMarketAccountSubscribers.values()) {
-			await accountSubscriber.unsubscribe();
-		}
+		await Promise.all(
+			Array.from(this.perpMarketAccountSubscribers.values()).map(
+				(accountSubscriber) => accountSubscriber.unsubscribe()
+			)
+		);
 	}
 
 	async unsubscribeFromSpotMarketAccounts(): Promise<void> {
-		for (const accountSubscriber of this.spotMarketAccountSubscribers.values()) {
-			await accountSubscriber.unsubscribe();
-		}
+		await Promise.all(
+			Array.from(this.spotMarketAccountSubscribers.values()).map(
+				(accountSubscriber) => accountSubscriber.unsubscribe()
+			)
+		);
 	}
 
 	async unsubscribeFromOracles(): Promise<void> {
-		for (const accountSubscriber of this.oracleSubscribers.values()) {
-			await accountSubscriber.unsubscribe();
-		}
+		await Promise.all(
+			Array.from(this.oracleSubscribers.values()).map((accountSubscriber) =>
+				accountSubscriber.unsubscribe()
+			)
+		);
 	}
 
 	public async fetch(): Promise<void> {
@@ -315,6 +324,7 @@ export class WebSocketDriftClientAccountSubscriber
 
 	async setPerpOracleMap() {
 		const perpMarkets = this.getMarketAccountsAndSlots();
+		const addOraclePromises = [];
 		for (const perpMarket of perpMarkets) {
 			if (!perpMarket) {
 				continue;
@@ -323,17 +333,21 @@ export class WebSocketDriftClientAccountSubscriber
 			const perpMarketIndex = perpMarketAccount.marketIndex;
 			const oracle = perpMarketAccount.amm.oracle;
 			if (!this.oracleSubscribers.has(oracle.toBase58())) {
-				await this.addOracle({
-					publicKey: oracle,
-					source: perpMarket.data.amm.oracleSource,
-				});
+				addOraclePromises.push(
+					this.addOracle({
+						publicKey: oracle,
+						source: perpMarket.data.amm.oracleSource,
+					})
+				);
 			}
 			this.perpOracleMap.set(perpMarketIndex, oracle);
 		}
+		await Promise.all(addOraclePromises);
 	}
 
 	async setSpotOracleMap() {
 		const spotMarkets = this.getSpotMarketAccountsAndSlots();
+		const addOraclePromises = [];
 		for (const spotMarket of spotMarkets) {
 			if (!spotMarket) {
 				continue;
@@ -342,13 +356,16 @@ export class WebSocketDriftClientAccountSubscriber
 			const spotMarketIndex = spotMarketAccount.marketIndex;
 			const oracle = spotMarketAccount.oracle;
 			if (!this.oracleSubscribers.has(oracle.toBase58())) {
-				await this.addOracle({
-					publicKey: oracle,
-					source: spotMarketAccount.oracleSource,
-				});
+				addOraclePromises.push(
+					this.addOracle({
+						publicKey: oracle,
+						source: spotMarketAccount.oracleSource,
+					})
+				);
 			}
 			this.spotOracleMap.set(spotMarketIndex, oracle);
 		}
+		await Promise.all(addOraclePromises);
 	}
 
 	assertIsSubscribed(): void {

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,6 @@ 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
+export const FUEL_START_TS = new BN(1715745600); // unix timestamp

package/src/constants/perpMarkets.ts

@@ -315,6 +315,18 @@ export const DevnetPerpMarkets: PerpMarketConfig[] = [
 		pythFeedId:
 			'0xb17e5bc5de742a8a378b54c9c75442b7d51e30ada63f28d9bd28d3c0e26511a0',
 	},
+	{
+		fullName: 'Wen',
+		category: ['Solana', 'Meme'],
+		symbol: 'WEN-PERP',
+		baseAssetSymbol: 'WEN',
+		marketIndex: 25,
+		oracle: new PublicKey('F47c7aJgYkfKXQ9gzrJaEpsNwUKHprysregTWXrtYLFp'),
+		launchTs: 1720572064000,
+		oracleSource: OracleSource.PYTH_1K_PULL,
+		pythFeedId:
+			'0x5169491cd7e2a44c98353b779d5eb612e4ac32e073f5cc534303d86307c2f1bc',
+	},
 ];
 
 export const MainnetPerpMarkets: PerpMarketConfig[] = [
@@ -722,6 +734,28 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		launchTs: 1719415157000,
 		oracleSource: OracleSource.SWITCHBOARD,
 	},
+	{
+		fullName: 'POPCAT',
+		category: ['Meme', 'Solana'],
+		symbol: 'POPCAT-PERP',
+		baseAssetSymbol: 'POPCAT',
+		marketIndex: 34,
+		oracle: new PublicKey('3GjpjC8TWsPqjyFSiR7saGxgzD8zqYJNsBnWpenZPEBy'),
+		launchTs: 1720013054000,
+		oracleSource: OracleSource.SWITCHBOARD,
+	},
+	{
+		fullName: 'Wen',
+		category: ['Solana', 'Meme'],
+		symbol: 'WEN-PERP',
+		baseAssetSymbol: 'WEN',
+		marketIndex: 35,
+		oracle: new PublicKey('F47c7aJgYkfKXQ9gzrJaEpsNwUKHprysregTWXrtYLFp'),
+		launchTs: 1720633344000,
+		oracleSource: OracleSource.PYTH_1K_PULL,
+		pythFeedId:
+			'0x5169491cd7e2a44c98353b779d5eb612e4ac32e073f5cc534303d86307c2f1bc',
+	},
 ];
 
 export const PerpMarkets: { [key in DriftEnv]: PerpMarketConfig[] } = {

package/src/constants/spotMarkets.ts

@@ -295,7 +295,7 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 	{
 		symbol: 'INF',
 		marketIndex: 16,
-		oracle: new PublicKey('6AQHz9mpGNjyVafcWdqzzgsJq14Cs8gG6MiQKmdAgCuP'),
+		oracle: new PublicKey('81SuhCcCQri9w4yPyv56ErtpXuncVyFCDT3fYehceG1M'),
 		oracleSource: OracleSource.SWITCHBOARD,
 		mint: new PublicKey('5oVNBeEEQvYi1cX3ir8Dx5n1P7pdxydbGF2X4TxVusJm'),
 		precision: new BN(10).pow(NINE),
@@ -334,6 +334,19 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 		precisionExp: SIX,
 		launchTs: 1719415157000,
 	},
+	{
+		symbol: 'POPCAT',
+		marketIndex: 20,
+		oracle: new PublicKey('3GjpjC8TWsPqjyFSiR7saGxgzD8zqYJNsBnWpenZPEBy'),
+		oracleSource: OracleSource.SWITCHBOARD,
+		mint: new PublicKey('7GCihgDB8fe6KNjn2MYtkzZcRjQy3t9GHdC8uHYmW2hr'),
+		precision: new BN(10).pow(NINE),
+		precisionExp: NINE,
+		launchTs: 1720013054000,
+		phoenixMarket: new PublicKey(
+			'31XgvAQ1HgFQEk31KdszbPkVXKaQqB1bgYZPoDrFpSR2'
+		),
+	},
 ];
 
 export const SpotMarkets: { [key in DriftEnv]: SpotMarketConfig[] } = {

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';