Merge pull request #441 from drift-labs/master

mb

Author: wphan

package.json

@@ -5,8 +5,8 @@
 	"main": "lib/index.js",
 	"license": "Apache-2.0",
 	"dependencies": {
-		"@drift-labs/jit-proxy": "0.15.9",
-		"@drift-labs/sdk": "2.117.0-beta.5",
+		"@drift-labs/jit-proxy": "0.15.15",
+		"@drift-labs/sdk": "2.118.0-beta.1",
 		"@drift/common": "file:./drift-common/common-ts",
 		"@opentelemetry/api": "1.7.0",
 		"@opentelemetry/auto-instrumentations-node": "0.31.2",

src/bots/trigger.ts

@@ -314,9 +314,10 @@ export class TriggerBot implements Bot {
 					.sendTransaction(tx)
 					.then((txSig) => {
 						logger.info(
-							`Triggered perp user (account: ${nodeToTrigger.node.userAccount.toString()}) perp order: ${nodeToTrigger.node.order.orderId.toString()}`
+							`Triggered perp user (account: ${nodeToTrigger.node.userAccount.toString()}) perp order: ${nodeToTrigger.node.order.orderId.toString()}: ${
+								txSig.txSig
+							}`
 						);
-						logger.info(`Tx: ${txSig}`);
 					})
 					.catch((error) => {
 						nodeToTrigger.node.haveTrigger = false;
@@ -413,9 +414,8 @@ export class TriggerBot implements Bot {
 					)
 					.then((txSig) => {
 						logger.info(
-							`Triggered user (account: ${nodeToTrigger.node.userAccount.toString()}) spot order: ${nodeToTrigger.node.order.orderId.toString()}`
+							`Triggered spot user (account: ${nodeToTrigger.node.userAccount.toString()}) spot order: ${nodeToTrigger.node.order.orderId.toString()}: ${txSig}`
 						);
-						logger.info(`Tx: ${txSig}`);
 					})
 					.catch((error) => {
 						nodeToTrigger.node.haveTrigger = false;

src/bots/userPnlSettler.ts

@@ -53,7 +53,7 @@ const SLEEP_MS = 500;
 const CU_EST_MULTIPLIER = 1.25;
 
 const FILTER_FOR_MARKET = undefined; // undefined;
-const EMPTY_USER_SETTLE_INTERVAL_MS = 5 * 60 * 1000; // 5 minutes
+const EMPTY_USER_SETTLE_INTERVAL_MS = 1 * 60 * 1000; // 1 minutes
 
 const errorCodesToSuppress = [
 	6010, // Error Code: UserHasNoPositionInMarket. Error Number: 6010. Error Message: User Has No Position In Market.
@@ -67,7 +67,7 @@ export class UserPnlSettlerBot implements Bot {
 	public readonly name: string;
 	public readonly dryRun: boolean;
 	public readonly runOnce: boolean;
-	public readonly defaultIntervalMs: number = 15 * 60 * 1000;
+	public readonly defaultIntervalMs: number = 5 * 60 * 1000;
 
 	private driftClient: DriftClient;
 	private slotSubscriber: SlotSubscriber;
@@ -247,6 +247,9 @@ export class UserPnlSettlerBot implements Bot {
 
 			for (const user of this.userMap!.values()) {
 				const userAccount = user.getUserAccount();
+				if (userAccount.poolId !== 0) {
+					continue;
+				}
 				const userAccKeyStr = user.getUserAccountPublicKey().toBase58();
 				const isUsdcBorrow =
 					userAccount.spotPositions[0] &&
@@ -604,6 +607,9 @@ export class UserPnlSettlerBot implements Bot {
 				}[]
 			> = new Map();
 			for (const user of this.userMap!.values()) {
+				if (user.getUserAccount().poolId !== 0) {
+					continue;
+				}
 				const perpPositions = user.getActivePerpPositions();
 				for (const perpPosition of perpPositions) {
 					// this loop only processes empty positions

yarn.lock

@@ -441,20 +441,20 @@
     enabled "2.0.x"
     kuler "^2.0.0"
 
-"@drift-labs/[email protected].9":
-  version "0.15.9"
-  resolved "https://registry.yarnpkg.com/@drift-labs/jit-proxy/-/jit-proxy-0.15.9.tgz#5761f0dddc13732985d615b5f45431b06a91a5a7"
-  integrity sha512-7LfrS7yAMZvUUr9yDLwbym6XxOcwBdb9E7nz5c75lKaIkUmcrWpv7e0s4WvkjMjzCQgWloeh0b8x0nhTWTIXUw==
+"@drift-labs/[email protected].15":
+  version "0.15.15"
+  resolved "https://registry.yarnpkg.com/@drift-labs/jit-proxy/-/jit-proxy-0.15.15.tgz#5c0e3ddae507c6b0b4cfec2f6ab5b93c859a745f"
+  integrity sha512-JhJ6Tlbn0y6woBI0cX7963+T0rPd9YazB7IpbER1vhIR6UlYjTQYzPl8XUVOrAjZZaUnF5DC+dQaTcCtSEeq4g==
   dependencies:
     "@coral-xyz/anchor" "0.26.0"
-    "@drift-labs/sdk" "2.117.0-beta.5"
+    "@drift-labs/sdk" "2.118.0-beta.1"
     "@solana/web3.js" "1.91.7"
     tweetnacl-util "^0.15.1"
 
-"@drift-labs/sdk@2.117.0-beta.5":
-  version "2.117.0-beta.5"
-  resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.117.0-beta.5.tgz#418572200dbc335e8c9b7af26173dc66b7fc8a85"
-  integrity sha512-0NhsMJxxku5pg44DLVWBOTtxouVG2l8ZQ3mh9U5TIoZPixDQ2p0GzN++yNNlPCM3c0iRZhC0Hg00lQhPIgJkIA==
+"@drift-labs/sdk@2.118.0-beta.1":
+  version "2.118.0-beta.1"
+  resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.118.0-beta.1.tgz#7f55656dbc30cb96695844369685d9043173feb3"
+  integrity sha512-DwYTbyfkJQYDJDri3nSvb0CR4gkW4WlsQY+p1eLyFHW0Xf/PiXs9pycICAYqHBQispovJASPgGKNgOGUDEXB2w==
   dependencies:
     "@coral-xyz/anchor" "0.29.0"
     "@coral-xyz/anchor-30" "npm:@coral-xyz/[email protected]"
@@ -512,7 +512,7 @@
 "@drift/common@file:./drift-common/common-ts":
   version "1.0.0"
   dependencies:
-    "@drift-labs/sdk" "file:../../Library/Caches/Yarn/v6/[email protected]93fc5fb6-00fc-4b8a-9f24-bf22b9af4261-1743102079480/node_modules/@drift/protocol/sdk"
+    "@drift-labs/sdk" "file:../../../.cache/yarn/v6/[email protected]979653c7-734b-4034-9ab7-10bd474535dc-1743528403202/node_modules/@drift/protocol/sdk"
     "@jest/globals" "29.3.1"
     "@slack/web-api" "6.4.0"
     "@solana/spl-token" "0.3.8"