@reyaxyz/sdk 0.134.36 → 0.136.0

package/README.md

@@ -6,5 +6,5 @@
 
 | Statements                  | Branches                | Functions                 | Lines             |
 | --------------------------- | ----------------------- | ------------------------- | ----------------- |
-| ![Statements](https://img.shields.io/badge/statements-9.16%25-red.svg?style=flat) | ![Branches](https://img.shields.io/badge/branches-5.75%25-red.svg?style=flat) | ![Functions](https://img.shields.io/badge/functions-4.1%25-red.svg?style=flat) | ![Lines](https://img.shields.io/badge/lines-8.81%25-red.svg?style=flat) |
+| ![Statements](https://img.shields.io/badge/statements-9.45%25-red.svg?style=flat) | ![Branches](https://img.shields.io/badge/branches-5.88%25-red.svg?style=flat) | ![Functions](https://img.shields.io/badge/functions-4.16%25-red.svg?style=flat) | ![Lines](https://img.shields.io/badge/lines-9.1%25-red.svg?style=flat) |
 

package/dist/config/index.js

@@ -60,35 +60,17 @@ var TransactionModule = /** @class */ (function (_super) {
     }
     TransactionModule.prototype.executeTransaction = function (txData, contractAddress, metadata) {
         return __awaiter(this, void 0, void 0, function () {
-            var isReyaExecutorEnabled, result, error_1;
+            var result;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        isReyaExecutorEnabled = process.env.IS_REYA_EXECUTOR_ENABLED === 'true' || false;
-                        if (!isReyaExecutorEnabled) return [3 /*break*/, 4];
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, this.post('/api/transaction-gelato/executeReya', {}, {
-                                txData: txData,
-                                contractAddress: contractAddress,
-                                metadata: metadata,
-                            })];
-                    case 2:
-                        result = _a.sent();
-                        if (result.txHash) {
-                            return [2 /*return*/, result];
-                        }
-                        return [3 /*break*/, 4];
-                    case 3:
-                        error_1 = _a.sent();
-                        console.warn('Reya executor failed', error_1);
-                        return [3 /*break*/, 4];
-                    case 4: return [2 /*return*/, this.post('/api/transaction-gelato/executeGelato', {}, {
+                    case 0: return [4 /*yield*/, this.post('/api/transaction-gelato/executeReya', {}, {
                             txData: txData,
                             contractAddress: contractAddress,
                             metadata: metadata,
                         })];
+                    case 1:
+                        result = _a.sent();
+                        return [2 /*return*/, result];
                 }
             });
         });

package/dist/config/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"/","sources":["config/index.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  RestClient,\n  ServiceConfig,\n  TransactionExecutionMetadata,\n  TransactionExecutionOutput,\n  CollateralWithHaircut,\n  getApiClientConfig,\n} from '@reyaxyz/common';\n\nexport type TxData = {\n  to: string;\n  data: string;\n};\n\nexport class TransactionModule extends RestClient {\n  async executeTransaction(\n    txData: TxData,\n    contractAddress: string,\n    metadata: TransactionExecutionMetadata,\n  ): Promise<TransactionExecutionOutput> {\n    const isReyaExecutorEnabled =\n      process.env.IS_REYA_EXECUTOR_ENABLED === 'true' || false;\n\n    if (isReyaExecutorEnabled) {\n      try {\n        const result = await this.post<TransactionExecutionOutput>(\n          '/api/transaction-gelato/executeReya',\n          {},\n          {\n            txData: txData,\n            contractAddress,\n            metadata,\n          },\n        );\n\n        if (result.txHash) {\n          return result;\n        }\n      } catch (error) {\n        console.warn('Reya executor failed', error);\n      }\n    }\n\n    return this.post<TransactionExecutionOutput>(\n      '/api/transaction-gelato/executeGelato',\n      {},\n      {\n        txData: txData,\n        contractAddress,\n        metadata,\n      },\n    );\n  }\n\n  async pushPendingTransaction(\n    marginAccountId: number,\n    transactionHash: string,\n    sourceChainId: number,\n    amount: number,\n    assetId: string,\n    type: string,\n  ) {\n    const uri = `/api/accounts/${marginAccountId}/push-pending-transaction`;\n    return this.post<{ successful: boolean }>(\n      uri,\n      {},\n      {\n        tx_hash: transactionHash,\n        source_chain_id: sourceChainId,\n        amount,\n        asset_id: assetId,\n        type: type,\n      },\n    );\n  }\n}\n\nexport class GeneralRestModule extends RestClient {\n  async getCollateralInfo(): Promise<CollateralWithHaircut[]> {\n    return this.get<CollateralWithHaircut[]>(\n      `/api/tokens/available-collaterals/excluding-rusd/${false}`,\n    );\n  }\n}\n\n// Internal state\nlet transactionModule: TransactionModule = new TransactionModule(\n  getApiClientConfig('test').apiEndpoint,\n);\n\nlet generalRestModule: GeneralRestModule = new GeneralRestModule(\n  getApiClientConfig('test').apiEndpoint,\n);\n\nlet config: ServiceConfig;\n\nexport const getSdkConfig = (): ServiceConfig => {\n  return config;\n};\n\n// Function to configure the SDK\nexport const configureSDK = (\n  environment: ServiceConfig['environment'],\n): void => {\n  config = getApiClientConfig(environment);\n  transactionModule = new TransactionModule(config.apiEndpoint);\n  generalRestModule = new GeneralRestModule(config.apiEndpoint);\n};\n\nexport const getTransactionModuleClient = (): TransactionModule => {\n  if (!transactionModule)\n    throw new Error('SDK is not configured! Call configureSDK()');\n  return transactionModule;\n};\n\nexport const getGeneralRestModuleClient = (): GeneralRestModule => {\n  if (!transactionModule)\n    throw new Error('SDK is not configured! Call configureSDK()');\n  return generalRestModule;\n};\n"]}
+{"version":3,"file":"index.js","sourceRoot":"/","sources":["config/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAOyB;AAOzB;IAAuC,qCAAU;IAAjD;;IAwCA,CAAC;IAvCO,8CAAkB,GAAxB,UACE,MAAc,EACd,eAAuB,EACvB,QAAsC;;;;;4BAEvB,qBAAM,IAAI,CAAC,IAAI,CAC5B,qCAAqC,EACrC,EAAE,EACF;4BACE,MAAM,EAAE,MAAM;4BACd,eAAe,iBAAA;4BACf,QAAQ,UAAA;yBACT,CACF,EAAA;;wBARK,MAAM,GAAG,SAQd;wBAED,sBAAO,MAAM,EAAC;;;;KACf;IAEK,kDAAsB,GAA5B,UACE,eAAuB,EACvB,eAAuB,EACvB,aAAqB,EACrB,MAAc,EACd,OAAe,EACf,IAAY;;;;gBAEN,GAAG,GAAG,wBAAiB,eAAe,8BAA2B,CAAC;gBACxE,sBAAO,IAAI,CAAC,IAAI,CACd,GAAG,EACH,EAAE,EACF;wBACE,OAAO,EAAE,eAAe;wBACxB,eAAe,EAAE,aAAa;wBAC9B,MAAM,QAAA;wBACN,QAAQ,EAAE,OAAO;wBACjB,IAAI,EAAE,IAAI;qBACX,CACF,EAAC;;;KACH;IACH,wBAAC;AAAD,CAAC,AAxCD,CAAuC,mBAAU,GAwChD;AAxCY,8CAAiB;AA0C9B;IAAuC,qCAAU;IAAjD;;IAMA,CAAC;IALO,6CAAiB,GAAvB;;;gBACE,sBAAO,IAAI,CAAC,GAAG,CACb,2DAAoD,KAAK,CAAE,CAC5D,EAAC;;;KACH;IACH,wBAAC;AAAD,CAAC,AAND,CAAuC,mBAAU,GAMhD;AANY,8CAAiB;AAQ9B,iBAAiB;AACjB,IAAI,iBAAiB,GAAsB,IAAI,iBAAiB,CAC9D,IAAA,2BAAkB,EAAC,MAAM,CAAC,CAAC,WAAW,CACvC,CAAC;AAEF,IAAI,iBAAiB,GAAsB,IAAI,iBAAiB,CAC9D,IAAA,2BAAkB,EAAC,MAAM,CAAC,CAAC,WAAW,CACvC,CAAC;AAEF,IAAI,MAAqB,CAAC;AAEnB,IAAM,YAAY,GAAG;IAC1B,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAFW,QAAA,YAAY,gBAEvB;AAEF,gCAAgC;AACzB,IAAM,YAAY,GAAG,UAC1B,WAAyC;IAEzC,MAAM,GAAG,IAAA,2BAAkB,EAAC,WAAW,CAAC,CAAC;IACzC,iBAAiB,GAAG,IAAI,iBAAiB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC9D,iBAAiB,GAAG,IAAI,iBAAiB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;AAChE,CAAC,CAAC;AANW,QAAA,YAAY,gBAMvB;AAEK,IAAM,0BAA0B,GAAG;IACxC,IAAI,CAAC,iBAAiB;QACpB,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;IAChE,OAAO,iBAAiB,CAAC;AAC3B,CAAC,CAAC;AAJW,QAAA,0BAA0B,8BAIrC;AAEK,IAAM,0BAA0B,GAAG;IACxC,IAAI,CAAC,iBAAiB;QACpB,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;IAChE,OAAO,iBAAiB,CAAC;AAC3B,CAAC,CAAC;AAJW,QAAA,0BAA0B,8BAIrC","sourcesContent":["import {\n  RestClient,\n  ServiceConfig,\n  TransactionExecutionMetadata,\n  TransactionExecutionOutput,\n  CollateralWithHaircut,\n  getApiClientConfig,\n} from '@reyaxyz/common';\n\nexport type TxData = {\n  to: string;\n  data: string;\n};\n\nexport class TransactionModule extends RestClient {\n  async executeTransaction(\n    txData: TxData,\n    contractAddress: string,\n    metadata: TransactionExecutionMetadata,\n  ): Promise<TransactionExecutionOutput> {\n    const result = await this.post<TransactionExecutionOutput>(\n      '/api/transaction-gelato/executeReya',\n      {},\n      {\n        txData: txData,\n        contractAddress,\n        metadata,\n      },\n    );\n\n    return result;\n  }\n\n  async pushPendingTransaction(\n    marginAccountId: number,\n    transactionHash: string,\n    sourceChainId: number,\n    amount: number,\n    assetId: string,\n    type: string,\n  ) {\n    const uri = `/api/accounts/${marginAccountId}/push-pending-transaction`;\n    return this.post<{ successful: boolean }>(\n      uri,\n      {},\n      {\n        tx_hash: transactionHash,\n        source_chain_id: sourceChainId,\n        amount,\n        asset_id: assetId,\n        type: type,\n      },\n    );\n  }\n}\n\nexport class GeneralRestModule extends RestClient {\n  async getCollateralInfo(): Promise<CollateralWithHaircut[]> {\n    return this.get<CollateralWithHaircut[]>(\n      `/api/tokens/available-collaterals/excluding-rusd/${false}`,\n    );\n  }\n}\n\n// Internal state\nlet transactionModule: TransactionModule = new TransactionModule(\n  getApiClientConfig('test').apiEndpoint,\n);\n\nlet generalRestModule: GeneralRestModule = new GeneralRestModule(\n  getApiClientConfig('test').apiEndpoint,\n);\n\nlet config: ServiceConfig;\n\nexport const getSdkConfig = (): ServiceConfig => {\n  return config;\n};\n\n// Function to configure the SDK\nexport const configureSDK = (\n  environment: ServiceConfig['environment'],\n): void => {\n  config = getApiClientConfig(environment);\n  transactionModule = new TransactionModule(config.apiEndpoint);\n  generalRestModule = new GeneralRestModule(config.apiEndpoint);\n};\n\nexport const getTransactionModuleClient = (): TransactionModule => {\n  if (!transactionModule)\n    throw new Error('SDK is not configured! Call configureSDK()');\n  return transactionModule;\n};\n\nexport const getGeneralRestModuleClient = (): GeneralRestModule => {\n  if (!transactionModule)\n    throw new Error('SDK is not configured! Call configureSDK()');\n  return generalRestModule;\n};\n"]}

package/dist/index.js

@@ -20,7 +20,6 @@ __exportStar(require("./services/margin-accounts"), exports);
 __exportStar(require("./services/money-flows"), exports);
 __exportStar(require("./services/orders"), exports);
 __exportStar(require("./services/conditional-orders"), exports);
-__exportStar(require("./services/isolated-order"), exports);
 __exportStar(require("./services/token"), exports);
 var config_1 = require("./config");
 Object.defineProperty(exports, "configureSDK", { enumerable: true, get: function () { return config_1.configureSDK; } });

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"/","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,gDAA8B;AAC9B,6DAA2C;AAC3C,yDAAuC;AACvC,oDAAkC;AAClC,gEAA8C;AAC9C,4DAA0C;AAC1C,mDAAiC;AACjC,mCAAoE;AAA3D,sGAAA,YAAY,OAAA;AAAE,oHAAA,0BAA0B,OAAA","sourcesContent":["export * from './services/lp';\nexport * from './services/margin-accounts';\nexport * from './services/money-flows';\nexport * from './services/orders';\nexport * from './services/conditional-orders';\nexport * from './services/isolated-order';\nexport * from './services/token';\nexport { configureSDK, getTransactionModuleClient } from './config';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"/","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,gDAA8B;AAC9B,6DAA2C;AAC3C,yDAAuC;AACvC,oDAAkC;AAClC,gEAA8C;AAC9C,mDAAiC;AACjC,mCAAoE;AAA3D,sGAAA,YAAY,OAAA;AAAE,oHAAA,0BAA0B,OAAA","sourcesContent":["export * from './services/lp';\nexport * from './services/margin-accounts';\nexport * from './services/money-flows';\nexport * from './services/orders';\nexport * from './services/conditional-orders';\nexport * from './services/token';\nexport { configureSDK, getTransactionModuleClient } from './config';\n"]}

package/dist/services/orders/order.js

@@ -48,7 +48,7 @@ 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 inputs, reyaChainId, creationTimestampMs, creationTimestampSeconds, _a, signature, nonce, fnSig, fnArgs, _b, ogInterface, data, isFastExecutionEnabled, result;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0:
@@ -77,10 +77,12 @@ var executeMarketOrderViaOrdersGateway = function (params) { return __awaiter(vo
                 ];
                 ogInterface = new ethers_1.Interface(common_1.OrdersGatewayAbi);
                 data = ogInterface.encodeFunctionData(fnSig, fnArgs);
+                isFastExecutionEnabled = process.env.FAST_ORDER_EXECUTION === 'true' || false;
                 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: isFastExecutionEnabled ? 'ioc-order-ui' : undefined,
                     })];
             case 3:
                 result = _c.sent();
@@ -94,7 +96,6 @@ var matchOrder = function (params) { return __awaiter(void 0, void 0, void 0, fu
     return __generator(this, function (_g) {
         switch (_g.label) {
             case 0:
-                console.log('match order execution v2');
                 if (params.amountInBase === 0) {
                     throw new Error('Order cannot be of size zero.');
                 }
@@ -153,7 +154,6 @@ var closeOrder = function (params) { return __awaiter(void 0, void 0, void 0, fu
     return __generator(this, function (_g) {
         switch (_g.label) {
             case 0:
-                console.log('close order execution v2');
                 if (params.orderBase === 0) {
                     throw new Error('Position is already closed.');
                 }

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  OrdersGatewayMarketOrderParams,\n} from './types';\nimport { signAndBroadcastTransaction } from '../signAndBroadcastTransaction';\nimport {\n  calculatePriceLimitForTrade,\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    },\n  );\n\n  return result;\n};\n\nexport const matchOrder = async (\n  params: MatchOrderParams,\n): Promise<MatchOrderResult> => {\n  console.log('match order execution v2');\n\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 slippageFactor = 40; // 2.5%\n  const orderPriceLimitE18 = calculatePriceLimitForTrade(\n    params.market.currentPrice,\n    snappedAmount,\n    slippageFactor,\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    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  console.log('close order execution v2');\n\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 slippageFactor = 40; // 2.5%\n  const orderPriceLimit = calculatePriceLimitForTrade(\n    params.market.currentPrice,\n    -closingBase,\n    slippageFactor,\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    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"]}
+{"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  calculatePriceLimitForTrade,\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 isFastExecutionEnabled =\n    process.env.FAST_ORDER_EXECUTION === 'true' || false;\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: isFastExecutionEnabled ? 'ioc-order-ui' : undefined,\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 slippageFactor = 40; // 2.5%\n  const orderPriceLimitE18 = calculatePriceLimitForTrade(\n    params.market.currentPrice,\n    snappedAmount,\n    slippageFactor,\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    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 slippageFactor = 40; // 2.5%\n  const orderPriceLimit = calculatePriceLimitForTrade(\n    params.market.currentPrice,\n    -closingBase,\n    slippageFactor,\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    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"]}

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  CoreCommandsEIP712SignatureAndPayload,\n  MarginAccountEntity,\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  currentPrice: number;\n  minOrderSizeBase: MarketEntity['minOrderSizeBase'];\n  baseSpacing: MarketEntity['baseSpacing'];\n};\n\nexport type MatchOrderParams = {\n  signer: Signer | JsonRpcSigner;\n  owner: Pick<OwnerMetadataEntity, 'coreSigNonce'>;\n  marginAccountId: MarginAccountEntity['id'];\n  amountInBase: number; // amount in base\n  market: MarketParams;\n  tradeSource?: 'reya' | 'rage' | 'other';\n};\n\nexport type CloseOrderParams = {\n  signer: Signer | JsonRpcSigner;\n  owner: Pick<OwnerMetadataEntity, 'coreSigNonce'>;\n  marginAccountId: MarginAccountEntity['id'];\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: MarginAccountEntity['id'];\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: MarginAccountEntity['id'];\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: MarginAccountEntity['id'];\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"]}
+{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/orders/types.ts"],"names":[],"mappings":"","sourcesContent":["import { Signer, JsonRpcSigner } from 'ethers';\nimport {\n  CoreCommandsEIP712SignatureAndPayload,\n  MarginAccountEntity,\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  currentPrice: number;\n  minOrderSizeBase: MarketEntity['minOrderSizeBase'];\n  baseSpacing: MarketEntity['baseSpacing'];\n};\n\nexport type MatchOrderParams = {\n  signer: Signer | JsonRpcSigner;\n  marginAccountId: MarginAccountEntity['id'];\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: MarginAccountEntity['id'];\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: MarginAccountEntity['id'];\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: MarginAccountEntity['id'];\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: MarginAccountEntity['id'];\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"]}

package/dist/types/config/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["config/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,aAAa,EACb,4BAA4B,EAC5B,0BAA0B,EAC1B,qBAAqB,EAEtB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,MAAM,GAAG;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,qBAAa,iBAAkB,SAAQ,UAAU;IACzC,kBAAkB,CACtB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,4BAA4B,GACrC,OAAO,CAAC,0BAA0B,CAAC;IAmChC,sBAAsB,CAC1B,eAAe,EAAE,MAAM,EACvB,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM;oBAGmB,OAAO;;CAYzC;AAED,qBAAa,iBAAkB,SAAQ,UAAU;IACzC,iBAAiB,IAAI,OAAO,CAAC,qBAAqB,EAAE,CAAC;CAK5D;AAaD,eAAO,MAAM,YAAY,QAAO,aAE/B,CAAC;AAGF,eAAO,MAAM,YAAY,gBACV,aAAa,CAAC,aAAa,CAAC,KACxC,IAIF,CAAC;AAEF,eAAO,MAAM,0BAA0B,QAAO,iBAI7C,CAAC;AAEF,eAAO,MAAM,0BAA0B,QAAO,iBAI7C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["config/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,aAAa,EACb,4BAA4B,EAC5B,0BAA0B,EAC1B,qBAAqB,EAEtB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,MAAM,GAAG;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,qBAAa,iBAAkB,SAAQ,UAAU;IACzC,kBAAkB,CACtB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,4BAA4B,GACrC,OAAO,CAAC,0BAA0B,CAAC;IAchC,sBAAsB,CAC1B,eAAe,EAAE,MAAM,EACvB,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM;oBAGmB,OAAO;;CAYzC;AAED,qBAAa,iBAAkB,SAAQ,UAAU;IACzC,iBAAiB,IAAI,OAAO,CAAC,qBAAqB,EAAE,CAAC;CAK5D;AAaD,eAAO,MAAM,YAAY,QAAO,aAE/B,CAAC;AAGF,eAAO,MAAM,YAAY,gBACV,aAAa,CAAC,aAAa,CAAC,KACxC,IAIF,CAAC;AAEF,eAAO,MAAM,0BAA0B,QAAO,iBAI7C,CAAC;AAEF,eAAO,MAAM,0BAA0B,QAAO,iBAI7C,CAAC"}

package/dist/types/index.d.ts

@@ -3,7 +3,6 @@ export * from './services/margin-accounts';
 export * from './services/money-flows';
 export * from './services/orders';
 export * from './services/conditional-orders';
-export * from './services/isolated-order';
 export * from './services/token';
 export { configureSDK, getTransactionModuleClient } from './config';
 //# sourceMappingURL=index.d.ts.map

package/dist/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,mBAAmB,CAAC;AAClC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,0BAA0B,EAAE,MAAM,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,mBAAmB,CAAC;AAClC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,0BAA0B,EAAE,MAAM,UAAU,CAAC"}

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,EAEjB,MAAM,SAAS,CAAC;AAyEjB,eAAO,MAAM,UAAU,WACb,gBAAgB,KACvB,QAAQ,gBAAgB,CA6D1B,CAAC;AAEF,eAAO,MAAM,UAAU,WACb,gBAAgB,KACvB,QAAQ,gBAAgB,CA6D1B,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,EAEjB,MAAM,SAAS,CAAC;AA6EjB,eAAO,MAAM,UAAU,WACb,gBAAgB,KACvB,QAAQ,gBAAgB,CA2D1B,CAAC;AAEF,eAAO,MAAM,UAAU,WACb,gBAAgB,KACvB,QAAQ,gBAAgB,CA2D1B,CAAC"}

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

@@ -10,7 +10,6 @@ export type MarketParams = {
 };
 export type MatchOrderParams = {
     signer: Signer | JsonRpcSigner;
-    owner: Pick<OwnerMetadataEntity, 'coreSigNonce'>;
     marginAccountId: MarginAccountEntity['id'];
     amountInBase: number;
     market: MarketParams;
@@ -18,7 +17,6 @@ export type MatchOrderParams = {
 };
 export type CloseOrderParams = {
     signer: Signer | JsonRpcSigner;
-    owner: Pick<OwnerMetadataEntity, 'coreSigNonce'>;
     marginAccountId: MarginAccountEntity['id'];
     orderBase: PositionEntity['base'];
     market: MarketParams;

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/orders/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/orders/types.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reyaxyz/sdk",
-  "version": "0.134.36",
+  "version": "0.136.0",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
@@ -29,11 +29,11 @@
     "generate:coverage-badges": "npx istanbul-badges-readme --silent"
   },
   "dependencies": {
-    "@reyaxyz/common": "0.304.0",
+    "@reyaxyz/common": "0.305.0",
     "axios": "1.6.2",
     "bignumber.js": "9.1.2",
     "ethers": "6.9.0"
   },
   "packageManager": "pnpm@8.3.1",
-  "gitHead": "e27bdaa0240fd1e8b2a38a27586a1757737b52e4"
+  "gitHead": "50889c5e771c392ca79306bbcdcec44d32eadc7d"
 }

package/src/config/index.ts

@@ -18,31 +18,8 @@ export class TransactionModule extends RestClient {
     contractAddress: string,
     metadata: TransactionExecutionMetadata,
   ): Promise<TransactionExecutionOutput> {
-    const isReyaExecutorEnabled =
-      process.env.IS_REYA_EXECUTOR_ENABLED === 'true' || false;
-
-    if (isReyaExecutorEnabled) {
-      try {
-        const result = await this.post<TransactionExecutionOutput>(
-          '/api/transaction-gelato/executeReya',
-          {},
-          {
-            txData: txData,
-            contractAddress,
-            metadata,
-          },
-        );
-
-        if (result.txHash) {
-          return result;
-        }
-      } catch (error) {
-        console.warn('Reya executor failed', error);
-      }
-    }
-
-    return this.post<TransactionExecutionOutput>(
-      '/api/transaction-gelato/executeGelato',
+    const result = await this.post<TransactionExecutionOutput>(
+      '/api/transaction-gelato/executeReya',
       {},
       {
         txData: txData,
@@ -50,6 +27,8 @@ export class TransactionModule extends RestClient {
         metadata,
       },
     );
+
+    return result;
   }
 
   async pushPendingTransaction(

package/src/index.ts

@@ -3,6 +3,5 @@ export * from './services/margin-accounts';
 export * from './services/money-flows';
 export * from './services/orders';
 export * from './services/conditional-orders';
-export * from './services/isolated-order';
 export * from './services/token';
 export { configureSDK, getTransactionModuleClient } from './config';

package/src/services/orders/order.ts

@@ -63,6 +63,9 @@ const executeMarketOrderViaOrdersGateway = async (
   const ogInterface = new Interface(OrdersGatewayAbi);
   const data = ogInterface.encodeFunctionData(fnSig, fnArgs);
 
+  const isFastExecutionEnabled =
+    process.env.FAST_ORDER_EXECUTION === 'true' || false;
+
   const result = await signAndBroadcastTransaction(
     data,
     reyaChainId,
@@ -71,6 +74,7 @@ const executeMarketOrderViaOrdersGateway = async (
       accountId: params.marginAccountId,
       marketId: params.marketId,
       tradeSource: params.tradeSource,
+      action: isFastExecutionEnabled ? 'ioc-order-ui' : undefined,
     },
   );
 
@@ -80,8 +84,6 @@ const executeMarketOrderViaOrdersGateway = async (
 export const matchOrder = async (
   params: MatchOrderParams,
 ): Promise<MatchOrderResult> => {
-  console.log('match order execution v2');
-
   if (params.amountInBase === 0) {
     throw new Error('Order cannot be of size zero.');
   }
@@ -145,8 +147,6 @@ export const matchOrder = async (
 export const closeOrder = async (
   params: CloseOrderParams,
 ): Promise<CloseOrderResult> => {
-  console.log('close order execution v2');
-
   if (params.orderBase === 0) {
     throw new Error('Position is already closed.');
   }

package/src/services/orders/types.ts

@@ -21,7 +21,6 @@ export type MarketParams = {
 
 export type MatchOrderParams = {
   signer: Signer | JsonRpcSigner;
-  owner: Pick<OwnerMetadataEntity, 'coreSigNonce'>;
   marginAccountId: MarginAccountEntity['id'];
   amountInBase: number; // amount in base
   market: MarketParams;
@@ -30,7 +29,6 @@ export type MatchOrderParams = {
 
 export type CloseOrderParams = {
   signer: Signer | JsonRpcSigner;
-  owner: Pick<OwnerMetadataEntity, 'coreSigNonce'>;
   marginAccountId: MarginAccountEntity['id'];
   orderBase: PositionEntity['base'];
   market: MarketParams;

package/dist/services/isolated-order/index.js

@@ -1,19 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./types"), exports);
-__exportStar(require("./isolatedOrder"), exports);
-//# sourceMappingURL=index.js.map

package/dist/services/isolated-order/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"/","sources":["services/isolated-order/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,kDAAgC","sourcesContent":["export * from './types';\nexport * from './isolatedOrder';\n"]}

package/dist/services/isolated-order/isolatedOrder.js

@@ -1,105 +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 };
-    }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isolatedOrder = void 0;
-var margin_accounts_1 = require("../margin-accounts");
-var orders_1 = require("../orders");
-var isolatedOrder = function (params) { return __awaiter(void 0, void 0, void 0, function () {
-    var createAccountResult, _i, _a, action, ownerWithBumpedNonce, matchOrderResult;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
-            case 0: return [4 /*yield*/, (0, margin_accounts_1.createAccount)({
-                    ownerAddress: params.owner.address,
-                    name: 'Isolated Trade Account',
-                })];
-            case 1:
-                createAccountResult = _b.sent();
-                if (!createAccountResult.accountId) {
-                    throw new Error('New Account Id not available to execute isolated trade');
-                }
-                _i = 0, _a = params.editCollateralActions;
-                _b.label = 2;
-            case 2:
-                if (!(_i < _a.length)) return [3 /*break*/, 5];
-                action = _a[_i];
-                // todo: p1: pack transfers into a single tx with multiple transfer commands (core sig issue)
-                return [4 /*yield*/, (0, margin_accounts_1.transferMarginBetweenAccounts)({
-                        signer: params.signer,
-                        owner: params.owner,
-                        fromMarginAccountId: params.fromMarginAccountId,
-                        toMarginAccountId: createAccountResult.accountId,
-                        amount: Math.abs(action.collateralDelta),
-                        tokenAddress: action.collateralAddress,
-                    })];
-            case 3:
-                // todo: p1: pack transfers into a single tx with multiple transfer commands (core sig issue)
-                _b.sent();
-                _b.label = 4;
-            case 4:
-                _i++;
-                return [3 /*break*/, 2];
-            case 5:
-                ownerWithBumpedNonce = {
-                    coreSigNonce: params.owner.coreSigNonce + 1,
-                    address: params.owner.address,
-                };
-                return [4 /*yield*/, (0, orders_1.matchOrder)({
-                        signer: params.signer,
-                        owner: ownerWithBumpedNonce,
-                        marginAccountId: createAccountResult.accountId,
-                        amountInBase: params.amountInBase,
-                        market: params.market,
-                    })];
-            case 6:
-                matchOrderResult = _b.sent();
-                return [2 /*return*/, {
-                        transactionHash: (matchOrderResult === null || matchOrderResult === void 0 ? void 0 : matchOrderResult.transactionHash) || null,
-                        coreSigNonce: matchOrderResult.coreSigNonce,
-                        xpBoost: matchOrderResult.xpBoost,
-                        lotteryXpBoost: matchOrderResult.lotteryXpBoost,
-                        isNftWon: matchOrderResult.isNftWon,
-                        marginAccountId: createAccountResult.accountId,
-                        xpEarned: matchOrderResult.xpEarned,
-                        executionPrice: matchOrderResult.executionPrice,
-                        base: matchOrderResult.base,
-                    }];
-        }
-    });
-}); };
-exports.isolatedOrder = isolatedOrder;
-//# sourceMappingURL=isolatedOrder.js.map

package/dist/services/isolated-order/isolatedOrder.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"isolatedOrder.js","sourceRoot":"/","sources":["services/isolated-order/isolatedOrder.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,sDAG4B;AAC5B,oCAAuC;AAGhC,IAAM,aAAa,GAAG,UAC3B,MAA2B;;;;oBAQC,qBAAM,IAAA,+BAAa,EAAC;oBAC9C,YAAY,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO;oBAClC,IAAI,EAAE,wBAAwB;iBAC/B,CAAC,EAAA;;gBAHI,mBAAmB,GAAG,SAG1B;gBAEF,IAAI,CAAC,mBAAmB,CAAC,SAAS,EAAE,CAAC;oBACnC,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;gBAC5E,CAAC;sBAIgD,EAA5B,KAAA,MAAM,CAAC,qBAAqB;;;qBAA5B,CAAA,cAA4B,CAAA;gBAAtC,MAAM;gBACf,6FAA6F;gBAC7F,qBAAM,IAAA,+CAA6B,EAAC;wBAClC,MAAM,EAAE,MAAM,CAAC,MAAM;wBACrB,KAAK,EAAE,MAAM,CAAC,KAAK;wBACnB,mBAAmB,EAAE,MAAM,CAAC,mBAAmB;wBAC/C,iBAAiB,EAAE,mBAAmB,CAAC,SAAS;wBAChD,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC;wBACxC,YAAY,EAAE,MAAM,CAAC,iBAAiB;qBACvC,CAAC,EAAA;;gBARF,6FAA6F;gBAC7F,SAOE,CAAC;;;gBATgB,IAA4B,CAAA;;;gBAkB3C,oBAAoB,GAGtB;oBACF,YAAY,EAAE,MAAM,CAAC,KAAK,CAAC,YAAY,GAAG,CAAC;oBAC3C,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO;iBAC9B,CAAC;gBAGuB,qBAAM,IAAA,mBAAU,EAAC;wBACxC,MAAM,EAAE,MAAM,CAAC,MAAM;wBACrB,KAAK,EAAE,oBAAoB;wBAC3B,eAAe,EAAE,mBAAmB,CAAC,SAAS;wBAC9C,YAAY,EAAE,MAAM,CAAC,YAAY;wBACjC,MAAM,EAAE,MAAM,CAAC,MAAM;qBACtB,CAAC,EAAA;;gBANI,gBAAgB,GAAG,SAMvB;gBAEF,sBAAO;wBACL,eAAe,EAAE,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,eAAe,KAAI,IAAI;wBAC1D,YAAY,EAAE,gBAAgB,CAAC,YAAY;wBAC3C,OAAO,EAAE,gBAAgB,CAAC,OAAO;wBACjC,cAAc,EAAE,gBAAgB,CAAC,cAAc;wBAC/C,QAAQ,EAAE,gBAAgB,CAAC,QAAQ;wBACnC,eAAe,EAAE,mBAAmB,CAAC,SAAS;wBAC9C,QAAQ,EAAE,gBAAgB,CAAC,QAAQ;wBACnC,cAAc,EAAE,gBAAgB,CAAC,cAAc;wBAC/C,IAAI,EAAE,gBAAgB,CAAC,IAAI;qBAC5B,EAAC;;;KACH,CAAC;AAlEW,QAAA,aAAa,iBAkExB","sourcesContent":["import { IsolatedOrderParams, IsolatedOrderResult } from './types';\nimport {\n  createAccount,\n  transferMarginBetweenAccounts,\n} from '../margin-accounts';\nimport { matchOrder } from '../orders';\nimport { OwnerMetadataEntity } from '@reyaxyz/common';\n\nexport const isolatedOrder = async (\n  params: IsolatedOrderParams,\n): Promise<IsolatedOrderResult> => {\n  // todo: p2  consider performing all steps in api and only call one api function from here?\n\n  // step 1: create new account\n\n  // todo: p2: consider having a function that creates an account and auto-generates a name in one go, use it t&cs also\n  // todo: p2: error handling & logging\n  const createAccountResult = await createAccount({\n    ownerAddress: params.owner.address,\n    name: 'Isolated Trade Account',\n  });\n\n  if (!createAccountResult.accountId) {\n    throw new Error('New Account Id not available to execute isolated trade');\n  }\n\n  // step 2: transfer margin from source to destination account\n\n  for (const action of params.editCollateralActions) {\n    // todo: p1: pack transfers into a single tx with multiple transfer commands (core sig issue)\n    await transferMarginBetweenAccounts({\n      signer: params.signer,\n      owner: params.owner,\n      fromMarginAccountId: params.fromMarginAccountId,\n      toMarginAccountId: createAccountResult.accountId,\n      amount: Math.abs(action.collateralDelta),\n      tokenAddress: action.collateralAddress,\n    });\n  }\n\n  // step 3: execute trade\n\n  /*\n   * We need to bump the nonce since we've just executed a transfer transaction\n   * */\n\n  const ownerWithBumpedNonce: Pick<\n    OwnerMetadataEntity,\n    'coreSigNonce' | 'address'\n  > = {\n    coreSigNonce: params.owner.coreSigNonce + 1,\n    address: params.owner.address,\n  };\n\n  // todo: p1: need to increase the nonce for this tx as well\n  const matchOrderResult = await matchOrder({\n    signer: params.signer,\n    owner: ownerWithBumpedNonce,\n    marginAccountId: createAccountResult.accountId,\n    amountInBase: params.amountInBase,\n    market: params.market,\n  });\n\n  return {\n    transactionHash: matchOrderResult?.transactionHash || null,\n    coreSigNonce: matchOrderResult.coreSigNonce,\n    xpBoost: matchOrderResult.xpBoost,\n    lotteryXpBoost: matchOrderResult.lotteryXpBoost,\n    isNftWon: matchOrderResult.isNftWon,\n    marginAccountId: createAccountResult.accountId,\n    xpEarned: matchOrderResult.xpEarned,\n    executionPrice: matchOrderResult.executionPrice,\n    base: matchOrderResult.base,\n  };\n};\n"]}

package/dist/services/isolated-order/types.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=types.js.map

package/dist/services/isolated-order/types.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/isolated-order/types.ts"],"names":[],"mappings":"","sourcesContent":["import { Signer, JsonRpcSigner } from 'ethers';\nimport {\n  EditCollateralAction,\n  MarginAccountEntity,\n  OwnerMetadataEntity,\n} from '@reyaxyz/common';\nimport { MarketParams } from '../orders';\n\nexport type IsolatedOrderParams = {\n  signer: Signer | JsonRpcSigner;\n  owner: Pick<OwnerMetadataEntity, 'coreSigNonce' | 'address'>;\n  fromMarginAccountId: MarginAccountEntity['id'];\n  editCollateralActions: EditCollateralAction[]; // todo: p2: consider abstracting this such that UI doesn't pass this\n  amountInBase: number;\n  market: MarketParams;\n};\n\nexport type IsolatedOrderResult = {\n  transactionHash: string | null;\n  coreSigNonce: OwnerMetadataEntity['coreSigNonce'] | null;\n  xpBoost: number;\n  lotteryXpBoost: number;\n  isNftWon: boolean;\n  marginAccountId: MarginAccountEntity['id'];\n  xpEarned: number;\n  executionPrice: number;\n  base: number;\n};\n"]}

package/dist/types/services/isolated-order/index.d.ts

@@ -1,3 +0,0 @@
-export * from './types';
-export * from './isolatedOrder';
-//# sourceMappingURL=index.d.ts.map

package/dist/types/services/isolated-order/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["services/isolated-order/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,iBAAiB,CAAC"}

package/dist/types/services/isolated-order/isolatedOrder.d.ts

@@ -1,3 +0,0 @@
-import { IsolatedOrderParams, IsolatedOrderResult } from './types';
-export declare const isolatedOrder: (params: IsolatedOrderParams) => Promise<IsolatedOrderResult>;
-//# sourceMappingURL=isolatedOrder.d.ts.map

package/dist/types/services/isolated-order/isolatedOrder.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"isolatedOrder.d.ts","sourceRoot":"/","sources":["services/isolated-order/isolatedOrder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAQnE,eAAO,MAAM,aAAa,WAChB,mBAAmB,KAC1B,QAAQ,mBAAmB,CAgE7B,CAAC"}

package/dist/types/services/isolated-order/types.d.ts

@@ -1,23 +0,0 @@
-import { Signer, JsonRpcSigner } from 'ethers';
-import { EditCollateralAction, MarginAccountEntity, OwnerMetadataEntity } from '@reyaxyz/common';
-import { MarketParams } from '../orders';
-export type IsolatedOrderParams = {
-    signer: Signer | JsonRpcSigner;
-    owner: Pick<OwnerMetadataEntity, 'coreSigNonce' | 'address'>;
-    fromMarginAccountId: MarginAccountEntity['id'];
-    editCollateralActions: EditCollateralAction[];
-    amountInBase: number;
-    market: MarketParams;
-};
-export type IsolatedOrderResult = {
-    transactionHash: string | null;
-    coreSigNonce: OwnerMetadataEntity['coreSigNonce'] | null;
-    xpBoost: number;
-    lotteryXpBoost: number;
-    isNftWon: boolean;
-    marginAccountId: MarginAccountEntity['id'];
-    xpEarned: number;
-    executionPrice: number;
-    base: number;
-};
-//# sourceMappingURL=types.d.ts.map

package/dist/types/services/isolated-order/types.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/isolated-order/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EACL,oBAAoB,EACpB,mBAAmB,EACnB,mBAAmB,EACpB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEzC,MAAM,MAAM,mBAAmB,GAAG;IAChC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,KAAK,EAAE,IAAI,CAAC,mBAAmB,EAAE,cAAc,GAAG,SAAS,CAAC,CAAC;IAC7D,mBAAmB,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC/C,qBAAqB,EAAE,oBAAoB,EAAE,CAAC;IAC9C,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,YAAY,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,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,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC3C,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC"}

package/src/services/isolated-order/index.ts

@@ -1,2 +0,0 @@
-export * from './types';
-export * from './isolatedOrder';

package/src/services/isolated-order/isolatedOrder.ts

@@ -1,75 +0,0 @@
-import { IsolatedOrderParams, IsolatedOrderResult } from './types';
-import {
-  createAccount,
-  transferMarginBetweenAccounts,
-} from '../margin-accounts';
-import { matchOrder } from '../orders';
-import { OwnerMetadataEntity } from '@reyaxyz/common';
-
-export const isolatedOrder = async (
-  params: IsolatedOrderParams,
-): Promise<IsolatedOrderResult> => {
-  // todo: p2  consider performing all steps in api and only call one api function from here?
-
-  // step 1: create new account
-
-  // todo: p2: consider having a function that creates an account and auto-generates a name in one go, use it t&cs also
-  // todo: p2: error handling & logging
-  const createAccountResult = await createAccount({
-    ownerAddress: params.owner.address,
-    name: 'Isolated Trade Account',
-  });
-
-  if (!createAccountResult.accountId) {
-    throw new Error('New Account Id not available to execute isolated trade');
-  }
-
-  // step 2: transfer margin from source to destination account
-
-  for (const action of params.editCollateralActions) {
-    // todo: p1: pack transfers into a single tx with multiple transfer commands (core sig issue)
-    await transferMarginBetweenAccounts({
-      signer: params.signer,
-      owner: params.owner,
-      fromMarginAccountId: params.fromMarginAccountId,
-      toMarginAccountId: createAccountResult.accountId,
-      amount: Math.abs(action.collateralDelta),
-      tokenAddress: action.collateralAddress,
-    });
-  }
-
-  // step 3: execute trade
-
-  /*
-   * We need to bump the nonce since we've just executed a transfer transaction
-   * */
-
-  const ownerWithBumpedNonce: Pick<
-    OwnerMetadataEntity,
-    'coreSigNonce' | 'address'
-  > = {
-    coreSigNonce: params.owner.coreSigNonce + 1,
-    address: params.owner.address,
-  };
-
-  // todo: p1: need to increase the nonce for this tx as well
-  const matchOrderResult = await matchOrder({
-    signer: params.signer,
-    owner: ownerWithBumpedNonce,
-    marginAccountId: createAccountResult.accountId,
-    amountInBase: params.amountInBase,
-    market: params.market,
-  });
-
-  return {
-    transactionHash: matchOrderResult?.transactionHash || null,
-    coreSigNonce: matchOrderResult.coreSigNonce,
-    xpBoost: matchOrderResult.xpBoost,
-    lotteryXpBoost: matchOrderResult.lotteryXpBoost,
-    isNftWon: matchOrderResult.isNftWon,
-    marginAccountId: createAccountResult.accountId,
-    xpEarned: matchOrderResult.xpEarned,
-    executionPrice: matchOrderResult.executionPrice,
-    base: matchOrderResult.base,
-  };
-};

package/src/services/isolated-order/types.ts

@@ -1,28 +0,0 @@
-import { Signer, JsonRpcSigner } from 'ethers';
-import {
-  EditCollateralAction,
-  MarginAccountEntity,
-  OwnerMetadataEntity,
-} from '@reyaxyz/common';
-import { MarketParams } from '../orders';
-
-export type IsolatedOrderParams = {
-  signer: Signer | JsonRpcSigner;
-  owner: Pick<OwnerMetadataEntity, 'coreSigNonce' | 'address'>;
-  fromMarginAccountId: MarginAccountEntity['id'];
-  editCollateralActions: EditCollateralAction[]; // todo: p2: consider abstracting this such that UI doesn't pass this
-  amountInBase: number;
-  market: MarketParams;
-};
-
-export type IsolatedOrderResult = {
-  transactionHash: string | null;
-  coreSigNonce: OwnerMetadataEntity['coreSigNonce'] | null;
-  xpBoost: number;
-  lotteryXpBoost: number;
-  isNftWon: boolean;
-  marginAccountId: MarginAccountEntity['id'];
-  xpEarned: number;
-  executionPrice: number;
-  base: number;
-};