@reyaxyz/sdk 0.151.4 → 0.152.1

package/src/services/orders/triggerSettlementHeadroom.ts

@@ -0,0 +1,56 @@
+/**
+ * Client-side mirror of the one trigger-admission rule a client can evaluate on
+ * its own: the settlement headroom a `GTT` lifetime must outlast.
+ *
+ * The per-market limit band is deliberately NOT mirrored here. It is an
+ * engine-side admission rule derived from matching-engine config, it is not
+ * published on the API, and a client cannot compute it — a `limitPx` outside it
+ * is refused at admission with `TRIGGER_LIMIT_OUTSIDE_BAND_ERROR`.
+ */
+
+/**
+ * Settlement headroom of a production deployment, in seconds. A `GTT` lifetime
+ * must be STRICTLY greater than `now + headroom`, or the engine refuses the
+ * order with `ORDER_EXPIRES_TOO_SOON_ERROR`. It is a venue parameter and is not
+ * published on the API; a deployment that runs a different one is handled by
+ * the per-call `settlementHeadroomSeconds` override.
+ */
+export const DEFAULT_SETTLEMENT_HEADROOM_SECONDS = 60;
+
+/**
+ * Refuse a `GTT` lifetime that does not outlast the settlement headroom.
+ *
+ * Independent of the `expiresAfter > deadline` coupling: a caller that pins a
+ * short deadline satisfies that check while still signing a lifetime the engine
+ * refuses. On a trigger the same deadline covers both phases, so the headroom
+ * bites there too.
+ *
+ * `expiresAfter` must be a positive safe integer (Unix seconds) and
+ * `headroomSeconds` a finite non-negative number; both are checked here rather
+ * than at the later `BigInt(expiresAfter)` conversion, so a `NaN`, `Infinity`,
+ * fractional or negative value fails at the validation boundary instead of
+ * after the signer has been resolved and a nonce minted.
+ */
+export const assertSettlementHeadroom = (
+  expiresAfter: number,
+  headroomSeconds: number = DEFAULT_SETTLEMENT_HEADROOM_SECONDS,
+  nowSeconds: number = Math.floor(Date.now() / 1000),
+): void => {
+  if (!Number.isSafeInteger(expiresAfter) || expiresAfter <= 0) {
+    throw new Error(
+      `expiresAfter=${expiresAfter} must be a positive integer Unix timestamp in seconds`,
+    );
+  }
+  if (!Number.isFinite(headroomSeconds) || headroomSeconds < 0) {
+    throw new Error(
+      `settlementHeadroomSeconds=${headroomSeconds} must be a finite, non-negative number of seconds`,
+    );
+  }
+  const earliestAdmissible = nowSeconds + headroomSeconds;
+  if (expiresAfter <= earliestAdmissible) {
+    throw new Error(
+      `expiresAfter=${expiresAfter} does not outlast the ${headroomSeconds}s settlement headroom ` +
+        `(needs > ${earliestAdmissible}). Pass settlementHeadroomSeconds if the target deployment runs a different one.`,
+    );
+  }
+};

package/src/services/orders/types.ts

