@drift-labs/jit-proxy 0.17.79 → 0.17.80

package/lib/jitProxyClient.d.ts

@@ -30,6 +30,18 @@ export declare class PriceType {
         oracle: {};
     };
 }
+/**
+ * Validates the price type and returns the corresponding enum value. (required for type checking because of how anchor handles recursive types in IDL)
+ */
+export declare function validatePriceType(priceType: PriceType): typeof PriceType.LIMIT | typeof PriceType.ORACLE;
+/**
+ * Validates the PostOnlyParams and returns the corresponding enum value. (required for type checking because of how anchor handles recursive types in IDL)
+ */
+export declare function validatePostOnlyParams(postOnly: PostOnlyParams): typeof PostOnlyParams.NONE | typeof PostOnlyParams.MUST_POST_ONLY | typeof PostOnlyParams.TRY_POST_ONLY | typeof PostOnlyParams.SLIDE;
+/**
+ * Validates the market type and returns the corresponding enum value. (required for type checking because of how anchor handles recursive types in IDL)
+ */
+export declare function validateMarketType(marketType: MarketType): typeof MarketType.PERP | typeof MarketType.SPOT;
 export type OrderConstraint = {
     maxPosition: BN;
     minPosition: BN;

package/lib/jitProxyClient.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JitProxyClient = exports.PriceType = exports.DEFAULT_CU_LIMIT = void 0;
+exports.validatePriceType = validatePriceType;
+exports.validatePostOnlyParams = validatePostOnlyParams;
+exports.validateMarketType = validateMarketType;
 const sdk_1 = require("@drift-labs/sdk");
 const jit_proxy_1 = require("./types/jit_proxy");
 const web3_js_1 = require("@solana/web3.js");
@@ -11,6 +14,48 @@ class PriceType {
 exports.PriceType = PriceType;
 PriceType.LIMIT = { limit: {} };
 PriceType.ORACLE = { oracle: {} };
+/**
+ * Validates the price type and returns the corresponding enum value. (required for type checking because of how anchor handles recursive types in IDL)
+ */
+function validatePriceType(priceType) {
+    if ((0, sdk_1.isVariant)(priceType, 'limit')) {
+        return PriceType.LIMIT;
+    }
+    if ((0, sdk_1.isVariant)(priceType, 'oracle')) {
+        return PriceType.ORACLE;
+    }
+    throw new Error('Invalid price type');
+}
+/**
+ * Validates the PostOnlyParams and returns the corresponding enum value. (required for type checking because of how anchor handles recursive types in IDL)
+ */
+function validatePostOnlyParams(postOnly) {
+    if ((0, sdk_1.isVariant)(postOnly, 'none')) {
+        return sdk_1.PostOnlyParams.NONE;
+    }
+    if ((0, sdk_1.isVariant)(postOnly, 'mustPostOnly')) {
+        return sdk_1.PostOnlyParams.MUST_POST_ONLY;
+    }
+    if ((0, sdk_1.isVariant)(postOnly, 'tryPostOnly')) {
+        return sdk_1.PostOnlyParams.TRY_POST_ONLY;
+    }
+    if ((0, sdk_1.isVariant)(postOnly, 'slide')) {
+        return sdk_1.PostOnlyParams.SLIDE;
+    }
+    throw new Error('Invalid post only params');
+}
+/**
+ * Validates the market type and returns the corresponding enum value. (required for type checking because of how anchor handles recursive types in IDL)
+ */
+function validateMarketType(marketType) {
+    if ((0, sdk_1.isVariant)(marketType, 'perp')) {
+        return sdk_1.MarketType.PERP;
+    }
+    if ((0, sdk_1.isVariant)(marketType, 'spot')) {
+        return sdk_1.MarketType.SPOT;
+    }
+    throw new Error('Invalid market type');
+}
 class JitProxyClient {
     constructor({ driftClient, programId, }) {
         this.driftClient = driftClient;
@@ -92,8 +137,8 @@ class JitProxyClient {
             minPosition,
             bid,
             ask,
-            postOnly,
-            priceType,
+            postOnly: validatePostOnlyParams(postOnly),
+            priceType: validatePriceType(priceType),
         };
         return this.program.methods
             .jit(jitParams)
@@ -136,8 +181,8 @@ class JitProxyClient {
             minPosition,
             bid,
             ask,
-            postOnly,
-            priceType,
+            postOnly: validatePostOnlyParams(postOnly),
+            priceType: validatePriceType(priceType),
         };
         return this.program.methods
             .jitSignedMsg(jitSignedMsgParams)
@@ -174,8 +219,12 @@ class JitProxyClient {
             readableSpotMarketIndexes,
             readablePerpMarketIndex,
         });
+        const validatedOrderConstraints = orderConstraints.map((orderConstraint) => ({
+            ...orderConstraint,
+            marketType: validateMarketType(orderConstraint.marketType),
+        }));
         return this.program.methods
-            .checkOrderConstraints(orderConstraints)
+            .checkOrderConstraints(validatedOrderConstraints)
             .accounts({
             user: await this.driftClient.getUserAccountPublicKey(subAccountId),
         })

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/jit-proxy",
-	"version": "0.17.79",
+	"version": "0.17.80",
 	"scripts": {
 		"clean": "rm -rf lib",
 		"build": "yarn clean && tsc"

package/src/jitProxyClient.ts

@@ -52,6 +52,61 @@ export class PriceType {
 	static readonly ORACLE = { oracle: {} };
 }
 
+/**
+ * Validates the price type and returns the corresponding enum value. (required for type checking because of how anchor handles recursive types in IDL)
+ */
+export function validatePriceType(
+	priceType: PriceType
+): typeof PriceType.LIMIT | typeof PriceType.ORACLE {
+	if (isVariant(priceType, 'limit')) {
+		return PriceType.LIMIT;
+	}
+	if (isVariant(priceType, 'oracle')) {
+		return PriceType.ORACLE;
+	}
+	throw new Error('Invalid price type');
+}
+
+/**
+ * Validates the PostOnlyParams and returns the corresponding enum value. (required for type checking because of how anchor handles recursive types in IDL)
+ */
+export function validatePostOnlyParams(
+	postOnly: PostOnlyParams
+):
+	| typeof PostOnlyParams.NONE
+	| typeof PostOnlyParams.MUST_POST_ONLY
+	| typeof PostOnlyParams.TRY_POST_ONLY
+	| typeof PostOnlyParams.SLIDE {
+	if (isVariant(postOnly, 'none')) {
+		return PostOnlyParams.NONE;
+	}
+	if (isVariant(postOnly, 'mustPostOnly')) {
+		return PostOnlyParams.MUST_POST_ONLY;
+	}
+	if (isVariant(postOnly, 'tryPostOnly')) {
+		return PostOnlyParams.TRY_POST_ONLY;
+	}
+	if (isVariant(postOnly, 'slide')) {
+		return PostOnlyParams.SLIDE;
+	}
+	throw new Error('Invalid post only params');
+}
+
+/**
+ * Validates the market type and returns the corresponding enum value. (required for type checking because of how anchor handles recursive types in IDL)
+ */
+export function validateMarketType(
+	marketType: MarketType
+): typeof MarketType.PERP | typeof MarketType.SPOT {
+	if (isVariant(marketType, 'perp')) {
+		return MarketType.PERP;
+	}
+	if (isVariant(marketType, 'spot')) {
+		return MarketType.SPOT;
+	}
+	throw new Error('Invalid market type');
+}
+
 export type OrderConstraint = {
 	maxPosition: BN;
 	minPosition: BN;
@@ -189,12 +244,12 @@ export class JitProxyClient {
 			minPosition,
 			bid,
 			ask,
-			postOnly,
-			priceType,
+			postOnly: validatePostOnlyParams(postOnly),
+			priceType: validatePriceType(priceType),
 		};
 
 		return this.program.methods
-			.jit(jitParams as any)
+			.jit(jitParams)
 			.accounts({
 				taker: takerKey,
 				takerStats: takerStatsKey,
@@ -251,12 +306,12 @@ export class JitProxyClient {
 			minPosition,
 			bid,
 			ask,
-			postOnly,
-			priceType,
+			postOnly: validatePostOnlyParams(postOnly),
+			priceType: validatePriceType(priceType),
 		};
 
 		return this.program.methods
-			.jitSignedMsg(jitSignedMsgParams as any)
+			.jitSignedMsg(jitSignedMsgParams)
 			.accounts({
 				taker: takerKey,
 				takerStats: takerStatsKey,
@@ -302,8 +357,15 @@ export class JitProxyClient {
 			readablePerpMarketIndex,
 		});
 
+		const validatedOrderConstraints = orderConstraints.map(
+			(orderConstraint) => ({
+				...orderConstraint,
+				marketType: validateMarketType(orderConstraint.marketType),
+			})
+		);
+
 		return this.program.methods
-			.checkOrderConstraints(orderConstraints as any)
+			.checkOrderConstraints(validatedOrderConstraints)
 			.accounts({
 				user: await this.driftClient.getUserAccountPublicKey(subAccountId),
 			})