@reyaxyz/sdk 0.37.0 → 0.38.0

package/dist/config/index.js

@@ -58,13 +58,20 @@ var TransactionModule = /** @class */ (function (_super) {
     function TransactionModule() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    TransactionModule.prototype.executeTransaction = function (signedTx, contractType, metadata) {
+    TransactionModule.prototype.executeTransaction = function (txData, contractType, metadata) {
         return __awaiter(this, void 0, void 0, function () {
             var uri;
             return __generator(this, function (_a) {
+                Object.defineProperty(BigInt.prototype, 'toJSON', {
+                    get: function () {
+                        'use strict';
+                        var _this = this;
+                        return function () { return String(_this); };
+                    },
+                });
                 uri = "/api/transaction/execute";
                 return [2 /*return*/, this.post(uri, {}, {
-                        signedTx: signedTx,
+                        txData: txData,
                         contractType: contractType,
                         metadata: metadata,
                     })];

package/dist/config/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"/","sources":["config/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAAgF;AAKhF;IAAuC,qCAAU;IAAjD;;IAiBA,CAAC;IAhBO,8CAAkB,GAAxB,UACE,QAAgB,EAChB,YAAoB,EACpB,QAAsC;;;;gBAEhC,GAAG,GAAG,0BAA0B,CAAC;gBACvC,sBAAO,IAAI,CAAC,IAAI,CACd,GAAG,EACH,EAAE,EACF;wBACE,QAAQ,UAAA;wBACR,YAAY,cAAA;wBACZ,QAAQ,UAAA;qBACT,CACF,EAAC;;;KACH;IACH,wBAAC;AAAD,CAAC,AAjBD,CAAuC,mBAAU,GAiBhD;AAjBY,8CAAiB;AAmB9B,iBAAiB;AACjB,IAAI,iBAAiB,GAAsB,IAAI,iBAAiB,CAC9D,2BAAkB,CAAC,MAAM,CAAC,CAAC,WAAW,CACvC,CAAC;AAEF,gCAAgC;AACzB,IAAM,YAAY,GAAG,UAC1B,WAAyC;IAEzC,IAAM,MAAM,GAAG,2BAAkB,CAAC,WAAW,CAAC,IAAI,2BAAkB,CAAC,MAAM,CAAC,CAAC;IAC7E,iBAAiB,GAAG,IAAI,iBAAiB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;AAChE,CAAC,CAAC;AALW,QAAA,YAAY,gBAKvB;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 { API_CLIENT_CONFIGS, RestClient, ServiceConfig } from '@reyaxyz/common';\n\nexport type BroadcastTransactionMetadata = {\n  accountName?: string;\n};\nexport class TransactionModule extends RestClient {\n  async executeTransaction(\n    signedTx: string,\n    contractType: string,\n    metadata: BroadcastTransactionMetadata,\n  ) {\n    const uri = `/api/transaction/execute`;\n    return this.post<{ txHash: string }>(\n      uri,\n      {},\n      {\n        signedTx,\n        contractType,\n        metadata,\n      },\n    );\n  }\n}\n\n// Internal state\nlet transactionModule: TransactionModule = new TransactionModule(\n  API_CLIENT_CONFIGS['test'].apiEndpoint,\n);\n\n// Function to configure the SDK\nexport const configureSDK = (\n  environment: ServiceConfig['environment'],\n): void => {\n  const config = API_CLIENT_CONFIGS[environment] || API_CLIENT_CONFIGS['test'];\n  transactionModule = new TransactionModule(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"]}
+{"version":3,"file":"index.js","sourceRoot":"/","sources":["config/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAAgF;AAehF;IAAuC,qCAAU;IAAjD;;IAuBA,CAAC;IAtBO,8CAAkB,GAAxB,UACE,MAAc,EACd,YAAoB,EACpB,QAAsC;;;;gBAEtC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,SAAS,EAAE,QAAQ,EAAE;oBAChD,GAAG;wBACD,YAAY,CAAC;wBADf,iBAGC;wBADC,OAAO,cAAM,OAAA,MAAM,CAAC,KAAI,CAAC,EAAZ,CAAY,CAAC;oBAC5B,CAAC;iBACF,CAAC,CAAC;gBACG,GAAG,GAAG,0BAA0B,CAAC;gBACvC,sBAAO,IAAI,CAAC,IAAI,CACd,GAAG,EACH,EAAE,EACF;wBACE,MAAM,QAAA;wBACN,YAAY,cAAA;wBACZ,QAAQ,UAAA;qBACT,CACF,EAAC;;;KACH;IACH,wBAAC;AAAD,CAAC,AAvBD,CAAuC,mBAAU,GAuBhD;AAvBY,8CAAiB;AAyB9B,iBAAiB;AACjB,IAAI,iBAAiB,GAAsB,IAAI,iBAAiB,CAC9D,2BAAkB,CAAC,MAAM,CAAC,CAAC,WAAW,CACvC,CAAC;AAEF,gCAAgC;AACzB,IAAM,YAAY,GAAG,UAC1B,WAAyC;IAEzC,IAAM,MAAM,GAAG,2BAAkB,CAAC,WAAW,CAAC,IAAI,2BAAkB,CAAC,MAAM,CAAC,CAAC;IAC7E,iBAAiB,GAAG,IAAI,iBAAiB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;AAChE,CAAC,CAAC;AALW,QAAA,YAAY,gBAKvB;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 { API_CLIENT_CONFIGS, RestClient, ServiceConfig } from '@reyaxyz/common';\n\nexport type BroadcastTransactionMetadata = {\n  accountName?: string;\n};\n\nexport type TxData = {\n  from: string;\n  to: string;\n  data: string;\n  value?: string;\n  gasLimit: bigint;\n  maxPriorityFeePerGas?: bigint;\n  maxFeePerGas?: bigint;\n};\nexport class TransactionModule extends RestClient {\n  async executeTransaction(\n    txData: TxData,\n    contractType: string,\n    metadata: BroadcastTransactionMetadata,\n  ) {\n    Object.defineProperty(BigInt.prototype, 'toJSON', {\n      get() {\n        'use strict';\n        return () => String(this);\n      },\n    });\n    const uri = `/api/transaction/execute`;\n    return this.post<{ txHash: string }>(\n      uri,\n      {},\n      {\n        txData,\n        contractType,\n        metadata,\n      },\n    );\n  }\n}\n\n// Internal state\nlet transactionModule: TransactionModule = new TransactionModule(\n  API_CLIENT_CONFIGS['test'].apiEndpoint,\n);\n\n// Function to configure the SDK\nexport const configureSDK = (\n  environment: ServiceConfig['environment'],\n): void => {\n  const config = API_CLIENT_CONFIGS[environment] || API_CLIENT_CONFIGS['test'];\n  transactionModule = new TransactionModule(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"]}

package/dist/services/executeTransaction.js

@@ -51,39 +51,40 @@ exports.signAndBroadcastTransaction = exports.executeTransaction = exports.estim
 var contractAddresses_1 = require("../utils/contractAddresses");
 var txHelpers_1 = require("../utils/txHelpers");
 var config_1 = require("../config");
+var common_1 = require("@reyaxyz/common");
 function estimateGas(signer, data, value, chainId, targetContract) {
     return __awaiter(this, void 0, void 0, function () {
-        var accountAddress, nonce, contractAddress, tx, gasLimit, gasEstimate, error_1, maxPriorityFeePerGas, maxFeePerGas;
+        var accountAddress, contractAddress, tx, gasLimit, gasEstimate, error_1, maxPriorityFeePerGas, maxFeePerGas;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0: return [4 /*yield*/, signer.getAddress()];
                 case 1:
                     accountAddress = _a.sent();
-                    return [4 /*yield*/, signer.getNonce()];
-                case 2:
-                    nonce = _a.sent();
                     contractAddress = Object.values(contractAddresses_1.ContractType).includes(targetContract)
                         ? (0, contractAddresses_1.getAddress)(chainId, targetContract)
                         : targetContract;
-                    tx = __assign(__assign({ from: accountAddress, to: contractAddress, data: data }, (value && value !== '0' ? { value: value } : {})), { chainId: chainId, nonce: nonce });
+                    tx = __assign({ from: accountAddress, to: contractAddress, data: data }, (value && value !== '0' ? { value: value } : {}));
                     gasLimit = BigInt('5000000');
-                    _a.label = 3;
-                case 3:
-                    _a.trys.push([3, 5, , 6]);
+                    _a.label = 2;
+                case 2:
+                    _a.trys.push([2, 4, , 5]);
                     return [4 /*yield*/, signer.estimateGas(tx)];
-                case 4:
+                case 3:
                     gasEstimate = _a.sent();
                     gasLimit = (0, txHelpers_1.getGasBuffer)(gasEstimate);
-                    return [3 /*break*/, 6];
-                case 5:
+                    return [3 /*break*/, 5];
+                case 4:
                     error_1 = _a.sent();
                     // sentry error & throw
                     console.warn(error_1);
-                    return [3 /*break*/, 6];
-                case 6:
-                    maxPriorityFeePerGas = BigInt('0');
-                    maxFeePerGas = BigInt('0');
-                    return [2 /*return*/, __assign(__assign({}, tx), { gasLimit: gasLimit, maxPriorityFeePerGas: maxPriorityFeePerGas, maxFeePerGas: maxFeePerGas })];
+                    return [3 /*break*/, 5];
+                case 5:
+                    if (Object.values(common_1.ReyaChainId).includes(chainId)) {
+                        maxPriorityFeePerGas = BigInt('0');
+                        maxFeePerGas = BigInt('0');
+                        return [2 /*return*/, __assign(__assign({}, tx), { gasLimit: gasLimit, maxPriorityFeePerGas: maxPriorityFeePerGas, maxFeePerGas: maxFeePerGas })];
+                    }
+                    return [2 /*return*/, __assign(__assign({}, tx), { gasLimit: gasLimit })];
             }
         });
     });
@@ -119,7 +120,7 @@ function executeTransaction(signer, data, value, chainId, targetContract) {
 exports.executeTransaction = executeTransaction;
 function signAndBroadcastTransaction(signer, data, value, chainId, targetContract, metadata) {
     return __awaiter(this, void 0, void 0, function () {
-        var txData, signedTx, transactionModuleClient, txHash, error_3;
+        var txData, transactionModuleClient, txHash, error_3;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0: return [4 /*yield*/, estimateGas(signer, data, value, chainId, targetContract)];
@@ -127,20 +128,17 @@ function signAndBroadcastTransaction(signer, data, value, chainId, targetContrac
                     txData = _a.sent();
                     _a.label = 2;
                 case 2:
-                    _a.trys.push([2, 5, , 6]);
-                    return [4 /*yield*/, signer.signTransaction(txData)];
-                case 3:
-                    signedTx = _a.sent();
+                    _a.trys.push([2, 4, , 5]);
                     transactionModuleClient = (0, config_1.getTransactionModuleClient)();
-                    return [4 /*yield*/, transactionModuleClient.executeTransaction(signedTx, targetContract, metadata)];
-                case 4:
+                    return [4 /*yield*/, transactionModuleClient.executeTransaction(txData, targetContract, metadata)];
+                case 3:
                     txHash = (_a.sent()).txHash;
                     return [2 /*return*/, { hash: txHash }];
-                case 5:
+                case 4:
                     error_3 = _a.sent();
                     console.warn(error_3);
                     throw new Error('Transaction Execution Error');
-                case 6: return [2 /*return*/];
+                case 5: return [2 /*return*/];
             }
         });
     });

package/dist/services/executeTransaction.js.map

@@ -1 +1 @@
-{"version":3,"file":"executeTransaction.js","sourceRoot":"/","sources":["services/executeTransaction.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gEAAsE;AACtE,gDAAkD;AAClD,oCAGmB;AASnB,SAAsB,WAAW,CAC/B,MAA8B,EAC9B,IAAY,EACZ,KAAa,EACb,OAAe,EACf,cAAqC;;;;;wBAQd,qBAAM,MAAM,CAAC,UAAU,EAAE,EAAA;;oBAA1C,cAAc,GAAG,SAAyB;oBAClC,qBAAM,MAAM,CAAC,QAAQ,EAAE,EAAA;;oBAA/B,KAAK,GAAG,SAAuB;oBAE/B,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,gCAAY,CAAC,CAAC,QAAQ,CAC1D,cAA8B,CAC/B;wBACC,CAAC,CAAC,IAAA,8BAAU,EAAC,OAAO,EAAE,cAA8B,CAAC;wBACrD,CAAC,CAAC,cAAc,CAAC;oBACb,EAAE,uBACN,IAAI,EAAE,cAAc,EACpB,EAAE,EAAE,eAAe,EACnB,IAAI,MAAA,IACD,CAAC,KAAK,IAAI,KAAK,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,KACnD,OAAO,EAAE,OAAO,EAChB,KAAK,OAAA,GACN,CAAC;oBAEE,QAAQ,GAAW,MAAM,CAAC,SAAS,CAAC,CAAC;;;;oBAGnB,qBAAM,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,EAAA;;oBAA1C,WAAW,GAAG,SAA4B;oBAChD,QAAQ,GAAG,IAAA,wBAAY,EAAC,WAAW,CAAC,CAAC;;;;oBAErC,uBAAuB;oBACvB,OAAO,CAAC,IAAI,CAAC,OAAK,CAAC,CAAC;;;oBAGhB,oBAAoB,GAAW,MAAM,CAAC,GAAG,CAAC,CAAC;oBAC3C,YAAY,GAAW,MAAM,CAAC,GAAG,CAAC,CAAC;oBACzC,4CAAY,EAAE,KAAE,QAAQ,UAAA,EAAE,oBAAoB,sBAAA,EAAE,YAAY,cAAA,KAAG;;;;CAChE;AA3CD,kCA2CC;AAED,SAAsB,kBAAkB,CACtC,MAA8B,EAC9B,IAAY,EACZ,KAAa,EACb,OAAe,EACf,cAAqC;;;;;wBAEtB,qBAAM,WAAW,CAC9B,MAAM,EACN,IAAI,EACJ,KAAK,EACL,OAAO,EACP,cAAc,CACf,EAAA;;oBANK,MAAM,GAAG,SAMd;;;;oBAGoB,qBAAM,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,EAAA;;oBAAjD,UAAU,GAAG,SAAoC;oBACrC,qBAAM,UAAU,CAAC,IAAI,EAAE,EAAA;;oBAAnC,SAAS,GAAG,SAAuB;oBACzC,sBAAO,SAAS,EAAC;;;oBAEjB,OAAO,CAAC,IAAI,CAAC,OAAK,CAAC,CAAC;oBACpB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;;;;;CAElD;AAvBD,gDAuBC;AAED,SAAsB,2BAA2B,CAC/C,MAA8B,EAC9B,IAAY,EACZ,KAAa,EACb,OAAe,EACf,cAAqC,EACrC,QAAsC;;;;;wBAEvB,qBAAM,WAAW,CAC9B,MAAM,EACN,IAAI,EACJ,KAAK,EACL,OAAO,EACP,cAAc,CACf,EAAA;;oBANK,MAAM,GAAG,SAMd;;;;oBAGkB,qBAAM,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,EAAA;;oBAA/C,QAAQ,GAAG,SAAoC;oBAE/C,uBAAuB,GAAG,IAAA,mCAA0B,GAAE,CAAC;oBAC1C,qBAAM,uBAAuB,CAAC,kBAAkB,CACjE,QAAQ,EACR,cAAc,EACd,QAAQ,CACT,EAAA;;oBAJO,MAAM,GAAK,CAAA,SAIlB,CAAA,OAJa;oBAKd,sBAAO,EAAE,IAAI,EAAE,MAAM,EAAE,EAAC;;;oBAExB,OAAO,CAAC,IAAI,CAAC,OAAK,CAAC,CAAC;oBACpB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;;;;;CAElD;AA9BD,kEA8BC","sourcesContent":["import { JsonRpcSigner, Signer } from 'ethers';\nimport { ContractType, getAddress } from '../utils/contractAddresses';\nimport { getGasBuffer } from '../utils/txHelpers';\nimport {\n  BroadcastTransactionMetadata,\n  getTransactionModuleClient,\n} from '../config';\n\nexport type Transaction = {\n  from: string;\n  to: string;\n  data: string;\n  value?: string;\n};\n\nexport async function estimateGas(\n  signer: Signer | JsonRpcSigner,\n  data: string,\n  value: string,\n  chainId: number,\n  targetContract: ContractType | string,\n): Promise<\n  Transaction & {\n    gasLimit: bigint;\n    maxPriorityFeePerGas: bigint;\n    maxFeePerGas: bigint;\n  }\n> {\n  const accountAddress = await signer.getAddress();\n  const nonce = await signer.getNonce();\n\n  const contractAddress = Object.values(ContractType).includes(\n    targetContract as ContractType,\n  )\n    ? getAddress(chainId, targetContract as ContractType)\n    : targetContract;\n  const tx = {\n    from: accountAddress,\n    to: contractAddress,\n    data,\n    ...(value && value !== '0' ? { value: value } : {}),\n    chainId: chainId,\n    nonce,\n  };\n\n  let gasLimit: bigint = BigInt('5000000'); // hardcode to 5m gas limit if fails to get estimate\n\n  try {\n    const gasEstimate = await signer.estimateGas(tx);\n    gasLimit = getGasBuffer(gasEstimate);\n  } catch (error) {\n    // sentry error & throw\n    console.warn(error);\n  }\n\n  const maxPriorityFeePerGas: bigint = BigInt('0');\n  const maxFeePerGas: bigint = BigInt('0');\n  return { ...tx, gasLimit, maxPriorityFeePerGas, maxFeePerGas };\n}\n\nexport async function executeTransaction(\n  signer: Signer | JsonRpcSigner,\n  data: string,\n  value: string,\n  chainId: number,\n  targetContract: ContractType | string,\n) {\n  const txData = await estimateGas(\n    signer,\n    data,\n    value,\n    chainId,\n    targetContract,\n  );\n\n  try {\n    const txResponse = await signer.sendTransaction(txData);\n    const txReceipt = await txResponse.wait();\n    return txReceipt;\n  } catch (error) {\n    console.warn(error);\n    throw new Error('Transaction Execution Error');\n  }\n}\n\nexport async function signAndBroadcastTransaction(\n  signer: Signer | JsonRpcSigner,\n  data: string,\n  value: string,\n  chainId: number,\n  targetContract: ContractType | string,\n  metadata: BroadcastTransactionMetadata,\n): Promise<{ hash: string }> {\n  const txData = await estimateGas(\n    signer,\n    data,\n    value,\n    chainId,\n    targetContract,\n  );\n\n  try {\n    const signedTx = await signer.signTransaction(txData);\n\n    const transactionModuleClient = getTransactionModuleClient();\n    const { txHash } = await transactionModuleClient.executeTransaction(\n      signedTx,\n      targetContract,\n      metadata,\n    );\n    return { hash: txHash };\n  } catch (error) {\n    console.warn(error);\n    throw new Error('Transaction Execution Error');\n  }\n}\n"]}
+{"version":3,"file":"executeTransaction.js","sourceRoot":"/","sources":["services/executeTransaction.ts"],"names":[],"mappings":"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","sourcesContent":["import { JsonRpcSigner, Signer } from 'ethers';\nimport { ContractType, getAddress } from '../utils/contractAddresses';\nimport { getGasBuffer } from '../utils/txHelpers';\nimport {\n  BroadcastTransactionMetadata,\n  getTransactionModuleClient,\n} from '../config';\nimport { ReyaChainId } from '@reyaxyz/common';\n\nexport type Transaction = {\n  from: string;\n  to: string;\n  data: string;\n  value?: string;\n};\n\nexport async function estimateGas(\n  signer: Signer | JsonRpcSigner,\n  data: string,\n  value: string,\n  chainId: number,\n  targetContract: ContractType | string,\n): Promise<\n  Transaction & {\n    gasLimit: bigint;\n    maxPriorityFeePerGas?: bigint;\n    maxFeePerGas?: bigint;\n  }\n> {\n  const accountAddress = await signer.getAddress();\n\n  const contractAddress = Object.values(ContractType).includes(\n    targetContract as ContractType,\n  )\n    ? getAddress(chainId, targetContract as ContractType)\n    : targetContract;\n  const tx = {\n    from: accountAddress,\n    to: contractAddress,\n    data,\n    ...(value && value !== '0' ? { value: value } : {}),\n  };\n\n  let gasLimit: bigint = BigInt('5000000'); // hardcode to 5m gas limit if fails to get estimate\n\n  try {\n    const gasEstimate = await signer.estimateGas(tx);\n    gasLimit = getGasBuffer(gasEstimate);\n  } catch (error) {\n    // sentry error & throw\n    console.warn(error);\n  }\n\n  if (Object.values(ReyaChainId).includes(chainId as ReyaChainId)) {\n    const maxPriorityFeePerGas: bigint = BigInt('0');\n    const maxFeePerGas: bigint = BigInt('0');\n    return { ...tx, gasLimit, maxPriorityFeePerGas, maxFeePerGas };\n  }\n\n  return { ...tx, gasLimit };\n}\n\nexport async function executeTransaction(\n  signer: Signer | JsonRpcSigner,\n  data: string,\n  value: string,\n  chainId: number,\n  targetContract: ContractType | string,\n) {\n  const txData = await estimateGas(\n    signer,\n    data,\n    value,\n    chainId,\n    targetContract,\n  );\n\n  try {\n    const txResponse = await signer.sendTransaction(txData);\n    const txReceipt = await txResponse.wait();\n    return txReceipt;\n  } catch (error) {\n    console.warn(error);\n    throw new Error('Transaction Execution Error');\n  }\n}\n\nexport async function signAndBroadcastTransaction(\n  signer: Signer | JsonRpcSigner,\n  data: string,\n  value: string,\n  chainId: number,\n  targetContract: ContractType | string,\n  metadata: BroadcastTransactionMetadata,\n): Promise<{ hash: string }> {\n  const txData = await estimateGas(\n    signer,\n    data,\n    value,\n    chainId,\n    targetContract,\n  );\n  try {\n    const transactionModuleClient = getTransactionModuleClient();\n    const { txHash } = await transactionModuleClient.executeTransaction(\n      txData,\n      targetContract,\n      metadata,\n    );\n    return { hash: txHash };\n  } catch (error) {\n    console.warn(error);\n    throw new Error('Transaction Execution Error');\n  }\n}\n"]}

package/dist/services/margin-accounts/withdrawMAAndBridge.js

@@ -69,7 +69,7 @@ var withdrawMAAndBridge = function (_a) {
                         moneyInOutChainId: moneyInOutChainId,
                         tokenName: bridgeTokenInfo.name,
                     });
-                    _c = (0, encode_1.encodeWithdrawMAAndBridge)(marginAccountId, corePeripheryTokenInfo.address, (0, common_1.scale)(corePeripheryTokenInfo.decimals)(unscaledAmount), eip712Signature, BigInt('10000000'), socketConnectors.deposit, receiverAddress), data = _c.calldata, value = _c.value;
+                    _c = (0, encode_1.encodeWithdrawMAAndBridge)(marginAccountId, corePeripheryTokenInfo.address, (0, common_1.scale)(corePeripheryTokenInfo.decimals)(unscaledAmount), eip712Signature, BigInt('10000000'), socketConnectors.withdraw, receiverAddress), data = _c.calldata, value = _c.value;
                     return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(signer, data, value, reyaChainId, contractAddresses_1.ContractType.CORE_PROXY)];
                 case 3:
                     result = _e.sent();

package/dist/services/margin-accounts/withdrawMAAndBridge.js.map

@@ -1 +1 @@
-{"version":3,"file":"withdrawMAAndBridge.js","sourceRoot":"/","sources":["services/margin-accounts/withdrawMAAndBridge.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAOyB;AACzB,mEAAyE;AACzE,4DAA2D;AAC3D,gCAA2C;AAC3C,mCAAqD;AAKrD,6CAAgE;AAChE,oCAAiD;AACjD,6CAAiD;AAE1C,IAAM,mBAAmB,GAAG,UAAO,EAQd;QAP1B,MAAM,YAAA,EACN,iBAAiB,uBAAA,EACjB,eAAe,qBAAA,EACf,KAAK,WAAA,EACG,cAAc,YAAA,EACtB,YAAY,kBAAA,EACZ,uBAA+B,EAA/B,eAAe,mBAAG,KAAK,CAAC,OAAO,KAAA;;;;;;wBAEf,qBAAM,CAAA,MAAA,MAAM,CAAC,QAAQ,0CAAE,UAAU,EAAE,CAAA,EAAA;;oBAA7C,OAAO,GAAG,SAAmC;oBAC7C,WAAW,GAAgB,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;oBAEpD,eAAe,GAAG,IAAA,8BAAqB,EAAC,YAAY,CAAC,CAAC;oBACtD,sBAAsB,GAC1B,eAAe,CAAC,IAAI,KAAK,MAAM;wBAC7B,CAAC,CAAC,IAAA,2BAAkB,EAAC,MAAM,EAAE,WAAW,CAAC;wBACzC,CAAC,CAAC,eAAe,CAAC;oBAEhB,WAAW,GAAG,IAAI,oBAAW,EAAE,CAAC;oBACtC,IAAA,6BAAoB,EAClB,sBAAsB,CAAC,OAAO,EAC9B,IAAA,cAAK,EAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC,cAAc,CAAC,EACtD,WAAW,CACZ,CAAC;oBACsB,qBAAM,IAAA,uBAAgB,EAC5C,MAAM,EACN,WAAW,EACX,IAAA,8BAAU,EAAC,WAAW,EAAE,gCAAY,CAAC,eAAe,CAAC,EACrD,eAAe,EACf,WAAW,CAAC,QAAQ,EACpB,KAAK,CAAC,YAAY,GAAG,CAAC,EACtB,IAAA,qCAA4B,GAAE,GAAG,mCAA0B,CAC5D,EAAA;;oBARK,eAAe,GAAG,SAQvB;oBAEK,gBAAgB,GAAG,IAAA,4BAAmB,EAAC;wBAC3C,iBAAiB,EAAE,iBAAiB;wBACpC,SAAS,EAAE,eAAe,CAAC,IAAI;qBAChC,CAAC,CAAC;oBAEG,KAA4B,IAAA,kCAAyB,EACzD,eAAe,EACf,sBAAsB,CAAC,OAAO,EAC9B,IAAA,cAAK,EAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC,cAAc,CAAC,EACtD,eAAe,EACf,MAAM,CAAC,UAAU,CAAC,EAClB,gBAAgB,CAAC,OAAO,EACxB,eAAe,CAChB,EARiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAQ3B;oBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,EACN,IAAI,EACJ,KAAK,EACL,WAAW,EACX,gCAAY,CAAC,UAAU,CACxB,EAAA;;oBANK,MAAM,GAAG,SAMd;oBAED,sBAAO;4BACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;yBACtC,EAAC;;;;CACH,CAAC;AA5DW,QAAA,mBAAmB,uBA4D9B","sourcesContent":["import {\n  getCurrentTimestampInSeconds,\n  getSocketConnectors,\n  scale,\n  ReyaChainId,\n  getTokenInfoByAddress,\n  getTokenInfoByName,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { signCoreCommands } from '../sign';\nimport { encodeWithdrawMAAndBridge } from './encode';\nimport {\n  WithdrawMAAndBridgeParams,\n  WithdrawMAAndBridgeParamsResult,\n} from './types';\nimport { BRIDGE_DEADLINE_IN_SECONDS } from '../../utils/consts';\nimport { encodeSingleWithdraw } from '../encode';\nimport { MultiAction } from '../../utils/action';\n\nexport const withdrawMAAndBridge = async ({\n  signer,\n  moneyInOutChainId,\n  marginAccountId,\n  owner,\n  amount: unscaledAmount,\n  tokenAddress,\n  receiverAddress = owner.address,\n}: WithdrawMAAndBridgeParams): Promise<WithdrawMAAndBridgeParamsResult> => {\n  const network = await signer.provider?.getNetwork();\n  const reyaChainId: ReyaChainId = Number(network?.chainId);\n\n  const bridgeTokenInfo = getTokenInfoByAddress(tokenAddress);\n  const corePeripheryTokenInfo =\n    bridgeTokenInfo.name === 'USDC'\n      ? getTokenInfoByName('RUSD', reyaChainId)\n      : bridgeTokenInfo;\n\n  const multiAction = new MultiAction();\n  encodeSingleWithdraw(\n    corePeripheryTokenInfo.address,\n    scale(corePeripheryTokenInfo.decimals)(unscaledAmount),\n    multiAction,\n  );\n  const eip712Signature = await signCoreCommands(\n    signer,\n    reyaChainId,\n    getAddress(reyaChainId, ContractType.PERIPHERY_PROXY),\n    marginAccountId,\n    multiAction.commands,\n    owner.coreSigNonce + 1,\n    getCurrentTimestampInSeconds() + BRIDGE_DEADLINE_IN_SECONDS,\n  );\n\n  const socketConnectors = getSocketConnectors({\n    moneyInOutChainId: moneyInOutChainId,\n    tokenName: bridgeTokenInfo.name,\n  });\n\n  const { calldata: data, value } = encodeWithdrawMAAndBridge(\n    marginAccountId,\n    corePeripheryTokenInfo.address,\n    scale(corePeripheryTokenInfo.decimals)(unscaledAmount),\n    eip712Signature,\n    BigInt('10000000'),\n    socketConnectors.deposit,\n    receiverAddress,\n  );\n\n  const result = await executeTransaction(\n    signer,\n    data,\n    value,\n    reyaChainId,\n    ContractType.CORE_PROXY,\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}
+{"version":3,"file":"withdrawMAAndBridge.js","sourceRoot":"/","sources":["services/margin-accounts/withdrawMAAndBridge.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAOyB;AACzB,mEAAyE;AACzE,4DAA2D;AAC3D,gCAA2C;AAC3C,mCAAqD;AAKrD,6CAAgE;AAChE,oCAAiD;AACjD,6CAAiD;AAE1C,IAAM,mBAAmB,GAAG,UAAO,EAQd;QAP1B,MAAM,YAAA,EACN,iBAAiB,uBAAA,EACjB,eAAe,qBAAA,EACf,KAAK,WAAA,EACG,cAAc,YAAA,EACtB,YAAY,kBAAA,EACZ,uBAA+B,EAA/B,eAAe,mBAAG,KAAK,CAAC,OAAO,KAAA;;;;;;wBAEf,qBAAM,CAAA,MAAA,MAAM,CAAC,QAAQ,0CAAE,UAAU,EAAE,CAAA,EAAA;;oBAA7C,OAAO,GAAG,SAAmC;oBAC7C,WAAW,GAAgB,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;oBAEpD,eAAe,GAAG,IAAA,8BAAqB,EAAC,YAAY,CAAC,CAAC;oBACtD,sBAAsB,GAC1B,eAAe,CAAC,IAAI,KAAK,MAAM;wBAC7B,CAAC,CAAC,IAAA,2BAAkB,EAAC,MAAM,EAAE,WAAW,CAAC;wBACzC,CAAC,CAAC,eAAe,CAAC;oBAEhB,WAAW,GAAG,IAAI,oBAAW,EAAE,CAAC;oBACtC,IAAA,6BAAoB,EAClB,sBAAsB,CAAC,OAAO,EAC9B,IAAA,cAAK,EAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC,cAAc,CAAC,EACtD,WAAW,CACZ,CAAC;oBACsB,qBAAM,IAAA,uBAAgB,EAC5C,MAAM,EACN,WAAW,EACX,IAAA,8BAAU,EAAC,WAAW,EAAE,gCAAY,CAAC,eAAe,CAAC,EACrD,eAAe,EACf,WAAW,CAAC,QAAQ,EACpB,KAAK,CAAC,YAAY,GAAG,CAAC,EACtB,IAAA,qCAA4B,GAAE,GAAG,mCAA0B,CAC5D,EAAA;;oBARK,eAAe,GAAG,SAQvB;oBAEK,gBAAgB,GAAG,IAAA,4BAAmB,EAAC;wBAC3C,iBAAiB,EAAE,iBAAiB;wBACpC,SAAS,EAAE,eAAe,CAAC,IAAI;qBAChC,CAAC,CAAC;oBAEG,KAA4B,IAAA,kCAAyB,EACzD,eAAe,EACf,sBAAsB,CAAC,OAAO,EAC9B,IAAA,cAAK,EAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC,cAAc,CAAC,EACtD,eAAe,EACf,MAAM,CAAC,UAAU,CAAC,EAClB,gBAAgB,CAAC,QAAQ,EACzB,eAAe,CAChB,EARiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAQ3B;oBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,EACN,IAAI,EACJ,KAAK,EACL,WAAW,EACX,gCAAY,CAAC,UAAU,CACxB,EAAA;;oBANK,MAAM,GAAG,SAMd;oBAED,sBAAO;4BACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;yBACtC,EAAC;;;;CACH,CAAC;AA5DW,QAAA,mBAAmB,uBA4D9B","sourcesContent":["import {\n  getCurrentTimestampInSeconds,\n  getSocketConnectors,\n  scale,\n  ReyaChainId,\n  getTokenInfoByAddress,\n  getTokenInfoByName,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { signCoreCommands } from '../sign';\nimport { encodeWithdrawMAAndBridge } from './encode';\nimport {\n  WithdrawMAAndBridgeParams,\n  WithdrawMAAndBridgeParamsResult,\n} from './types';\nimport { BRIDGE_DEADLINE_IN_SECONDS } from '../../utils/consts';\nimport { encodeSingleWithdraw } from '../encode';\nimport { MultiAction } from '../../utils/action';\n\nexport const withdrawMAAndBridge = async ({\n  signer,\n  moneyInOutChainId,\n  marginAccountId,\n  owner,\n  amount: unscaledAmount,\n  tokenAddress,\n  receiverAddress = owner.address,\n}: WithdrawMAAndBridgeParams): Promise<WithdrawMAAndBridgeParamsResult> => {\n  const network = await signer.provider?.getNetwork();\n  const reyaChainId: ReyaChainId = Number(network?.chainId);\n\n  const bridgeTokenInfo = getTokenInfoByAddress(tokenAddress);\n  const corePeripheryTokenInfo =\n    bridgeTokenInfo.name === 'USDC'\n      ? getTokenInfoByName('RUSD', reyaChainId)\n      : bridgeTokenInfo;\n\n  const multiAction = new MultiAction();\n  encodeSingleWithdraw(\n    corePeripheryTokenInfo.address,\n    scale(corePeripheryTokenInfo.decimals)(unscaledAmount),\n    multiAction,\n  );\n  const eip712Signature = await signCoreCommands(\n    signer,\n    reyaChainId,\n    getAddress(reyaChainId, ContractType.PERIPHERY_PROXY),\n    marginAccountId,\n    multiAction.commands,\n    owner.coreSigNonce + 1,\n    getCurrentTimestampInSeconds() + BRIDGE_DEADLINE_IN_SECONDS,\n  );\n\n  const socketConnectors = getSocketConnectors({\n    moneyInOutChainId: moneyInOutChainId,\n    tokenName: bridgeTokenInfo.name,\n  });\n\n  const { calldata: data, value } = encodeWithdrawMAAndBridge(\n    marginAccountId,\n    corePeripheryTokenInfo.address,\n    scale(corePeripheryTokenInfo.decimals)(unscaledAmount),\n    eip712Signature,\n    BigInt('10000000'),\n    socketConnectors.withdraw,\n    receiverAddress,\n  );\n\n  const result = await executeTransaction(\n    signer,\n    data,\n    value,\n    reyaChainId,\n    ContractType.CORE_PROXY,\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}

package/dist/services/orders/encode.js

@@ -1,25 +1,70 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
+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.encodeMatchOrder = void 0;
 var action_1 = require("../../utils/action");
 var encode_1 = require("../encode");
-var encodeMatchOrder = function (accountId, orderBase, orderPriceLimit, counterpartyAccountIds, marketId, exchangeId) {
-    var multiAction = new action_1.MultiAction();
-    (0, encode_1.encodeSingleTrade)(counterpartyAccountIds, orderBase, orderPriceLimit, marketId, exchangeId, multiAction);
-    var value = BigInt(0);
-    var call = (0, encode_1.encodeRouterCall)(multiAction, accountId, value);
-    return __assign({}, call);
-};
+var sign_1 = require("../sign");
+var common_1 = require("@reyaxyz/common");
+var consts_1 = require("../../utils/consts");
+var ethers_1 = require("ethers");
+var ExecutionModule_json_1 = require("../../abis/ExecutionModule.json");
+var encodeMatchOrder = function (signer, chainId, coreSigNonce, accountId, orderBase, orderPriceLimit, counterpartyAccountIds, marketId, exchangeId) { return __awaiter(void 0, void 0, void 0, function () {
+    var multiAction, eip712Signature, value, functionSignature, parameters, INTERFACE, calldata;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                multiAction = new action_1.MultiAction();
+                (0, encode_1.encodeSingleTrade)(counterpartyAccountIds, orderBase, orderPriceLimit, marketId, exchangeId, multiAction);
+                return [4 /*yield*/, (0, sign_1.signCoreCommands)(signer, chainId, consts_1.RELAYER_ACCOUNT, accountId, multiAction.commands, coreSigNonce + 1, (0, common_1.getCurrentTimestampInSeconds)() + consts_1.CORE_DEADLINE_IN_SECONDS)];
+            case 1:
+                eip712Signature = _a.sent();
+                value = BigInt(0);
+                functionSignature = 'executeBySig';
+                parameters = [accountId, multiAction.commands, eip712Signature];
+                INTERFACE = new ethers_1.Interface(ExecutionModule_json_1.abi);
+                calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
+                return [2 /*return*/, {
+                        calldata: calldata,
+                        value: BigInt(value).toString(10),
+                    }];
+        }
+    });
+}); };
 exports.encodeMatchOrder = encodeMatchOrder;
 //# sourceMappingURL=encode.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"encode.js","sourceRoot":"/","sources":["services/orders/encode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,6CAAmE;AACnE,oCAAgE;AAEzD,IAAM,gBAAgB,GAAG,UAC9B,SAAiB,EACjB,SAAiB,EACjB,eAAuB,EACvB,sBAAgC,EAChC,QAAgB,EAChB,UAAkB;IAElB,IAAM,WAAW,GAAG,IAAI,oBAAW,EAAE,CAAC;IAEtC,IAAA,0BAAiB,EACf,sBAAsB,EACtB,SAAS,EACT,eAAe,EACf,QAAQ,EACR,UAAU,EACV,WAAW,CACZ,CAAC;IAEF,IAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IACxB,IAAM,IAAI,GAAG,IAAA,yBAAgB,EAAC,WAAW,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;IAE7D,oBACK,IAAI,EACP;AACJ,CAAC,CAAC;AAzBW,QAAA,gBAAgB,oBAyB3B","sourcesContent":["import { MethodParameters, MultiAction } from '../../utils/action';\nimport { encodeRouterCall, encodeSingleTrade } from '../encode';\n\nexport const encodeMatchOrder = (\n  accountId: number,\n  orderBase: bigint,\n  orderPriceLimit: bigint,\n  counterpartyAccountIds: number[],\n  marketId: number,\n  exchangeId: number,\n): MethodParameters => {\n  const multiAction = new MultiAction();\n\n  encodeSingleTrade(\n    counterpartyAccountIds,\n    orderBase,\n    orderPriceLimit,\n    marketId,\n    exchangeId,\n    multiAction,\n  );\n\n  const value = BigInt(0);\n  const call = encodeRouterCall(multiAction, accountId, value);\n\n  return {\n    ...call,\n  };\n};\n"]}
+{"version":3,"file":"encode.js","sourceRoot":"/","sources":["services/orders/encode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAmE;AACnE,oCAA8C;AAC9C,gCAA2C;AAC3C,0CAA+D;AAC/D,6CAA+E;AAC/E,iCAA2C;AAC3C,wEAAsD;AAC/C,IAAM,gBAAgB,GAAG,UAC9B,MAAc,EACd,OAAe,EACf,YAAoB,EACpB,SAAiB,EACjB,SAAiB,EACjB,eAAuB,EACvB,sBAAgC,EAChC,QAAgB,EAChB,UAAkB;;;;;gBAEZ,WAAW,GAAG,IAAI,oBAAW,EAAE,CAAC;gBAEtC,IAAA,0BAAiB,EACf,sBAAsB,EACtB,SAAS,EACT,eAAe,EACf,QAAQ,EACR,UAAU,EACV,WAAW,CACZ,CAAC;gBACsB,qBAAM,IAAA,uBAAgB,EAC5C,MAAM,EACN,OAAO,EACP,wBAAe,EACf,SAAS,EACT,WAAW,CAAC,QAAQ,EACpB,YAAY,GAAG,CAAC,EAChB,IAAA,qCAA4B,GAAE,GAAG,iCAAwB,CAC1D,EAAA;;gBARK,eAAe,GAAG,SAQvB;gBAEK,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBAClB,iBAAiB,GAAG,cAAc,CAAC;gBACnC,UAAU,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;gBAEhE,SAAS,GAAG,IAAI,kBAAS,CAAC,0BAAG,CAAC,CAAC;gBAC/B,QAAQ,GAAG,SAAS,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;gBAC7E,sBAAO;wBACL,QAAQ,EAAE,QAAQ;wBAClB,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;qBAClC,EAAC;;;KACH,CAAC;AAzCW,QAAA,gBAAgB,oBAyC3B","sourcesContent":["import { MethodParameters, MultiAction } from '../../utils/action';\nimport { encodeSingleTrade } from '../encode';\nimport { signCoreCommands } from '../sign';\nimport { getCurrentTimestampInSeconds } from '@reyaxyz/common';\nimport { CORE_DEADLINE_IN_SECONDS, RELAYER_ACCOUNT } from '../../utils/consts';\nimport { Interface, Signer } from 'ethers';\nimport { abi } from '../../abis/ExecutionModule.json';\nexport const encodeMatchOrder = async (\n  signer: Signer,\n  chainId: number,\n  coreSigNonce: number,\n  accountId: number,\n  orderBase: bigint,\n  orderPriceLimit: bigint,\n  counterpartyAccountIds: number[],\n  marketId: number,\n  exchangeId: number,\n): Promise<MethodParameters> => {\n  const multiAction = new MultiAction();\n\n  encodeSingleTrade(\n    counterpartyAccountIds,\n    orderBase,\n    orderPriceLimit,\n    marketId,\n    exchangeId,\n    multiAction,\n  );\n  const eip712Signature = await signCoreCommands(\n    signer,\n    chainId,\n    RELAYER_ACCOUNT,\n    accountId,\n    multiAction.commands,\n    coreSigNonce + 1,\n    getCurrentTimestampInSeconds() + CORE_DEADLINE_IN_SECONDS,\n  );\n\n  const value = BigInt(0);\n  const functionSignature = 'executeBySig';\n  const parameters = [accountId, multiAction.commands, eip712Signature];\n\n  const INTERFACE = new Interface(abi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return {\n    calldata: calldata,\n    value: BigInt(value).toString(10),\n  };\n};\n"]}

package/dist/services/orders/order.js

@@ -47,7 +47,7 @@ var bignumber_js_1 = __importDefault(require("bignumber.js"));
 var contractAddresses_1 = require("../../utils/contractAddresses");
 var common_1 = require("@reyaxyz/common");
 var matchOrder = function (params) { return __awaiter(void 0, void 0, void 0, function () {
-    var orderPriceLimit, orderBase, _a, data, value, network, chainId, result;
+    var orderPriceLimit, orderBase, network, chainId, _a, data, value, result;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -57,13 +57,15 @@ var matchOrder = function (params) { return __awaiter(void 0, void 0, void 0, fu
                 }
                 orderPriceLimit = (0, trade_1.calculatePriceLimitForTrade)(params.market.currentPrice, params.orderBase);
                 orderBase = (0, common_1.scale)(18)(params.orderBase);
-                _a = (0, encode_1.encodeMatchOrder)(params.marginAccountId, orderBase, orderPriceLimit, params.market.counterpartyAccountIds, params.market.id, params.market.exchangeId), data = _a.calldata, value = _a.value;
                 return [4 /*yield*/, ((_b = params.signer.provider) === null || _b === void 0 ? void 0 : _b.getNetwork())];
             case 1:
                 network = _c.sent();
                 chainId = Number(network === null || network === void 0 ? void 0 : network.chainId);
-                return [4 /*yield*/, (0, executeTransaction_1.signAndBroadcastTransaction)(params.signer, data, value, chainId, contractAddresses_1.ContractType.CORE_PROXY, {})];
+                return [4 /*yield*/, (0, encode_1.encodeMatchOrder)(params.signer, chainId, params.owner.coreSigNonce, params.marginAccountId, orderBase, orderPriceLimit, params.market.counterpartyAccountIds, params.market.id, params.market.exchangeId)];
             case 2:
+                _a = _c.sent(), data = _a.calldata, value = _a.value;
+                return [4 /*yield*/, (0, executeTransaction_1.signAndBroadcastTransaction)(params.signer, data, value, chainId, contractAddresses_1.ContractType.CORE_PROXY, {})];
+            case 3:
                 result = _c.sent();
                 return [2 /*return*/, {
                         transactionHash: (result === null || result === void 0 ? void 0 : result.hash) || null,
@@ -73,7 +75,7 @@ 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 base, orderPriceLimit, _a, data, value, network, chainId, result;
+    var base, orderPriceLimit, network, chainId, _a, data, value, result;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -83,13 +85,15 @@ var closeOrder = function (params) { return __awaiter(void 0, void 0, void 0, fu
                 }
                 base = (0, common_1.scale)(18)((0, bignumber_js_1.default)(params.orderBase).negated().toNumber());
                 orderPriceLimit = (0, trade_1.calculatePriceLimitForTrade)(params.market.currentPrice, (0, bignumber_js_1.default)(params.orderBase).negated().toNumber());
-                _a = (0, encode_1.encodeMatchOrder)(params.marginAccountId, BigInt(base), orderPriceLimit, params.market.counterpartyAccountIds, params.market.id, params.market.exchangeId), data = _a.calldata, value = _a.value;
                 return [4 /*yield*/, ((_b = params.signer.provider) === null || _b === void 0 ? void 0 : _b.getNetwork())];
             case 1:
                 network = _c.sent();
                 chainId = Number(network === null || network === void 0 ? void 0 : network.chainId);
-                return [4 /*yield*/, (0, executeTransaction_1.signAndBroadcastTransaction)(params.signer, data, value, chainId, contractAddresses_1.ContractType.CORE_PROXY, {})];
+                return [4 /*yield*/, (0, encode_1.encodeMatchOrder)(params.signer, chainId, params.owner.coreSigNonce, params.marginAccountId, BigInt(base), orderPriceLimit, params.market.counterpartyAccountIds, params.market.id, params.market.exchangeId)];
             case 2:
+                _a = _c.sent(), data = _a.calldata, value = _a.value;
+                return [4 /*yield*/, (0, executeTransaction_1.signAndBroadcastTransaction)(params.signer, data, value, chainId, contractAddresses_1.ContractType.CORE_PROXY, {})];
+            case 3:
                 result = _c.sent();
                 return [2 /*return*/, {
                         transactionHash: (result === null || result === void 0 ? void 0 : result.hash) || null,

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

@@ -1 +1 @@
-{"version":3,"file":"order.js","sourceRoot":"/","sources":["services/orders/order.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  CloseOrderParams,\n  CloseOrderResult,\n  MatchOrderParams,\n  MatchOrderResult,\n} from './types';\nimport { encodeMatchOrder } from './encode';\nimport { signAndBroadcastTransaction } from '../executeTransaction';\nimport { calculatePriceLimitForTrade } from '../../utils/trade';\nimport BigNumber from 'bignumber.js';\nimport { ContractType } from '../../utils/contractAddresses';\nimport { scale } from '@reyaxyz/common';\n\nexport const matchOrder = async (\n  params: MatchOrderParams,\n): Promise<MatchOrderResult> => {\n  if (params.orderBase === 0) {\n    throw new Error('Position base can not be 0');\n  }\n  const orderPriceLimit = calculatePriceLimitForTrade(\n    params.market.currentPrice,\n    params.orderBase,\n  );\n\n  const orderBase = scale(18)(params.orderBase);\n\n  const { calldata: data, value } = encodeMatchOrder(\n    params.marginAccountId,\n    orderBase,\n    orderPriceLimit,\n    params.market.counterpartyAccountIds,\n    params.market.id,\n    params.market.exchangeId,\n  );\n\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n\n  const result = await signAndBroadcastTransaction(\n    params.signer,\n    data,\n    value,\n    chainId,\n    ContractType.CORE_PROXY,\n    {},\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n\nexport const closeOrder = async (\n  params: CloseOrderParams,\n): Promise<CloseOrderResult> => {\n  if (params.orderBase === 0) {\n    throw new Error('Position base can not be 0');\n  }\n\n  const base = scale(18)(BigNumber(params.orderBase).negated().toNumber());\n  const orderPriceLimit = calculatePriceLimitForTrade(\n    params.market.currentPrice,\n    BigNumber(params.orderBase).negated().toNumber(), // used just because of sign\n  );\n\n  const { calldata: data, value } = encodeMatchOrder(\n    params.marginAccountId,\n    BigInt(base),\n    orderPriceLimit,\n    params.market.counterpartyAccountIds,\n    params.market.id,\n    params.market.exchangeId,\n  );\n\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n\n  const result = await signAndBroadcastTransaction(\n    params.signer,\n    data,\n    value,\n    chainId,\n    ContractType.CORE_PROXY,\n    {},\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}
+{"version":3,"file":"order.js","sourceRoot":"/","sources":["services/orders/order.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAMA,mCAA4C;AAC5C,4DAAoE;AACpE,2CAAgE;AAChE,8DAAqC;AACrC,mEAA6D;AAC7D,0CAAwC;AAEjC,IAAM,UAAU,GAAG,UACxB,MAAwB;;;;;;gBAExB,IAAI,MAAM,CAAC,SAAS,KAAK,CAAC,EAAE,CAAC;oBAC3B,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;gBAChD,CAAC;gBACK,eAAe,GAAG,IAAA,mCAA2B,EACjD,MAAM,CAAC,MAAM,CAAC,YAAY,EAC1B,MAAM,CAAC,SAAS,CACjB,CAAC;gBAEI,SAAS,GAAG,IAAA,cAAK,EAAC,EAAE,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;gBAC9B,qBAAM,CAAA,MAAA,MAAM,CAAC,MAAM,CAAC,QAAQ,0CAAE,UAAU,EAAE,CAAA,EAAA;;gBAApD,OAAO,GAAG,SAA0C;gBACpD,OAAO,GAAG,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;gBAEP,qBAAM,IAAA,yBAAgB,EACtD,MAAM,CAAC,MAAM,EACb,OAAO,EACP,MAAM,CAAC,KAAK,CAAC,YAAY,EACzB,MAAM,CAAC,eAAe,EACtB,SAAS,EACT,eAAe,EACf,MAAM,CAAC,MAAM,CAAC,sBAAsB,EACpC,MAAM,CAAC,MAAM,CAAC,EAAE,EAChB,MAAM,CAAC,MAAM,CAAC,UAAU,CACzB,EAAA;;gBAVK,KAA4B,SAUjC,EAViB,IAAI,cAAA,EAAE,KAAK,WAAA;gBAYd,qBAAM,IAAA,gDAA2B,EAC9C,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,gCAAY,CAAC,UAAU,EACvB,EAAE,CACH,EAAA;;gBAPK,MAAM,GAAG,SAOd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AAvCW,QAAA,UAAU,cAuCrB;AAEK,IAAM,UAAU,GAAG,UACxB,MAAwB;;;;;;gBAExB,IAAI,MAAM,CAAC,SAAS,KAAK,CAAC,EAAE,CAAC;oBAC3B,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;gBAChD,CAAC;gBAEK,IAAI,GAAG,IAAA,cAAK,EAAC,EAAE,CAAC,CAAC,IAAA,sBAAS,EAAC,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;gBACnE,eAAe,GAAG,IAAA,mCAA2B,EACjD,MAAM,CAAC,MAAM,CAAC,YAAY,EAC1B,IAAA,sBAAS,EAAC,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CACjD,CAAC;gBAEc,qBAAM,CAAA,MAAA,MAAM,CAAC,MAAM,CAAC,QAAQ,0CAAE,UAAU,EAAE,CAAA,EAAA;;gBAApD,OAAO,GAAG,SAA0C;gBACpD,OAAO,GAAG,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;gBAEP,qBAAM,IAAA,yBAAgB,EACtD,MAAM,CAAC,MAAM,EACb,OAAO,EACP,MAAM,CAAC,KAAK,CAAC,YAAY,EACzB,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,IAAI,CAAC,EACZ,eAAe,EACf,MAAM,CAAC,MAAM,CAAC,sBAAsB,EACpC,MAAM,CAAC,MAAM,CAAC,EAAE,EAChB,MAAM,CAAC,MAAM,CAAC,UAAU,CACzB,EAAA;;gBAVK,KAA4B,SAUjC,EAViB,IAAI,cAAA,EAAE,KAAK,WAAA;gBAYd,qBAAM,IAAA,gDAA2B,EAC9C,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,gCAAY,CAAC,UAAU,EACvB,EAAE,CACH,EAAA;;gBAPK,MAAM,GAAG,SAOd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AAxCW,QAAA,UAAU,cAwCrB","sourcesContent":["import {\n  CloseOrderParams,\n  CloseOrderResult,\n  MatchOrderParams,\n  MatchOrderResult,\n} from './types';\nimport { encodeMatchOrder } from './encode';\nimport { signAndBroadcastTransaction } from '../executeTransaction';\nimport { calculatePriceLimitForTrade } from '../../utils/trade';\nimport BigNumber from 'bignumber.js';\nimport { ContractType } from '../../utils/contractAddresses';\nimport { scale } from '@reyaxyz/common';\n\nexport const matchOrder = async (\n  params: MatchOrderParams,\n): Promise<MatchOrderResult> => {\n  if (params.orderBase === 0) {\n    throw new Error('Position base can not be 0');\n  }\n  const orderPriceLimit = calculatePriceLimitForTrade(\n    params.market.currentPrice,\n    params.orderBase,\n  );\n\n  const orderBase = scale(18)(params.orderBase);\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n\n  const { calldata: data, value } = await encodeMatchOrder(\n    params.signer,\n    chainId,\n    params.owner.coreSigNonce,\n    params.marginAccountId,\n    orderBase,\n    orderPriceLimit,\n    params.market.counterpartyAccountIds,\n    params.market.id,\n    params.market.exchangeId,\n  );\n\n  const result = await signAndBroadcastTransaction(\n    params.signer,\n    data,\n    value,\n    chainId,\n    ContractType.CORE_PROXY,\n    {},\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n\nexport const closeOrder = async (\n  params: CloseOrderParams,\n): Promise<CloseOrderResult> => {\n  if (params.orderBase === 0) {\n    throw new Error('Position base can not be 0');\n  }\n\n  const base = scale(18)(BigNumber(params.orderBase).negated().toNumber());\n  const orderPriceLimit = calculatePriceLimitForTrade(\n    params.market.currentPrice,\n    BigNumber(params.orderBase).negated().toNumber(), // used just because of sign\n  );\n\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n\n  const { calldata: data, value } = await encodeMatchOrder(\n    params.signer,\n    chainId,\n    params.owner.coreSigNonce,\n    params.marginAccountId,\n    BigInt(base),\n    orderPriceLimit,\n    params.market.counterpartyAccountIds,\n    params.market.id,\n    params.market.exchangeId,\n  );\n\n  const result = await signAndBroadcastTransaction(\n    params.signer,\n    data,\n    value,\n    chainId,\n    ContractType.CORE_PROXY,\n    {},\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}

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

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

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

@@ -2,8 +2,17 @@ import { RestClient, ServiceConfig } from '@reyaxyz/common';
 export type BroadcastTransactionMetadata = {
     accountName?: string;
 };
+export type TxData = {
+    from: string;
+    to: string;
+    data: string;
+    value?: string;
+    gasLimit: bigint;
+    maxPriorityFeePerGas?: bigint;
+    maxFeePerGas?: bigint;
+};
 export declare class TransactionModule extends RestClient {
-    executeTransaction(signedTx: string, contractType: string, metadata: BroadcastTransactionMetadata): Promise<{
+    executeTransaction(txData: TxData, contractType: string, metadata: BroadcastTransactionMetadata): Promise<{
         txHash: string;
     }>;
 }

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,EAAsB,UAAU,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhF,MAAM,MAAM,4BAA4B,GAAG;IACzC,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AACF,qBAAa,iBAAkB,SAAQ,UAAU;IACzC,kBAAkB,CACtB,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,4BAA4B;gBAGX,MAAM;;CAUpC;AAQD,eAAO,MAAM,YAAY,gBACV,aAAa,CAAC,aAAa,CAAC,KACxC,IAGF,CAAC;AAEF,eAAO,MAAM,0BAA0B,QAAO,iBAI7C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["config/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,UAAU,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhF,MAAM,MAAM,4BAA4B,GAAG;IACzC,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AACF,qBAAa,iBAAkB,SAAQ,UAAU;IACzC,kBAAkB,CACtB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,4BAA4B;gBASX,MAAM;;CAUpC;AAQD,eAAO,MAAM,YAAY,gBACV,aAAa,CAAC,aAAa,CAAC,KACxC,IAGF,CAAC;AAEF,eAAO,MAAM,0BAA0B,QAAO,iBAI7C,CAAC"}

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

@@ -9,8 +9,8 @@ export type Transaction = {
 };
 export declare function estimateGas(signer: Signer | JsonRpcSigner, data: string, value: string, chainId: number, targetContract: ContractType | string): Promise<Transaction & {
     gasLimit: bigint;
-    maxPriorityFeePerGas: bigint;
-    maxFeePerGas: bigint;
+    maxPriorityFeePerGas?: bigint;
+    maxFeePerGas?: bigint;
 }>;
 export declare function executeTransaction(signer: Signer | JsonRpcSigner, data: string, value: string, chainId: number, targetContract: ContractType | string): Promise<import("ethers").TransactionReceipt | null>;
 export declare function signAndBroadcastTransaction(signer: Signer | JsonRpcSigner, data: string, value: string, chainId: number, targetContract: ContractType | string, metadata: BroadcastTransactionMetadata): Promise<{

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

@@ -1 +1 @@
-{"version":3,"file":"executeTransaction.d.ts","sourceRoot":"/","sources":["services/executeTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAc,MAAM,4BAA4B,CAAC;AAEtE,OAAO,EACL,4BAA4B,EAE7B,MAAM,WAAW,CAAC;AAEnB,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,wBAAsB,WAAW,CAC/B,MAAM,EAAE,MAAM,GAAG,aAAa,EAC9B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,YAAY,GAAG,MAAM,GACpC,OAAO,CACR,WAAW,GAAG;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,YAAY,EAAE,MAAM,CAAC;CACtB,CACF,CA+BA;AAED,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,MAAM,GAAG,aAAa,EAC9B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,YAAY,GAAG,MAAM,uDAkBtC;AAED,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,MAAM,GAAG,aAAa,EAC9B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,YAAY,GAAG,MAAM,EACrC,QAAQ,EAAE,4BAA4B,GACrC,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAuB3B"}
+{"version":3,"file":"executeTransaction.d.ts","sourceRoot":"/","sources":["services/executeTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAc,MAAM,4BAA4B,CAAC;AAEtE,OAAO,EACL,4BAA4B,EAE7B,MAAM,WAAW,CAAC;AAGnB,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,wBAAsB,WAAW,CAC/B,MAAM,EAAE,MAAM,GAAG,aAAa,EAC9B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,YAAY,GAAG,MAAM,GACpC,OAAO,CACR,WAAW,GAAG;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CACF,CAgCA;AAED,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,MAAM,GAAG,aAAa,EAC9B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,YAAY,GAAG,MAAM,uDAkBtC;AAED,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,MAAM,GAAG,aAAa,EAC9B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,YAAY,GAAG,MAAM,EACrC,QAAQ,EAAE,4BAA4B,GACrC,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAoB3B"}

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

@@ -1,3 +1,4 @@
 import { MethodParameters } from '../../utils/action';
-export declare const encodeMatchOrder: (accountId: number, orderBase: bigint, orderPriceLimit: bigint, counterpartyAccountIds: number[], marketId: number, exchangeId: number) => MethodParameters;
+import { Signer } from 'ethers';
+export declare const encodeMatchOrder: (signer: Signer, chainId: number, coreSigNonce: number, accountId: number, orderBase: bigint, orderPriceLimit: bigint, counterpartyAccountIds: number[], marketId: number, exchangeId: number) => Promise<MethodParameters>;
 //# sourceMappingURL=encode.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"encode.d.ts","sourceRoot":"/","sources":["services/orders/encode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAe,MAAM,oBAAoB,CAAC;AAGnE,eAAO,MAAM,gBAAgB,cAChB,MAAM,aACN,MAAM,mBACA,MAAM,0BACC,MAAM,EAAE,YACtB,MAAM,cACJ,MAAM,KACjB,gBAkBF,CAAC"}
+{"version":3,"file":"encode.d.ts","sourceRoot":"/","sources":["services/orders/encode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAe,MAAM,oBAAoB,CAAC;AAKnE,OAAO,EAAa,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE3C,eAAO,MAAM,gBAAgB,WACnB,MAAM,WACL,MAAM,gBACD,MAAM,aACT,MAAM,aACN,MAAM,mBACA,MAAM,0BACC,MAAM,EAAE,YACtB,MAAM,cACJ,MAAM,KACjB,QAAQ,gBAAgB,CA+B1B,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,EACjB,MAAM,SAAS,CAAC;AAQjB,eAAO,MAAM,UAAU,WACb,gBAAgB,KACvB,QAAQ,gBAAgB,CAmC1B,CAAC;AAEF,eAAO,MAAM,UAAU,WACb,gBAAgB,KACvB,QAAQ,gBAAgB,CAmC1B,CAAC"}
+{"version":3,"file":"order.d.ts","sourceRoot":"/","sources":["services/orders/order.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,SAAS,CAAC;AAQjB,eAAO,MAAM,UAAU,WACb,gBAAgB,KACvB,QAAQ,gBAAgB,CAqC1B,CAAC;AAEF,eAAO,MAAM,UAAU,WACb,gBAAgB,KACvB,QAAQ,gBAAgB,CAsC1B,CAAC"}

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

@@ -1,5 +1,5 @@
 import { Signer, JsonRpcSigner } from 'ethers';
-import { MarginAccountEntity, MarketEntity, PositionEntity } from '@reyaxyz/common';
+import { MarginAccountEntity, MarketEntity, OwnerMetadataEntity, PositionEntity } from '@reyaxyz/common';
 export type MarketParams = {
     id: MarketEntity['id'];
     exchangeId: MarketEntity['orderInfo']['exchangeId'];
@@ -8,12 +8,14 @@ export type MarketParams = {
 };
 export type MatchOrderParams = {
     signer: Signer | JsonRpcSigner;
+    owner: Pick<OwnerMetadataEntity, 'coreSigNonce'>;
     marginAccountId: MarginAccountEntity['id'];
     orderBase: number;
     market: MarketParams;
 };
 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":"AAAA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EACL,mBAAmB,EACnB,YAAY,EACZ,cAAc,EACf,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,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,eAAe,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC3C,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,YAAY,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,eAAe,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC3C,SAAS,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC;IAClC,MAAM,EAAE,YAAY,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC"}
+{"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,mBAAmB,EACnB,YAAY,EACZ,mBAAmB,EACnB,cAAc,EACf,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,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,KAAK,EAAE,IAAI,CAAC,mBAAmB,EAAE,cAAc,CAAC,CAAC;IACjD,eAAe,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC3C,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,YAAY,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,KAAK,EAAE,IAAI,CAAC,mBAAmB,EAAE,cAAc,CAAC,CAAC;IACjD,eAAe,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC3C,SAAS,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC;IAClC,MAAM,EAAE,YAAY,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC"}

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

@@ -1,2 +1,4 @@
 export declare const BRIDGE_DEADLINE_IN_SECONDS: number;
+export declare const CORE_DEADLINE_IN_SECONDS = 60;
+export declare const RELAYER_ACCOUNT = "0xb43c317c9c9215d268881d7d6b59c2d3d0247da1";
 //# sourceMappingURL=consts.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"consts.d.ts","sourceRoot":"/","sources":["utils/consts.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,0BAA0B,QAAU,CAAC"}
+{"version":3,"file":"consts.d.ts","sourceRoot":"/","sources":["utils/consts.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,0BAA0B,QAAU,CAAC;AAClD,eAAO,MAAM,wBAAwB,KAAK,CAAC;AAC3C,eAAO,MAAM,eAAe,+CAA+C,CAAC"}

package/dist/utils/consts.js

@@ -1,5 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BRIDGE_DEADLINE_IN_SECONDS = void 0;
+exports.RELAYER_ACCOUNT = exports.CORE_DEADLINE_IN_SECONDS = exports.BRIDGE_DEADLINE_IN_SECONDS = void 0;
 exports.BRIDGE_DEADLINE_IN_SECONDS = 15 * 60; // 15 minutes
+exports.CORE_DEADLINE_IN_SECONDS = 60; // 1 minute
+exports.RELAYER_ACCOUNT = '0xb43c317c9c9215d268881d7d6b59c2d3d0247da1'; // @todo update value
 //# sourceMappingURL=consts.js.map

package/dist/utils/consts.js.map

@@ -1 +1 @@
-{"version":3,"file":"consts.js","sourceRoot":"/","sources":["utils/consts.ts"],"names":[],"mappings":";;;AAAa,QAAA,0BAA0B,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,aAAa","sourcesContent":["export const BRIDGE_DEADLINE_IN_SECONDS = 15 * 60; // 15 minutes\n"]}
+{"version":3,"file":"consts.js","sourceRoot":"/","sources":["utils/consts.ts"],"names":[],"mappings":";;;AAAa,QAAA,0BAA0B,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,aAAa;AACnD,QAAA,wBAAwB,GAAG,EAAE,CAAC,CAAC,WAAW;AAC1C,QAAA,eAAe,GAAG,4CAA4C,CAAC,CAAC,qBAAqB","sourcesContent":["export const BRIDGE_DEADLINE_IN_SECONDS = 15 * 60; // 15 minutes\nexport const CORE_DEADLINE_IN_SECONDS = 60; // 1 minute\nexport const RELAYER_ACCOUNT = '0xb43c317c9c9215d268881d7d6b59c2d3d0247da1'; // @todo update value\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reyaxyz/sdk",
-  "version": "0.37.0",
+  "version": "0.38.0",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
@@ -34,5 +34,5 @@
     "ethers": "6.9.0"
   },
   "packageManager": "pnpm@8.10.4",
-  "gitHead": "08b91b59581c5c96bc77b2f490f9596b9371bb39"
+  "gitHead": "483895feb58ea8c9b5ff53441a0cc98701352db4"
 }

package/src/config/index.ts

@@ -3,18 +3,34 @@ import { API_CLIENT_CONFIGS, RestClient, ServiceConfig } from '@reyaxyz/common';
 export type BroadcastTransactionMetadata = {
   accountName?: string;
 };
+
+export type TxData = {
+  from: string;
+  to: string;
+  data: string;
+  value?: string;
+  gasLimit: bigint;
+  maxPriorityFeePerGas?: bigint;
+  maxFeePerGas?: bigint;
+};
 export class TransactionModule extends RestClient {
   async executeTransaction(
-    signedTx: string,
+    txData: TxData,
     contractType: string,
     metadata: BroadcastTransactionMetadata,
   ) {
+    Object.defineProperty(BigInt.prototype, 'toJSON', {
+      get() {
+        'use strict';
+        return () => String(this);
+      },
+    });
     const uri = `/api/transaction/execute`;
     return this.post<{ txHash: string }>(
       uri,
       {},
       {
-        signedTx,
+        txData,
         contractType,
         metadata,
       },

package/src/services/executeTransaction.ts

@@ -5,6 +5,7 @@ import {
   BroadcastTransactionMetadata,
   getTransactionModuleClient,
 } from '../config';
+import { ReyaChainId } from '@reyaxyz/common';
 
 export type Transaction = {
   from: string;
@@ -22,12 +23,11 @@ export async function estimateGas(
 ): Promise<
   Transaction & {
     gasLimit: bigint;
-    maxPriorityFeePerGas: bigint;
-    maxFeePerGas: bigint;
+    maxPriorityFeePerGas?: bigint;
+    maxFeePerGas?: bigint;
   }
 > {
   const accountAddress = await signer.getAddress();
-  const nonce = await signer.getNonce();
 
   const contractAddress = Object.values(ContractType).includes(
     targetContract as ContractType,
@@ -39,8 +39,6 @@ export async function estimateGas(
     to: contractAddress,
     data,
     ...(value && value !== '0' ? { value: value } : {}),
-    chainId: chainId,
-    nonce,
   };
 
   let gasLimit: bigint = BigInt('5000000'); // hardcode to 5m gas limit if fails to get estimate
@@ -53,9 +51,13 @@ export async function estimateGas(
     console.warn(error);
   }
 
-  const maxPriorityFeePerGas: bigint = BigInt('0');
-  const maxFeePerGas: bigint = BigInt('0');
-  return { ...tx, gasLimit, maxPriorityFeePerGas, maxFeePerGas };
+  if (Object.values(ReyaChainId).includes(chainId as ReyaChainId)) {
+    const maxPriorityFeePerGas: bigint = BigInt('0');
+    const maxFeePerGas: bigint = BigInt('0');
+    return { ...tx, gasLimit, maxPriorityFeePerGas, maxFeePerGas };
+  }
+
+  return { ...tx, gasLimit };
 }
 
 export async function executeTransaction(
@@ -98,13 +100,10 @@ export async function signAndBroadcastTransaction(
     chainId,
     targetContract,
   );
-
   try {
-    const signedTx = await signer.signTransaction(txData);
-
     const transactionModuleClient = getTransactionModuleClient();
     const { txHash } = await transactionModuleClient.executeTransaction(
-      signedTx,
+      txData,
       targetContract,
       metadata,
     );

package/src/services/margin-accounts/withdrawMAAndBridge.ts

@@ -63,7 +63,7 @@ export const withdrawMAAndBridge = async ({
     scale(corePeripheryTokenInfo.decimals)(unscaledAmount),
     eip712Signature,
     BigInt('10000000'),
-    socketConnectors.deposit,
+    socketConnectors.withdraw,
     receiverAddress,
   );
 

package/src/services/orders/encode.ts

@@ -1,14 +1,21 @@
 import { MethodParameters, MultiAction } from '../../utils/action';
-import { encodeRouterCall, encodeSingleTrade } from '../encode';
-
-export const encodeMatchOrder = (
+import { encodeSingleTrade } from '../encode';
+import { signCoreCommands } from '../sign';
+import { getCurrentTimestampInSeconds } from '@reyaxyz/common';
+import { CORE_DEADLINE_IN_SECONDS, RELAYER_ACCOUNT } from '../../utils/consts';
+import { Interface, Signer } from 'ethers';
+import { abi } from '../../abis/ExecutionModule.json';
+export const encodeMatchOrder = async (
+  signer: Signer,
+  chainId: number,
+  coreSigNonce: number,
   accountId: number,
   orderBase: bigint,
   orderPriceLimit: bigint,
   counterpartyAccountIds: number[],
   marketId: number,
   exchangeId: number,
-): MethodParameters => {
+): Promise<MethodParameters> => {
   const multiAction = new MultiAction();
 
   encodeSingleTrade(
@@ -19,11 +26,24 @@ export const encodeMatchOrder = (
     exchangeId,
     multiAction,
   );
+  const eip712Signature = await signCoreCommands(
+    signer,
+    chainId,
+    RELAYER_ACCOUNT,
+    accountId,
+    multiAction.commands,
+    coreSigNonce + 1,
+    getCurrentTimestampInSeconds() + CORE_DEADLINE_IN_SECONDS,
+  );
 
   const value = BigInt(0);
-  const call = encodeRouterCall(multiAction, accountId, value);
+  const functionSignature = 'executeBySig';
+  const parameters = [accountId, multiAction.commands, eip712Signature];
 
+  const INTERFACE = new Interface(abi);
+  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
   return {
-    ...call,
+    calldata: calldata,
+    value: BigInt(value).toString(10),
   };
 };

package/src/services/orders/order.ts

@@ -23,8 +23,13 @@ export const matchOrder = async (
   );
 
   const orderBase = scale(18)(params.orderBase);
+  const network = await params.signer.provider?.getNetwork();
+  const chainId = Number(network?.chainId);
 
-  const { calldata: data, value } = encodeMatchOrder(
+  const { calldata: data, value } = await encodeMatchOrder(
+    params.signer,
+    chainId,
+    params.owner.coreSigNonce,
     params.marginAccountId,
     orderBase,
     orderPriceLimit,
@@ -33,9 +38,6 @@ export const matchOrder = async (
     params.market.exchangeId,
   );
 
-  const network = await params.signer.provider?.getNetwork();
-  const chainId = Number(network?.chainId);
-
   const result = await signAndBroadcastTransaction(
     params.signer,
     data,
@@ -63,7 +65,13 @@ export const closeOrder = async (
     BigNumber(params.orderBase).negated().toNumber(), // used just because of sign
   );
 
-  const { calldata: data, value } = encodeMatchOrder(
+  const network = await params.signer.provider?.getNetwork();
+  const chainId = Number(network?.chainId);
+
+  const { calldata: data, value } = await encodeMatchOrder(
+    params.signer,
+    chainId,
+    params.owner.coreSigNonce,
     params.marginAccountId,
     BigInt(base),
     orderPriceLimit,
@@ -72,9 +80,6 @@ export const closeOrder = async (
     params.market.exchangeId,
   );
 
-  const network = await params.signer.provider?.getNetwork();
-  const chainId = Number(network?.chainId);
-
   const result = await signAndBroadcastTransaction(
     params.signer,
     data,

package/src/services/orders/types.ts

@@ -2,6 +2,7 @@ import { Signer, JsonRpcSigner } from 'ethers';
 import {
   MarginAccountEntity,
   MarketEntity,
+  OwnerMetadataEntity,
   PositionEntity,
 } from '@reyaxyz/common';
 
@@ -14,6 +15,7 @@ export type MarketParams = {
 
 export type MatchOrderParams = {
   signer: Signer | JsonRpcSigner;
+  owner: Pick<OwnerMetadataEntity, 'coreSigNonce'>;
   marginAccountId: MarginAccountEntity['id'];
   orderBase: number;
   market: MarketParams;
@@ -21,6 +23,7 @@ export type MatchOrderParams = {
 
 export type CloseOrderParams = {
   signer: Signer | JsonRpcSigner;
+  owner: Pick<OwnerMetadataEntity, 'coreSigNonce'>;
   marginAccountId: MarginAccountEntity['id'];
   orderBase: PositionEntity['base'];
   market: MarketParams;

package/src/utils/consts.ts

@@ -1 +1,3 @@
 export const BRIDGE_DEADLINE_IN_SECONDS = 15 * 60; // 15 minutes
+export const CORE_DEADLINE_IN_SECONDS = 60; // 1 minute
+export const RELAYER_ACCOUNT = '0xb43c317c9c9215d268881d7d6b59c2d3d0247da1'; // @todo update value