@@ -3,7 +3,6 @@ import {
   CoreCommandsEIP712SignatureAndPayload,
   MarketEntity,
   MethodParameters,
-  OrdersGatewayOrderType,
   OwnerMetadataEntity,
   PositionEntity,
   TransactionExecutionOutput,
@@ -69,17 +68,3 @@ export type CloseOrderResult = {
 
 export type MethodParametersAndEIP712Payload = MethodParameters &
   CoreCommandsEIP712SignatureAndPayload;
-
-export type OrdersGatewayMarketOrderParams = {
-  signer: Signer | JsonRpcSigner;
-  marginAccountId: number;
-  marketId: MarketEntity['id'];
-  counterpartyAccountIds: MarketEntity['orderInfo']['counterpartyAccountIds'];
-  exchangeId: MarketEntity['orderInfo']['exchangeId'];
-  orderType:
-    | OrdersGatewayOrderType.MARKET_ORDER
-    | OrdersGatewayOrderType.REDUCE_ONLY_MARKET_ORDER
-    | OrdersGatewayOrderType.FULL_CLOSE_ORDER;
-  orderInputs: string;
-  tradeSource?: 'reya' | 'rage' | 'other';
-};

package/dist/services/orders/order.js

@@ -1,231 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.closeOrder = exports.matchOrder = void 0;
-var signAndBroadcastTransaction_1 = require("../signAndBroadcastTransaction");
-var common_1 = require("@reyaxyz/common");
-var bignumber_js_1 = __importDefault(require("bignumber.js"));
-var common_2 = require("@reyaxyz/common");
-var common_3 = require("@reyaxyz/common");
-var network_1 = require("../../utils/network");
-var ethers_1 = require("ethers");
-var executeMarketOrderViaOrdersGateway = function (params) { return __awaiter(void 0, void 0, void 0, function () {
-    var reyaChainId, creationTimestampMs, creationTimestampSeconds, _a, signature, nonce, fnSig, fnArgs, _b, ogInterface, data, result;
-    return __generator(this, function (_c) {
-        switch (_c.label) {
-            case 0:
-                reyaChainId = (0, network_1.getReyaNetwork)();
-                creationTimestampMs = Date.now();
-                creationTimestampSeconds = Math.floor(creationTimestampMs / 1000);
-                return [4 /*yield*/, (0, common_1.signOrdersGatewayOrder)(params.signer, reyaChainId, params.marginAccountId, params.marketId, params.exchangeId, params.counterpartyAccountIds, params.orderType, params.orderInputs, creationTimestampSeconds + common_1.ORDERS_GATEWAY_DEADLINE_IN_SECONDS, creationTimestampMs)];
-            case 1:
-                _a = _c.sent(), signature = _a.signature, nonce = _a.nonce;
-                fnSig = 'execute';
-                _b = [params.marginAccountId,
-                    params.marketId,
-                    params.exchangeId,
-                    params.counterpartyAccountIds,
-                    params.orderType,
-                    params.orderInputs];
-                return [4 /*yield*/, params.signer.getAddress()];
-            case 2:
-                fnArgs = [
-                    _b.concat([
-                        _c.sent(),
-                        nonce
-                    ]),
-                    [signature.v, signature.r, signature.s, signature.deadline]
-                ];
-                ogInterface = new ethers_1.Interface(common_1.OrdersGatewayAbi);
-                data = ogInterface.encodeFunctionData(fnSig, fnArgs);
-                return [4 /*yield*/, (0, signAndBroadcastTransaction_1.signAndBroadcastTransaction)(data, reyaChainId, common_2.ContractType.ORDERS_GATEWAY_PROXY, {
-                        accountId: params.marginAccountId,
-                        marketId: params.marketId,
-                        tradeSource: params.tradeSource,
-                        action: 'ioc-order-ui',
-                    })];
-            case 3:
-                result = _c.sent();
-                return [2 /*return*/, result];
-        }
-    });
-}); };
-var matchOrder = function (params) { return __awaiter(void 0, void 0, void 0, function () {
-    var snappedAmount, orderBaseE18, orderPriceLimitE18, orderInputs, result;
-    var _a, _b, _c, _d, _e, _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
-            case 0:
-                if (params.amountInBase === 0) {
-                    throw new Error('Order cannot be of size zero.');
-                }
-                snappedAmount = (0, bignumber_js_1.default)(params.amountInBase)
-                    .abs()
-                    .dividedBy(params.market.baseSpacing)
-                    .integerValue(bignumber_js_1.default.ROUND_FLOOR)
-                    .multipliedBy(params.market.baseSpacing)
-                    .toNumber();
-                if (params.amountInBase < 0) {
-                    snappedAmount = -snappedAmount;
-                }
-                if (Math.abs(snappedAmount) < params.market.minOrderSizeBase) {
-                    console.error("Minimum trade amount ".concat(params.market.minOrderSizeBase, ". Entered amount ").concat(snappedAmount, ", ").concat(params.amountInBase));
-                    throw new Error("Minimum trade amount ".concat(params.market.minOrderSizeBase));
-                }
-                orderBaseE18 = (0, common_3.scale)(18)(snappedAmount);
-                orderPriceLimitE18 = (0, common_1.calculateMaxPriceLimit)(snappedAmount > 0);
-                orderInputs = ethers_1.AbiCoder.defaultAbiCoder().encode(['int256', 'uint256'], [orderBaseE18, orderPriceLimitE18]);
-                return [4 /*yield*/, executeMarketOrderViaOrdersGateway({
-                        signer: params.signer,
-                        marginAccountId: params.marginAccountId,
-                        counterpartyAccountIds: params.market.counterpartyAccountIds,
-                        marketId: params.market.id,
-                        exchangeId: params.market.exchangeId,
-                        tradeSource: params.tradeSource,
-                        orderType: common_1.OrdersGatewayOrderType.MARKET_ORDER,
-                        orderInputs: orderInputs,
-                    })];
-            case 1:
-                result = _g.sent();
-                return [2 /*return*/, {
-                        transactionHash: (result === null || result === void 0 ? void 0 : result.txHash) || null,
-                        coreSigNonce: Number(result === null || result === void 0 ? void 0 : result.coreSigNonce) || null,
-                        xpBoost: ((_a = result.miscellaneous) === null || _a === void 0 ? void 0 : _a.tradeXpBoost) || 0,
-                        lotteryXpBoost: ((_b = result.miscellaneous) === null || _b === void 0 ? void 0 : _b.lotteryXpBoost) || 0,
-                        isNftWon: ((_c = result.miscellaneous) === null || _c === void 0 ? void 0 : _c.xpNftAwarded) || false,
-                        marginAccountId: params.marginAccountId,
-                        xpEarned: ((_d = result.miscellaneous) === null || _d === void 0 ? void 0 : _d.xpEarned) || 0,
-                        executionPrice: ((_e = result.tradeDetails) === null || _e === void 0 ? void 0 : _e.executionPrice) || 0,
-                        base: ((_f = result.tradeDetails) === null || _f === void 0 ? void 0 : _f.base) || 0,
-                        positions: result.positions,
-                        orders: result.orders,
-                        accounts: result.accounts,
-                    }];
-        }
-    });
-}); };
-exports.matchOrder = matchOrder;
-var fullCloseOrder = function (params) { return __awaiter(void 0, void 0, void 0, function () {
-    var result;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0: return [4 /*yield*/, executeMarketOrderViaOrdersGateway({
-                    signer: params.signer,
-                    marginAccountId: params.marginAccountId,
-                    counterpartyAccountIds: params.market.counterpartyAccountIds,
-                    marketId: params.market.id,
-                    exchangeId: params.market.exchangeId,
-                    orderType: common_1.OrdersGatewayOrderType.FULL_CLOSE_ORDER,
-                    orderInputs: ethers_1.AbiCoder.defaultAbiCoder().encode([], []),
-                })];
-            case 1:
-                result = _a.sent();
-                return [2 /*return*/, result];
-        }
-    });
-}); };
-var partialCloseOrder = function (params) { return __awaiter(void 0, void 0, void 0, function () {
-    var orderPriceLimit, orderInputs, result;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                if (params.orderBase === 0) {
-                    throw new Error('Position is already closed.');
-                }
-                if (params.closingOrderBase === 0) {
-                    throw new Error('Specified base to close is zero.');
-                }
-                if (params.closingOrderBase * params.orderBase < 0) {
-                    throw new Error('Specified base to close is in different direction that the actual order.');
-                }
-                if (Math.abs(params.closingOrderBase) > Math.abs(params.orderBase)) {
-                    throw new Error('Specified base to close is larger than the actual order.');
-                }
-                orderPriceLimit = (0, common_1.calculateMaxPriceLimit)(params.closingOrderBase < 0);
-                orderInputs = ethers_1.AbiCoder.defaultAbiCoder().encode(['int256', 'uint256'], [-(0, common_3.scale)(18)(params.closingOrderBase), orderPriceLimit]);
-                return [4 /*yield*/, executeMarketOrderViaOrdersGateway({
-                        signer: params.signer,
-                        marginAccountId: params.marginAccountId,
-                        counterpartyAccountIds: params.market.counterpartyAccountIds,
-                        marketId: params.market.id,
-                        exchangeId: params.market.exchangeId,
-                        orderType: common_1.OrdersGatewayOrderType.REDUCE_ONLY_MARKET_ORDER,
-                        orderInputs: orderInputs,
-                    })];
-            case 1:
-                result = _a.sent();
-                return [2 /*return*/, result];
-        }
-    });
-}); };
-var closeOrder = function (params) { return __awaiter(void 0, void 0, void 0, function () {
-    var result, _a;
-    var _b, _c, _d, _e, _f, _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
-            case 0:
-                if (!(params.type === 'full')) return [3 /*break*/, 2];
-                return [4 /*yield*/, fullCloseOrder(params)];
-            case 1:
-                _a = _h.sent();
-                return [3 /*break*/, 4];
-            case 2: return [4 /*yield*/, partialCloseOrder(params)];
-            case 3:
-                _a = _h.sent();
-                _h.label = 4;
-            case 4:
-                result = _a;
-                return [2 /*return*/, {
-                        transactionHash: (result === null || result === void 0 ? void 0 : result.txHash) || null,
-                        coreSigNonce: Number(result === null || result === void 0 ? void 0 : result.coreSigNonce) || null,
-                        xpBoost: ((_b = result.miscellaneous) === null || _b === void 0 ? void 0 : _b.tradeXpBoost) || 0,
-                        lotteryXpBoost: ((_c = result.miscellaneous) === null || _c === void 0 ? void 0 : _c.lotteryXpBoost) || 0,
-                        isNftWon: ((_d = result.miscellaneous) === null || _d === void 0 ? void 0 : _d.xpNftAwarded) || false,
-                        marginAccountId: params.marginAccountId,
-                        xpEarned: ((_e = result.miscellaneous) === null || _e === void 0 ? void 0 : _e.xpEarned) || 0,
-                        executionPrice: ((_f = result.tradeDetails) === null || _f === void 0 ? void 0 : _f.executionPrice) || 0,
-                        base: ((_g = result.tradeDetails) === null || _g === void 0 ? void 0 : _g.base) || 0,
-                    }];
-        }
-    });
-}); };
-exports.closeOrder = closeOrder;
-//# sourceMappingURL=order.js.map

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

