@reyaxyz/sdk 0.64.1 → 0.65.0

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

@@ -113,7 +113,7 @@ var encodeTransferMargin = function (signer, chainId, coreSigNonce, fromMarginAc
     });
 }); };
 exports.encodeTransferMargin = encodeTransferMargin;
-var encodeWithdrawMAAndBridge = function (accountId, corePeripheryTokenAddress, corePeripheryTokenAmount, sig, socketMsgGasLimit, socketPayloadSize, socketConnector, receiver) {
+var encodeWithdrawMAAndBridge = function (accountId, corePeripheryTokenAddress, corePeripheryTokenAmount, sig, socketMsgGasLimit, chainId, receiver) {
     var functionSignature = 'withdrawMA';
     var parameters = [
         {
@@ -122,8 +122,7 @@ var encodeWithdrawMAAndBridge = function (accountId, corePeripheryTokenAddress,
             tokenAmount: corePeripheryTokenAmount,
             sig: sig,
             socketMsgGasLimit: socketMsgGasLimit,
-            socketPayloadSize: socketPayloadSize,
-            socketConnector: socketConnector,
+            chainId: chainId,
             receiver: receiver,
         },
     ];
@@ -132,19 +131,13 @@ var encodeWithdrawMAAndBridge = function (accountId, corePeripheryTokenAddress,
     return { calldata: calldata, value: BigInt(0).toString(10) };
 };
 exports.encodeWithdrawMAAndBridge = encodeWithdrawMAAndBridge;
-var encodeBridgeAndDepositNewMA = function (receiver, socketMsgGasLimit, socketConnector, socketBridgeOptions, socketFees, accountOwner, peripheryTokenAddress, peripheryTokenAmount, moneyInOutTokenAmount, fallbackSocketMsgGasLimit, fallbackSocketConnector, fallbackSocketPayloadSize) {
+var encodeBridgeAndDepositNewMA = function (receiver, socketMsgGasLimit, socketConnector, socketBridgeOptions, socketFees, accountOwner, peripheryTokenAddress, peripheryTokenAmount, moneyInOutTokenAmount) {
     var PERIPHERY_INTERFACE = new ethers_1.Interface(Periphery_json_1.abi);
     var inputs = {
         accountOwner: accountOwner,
         token: peripheryTokenAddress,
-        tokenAmount: peripheryTokenAmount,
     };
-    var fallbackData = {
-        socketMsgGasLimit: fallbackSocketMsgGasLimit,
-        socketConnector: fallbackSocketConnector,
-        socketPayloadSize: fallbackSocketPayloadSize,
-    };
-    var peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData('depositNewMA((address,address,uint256),(uint256,uint256,address))', [inputs, fallbackData]);
+    var peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData('depositNewMA((address,address))', [inputs]);
     var functionSignature = 'bridge';
     var parameters = [
         receiver,
@@ -159,19 +152,13 @@ var encodeBridgeAndDepositNewMA = function (receiver, socketMsgGasLimit, socketC
     return { calldata: calldata, value: socketFees.toString(10) };
 };
 exports.encodeBridgeAndDepositNewMA = encodeBridgeAndDepositNewMA;
-var encodeBridgeAndDepositExistingMA = function (receiver, socketMsgGasLimit, socketConnector, socketBridgeOptions, socketFees, accountId, peripheryTokenAddress, peripheryTokenAmount, moneyInOutTokenAmount, fallbackSocketMsgGasLimit, fallbackSocketConnector, fallbackSocketPayloadSize) {
+var encodeBridgeAndDepositExistingMA = function (receiver, socketMsgGasLimit, socketConnector, socketBridgeOptions, socketFees, accountId, peripheryTokenAddress, peripheryTokenAmount, moneyInOutTokenAmount) {
     var PERIPHERY_INTERFACE = new ethers_1.Interface(Periphery_json_1.abi);
     var inputs = {
         accountId: accountId,
         token: peripheryTokenAddress,
-        tokenAmount: peripheryTokenAmount,
-    };
-    var fallbackData = {
-        socketMsgGasLimit: fallbackSocketMsgGasLimit,
-        socketConnector: fallbackSocketConnector,
-        socketPayloadSize: fallbackSocketPayloadSize,
     };
-    var peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData('depositExistingMA((uint128,address,uint256),(uint256,uint256,address))', [inputs, fallbackData]);
+    var peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData('depositExistingMA((uint128,address))', [inputs]);
     var functionSignature = 'bridge';
     var parameters = [
         receiver,

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 coreAbi } 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  );\n\n  const value = BigInt(0);\n  const functionSignature = 'executeBySig';\n  const parameters = [\n    fromMarginAccountId,\n    multiAction.commands,\n    eip712Signature,\n    ethers.AbiCoder.defaultAbiCoder().encode([], []),\n  ];\n\n  const INTERFACE = new Interface(coreAbi);\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  socketPayloadSize: bigint,\n  socketConnector: string,\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      socketPayloadSize,\n      socketConnector,\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  fallbackSocketMsgGasLimit: bigint,\n  fallbackSocketConnector: string,\n  fallbackSocketPayloadSize: bigint,\n): MethodParameters => {\n  const PERIPHERY_INTERFACE = new Interface(peripheryAbi);\n  const inputs = {\n    accountOwner,\n    token: peripheryTokenAddress,\n    tokenAmount: peripheryTokenAmount,\n  };\n  const fallbackData = {\n    socketMsgGasLimit: fallbackSocketMsgGasLimit,\n    socketConnector: fallbackSocketConnector,\n    socketPayloadSize: fallbackSocketPayloadSize,\n  };\n  const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(\n    'depositNewMA((address,address,uint256),(uint256,uint256,address))',\n    [inputs, fallbackData],\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  fallbackSocketMsgGasLimit: bigint,\n  fallbackSocketConnector: string,\n  fallbackSocketPayloadSize: bigint,\n): MethodParameters => {\n  const PERIPHERY_INTERFACE = new Interface(peripheryAbi);\n  const inputs = {\n    accountId,\n    token: peripheryTokenAddress,\n    tokenAmount: peripheryTokenAmount,\n  };\n  const fallbackData = {\n    socketMsgGasLimit: fallbackSocketMsgGasLimit,\n    socketConnector: fallbackSocketConnector,\n    socketPayloadSize: fallbackSocketPayloadSize,\n  };\n  const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(\n    'depositExistingMA((uint128,address,uint256),(uint256,uint256,address))',\n    [inputs, fallbackData],\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":"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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 coreAbi } 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  );\n\n  const value = BigInt(0);\n  const functionSignature = 'executeBySig';\n  const parameters = [\n    fromMarginAccountId,\n    multiAction.commands,\n    eip712Signature,\n    ethers.AbiCoder.defaultAbiCoder().encode([], []),\n  ];\n\n  const INTERFACE = new Interface(coreAbi);\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/withdrawMAAndBridge.js

@@ -48,7 +48,7 @@ var action_1 = require("../../utils/action");
 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;
     return __awaiter(void 0, void 0, void 0, function () {
-        var network, reyaChainId, corePeripheryTokenInfo, bridgeTokenInfo, multiAction, eip712Signature, socketConnectors, _c, data, value, result;
+        var network, reyaChainId, corePeripheryTokenInfo, multiAction, eip712Signature, _c, data, value, result;
         var _d;
         return __generator(this, function (_e) {
             switch (_e.label) {
@@ -57,19 +57,12 @@ var withdrawMAAndBridge = function (_a) {
                     network = _e.sent();
                     reyaChainId = Number(network === null || network === void 0 ? void 0 : network.chainId);
                     corePeripheryTokenInfo = (0, common_1.getTokenInfoByAddress)(tokenAddress);
-                    bridgeTokenInfo = corePeripheryTokenInfo.name === 'RUSD'
-                        ? (0, common_1.getRUSDUnderlyingTokenInfo)(reyaChainId)
-                        : corePeripheryTokenInfo;
                     multiAction = new action_1.MultiAction();
                     (0, encode_2.encodeSingleWithdraw)(corePeripheryTokenInfo.address, (0, common_1.scale)(corePeripheryTokenInfo.decimals)(unscaledAmount), multiAction);
                     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)];
                 case 2:
                     eip712Signature = _e.sent();
-                    socketConnectors = (0, common_1.getSocketConnectors)({
-                        moneyInOutChainId: moneyInOutChainId,
-                        tokenName: bridgeTokenInfo.name,
-                    });
-                    _c = (0, encode_1.encodeWithdrawMAAndBridge)(marginAccountId, corePeripheryTokenInfo.address, (0, common_1.scale)(corePeripheryTokenInfo.decimals)(unscaledAmount), eip712Signature, BigInt('10000000'), BigInt(0), socketConnectors.withdraw, 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'), moneyInOutChainId, receiverAddress), data = _c.calldata, value = _c.value;
                     return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(signer, data, value, reyaChainId, contractAddresses_1.ContractType.PERIPHERY_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,sBAAsB,GAAG,IAAA,8BAAqB,EAAC,YAAY,CAAC,CAAC;oBAC7D,eAAe,GACnB,sBAAsB,CAAC,IAAI,KAAK,MAAM;wBACpC,CAAC,CAAC,IAAA,mCAA0B,EAAC,WAAW,CAAC;wBACzC,CAAC,CAAC,sBAAsB,CAAC;oBAEvB,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,MAAM,CAAC,CAAC,CAAC,EACT,gBAAgB,CAAC,QAAQ,EACzB,eAAe,CAChB,EATiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAS3B;oBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,EACN,IAAI,EACJ,KAAK,EACL,WAAW,EACX,gCAAY,CAAC,eAAe,CAC7B,EAAA;;oBANK,MAAM,GAAG,SAMd;oBAED,sBAAO;4BACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;yBACtC,EAAC;;;;CACH,CAAC;AA7DW,QAAA,mBAAmB,uBA6D9B","sourcesContent":["import {\n  getCurrentTimestampInSeconds,\n  getSocketConnectors,\n  scale,\n  ReyaChainId,\n  getTokenInfoByAddress,\n  getRUSDUnderlyingTokenInfo,\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 corePeripheryTokenInfo = getTokenInfoByAddress(tokenAddress);\n  const bridgeTokenInfo =\n    corePeripheryTokenInfo.name === 'RUSD'\n      ? getRUSDUnderlyingTokenInfo(reyaChainId)\n      : corePeripheryTokenInfo;\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    BigInt(0),\n    socketConnectors.withdraw,\n    receiverAddress,\n  );\n\n  const result = await executeTransaction(\n    signer,\n    data,\n    value,\n    reyaChainId,\n    ContractType.PERIPHERY_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,0CAKyB;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,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;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,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,iBAAiB,EACjB,eAAe,CAChB,EARiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAQ3B;oBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,EACN,IAAI,EACJ,KAAK,EACL,WAAW,EACX,gCAAY,CAAC,eAAe,CAC7B,EAAA;;oBANK,MAAM,GAAG,SAMd;oBAED,sBAAO;4BACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;yBACtC,EAAC;;;;CACH,CAAC;AAnDW,QAAA,mBAAmB,uBAmD9B","sourcesContent":["import {\n  getCurrentTimestampInSeconds,\n  scale,\n  ReyaChainId,\n  getTokenInfoByAddress,\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 corePeripheryTokenInfo = getTokenInfoByAddress(tokenAddress);\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 { calldata: data, value } = encodeWithdrawMAAndBridge(\n    marginAccountId,\n    corePeripheryTokenInfo.address,\n    scale(corePeripheryTokenInfo.decimals)(unscaledAmount),\n    eip712Signature,\n    BigInt('10000000'),\n    moneyInOutChainId,\n    receiverAddress,\n  );\n\n  const result = await executeTransaction(\n    signer,\n    data,\n    value,\n    reyaChainId,\n    ContractType.PERIPHERY_PROXY,\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}

package/dist/services/sign.js

@@ -86,7 +86,7 @@ function signCoreCommands(signer, reyaChainId, caller, accountId, commands, nonc
     });
 }
 exports.signCoreCommands = signCoreCommands;
-function signPoolRemoveLiquidity(signer, reyaChainId, caller, owner, poolId, sharesAmount, minOut, nonce, deadline) {
+function signPoolRemoveLiquidity(signer, reyaChainId, caller, owner, poolId, sharesAmount, minOut, nonce, deadline, socketMsgGasLimit, chainId, receiver) {
     return __awaiter(this, void 0, void 0, function () {
         var signature;
         return __generator(this, function (_a) {
@@ -101,6 +101,7 @@ function signPoolRemoveLiquidity(signer, reyaChainId, caller, owner, poolId, sha
                             { name: 'minOut', type: 'uint256' },
                             { name: 'nonce', type: 'uint256' },
                             { name: 'deadline', type: 'uint256' },
+                            { name: 'extraSignatureData', type: 'bytes' },
                         ],
                     }, {
                         verifyingChainId: reyaChainId,
@@ -111,6 +112,7 @@ function signPoolRemoveLiquidity(signer, reyaChainId, caller, owner, poolId, sha
                         minOut: minOut,
                         nonce: nonce,
                         deadline: deadline,
+                        extraSignatureData: ethers_2.ethers.AbiCoder.defaultAbiCoder().encode(['address', 'uint256', 'uint256'], [receiver, chainId, socketMsgGasLimit]),
                     })];
                 case 1:
                     signature = _a.sent();

package/dist/services/sign.js.map

@@ -1 +1 @@
-{"version":3,"file":"sign.js","sourceRoot":"/","sources":["services/sign.ts"],"names":[],"mappings":"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","sourcesContent":["import { JsonRpcSigner, Signature, Signer, TypedDataField } from 'ethers';\nimport { ContractType, getAddress } from '../utils/contractAddresses';\nimport { Address, ReyaChainId } from '@reyaxyz/common';\nimport { Command } from '../utils/action';\nimport { ethers } from 'ethers';\n\nexport type EIP712Signature = {\n  v: number;\n  r: string;\n  s: string;\n  deadline: number;\n};\n\nfunction convertEthersSignatureToEIP712Signature(\n  signature: Signature,\n  deadline: number,\n): EIP712Signature {\n  return {\n    v: signature.v,\n    r: signature.r,\n    s: signature.s,\n    deadline: deadline,\n  };\n}\n\nexport async function signCoreCommands(\n  signer: Signer | JsonRpcSigner,\n  reyaChainId: ReyaChainId,\n  caller: Address,\n  accountId: number,\n  commands: Command[],\n  nonce: number,\n  deadline: number,\n): Promise<EIP712Signature> {\n  const signature = await signReyaTypedData(\n    signer,\n    getAddress(reyaChainId, ContractType.CORE_PROXY),\n    {\n      ExecuteBySig: [\n        { name: 'verifyingChainId', type: 'uint256' },\n        { name: 'caller', type: 'address' },\n        { name: 'accountId', type: 'uint128' },\n        { name: 'commands', type: 'Command[]' },\n        { name: 'nonce', type: 'uint256' },\n        { name: 'deadline', type: 'uint256' },\n        { name: 'extraSignatureData', type: 'bytes' },\n      ],\n      Command: [\n        { name: 'commandType', type: 'uint8' },\n        { name: 'inputs', type: 'bytes' },\n        { name: 'marketId', type: 'uint128' },\n        { name: 'exchangeId', type: 'uint128' },\n      ],\n    },\n    {\n      verifyingChainId: reyaChainId,\n      caller: caller,\n      accountId: accountId,\n      commands: commands,\n      nonce: nonce,\n      deadline: deadline,\n      extraSignatureData: ethers.AbiCoder.defaultAbiCoder().encode([], []),\n    },\n  );\n\n  return convertEthersSignatureToEIP712Signature(signature, deadline);\n}\n\nexport async function signPoolRemoveLiquidity(\n  signer: Signer | JsonRpcSigner,\n  reyaChainId: ReyaChainId,\n  caller: Address,\n  owner: Address,\n  poolId: number,\n  sharesAmount: bigint,\n  minOut: bigint,\n  nonce: number,\n  deadline: number,\n): Promise<EIP712Signature> {\n  // @todo extend\n  const signature = await signReyaTypedData(\n    signer,\n    getAddress(reyaChainId, ContractType.PASSIVE_POOL_PROXY),\n    {\n      RemoveLiquidityBySig: [\n        { name: 'verifyingChainId', type: 'uint256' },\n        { name: 'caller', type: 'address' },\n        { name: 'owner', type: 'address' },\n        { name: 'poolId', type: 'uint128' },\n        { name: 'sharesAmount', type: 'uint256' },\n        { name: 'minOut', type: 'uint256' },\n        { name: 'nonce', type: 'uint256' },\n        { name: 'deadline', type: 'uint256' },\n      ],\n    },\n    {\n      verifyingChainId: reyaChainId,\n      caller: caller,\n      owner: owner,\n      poolId: poolId,\n      sharesAmount: sharesAmount,\n      minOut: minOut,\n      nonce: nonce,\n      deadline: deadline,\n    },\n  );\n\n  return convertEthersSignatureToEIP712Signature(signature, deadline);\n}\n\nasync function signReyaTypedData(\n  signer: Signer | JsonRpcSigner,\n  verifyingContract: string,\n  types: Record<string, Array<TypedDataField>>,\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  value: Record<string, any>,\n): Promise<Signature> {\n  const domain = {\n    name: 'Reya',\n    version: '1',\n    verifyingContract: verifyingContract,\n  };\n\n  const signatureString = await signer.signTypedData(domain, types, value);\n\n  return Signature.from(signatureString);\n}\n"]}
+{"version":3,"file":"sign.js","sourceRoot":"/","sources":["services/sign.ts"],"names":[],"mappings":"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","sourcesContent":["import { JsonRpcSigner, Signature, Signer, TypedDataField } from 'ethers';\nimport { ContractType, getAddress } from '../utils/contractAddresses';\nimport { Address, ReyaChainId } from '@reyaxyz/common';\nimport { Command } from '../utils/action';\nimport { ethers } from 'ethers';\n\nexport type EIP712Signature = {\n  v: number;\n  r: string;\n  s: string;\n  deadline: number;\n};\n\nfunction convertEthersSignatureToEIP712Signature(\n  signature: Signature,\n  deadline: number,\n): EIP712Signature {\n  return {\n    v: signature.v,\n    r: signature.r,\n    s: signature.s,\n    deadline: deadline,\n  };\n}\n\nexport async function signCoreCommands(\n  signer: Signer | JsonRpcSigner,\n  reyaChainId: ReyaChainId,\n  caller: Address,\n  accountId: number,\n  commands: Command[],\n  nonce: number,\n  deadline: number,\n): Promise<EIP712Signature> {\n  const signature = await signReyaTypedData(\n    signer,\n    getAddress(reyaChainId, ContractType.CORE_PROXY),\n    {\n      ExecuteBySig: [\n        { name: 'verifyingChainId', type: 'uint256' },\n        { name: 'caller', type: 'address' },\n        { name: 'accountId', type: 'uint128' },\n        { name: 'commands', type: 'Command[]' },\n        { name: 'nonce', type: 'uint256' },\n        { name: 'deadline', type: 'uint256' },\n        { name: 'extraSignatureData', type: 'bytes' },\n      ],\n      Command: [\n        { name: 'commandType', type: 'uint8' },\n        { name: 'inputs', type: 'bytes' },\n        { name: 'marketId', type: 'uint128' },\n        { name: 'exchangeId', type: 'uint128' },\n      ],\n    },\n    {\n      verifyingChainId: reyaChainId,\n      caller: caller,\n      accountId: accountId,\n      commands: commands,\n      nonce: nonce,\n      deadline: deadline,\n      extraSignatureData: ethers.AbiCoder.defaultAbiCoder().encode([], []),\n    },\n  );\n\n  return convertEthersSignatureToEIP712Signature(signature, deadline);\n}\n\nexport async function signPoolRemoveLiquidity(\n  signer: Signer | JsonRpcSigner,\n  reyaChainId: ReyaChainId,\n  caller: Address,\n  owner: Address,\n  poolId: number,\n  sharesAmount: bigint,\n  minOut: bigint,\n  nonce: number,\n  deadline: number,\n  socketMsgGasLimit: bigint,\n  chainId: number,\n  receiver: string,\n): Promise<EIP712Signature> {\n  const signature = await signReyaTypedData(\n    signer,\n    getAddress(reyaChainId, ContractType.PASSIVE_POOL_PROXY),\n    {\n      RemoveLiquidityBySig: [\n        { name: 'verifyingChainId', type: 'uint256' },\n        { name: 'caller', type: 'address' },\n        { name: 'owner', type: 'address' },\n        { name: 'poolId', type: 'uint128' },\n        { name: 'sharesAmount', type: 'uint256' },\n        { name: 'minOut', type: 'uint256' },\n        { name: 'nonce', type: 'uint256' },\n        { name: 'deadline', type: 'uint256' },\n        { name: 'extraSignatureData', type: 'bytes' },\n      ],\n    },\n    {\n      verifyingChainId: reyaChainId,\n      caller: caller,\n      owner: owner,\n      poolId: poolId,\n      sharesAmount: sharesAmount,\n      minOut: minOut,\n      nonce: nonce,\n      deadline: deadline,\n      extraSignatureData: ethers.AbiCoder.defaultAbiCoder().encode(\n        ['address', 'uint256', 'uint256'],\n        [receiver, chainId, socketMsgGasLimit],\n      ),\n    },\n  );\n\n  return convertEthersSignatureToEIP712Signature(signature, deadline);\n}\n\nasync function signReyaTypedData(\n  signer: Signer | JsonRpcSigner,\n  verifyingContract: string,\n  types: Record<string, Array<TypedDataField>>,\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  value: Record<string, any>,\n): Promise<Signature> {\n  const domain = {\n    name: 'Reya',\n    version: '1',\n    verifyingContract: verifyingContract,\n  };\n\n  const signatureString = await signer.signTypedData(domain, types, value);\n\n  return Signature.from(signatureString);\n}\n"]}

package/dist/types/services/lp/bridgeAndDepositPassivePool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bridgeAndDepositPassivePool.d.ts","sourceRoot":"/","sources":["services/lp/bridgeAndDepositPassivePool.ts"],"names":[],"mappings":"AAaA,OAAO,EACL,iCAAiC,EACjC,iCAAiC,EACjC,gDAAgD,EAChD,gDAAgD,EACjD,MAAM,SAAS,CAAC;AAEjB,eAAO,MAAM,2BAA2B,WAC9B,iCAAiC,KACxC,QAAQ,iCAAiC,CAiD3C,CAAC;AAEF,eAAO,MAAM,0CAA0C,WAC7C,gDAAgD,KACvD,QAAQ,gDAAgD,CAQ1D,CAAC"}
+{"version":3,"file":"bridgeAndDepositPassivePool.d.ts","sourceRoot":"/","sources":["services/lp/bridgeAndDepositPassivePool.ts"],"names":[],"mappings":"AAaA,OAAO,EACL,iCAAiC,EACjC,iCAAiC,EACjC,gDAAgD,EAChD,gDAAgD,EACjD,MAAM,SAAS,CAAC;AAEjB,eAAO,MAAM,2BAA2B,WAC9B,iCAAiC,KACxC,QAAQ,iCAAiC,CA8C3C,CAAC;AAEF,eAAO,MAAM,0CAA0C,WAC7C,gDAAgD,KACvD,QAAQ,gDAAgD,CAQ1D,CAAC"}

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

@@ -3,6 +3,6 @@ import { EIP712Signature } from '../sign';
 export declare const encodeProvideLiquidityCall: (poolId: number, accountOwner: string, amount: bigint, minShares: number) => MethodParameters;
 export declare const encodeRemoveLiquidityCall: (poolId: number, sharesAmount: bigint, minOut: number) => MethodParameters;
 export declare const encodeTransferFromMAToPool: (accountId: number, amount: bigint, sig: EIP712Signature, poolId: number, minShares: bigint, receiver: string) => MethodParameters;
-export declare const encodeWithdrawPassivePoolAndBridge: (owner: string, poolId: number, sharesAmount: bigint, minOut: bigint, sig: EIP712Signature, socketMsgGasLimit: bigint, socketPayloadSize: bigint, socketConnector: string, receiver: string) => MethodParameters;
-export declare const encodeBridgeAndDepositPassivePool: (receiver: string, socketMsgGasLimit: bigint, socketConnector: string, socketBridgeOptions: string, socketFees: bigint, poolId: number, owner: string, amount: bigint, minShares: bigint, fallbackSocketMsgGasLimit: bigint, fallbackSocketConnector: string, fallbackSocketPayloadSize: bigint) => MethodParameters;
+export declare const encodeWithdrawPassivePoolAndBridge: (owner: string, poolId: number, sharesAmount: bigint, minOut: bigint, sig: EIP712Signature, socketMsgGasLimit: bigint, chainId: number, receiver: string) => MethodParameters;
+export declare const encodeBridgeAndDepositPassivePool: (receiver: string, socketMsgGasLimit: bigint, socketConnector: string, socketBridgeOptions: string, socketFees: bigint, poolId: number, owner: string, amount: bigint, minShares: bigint) => MethodParameters;
 //# sourceMappingURL=encode.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"encode.d.ts","sourceRoot":"/","sources":["services/lp/encode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAa1C,eAAO,MAAM,0BAA0B,WAC7B,MAAM,gBACA,MAAM,UACZ,MAAM,aACH,MAAM,KAChB,gBAMF,CAAC;AAEF,eAAO,MAAM,yBAAyB,WAC5B,MAAM,gBACA,MAAM,UACZ,MAAM,KACb,gBAMF,CAAC;AAEF,eAAO,MAAM,0BAA0B,cAC1B,MAAM,UACT,MAAM,OACT,eAAe,UACZ,MAAM,aACH,MAAM,YACP,MAAM,KACf,gBAMF,CAAC;AAEF,eAAO,MAAM,kCAAkC,UACtC,MAAM,UACL,MAAM,gBACA,MAAM,UACZ,MAAM,OACT,eAAe,qBACD,MAAM,qBACN,MAAM,mBACR,MAAM,YACb,MAAM,KACf,gBAkBF,CAAC;AAEF,eAAO,MAAM,iCAAiC,aAClC,MAAM,qBACG,MAAM,mBACR,MAAM,uBACF,MAAM,cACf,MAAM,UACV,MAAM,SACP,MAAM,UACL,MAAM,aACH,MAAM,6BACU,MAAM,2BACR,MAAM,6BACJ,MAAM,KAChC,gBAyBF,CAAC"}
+{"version":3,"file":"encode.d.ts","sourceRoot":"/","sources":["services/lp/encode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAa1C,eAAO,MAAM,0BAA0B,WAC7B,MAAM,gBACA,MAAM,UACZ,MAAM,aACH,MAAM,KAChB,gBAMF,CAAC;AAEF,eAAO,MAAM,yBAAyB,WAC5B,MAAM,gBACA,MAAM,UACZ,MAAM,KACb,gBAMF,CAAC;AAEF,eAAO,MAAM,0BAA0B,cAC1B,MAAM,UACT,MAAM,OACT,eAAe,UACZ,MAAM,aACH,MAAM,YACP,MAAM,KACf,gBAMF,CAAC;AAEF,eAAO,MAAM,kCAAkC,UACtC,MAAM,UACL,MAAM,gBACA,MAAM,UACZ,MAAM,OACT,eAAe,qBACD,MAAM,WAChB,MAAM,YACL,MAAM,KACf,gBAiBF,CAAC;AAEF,eAAO,MAAM,iCAAiC,aAClC,MAAM,qBACG,MAAM,mBACR,MAAM,uBACF,MAAM,cACf,MAAM,UACV,MAAM,SACP,MAAM,UACL,MAAM,aACH,MAAM,KAChB,gBAoBF,CAAC"}

package/dist/types/services/lp/withdrawPassivePoolAndBridge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withdrawPassivePoolAndBridge.d.ts","sourceRoot":"/","sources":["services/lp/withdrawPassivePoolAndBridge.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,kCAAkC,EAClC,kCAAkC,EACnC,MAAM,SAAS,CAAC;AAWjB,eAAO,MAAM,4BAA4B,WAC/B,kCAAkC,KACzC,QAAQ,kCAAkC,CAiD5C,CAAC"}
+{"version":3,"file":"withdrawPassivePoolAndBridge.d.ts","sourceRoot":"/","sources":["services/lp/withdrawPassivePoolAndBridge.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,kCAAkC,EAClC,kCAAkC,EACnC,MAAM,SAAS,CAAC;AASjB,eAAO,MAAM,4BAA4B,WAC/B,kCAAkC,KACzC,QAAQ,kCAAkC,CAgD5C,CAAC"}

package/dist/types/services/margin-accounts/bridgeAndDepositExistingMA.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bridgeAndDepositExistingMA.d.ts","sourceRoot":"/","sources":["services/margin-accounts/bridgeAndDepositExistingMA.ts"],"names":[],"mappings":"AAaA,OAAO,EACL,gCAAgC,EAChC,gCAAgC,EACjC,MAAM,SAAS,CAAC;AAIjB,eAAO,MAAM,0BAA0B,WAC7B,gCAAgC,KACvC,QAAQ,gCAAgC,CAiE1C,CAAC"}
+{"version":3,"file":"bridgeAndDepositExistingMA.d.ts","sourceRoot":"/","sources":["services/margin-accounts/bridgeAndDepositExistingMA.ts"],"names":[],"mappings":"AAaA,OAAO,EACL,gCAAgC,EAChC,gCAAgC,EACjC,MAAM,SAAS,CAAC;AAIjB,eAAO,MAAM,0BAA0B,WAC7B,gCAAgC,KACvC,QAAQ,gCAAgC,CA8D1C,CAAC"}

package/dist/types/services/margin-accounts/bridgeAndDepositNewMA.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bridgeAndDepositNewMA.d.ts","sourceRoot":"/","sources":["services/margin-accounts/bridgeAndDepositNewMA.ts"],"names":[],"mappings":"AAaA,OAAO,EACL,2BAA2B,EAC3B,2BAA2B,EAC5B,MAAM,SAAS,CAAC;AAEjB,eAAO,MAAM,qBAAqB,WACxB,2BAA2B,KAClC,QAAQ,2BAA2B,CAkDrC,CAAC"}
+{"version":3,"file":"bridgeAndDepositNewMA.d.ts","sourceRoot":"/","sources":["services/margin-accounts/bridgeAndDepositNewMA.ts"],"names":[],"mappings":"AAaA,OAAO,EACL,2BAA2B,EAC3B,2BAA2B,EAC5B,MAAM,SAAS,CAAC;AAEjB,eAAO,MAAM,qBAAqB,WACxB,2BAA2B,KAClC,QAAQ,2BAA2B,CA+CrC,CAAC"}

package/dist/types/services/margin-accounts/encode.d.ts

@@ -5,7 +5,7 @@ export declare const encodeCreateAccountCall: (accountOwner: string) => MethodPa
 export declare const encodeDeposit: (accountId: number, token: string, amount: bigint) => MethodParameters;
 export declare const encodeWithdraw: (accountId: number, token: string, amount: bigint) => MethodParameters;
 export declare const encodeTransferMargin: (signer: Signer, chainId: number, coreSigNonce: number, fromMarginAccountId: number, toMarginAccountId: number, token: string, amount: bigint) => Promise<MethodParameters>;
-export declare const encodeWithdrawMAAndBridge: (accountId: number, corePeripheryTokenAddress: string, corePeripheryTokenAmount: bigint, sig: EIP712Signature, socketMsgGasLimit: bigint, socketPayloadSize: bigint, socketConnector: string, receiver: string) => MethodParameters;
-export declare const encodeBridgeAndDepositNewMA: (receiver: string, socketMsgGasLimit: bigint, socketConnector: string, socketBridgeOptions: string, socketFees: bigint, accountOwner: string, peripheryTokenAddress: string, peripheryTokenAmount: bigint, moneyInOutTokenAmount: bigint, fallbackSocketMsgGasLimit: bigint, fallbackSocketConnector: string, fallbackSocketPayloadSize: bigint) => MethodParameters;
-export declare const encodeBridgeAndDepositExistingMA: (receiver: string, socketMsgGasLimit: bigint, socketConnector: string, socketBridgeOptions: string, socketFees: bigint, accountId: number, peripheryTokenAddress: string, peripheryTokenAmount: bigint, moneyInOutTokenAmount: bigint, fallbackSocketMsgGasLimit: bigint, fallbackSocketConnector: string, fallbackSocketPayloadSize: bigint) => MethodParameters;
+export declare const encodeWithdrawMAAndBridge: (accountId: number, corePeripheryTokenAddress: string, corePeripheryTokenAmount: bigint, sig: EIP712Signature, socketMsgGasLimit: bigint, chainId: number, receiver: string) => MethodParameters;
+export declare const encodeBridgeAndDepositNewMA: (receiver: string, socketMsgGasLimit: bigint, socketConnector: string, socketBridgeOptions: string, socketFees: bigint, accountOwner: string, peripheryTokenAddress: string, peripheryTokenAmount: bigint, moneyInOutTokenAmount: bigint) => MethodParameters;
+export declare const encodeBridgeAndDepositExistingMA: (receiver: string, socketMsgGasLimit: bigint, socketConnector: string, socketBridgeOptions: string, socketFees: bigint, accountId: number, peripheryTokenAddress: string, peripheryTokenAmount: bigint, moneyInOutTokenAmount: bigint) => MethodParameters;
 //# sourceMappingURL=encode.d.ts.map

package/dist/types/services/margin-accounts/encode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"encode.d.ts","sourceRoot":"/","sources":["services/margin-accounts/encode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAe,MAAM,oBAAoB,CAAC;AAanE,OAAO,EAAE,eAAe,EAAoB,MAAM,SAAS,CAAC;AAG5D,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAIhC,eAAO,MAAM,uBAAuB,iBACpB,MAAM,KACnB,gBAMF,CAAC;AAEF,eAAO,MAAM,aAAa,cACb,MAAM,SACV,MAAM,UACL,MAAM,KACb,gBAWF,CAAC;AAEF,eAAO,MAAM,cAAc,cACd,MAAM,SACV,MAAM,UACL,MAAM,KACb,gBAWF,CAAC;AAEF,eAAO,MAAM,oBAAoB,WACvB,MAAM,WACL,MAAM,gBACD,MAAM,uBACC,MAAM,qBACR,MAAM,SAClB,MAAM,UACL,MAAM,KACb,QAAQ,gBAAgB,CA8B1B,CAAC;AAEF,eAAO,MAAM,yBAAyB,cACzB,MAAM,6BACU,MAAM,4BACP,MAAM,OAC3B,eAAe,qBACD,MAAM,qBACN,MAAM,mBACR,MAAM,YACb,MAAM,KACf,gBAiBF,CAAC;AAEF,eAAO,MAAM,2BAA2B,aAC5B,MAAM,qBACG,MAAM,mBACR,MAAM,uBACF,MAAM,cACf,MAAM,gBACJ,MAAM,yBACG,MAAM,wBACP,MAAM,yBACL,MAAM,6BACF,MAAM,2BACR,MAAM,6BACJ,MAAM,KAChC,gBA6BF,CAAC;AAEF,eAAO,MAAM,gCAAgC,aACjC,MAAM,qBACG,MAAM,mBACR,MAAM,uBACF,MAAM,cACf,MAAM,aACP,MAAM,yBACM,MAAM,wBACP,MAAM,yBACL,MAAM,6BACF,MAAM,2BACR,MAAM,6BACJ,MAAM,KAChC,gBA6BF,CAAC"}
+{"version":3,"file":"encode.d.ts","sourceRoot":"/","sources":["services/margin-accounts/encode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAe,MAAM,oBAAoB,CAAC;AAanE,OAAO,EAAE,eAAe,EAAoB,MAAM,SAAS,CAAC;AAG5D,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAIhC,eAAO,MAAM,uBAAuB,iBACpB,MAAM,KACnB,gBAMF,CAAC;AAEF,eAAO,MAAM,aAAa,cACb,MAAM,SACV,MAAM,UACL,MAAM,KACb,gBAWF,CAAC;AAEF,eAAO,MAAM,cAAc,cACd,MAAM,SACV,MAAM,UACL,MAAM,KACb,gBAWF,CAAC;AAEF,eAAO,MAAM,oBAAoB,WACvB,MAAM,WACL,MAAM,gBACD,MAAM,uBACC,MAAM,qBACR,MAAM,SAClB,MAAM,UACL,MAAM,KACb,QAAQ,gBAAgB,CA8B1B,CAAC;AAEF,eAAO,MAAM,yBAAyB,cACzB,MAAM,6BACU,MAAM,4BACP,MAAM,OAC3B,eAAe,qBACD,MAAM,WAChB,MAAM,YACL,MAAM,KACf,gBAgBF,CAAC;AAEF,eAAO,MAAM,2BAA2B,aAC5B,MAAM,qBACG,MAAM,mBACR,MAAM,uBACF,MAAM,cACf,MAAM,gBACJ,MAAM,yBACG,MAAM,wBACP,MAAM,yBACL,MAAM,KAC5B,gBAuBF,CAAC;AAEF,eAAO,MAAM,gCAAgC,aACjC,MAAM,qBACG,MAAM,mBACR,MAAM,uBACF,MAAM,cACf,MAAM,aACP,MAAM,yBACM,MAAM,wBACP,MAAM,yBACL,MAAM,KAC5B,gBAuBF,CAAC"}

package/dist/types/services/margin-accounts/withdrawMAAndBridge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withdrawMAAndBridge.d.ts","sourceRoot":"/","sources":["services/margin-accounts/withdrawMAAndBridge.ts"],"names":[],"mappings":"AAYA,OAAO,EACL,yBAAyB,EACzB,+BAA+B,EAChC,MAAM,SAAS,CAAC;AAKjB,eAAO,MAAM,mBAAmB,kHAQ7B,yBAAyB,KAAG,QAAQ,+BAA+B,CAqDrE,CAAC"}
+{"version":3,"file":"withdrawMAAndBridge.d.ts","sourceRoot":"/","sources":["services/margin-accounts/withdrawMAAndBridge.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,yBAAyB,EACzB,+BAA+B,EAChC,MAAM,SAAS,CAAC;AAKjB,eAAO,MAAM,mBAAmB,kHAQ7B,yBAAyB,KAAG,QAAQ,+BAA+B,CA2CrE,CAAC"}

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

@@ -8,5 +8,5 @@ export type EIP712Signature = {
     deadline: number;
 };
 export declare function signCoreCommands(signer: Signer | JsonRpcSigner, reyaChainId: ReyaChainId, caller: Address, accountId: number, commands: Command[], nonce: number, deadline: number): Promise<EIP712Signature>;
-export declare function signPoolRemoveLiquidity(signer: Signer | JsonRpcSigner, reyaChainId: ReyaChainId, caller: Address, owner: Address, poolId: number, sharesAmount: bigint, minOut: bigint, nonce: number, deadline: number): Promise<EIP712Signature>;
+export declare function signPoolRemoveLiquidity(signer: Signer | JsonRpcSigner, reyaChainId: ReyaChainId, caller: Address, owner: Address, poolId: number, sharesAmount: bigint, minOut: bigint, nonce: number, deadline: number, socketMsgGasLimit: bigint, chainId: number, receiver: string): Promise<EIP712Signature>;
 //# sourceMappingURL=sign.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"sign.d.ts","sourceRoot":"/","sources":["services/sign.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAa,MAAM,EAAkB,MAAM,QAAQ,CAAC;AAE1E,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAG1C,MAAM,MAAM,eAAe,GAAG;IAC5B,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAcF,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,GAAG,aAAa,EAC9B,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,OAAO,EAAE,EACnB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,eAAe,CAAC,CAiC1B;AAED,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,MAAM,GAAG,aAAa,EAC9B,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,OAAO,EACf,KAAK,EAAE,OAAO,EACd,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,eAAe,CAAC,CA8B1B"}
+{"version":3,"file":"sign.d.ts","sourceRoot":"/","sources":["services/sign.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAa,MAAM,EAAkB,MAAM,QAAQ,CAAC;AAE1E,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAG1C,MAAM,MAAM,eAAe,GAAG;IAC5B,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAcF,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,GAAG,aAAa,EAC9B,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,OAAO,EAAE,EACnB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,eAAe,CAAC,CAiC1B;AAED,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,MAAM,GAAG,aAAa,EAC9B,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,OAAO,EACf,KAAK,EAAE,OAAO,EACd,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,iBAAiB,EAAE,MAAM,EACzB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,eAAe,CAAC,CAkC1B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reyaxyz/sdk",
-  "version": "0.64.1",
+  "version": "0.65.0",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
@@ -34,5 +34,5 @@
     "ethers": "6.9.0"
   },
   "packageManager": "pnpm@8.10.4",
-  "gitHead": "f41818ecc58254b718dfe6201073b9d82a2df519"
+  "gitHead": "eec53967704ca5564733a435e3cfb1150d03588f"
 }