Merge branch 'master' into mainnet-beta

Author: wphan

src/bots/common/jetTxSender.ts

@@ -1,8 +1,4 @@
-import {
-	ConfirmOptions,
-	Connection,
-	SendTransactionError,
-} from '@solana/web3.js';
+import { ConfirmOptions, Connection } from '@solana/web3.js';
 import { logger } from '../../logger';
 import { WhileValidTxSender } from '@drift-labs/sdk';
 

src/bots/common/timedLookup.ts

@@ -21,7 +21,7 @@ export function timedCacheableLookup(
 	// Use cacheable lookup instead of direct dns.lookup
 	//@ts-ignore
 	cacheable.lookup(hostname, options, (err, address, family) => {
-		console.log(`Cached Lookup: ${hostname}: ${hrtimeMs() - start}ms`);
+		console.debug(`Cached Lookup: ${hostname}: ${hrtimeMs() - start}ms`);
 		callback(err, address, family);
 	});
 }

src/bots/makerBidAskTwapCrank.ts

@@ -13,6 +13,7 @@ import {
 	isOneOfVariant,
 	getVariant,
 	PerpMarkets,
+	BlockhashSubscriber,
 } from '@drift-labs/sdk';
 import { Mutex } from 'async-mutex';
 
@@ -51,6 +52,8 @@ const MAX_PRIORITY_FEE = process.env.MAX_PRIORITY_FEE
 	? parseInt(process.env.MAX_PRIORITY_FEE) || 500_000
 	: 500_000;
 
+const CACHED_BLOCKHASH_OFFSET = 5;
+
 const SLOT_STALENESS_THRESHOLD_RESTART = process.env
 	.SLOT_STALENESS_THRESHOLD_RESTART
 	? parseInt(process.env.SLOT_STALENESS_THRESHOLD_RESTART) || 300
@@ -209,6 +212,7 @@ export class MakerBidAskTwapCrank implements Bot {
 	private pythPullOracleClient: PythPullClient;
 	private pythHealthy: boolean = true;
 	private lookupTableAccounts: AddressLookupTableAccount[];
+	private blockhashSubscriber: BlockhashSubscriber;
 
 	private bundleSender?: BundleSender;
 	private crankIntervalToMarketIndicies?: { [key: number]: number[] };
@@ -220,6 +224,7 @@ export class MakerBidAskTwapCrank implements Bot {
 		config: MakerBidAskTwapCrankConfig,
 		globalConfig: GlobalConfig,
 		runOnce: boolean,
+		blockhashSubscriber: BlockhashSubscriber,
 		pythPriceSubscriber?: PythPriceFeedSubscriber,
 		lookupTableAccounts: AddressLookupTableAccount[] = [],
 		bundleSender?: BundleSender
@@ -236,6 +241,7 @@ export class MakerBidAskTwapCrank implements Bot {
 		this.pythPullOracleClient = new PythPullClient(this.driftClient.connection);
 		this.bundleSender = bundleSender;
 		this.crankIntervalToMarketIndicies = config.crankIntervalToMarketIndicies;
+		this.blockhashSubscriber = blockhashSubscriber;
 
 		// Pyth lazer: remember to remove devnet guard
 		if (!this.globalConfig.lazerEndpoints || !this.globalConfig.lazerToken) {
@@ -428,8 +434,7 @@ export class MakerBidAskTwapCrank implements Bot {
 		ixs: TransactionInstruction[],
 		doSimulation = true
 	): Promise<VersionedTransaction | undefined> {
-		const recentBlockhash =
-			await this.driftClient.connection.getLatestBlockhash('confirmed');
+		const recentBlockhash = await this.getBlockhashForTx();
 
 		let simResult: SimulateAndGetTxWithCUsResponse | undefined;
 		try {
@@ -441,7 +446,7 @@ export class MakerBidAskTwapCrank implements Bot {
 				cuLimitMultiplier: CU_EST_MULTIPLIER,
 				minCuLimit: TWAP_CRANK_MIN_CU,
 				doSimulation,
-				recentBlockhash: recentBlockhash.blockhash,
+				recentBlockhash,
 			});
 		} catch (error) {
 			logger.error(`[${this.name}] simulating tx: ${error}`);
@@ -469,6 +474,21 @@ export class MakerBidAskTwapCrank implements Bot {
 		}
 	}
 
+	private async getBlockhashForTx(): Promise<string> {
+		const cachedBlockhash = this.blockhashSubscriber.getLatestBlockhash(
+			CACHED_BLOCKHASH_OFFSET
+		);
+		if (cachedBlockhash) {
+			return cachedBlockhash.blockhash as string;
+		}
+
+		const recentBlockhash =
+			await this.driftClient.connection.getLatestBlockhash({
+				commitment: 'confirmed',
+			});
+		return recentBlockhash.blockhash;
+	}
+
 	private async getPythIxsFromTwapCrankInfo(
 		crankMarketIndex: number,
 		precedingIxs: TransactionInstruction[] = []

src/index.ts

@@ -902,6 +902,7 @@ const runBot = async () => {
 
 	if (configHasBot(config, 'markTwapCrank')) {
 		needPythPriceSubscriber = true;
+		needBlockhashSubscriber = true;
 		needCheckDriftUser = true;
 		needUserMapSubscribe = true;
 		needDriftStateWatcher = true;
@@ -914,6 +915,7 @@ const runBot = async () => {
 				config.botConfigs!.markTwapCrank!,
 				config.global,
 				config.global.runOnce ?? false,
+				blockhashSubscriber,
 				pythPriceSubscriber,
 				[],
 				bundleSender