@reyaxyz/sdk 0.26.3 → 0.27.0

package/dist/services/orders/order.js

@@ -45,17 +45,18 @@ var executeTransaction_1 = require("../executeTransaction");
 var trade_1 = require("../../utils/trade");
 var bignumber_js_1 = __importDefault(require("bignumber.js"));
 var contractAddresses_1 = require("../../utils/contractAddresses");
+var common_1 = require("@reyaxyz/common");
 var matchOrder = function (params) { return __awaiter(void 0, void 0, void 0, function () {
     var orderPriceLimit, orderBase, _a, data, value, network, chainId, result;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0:
-                if (params.orderSize === 0) {
-                    throw new Error('Position size can not be 0');
+                if (params.orderBase === 0) {
+                    throw new Error('Position base can not be 0');
                 }
-                orderPriceLimit = (0, trade_1.calculatePriceLimitForTrade)(params.market.currentPrice, params.orderSize);
-                orderBase = (0, trade_1.calculateOrderBaseFromOrderSize)(params.orderSize, params.market.currentPrice);
+                orderPriceLimit = (0, trade_1.calculatePriceLimitForTrade)(params.market.currentPrice, params.orderBase);
+                orderBase = (0, common_1.scale)(18)(params.orderBase);
                 _a = (0, encode_1.encodeMatchOrder)(params.marginAccountId, orderBase, orderPriceLimit, params.market.counterpartyAccountIds, params.market.id, params.market.exchangeId), data = _a.calldata, value = _a.value;
                 return [4 /*yield*/, ((_b = params.signer.provider) === null || _b === void 0 ? void 0 : _b.getNetwork())];
             case 1:

package/dist/services/orders/order.js.map

@@ -1 +1 @@
-{"version":3,"file":"order.js","sourceRoot":"/","sources":["services/orders/order.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  CloseOrderParams,\n  CloseOrderResult,\n  MatchOrderParams,\n  MatchOrderResult,\n} from './types';\nimport { encodeMatchOrder } from './encode';\nimport { executeTransaction } from '../executeTransaction';\nimport {\n  calculateOrderBaseFromOrderSize,\n  calculatePriceLimitForTrade,\n} from '../../utils/trade';\nimport BigNumber from 'bignumber.js';\nimport { ContractType } from '../../utils/contractAddresses';\n\nexport const matchOrder = async (\n  params: MatchOrderParams,\n): Promise<MatchOrderResult> => {\n  if (params.orderSize === 0) {\n    throw new Error('Position size can not be 0');\n  }\n  const orderPriceLimit = calculatePriceLimitForTrade(\n    params.market.currentPrice,\n    params.orderSize,\n  );\n\n  const orderBase = calculateOrderBaseFromOrderSize(\n    params.orderSize,\n    params.market.currentPrice,\n  );\n\n  const { calldata: data, value } = encodeMatchOrder(\n    params.marginAccountId,\n    orderBase,\n    orderPriceLimit,\n    params.market.counterpartyAccountIds,\n    params.market.id,\n    params.market.exchangeId,\n  );\n\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    chainId,\n    ContractType.CORE_PROXY,\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n\nexport const closeOrder = async (\n  params: CloseOrderParams,\n): Promise<CloseOrderResult> => {\n  if (params.orderBase === 0) {\n    throw new Error('Position base can not be 0');\n  }\n\n  const base = BigNumber(params.orderBase).negated().toNumber(); // when closing position we are doing trade in the opposite direction\n\n  const orderPriceLimit = calculatePriceLimitForTrade(\n    params.market.currentPrice,\n    base,\n  );\n\n  const { calldata: data, value } = encodeMatchOrder(\n    params.marginAccountId,\n    BigInt(base),\n    orderPriceLimit,\n    params.market.counterpartyAccountIds,\n    params.market.id,\n    params.market.exchangeId,\n  );\n\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    chainId,\n    ContractType.CORE_PROXY,\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}
+{"version":3,"file":"order.js","sourceRoot":"/","sources":["services/orders/order.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  CloseOrderParams,\n  CloseOrderResult,\n  MatchOrderParams,\n  MatchOrderResult,\n} from './types';\nimport { encodeMatchOrder } from './encode';\nimport { executeTransaction } from '../executeTransaction';\nimport { calculatePriceLimitForTrade } from '../../utils/trade';\nimport BigNumber from 'bignumber.js';\nimport { ContractType } from '../../utils/contractAddresses';\nimport { scale } from '@reyaxyz/common';\n\nexport const matchOrder = async (\n  params: MatchOrderParams,\n): Promise<MatchOrderResult> => {\n  if (params.orderBase === 0) {\n    throw new Error('Position base can not be 0');\n  }\n  const orderPriceLimit = calculatePriceLimitForTrade(\n    params.market.currentPrice,\n    params.orderBase,\n  );\n\n  const orderBase = scale(18)(params.orderBase);\n\n  const { calldata: data, value } = encodeMatchOrder(\n    params.marginAccountId,\n    orderBase,\n    orderPriceLimit,\n    params.market.counterpartyAccountIds,\n    params.market.id,\n    params.market.exchangeId,\n  );\n\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    chainId,\n    ContractType.CORE_PROXY,\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n\nexport const closeOrder = async (\n  params: CloseOrderParams,\n): Promise<CloseOrderResult> => {\n  if (params.orderBase === 0) {\n    throw new Error('Position base can not be 0');\n  }\n\n  const base = BigNumber(params.orderBase).negated().toNumber(); // when closing position we are doing trade in the opposite direction\n\n  const orderPriceLimit = calculatePriceLimitForTrade(\n    params.market.currentPrice,\n    base,\n  );\n\n  const { calldata: data, value } = encodeMatchOrder(\n    params.marginAccountId,\n    BigInt(base),\n    orderPriceLimit,\n    params.market.counterpartyAccountIds,\n    params.market.id,\n    params.market.exchangeId,\n  );\n\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    chainId,\n    ContractType.CORE_PROXY,\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}

package/dist/services/orders/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/orders/types.ts"],"names":[],"mappings":"","sourcesContent":["import { Signer, JsonRpcSigner } from 'ethers';\nimport {\n  MarginAccountEntity,\n  MarketEntity,\n  PositionEntity,\n} from '@reyaxyz/common';\n\nexport type MarketParams = {\n  id: MarketEntity['id'];\n  exchangeId: MarketEntity['orderInfo']['exchangeId'];\n  counterpartyAccountIds: MarketEntity['orderInfo']['counterpartyAccountIds'];\n  currentPrice: number;\n};\n\nexport type MatchOrderParams = {\n  signer: Signer | JsonRpcSigner;\n  marginAccountId: MarginAccountEntity['id'];\n  orderSize: number;\n  market: MarketParams;\n};\n\nexport type CloseOrderParams = {\n  signer: Signer | JsonRpcSigner;\n  marginAccountId: MarginAccountEntity['id'];\n  orderBase: PositionEntity['base'];\n  market: MarketParams;\n};\n\nexport type MatchOrderResult = {\n  transactionHash: string | null;\n};\n\nexport type CloseOrderResult = {\n  transactionHash: string | null;\n};\n"]}
+{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/orders/types.ts"],"names":[],"mappings":"","sourcesContent":["import { Signer, JsonRpcSigner } from 'ethers';\nimport {\n  MarginAccountEntity,\n  MarketEntity,\n  PositionEntity,\n} from '@reyaxyz/common';\n\nexport type MarketParams = {\n  id: MarketEntity['id'];\n  exchangeId: MarketEntity['orderInfo']['exchangeId'];\n  counterpartyAccountIds: MarketEntity['orderInfo']['counterpartyAccountIds'];\n  currentPrice: number;\n};\n\nexport type MatchOrderParams = {\n  signer: Signer | JsonRpcSigner;\n  marginAccountId: MarginAccountEntity['id'];\n  orderBase: number;\n  market: MarketParams;\n};\n\nexport type CloseOrderParams = {\n  signer: Signer | JsonRpcSigner;\n  marginAccountId: MarginAccountEntity['id'];\n  orderBase: PositionEntity['base'];\n  market: MarketParams;\n};\n\nexport type MatchOrderResult = {\n  transactionHash: string | null;\n};\n\nexport type CloseOrderResult = {\n  transactionHash: string | null;\n};\n"]}

package/dist/types/services/orders/order.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"order.d.ts","sourceRoot":"/","sources":["services/orders/order.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,SAAS,CAAC;AAUjB,eAAO,MAAM,UAAU,WACb,gBAAgB,KACvB,QAAQ,gBAAgB,CAqC1B,CAAC;AAEF,eAAO,MAAM,UAAU,WACb,gBAAgB,KACvB,QAAQ,gBAAgB,CAmC1B,CAAC"}
+{"version":3,"file":"order.d.ts","sourceRoot":"/","sources":["services/orders/order.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,SAAS,CAAC;AAQjB,eAAO,MAAM,UAAU,WACb,gBAAgB,KACvB,QAAQ,gBAAgB,CAkC1B,CAAC;AAEF,eAAO,MAAM,UAAU,WACb,gBAAgB,KACvB,QAAQ,gBAAgB,CAmC1B,CAAC"}

package/dist/types/services/orders/types.d.ts

@@ -9,7 +9,7 @@ export type MarketParams = {
 export type MatchOrderParams = {
     signer: Signer | JsonRpcSigner;
     marginAccountId: MarginAccountEntity['id'];
-    orderSize: number;
+    orderBase: number;
     market: MarketParams;
 };
 export type CloseOrderParams = {

package/dist/types/utils/trade.d.ts

@@ -1,3 +1,2 @@
 export declare function calculatePriceLimitForTrade(orderPrice: number, amount: number): bigint;
-export declare function calculateOrderBaseFromOrderSize(orderSize: number, currentPrice: number): bigint;
 //# sourceMappingURL=trade.d.ts.map

package/dist/types/utils/trade.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"trade.d.ts","sourceRoot":"/","sources":["utils/trade.ts"],"names":[],"mappings":"AAEA,wBAAgB,2BAA2B,CACzC,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACb,MAAM,CAkBR;AAED,wBAAgB,+BAA+B,CAC7C,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,GACnB,MAAM,CAUR"}
+{"version":3,"file":"trade.d.ts","sourceRoot":"/","sources":["utils/trade.ts"],"names":[],"mappings":"AAEA,wBAAgB,2BAA2B,CACzC,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACb,MAAM,CAkBR"}

package/dist/utils/trade.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateOrderBaseFromOrderSize = exports.calculatePriceLimitForTrade = void 0;
+exports.calculatePriceLimitForTrade = void 0;
 var bignumber_js_1 = __importDefault(require("bignumber.js"));
 function calculatePriceLimitForTrade(orderPrice, amount) {
     // Ensure orderPrice is BigInt
@@ -20,14 +20,4 @@ function calculatePriceLimitForTrade(orderPrice, amount) {
     }
 }
 exports.calculatePriceLimitForTrade = calculatePriceLimitForTrade;
-function calculateOrderBaseFromOrderSize(orderSize, currentPrice) {
-    var decimalFactor = (0, bignumber_js_1.default)('1000000000000000000'); // 10^18
-    // @todo check decimal places handling if this should stay hardcoded to 6
-    var orderBase = (0, bignumber_js_1.default)(orderSize)
-        .times(decimalFactor)
-        .div(currentPrice)
-        .toFixed(0);
-    return BigInt(orderBase);
-}
-exports.calculateOrderBaseFromOrderSize = calculateOrderBaseFromOrderSize;
 //# sourceMappingURL=trade.js.map

package/dist/utils/trade.js.map

@@ -1 +1 @@
-{"version":3,"file":"trade.js","sourceRoot":"/","sources":["utils/trade.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAqC;AAErC,SAAgB,2BAA2B,CACzC,UAAkB,EAClB,MAAc;IAEd,8BAA8B;IAC9B,IAAM,gBAAgB,GAAG,IAAA,sBAAS,EAAC,UAAU,CAAC,CAAC;IAE/C,mCAAmC;IACnC,IAAM,MAAM,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAEvC,mFAAmF;IACnF,IAAI,MAAM,GAAG,CAAC,EAAE,CAAC;QACf,wBAAwB;QACxB,OAAO,MAAM,CACX,IAAA,sBAAS,EAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAChE,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,OAAO,MAAM,CACX,IAAA,sBAAS,EAAC,gBAAgB,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CACjE,CAAC;IACJ,CAAC;AACH,CAAC;AArBD,kEAqBC;AAED,SAAgB,+BAA+B,CAC7C,SAAiB,EACjB,YAAoB;IAEpB,IAAM,aAAa,GAAG,IAAA,sBAAS,EAAC,qBAAqB,CAAC,CAAC,CAAC,QAAQ;IAChE,yEAAyE;IAEzE,IAAM,SAAS,GAAG,IAAA,sBAAS,EAAC,SAAS,CAAC;SACnC,KAAK,CAAC,aAAa,CAAC;SACpB,GAAG,CAAC,YAAY,CAAC;SACjB,OAAO,CAAC,CAAC,CAAC,CAAC;IAEd,OAAO,MAAM,CAAC,SAAS,CAAC,CAAC;AAC3B,CAAC;AAbD,0EAaC","sourcesContent":["import BigNumber from 'bignumber.js';\n\nexport function calculatePriceLimitForTrade(\n  orderPrice: number,\n  amount: number,\n): bigint {\n  // Ensure orderPrice is BigInt\n  const orderPriceBigInt = BigNumber(orderPrice);\n\n  // Calculate 50% of the order price\n  const offset = orderPriceBigInt.div(2);\n\n  // Determine if the amount is positive or negative and adjust the price accordingly\n  if (amount > 0) {\n    // Trade is long, so add\n    return BigInt(\n      BigNumber(orderPriceBigInt).plus(offset).times(1e18).toFixed(0),\n    );\n  } else {\n    return BigInt(\n      BigNumber(orderPriceBigInt).minus(offset).times(1e18).toFixed(0),\n    );\n  }\n}\n\nexport function calculateOrderBaseFromOrderSize(\n  orderSize: number,\n  currentPrice: number,\n): bigint {\n  const decimalFactor = BigNumber('1000000000000000000'); // 10^18\n  // @todo check decimal places handling if this should stay hardcoded to 6\n\n  const orderBase = BigNumber(orderSize)\n    .times(decimalFactor)\n    .div(currentPrice)\n    .toFixed(0);\n\n  return BigInt(orderBase);\n}\n"]}
+{"version":3,"file":"trade.js","sourceRoot":"/","sources":["utils/trade.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAqC;AAErC,SAAgB,2BAA2B,CACzC,UAAkB,EAClB,MAAc;IAEd,8BAA8B;IAC9B,IAAM,gBAAgB,GAAG,IAAA,sBAAS,EAAC,UAAU,CAAC,CAAC;IAE/C,mCAAmC;IACnC,IAAM,MAAM,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAEvC,mFAAmF;IACnF,IAAI,MAAM,GAAG,CAAC,EAAE,CAAC;QACf,wBAAwB;QACxB,OAAO,MAAM,CACX,IAAA,sBAAS,EAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAChE,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,OAAO,MAAM,CACX,IAAA,sBAAS,EAAC,gBAAgB,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CACjE,CAAC;IACJ,CAAC;AACH,CAAC;AArBD,kEAqBC","sourcesContent":["import BigNumber from 'bignumber.js';\n\nexport function calculatePriceLimitForTrade(\n  orderPrice: number,\n  amount: number,\n): bigint {\n  // Ensure orderPrice is BigInt\n  const orderPriceBigInt = BigNumber(orderPrice);\n\n  // Calculate 50% of the order price\n  const offset = orderPriceBigInt.div(2);\n\n  // Determine if the amount is positive or negative and adjust the price accordingly\n  if (amount > 0) {\n    // Trade is long, so add\n    return BigInt(\n      BigNumber(orderPriceBigInt).plus(offset).times(1e18).toFixed(0),\n    );\n  } else {\n    return BigInt(\n      BigNumber(orderPriceBigInt).minus(offset).times(1e18).toFixed(0),\n    );\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reyaxyz/sdk",
-  "version": "0.26.3",
+  "version": "0.27.0",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
@@ -29,10 +29,10 @@
     "generate:coverage-badges": "npx istanbul-badges-readme --silent"
   },
   "dependencies": {
-    "@reyaxyz/common": "0.27.0",
+    "@reyaxyz/common": "0.28.0",
     "bignumber.js": "^9.1.2",
     "ethers": "6.9.0"
   },
   "packageManager": "pnpm@8.10.4",
-  "gitHead": "8eb6eea74ac708cd39716c34626d02d716376114"
+  "gitHead": "f9e9d10caaeb9a15b82c62cf01ee75a5d46a2c1b"
 }

package/src/services/orders/order.ts

@@ -6,28 +6,23 @@ import {
 } from './types';
 import { encodeMatchOrder } from './encode';
 import { executeTransaction } from '../executeTransaction';
-import {
-  calculateOrderBaseFromOrderSize,
-  calculatePriceLimitForTrade,
-} from '../../utils/trade';
+import { calculatePriceLimitForTrade } from '../../utils/trade';
 import BigNumber from 'bignumber.js';
 import { ContractType } from '../../utils/contractAddresses';
+import { scale } from '@reyaxyz/common';
 
 export const matchOrder = async (
   params: MatchOrderParams,
 ): Promise<MatchOrderResult> => {
-  if (params.orderSize === 0) {
-    throw new Error('Position size can not be 0');
+  if (params.orderBase === 0) {
+    throw new Error('Position base can not be 0');
   }
   const orderPriceLimit = calculatePriceLimitForTrade(
     params.market.currentPrice,
-    params.orderSize,
+    params.orderBase,
   );
 
-  const orderBase = calculateOrderBaseFromOrderSize(
-    params.orderSize,
-    params.market.currentPrice,
-  );
+  const orderBase = scale(18)(params.orderBase);
 
   const { calldata: data, value } = encodeMatchOrder(
     params.marginAccountId,

package/src/services/orders/types.ts

@@ -15,7 +15,7 @@ export type MarketParams = {
 export type MatchOrderParams = {
   signer: Signer | JsonRpcSigner;
   marginAccountId: MarginAccountEntity['id'];
-  orderSize: number;
+  orderBase: number;
   market: MarketParams;
 };
 

package/src/utils/trade.ts

@@ -22,18 +22,3 @@ export function calculatePriceLimitForTrade(
     );
   }
 }
-
-export function calculateOrderBaseFromOrderSize(
-  orderSize: number,
-  currentPrice: number,
-): bigint {
-  const decimalFactor = BigNumber('1000000000000000000'); // 10^18
-  // @todo check decimal places handling if this should stay hardcoded to 6
-
-  const orderBase = BigNumber(orderSize)
-    .times(decimalFactor)
-    .div(currentPrice)
-    .toFixed(0);
-
-  return BigInt(orderBase);
-}