Merge pull request #429 from drift-labs/master

fix place sim guard

Author: moosecat2

src/experimental-bots/swift/placerExample.ts

@@ -26,7 +26,12 @@ import { RuntimeSpec } from 'src/metrics';
 import WebSocket from 'ws';
 import nacl from 'tweetnacl';
 import { decodeUTF8 } from 'tweetnacl-util';
-import { getWallet, simulateAndGetTxWithCUs, sleepMs } from '../../utils';
+import {
+	getWallet,
+	simulateAndGetTxWithCUs,
+	SimulateAndGetTxWithCUsResponse,
+	sleepMs,
+} from '../../utils';
 import {
 	ComputeBudgetProgram,
 	Keypair,
@@ -283,15 +288,22 @@ export class SwiftPlacer {
 						true
 					);
 
-					const resp = await simulateAndGetTxWithCUs({
-						connection: this.driftClient.connection,
-						payerPublicKey: this.driftClient.wallet.payer!.publicKey,
-						ixs: [...computeBudgetIxs, ...ixs, fillIx],
-						cuLimitMultiplier: 1.5,
-						lookupTableAccounts:
-							await this.driftClient.fetchAllLookupTableAccounts(),
-						doSimulation: true,
-					});
+					let resp: SimulateAndGetTxWithCUsResponse | undefined;
+					try {
+						resp = await simulateAndGetTxWithCUs({
+							connection: this.driftClient.connection,
+							payerPublicKey: this.driftClient.wallet.payer!.publicKey,
+							ixs: [...computeBudgetIxs, ...ixs, fillIx],
+							cuLimitMultiplier: 1.5,
+							lookupTableAccounts:
+								await this.driftClient.fetchAllLookupTableAccounts(),
+							doSimulation: true,
+						});
+					} catch (e) {
+						console.error(e);
+						return;
+					}
+
 					if (resp.simError) {
 						console.log(resp.simTxLogs);
 						return;

src/experimental-bots/swift/takerExample.ts

@@ -7,6 +7,7 @@ import {
 	digestSignature,
 	generateSignedMsgUuid,
 	BN,
+	OrderParams,
 } from '@drift-labs/sdk';
 import { RuntimeSpec } from 'src/metrics';
 import * as axios from 'axios';
@@ -53,28 +54,27 @@ export class SwiftTaker {
 			const highPrice = oracleInfo.price.muln(101).divn(100);
 			const lowPrice = oracleInfo.price;
 
+			const marketOrderParams = getMarketOrderParams({
+				marketIndex,
+				marketType: MarketType.PERP,
+				direction,
+				baseAssetAmount: this.driftClient
+					.getPerpMarketAccount(marketIndex)!
+					.amm.minOrderSize.muln(2),
+				auctionStartPrice: isVariant(direction, 'long') ? lowPrice : highPrice,
+				auctionEndPrice: isVariant(direction, 'long') ? highPrice : lowPrice,
+				auctionDuration: 50,
+			});
+
 			const orderMessage = {
-				signedMsgOrderParams: getMarketOrderParams({
-					marketIndex,
-					marketType: MarketType.PERP,
-					direction,
-					baseAssetAmount: this.driftClient
-						.getPerpMarketAccount(marketIndex)!
-						.amm.minOrderSize.muln(2),
-					auctionStartPrice: isVariant(direction, 'long')
-						? lowPrice
-						: highPrice,
-					auctionEndPrice: isVariant(direction, 'long') ? highPrice : lowPrice,
-					auctionDuration: 50,
-				}),
+				signedMsgOrderParams: marketOrderParams as OrderParams,
 				subAccountId: this.driftClient.activeSubAccountId,
 				slot: new BN(slot),
 				uuid: generateSignedMsgUuid(),
 				stopLossOrderParams: null,
 				takeProfitOrderParams: null,
 			};
 			const { orderParams: message, signature } =
-				//@ts-ignore
 				this.driftClient.signSignedMsgOrderParamsMessage(orderMessage);
 
 			const hash = digestSignature(Uint8Array.from(signature));