@@ -1 +0,0 @@
-{"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  OrdersGatewayMarketOrderParams,\n} from './types';\nimport { signAndBroadcastTransaction } from '../signAndBroadcastTransaction';\nimport {\n  calculateMaxPriceLimit,\n  ORDERS_GATEWAY_DEADLINE_IN_SECONDS,\n  OrdersGatewayAbi,\n  OrdersGatewayOrderType,\n  PositionEntity,\n  signOrdersGatewayOrder,\n  TransactionExecutionOutput,\n} from '@reyaxyz/common';\nimport BigNumber from 'bignumber.js';\nimport { ContractType } from '@reyaxyz/common';\nimport { scale } from '@reyaxyz/common';\nimport { getReyaNetwork } from '../../utils/network';\nimport { AbiCoder, Interface } from 'ethers';\n\nconst executeMarketOrderViaOrdersGateway = async (\n  params: OrdersGatewayMarketOrderParams,\n): Promise<TransactionExecutionOutput> => {\n  const reyaChainId = getReyaNetwork();\n  const creationTimestampMs = Date.now();\n  const creationTimestampSeconds = Math.floor(creationTimestampMs / 1000);\n\n  const { signature, nonce } = await signOrdersGatewayOrder(\n    params.signer,\n    reyaChainId,\n    params.marginAccountId,\n    params.marketId,\n    params.exchangeId,\n    params.counterpartyAccountIds,\n    params.orderType,\n    params.orderInputs,\n    creationTimestampSeconds + ORDERS_GATEWAY_DEADLINE_IN_SECONDS,\n    creationTimestampMs,\n  );\n\n  const fnSig = 'execute';\n  const fnArgs = [\n    [\n      params.marginAccountId,\n      params.marketId,\n      params.exchangeId,\n      params.counterpartyAccountIds,\n      params.orderType,\n      params.orderInputs,\n      await params.signer.getAddress(),\n      nonce,\n    ],\n    [signature.v, signature.r, signature.s, signature.deadline],\n  ];\n\n  const ogInterface = new Interface(OrdersGatewayAbi);\n  const data = ogInterface.encodeFunctionData(fnSig, fnArgs);\n\n  const result = await signAndBroadcastTransaction(\n    data,\n    reyaChainId,\n    ContractType.ORDERS_GATEWAY_PROXY,\n    {\n      accountId: params.marginAccountId,\n      marketId: params.marketId,\n      tradeSource: params.tradeSource,\n      action: 'ioc-order-ui',\n    },\n  );\n\n  return result;\n};\n\nexport const matchOrder = async (\n  params: MatchOrderParams,\n): Promise<MatchOrderResult> => {\n  if (params.amountInBase === 0) {\n    throw new Error('Order cannot be of size zero.');\n  }\n\n  let snappedAmount = BigNumber(params.amountInBase)\n    .abs()\n    .dividedBy(params.market.baseSpacing)\n    .integerValue(BigNumber.ROUND_FLOOR)\n    .multipliedBy(params.market.baseSpacing)\n    .toNumber();\n\n  if (params.amountInBase < 0) {\n    snappedAmount = -snappedAmount;\n  }\n\n  if (Math.abs(snappedAmount) < params.market.minOrderSizeBase) {\n    console.error(\n      `Minimum trade amount ${params.market.minOrderSizeBase}. Entered amount ${snappedAmount}, ${params.amountInBase}`,\n    );\n    throw new Error(`Minimum trade amount ${params.market.minOrderSizeBase}`);\n  }\n\n  const orderBaseE18 = scale(18)(snappedAmount);\n  const orderPriceLimitE18 = calculateMaxPriceLimit(snappedAmount > 0);\n  const orderInputs = AbiCoder.defaultAbiCoder().encode(\n    ['int256', 'uint256'],\n    [orderBaseE18, orderPriceLimitE18],\n  );\n\n  const result = await executeMarketOrderViaOrdersGateway({\n    signer: params.signer,\n    marginAccountId: params.marginAccountId,\n    counterpartyAccountIds: params.market.counterpartyAccountIds,\n    marketId: params.market.id,\n    exchangeId: params.market.exchangeId,\n    tradeSource: params.tradeSource,\n    orderType: OrdersGatewayOrderType.MARKET_ORDER,\n    orderInputs,\n  });\n\n  return {\n    transactionHash: result?.txHash || null,\n    coreSigNonce: Number(result?.coreSigNonce) || null,\n    xpBoost: result.miscellaneous?.tradeXpBoost || 0,\n    lotteryXpBoost: result.miscellaneous?.lotteryXpBoost || 0,\n    isNftWon: result.miscellaneous?.xpNftAwarded || false,\n    marginAccountId: params.marginAccountId,\n    xpEarned: result.miscellaneous?.xpEarned || 0,\n    executionPrice: result.tradeDetails?.executionPrice || 0,\n    base: result.tradeDetails?.base || 0,\n    positions: result.positions,\n    orders: result.orders,\n    accounts: result.accounts,\n  };\n};\n\nconst fullCloseOrder = async (\n  params: Pick<CloseOrderParams, 'signer' | 'marginAccountId' | 'market'>,\n): Promise<TransactionExecutionOutput> => {\n  const result = await executeMarketOrderViaOrdersGateway({\n    signer: params.signer,\n    marginAccountId: params.marginAccountId,\n    counterpartyAccountIds: params.market.counterpartyAccountIds,\n    marketId: params.market.id,\n    exchangeId: params.market.exchangeId,\n    orderType: OrdersGatewayOrderType.FULL_CLOSE_ORDER,\n    orderInputs: AbiCoder.defaultAbiCoder().encode([], []),\n  });\n\n  return result;\n};\n\nconst partialCloseOrder = async (\n  params: Pick<CloseOrderParams, 'signer' | 'marginAccountId' | 'market'> & {\n    orderBase: PositionEntity['base'];\n    closingOrderBase: number;\n  },\n): Promise<TransactionExecutionOutput> => {\n  if (params.orderBase === 0) {\n    throw new Error('Position is already closed.');\n  }\n\n  if (params.closingOrderBase === 0) {\n    throw new Error('Specified base to close is zero.');\n  }\n\n  if (params.closingOrderBase * params.orderBase < 0) {\n    throw new Error(\n      'Specified base to close is in different direction that the actual order.',\n    );\n  }\n\n  if (Math.abs(params.closingOrderBase) > Math.abs(params.orderBase)) {\n    throw new Error('Specified base to close is larger than the actual order.');\n  }\n\n  const orderPriceLimit = calculateMaxPriceLimit(params.closingOrderBase < 0);\n  const orderInputs = AbiCoder.defaultAbiCoder().encode(\n    ['int256', 'uint256'],\n    [-scale(18)(params.closingOrderBase), orderPriceLimit],\n  );\n\n  const result = await executeMarketOrderViaOrdersGateway({\n    signer: params.signer,\n    marginAccountId: params.marginAccountId,\n    counterpartyAccountIds: params.market.counterpartyAccountIds,\n    marketId: params.market.id,\n    exchangeId: params.market.exchangeId,\n    orderType: OrdersGatewayOrderType.REDUCE_ONLY_MARKET_ORDER,\n    orderInputs,\n  });\n\n  return result;\n};\n\nexport const closeOrder = async (\n  params: CloseOrderParams,\n): Promise<CloseOrderResult> => {\n  const result =\n    params.type === 'full'\n      ? await fullCloseOrder(params)\n      : await partialCloseOrder(params);\n\n  return {\n    transactionHash: result?.txHash || null,\n    coreSigNonce: Number(result?.coreSigNonce) || null,\n    xpBoost: result.miscellaneous?.tradeXpBoost || 0,\n    lotteryXpBoost: result.miscellaneous?.lotteryXpBoost || 0,\n    isNftWon: result.miscellaneous?.xpNftAwarded || false,\n    marginAccountId: params.marginAccountId,\n    xpEarned: result.miscellaneous?.xpEarned || 0,\n    executionPrice: result.tradeDetails?.executionPrice || 0,\n    base: result.tradeDetails?.base || 0,\n  };\n};\n"]}

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

