npm - @reyaxyz/sdk - Versions diffs - 0.139.5 → 0.140.1 - Mend

@reyaxyz/sdk 0.139.5 → 0.140.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

package/README.md +1 -1
package/dist/services/orders/order.js +70 -43
package/dist/services/orders/order.js.map +1 -1
package/dist/services/orders/types.js.map +1 -1
package/dist/types/services/orders/order.d.ts.map +1 -1
package/dist/types/services/orders/types.d.ts +3 -6
package/dist/types/services/orders/types.d.ts.map +1 -1
package/package.json +3 -3
package/src/services/orders/order.ts +63 -44
package/src/services/orders/types.ts +6 -8

package/README.md CHANGED Viewed

@@ -6,5 +6,5 @@
 | Statements                  | Branches                | Functions                 | Lines             |
 | --------------------------- | ----------------------- | ------------------------- | ----------------- |
-| ![Statements](https://img.shields.io/badge/statements-9.19%25-red.svg?style=flat) | ![Branches](https://img.shields.io/badge/branches-6.06%25-red.svg?style=flat) | ![Functions](https://img.shields.io/badge/functions-4%25-red.svg?style=flat) | ![Lines](https://img.shields.io/badge/lines-8.85%25-red.svg?style=flat) |
+| ![Statements](https://img.shields.io/badge/statements-9.14%25-red.svg?style=flat) | ![Branches](https://img.shields.io/badge/branches-6.06%25-red.svg?style=flat) | ![Functions](https://img.shields.io/badge/functions-3.89%25-red.svg?style=flat) | ![Lines](https://img.shields.io/badge/lines-8.8%25-red.svg?style=flat) |

package/dist/services/orders/order.js CHANGED Viewed

@@ -48,15 +48,14 @@ 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 inputs, reyaChainId, creationTimestampMs, creationTimestampSeconds, _a, signature, nonce, fnSig, fnArgs, _b, ogInterface, data, result;
+    var reyaChainId, creationTimestampMs, creationTimestampSeconds, _a, signature, nonce, fnSig, fnArgs, _b, ogInterface, data, result;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0:
-                inputs = ethers_1.AbiCoder.defaultAbiCoder().encode(['int256', 'uint256'], [params.order.baseE18, params.order.priceLimitE18]);
                 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.order.type, inputs, creationTimestampSeconds + common_1.ORDERS_GATEWAY_DEADLINE_IN_SECONDS, creationTimestampMs)];
