@drift-labs/sdk 2.38.1-beta.3 → 2.38.1-beta.5

package/VERSION

@@ -1 +1 @@
-2.38.1-beta.3
+2.38.1-beta.5

package/lib/accounts/pollingUserAccountSubscriber.js

@@ -37,7 +37,7 @@ class PollingUserAccountSubscriber {
             if (this.user && this.user.slot > slot) {
                 return;
             }
-            const account = this.program.account.user.coder.accounts.decodeUnchecked('User', buffer);
+            const account = this.program.account.user.coder.accounts.decode('User', buffer);
             this.user = { data: account, slot };
             this.eventEmitter.emit('userAccountUpdate', account);
             this.eventEmitter.emit('update');
@@ -57,7 +57,7 @@ class PollingUserAccountSubscriber {
         const { buffer, slot } = this.accountLoader.getBufferAndSlot(this.userAccountPublicKey);
         const currentSlot = (_b = (_a = this.user) === null || _a === void 0 ? void 0 : _a.slot) !== null && _b !== void 0 ? _b : 0;
         if (buffer && slot > currentSlot) {
-            const account = this.program.account.user.coder.accounts.decodeUnchecked('User', buffer);
+            const account = this.program.account.user.coder.accounts.decode('User', buffer);
             this.user = { data: account, slot };
         }
     }

package/lib/accounts/webSocketAccountSubscriber.js

@@ -78,7 +78,7 @@ class WebSocketAccountSubscriber {
             return this.decodeBufferFn(buffer);
         }
         else {
-            return this.program.account[this.accountName].coder.accounts.decodeUnchecked((0, utils_1.capitalize)(this.accountName), buffer);
+            return this.program.account[this.accountName].coder.accounts.decode((0, utils_1.capitalize)(this.accountName), buffer);
         }
     }
     unsubscribe() {

package/lib/driftClient.js

@@ -76,7 +76,9 @@ class DriftClient {
         this.connection = config.connection;
         this.wallet = config.wallet;
         this.opts = config.opts || anchor_1.AnchorProvider.defaultOptions();
-        this.provider = new anchor_1.AnchorProvider(config.connection, config.wallet, this.opts);
+        this.provider = new anchor_1.AnchorProvider(config.connection, 
+        // @ts-ignore
+        config.wallet, this.opts);
         this.program = new anchor_1.Program(drift_json_1.default, (_a = config.programID) !== null && _a !== void 0 ? _a : new web3_js_1.PublicKey(config_1.DRIFT_PROGRAM_ID), this.provider);
         this.authority = (_b = config.authority) !== null && _b !== void 0 ? _b : this.wallet.publicKey;
         this.activeSubAccountId = (_c = config.activeSubAccountId) !== null && _c !== void 0 ? _c : 0;
@@ -292,7 +294,9 @@ class DriftClient {
      * @param includeDelegates
      */
     async updateWallet(newWallet, subAccountIds, activeSubAccountId, includeDelegates, authoritySubaccountMap) {
-        const newProvider = new anchor_1.AnchorProvider(this.connection, newWallet, this.opts);
+        const newProvider = new anchor_1.AnchorProvider(this.connection, 
+        // @ts-ignore
+        newWallet, this.opts);
         const newProgram = new anchor_1.Program(drift_json_1.default, this.program.programId, newProvider);
         this.skipLoadUsers = false;
         // Update provider for txSender with new wallet details
@@ -1374,6 +1378,7 @@ class DriftClient {
             ]);
             const { txSig, slot } = await this.txSender.sendRawTransaction(signedVersionedMarketOrderTx.serialize(), this.opts);
             this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
+            // @ts-ignore
             return { txSig, signedFillTx: signedVersionedFillTx };
         }
         else {

package/lib/examples/loadDlob.js

@@ -16,7 +16,9 @@ const main = async () => {
     const rpcAddress = process.env.RPC_ADDRESS; // can use: https://api.devnet.solana.com for devnet; https://api.mainnet-beta.solana.com for mainnet;
     const connection = new web3_js_1.Connection(rpcAddress);
     // Set up the Provider
-    const provider = new anchor_1.AnchorProvider(connection, wallet, anchor_1.AnchorProvider.defaultOptions());
+    const provider = new anchor_1.AnchorProvider(connection, 
+    // @ts-ignore
+    wallet, anchor_1.AnchorProvider.defaultOptions());
     // Set up the Drift Clearing House
     const driftPublicKey = new web3_js_1.PublicKey(sdkConfig.DRIFT_PROGRAM_ID);
     const bulkAccountLoader = new __2.BulkAccountLoader(connection, 'confirmed', 1000);

package/lib/examples/makeTradeExample.js

@@ -23,7 +23,9 @@ const main = async () => {
     const rpcAddress = process.env.RPC_ADDRESS; // can use: https://api.devnet.solana.com for devnet; https://api.mainnet-beta.solana.com for mainnet;
     const connection = new web3_js_1.Connection(rpcAddress);
     // Set up the Provider
-    const provider = new anchor_1.AnchorProvider(connection, wallet, anchor_1.AnchorProvider.defaultOptions());
+    const provider = new anchor_1.AnchorProvider(connection, 
+    // @ts-ignore
+    wallet, anchor_1.AnchorProvider.defaultOptions());
     // Check SOL Balance
     const lamportsBalance = await connection.getBalance(wallet.publicKey);
     console.log('SOL balance:', lamportsBalance / 10 ** 9);

package/lib/index.d.ts

@@ -59,6 +59,7 @@ export * from './constants/numericConstants';
 export * from './serum/serumSubscriber';
 export * from './serum/serumFulfillmentConfigMap';
 export * from './phoenix/phoenixSubscriber';
+export * from './priorityFee/priorityFeeSubscriber';
 export * from './phoenix/phoenixFulfillmentConfigMap';
 export * from './tx/fastSingleTxSender';
 export * from './tx/retryTxSender';

package/lib/index.js

@@ -82,6 +82,7 @@ __exportStar(require("./constants/numericConstants"), exports);
 __exportStar(require("./serum/serumSubscriber"), exports);
 __exportStar(require("./serum/serumFulfillmentConfigMap"), exports);
 __exportStar(require("./phoenix/phoenixSubscriber"), exports);
+__exportStar(require("./priorityFee/priorityFeeSubscriber"), exports);
 __exportStar(require("./phoenix/phoenixFulfillmentConfigMap"), exports);
 __exportStar(require("./tx/fastSingleTxSender"), exports);
 __exportStar(require("./tx/retryTxSender"), exports);

package/lib/orderSubscriber/OrderSubscriber.js

@@ -76,7 +76,7 @@ class OrderSubscriber {
     tryUpdateUserAccount(key, buffer, slot) {
         const slotAndUserAccount = this.usersAccounts.get(key);
         if (!slotAndUserAccount || slotAndUserAccount.slot < slot) {
-            const userAccount = this.driftClient.program.account.user.coder.accounts.decodeUnchecked('User', buffer);
+            const userAccount = this.driftClient.program.account.user.coder.accounts.decode('User', buffer);
             const newOrders = userAccount.orders.filter((order) => {
                 var _a;
                 return order.slot.toNumber() > ((_a = slotAndUserAccount === null || slotAndUserAccount === void 0 ? void 0 : slotAndUserAccount.slot) !== null && _a !== void 0 ? _a : 0) &&

package/lib/priorityFee/priorityFeeSubscriber.d.ts

@@ -0,0 +1,22 @@
+/// <reference types="node" />
+import { Connection, PublicKey } from '@solana/web3.js';
+export declare class PriorityFeeSubscriber {
+    connection: Connection;
+    frequencyMs: number;
+    addresses: PublicKey[];
+    slotsToCheck: number;
+    intervalId?: NodeJS.Timer;
+    latestPriorityFee: number;
+    avgPriorityFee: number;
+    maxPriorityFee: number;
+    lastSlotSeen: number;
+    constructor({ connection, frequencyMs, addresses, slotsToCheck, }: {
+        connection: Connection;
+        frequencyMs: number;
+        addresses: PublicKey[];
+        slotsToCheck?: number;
+    });
+    subscribe(): Promise<void>;
+    load(): Promise<void>;
+    unsubscribe(): Promise<void>;
+}

package/lib/priorityFee/priorityFeeSubscriber.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PriorityFeeSubscriber = void 0;
+class PriorityFeeSubscriber {
+    constructor({ connection, frequencyMs, addresses, slotsToCheck = 10, }) {
+        this.latestPriorityFee = 0;
+        // avg of last {slotsToCheck} slots
+        this.avgPriorityFee = 0;
+        // max of last {slotsToCheck} slots
+        this.maxPriorityFee = 0;
+        this.lastSlotSeen = 0;
+        this.connection = connection;
+        this.frequencyMs = frequencyMs;
+        this.addresses = addresses;
+        this.slotsToCheck = slotsToCheck;
+    }
+    async subscribe() {
+        if (this.intervalId) {
+            return;
+        }
+        this.intervalId = setInterval(this.load.bind(this), this.frequencyMs);
+    }
+    async load() {
+        var _a, _b, _c;
+        // @ts-ignore
+        const rpcJSONResponse = await this.connection._rpcRequest('getRecentPrioritizationFees', [this.addresses]);
+        const descResults = (_c = (_b = (_a = rpcJSONResponse === null || rpcJSONResponse === void 0 ? void 0 : rpcJSONResponse.result) === null || _a === void 0 ? void 0 : _a.sort((a, b) => b.slot - a.slot)) === null || _b === void 0 ? void 0 : _b.slice(0, this.slotsToCheck)) !== null && _c !== void 0 ? _c : [];
+        if (!(descResults === null || descResults === void 0 ? void 0 : descResults.length))
+            return;
+        const mostRecentResult = descResults[0];
+        this.latestPriorityFee = mostRecentResult.prioritizationFee;
+        this.lastSlotSeen = mostRecentResult.slot;
+        this.avgPriorityFee =
+            descResults.reduce((a, b) => {
+                return a + b.prioritizationFee;
+            }, 0) / descResults.length;
+        this.maxPriorityFee = Math.max(...descResults.map((result) => result.prioritizationFee));
+    }
+    async unsubscribe() {
+        if (this.intervalId) {
+            clearInterval(this.intervalId);
+            this.intervalId = undefined;
+        }
+    }
+}
+exports.PriorityFeeSubscriber = PriorityFeeSubscriber;

package/lib/tokenFaucet.js

@@ -37,6 +37,7 @@ class TokenFaucet {
         this.connection = connection;
         this.wallet = wallet;
         this.opts = opts || anchor_1.AnchorProvider.defaultOptions();
+        // @ts-ignore
         const provider = new anchor_1.AnchorProvider(connection, wallet, this.opts);
         this.provider = provider;
         this.program = new anchor_1.Program(token_faucet_json_1.default, programId, provider);

package/lib/userMap/userMap.js

@@ -165,7 +165,7 @@ class UserMap {
         }
         for (const [key, buffer] of programAccountBufferMap.entries()) {
             if (!this.has(key)) {
-                const userAccount = this.driftClient.program.account.user.coder.accounts.decodeUnchecked('User', buffer);
+                const userAccount = this.driftClient.program.account.user.coder.accounts.decode('User', buffer);
                 await this.addPubkey(new web3_js_1.PublicKey(key), userAccount);
             }
         }
@@ -175,7 +175,7 @@ class UserMap {
                 this.userMap.delete(key);
             }
             else {
-                const userAccount = this.driftClient.program.account.user.coder.accounts.decodeUnchecked('User', programAccountBufferMap.get(key));
+                const userAccount = this.driftClient.program.account.user.coder.accounts.decode('User', programAccountBufferMap.get(key));
                 user.accountSubscriber.updateData(userAccount, slot);
             }
         }

package/lib/userMap/userStatsMap.js

@@ -141,7 +141,7 @@ class UserStatsMap {
         }
         for (const key of programAccountMap.keys()) {
             if (!this.has(key)) {
-                const userStatsAccount = this.driftClient.program.account.userStats.coder.accounts.decodeUnchecked('UserStats', programAccountMap.get(key).data);
+                const userStatsAccount = this.driftClient.program.account.userStats.coder.accounts.decode('UserStats', programAccountMap.get(key).data);
                 await this.addUserStat(new web3_js_1.PublicKey(key), userStatsAccount);
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.38.1-beta.3",
+	"version": "2.38.1-beta.5",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",
@@ -34,7 +34,7 @@
 		"access": "public"
 	},
 	"dependencies": {
-		"@coral-xyz/anchor": "0.26.0",
+		"@coral-xyz/anchor": "0.28.1-beta.2",
 		"@ellipsis-labs/phoenix-sdk": "^1.4.2",
 		"@project-serum/serum": "^0.13.38",
 		"@pythnetwork/client": "2.5.3",

package/src/accounts/pollingUserAccountSubscriber.ts

@@ -71,11 +71,10 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 					return;
 				}
 
-				const account =
-					this.program.account.user.coder.accounts.decodeUnchecked(
-						'User',
-						buffer
-					);
+				const account = this.program.account.user.coder.accounts.decode(
+					'User',
+					buffer
+				);
 				this.user = { data: account, slot };
 				this.eventEmitter.emit('userAccountUpdate', account);
 				this.eventEmitter.emit('update');
@@ -100,7 +99,7 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 		);
 		const currentSlot = this.user?.slot ?? 0;
 		if (buffer && slot > currentSlot) {
-			const account = this.program.account.user.coder.accounts.decodeUnchecked(
+			const account = this.program.account.user.coder.accounts.decode(
 				'User',
 				buffer
 			);

package/src/accounts/webSocketAccountSubscriber.ts

@@ -112,9 +112,10 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 		if (this.decodeBufferFn) {
 			return this.decodeBufferFn(buffer);
 		} else {
-			return this.program.account[
-				this.accountName
-			].coder.accounts.decodeUnchecked(capitalize(this.accountName), buffer);
+			return this.program.account[this.accountName].coder.accounts.decode(
+				capitalize(this.accountName),
+				buffer
+			);
 		}
 	}
 

package/src/driftClient.ts

@@ -174,6 +174,7 @@ export class DriftClient {
 		this.opts = config.opts || AnchorProvider.defaultOptions();
 		this.provider = new AnchorProvider(
 			config.connection,
+			// @ts-ignore
 			config.wallet,
 			this.opts
 		);
@@ -512,6 +513,7 @@ export class DriftClient {
 	): Promise<boolean> {
 		const newProvider = new AnchorProvider(
 			this.connection,
+			// @ts-ignore
 			newWallet,
 			this.opts
 		);
@@ -2473,6 +2475,7 @@ export class DriftClient {
 			);
 			this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
 
+			// @ts-ignore
 			return { txSig, signedFillTx: signedVersionedFillTx };
 		} else {
 			const marketOrderTx = wrapInTx(

package/src/examples/loadDlob.ts

@@ -28,6 +28,7 @@ const main = async () => {
 	// Set up the Provider
 	const provider = new AnchorProvider(
 		connection,
+		// @ts-ignore
 		wallet,
 		AnchorProvider.defaultOptions()
 	);

package/src/examples/makeTradeExample.ts

@@ -51,6 +51,7 @@ const main = async () => {
 	// Set up the Provider
 	const provider = new AnchorProvider(
 		connection,
+		// @ts-ignore
 		wallet,
 		AnchorProvider.defaultOptions()
 	);

package/src/index.ts

@@ -60,6 +60,7 @@ export * from './constants/numericConstants';
 export * from './serum/serumSubscriber';
 export * from './serum/serumFulfillmentConfigMap';
 export * from './phoenix/phoenixSubscriber';
+export * from './priorityFee/priorityFeeSubscriber';
 export * from './phoenix/phoenixFulfillmentConfigMap';
 export * from './tx/fastSingleTxSender';
 export * from './tx/retryTxSender';

package/src/orderSubscriber/OrderSubscriber.ts

@@ -106,7 +106,7 @@ export class OrderSubscriber {
 		const slotAndUserAccount = this.usersAccounts.get(key);
 		if (!slotAndUserAccount || slotAndUserAccount.slot < slot) {
 			const userAccount =
-				this.driftClient.program.account.user.coder.accounts.decodeUnchecked(
+				this.driftClient.program.account.user.coder.accounts.decode(
 					'User',
 					buffer
 				) as UserAccount;

package/src/priorityFee/priorityFeeSubscriber.ts

@@ -0,0 +1,75 @@
+import { Connection, PublicKey } from '@solana/web3.js';
+
+export class PriorityFeeSubscriber {
+	connection: Connection;
+	frequencyMs: number;
+	addresses: PublicKey[];
+	slotsToCheck: number;
+
+	intervalId?: NodeJS.Timer;
+
+	latestPriorityFee = 0;
+	// avg of last {slotsToCheck} slots
+	avgPriorityFee = 0;
+	// max of last {slotsToCheck} slots
+	maxPriorityFee = 0;
+	lastSlotSeen = 0;
+
+	public constructor({
+		connection,
+		frequencyMs,
+		addresses,
+		slotsToCheck = 10,
+	}: {
+		connection: Connection;
+		frequencyMs: number;
+		addresses: PublicKey[];
+		slotsToCheck?: number;
+	}) {
+		this.connection = connection;
+		this.frequencyMs = frequencyMs;
+		this.addresses = addresses;
+		this.slotsToCheck = slotsToCheck;
+	}
+
+	public async subscribe(): Promise<void> {
+		if (this.intervalId) {
+			return;
+		}
+
+		this.intervalId = setInterval(this.load.bind(this), this.frequencyMs);
+	}
+
+	public async load(): Promise<void> {
+		// @ts-ignore
+		const rpcJSONResponse: any = await this.connection._rpcRequest(
+			'getRecentPrioritizationFees',
+			[this.addresses]
+		);
+
+		const descResults: { slot: number; prioritizationFee: number }[] =
+			rpcJSONResponse?.result
+				?.sort((a, b) => b.slot - a.slot)
+				?.slice(0, this.slotsToCheck) ?? [];
+
+		if (!descResults?.length) return;
+
+		const mostRecentResult = descResults[0];
+		this.latestPriorityFee = mostRecentResult.prioritizationFee;
+		this.lastSlotSeen = mostRecentResult.slot;
+		this.avgPriorityFee =
+			descResults.reduce((a, b) => {
+				return a + b.prioritizationFee;
+			}, 0) / descResults.length;
+		this.maxPriorityFee = Math.max(
+			...descResults.map((result) => result.prioritizationFee)
+		);
+	}
+
+	public async unsubscribe(): Promise<void> {
+		if (this.intervalId) {
+			clearInterval(this.intervalId);
+			this.intervalId = undefined;
+		}
+	}
+}

package/src/tokenFaucet.ts

@@ -38,6 +38,7 @@ export class TokenFaucet {
 		this.connection = connection;
 		this.wallet = wallet;
 		this.opts = opts || AnchorProvider.defaultOptions();
+		// @ts-ignore
 		const provider = new AnchorProvider(connection, wallet, this.opts);
 		this.provider = provider;
 		this.program = new Program(tokenFaucet as Idl, programId, provider);

package/src/userMap/userMap.ts

@@ -235,7 +235,7 @@ export class UserMap implements UserMapInterface {
 		for (const [key, buffer] of programAccountBufferMap.entries()) {
 			if (!this.has(key)) {
 				const userAccount =
-					this.driftClient.program.account.user.coder.accounts.decodeUnchecked(
+					this.driftClient.program.account.user.coder.accounts.decode(
 						'User',
 						buffer
 					);
@@ -249,7 +249,7 @@ export class UserMap implements UserMapInterface {
 				this.userMap.delete(key);
 			} else {
 				const userAccount =
-					this.driftClient.program.account.user.coder.accounts.decodeUnchecked(
+					this.driftClient.program.account.user.coder.accounts.decode(
 						'User',
 						programAccountBufferMap.get(key)
 					);

package/src/userMap/userStatsMap.ts

@@ -197,7 +197,7 @@ export class UserStatsMap {
 		for (const key of programAccountMap.keys()) {
 			if (!this.has(key)) {
 				const userStatsAccount =
-					this.driftClient.program.account.userStats.coder.accounts.decodeUnchecked(
+					this.driftClient.program.account.userStats.coder.accounts.decode(
 						'UserStats',
 						programAccountMap.get(key).data
 					);