@@ -1,4 +0,0 @@
-import { CloseOrderParams, CloseOrderResult, MatchOrderParams, MatchOrderResult } from './types';
-export declare const matchOrder: (params: MatchOrderParams) => Promise<MatchOrderResult>;
-export declare const closeOrder: (params: CloseOrderParams) => Promise<CloseOrderResult>;
-//# sourceMappingURL=order.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"order.d.ts","sourceRoot":"/","sources":["services/orders/order.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EAEjB,MAAM,SAAS,CAAC;AAsEjB,eAAO,MAAM,UAAU,WACb,gBAAgB,KACvB,QAAQ,gBAAgB,CAuD1B,CAAC;AA6DF,eAAO,MAAM,UAAU,WACb,gBAAgB,KACvB,QAAQ,gBAAgB,CAiB1B,CAAC"}

package/src/services/orders/order.ts

@@ -1,214 +0,0 @@
-import {
-  CloseOrderParams,
-  CloseOrderResult,
-  MatchOrderParams,
-  MatchOrderResult,
-  OrdersGatewayMarketOrderParams,
-} from './types';
-import { signAndBroadcastTransaction } from '../signAndBroadcastTransaction';
-import {
-  calculateMaxPriceLimit,
-  ORDERS_GATEWAY_DEADLINE_IN_SECONDS,
-  OrdersGatewayAbi,
-  OrdersGatewayOrderType,
-  PositionEntity,
-  signOrdersGatewayOrder,
-  TransactionExecutionOutput,
-} from '@reyaxyz/common';
-import BigNumber from 'bignumber.js';
-import { ContractType } from '@reyaxyz/common';
-import { scale } from '@reyaxyz/common';
-import { getReyaNetwork } from '../../utils/network';
-import { AbiCoder, Interface } from 'ethers';
-
-const executeMarketOrderViaOrdersGateway = async (
-  params: OrdersGatewayMarketOrderParams,
-): Promise<TransactionExecutionOutput> => {
-  const reyaChainId = getReyaNetwork();
-  const creationTimestampMs = Date.now();
-  const creationTimestampSeconds = Math.floor(creationTimestampMs / 1000);
-
-  const { signature, nonce } = await signOrdersGatewayOrder(
-    params.signer,
-    reyaChainId,
-    params.marginAccountId,
-    params.marketId,
-    params.exchangeId,
-    params.counterpartyAccountIds,
-    params.orderType,
-    params.orderInputs,
-    creationTimestampSeconds + ORDERS_GATEWAY_DEADLINE_IN_SECONDS,
-    creationTimestampMs,
-  );
-
-  const fnSig = 'execute';
-  const fnArgs = [
-    [
-      params.marginAccountId,
-      params.marketId,
-      params.exchangeId,
-      params.counterpartyAccountIds,
-      params.orderType,
-      params.orderInputs,
-      await params.signer.getAddress(),
-      nonce,
-    ],
-    [signature.v, signature.r, signature.s, signature.deadline],
-  ];
-
-  const ogInterface = new Interface(OrdersGatewayAbi);
-  const data = ogInterface.encodeFunctionData(fnSig, fnArgs);
-
-  const result = await signAndBroadcastTransaction(
-    data,
-    reyaChainId,
-    ContractType.ORDERS_GATEWAY_PROXY,
-    {
-      accountId: params.marginAccountId,
-      marketId: params.marketId,
-      tradeSource: params.tradeSource,
-      action: 'ioc-order-ui',
-    },
-  );
-
-  return result;
-};
-
-export const matchOrder = async (
-  params: MatchOrderParams,
-): Promise<MatchOrderResult> => {
-  if (params.amountInBase === 0) {
-    throw new Error('Order cannot be of size zero.');
-  }
-
-  let snappedAmount = BigNumber(params.amountInBase)
-    .abs()
-    .dividedBy(params.market.baseSpacing)
-    .integerValue(BigNumber.ROUND_FLOOR)
-    .multipliedBy(params.market.baseSpacing)
-    .toNumber();
-
-  if (params.amountInBase < 0) {
-    snappedAmount = -snappedAmount;
-  }
-
-  if (Math.abs(snappedAmount) < params.market.minOrderSizeBase) {
-    console.error(
-      `Minimum trade amount ${params.market.minOrderSizeBase}. Entered amount ${snappedAmount}, ${params.amountInBase}`,
-    );
-    throw new Error(`Minimum trade amount ${params.market.minOrderSizeBase}`);
-  }
-
-  const orderBaseE18 = scale(18)(snappedAmount);
-  const orderPriceLimitE18 = calculateMaxPriceLimit(snappedAmount > 0);
-  const orderInputs = AbiCoder.defaultAbiCoder().encode(
-    ['int256', 'uint256'],
-    [orderBaseE18, orderPriceLimitE18],
-  );
-
-  const result = await executeMarketOrderViaOrdersGateway({
-    signer: params.signer,
-    marginAccountId: params.marginAccountId,
-    counterpartyAccountIds: params.market.counterpartyAccountIds,
-    marketId: params.market.id,
-    exchangeId: params.market.exchangeId,
-    tradeSource: params.tradeSource,
-    orderType: OrdersGatewayOrderType.MARKET_ORDER,
-    orderInputs,
-  });
-
-  return {
-    transactionHash: result?.txHash || null,
-    coreSigNonce: Number(result?.coreSigNonce) || null,
-    xpBoost: result.miscellaneous?.tradeXpBoost || 0,
-    lotteryXpBoost: result.miscellaneous?.lotteryXpBoost || 0,
-    isNftWon: result.miscellaneous?.xpNftAwarded || false,
-    marginAccountId: params.marginAccountId,
-    xpEarned: result.miscellaneous?.xpEarned || 0,
-    executionPrice: result.tradeDetails?.executionPrice || 0,
-    base: result.tradeDetails?.base || 0,
-    positions: result.positions,
-    orders: result.orders,
-    accounts: result.accounts,
-  };
-};
-
-const fullCloseOrder = async (
-  params: Pick<CloseOrderParams, 'signer' | 'marginAccountId' | 'market'>,
-): Promise<TransactionExecutionOutput> => {
-  const result = await executeMarketOrderViaOrdersGateway({
-    signer: params.signer,
-    marginAccountId: params.marginAccountId,
-    counterpartyAccountIds: params.market.counterpartyAccountIds,
-    marketId: params.market.id,
-    exchangeId: params.market.exchangeId,
-    orderType: OrdersGatewayOrderType.FULL_CLOSE_ORDER,
-    orderInputs: AbiCoder.defaultAbiCoder().encode([], []),
-  });
-
-  return result;
-};
-
-const partialCloseOrder = async (
-  params: Pick<CloseOrderParams, 'signer' | 'marginAccountId' | 'market'> & {
-    orderBase: PositionEntity['base'];
-    closingOrderBase: number;
-  },
-): Promise<TransactionExecutionOutput> => {
-  if (params.orderBase === 0) {
-    throw new Error('Position is already closed.');
-  }
-
-  if (params.closingOrderBase === 0) {
-    throw new Error('Specified base to close is zero.');
-  }
-
-  if (params.closingOrderBase * params.orderBase < 0) {
-    throw new Error(
-      'Specified base to close is in different direction that the actual order.',
-    );
-  }
-
-  if (Math.abs(params.closingOrderBase) > Math.abs(params.orderBase)) {
-    throw new Error('Specified base to close is larger than the actual order.');
-  }
-
-  const orderPriceLimit = calculateMaxPriceLimit(params.closingOrderBase < 0);
-  const orderInputs = AbiCoder.defaultAbiCoder().encode(
-    ['int256', 'uint256'],
-    [-scale(18)(params.closingOrderBase), orderPriceLimit],
-  );
-
-  const result = await executeMarketOrderViaOrdersGateway({
-    signer: params.signer,
-    marginAccountId: params.marginAccountId,
-    counterpartyAccountIds: params.market.counterpartyAccountIds,
-    marketId: params.market.id,
-    exchangeId: params.market.exchangeId,
-    orderType: OrdersGatewayOrderType.REDUCE_ONLY_MARKET_ORDER,
-    orderInputs,
-  });
-
-  return result;
-};
-
-export const closeOrder = async (
-  params: CloseOrderParams,
-): Promise<CloseOrderResult> => {
-  const result =
-    params.type === 'full'
-      ? await fullCloseOrder(params)
-      : await partialCloseOrder(params);
-
-  return {
-    transactionHash: result?.txHash || null,
-    coreSigNonce: Number(result?.coreSigNonce) || null,
-    xpBoost: result.miscellaneous?.tradeXpBoost || 0,
-    lotteryXpBoost: result.miscellaneous?.lotteryXpBoost || 0,
-    isNftWon: result.miscellaneous?.xpNftAwarded || false,
-    marginAccountId: params.marginAccountId,
-    xpEarned: result.miscellaneous?.xpEarned || 0,
-    executionPrice: result.tradeDetails?.executionPrice || 0,
-    base: result.tradeDetails?.base || 0,
-  };
-};