Merge pull request #412 from drift-labs/master

rename fastlane -> swift

Author: moosecat2

.github/workflows/master.yml

@@ -67,5 +67,5 @@ jobs:
           kubectl rollout restart -n $BRANCH_NAME deployment/pyth-cranker-bot
           kubectl rollout restart -n $BRANCH_NAME deployment/pyth-lazer-cranker-bot
           kubectl rollout restart -n $BRANCH_NAME deployment/switchboard-cranker-bot
-          kubectl rollout restart -n $BRANCH_NAME deployment/fastlane-taker-example-bot
-          kubectl rollout restart -n $BRANCH_NAME deployment/fastlane-maker-example-bot
+          kubectl rollout restart -n $BRANCH_NAME deployment/swift-taker-example-bot
+          kubectl rollout restart -n $BRANCH_NAME deployment/swift-maker-example-bot

package.json

@@ -5,8 +5,8 @@
 	"main": "lib/index.js",
 	"license": "Apache-2.0",
 	"dependencies": {
-		"@drift-labs/jit-proxy": "0.13.61",
-		"@drift-labs/sdk": "2.113.0-beta.1",
+		"@drift-labs/jit-proxy": "0.13.66",
+		"@drift-labs/sdk": "2.113.0-beta.5",
 		"@opentelemetry/api": "1.7.0",
 		"@opentelemetry/auto-instrumentations-node": "0.31.2",
 		"@opentelemetry/exporter-prometheus": "0.31.0",

src/config.ts

@@ -147,8 +147,8 @@ export type BotConfigMap = {
 	pythCranker?: PythCrankerBotConfig;
 	pythLazerCranker?: PythLazerCrankerBotConfig;
 	switchboardCranker?: SwitchboardCrankerBotConfig;
-	fastlaneTaker?: BaseBotConfig;
-	fastlaneMaker?: BaseBotConfig;
+	swiftTaker?: BaseBotConfig;
+	swiftMaker?: BaseBotConfig;
 	jitMaker?: JitMakerConfig;
 };
 

src/experimental-bots/entrypoint.ts

@@ -37,8 +37,8 @@ import { promiseTimeout } from '@drift-labs/sdk';
 import { SpotFillerMultithreaded } from './spotFiller/spotFillerMultithreaded';
 import { setGlobalDispatcher, Agent } from 'undici';
 import { PythPriceFeedSubscriber } from '../pythPriceFeedSubscriber';
-import { FastlaneMaker } from './fastlane/makerExample';
-import { FastlaneTaker } from './fastlane/takerExample';
+import { SwiftMaker } from './swift/makerExample';
+import { SwiftTaker } from './swift/takerExample';
 import * as net from 'net';
 
 setGlobalDispatcher(
@@ -376,7 +376,7 @@ const runBot = async () => {
 		bots.push(spotFillerMultithreaded);
 	}
 
-	if (configHasBot(config, 'fastlaneMaker')) {
+	if (configHasBot(config, 'swiftMaker')) {
 		const userMap = new UserMap({
 			connection,
 			driftClient,
@@ -388,7 +388,7 @@ const runBot = async () => {
 		});
 		await userMap.subscribe();
 
-		const signedMsgMaker = new FastlaneMaker(
+		const signedMsgMaker = new SwiftMaker(
 			driftClient,
 			userMap,
 			{
@@ -403,8 +403,8 @@ const runBot = async () => {
 		bots.push(signedMsgMaker);
 	}
 
-	if (configHasBot(config, 'fastlaneTaker')) {
-		const signedMsgMaker = new FastlaneTaker(
+	if (configHasBot(config, 'swiftTaker')) {
+		const signedMsgMaker = new SwiftTaker(
 			driftClient,
 			{
 				rpcEndpoint: endpoint,

…filler-common/fastlaneOrderSubscriber.ts …ts/filler-common/swiftOrderSubscriber.tssrc/experimental-bots/filler-common/fastlaneOrderSubscriber.ts renamed to src/experimental-bots/filler-common/swiftOrderSubscriber.ts src/experimental-bots/filler-common/fastlaneOrderSubscriber.ts renamed to src/experimental-bots/filler-common/swiftOrderSubscriber.ts

@@ -12,20 +12,20 @@ import { sleepMs } from '../../utils';
 import dotenv from 'dotenv';
 import parseArgs from 'minimist';
 
-export type FastlaneOrderSubscriberConfig = {
+export type SwiftOrderSubscriberConfig = {
 	driftEnv: DriftEnv;
 	endpoint: string;
 	marketIndexes: number[];
 	keypair: Keypair;
 };
 
-export class FastlaneOrderSubscriber {
+export class SwiftOrderSubscriber {
 	private heartbeatTimeout: NodeJS.Timeout | null = null;
 	private readonly heartbeatIntervalMs = 60000;
 	private ws: WebSocket | null = null;
 	subscribed: boolean = false;
 
-	constructor(private config: FastlaneOrderSubscriberConfig) {}
+	constructor(private config: SwiftOrderSubscriberConfig) {}
 
 	getSymbolForMarketIndex(marketIndex: number) {
 		const markets =
@@ -174,20 +174,20 @@ async function main() {
 	}
 
 	const keypair = loadKeypair(privateKey);
-	const fastlaneOrderSubscriberConfig: FastlaneOrderSubscriberConfig = {
+	const swiftOrderSubscriberConfig: SwiftOrderSubscriberConfig = {
 		driftEnv,
 		endpoint:
 			driftEnv === 'devnet'
-				? 'wss://master.fastlane.drift.trade/ws'
-				: 'wss://fastlane.drift.trade/ws',
+				? 'wss://master.swift.drift.trade/ws'
+				: 'wss://swift.drift.trade/ws',
 		marketIndexes,
 		keypair,
 	};
 
-	const fastlaneOrderSubscriber = new FastlaneOrderSubscriber(
-		fastlaneOrderSubscriberConfig
+	const swiftOrderSubscriber = new SwiftOrderSubscriber(
+		swiftOrderSubscriberConfig
 	);
-	await fastlaneOrderSubscriber.subscribe();
+	await swiftOrderSubscriber.subscribe();
 }
 
 main();

src/experimental-bots/filler/fillerMultithreaded.ts

@@ -197,7 +197,7 @@ export class FillerMultithreaded {
 
 	private dlobHealthy = true;
 	private orderSubscriberHealthy = true;
-	private fastlaneOrderSubscriberHealth = true;
+	private swiftOrderSubscriberHealth = true;
 	private simulateTxForCUEstimate?: boolean;
 
 	// SignedMsg orders
@@ -598,17 +598,17 @@ export class FillerMultithreaded {
 		);
 
 		// SignedMsg Subscriber process
-		const fastlaneOrderSubscriberFileName =
-			'fastlaneOrderSubscriber' + (isTsRuntime() ? '.ts' : '.js');
-		const fastlaneOrderSubscriberProcess = spawnChild(
+		const swiftOrderSubscriberFileName =
+			'swiftOrderSubscriber' + (isTsRuntime() ? '.ts' : '.js');
+		const swiftOrderSubscriberProcess = spawnChild(
 			path.join(
 				__dirname,
 				isTsRuntime() ? '..' : '.',
 				'filler-common',
-				fastlaneOrderSubscriberFileName
+				swiftOrderSubscriberFileName
 			),
 			orderSubscriberArgs,
-			'fastlaneOrderSubscriber',
+			'swiftOrderSubscriber',
 			(msg: any) => {
 				switch (msg.type) {
 					case 'signedMsgOrderParamsMessage':
@@ -623,14 +623,14 @@ export class FillerMultithreaded {
 						}
 						break;
 					case 'health':
-						this.fastlaneOrderSubscriberHealth = msg.data.healthy;
+						this.swiftOrderSubscriberHealth = msg.data.healthy;
 						break;
 				}
 			}
 		);
 
-		fastlaneOrderSubscriberProcess.on('exit', (code) => {
-			logger.error(`fastlaneOrderSubscriber exited with code ${code}`);
+		swiftOrderSubscriberProcess.on('exit', (code) => {
+			logger.error(`swiftOrderSubscriber exited with code ${code}`);
 			process.exit(code || 1);
 		});
 
@@ -640,12 +640,12 @@ export class FillerMultithreaded {
 				value.process.kill();
 			});
 			orderSubscriberProcess.kill();
-			fastlaneOrderSubscriberProcess.kill();
+			swiftOrderSubscriberProcess.kill();
 			process.exit(0);
 		});
 
 		logger.info(
-			`fastlaneOrderSubscriber process spawned with pid: ${fastlaneOrderSubscriberProcess.pid}`
+			`swiftOrderSubscriber process spawned with pid: ${swiftOrderSubscriberProcess.pid}`
 		);
 
 		this.intervalIds.push(
@@ -837,13 +837,13 @@ export class FillerMultithreaded {
 		if (!this.orderSubscriberHealthy) {
 			logger.error(`${logPrefix} Order subscriber not healthy`);
 		}
-		if (!this.fastlaneOrderSubscriberHealth) {
+		if (!this.swiftOrderSubscriberHealth) {
 			logger.error(`${logPrefix} SignedMsg order subscriber not healthy`);
 		}
 		return (
 			this.dlobHealthy &&
 			this.orderSubscriberHealthy &&
-			this.fastlaneOrderSubscriberHealth
+			this.swiftOrderSubscriberHealth
 		);
 	}
 

…perimental-bots/fastlane/makerExample.ts …/experimental-bots/swift/makerExample.tssrc/experimental-bots/fastlane/makerExample.ts renamed to src/experimental-bots/swift/makerExample.ts src/experimental-bots/fastlane/makerExample.ts renamed to src/experimental-bots/swift/makerExample.ts

@@ -24,7 +24,7 @@ import {
 } from '@solana/web3.js';
 import { getPriorityFeeInstruction } from '../filler-common/utils';
 
-export class FastlaneMaker {
+export class SwiftMaker {
 	interval: NodeJS.Timeout | null = null;
 	private ws: WebSocket | null = null;
 	private signedMsgUrl: string;
@@ -39,8 +39,8 @@ export class FastlaneMaker {
 	) {
 		this.signedMsgUrl =
 			runtimeSpec.driftEnv === 'mainnet-beta'
-				? 'wss://fastlane.drift.trade/ws'
-				: 'wss://master.fastlane.drift.trade/ws';
+				? 'wss://swift.drift.trade/ws'
+				: 'wss://master.swift.drift.trade/ws';
 
 		const perpMarketsToWatchForFees = [0, 1, 2, 3, 4, 5].map((x) => {
 			return { marketType: 'perp', marketIndex: x };

…perimental-bots/fastlane/takerExample.ts …/experimental-bots/swift/takerExample.tssrc/experimental-bots/fastlane/takerExample.ts renamed to src/experimental-bots/swift/takerExample.ts src/experimental-bots/fastlane/takerExample.ts renamed to src/experimental-bots/swift/takerExample.ts

@@ -14,19 +14,19 @@ import { sleepMs } from '../../utils';
 
 const CONFIRM_TIMEOUT = 30_000;
 
-export class FastlaneTaker {
+export class SwiftTaker {
 	interval: NodeJS.Timeout | null = null;
-	fastlaneUrl: string;
+	swiftUrl: string;
 
 	constructor(
 		private driftClient: DriftClient,
 		runtimeSpec: RuntimeSpec,
 		private intervalMs: number
 	) {
-		this.fastlaneUrl =
+		this.swiftUrl =
 			runtimeSpec.driftEnv === 'mainnet-beta'
-				? 'https://fastlane.drift.trade'
-				: 'https://master.fastlane.drift.trade';
+				? 'https://swift.drift.trade'
+				: 'https://master.swift.drift.trade';
 	}
 
 	async init() {
@@ -82,7 +82,7 @@ export class FastlaneTaker {
 			);
 
 			const response = await axios.default.post(
-				this.fastlaneUrl + '/orders',
+				this.swiftUrl + '/orders',
 				{
 					market_index: marketIndex,
 					market_type: 'perp',
@@ -104,7 +104,7 @@ export class FastlaneTaker {
 			const expireTime = Date.now() + CONFIRM_TIMEOUT;
 			while (Date.now() < expireTime) {
 				const response = await axios.default.get(
-					this.fastlaneUrl +
+					this.swiftUrl +
 						'/confirmation/hash-status?hash=' +
 						encodeURIComponent(hash),
 					{

src/index.ts

@@ -38,7 +38,7 @@ import {
 	PerpMarkets,
 	configs,
 	AuctionSubscriber,
-	FastlaneOrderSubscriber,
+	SwiftOrderSubscriber,
 } from '@drift-labs/sdk';
 import { promiseTimeout } from '@drift-labs/sdk';
 
@@ -607,13 +607,12 @@ const runBot = async () => {
 			driftClient,
 			resubTimeoutMs: 30_000,
 		});
-		let fastlaneOrderSubscriber: FastlaneOrderSubscriber | undefined =
-			undefined;
+		let swiftOrderSubscriber: SwiftOrderSubscriber | undefined = undefined;
 		if (config.global.driftEnv === 'devnet') {
 			if (!config.botConfigs?.jitMaker?.marketIndexes) {
 				throw new Error('Market indexes must be specified for JIT Maker bot');
 			}
-			fastlaneOrderSubscriber = new FastlaneOrderSubscriber({
+			swiftOrderSubscriber = new SwiftOrderSubscriber({
 				driftEnv: 'devnet',
 				marketIndexes: config.botConfigs?.jitMaker?.marketIndexes,
 				keypair: new Keypair(),
@@ -632,9 +631,9 @@ const runBot = async () => {
 			auctionSubscriber,
 			driftClient,
 			jitProxyClient,
-			fastlaneOrderSubscriber,
+			swiftOrderSubscriber,
 			slotSubscriber,
-			auctionSubscriberIgnoresFastlaneOrders: !!fastlaneOrderSubscriber,
+			auctionSubscriberIgnoresSwiftOrders: !!swiftOrderSubscriber,
 		});
 		await jitter.subscribe();
 

yarn.lock

@@ -175,20 +175,20 @@
     enabled "2.0.x"
     kuler "^2.0.0"
 
-"@drift-labs/[email protected].61":
-  version "0.13.61"
-  resolved "https://registry.yarnpkg.com/@drift-labs/jit-proxy/-/jit-proxy-0.13.61.tgz#e2fa9ebf695a08500bed6f8beb208ef1a9b8c031"
-  integrity sha512-niACh0kawZZ46k9eiFTCJYY+xhjswRlXz2xrxHsTnInaPTWYvZ7p93Y98SaGXNRTq2m81mSX8XM4l3v0+muzjg==
+"@drift-labs/[email protected].66":
+  version "0.13.66"
+  resolved "https://registry.yarnpkg.com/@drift-labs/jit-proxy/-/jit-proxy-0.13.66.tgz#8f30822357b642cb870516471128be3657090bca"
+  integrity sha512-eBHZ0oLOrC8V0xuczszqvRbjFBvGo6guFeXM0hrlWMOfhOes8mGGocUGD1a00jsigPpPLVCAsmVEEfqValQEpA==
   dependencies:
     "@coral-xyz/anchor" "0.26.0"
-    "@drift-labs/sdk" "2.113.0-beta.1"
+    "@drift-labs/sdk" "2.113.0-beta.5"
     "@solana/web3.js" "1.91.7"
     tweetnacl-util "^0.15.1"
 
-"@drift-labs/[email protected].1":
-  version "2.113.0-beta.1"
-  resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.113.0-beta.1.tgz#5262e8ff1d424cd9b4284fb87722064f5fe6daf5"
-  integrity sha512-W2Gul59QvAemQyqckBJYIJc5fLNDv9kPs1lPxSszIS44eX/2JG55k+P6Rbf0kFKBaSwmRYvDoMYnvWzjR28iCQ==
+"@drift-labs/[email protected].5":
+  version "2.113.0-beta.5"
+  resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.113.0-beta.5.tgz#6a9882f58a5dbf719016b8020aac0481856dc8ec"
+  integrity sha512-Cg6Ib89GJ5zBFnS3xXlY0f0ZMfQ754BF7Utll1kx4xpvW6mK3Nt+XuwoUjTifQyT52vhr8WdrL5/NvokjvwTTg==
   dependencies:
     "@coral-xyz/anchor" "0.29.0"
     "@coral-xyz/anchor-30" "npm:@coral-xyz/[email protected]"