+                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';
@@ -64,8 +63,8 @@ var executeMarketOrderViaOrdersGateway = function (params) { return __awaiter(vo
                     params.marketId,
                     params.exchangeId,
                     params.counterpartyAccountIds,
-                    params.order.type,
-                    inputs];
+                    params.orderType,
+                    params.orderInputs];
                 return [4 /*yield*/, params.signer.getAddress()];
             case 2:
                 fnArgs = [
@@ -90,7 +89,7 @@ var executeMarketOrderViaOrdersGateway = function (params) { return __awaiter(vo
     });
 }); };
 var matchOrder = function (params) { return __awaiter(void 0, void 0, void 0, function () {
-    var snappedAmount, orderBaseE18, orderPriceLimitE18, result;
+    var snappedAmount, orderBaseE18, orderPriceLimitE18, orderInputs, result;
     var _a, _b, _c, _d, _e, _f;
     return __generator(this, function (_g) {
         switch (_g.label) {
@@ -113,6 +112,7 @@ var matchOrder = function (params) { return __awaiter(void 0, void 0, void 0, fu
                 }
                 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,
@@ -120,11 +120,8 @@ var matchOrder = function (params) { return __awaiter(void 0, void 0, void 0, fu
                         marketId: params.market.id,
                         exchangeId: params.market.exchangeId,
                         tradeSource: params.tradeSource,
-                        order: {
-                            baseE18: orderBaseE18,
-                            priceLimitE18: orderPriceLimitE18,
-                            type: common_1.OrdersGatewayOrderType.MARKET_ORDER,
-                        },
+                        orderType: common_1.OrdersGatewayOrderType.MARKET_ORDER,
+                        orderInputs: orderInputs,
                     })];
             case 1:
                 result = _g.sent();
@@ -146,56 +143,86 @@ var matchOrder = function (params) { return __awaiter(void 0, void 0, void 0, fu
     });
 }); };
 exports.matchOrder = matchOrder;
-var closeOrder = function (params) { return __awaiter(void 0, void 0, void 0, function () {
-    var closingBase, orderPriceLimit, result;
-    var _a, _b, _c, _d, _e, _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+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.');
                 }
-                closingBase = 0;
-                if (params.type === 'full') {
-                    closingBase = params.orderBase;
+                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.');
                 }
-                else {
-                    closingBase = params.closingOrderBase;
-                    if (closingBase === 0) {
-                        throw new Error('Specified base to close is zero.');
-                    }
-                    if (closingBase * params.orderBase < 0) {
-                        throw new Error('Specified base to close is in different direction that the actual order.');
-                    }
-                    if (Math.abs(closingBase) > Math.abs(params.orderBase)) {
-                        throw new Error('Specified base to close is larger than 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)(closingBase < 0);
+                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,
-                        order: {
-                            baseE18: -(0, common_3.scale)(18)(closingBase),
-                            priceLimitE18: orderPriceLimit,
-                            type: common_1.OrdersGatewayOrderType.REDUCE_ONLY_MARKET_ORDER,
-                        },
+                        orderType: common_1.OrdersGatewayOrderType.REDUCE_ONLY_MARKET_ORDER,
+                        orderInputs: orderInputs,
                     })];
             case 1:
-                result = _g.sent();
+                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: ((_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,
+                        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: ((_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,
+                        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,
                     }];
         }
     });

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

	@@ -1 +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 OrdersGatewayMarketOrderParams,\n} from './types';\nimport { signAndBroadcastTransaction } from '../signAndBroadcastTransaction';\nimport {\n calculateMaxPriceLimit,\n ORDERS_GATEWAY_DEADLINE_IN_SECONDS,\n OrdersGatewayAbi,\n OrdersGatewayOrderType,\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 inputs = AbiCoder.defaultAbiCoder().encode(\n ['int256', 'uint256'],\n [params.order.baseE18, params.order.priceLimitE18],\n );\n\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.order.type,\n inputs,\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.order.type,\n inputs,\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\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 order: {\n baseE18: orderBaseE18,\n priceLimitE18: orderPriceLimitE18,\n type: OrdersGatewayOrderType.MARKET_ORDER,\n },\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\nexport const closeOrder = async (\n params: CloseOrderParams,\n): Promise<CloseOrderResult> => {\n if (params.orderBase === 0) {\n throw new Error('Position is already closed.');\n }\n\n let closingBase: number = 0;\n if (params.type === 'full') {\n closingBase = params.orderBase;\n } else {\n closingBase = params.closingOrderBase;\n\n if (closingBase === 0) {\n throw new Error('Specified base to close is zero.');\n }\n\n if (closingBase * 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(closingBase) > Math.abs(params.orderBase)) {\n throw new Error(\n 'Specified base to close is larger than the actual order.',\n );\n }\n }\n\n const orderPriceLimit = calculateMaxPriceLimit(closingBase < 0);\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 order: {\n baseE18: -scale(18)(closingBase),\n priceLimitE18: orderPriceLimit,\n type: OrdersGatewayOrderType.REDUCE_ONLY_MARKET_ORDER,\n },\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 };\n};\n"]}
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 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/services/orders/types.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"types.js","sourceRoot":"/","sources":["services/orders/types.ts"],"names":[],"mappings":"","sourcesContent":["import { Signer, JsonRpcSigner } from 'ethers';\nimport {\n CoreCommandsEIP712SignatureAndPayload,\n MarketEntity,\n MethodParameters,\n OrdersGatewayOrderType,\n OwnerMetadataEntity,\n PositionEntity,\n TransactionExecutionOutput,\n} from '@reyaxyz/common';\n\nexport type MarketParams = {\n id: MarketEntity['id'];\n exchangeId: MarketEntity['orderInfo']['exchangeId'];\n counterpartyAccountIds: MarketEntity['orderInfo']['counterpartyAccountIds'];\n minOrderSizeBase: MarketEntity['minOrderSizeBase'];\n baseSpacing: MarketEntity['baseSpacing'];\n};\n\nexport type MatchOrderParams = {\n signer: Signer \| JsonRpcSigner;\n marginAccountId: number;\n amountInBase: number; // amount in base\n market: MarketParams;\n tradeSource?: 'reya' \| 'rage' \| 'other';\n};\n\nexport type CloseOrderParams = {\n signer: Signer \| JsonRpcSigner;\n marginAccountId: number;\n ~~orderBase: PositionEntity['base'];\n~~ market: MarketParams;\n} & (\n \| {\n type: 'full';\n }\n \| {\n type: 'partial';\n closingOrderBase: number;\n }\n);\n\nexport type MatchOrderResult = {\n transactionHash: string \| null;\n coreSigNonce: OwnerMetadataEntity['coreSigNonce'] \| null;\n xpBoost: number;\n lotteryXpBoost: number;\n isNftWon: boolean;\n marginAccountId: number;\n xpEarned: number;\n executionPrice: number;\n base: number;\n positions?: TransactionExecutionOutput['positions'];\n orders?: TransactionExecutionOutput['orders'];\n accounts?: TransactionExecutionOutput['accounts'];\n};\n\nexport type CloseOrderResult = {\n transactionHash: string \| null;\n coreSigNonce: OwnerMetadataEntity['coreSigNonce'] \| null;\n xpBoost: number;\n lotteryXpBoost: number;\n isNftWon: boolean;\n marginAccountId: number;\n xpEarned: number;\n executionPrice: number;\n base: number;\n};\n\nexport type MethodParametersAndEIP712Payload = MethodParameters &\n CoreCommandsEIP712SignatureAndPayload;\n\nexport type OrdersGatewayMarketOrderParams = {\n signer: Signer \| JsonRpcSigner;\n marginAccountId: number;\n marketId: MarketEntity['id'];\n counterpartyAccountIds: MarketEntity['orderInfo']['counterpartyAccountIds'];\n exchangeId: MarketEntity['orderInfo']['exchangeId'];\n ~~order: {\~~n ~~baseE18:~~ ~~bigint;\~~n ~~priceLimitE18: bigint;\n type:\n~~ \| OrdersGatewayOrderType.~~MARKET_ORDER~~\n \| OrdersGatewayOrderType.~~REDUCE_ONLY_MARKET_ORDER~~;\n };\n tradeSource?: 'reya' \| 'rage' \| 'other';\n};\n"]}
1	+ {"version":3,"file":"types.js","sourceRoot":"/","sources":["services/orders/types.ts"],"names":[],"mappings":"","sourcesContent":["import { Signer, JsonRpcSigner } from 'ethers';\nimport {\n CoreCommandsEIP712SignatureAndPayload,\n MarketEntity,\n MethodParameters,\n OrdersGatewayOrderType,\n OwnerMetadataEntity,\n PositionEntity,\n TransactionExecutionOutput,\n} from '@reyaxyz/common';\n\nexport type MarketParams = {\n id: MarketEntity['id'];\n exchangeId: MarketEntity['orderInfo']['exchangeId'];\n counterpartyAccountIds: MarketEntity['orderInfo']['counterpartyAccountIds'];\n minOrderSizeBase: MarketEntity['minOrderSizeBase'];\n baseSpacing: MarketEntity['baseSpacing'];\n};\n\nexport type MatchOrderParams = {\n signer: Signer \| JsonRpcSigner;\n marginAccountId: number;\n amountInBase: number; // amount in base\n market: MarketParams;\n tradeSource?: 'reya' \| 'rage' \| 'other';\n};\n\nexport type CloseOrderParams = {\n signer: Signer \| JsonRpcSigner;\n marginAccountId: number;\n market: MarketParams;\n} & (\n \| {\n type: 'full';\n }\n \| {\n type: 'partial';\n orderBase: PositionEntity['base'];\n closingOrderBase: number;\n }\n);\n\nexport type MatchOrderResult = {\n transactionHash: string \| null;\n coreSigNonce: OwnerMetadataEntity['coreSigNonce'] \| null;\n xpBoost: number;\n lotteryXpBoost: number;\n isNftWon: boolean;\n marginAccountId: number;\n xpEarned: number;\n executionPrice: number;\n base: number;\n positions?: TransactionExecutionOutput['positions'];\n orders?: TransactionExecutionOutput['orders'];\n accounts?: TransactionExecutionOutput['accounts'];\n};\n\nexport type CloseOrderResult = {\n transactionHash: string \| null;\n coreSigNonce: OwnerMetadataEntity['coreSigNonce'] \| null;\n xpBoost: number;\n lotteryXpBoost: number;\n isNftWon: boolean;\n marginAccountId: number;\n xpEarned: number;\n executionPrice: number;\n base: number;\n};\n\nexport type MethodParametersAndEIP712Payload = MethodParameters &\n CoreCommandsEIP712SignatureAndPayload;\n\nexport type OrdersGatewayMarketOrderParams = {\n signer: Signer \| JsonRpcSigner;\n marginAccountId: number;\n marketId: MarketEntity['id'];\n counterpartyAccountIds: MarketEntity['orderInfo']['counterpartyAccountIds'];\n exchangeId: MarketEntity['orderInfo']['exchangeId'];\n orderType:\n \| OrdersGatewayOrderType.MARKET_ORDER\n \| OrdersGatewayOrderType.REDUCE_ONLY_MARKET_ORDER\n \| OrdersGatewayOrderType.FULL_CLOSE_ORDER;\n orderInputs: string;\n tradeSource?: 'reya' \| 'rage' \| 'other';\n};\n"]}

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

	@@ -1 +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,EAEjB,MAAM,SAAS,CAAC;~~AA0EjB~~,eAAO,MAAM,UAAU,WACb,gBAAgB,KACvB,QAAQ,gBAAgB,~~CAsD1B~~,CAAC;~~AAEF~~,eAAO,MAAM,UAAU,WACb,gBAAgB,KACvB,QAAQ,gBAAgB,~~CAsD1B~~,CAAC"}
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,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/dist/types/services/orders/types.d.ts CHANGED Viewed

@@ -17,12 +17,12 @@ export type MatchOrderParams = {
 export type CloseOrderParams = {
     signer: Signer | JsonRpcSigner;
     marginAccountId: number;
-    orderBase: PositionEntity['base'];
     market: MarketParams;
 } & ({
     type: 'full';
 } | {
     type: 'partial';
+    orderBase: PositionEntity['base'];
     closingOrderBase: number;
 });
 export type MatchOrderResult = {
@@ -57,11 +57,8 @@ export type OrdersGatewayMarketOrderParams = {
     marketId: MarketEntity['id'];
     counterpartyAccountIds: MarketEntity['orderInfo']['counterpartyAccountIds'];
     exchangeId: MarketEntity['orderInfo']['exchangeId'];
-    order: {
-        baseE18: bigint;
-        priceLimitE18: bigint;
-        type: OrdersGatewayOrderType.MARKET_ORDER | OrdersGatewayOrderType.REDUCE_ONLY_MARKET_ORDER;
-    };
+    orderType: OrdersGatewayOrderType.MARKET_ORDER | OrdersGatewayOrderType.REDUCE_ONLY_MARKET_ORDER | OrdersGatewayOrderType.FULL_CLOSE_ORDER;
+    orderInputs: string;
     tradeSource?: 'reya' | 'rage' | 'other';
 };
 //# sourceMappingURL=types.d.ts.map

package/dist/types/services/orders/types.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/orders/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EACL,qCAAqC,EACrC,YAAY,EACZ,gBAAgB,EAChB,sBAAsB,EACtB,mBAAmB,EACnB,cAAc,EACd,0BAA0B,EAC3B,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,YAAY,GAAG;IACzB,EAAE,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;IACvB,UAAU,EAAE,YAAY,CAAC,WAAW,CAAC,CAAC,YAAY,CAAC,CAAC;IACpD,sBAAsB,EAAE,YAAY,CAAC,WAAW,CAAC,CAAC,wBAAwB,CAAC,CAAC;IAC5E,gBAAgB,EAAE,YAAY,CAAC,kBAAkB,CAAC,CAAC;IACnD,WAAW,EAAE,YAAY,CAAC,aAAa,CAAC,CAAC;CAC1C,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,YAAY,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;CACzC,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,eAAe,EAAE,MAAM,CAAC;IACxB,~~SAAS,EAAE,cAAc,CAAC,~~MAAM,~~CAAC,CAAC;IAClC,MAAM,~~EAAE,YAAY,CAAC;CACtB,GAAG,CACA;IACE,IAAI,EAAE,MAAM,CAAC;CACd,GACD;IACE,IAAI,EAAE,SAAS,CAAC;IAChB,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CACJ,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,YAAY,EAAE,mBAAmB,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC;IACzD,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,0BAA0B,CAAC,WAAW,CAAC,CAAC;IACpD,MAAM,CAAC,EAAE,0BAA0B,CAAC,QAAQ,CAAC,CAAC;IAC9C,QAAQ,CAAC,EAAE,0BAA0B,CAAC,UAAU,CAAC,CAAC;CACnD,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,YAAY,EAAE,mBAAmB,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC;IACzD,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,gCAAgC,GAAG,gBAAgB,GAC7D,qCAAqC,CAAC;AAExC,MAAM,MAAM,8BAA8B,GAAG;IAC3C,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;IAC7B,sBAAsB,EAAE,YAAY,CAAC,WAAW,CAAC,CAAC,wBAAwB,CAAC,CAAC;IAC5E,UAAU,EAAE,YAAY,CAAC,WAAW,CAAC,CAAC,YAAY,CAAC,CAAC;IACpD,~~KAAK~~,~~EAAE;QACL~~,~~OAAO~~,~~EAAE,MAAM,~~CAAC~~;QAChB~~,~~aAAa~~,~~EAAE~~,~~MAAM~~,CAAC~~;QACtB~~,~~IAAI~~,~~EACA~~,sBAAsB,CAAC,~~YAAY~~,~~GACnC~~,~~sBAAsB~~,~~CAAC~~,~~wBAAwB~~,CAAC;~~KACrD~~,~~CAAC;IACF,~~WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;CACzC,CAAC"}
1	+ {"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/orders/types.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@reyaxyz/sdk",
-  "version": "0.139.5",
+  "version": "0.140.1",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
@@ -29,11 +29,11 @@
     "generate:coverage-badges": "npx istanbul-badges-readme --silent"
   },
   "dependencies": {
-    "@reyaxyz/common": "0.321.1",
+    "@reyaxyz/common": "0.323.0",
     "axios": "1.6.2",
     "bignumber.js": "9.1.2",
     "ethers": "6.9.0"
   },
   "packageManager": "pnpm@8.3.1",
-  "gitHead": "ba5292ccbb2e932aacd321bbb9b1e1cf742a1b90"
+  "gitHead": "14753daf1fd9d785f10e14ce5d923d2fa8cb71b1"
 }

package/src/services/orders/order.ts CHANGED Viewed

@@ -11,6 +11,7 @@ import {
   ORDERS_GATEWAY_DEADLINE_IN_SECONDS,
   OrdersGatewayAbi,
   OrdersGatewayOrderType,
+  PositionEntity,
   signOrdersGatewayOrder,
   TransactionExecutionOutput,
 } from '@reyaxyz/common';
@@ -23,11 +24,6 @@ import { AbiCoder, Interface } from 'ethers';
 const executeMarketOrderViaOrdersGateway = async (
   params: OrdersGatewayMarketOrderParams,
 ): Promise<TransactionExecutionOutput> => {
-  const inputs = AbiCoder.defaultAbiCoder().encode(
-    ['int256', 'uint256'],
-    [params.order.baseE18, params.order.priceLimitE18],
-  );
   const reyaChainId = getReyaNetwork();
   const creationTimestampMs = Date.now();
   const creationTimestampSeconds = Math.floor(creationTimestampMs / 1000);
@@ -39,8 +35,8 @@ const executeMarketOrderViaOrdersGateway = async (
     params.marketId,
     params.exchangeId,
     params.counterpartyAccountIds,
-    params.order.type,
-    inputs,
+    params.orderType,
+    params.orderInputs,
     creationTimestampSeconds + ORDERS_GATEWAY_DEADLINE_IN_SECONDS,
     creationTimestampMs,
   );
@@ -52,8 +48,8 @@ const executeMarketOrderViaOrdersGateway = async (
       params.marketId,
       params.exchangeId,
       params.counterpartyAccountIds,
-      params.order.type,
-      inputs,
+      params.orderType,
+      params.orderInputs,
       await params.signer.getAddress(),
       nonce,
     ],
@@ -105,6 +101,10 @@ export const matchOrder = async (
   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,
@@ -113,11 +113,8 @@ export const matchOrder = async (
     marketId: params.market.id,
     exchangeId: params.market.exchangeId,
     tradeSource: params.tradeSource,
-    order: {
-      baseE18: orderBaseE18,
-      priceLimitE18: orderPriceLimitE18,
-      type: OrdersGatewayOrderType.MARKET_ORDER,
-    },
+    orderType: OrdersGatewayOrderType.MARKET_ORDER,
+    orderInputs,
   });
   return {
@@ -136,37 +133,51 @@ export const matchOrder = async (
   };
 };
-export const closeOrder = async (
-  params: CloseOrderParams,
-): Promise<CloseOrderResult> => {
+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.');
   }
-  let closingBase: number = 0;
-  if (params.type === 'full') {
-    closingBase = params.orderBase;
-  } else {
-    closingBase = params.closingOrderBase;
-    if (closingBase === 0) {
-      throw new Error('Specified base to close is zero.');
-    }
-    if (closingBase * params.orderBase < 0) {
-      throw new Error(
-        'Specified base to close is in different direction that the actual order.',
-      );
-    }
-    if (Math.abs(closingBase) > Math.abs(params.orderBase)) {
-      throw new Error(
-        'Specified base to close is larger than the actual order.',
-      );
-    }
+  if (params.closingOrderBase === 0) {
+    throw new Error('Specified base to close is zero.');
   }
-  const orderPriceLimit = calculateMaxPriceLimit(closingBase < 0);
+  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,
@@ -174,13 +185,21 @@ export const closeOrder = async (
     counterpartyAccountIds: params.market.counterpartyAccountIds,
     marketId: params.market.id,
     exchangeId: params.market.exchangeId,
-    order: {
-      baseE18: -scale(18)(closingBase),
-      priceLimitE18: orderPriceLimit,
-      type: OrdersGatewayOrderType.REDUCE_ONLY_MARKET_ORDER,
-    },
+    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,

package/src/services/orders/types.ts CHANGED Viewed

@@ -28,7 +28,6 @@ export type MatchOrderParams = {
 export type CloseOrderParams = {
   signer: Signer | JsonRpcSigner;
   marginAccountId: number;
-  orderBase: PositionEntity['base'];
   market: MarketParams;
 } & (
   | {
@@ -36,6 +35,7 @@ export type CloseOrderParams = {
     }
   | {
       type: 'partial';
+      orderBase: PositionEntity['base'];
       closingOrderBase: number;
     }
 );
@@ -76,12 +76,10 @@ export type OrdersGatewayMarketOrderParams = {
   marketId: MarketEntity['id'];
   counterpartyAccountIds: MarketEntity['orderInfo']['counterpartyAccountIds'];
   exchangeId: MarketEntity['orderInfo']['exchangeId'];
-  order: {
-    baseE18: bigint;
-    priceLimitE18: bigint;
-    type:
-      | OrdersGatewayOrderType.MARKET_ORDER
-      | OrdersGatewayOrderType.REDUCE_ONLY_MARKET_ORDER;
-  };
+  orderType:
+    | OrdersGatewayOrderType.MARKET_ORDER
+    | OrdersGatewayOrderType.REDUCE_ONLY_MARKET_ORDER
+    | OrdersGatewayOrderType.FULL_CLOSE_ORDER;
+  orderInputs: string;
   tradeSource?: 'reya' | 'rage' | 'other';
 };