Merge pull request #364 from drift-labs/master

mb

Author: wphan

package.json

@@ -5,8 +5,8 @@
 	"main": "lib/index.js",
 	"license": "Apache-2.0",
 	"dependencies": {
-		"@drift-labs/jit-proxy": "0.12.82",
-		"@drift-labs/sdk": "2.109.0-beta.0",
+		"@drift-labs/jit-proxy": "0.12.85",
+		"@drift-labs/sdk": "2.109.0-beta.3",
 		"@opentelemetry/api": "1.7.0",
 		"@opentelemetry/auto-instrumentations-node": "0.31.2",
 		"@opentelemetry/exporter-prometheus": "0.31.0",

src/bots/pythLazerCranker.ts

@@ -84,7 +84,8 @@ export class PythLazerCrankerBot implements Bot {
 		this.pythLazerClient = new PythLazerSubscriber(
 			this.globalConfig.lazerEndpoint,
 			this.globalConfig.lazerToken,
-			feedIdChunks
+			feedIdChunks,
+			this.globalConfig.driftEnv
 		);
 		this.decodeFunc =
 			this.driftClient.program.account.pythLazerOracle.coder.accounts.decodeUnchecked.bind(

src/bots/trigger.ts

@@ -10,6 +10,7 @@ import {
 	PriorityFeeCalculator,
 	TxParams,
 	PublicKey,
+	BlockhashSubscriber,
 } from '@drift-labs/sdk';
 import { Mutex, tryAcquire, E_ALREADY_LOCKED } from 'async-mutex';
 
@@ -27,7 +28,8 @@ import {
 	View,
 } from '@opentelemetry/sdk-metrics-base';
 import { RuntimeSpec, metricAttrFromUserAccount } from '../metrics';
-import { getNodeToTriggerSignature } from '../utils';
+import { getNodeToTriggerSignature, getVersionedTransaction } from '../utils';
+import { AddressLookupTableAccount } from '@solana/web3.js';
 
 const TRIGGER_ORDER_COOLDOWN_MS = 10000; // time to wait between triggering an order
 
@@ -52,6 +54,8 @@ export class TriggerBot implements Bot {
 	private driftClient: DriftClient;
 	private slotSubscriber: SlotSubscriber;
 	private dlobSubscriber?: DLOBSubscriber;
+	private blockhashSubscriber: BlockhashSubscriber;
+	private lookupTableAccount?: AddressLookupTableAccount;
 	private triggeringNodes = new Map<string, number>();
 	private periodicTaskMutex = new Mutex();
 	private intervalIds: Array<NodeJS.Timer> = [];
@@ -77,6 +81,7 @@ export class TriggerBot implements Bot {
 	constructor(
 		driftClient: DriftClient,
 		slotSubscriber: SlotSubscriber,
+		blockhashSubscriber: BlockhashSubscriber,
 		userMap: UserMap,
 		runtimeSpec: RuntimeSpec,
 		config: BaseBotConfig
@@ -87,6 +92,7 @@ export class TriggerBot implements Bot {
 		this.userMap = userMap;
 		this.runtimeSpec = runtimeSpec;
 		this.slotSubscriber = slotSubscriber;
+		this.blockhashSubscriber = blockhashSubscriber;
 
 		this.metricsPort = config.metricsPort;
 		if (this.metricsPort) {
@@ -168,6 +174,9 @@ export class TriggerBot implements Bot {
 			driftClient: this.driftClient,
 		});
 		await this.dlobSubscriber.subscribe();
+
+		this.lookupTableAccount =
+			await this.driftClient.fetchMarketLookupTableAccount();
 	}
 
 	public async reset() {
@@ -198,6 +207,20 @@ export class TriggerBot implements Bot {
 		return healthy;
 	}
 
+	private async getBlockhashForTx(): Promise<string> {
+		const cachedBlockhash = this.blockhashSubscriber.getLatestBlockhash(10);
+		if (cachedBlockhash) {
+			return cachedBlockhash.blockhash as string;
+		}
+
+		const recentBlockhash =
+			await this.driftClient.connection.getLatestBlockhash({
+				commitment: 'confirmed',
+			});
+
+		return recentBlockhash.blockhash;
+	}
+
 	private async tryTriggerForPerpMarket(market: PerpMarketAccount) {
 		const marketIndex = market.marketIndex;
 
@@ -258,11 +281,11 @@ export class TriggerBot implements Bot {
 
 				ixs.push(await this.driftClient.getRevertFillIx());
 
-				const tx = await this.driftClient.txSender.getVersionedTransaction(
+				const tx = getVersionedTransaction(
+					this.driftClient.wallet.publicKey,
 					ixs,
-					[],
-					undefined,
-					this.driftClient.opts
+					[this.lookupTableAccount!],
+					await this.getBlockhashForTx()
 				);
 
 				this.driftClient

src/experimental-bots/swift/makerExample.ts

@@ -173,6 +173,11 @@ export class SwiftMaker {
 						})
 					);
 
+					if (this.dryRun) {
+						// console.log('Dry run, not sending transaction');
+						return;
+					}
+
 					const resp = await simulateAndGetTxWithCUs({
 						connection: this.driftClient.connection,
 						payerPublicKey: this.driftClient.wallet.payer!.publicKey,
@@ -185,10 +190,6 @@ export class SwiftMaker {
 						return;
 					}
 
-					if (this.dryRun) {
-						console.log('Dry run, not sending transaction');
-						return;
-					}
 					this.driftClient.txSender
 						.sendVersionedTransaction(resp.tx)
 						.then((response) => {

src/index.ts

@@ -741,10 +741,13 @@ const runBot = async () => {
 	if (configHasBot(config, 'trigger')) {
 		needUserMapSubscribe = true;
 		needDriftStateWatcher = true;
+		needBlockhashSubscriber = true;
+
 		bots.push(
 			new TriggerBot(
 				driftClient,
 				slotSubscriber,
+				blockhashSubscriber,
 				userMap,
 				{
 					rpcEndpoint: endpoint,

yarn.lock

@@ -175,20 +175,20 @@
     enabled "2.0.x"
     kuler "^2.0.0"
 
-"@drift-labs/[email protected].82":
-  version "0.12.82"
-  resolved "https://registry.yarnpkg.com/@drift-labs/jit-proxy/-/jit-proxy-0.12.82.tgz#b7befc69f3610fdbda16223f5b3e76aaffb0c242"
-  integrity sha512-AEkQgolsEkPfkyZHiHoZ4Kgj/JoKUBdOqluexoiQLj8AIftbe/RNpKc4EgClFkM0lpLplMau20yM0Oz5LaG74g==
+"@drift-labs/[email protected].85":
+  version "0.12.85"
+  resolved "https://registry.yarnpkg.com/@drift-labs/jit-proxy/-/jit-proxy-0.12.85.tgz#3a946e428404e653e15f42cf0bd675b0aaaa1444"
+  integrity sha512-yBkCh14OSWnKassQSQ4JXDmZe87xepGt1PNQhTAoMVlnxiZ2DxaTmc3P8H+SWr5Jk0FD6qMJFAkQJZddAhB9nw==
   dependencies:
     "@coral-xyz/anchor" "0.26.0"
-    "@drift-labs/sdk" "2.109.0-beta.0"
+    "@drift-labs/sdk" "2.109.0-beta.3"
     "@solana/web3.js" "1.91.7"
     tweetnacl-util "^0.15.1"
 
-"@drift-labs/[email protected].0":
-  version "2.109.0-beta.0"
-  resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.109.0-beta.0.tgz#b14ee689116798d96431e06bc175771abdb0cdd8"
-  integrity sha512-HBZAlqz/C30jcqL+Ml6f08JinwbQOYx6p3/s9ApEdM32ZwF584vBV66KohTMf17rdYBlyrCzBNKnedvG47yljw==
+"@drift-labs/[email protected].3":
+  version "2.109.0-beta.3"
+  resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.109.0-beta.3.tgz#a7e6c8698836ba59b93353509c2057f371d54df2"
+  integrity sha512-zOO8G5Wgm5RNd1LYdS18GprmXAAUSEKaSBM7gEVadCGzQmsVbTmmT1fKCAfIHYPdjcKfM0wc41qlZQaPPZuPPw==
   dependencies:
     "@coral-xyz/anchor" "0.29.0"
     "@coral-xyz/anchor-30" "npm:@coral-xyz/[email protected]"