Merge pull request #522 from drift-labs/master

merge mainnet

Author: moosecat2

package.json

@@ -42,7 +42,25 @@
 		"yaml": "2.3.4"
 	},
 	"resolutions": {
-		"jito-ts": "4.1.1"
+		"jito-ts": "4.1.1",
+		"chalk": "<5.6.1",
+		"debug": "<4.4.2",
+		"ansi-styles": "<6.2.2",
+		"supports-color": "<10.2.1",
+		"strip-ansi": "<7.1.1",
+		"ansi-regex": "<6.2.1",
+		"wrap-ansi": "<9.0.1",
+		"color-convert": "<3.1.1",
+		"color-name": "<2.0.1",
+		"color-string": "<2.1.1",
+		"simple-swizzle": "<0.2.3",
+		"is-arrayish": "<0.3.3",
+		"slice-ansi": "<7.1.1",
+		"error-ex": "<1.3.3",
+		"backslash": "<0.2.1",
+		"chalk-template": "<1.1.1",
+		"supports-hyperlinks": "<4.1.1",
+		"has-ansi": "<6.0.1"
 	},
 	"devDependencies": {
 		"@types/chai": "4.3.11",

src/bots/filler.ts

@@ -355,10 +355,6 @@ export class FillerBot extends TxThreaded implements Bot {
 		);
 
 		this.priorityFeeSubscriber = priorityFeeSubscriber;
-		this.priorityFeeSubscriber.updateAddresses([
-			new PublicKey('8BnEgHoWFysVcuFFX7QztDmzuH8r5ZFvyP3sYwn1XTh6'), // Openbook SOL/USDC
-			new PublicKey('8UJgxaiQx5nTrdDgph5FiahMmzduuLTLf5WmsPegYA6W'), // sol-perp
-		]);
 		this.blockhashSubscriber = blockhashSubscriber;
 
 		this.expiredNodesSet = new LRUCache<string, boolean>({

src/bots/liquidator.ts

@@ -2666,12 +2666,8 @@ export class LiquidatorBot implements Bot {
 						}
 					}
 
-					const baseAmountToLiquidate = this.calculateBaseAmountToLiquidate(
-						user.getPerpPositionWithLPSettle(
-							liquidateePosition.marketIndex,
-							liquidateePosition
-						)[0]
-					);
+					const baseAmountToLiquidate =
+						this.calculateBaseAmountToLiquidate(liquidateePosition);
 
 					const subAccountToLiqPerp = this.getSubAccountIdToLiquidatePerp(
 						liquidateePosition.marketIndex

src/bots/pythCranker.ts

@@ -259,10 +259,6 @@ export class PythCrankerBot implements Bot {
 				this.feedIdToPriceFeedMap.set(priceFeed.id, priceFeed);
 			}
 		);
-
-		this.priorityFeeSubscriber?.updateAddresses([
-			this.driftClient.getReceiverProgram().programId,
-		]);
 	}
 
 	async reset(): Promise<void> {

src/bots/pythLazerCranker.ts

@@ -7,7 +7,6 @@ import {
 	DevnetPerpMarkets,
 	DevnetSpotMarkets,
 	DriftClient,
-	getPythLazerOraclePublicKey,
 	getVariant,
 	MainnetPerpMarkets,
 	MainnetSpotMarkets,
@@ -170,15 +169,6 @@ export class PythLazerCrankerBot implements Bot {
 		);
 
 		await this.pythLazerClient.subscribe();
-
-		this.priorityFeeSubscriber?.updateAddresses(
-			this.pythLazerClient.allSubscribedIds.map((feedId) =>
-				getPythLazerOraclePublicKey(
-					this.driftClient.program.programId,
-					Number(feedId)
-				)
-			)
-		);
 	}
 
 	async reset(): Promise<void> {