Merge branch 'master' into mainnet-beta

Author: wphan

package.json

@@ -5,8 +5,8 @@
 	"main": "lib/index.js",
 	"license": "Apache-2.0",
 	"dependencies": {
-		"@drift-labs/jit-proxy": "0.21.116",
-		"@drift-labs/sdk": "2.150.0-beta.3",
+		"@drift-labs/jit-proxy": "0.21.118",
+		"@drift-labs/sdk": "2.150.0-beta.5",
 		"@drift/common": "file:./drift-common/common-ts",
 		"@opentelemetry/api": "1.7.0",
 		"@opentelemetry/auto-instrumentations-node": "^0.62.1",

src/bots/common/threads/txSender.ts

@@ -486,7 +486,7 @@ export class TxSender {
 							simResult.cuEstimate
 						} simError: ${JSON.stringify(
 							simResult.simError
-						)}, sim tx logs:\n${JSON.stringify(simResult.simTxLogs, null, 2)}`
+						)}, sim logs:\n${JSON.stringify(simResult.simTxLogs, null, 2)}`
 					);
 				}
 				this.metrics.txAttempted++;

src/bots/filler.ts

@@ -1842,7 +1842,9 @@ export class FillerBot extends TxThreaded implements Bot {
 				logger.error(
 					`simError: ${JSON.stringify(
 						simResult.simError
-					)} (fillTxId: ${fillTxId})`
+					)} (fillTxId: ${fillTxId}), sim logs:\n${
+						simResult.simTxLogs ? simResult.simTxLogs.join('\n') : 'none'
+					}`
 				);
 				handleSimResultError(
 					simResult,
@@ -2094,7 +2096,7 @@ export class FillerBot extends TxThreaded implements Bot {
 				logger.error(
 					`executeTriggerablePerpNodesForMarket simError: (simError: ${JSON.stringify(
 						simResult.simError
-					)}, logs: ${JSON.stringify(simResult.simTxLogs)})`
+					)}, sim logs: ${JSON.stringify(simResult.simTxLogs)})`
 				);
 				handleSimResultError(
 					simResult,
@@ -2246,7 +2248,11 @@ export class FillerBot extends TxThreaded implements Bot {
 
 						if (this.simulateTxForCUEstimate && simResult.simError) {
 							logger.info(
-								`settlePnls simError: ${JSON.stringify(simResult.simError)}`
+								`settlePnls simError: ${JSON.stringify(
+									simResult.simError
+								)}, sim logs:\n${
+									simResult.simTxLogs ? simResult.simTxLogs.join('\n') : 'none'
+								}`
 							);
 							handleSimResultError(
 								simResult,

src/experimental-bots/filler/fillerMultithreaded.ts

@@ -1944,7 +1944,9 @@ export class FillerMultithreaded {
 			logger.error(
 				`simError: ${JSON.stringify(
 					simResult.simError
-				)} (fillTxId: ${fillTxId})`
+				)} (fillTxId: ${fillTxId}), sim logs:\n${
+					simResult.simTxLogs ? simResult.simTxLogs.join('\n') : 'none'
+				}`
 			);
 		} else {
 			if (this.hasEnoughSolToFill) {
@@ -2158,7 +2160,11 @@ export class FillerMultithreaded {
 
 						if (this.simulateTxForCUEstimate && simResult.simError) {
 							logger.info(
-								`settlePnls simError: ${JSON.stringify(simResult.simError)}`
+								`settlePnls simError: ${JSON.stringify(
+									simResult.simError
+								)}, sim logs:\n${
+									simResult.simTxLogs ? simResult.simTxLogs.join('\n') : 'none'
+								}`
 							);
 							handleSimResultError(
 								simResult,

src/experimental-bots/spotFiller/spotFillerMultithreaded.ts

@@ -1029,7 +1029,9 @@ export class SpotFillerMultithreaded {
 			logger.error(
 				`simError: ${JSON.stringify(
 					simResult.simError
-				)} (fillTxId: ${fillTxId})`
+				)} (fillTxId: ${fillTxId}), sim logs:\n${
+					simResult.simTxLogs ? simResult.simTxLogs.join('\n') : 'none'
+				}`
 			);
 			handleSimResultError(
 				simResult,

yarn.lock

@@ -112,21 +112,21 @@
     enabled "2.0.x"
     kuler "^2.0.0"
 
-"@drift-labs/[email protected].116":
-  version "0.21.116"
-  resolved "https://registry.yarnpkg.com/@drift-labs/jit-proxy/-/jit-proxy-0.21.116.tgz#991b5265a7fee45f7c072df0b4a712ef09802104"
-  integrity sha512-m5l0hv8+B2rj7YHOq3sW1fhNaLbwmqq/eZvWfjzkxgw5rfAJnlc3inena0bP9VqRWnLJzPkk8liAd60LD7Bb4w==
+"@drift-labs/[email protected].118":
+  version "0.21.118"
+  resolved "https://registry.yarnpkg.com/@drift-labs/jit-proxy/-/jit-proxy-0.21.118.tgz#e581aed5598cc75884968f5c229b47f7441d192f"
+  integrity sha512-h6HxaIWfQ92Oz2p9Vd+t+83tzlohQGpttgChb5n6sbTM3O13U1U8Z8eUMa5m1twSQjG4LpLsBvrOlbBal4l+Wg==
   dependencies:
     "@coral-xyz/anchor" "0.29.0"
-    "@drift-labs/sdk" "2.150.0-beta.3"
+    "@drift-labs/sdk" "2.150.0-beta.5"
     "@solana/web3.js" "1.98.0"
     tweetnacl-util "^0.15.1"
     typescript "5.4.5"
 
-"@drift-labs/[email protected].3":
-  version "2.150.0-beta.3"
-  resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.150.0-beta.3.tgz#c8522eb71fcf6aef3b6148c51d54c893c62168db"
-  integrity sha512-jA+y+lKH/6kHbXwFGGmuhs26Va3UK427TH8Jrzx+C6vRQieJkNwwWJq/H0NS6HfjBFt7ExdZTVtv9yDeMQ8TGg==
+"@drift-labs/[email protected].5":
+  version "2.150.0-beta.5"
+  resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.150.0-beta.5.tgz#61530f73ab9c60f392dcf6f09119f3ca91120df5"
+  integrity sha512-4Tx9OOiLQW29XKm9j/8gKZGm4Oq2cDz/x5DEtRUyg6GJHy1wm6s+kwOpJ+4d498QqgBISoTJGRhieYWe9mLQdw==
   dependencies:
     "@coral-xyz/anchor" "0.29.0"
     "@coral-xyz/anchor-30" "npm:@coral-xyz/[email protected]"