@reyaxyz/sdk 0.80.0 → 0.81.0

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

@@ -48,27 +48,22 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.encodeBridgeAndDepositExistingMA = exports.encodeBridgeAndDepositNewMA = exports.encodeWithdrawMAAndBridge = exports.encodeTransferMargin = exports.encodeWithdraw = exports.encodeDeposit = exports.encodeCreateAccountCall = void 0;
-var action_1 = require("../../utils/action");
+var common_1 = require("@reyaxyz/common");
 var ethers_1 = require("ethers");
 var encode_1 = require("../encode");
-var CoreProxy_json_1 = require("../../abis/CoreProxy.json");
-var Periphery_json_1 = require("../../abis/Periphery.json");
-var VaultWithPayload_json_1 = require("../../abis/socket/VaultWithPayload.json");
-var sign_1 = require("../sign");
-var consts_1 = require("../../utils/consts");
-var common_1 = require("@reyaxyz/common");
+var common_2 = require("@reyaxyz/common");
+var common_3 = require("@reyaxyz/common");
 var ethers_2 = require("ethers");
-var contractAddresses_1 = require("../../utils/contractAddresses");
 var encodeCreateAccountCall = function (accountOwner) {
     var functionSignature = 'createAccount';
     var parameters = [accountOwner];
-    var INTERFACE = new ethers_1.Interface(CoreProxy_json_1.abi);
+    var INTERFACE = new ethers_1.Interface(common_2.CoreAbi);
     var calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
     return { calldata: calldata, value: BigInt(0).toString(10) };
 };
 exports.encodeCreateAccountCall = encodeCreateAccountCall;
 var encodeDeposit = function (accountId, token, amount) {
-    var multiAction = new action_1.MultiAction();
+    var multiAction = new common_1.MultiAction();
     (0, encode_1.encodeSingleDeposit)(token, amount, multiAction);
     var value = BigInt(0);
     var call = (0, encode_1.encodeRouterCall)(multiAction, accountId, value);
@@ -76,7 +71,7 @@ var encodeDeposit = function (accountId, token, amount) {
 };
 exports.encodeDeposit = encodeDeposit;
 var encodeWithdraw = function (accountId, token, amount) {
-    var multiAction = new action_1.MultiAction();
+    var multiAction = new common_1.MultiAction();
     (0, encode_1.encodeSingleWithdraw)(token, amount, multiAction);
     var value = BigInt(0);
     var call = (0, encode_1.encodeRouterCall)(multiAction, accountId, value);
@@ -88,10 +83,10 @@ var encodeTransferMargin = function (signer, chainId, coreSigNonce, fromMarginAc
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                multiAction = new action_1.MultiAction();
+                multiAction = new common_1.MultiAction();
                 // todo: note can we make this more stateless?
                 (0, encode_1.encodeSingleTransferMargin)(toMarginAccountId, token, amount, multiAction);
-                return [4 /*yield*/, (0, sign_1.signCoreCommands)(signer, chainId, (0, contractAddresses_1.getAddress)(chainId, contractAddresses_1.ContractType.PERIPHERY_PROXY), fromMarginAccountId, multiAction.commands, coreSigNonce + 1, (0, common_1.getCurrentTimestampInSeconds)() + consts_1.CORE_DEADLINE_IN_SECONDS, ethers_2.ethers.AbiCoder.defaultAbiCoder().encode([], []))];
+                return [4 /*yield*/, (0, common_2.signCoreCommands)(signer, chainId, (0, common_2.getAddress)(chainId, common_2.ContractType.PERIPHERY_PROXY), fromMarginAccountId, multiAction.commands, coreSigNonce + 1, (0, common_3.getCurrentTimestampInSeconds)() + common_2.CORE_DEADLINE_IN_SECONDS, ethers_2.ethers.AbiCoder.defaultAbiCoder().encode([], []))];
             case 1:
                 eip712Signature = _a.sent();
                 value = BigInt(0);
@@ -107,7 +102,7 @@ var encodeTransferMargin = function (signer, chainId, coreSigNonce, fromMarginAc
                         sig: eip712Signature,
                     },
                 ];
-                INTERFACE = new ethers_1.Interface(Periphery_json_1.abi);
+                INTERFACE = new ethers_1.Interface(common_2.PeripheryAbi);
                 calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
                 return [2 /*return*/, {
                         calldata: calldata,
@@ -130,13 +125,13 @@ var encodeWithdrawMAAndBridge = function (accountId, corePeripheryTokenAddress,
             receiver: receiver,
         },
     ];
-    var INTERFACE = new ethers_1.Interface(Periphery_json_1.abi);
+    var INTERFACE = new ethers_1.Interface(common_2.PeripheryAbi);
     var calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
     return { calldata: calldata, value: BigInt(0).toString(10) };
 };
 exports.encodeWithdrawMAAndBridge = encodeWithdrawMAAndBridge;
 var encodeBridgeAndDepositNewMA = function (receiver, socketMsgGasLimit, socketConnector, socketBridgeOptions, socketFees, accountOwner, peripheryTokenAddress, peripheryTokenAmount, moneyInOutTokenAmount) {
-    var PERIPHERY_INTERFACE = new ethers_1.Interface(Periphery_json_1.abi);
+    var PERIPHERY_INTERFACE = new ethers_1.Interface(common_2.PeripheryAbi);
     var inputs = {
         accountOwner: accountOwner,
         token: peripheryTokenAddress,
@@ -151,13 +146,13 @@ var encodeBridgeAndDepositNewMA = function (receiver, socketMsgGasLimit, socketC
         peripheryCalldata,
         socketBridgeOptions,
     ];
-    var INTERFACE = new ethers_1.Interface(VaultWithPayload_json_1.abi);
+    var INTERFACE = new ethers_1.Interface(common_2.Socket_VaultWithPayloadAbi);
     var calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
     return { calldata: calldata, value: socketFees.toString(10) };
 };
 exports.encodeBridgeAndDepositNewMA = encodeBridgeAndDepositNewMA;
 var encodeBridgeAndDepositExistingMA = function (receiver, socketMsgGasLimit, socketConnector, socketBridgeOptions, socketFees, accountId, peripheryTokenAddress, peripheryTokenAmount, moneyInOutTokenAmount) {
-    var PERIPHERY_INTERFACE = new ethers_1.Interface(Periphery_json_1.abi);
+    var PERIPHERY_INTERFACE = new ethers_1.Interface(common_2.PeripheryAbi);
     var inputs = {
         accountId: accountId,
         token: peripheryTokenAddress,
@@ -172,7 +167,7 @@ var encodeBridgeAndDepositExistingMA = function (receiver, socketMsgGasLimit, so
         peripheryCalldata,
         socketBridgeOptions,
     ];
-    var INTERFACE = new ethers_1.Interface(VaultWithPayload_json_1.abi);
+    var INTERFACE = new ethers_1.Interface(common_2.Socket_VaultWithPayloadAbi);
     var calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
     return { calldata: calldata, value: socketFees.toString(10) };
 };

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

@@ -1 +1 @@
-{"version":3,"file":"encode.js","sourceRoot":"/","sources":["services/margin-accounts/encode.ts"],"names":[],"mappings":"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","sourcesContent":["import { MethodParameters, MultiAction } from '../../utils/action';\nimport { Interface } from 'ethers';\nimport {\n  encodeRouterCall,\n  encodeSingleDeposit,\n  encodeSingleTransferMargin,\n  encodeSingleWithdraw,\n} from '../encode';\n\nimport { abi } from '../../abis/CoreProxy.json';\nimport { abi as peripheryAbi } from '../../abis/Periphery.json';\nimport { abi as Socket_VaultWithPayloadAbi } from '../../abis/socket/VaultWithPayload.json';\nimport { EIP712Signature, signCoreCommands } from '../sign';\nimport { CORE_DEADLINE_IN_SECONDS } from '../../utils/consts';\nimport { getCurrentTimestampInSeconds } from '@reyaxyz/common';\nimport { Signer } from 'ethers';\nimport { ethers } from 'ethers';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\n\nexport const encodeCreateAccountCall = (\n  accountOwner: string,\n): MethodParameters => {\n  const functionSignature = 'createAccount';\n  const parameters = [accountOwner];\n  const INTERFACE = new Interface(abi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return { calldata: calldata, value: BigInt(0).toString(10) };\n};\n\nexport const encodeDeposit = (\n  accountId: number,\n  token: string,\n  amount: bigint,\n): MethodParameters => {\n  const multiAction = new MultiAction();\n\n  encodeSingleDeposit(token, amount, multiAction);\n\n  const value = BigInt(0);\n  const call = encodeRouterCall(multiAction, accountId, value);\n\n  return {\n    ...call,\n  };\n};\n\nexport const encodeWithdraw = (\n  accountId: number,\n  token: string,\n  amount: bigint,\n): MethodParameters => {\n  const multiAction = new MultiAction();\n\n  encodeSingleWithdraw(token, amount, multiAction);\n\n  const value = BigInt(0);\n  const call = encodeRouterCall(multiAction, accountId, value);\n\n  return {\n    ...call,\n  };\n};\n\nexport const encodeTransferMargin = async (\n  signer: Signer,\n  chainId: number,\n  coreSigNonce: number,\n  fromMarginAccountId: number,\n  toMarginAccountId: number,\n  token: string,\n  amount: bigint,\n): Promise<MethodParameters> => {\n  const multiAction = new MultiAction();\n  // todo: note can we make this more stateless?\n  encodeSingleTransferMargin(toMarginAccountId, token, amount, multiAction);\n\n  const eip712Signature = await signCoreCommands(\n    signer,\n    chainId,\n    getAddress(chainId, ContractType.PERIPHERY_PROXY),\n    fromMarginAccountId,\n    multiAction.commands,\n    coreSigNonce + 1,\n    getCurrentTimestampInSeconds() + CORE_DEADLINE_IN_SECONDS,\n    ethers.AbiCoder.defaultAbiCoder().encode([], []),\n  );\n\n  const value = BigInt(0);\n  const functionSignature = 'transferFromMAToMA';\n  const parameters = [\n    {\n      accountId: fromMarginAccountId,\n      transfer: {\n        destAccountId: toMarginAccountId,\n        collateral: token,\n        collateralAmount: amount,\n      },\n      sig: eip712Signature,\n    },\n  ];\n\n  const INTERFACE = new Interface(peripheryAbi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return {\n    calldata: calldata,\n    value: BigInt(value).toString(10),\n  };\n};\n\nexport const encodeWithdrawMAAndBridge = (\n  accountId: number,\n  corePeripheryTokenAddress: string,\n  corePeripheryTokenAmount: bigint,\n  sig: EIP712Signature,\n  socketMsgGasLimit: bigint,\n  chainId: number,\n  receiver: string,\n): MethodParameters => {\n  const functionSignature = 'withdrawMA';\n  const parameters = [\n    {\n      accountId,\n      token: corePeripheryTokenAddress,\n      tokenAmount: corePeripheryTokenAmount,\n      sig,\n      socketMsgGasLimit,\n      chainId,\n      receiver,\n    },\n  ];\n  const INTERFACE = new Interface(peripheryAbi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return { calldata: calldata, value: BigInt(0).toString(10) };\n};\n\nexport const encodeBridgeAndDepositNewMA = (\n  receiver: string,\n  socketMsgGasLimit: bigint,\n  socketConnector: string,\n  socketBridgeOptions: string,\n  socketFees: bigint,\n  accountOwner: string,\n  peripheryTokenAddress: string,\n  peripheryTokenAmount: bigint,\n  moneyInOutTokenAmount: bigint,\n): MethodParameters => {\n  const PERIPHERY_INTERFACE = new Interface(peripheryAbi);\n  const inputs = {\n    accountOwner,\n    token: peripheryTokenAddress,\n  };\n  const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(\n    'depositNewMA((address,address))',\n    [inputs],\n  );\n\n  const functionSignature = 'bridge';\n  const parameters = [\n    receiver,\n    moneyInOutTokenAmount,\n    socketMsgGasLimit,\n    socketConnector,\n    peripheryCalldata,\n    socketBridgeOptions,\n  ];\n  const INTERFACE = new Interface(Socket_VaultWithPayloadAbi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return { calldata: calldata, value: socketFees.toString(10) };\n};\n\nexport const encodeBridgeAndDepositExistingMA = (\n  receiver: string,\n  socketMsgGasLimit: bigint,\n  socketConnector: string,\n  socketBridgeOptions: string,\n  socketFees: bigint,\n  accountId: number,\n  peripheryTokenAddress: string,\n  peripheryTokenAmount: bigint,\n  moneyInOutTokenAmount: bigint,\n): MethodParameters => {\n  const PERIPHERY_INTERFACE = new Interface(peripheryAbi);\n  const inputs = {\n    accountId,\n    token: peripheryTokenAddress,\n  };\n  const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(\n    'depositExistingMA((uint128,address))',\n    [inputs],\n  );\n\n  const functionSignature = 'bridge';\n  const parameters = [\n    receiver,\n    moneyInOutTokenAmount,\n    socketMsgGasLimit,\n    socketConnector,\n    peripheryCalldata,\n    socketBridgeOptions,\n  ];\n  const INTERFACE = new Interface(Socket_VaultWithPayloadAbi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return { calldata: calldata, value: socketFees.toString(10) };\n};\n"]}
+{"version":3,"file":"encode.js","sourceRoot":"/","sources":["services/margin-accounts/encode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAAgE;AAChE,iCAAmC;AACnC,oCAKmB;AACnB,0CASyB;AACzB,0CAA+D;AAE/D,iCAAgC;AAEzB,IAAM,uBAAuB,GAAG,UACrC,YAAoB;IAEpB,IAAM,iBAAiB,GAAG,eAAe,CAAC;IAC1C,IAAM,UAAU,GAAG,CAAC,YAAY,CAAC,CAAC;IAClC,IAAM,SAAS,GAAG,IAAI,kBAAS,CAAC,gBAAG,CAAC,CAAC;IACrC,IAAM,QAAQ,GAAG,SAAS,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;IAC7E,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;AAC/D,CAAC,CAAC;AARW,QAAA,uBAAuB,2BAQlC;AAEK,IAAM,aAAa,GAAG,UAC3B,SAAiB,EACjB,KAAa,EACb,MAAc;IAEd,IAAM,WAAW,GAAG,IAAI,oBAAW,EAAE,CAAC;IAEtC,IAAA,4BAAmB,EAAC,KAAK,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;IAEhD,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;AAfW,QAAA,aAAa,iBAexB;AAEK,IAAM,cAAc,GAAG,UAC5B,SAAiB,EACjB,KAAa,EACb,MAAc;IAEd,IAAM,WAAW,GAAG,IAAI,oBAAW,EAAE,CAAC;IAEtC,IAAA,6BAAoB,EAAC,KAAK,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;IAEjD,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;AAfW,QAAA,cAAc,kBAezB;AAEK,IAAM,oBAAoB,GAAG,UAClC,MAAc,EACd,OAAe,EACf,YAAoB,EACpB,mBAA2B,EAC3B,iBAAyB,EACzB,KAAa,EACb,MAAc;;;;;gBAER,WAAW,GAAG,IAAI,oBAAW,EAAE,CAAC;gBACtC,8CAA8C;gBAC9C,IAAA,mCAA0B,EAAC,iBAAiB,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;gBAElD,qBAAM,IAAA,yBAAgB,EAC5C,MAAM,EACN,OAAO,EACP,IAAA,mBAAU,EAAC,OAAO,EAAE,qBAAY,CAAC,eAAe,CAAC,EACjD,mBAAmB,EACnB,WAAW,CAAC,QAAQ,EACpB,YAAY,GAAG,CAAC,EAChB,IAAA,qCAA4B,GAAE,GAAG,iCAAwB,EACzD,eAAM,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,CACjD,EAAA;;gBATK,eAAe,GAAG,SASvB;gBAEK,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBAClB,iBAAiB,GAAG,oBAAoB,CAAC;gBACzC,UAAU,GAAG;oBACjB;wBACE,SAAS,EAAE,mBAAmB;wBAC9B,QAAQ,EAAE;4BACR,aAAa,EAAE,iBAAiB;4BAChC,UAAU,EAAE,KAAK;4BACjB,gBAAgB,EAAE,MAAM;yBACzB;wBACD,GAAG,EAAE,eAAe;qBACrB;iBACF,CAAC;gBAEI,SAAS,GAAG,IAAI,kBAAS,CAAC,qBAAY,CAAC,CAAC;gBACxC,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;AA5CW,QAAA,oBAAoB,wBA4C/B;AAEK,IAAM,yBAAyB,GAAG,UACvC,SAAiB,EACjB,yBAAiC,EACjC,wBAAgC,EAChC,GAAoB,EACpB,iBAAyB,EACzB,OAAe,EACf,QAAgB;IAEhB,IAAM,iBAAiB,GAAG,YAAY,CAAC;IACvC,IAAM,UAAU,GAAG;QACjB;YACE,SAAS,WAAA;YACT,KAAK,EAAE,yBAAyB;YAChC,WAAW,EAAE,wBAAwB;YACrC,GAAG,KAAA;YACH,iBAAiB,mBAAA;YACjB,OAAO,SAAA;YACP,QAAQ,UAAA;SACT;KACF,CAAC;IACF,IAAM,SAAS,GAAG,IAAI,kBAAS,CAAC,qBAAY,CAAC,CAAC;IAC9C,IAAM,QAAQ,GAAG,SAAS,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;IAC7E,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;AAC/D,CAAC,CAAC;AAxBW,QAAA,yBAAyB,6BAwBpC;AAEK,IAAM,2BAA2B,GAAG,UACzC,QAAgB,EAChB,iBAAyB,EACzB,eAAuB,EACvB,mBAA2B,EAC3B,UAAkB,EAClB,YAAoB,EACpB,qBAA6B,EAC7B,oBAA4B,EAC5B,qBAA6B;IAE7B,IAAM,mBAAmB,GAAG,IAAI,kBAAS,CAAC,qBAAY,CAAC,CAAC;IACxD,IAAM,MAAM,GAAG;QACb,YAAY,cAAA;QACZ,KAAK,EAAE,qBAAqB;KAC7B,CAAC;IACF,IAAM,iBAAiB,GAAG,mBAAmB,CAAC,kBAAkB,CAC9D,iCAAiC,EACjC,CAAC,MAAM,CAAC,CACT,CAAC;IAEF,IAAM,iBAAiB,GAAG,QAAQ,CAAC;IACnC,IAAM,UAAU,GAAG;QACjB,QAAQ;QACR,qBAAqB;QACrB,iBAAiB;QACjB,eAAe;QACf,iBAAiB;QACjB,mBAAmB;KACpB,CAAC;IACF,IAAM,SAAS,GAAG,IAAI,kBAAS,CAAC,mCAA0B,CAAC,CAAC;IAC5D,IAAM,QAAQ,GAAG,SAAS,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;IAC7E,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;AAChE,CAAC,CAAC;AAjCW,QAAA,2BAA2B,+BAiCtC;AAEK,IAAM,gCAAgC,GAAG,UAC9C,QAAgB,EAChB,iBAAyB,EACzB,eAAuB,EACvB,mBAA2B,EAC3B,UAAkB,EAClB,SAAiB,EACjB,qBAA6B,EAC7B,oBAA4B,EAC5B,qBAA6B;IAE7B,IAAM,mBAAmB,GAAG,IAAI,kBAAS,CAAC,qBAAY,CAAC,CAAC;IACxD,IAAM,MAAM,GAAG;QACb,SAAS,WAAA;QACT,KAAK,EAAE,qBAAqB;KAC7B,CAAC;IACF,IAAM,iBAAiB,GAAG,mBAAmB,CAAC,kBAAkB,CAC9D,sCAAsC,EACtC,CAAC,MAAM,CAAC,CACT,CAAC;IAEF,IAAM,iBAAiB,GAAG,QAAQ,CAAC;IACnC,IAAM,UAAU,GAAG;QACjB,QAAQ;QACR,qBAAqB;QACrB,iBAAiB;QACjB,eAAe;QACf,iBAAiB;QACjB,mBAAmB;KACpB,CAAC;IACF,IAAM,SAAS,GAAG,IAAI,kBAAS,CAAC,mCAA0B,CAAC,CAAC;IAC5D,IAAM,QAAQ,GAAG,SAAS,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;IAC7E,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;AAChE,CAAC,CAAC;AAjCW,QAAA,gCAAgC,oCAiC3C","sourcesContent":["import { MethodParameters, MultiAction } from '@reyaxyz/common';\nimport { Interface } from 'ethers';\nimport {\n  encodeRouterCall,\n  encodeSingleDeposit,\n  encodeSingleTransferMargin,\n  encodeSingleWithdraw,\n} from '../encode';\nimport {\n  CoreAbi as abi,\n  PeripheryAbi,\n  Socket_VaultWithPayloadAbi,\n  CORE_DEADLINE_IN_SECONDS,\n  EIP712Signature,\n  signCoreCommands,\n  ContractType,\n  getAddress,\n} from '@reyaxyz/common';\nimport { getCurrentTimestampInSeconds } from '@reyaxyz/common';\nimport { Signer } from 'ethers';\nimport { ethers } from 'ethers';\n\nexport const encodeCreateAccountCall = (\n  accountOwner: string,\n): MethodParameters => {\n  const functionSignature = 'createAccount';\n  const parameters = [accountOwner];\n  const INTERFACE = new Interface(abi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return { calldata: calldata, value: BigInt(0).toString(10) };\n};\n\nexport const encodeDeposit = (\n  accountId: number,\n  token: string,\n  amount: bigint,\n): MethodParameters => {\n  const multiAction = new MultiAction();\n\n  encodeSingleDeposit(token, amount, multiAction);\n\n  const value = BigInt(0);\n  const call = encodeRouterCall(multiAction, accountId, value);\n\n  return {\n    ...call,\n  };\n};\n\nexport const encodeWithdraw = (\n  accountId: number,\n  token: string,\n  amount: bigint,\n): MethodParameters => {\n  const multiAction = new MultiAction();\n\n  encodeSingleWithdraw(token, amount, multiAction);\n\n  const value = BigInt(0);\n  const call = encodeRouterCall(multiAction, accountId, value);\n\n  return {\n    ...call,\n  };\n};\n\nexport const encodeTransferMargin = async (\n  signer: Signer,\n  chainId: number,\n  coreSigNonce: number,\n  fromMarginAccountId: number,\n  toMarginAccountId: number,\n  token: string,\n  amount: bigint,\n): Promise<MethodParameters> => {\n  const multiAction = new MultiAction();\n  // todo: note can we make this more stateless?\n  encodeSingleTransferMargin(toMarginAccountId, token, amount, multiAction);\n\n  const eip712Signature = await signCoreCommands(\n    signer,\n    chainId,\n    getAddress(chainId, ContractType.PERIPHERY_PROXY),\n    fromMarginAccountId,\n    multiAction.commands,\n    coreSigNonce + 1,\n    getCurrentTimestampInSeconds() + CORE_DEADLINE_IN_SECONDS,\n    ethers.AbiCoder.defaultAbiCoder().encode([], []),\n  );\n\n  const value = BigInt(0);\n  const functionSignature = 'transferFromMAToMA';\n  const parameters = [\n    {\n      accountId: fromMarginAccountId,\n      transfer: {\n        destAccountId: toMarginAccountId,\n        collateral: token,\n        collateralAmount: amount,\n      },\n      sig: eip712Signature,\n    },\n  ];\n\n  const INTERFACE = new Interface(PeripheryAbi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return {\n    calldata: calldata,\n    value: BigInt(value).toString(10),\n  };\n};\n\nexport const encodeWithdrawMAAndBridge = (\n  accountId: number,\n  corePeripheryTokenAddress: string,\n  corePeripheryTokenAmount: bigint,\n  sig: EIP712Signature,\n  socketMsgGasLimit: bigint,\n  chainId: number,\n  receiver: string,\n): MethodParameters => {\n  const functionSignature = 'withdrawMA';\n  const parameters = [\n    {\n      accountId,\n      token: corePeripheryTokenAddress,\n      tokenAmount: corePeripheryTokenAmount,\n      sig,\n      socketMsgGasLimit,\n      chainId,\n      receiver,\n    },\n  ];\n  const INTERFACE = new Interface(PeripheryAbi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return { calldata: calldata, value: BigInt(0).toString(10) };\n};\n\nexport const encodeBridgeAndDepositNewMA = (\n  receiver: string,\n  socketMsgGasLimit: bigint,\n  socketConnector: string,\n  socketBridgeOptions: string,\n  socketFees: bigint,\n  accountOwner: string,\n  peripheryTokenAddress: string,\n  peripheryTokenAmount: bigint,\n  moneyInOutTokenAmount: bigint,\n): MethodParameters => {\n  const PERIPHERY_INTERFACE = new Interface(PeripheryAbi);\n  const inputs = {\n    accountOwner,\n    token: peripheryTokenAddress,\n  };\n  const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(\n    'depositNewMA((address,address))',\n    [inputs],\n  );\n\n  const functionSignature = 'bridge';\n  const parameters = [\n    receiver,\n    moneyInOutTokenAmount,\n    socketMsgGasLimit,\n    socketConnector,\n    peripheryCalldata,\n    socketBridgeOptions,\n  ];\n  const INTERFACE = new Interface(Socket_VaultWithPayloadAbi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return { calldata: calldata, value: socketFees.toString(10) };\n};\n\nexport const encodeBridgeAndDepositExistingMA = (\n  receiver: string,\n  socketMsgGasLimit: bigint,\n  socketConnector: string,\n  socketBridgeOptions: string,\n  socketFees: bigint,\n  accountId: number,\n  peripheryTokenAddress: string,\n  peripheryTokenAmount: bigint,\n  moneyInOutTokenAmount: bigint,\n): MethodParameters => {\n  const PERIPHERY_INTERFACE = new Interface(PeripheryAbi);\n  const inputs = {\n    accountId,\n    token: peripheryTokenAddress,\n  };\n  const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(\n    'depositExistingMA((uint128,address))',\n    [inputs],\n  );\n\n  const functionSignature = 'bridge';\n  const parameters = [\n    receiver,\n    moneyInOutTokenAmount,\n    socketMsgGasLimit,\n    socketConnector,\n    peripheryCalldata,\n    socketBridgeOptions,\n  ];\n  const INTERFACE = new Interface(Socket_VaultWithPayloadAbi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return { calldata: calldata, value: socketFees.toString(10) };\n};\n"]}

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

@@ -38,8 +38,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transferMarginBetweenAccounts = void 0;
 var common_1 = require("@reyaxyz/common");
-var contractAddresses_1 = require("../../utils/contractAddresses");
-var executeTransaction_1 = require("../executeTransaction");
+var common_2 = require("@reyaxyz/common");
+var signAndBroadcastTransaction_1 = require("../signAndBroadcastTransaction");
 var encode_1 = require("./encode");
 var transferMarginBetweenAccounts = function (params) { return __awaiter(void 0, void 0, void 0, function () {
     var tokenInfo, amount, network, chainId, _a, data, value, result;
@@ -56,7 +56,7 @@ var transferMarginBetweenAccounts = function (params) { return __awaiter(void 0,
                 return [4 /*yield*/, (0, encode_1.encodeTransferMargin)(params.signer, chainId, params.owner.coreSigNonce, params.fromMarginAccountId, params.toMarginAccountId, params.tokenAddress, amount)];
             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.PERIPHERY_PROXY, {})];
+                return [4 /*yield*/, (0, signAndBroadcastTransaction_1.signAndBroadcastTransaction)(params.signer, data, value, chainId, common_2.ContractType.PERIPHERY_PROXY, {})];
             case 3:
                 result = _c.sent();
                 return [2 /*return*/, {

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

@@ -1 +1 @@
-{"version":3,"file":"transferMarginBetweenAccounts.js","sourceRoot":"/","sources":["services/margin-accounts/transferMarginBetweenAccounts.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAA+D;AAC/D,mEAA6D;AAC7D,4DAAoE;AACpE,mCAAgD;AAMzC,IAAM,6BAA6B,GAAG,UAC3C,MAA2C;;;;;;gBAErC,SAAS,GAAG,IAAA,8BAAqB,EAAC,MAAM,CAAC,YAAY,CAAC,CAAC;gBACvD,MAAM,GAAG,IAAA,cAAK,EAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAExC,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;gBACP,qBAAM,IAAA,6BAAoB,EAC1D,MAAM,CAAC,MAAM,EACb,OAAO,EACP,MAAM,CAAC,KAAK,CAAC,YAAY,EACzB,MAAM,CAAC,mBAAmB,EAC1B,MAAM,CAAC,iBAAiB,EACxB,MAAM,CAAC,YAAY,EACnB,MAAM,CACP,EAAA;;gBARK,KAA4B,SAQjC,EARiB,IAAI,cAAA,EAAE,KAAK,WAAA;gBAUd,qBAAM,IAAA,gDAA2B,EAC9C,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,gCAAY,CAAC,eAAe,EAC5B,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;AA9BW,QAAA,6BAA6B,iCA8BxC","sourcesContent":["import { scale, getTokenInfoByAddress } from '@reyaxyz/common';\nimport { ContractType } from '../../utils/contractAddresses';\nimport { signAndBroadcastTransaction } from '../executeTransaction';\nimport { encodeTransferMargin } from './encode';\nimport {\n  TransferMarginBetweenAccountsParams,\n  TransferMarginBetweenAccountsResult,\n} from './types';\n\nexport const transferMarginBetweenAccounts = async (\n  params: TransferMarginBetweenAccountsParams,\n): Promise<TransferMarginBetweenAccountsResult> => {\n  const tokenInfo = getTokenInfoByAddress(params.tokenAddress);\n  const amount = scale(tokenInfo.decimals)(params.amount);\n\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n  const { calldata: data, value } = await encodeTransferMargin(\n    params.signer,\n    chainId,\n    params.owner.coreSigNonce,\n    params.fromMarginAccountId,\n    params.toMarginAccountId,\n    params.tokenAddress,\n    amount,\n  );\n\n  const result = await signAndBroadcastTransaction(\n    params.signer,\n    data,\n    value,\n    chainId,\n    ContractType.PERIPHERY_PROXY,\n    {},\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}
+{"version":3,"file":"transferMarginBetweenAccounts.js","sourceRoot":"/","sources":["services/margin-accounts/transferMarginBetweenAccounts.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAA+D;AAC/D,0CAA+C;AAC/C,8EAA6E;AAC7E,mCAAgD;AAMzC,IAAM,6BAA6B,GAAG,UAC3C,MAA2C;;;;;;gBAErC,SAAS,GAAG,IAAA,8BAAqB,EAAC,MAAM,CAAC,YAAY,CAAC,CAAC;gBACvD,MAAM,GAAG,IAAA,cAAK,EAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAExC,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;gBACP,qBAAM,IAAA,6BAAoB,EAC1D,MAAM,CAAC,MAAM,EACb,OAAO,EACP,MAAM,CAAC,KAAK,CAAC,YAAY,EACzB,MAAM,CAAC,mBAAmB,EAC1B,MAAM,CAAC,iBAAiB,EACxB,MAAM,CAAC,YAAY,EACnB,MAAM,CACP,EAAA;;gBARK,KAA4B,SAQjC,EARiB,IAAI,cAAA,EAAE,KAAK,WAAA;gBAUd,qBAAM,IAAA,yDAA2B,EAC9C,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,qBAAY,CAAC,eAAe,EAC5B,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;AA9BW,QAAA,6BAA6B,iCA8BxC","sourcesContent":["import { scale, getTokenInfoByAddress } from '@reyaxyz/common';\nimport { ContractType } from '@reyaxyz/common';\nimport { signAndBroadcastTransaction } from '../signAndBroadcastTransaction';\nimport { encodeTransferMargin } from './encode';\nimport {\n  TransferMarginBetweenAccountsParams,\n  TransferMarginBetweenAccountsResult,\n} from './types';\n\nexport const transferMarginBetweenAccounts = async (\n  params: TransferMarginBetweenAccountsParams,\n): Promise<TransferMarginBetweenAccountsResult> => {\n  const tokenInfo = getTokenInfoByAddress(params.tokenAddress);\n  const amount = scale(tokenInfo.decimals)(params.amount);\n\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n  const { calldata: data, value } = await encodeTransferMargin(\n    params.signer,\n    chainId,\n    params.owner.coreSigNonce,\n    params.fromMarginAccountId,\n    params.toMarginAccountId,\n    params.tokenAddress,\n    amount,\n  );\n\n  const result = await signAndBroadcastTransaction(\n    params.signer,\n    data,\n    value,\n    chainId,\n    ContractType.PERIPHERY_PROXY,\n    {},\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}

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

@@ -38,23 +38,22 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withdraw = void 0;
 var encode_1 = require("./encode");
-var executeTransaction_1 = require("../executeTransaction");
-var contractAddresses_1 = require("../../utils/contractAddresses");
 var common_1 = require("@reyaxyz/common");
+var common_2 = require("@reyaxyz/common");
 var withdraw = function (params) { return __awaiter(void 0, void 0, void 0, function () {
     var tokenInfo, amount, _a, data, value, network, chainId, result;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0:
-                tokenInfo = (0, common_1.getTokenInfoByAddress)(params.tokenAddress);
-                amount = (0, common_1.scale)(tokenInfo.decimals)(params.amount);
+                tokenInfo = (0, common_2.getTokenInfoByAddress)(params.tokenAddress);
+                amount = (0, common_2.scale)(tokenInfo.decimals)(params.amount);
                 _a = (0, encode_1.encodeWithdraw)(params.marginAccountId, params.tokenAddress, BigInt(amount)), 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.executeTransaction)(params.signer, data, value, chainId, contractAddresses_1.ContractType.CORE_PROXY)];
+                return [4 /*yield*/, (0, common_1.executeTransaction)(params.signer, data, value, chainId, common_1.ContractType.CORE_PROXY)];
             case 2:
                 result = _c.sent();
                 return [2 /*return*/, {

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

@@ -1 +1 @@
-{"version":3,"file":"withdraw.js","sourceRoot":"/","sources":["services/margin-accounts/withdraw.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,mCAA0C;AAC1C,4DAA2D;AAC3D,mEAA6D;AAC7D,0CAA+D;AAExD,IAAM,QAAQ,GAAG,UACtB,MAAsB;;;;;;gBAEhB,SAAS,GAAG,IAAA,8BAAqB,EAAC,MAAM,CAAC,YAAY,CAAC,CAAC;gBACvD,MAAM,GAAG,IAAA,cAAK,EAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAElD,KAA4B,IAAA,uBAAc,EAC9C,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,YAAY,EACnB,MAAM,CAAC,MAAM,CAAC,CACf,EAJiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAI3B;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;gBAE1B,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,gCAAY,CAAC,UAAU,CACxB,EAAA;;gBANK,MAAM,GAAG,SAMd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AA1BW,QAAA,QAAQ,YA0BnB","sourcesContent":["import { WithdrawParams, WithdrawResult } from './types';\nimport { encodeWithdraw } from './encode';\nimport { executeTransaction } from '../executeTransaction';\nimport { ContractType } from '../../utils/contractAddresses';\nimport { getTokenInfoByAddress, scale } from '@reyaxyz/common';\n\nexport const withdraw = async (\n  params: WithdrawParams,\n): Promise<WithdrawResult> => {\n  const tokenInfo = getTokenInfoByAddress(params.tokenAddress);\n  const amount = scale(tokenInfo.decimals)(params.amount);\n\n  const { calldata: data, value } = encodeWithdraw(\n    params.marginAccountId,\n    params.tokenAddress,\n    BigInt(amount),\n  );\n\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    chainId,\n    ContractType.CORE_PROXY,\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}
+{"version":3,"file":"withdraw.js","sourceRoot":"/","sources":["services/margin-accounts/withdraw.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,mCAA0C;AAC1C,0CAAmE;AACnE,0CAA+D;AAExD,IAAM,QAAQ,GAAG,UACtB,MAAsB;;;;;;gBAEhB,SAAS,GAAG,IAAA,8BAAqB,EAAC,MAAM,CAAC,YAAY,CAAC,CAAC;gBACvD,MAAM,GAAG,IAAA,cAAK,EAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAElD,KAA4B,IAAA,uBAAc,EAC9C,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,YAAY,EACnB,MAAM,CAAC,MAAM,CAAC,CACf,EAJiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAI3B;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;gBAE1B,qBAAM,IAAA,2BAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,qBAAY,CAAC,UAAU,CACxB,EAAA;;gBANK,MAAM,GAAG,SAMd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AA1BW,QAAA,QAAQ,YA0BnB","sourcesContent":["import { WithdrawParams, WithdrawResult } from './types';\nimport { encodeWithdraw } from './encode';\nimport { ContractType, executeTransaction } from '@reyaxyz/common';\nimport { getTokenInfoByAddress, scale } from '@reyaxyz/common';\n\nexport const withdraw = async (\n  params: WithdrawParams,\n): Promise<WithdrawResult> => {\n  const tokenInfo = getTokenInfoByAddress(params.tokenAddress);\n  const amount = scale(tokenInfo.decimals)(params.amount);\n\n  const { calldata: data, value } = encodeWithdraw(\n    params.marginAccountId,\n    params.tokenAddress,\n    BigInt(amount),\n  );\n\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    chainId,\n    ContractType.CORE_PROXY,\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}

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

@@ -38,13 +38,13 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withdrawMAAndBridge = void 0;
 var common_1 = require("@reyaxyz/common");
-var contractAddresses_1 = require("../../utils/contractAddresses");
-var executeTransaction_1 = require("../executeTransaction");
-var sign_1 = require("../sign");
+var common_2 = require("@reyaxyz/common");
+var signAndBroadcastTransaction_1 = require("../signAndBroadcastTransaction");
+var common_3 = require("@reyaxyz/common");
 var encode_1 = require("./encode");
-var consts_1 = require("../../utils/consts");
+var common_4 = require("@reyaxyz/common");
 var encode_2 = require("../encode");
-var action_1 = require("../../utils/action");
+var common_5 = require("@reyaxyz/common");
 var ethers_1 = require("ethers");
 var withdrawMAAndBridge = function (_a) {
     var signer = _a.signer, moneyInOutChainId = _a.moneyInOutChainId, marginAccountId = _a.marginAccountId, owner = _a.owner, unscaledAmount = _a.amount, tokenAddress = _a.tokenAddress, _b = _a.receiverAddress, receiverAddress = _b === void 0 ? owner.address : _b;
@@ -58,14 +58,14 @@ var withdrawMAAndBridge = function (_a) {
                     network = _e.sent();
                     reyaChainId = Number(network === null || network === void 0 ? void 0 : network.chainId);
                     corePeripheryTokenInfo = (0, common_1.getTokenInfoByAddress)(tokenAddress);
-                    multiAction = new action_1.MultiAction();
+                    multiAction = new common_5.MultiAction();
                     (0, encode_2.encodeSingleWithdraw)(corePeripheryTokenInfo.address, (0, common_1.scale)(corePeripheryTokenInfo.decimals)(unscaledAmount), multiAction);
                     socketMsgGasLimit = BigInt('10000000');
-                    return [4 /*yield*/, (0, sign_1.signCoreCommands)(signer, reyaChainId, (0, contractAddresses_1.getAddress)(reyaChainId, contractAddresses_1.ContractType.PERIPHERY_PROXY), marginAccountId, multiAction.commands, owner.coreSigNonce + 1, (0, common_1.getCurrentTimestampInSeconds)() + consts_1.BRIDGE_DEADLINE_IN_SECONDS, ethers_1.ethers.AbiCoder.defaultAbiCoder().encode(['address', 'uint256', 'uint256'], [receiverAddress, moneyInOutChainId, socketMsgGasLimit]))];
+                    return [4 /*yield*/, (0, common_3.signCoreCommands)(signer, reyaChainId, (0, common_2.getAddress)(reyaChainId, common_2.ContractType.PERIPHERY_PROXY), marginAccountId, multiAction.commands, owner.coreSigNonce + 1, (0, common_1.getCurrentTimestampInSeconds)() + common_4.BRIDGE_DEADLINE_IN_SECONDS, ethers_1.ethers.AbiCoder.defaultAbiCoder().encode(['address', 'uint256', 'uint256'], [receiverAddress, moneyInOutChainId, socketMsgGasLimit]))];
                 case 2:
                     eip712Signature = _e.sent();
                     _c = (0, encode_1.encodeWithdrawMAAndBridge)(marginAccountId, corePeripheryTokenInfo.address, (0, common_1.scale)(corePeripheryTokenInfo.decimals)(unscaledAmount), eip712Signature, socketMsgGasLimit, moneyInOutChainId, receiverAddress), data = _c.calldata, value = _c.value;
-                    return [4 /*yield*/, (0, executeTransaction_1.signAndBroadcastTransaction)(signer, data, value, reyaChainId, contractAddresses_1.ContractType.PERIPHERY_PROXY, {})];
+                    return [4 /*yield*/, (0, signAndBroadcastTransaction_1.signAndBroadcastTransaction)(signer, data, value, reyaChainId, common_2.ContractType.PERIPHERY_PROXY, {})];
                 case 3:
                     result = _e.sent();
                     return [2 /*return*/, {

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,0CAKyB;AACzB,mEAAyE;AACzE,4DAAoE;AACpE,gCAA2C;AAC3C,mCAAqD;AAKrD,6CAAgE;AAChE,oCAAiD;AACjD,6CAAiD;AACjD,iCAAgC;AAEzB,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,sBAAsB,GAAG,IAAA,8BAAqB,EAAC,YAAY,CAAC,CAAC;oBAE7D,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;oBAEI,iBAAiB,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;oBACrB,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,EAC3D,eAAM,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CACtC,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,EACjC,CAAC,eAAe,EAAE,iBAAiB,EAAE,iBAAiB,CAAC,CACxD,CACF,EAAA;;oBAZK,eAAe,GAAG,SAYvB;oBAEK,KAA4B,IAAA,kCAAyB,EACzD,eAAe,EACf,sBAAsB,CAAC,OAAO,EAC9B,IAAA,cAAK,EAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC,cAAc,CAAC,EACtD,eAAe,EACf,iBAAiB,EACjB,iBAAiB,EACjB,eAAe,CAChB,EARiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAQ3B;oBAEa,qBAAM,IAAA,gDAA2B,EAC9C,MAAM,EACN,IAAI,EACJ,KAAK,EACL,WAAW,EACX,gCAAY,CAAC,eAAe,EAC5B,EAAE,CACH,EAAA;;oBAPK,MAAM,GAAG,SAOd;oBAED,sBAAO;4BACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;yBACtC,EAAC;;;;CACH,CAAC;AA1DW,QAAA,mBAAmB,uBA0D9B","sourcesContent":["import {\n  getCurrentTimestampInSeconds,\n  scale,\n  ReyaChainId,\n  getTokenInfoByAddress,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\nimport { signAndBroadcastTransaction } 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';\nimport { ethers } from 'ethers';\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 corePeripheryTokenInfo = getTokenInfoByAddress(tokenAddress);\n\n  const multiAction = new MultiAction();\n  encodeSingleWithdraw(\n    corePeripheryTokenInfo.address,\n    scale(corePeripheryTokenInfo.decimals)(unscaledAmount),\n    multiAction,\n  );\n\n  const socketMsgGasLimit = BigInt('10000000');\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    ethers.AbiCoder.defaultAbiCoder().encode(\n      ['address', 'uint256', 'uint256'],\n      [receiverAddress, moneyInOutChainId, socketMsgGasLimit],\n    ),\n  );\n\n  const { calldata: data, value } = encodeWithdrawMAAndBridge(\n    marginAccountId,\n    corePeripheryTokenInfo.address,\n    scale(corePeripheryTokenInfo.decimals)(unscaledAmount),\n    eip712Signature,\n    socketMsgGasLimit,\n    moneyInOutChainId,\n    receiverAddress,\n  );\n\n  const result = await signAndBroadcastTransaction(\n    signer,\n    data,\n    value,\n    reyaChainId,\n    ContractType.PERIPHERY_PROXY,\n    {},\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,0CAKyB;AACzB,0CAA2D;AAC3D,8EAA6E;AAC7E,0CAAmD;AACnD,mCAAqD;AAKrD,0CAA6D;AAC7D,oCAAiD;AACjD,0CAA8C;AAC9C,iCAAgC;AAEzB,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,sBAAsB,GAAG,IAAA,8BAAqB,EAAC,YAAY,CAAC,CAAC;oBAE7D,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;oBAEI,iBAAiB,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;oBACrB,qBAAM,IAAA,yBAAgB,EAC5C,MAAM,EACN,WAAW,EACX,IAAA,mBAAU,EAAC,WAAW,EAAE,qBAAY,CAAC,eAAe,CAAC,EACrD,eAAe,EACf,WAAW,CAAC,QAAQ,EACpB,KAAK,CAAC,YAAY,GAAG,CAAC,EACtB,IAAA,qCAA4B,GAAE,GAAG,mCAA0B,EAC3D,eAAM,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CACtC,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,EACjC,CAAC,eAAe,EAAE,iBAAiB,EAAE,iBAAiB,CAAC,CACxD,CACF,EAAA;;oBAZK,eAAe,GAAG,SAYvB;oBAEK,KAA4B,IAAA,kCAAyB,EACzD,eAAe,EACf,sBAAsB,CAAC,OAAO,EAC9B,IAAA,cAAK,EAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC,cAAc,CAAC,EACtD,eAAe,EACf,iBAAiB,EACjB,iBAAiB,EACjB,eAAe,CAChB,EARiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAQ3B;oBAEa,qBAAM,IAAA,yDAA2B,EAC9C,MAAM,EACN,IAAI,EACJ,KAAK,EACL,WAAW,EACX,qBAAY,CAAC,eAAe,EAC5B,EAAE,CACH,EAAA;;oBAPK,MAAM,GAAG,SAOd;oBAED,sBAAO;4BACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;yBACtC,EAAC;;;;CACH,CAAC;AA1DW,QAAA,mBAAmB,uBA0D9B","sourcesContent":["import {\n  getCurrentTimestampInSeconds,\n  scale,\n  ReyaChainId,\n  getTokenInfoByAddress,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '@reyaxyz/common';\nimport { signAndBroadcastTransaction } from '../signAndBroadcastTransaction';\nimport { signCoreCommands } from '@reyaxyz/common';\nimport { encodeWithdrawMAAndBridge } from './encode';\nimport {\n  WithdrawMAAndBridgeParams,\n  WithdrawMAAndBridgeParamsResult,\n} from './types';\nimport { BRIDGE_DEADLINE_IN_SECONDS } from '@reyaxyz/common';\nimport { encodeSingleWithdraw } from '../encode';\nimport { MultiAction } from '@reyaxyz/common';\nimport { ethers } from 'ethers';\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 corePeripheryTokenInfo = getTokenInfoByAddress(tokenAddress);\n\n  const multiAction = new MultiAction();\n  encodeSingleWithdraw(\n    corePeripheryTokenInfo.address,\n    scale(corePeripheryTokenInfo.decimals)(unscaledAmount),\n    multiAction,\n  );\n\n  const socketMsgGasLimit = BigInt('10000000');\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    ethers.AbiCoder.defaultAbiCoder().encode(\n      ['address', 'uint256', 'uint256'],\n      [receiverAddress, moneyInOutChainId, socketMsgGasLimit],\n    ),\n  );\n\n  const { calldata: data, value } = encodeWithdrawMAAndBridge(\n    marginAccountId,\n    corePeripheryTokenInfo.address,\n    scale(corePeripheryTokenInfo.decimals)(unscaledAmount),\n    eip712Signature,\n    socketMsgGasLimit,\n    moneyInOutChainId,\n    receiverAddress,\n  );\n\n  const result = await signAndBroadcastTransaction(\n    signer,\n    data,\n    value,\n    reyaChainId,\n    ContractType.PERIPHERY_PROXY,\n    {},\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}

package/dist/services/orders/encode.js

@@ -37,23 +37,21 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.encodeMatchOrder = void 0;
-var action_1 = require("../../utils/action");
-var encode_1 = require("../encode");
-var sign_1 = require("../sign");
 var common_1 = require("@reyaxyz/common");
-var consts_1 = require("../../utils/consts");
+var encode_1 = require("../encode");
+var common_2 = require("@reyaxyz/common");
+var common_3 = require("@reyaxyz/common");
+var common_4 = require("@reyaxyz/common");
 var ethers_1 = require("ethers");
-var Periphery_json_1 = require("../../abis/Periphery.json");
-var contractAddresses_1 = require("../../utils/contractAddresses");
 var ethers_2 = require("ethers");
 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();
+                multiAction = new common_1.MultiAction();
                 (0, encode_1.encodeSingleTrade)(counterpartyAccountIds, orderBase, orderPriceLimit, marketId, exchangeId, multiAction);
-                return [4 /*yield*/, (0, sign_1.signCoreCommands)(signer, chainId, (0, contractAddresses_1.getAddress)(chainId, contractAddresses_1.ContractType.PERIPHERY_PROXY), accountId, multiAction.commands, coreSigNonce + 1, (0, common_1.getCurrentTimestampInSeconds)() + consts_1.CORE_DEADLINE_IN_SECONDS, ethers_2.ethers.AbiCoder.defaultAbiCoder().encode([], []))];
+                return [4 /*yield*/, (0, common_2.signCoreCommands)(signer, chainId, (0, common_3.getAddress)(chainId, common_3.ContractType.PERIPHERY_PROXY), accountId, multiAction.commands, coreSigNonce + 1, (0, common_3.getCurrentTimestampInSeconds)() + common_4.CORE_DEADLINE_IN_SECONDS, ethers_2.ethers.AbiCoder.defaultAbiCoder().encode([], []))];
             case 1:
                 eip712Signature = _a.sent();
                 value = BigInt(0);
@@ -61,7 +59,7 @@ var encodeMatchOrder = function (signer, chainId, coreSigNonce, accountId, order
                 parameters = [
                     { accountId: accountId, commands: multiAction.commands, sig: eip712Signature },
                 ];
-                INTERFACE = new ethers_1.Interface(Periphery_json_1.abi);
+                INTERFACE = new ethers_1.Interface(common_1.PeripheryAbi);
                 calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
                 return [2 /*return*/, {
                         calldata: calldata,

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,oCAA8C;AAC9C,gCAA2C;AAC3C,0CAA+D;AAC/D,6CAA8D;AAC9D,iCAA2C;AAC3C,4DAAgD;AAChD,mEAAyE;AACzE,iCAAgC;AACzB,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,IAAA,8BAAU,EAAC,OAAO,EAAE,gCAAY,CAAC,eAAe,CAAC,EACjD,SAAS,EACT,WAAW,CAAC,QAAQ,EACpB,YAAY,GAAG,CAAC,EAChB,IAAA,qCAA4B,GAAE,GAAG,iCAAwB,EACzD,eAAM,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,CACjD,EAAA;;gBATK,eAAe,GAAG,SASvB;gBAEK,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBAClB,iBAAiB,GAAG,oBAAoB,CAAC;gBACzC,UAAU,GAAG;oBACjB,EAAE,SAAS,WAAA,EAAE,QAAQ,EAAE,WAAW,CAAC,QAAQ,EAAE,GAAG,EAAE,eAAe,EAAE;iBACpE,CAAC;gBAEI,SAAS,GAAG,IAAI,kBAAS,CAAC,oBAAG,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;AA5CW,QAAA,gBAAgB,oBA4C3B","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 } from '../../utils/consts';\nimport { Interface, Signer } from 'ethers';\nimport { abi } from '../../abis/Periphery.json';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\nimport { ethers } from 'ethers';\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    getAddress(chainId, ContractType.PERIPHERY_PROXY),\n    accountId,\n    multiAction.commands,\n    coreSigNonce + 1,\n    getCurrentTimestampInSeconds() + CORE_DEADLINE_IN_SECONDS,\n    ethers.AbiCoder.defaultAbiCoder().encode([], []),\n  );\n\n  const value = BigInt(0);\n  const functionSignature = 'executeMatchOrders';\n  const parameters = [\n    { accountId, commands: multiAction.commands, sig: eip712Signature },\n  ];\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"]}
+{"version":3,"file":"encode.js","sourceRoot":"/","sources":["services/orders/encode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAIyB;AACzB,oCAA8C;AAC9C,0CAAmD;AACnD,0CAIyB;AACzB,0CAA2D;AAC3D,iCAA2C;AAC3C,iCAAgC;AACzB,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,yBAAgB,EAC5C,MAAM,EACN,OAAO,EACP,IAAA,mBAAU,EAAC,OAAO,EAAE,qBAAY,CAAC,eAAe,CAAC,EACjD,SAAS,EACT,WAAW,CAAC,QAAQ,EACpB,YAAY,GAAG,CAAC,EAChB,IAAA,qCAA4B,GAAE,GAAG,iCAAwB,EACzD,eAAM,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,CACjD,EAAA;;gBATK,eAAe,GAAG,SASvB;gBAEK,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBAClB,iBAAiB,GAAG,oBAAoB,CAAC;gBACzC,UAAU,GAAG;oBACjB,EAAE,SAAS,WAAA,EAAE,QAAQ,EAAE,WAAW,CAAC,QAAQ,EAAE,GAAG,EAAE,eAAe,EAAE;iBACpE,CAAC;gBAEI,SAAS,GAAG,IAAI,kBAAS,CAAC,qBAAG,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;AA5CW,QAAA,gBAAgB,oBA4C3B","sourcesContent":["import {\n  MethodParameters,\n  MultiAction,\n  PeripheryAbi as abi,\n} from '@reyaxyz/common';\nimport { encodeSingleTrade } from '../encode';\nimport { signCoreCommands } from '@reyaxyz/common';\nimport {\n  getCurrentTimestampInSeconds,\n  ContractType,\n  getAddress,\n} from '@reyaxyz/common';\nimport { CORE_DEADLINE_IN_SECONDS } from '@reyaxyz/common';\nimport { Interface, Signer } from 'ethers';\nimport { ethers } from 'ethers';\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    getAddress(chainId, ContractType.PERIPHERY_PROXY),\n    accountId,\n    multiAction.commands,\n    coreSigNonce + 1,\n    getCurrentTimestampInSeconds() + CORE_DEADLINE_IN_SECONDS,\n    ethers.AbiCoder.defaultAbiCoder().encode([], []),\n  );\n\n  const value = BigInt(0);\n  const functionSignature = 'executeMatchOrders';\n  const parameters = [\n    { accountId, commands: multiAction.commands, sig: eip712Signature },\n  ];\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

@@ -41,11 +41,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.closeOrder = exports.matchOrder = void 0;
 var encode_1 = require("./encode");
-var executeTransaction_1 = require("../executeTransaction");
-var trade_1 = require("../../utils/trade");
-var bignumber_js_1 = __importDefault(require("bignumber.js"));
-var contractAddresses_1 = require("../../utils/contractAddresses");
+var signAndBroadcastTransaction_1 = require("../signAndBroadcastTransaction");
 var common_1 = require("@reyaxyz/common");
+var bignumber_js_1 = __importDefault(require("bignumber.js"));
+var common_2 = require("@reyaxyz/common");
+var common_3 = require("@reyaxyz/common");
 var matchOrder = function (params) { return __awaiter(void 0, void 0, void 0, function () {
     var orderPriceLimit, orderBase, network, chainId, _a, data, value, result;
     var _b;
@@ -55,8 +55,8 @@ var matchOrder = function (params) { return __awaiter(void 0, void 0, void 0, fu
                 if (params.snappedAmountInBase === 0) {
                     throw new Error('Position base can not be 0');
                 }
-                orderPriceLimit = (0, trade_1.calculatePriceLimitForTrade)(params.market.currentPrice, params.snappedAmountInBase);
-                orderBase = (0, common_1.scale)(18)(params.snappedAmountInBase);
+                orderPriceLimit = (0, common_1.calculatePriceLimitForTrade)(params.market.currentPrice, params.snappedAmountInBase);
+                orderBase = (0, common_3.scale)(18)(params.snappedAmountInBase);
                 return [4 /*yield*/, ((_b = params.signer.provider) === null || _b === void 0 ? void 0 : _b.getNetwork())];
             case 1:
                 network = _c.sent();
@@ -64,7 +64,7 @@ var matchOrder = function (params) { return __awaiter(void 0, void 0, void 0, fu
                 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.PERIPHERY_PROXY, {})];
+                return [4 /*yield*/, (0, signAndBroadcastTransaction_1.signAndBroadcastTransaction)(params.signer, data, value, chainId, common_2.ContractType.PERIPHERY_PROXY, {})];
             case 3:
                 result = _c.sent();
                 return [2 /*return*/, {
@@ -83,8 +83,8 @@ var closeOrder = function (params) { return __awaiter(void 0, void 0, void 0, fu
                 if (params.orderBase === 0) {
                     throw new Error('Position base can not be 0');
                 }
-                base = (0, common_1.scale)(18)(params.orderBase);
-                orderPriceLimit = (0, trade_1.calculatePriceLimitForTrade)(params.market.currentPrice, (0, bignumber_js_1.default)(params.orderBase).negated().toNumber());
+                base = (0, common_3.scale)(18)(params.orderBase);
+                orderPriceLimit = (0, common_1.calculatePriceLimitForTrade)(params.market.currentPrice, (0, bignumber_js_1.default)(params.orderBase).negated().toNumber());
                 return [4 /*yield*/, ((_b = params.signer.provider) === null || _b === void 0 ? void 0 : _b.getNetwork())];
             case 1:
                 network = _c.sent();
@@ -92,7 +92,7 @@ var closeOrder = function (params) { return __awaiter(void 0, void 0, void 0, fu
                 return [4 /*yield*/, (0, encode_1.encodeMatchOrder)(params.signer, chainId, params.owner.coreSigNonce, params.marginAccountId, -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.PERIPHERY_PROXY, {})];
+                return [4 /*yield*/, (0, signAndBroadcastTransaction_1.signAndBroadcastTransaction)(params.signer, data, value, chainId, common_2.ContractType.PERIPHERY_PROXY, {})];
             case 3:
                 result = _c.sent();
                 return [2 /*return*/, {

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.snappedAmountInBase === 0) {\n    throw new Error('Position base can not be 0');\n  }\n  const orderPriceLimit = calculatePriceLimitForTrade(\n    params.market.currentPrice,\n    params.snappedAmountInBase,\n  );\n\n  const orderBase = scale(18)(params.snappedAmountInBase);\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.PERIPHERY_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)(params.orderBase);\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  const { calldata: data, value } = await encodeMatchOrder(\n    params.signer,\n    chainId,\n    params.owner.coreSigNonce,\n    params.marginAccountId,\n    -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.PERIPHERY_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":"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","sourcesContent":["import {\n  CloseOrderParams,\n  CloseOrderResult,\n  MatchOrderParams,\n  MatchOrderResult,\n} from './types';\nimport { encodeMatchOrder } from './encode';\nimport { signAndBroadcastTransaction } from '../signAndBroadcastTransaction';\nimport { calculatePriceLimitForTrade } from '@reyaxyz/common';\nimport BigNumber from 'bignumber.js';\nimport { ContractType } from '@reyaxyz/common';\nimport { scale } from '@reyaxyz/common';\n\nexport const matchOrder = async (\n  params: MatchOrderParams,\n): Promise<MatchOrderResult> => {\n  if (params.snappedAmountInBase === 0) {\n    throw new Error('Position base can not be 0');\n  }\n  const orderPriceLimit = calculatePriceLimitForTrade(\n    params.market.currentPrice,\n    params.snappedAmountInBase,\n  );\n\n  const orderBase = scale(18)(params.snappedAmountInBase);\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.PERIPHERY_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)(params.orderBase);\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  const { calldata: data, value } = await encodeMatchOrder(\n    params.signer,\n    chainId,\n    params.owner.coreSigNonce,\n    params.marginAccountId,\n    -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.PERIPHERY_PROXY,\n    {},\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}

package/dist/services/{executeTransaction.js → signAndBroadcastTransaction.js}

@@ -1,15 +1,4 @@
 "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) {
@@ -47,89 +36,21 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.signAndBroadcastTransaction = exports.executeTransaction = exports.estimateGas = void 0;
-var contractAddresses_1 = require("../utils/contractAddresses");
-var txHelpers_1 = require("../utils/txHelpers");
-var config_1 = require("../config");
+exports.signAndBroadcastTransaction = void 0;
+var config_1 = require("../../../sdk/src/config");
 var common_1 = require("@reyaxyz/common");
-function estimateGas(signer, data, value, chainId, targetContract) {
-    return __awaiter(this, void 0, void 0, function () {
-        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();
-                    contractAddress = Object.values(contractAddresses_1.ContractType).includes(targetContract)
-                        ? (0, contractAddresses_1.getAddress)(chainId, targetContract)
-                        : targetContract;
-                    tx = __assign({ from: accountAddress, to: contractAddress, data: data }, (value && value !== '0' ? { value: value } : {}));
-                    gasLimit = BigInt('5000000');
-                    _a.label = 2;
-                case 2:
-                    _a.trys.push([2, 4, , 5]);
-                    return [4 /*yield*/, signer.estimateGas(tx)];
-                case 3:
-                    gasEstimate = _a.sent();
-                    gasLimit = (0, txHelpers_1.getGasBuffer)(gasEstimate);
-                    return [3 /*break*/, 5];
-                case 4:
-                    error_1 = _a.sent();
-                    // sentry error & thorw
-                    console.warn(error_1);
-                    throw new Error('Error executing transaction'); // @todo introduce error parsing
-                case 5:
-                    if (Object.values(common_1.ReyaChainId).includes(chainId)) {
-                        maxPriorityFeePerGas = BigInt('0');
-                        maxFeePerGas = BigInt('100000000');
-                        return [2 /*return*/, __assign(__assign({}, tx), { gasLimit: gasLimit, maxPriorityFeePerGas: maxPriorityFeePerGas, maxFeePerGas: maxFeePerGas })];
-                    }
-                    return [2 /*return*/, __assign(__assign({}, tx), { gasLimit: gasLimit })];
-            }
-        });
-    });
-}
-exports.estimateGas = estimateGas;
-function executeTransaction(signer, data, value, chainId, targetContract) {
-    return __awaiter(this, void 0, void 0, function () {
-        var txData, txResponse, txReceipt, error_2;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, estimateGas(signer, data, value, chainId, targetContract)];
-                case 1:
-                    txData = _a.sent();
-                    _a.label = 2;
-                case 2:
-                    _a.trys.push([2, 5, , 6]);
-                    return [4 /*yield*/, signer.sendTransaction(txData)];
-                case 3:
-                    txResponse = _a.sent();
-                    return [4 /*yield*/, txResponse.wait()];
-                case 4:
-                    txReceipt = _a.sent();
-                    return [2 /*return*/, txReceipt];
-                case 5:
-                    error_2 = _a.sent();
-                    console.warn(error_2);
-                    throw new Error('Transaction Execution Error');
-                case 6: return [2 /*return*/];
-            }
-        });
-    });
-}
-exports.executeTransaction = executeTransaction;
 function signAndBroadcastTransaction(signer, data, value, chainId, targetContract, metadata) {
     return __awaiter(this, void 0, void 0, function () {
-        var contractAddress, transactionModuleClient, _a, txHash, accountId, error_3;
+        var contractAddress, transactionModuleClient, _a, txHash, accountId, error_1;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
-                    contractAddress = Object.values(contractAddresses_1.ContractType).includes(targetContract)
-                        ? (0, contractAddresses_1.getAddress)(chainId, targetContract)
+                    contractAddress = Object.values(common_1.ContractType).includes(targetContract)
+                        ? (0, common_1.getAddress)(chainId, targetContract)
                         : targetContract;
                     // used to catch error in advance since gelato is slow in failing down
                     // on reya chain usually takes around 100ms, should be monitored!
-                    return [4 /*yield*/, estimateGas(signer, data, value, chainId, targetContract)];
+                    return [4 /*yield*/, (0, common_1.estimateGas)(signer, data, value, chainId, targetContract)];
                 case 1:
                     // used to catch error in advance since gelato is slow in failing down
                     // on reya chain usually takes around 100ms, should be monitored!
@@ -146,8 +67,8 @@ function signAndBroadcastTransaction(signer, data, value, chainId, targetContrac
                     }
                     return [2 /*return*/, { hash: txHash, accountId: accountId }];
                 case 4:
-                    error_3 = _b.sent();
-                    console.warn(error_3);
+                    error_1 = _b.sent();
+                    console.warn(error_1);
                     throw new Error('Transaction Execution Error');
                 case 5: return [2 /*return*/];
             }
@@ -155,4 +76,4 @@ function signAndBroadcastTransaction(signer, data, value, chainId, targetContrac
     });
 }
 exports.signAndBroadcastTransaction = signAndBroadcastTransaction;
-//# sourceMappingURL=executeTransaction.js.map
+//# sourceMappingURL=signAndBroadcastTransaction.js.map

package/dist/services/signAndBroadcastTransaction.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"signAndBroadcastTransaction.js","sourceRoot":"/","sources":["services/signAndBroadcastTransaction.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,kDAGiC;AACjC,0CAAwE;AAExE,SAAsB,2BAA2B,CAC/C,MAA8B,EAC9B,IAAY,EACZ,KAAa,EACb,OAAe,EACf,cAAqC,EACrC,QAAsC;;;;;;oBAEhC,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,qBAAY,CAAC,CAAC,QAAQ,CAC1D,cAA8B,CAC/B;wBACC,CAAC,CAAC,IAAA,mBAAU,EAAC,OAAO,EAAE,cAA8B,CAAC;wBACrD,CAAC,CAAC,cAAc,CAAC;oBAEnB,sEAAsE;oBACtE,iEAAiE;oBACjE,qBAAM,IAAA,oBAAW,EAAC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,cAAc,CAAC,EAAA;;oBAF/D,sEAAsE;oBACtE,iEAAiE;oBACjE,SAA+D,CAAC;;;;oBAExD,uBAAuB,GAAG,IAAA,mCAA0B,GAAE,CAAC;oBAE3D,qBAAM,uBAAuB,CAAC,kBAAkB,CAC9C,EAAE,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,IAAI,EAAE,EACnC,eAAe,EACf,QAAQ,CACT,EAAA;;oBALG,KACJ,SAIC,EALK,MAAM,YAAA,EAAE,SAAS,eAAA;oBAOzB,IAAI,CAAC,MAAM,EAAE,CAAC;wBACZ,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;oBAC/C,CAAC;oBACD,sBAAO,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,WAAA,EAAE,EAAC;;;oBAEnC,OAAO,CAAC,IAAI,CAAC,OAAK,CAAC,CAAC;oBACpB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;;;;;CAElD;AAlCD,kEAkCC","sourcesContent":["import { JsonRpcSigner, Signer } from 'ethers';\nimport {\n  BroadcastTransactionMetadata,\n  getTransactionModuleClient,\n} from '../../../sdk/src/config';\nimport { ContractType, getAddress, estimateGas } from '@reyaxyz/common';\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; accountId?: string }> {\n  const contractAddress = Object.values(ContractType).includes(\n    targetContract as ContractType,\n  )\n    ? getAddress(chainId, targetContract as ContractType)\n    : targetContract;\n\n  // used to catch error in advance since gelato is slow in failing down\n  // on reya chain usually takes around 100ms, should be monitored!\n  await estimateGas(signer, data, value, chainId, targetContract);\n  try {\n    const transactionModuleClient = getTransactionModuleClient();\n    const { txHash, accountId } =\n      await transactionModuleClient.executeTransaction(\n        { to: contractAddress, data: data },\n        contractAddress,\n        metadata,\n      );\n\n    if (!txHash) {\n      throw new Error('Error sending transaction');\n    }\n    return { hash: txHash, accountId };\n  } catch (error) {\n    console.warn(error);\n    throw new Error('Transaction Execution Error');\n  }\n}\n"]}

package/dist/services/token/approve.js

@@ -39,7 +39,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.approveTokenSpending = void 0;
 var types_1 = require("./types");
 var common_1 = require("@reyaxyz/common");
-var contractAddresses_1 = require("../../utils/contractAddresses");
+var common_2 = require("@reyaxyz/common");
 var approveTokenSpending = function (params) { return __awaiter(void 0, void 0, void 0, function () {
     var network, chainId, tokenInfo, tokenContract, contractProxyAddress, scaledTokenAmount, approvalTransaction, error_1, _a, error_2;
     var _b;
@@ -57,10 +57,10 @@ var approveTokenSpending = function (params) { return __awaiter(void 0, void 0,
                 tokenContract = (0, common_1.getERC20TokenContract)(tokenInfo.address, params.signer);
                 switch (params.type) {
                     case types_1.ApprovalType.DEPOSIT:
-                        contractProxyAddress = (0, contractAddresses_1.getAddress)(chainId, contractAddresses_1.ContractType.CORE_PROXY);
+                        contractProxyAddress = (0, common_2.getAddress)(chainId, common_2.ContractType.CORE_PROXY);
                         break;
                     case types_1.ApprovalType.LP:
-                        contractProxyAddress = (0, contractAddresses_1.getAddress)(chainId, contractAddresses_1.ContractType.PASSIVE_POOL_PROXY);
+                        contractProxyAddress = (0, common_2.getAddress)(chainId, common_2.ContractType.PASSIVE_POOL_PROXY);
                         break;
                     case types_1.ApprovalType.BRIDGE:
                         contractProxyAddress = (0, common_1.getSocketVault)({