@reyaxyz/sdk 0.21.2 → 0.23.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (42) hide show
  1. package/dist/services/lp/bridgeAndDepositPassivePool.js +2 -0
  2. package/dist/services/lp/bridgeAndDepositPassivePool.js.map +1 -1
  3. package/dist/services/lp/encode.js +6 -6
  4. package/dist/services/lp/encode.js.map +1 -1
  5. package/dist/services/lp/index.js +3 -0
  6. package/dist/services/lp/index.js.map +1 -1
  7. package/dist/services/lp/simulateBridgeAndDepositPassivePool.js +67 -0
  8. package/dist/services/lp/simulateBridgeAndDepositPassivePool.js.map +1 -0
  9. package/dist/services/lp/simulateWithdrawPassivePoolAndBridge.js +66 -0
  10. package/dist/services/lp/simulateWithdrawPassivePoolAndBridge.js.map +1 -0
  11. package/dist/services/lp/types.js.map +1 -1
  12. package/dist/services/margin-accounts/bridgeAndDepositExistingMA.js +2 -0
  13. package/dist/services/margin-accounts/bridgeAndDepositExistingMA.js.map +1 -1
  14. package/dist/services/margin-accounts/bridgeAndDepositNewMA.js +2 -0
  15. package/dist/services/margin-accounts/bridgeAndDepositNewMA.js.map +1 -1
  16. package/dist/services/margin-accounts/encode.js +8 -8
  17. package/dist/services/margin-accounts/encode.js.map +1 -1
  18. package/dist/types/services/lp/bridgeAndDepositPassivePool.d.ts.map +1 -1
  19. package/dist/types/services/lp/encode.d.ts +2 -2
  20. package/dist/types/services/lp/encode.d.ts.map +1 -1
  21. package/dist/types/services/lp/index.d.ts +3 -0
  22. package/dist/types/services/lp/index.d.ts.map +1 -1
  23. package/dist/types/services/lp/simulateBridgeAndDepositPassivePool.d.ts +3 -0
  24. package/dist/types/services/lp/simulateBridgeAndDepositPassivePool.d.ts.map +1 -0
  25. package/dist/types/services/lp/simulateWithdrawPassivePoolAndBridge.d.ts +3 -0
  26. package/dist/types/services/lp/simulateWithdrawPassivePoolAndBridge.d.ts.map +1 -0
  27. package/dist/types/services/lp/types.d.ts +19 -0
  28. package/dist/types/services/lp/types.d.ts.map +1 -1
  29. package/dist/types/services/margin-accounts/bridgeAndDepositExistingMA.d.ts.map +1 -1
  30. package/dist/types/services/margin-accounts/bridgeAndDepositNewMA.d.ts.map +1 -1
  31. package/dist/types/services/margin-accounts/encode.d.ts +2 -2
  32. package/dist/types/services/margin-accounts/encode.d.ts.map +1 -1
  33. package/package.json +3 -3
  34. package/src/services/lp/bridgeAndDepositPassivePool.ts +9 -1
  35. package/src/services/lp/encode.ts +8 -7
  36. package/src/services/lp/index.ts +3 -0
  37. package/src/services/lp/simulateBridgeAndDepositPassivePool.ts +32 -0
  38. package/src/services/lp/simulateWithdrawPassivePoolAndBridge.ts +31 -0
  39. package/src/services/lp/types.ts +29 -1
  40. package/src/services/margin-accounts/bridgeAndDepositExistingMA.ts +4 -0
  41. package/src/services/margin-accounts/bridgeAndDepositNewMA.ts +8 -1
  42. package/src/services/margin-accounts/encode.ts +12 -10
@@ -56,6 +56,8 @@ var bridgeAndDepositPassivePool = function (params) { return __awaiter(void 0, v
56
56
  _a = (0, encode_1.encodeBridgeAndDepositPassivePool)((0, contractAddresses_1.getAddress)(chainId, contractAddresses_1.ContractType.PERIPHERY_PROXY), BigInt('10000000'), (0, common_1.getSocketConnector)({
57
57
  chainId: chainId,
58
58
  tokenAddress: params.pool.tokenAddress.toLowerCase(),
59
+ }), (0, common_1.getSocketFees)({
60
+ moneyInOutChainId: chainId,
59
61
  }), params.pool.id, params.ownerAddress, amount, BigInt(0)), data = _a.calldata, value = _a.value;
60
62
  return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(params.signer, data, value, chainId, (0, common_1.getSocketVault)({
61
63
  moneyInOutChainId: chainId,
@@ -1 +1 @@
1
- {"version":3,"file":"bridgeAndDepositPassivePool.js","sourceRoot":"/","sources":["services/lp/bridgeAndDepositPassivePool.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAA8E;AAC9E,mEAAyE;AACzE,4DAA2D;AAC3D,0CAAyD;AACzD,mCAA6D;AAMtD,IAAM,2BAA2B,GAAG,UACzC,MAAyC;;;;;oBAEzB,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;gBAEjC,aAAa,GAAK,IAAA,wBAAe,EAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,cAA9C,CAA+C;gBAC9D,MAAM,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAE7C,KAA4B,IAAA,0CAAiC,EACjE,IAAA,8BAAU,EAAC,OAAO,EAAE,gCAAY,CAAC,eAAe,CAAC,EACjD,MAAM,CAAC,UAAU,CAAC,EAClB,IAAA,2BAAkB,EAAC;oBACjB,OAAO,EAAE,OAAO;oBAChB,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,EAAa;iBAChE,CAAC,EACF,MAAM,CAAC,IAAI,CAAC,EAAE,EACd,MAAM,CAAC,YAAY,EACnB,MAAM,EACN,MAAM,CAAC,CAAC,CAAC,CACV,EAXiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAW3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,IAAA,uBAAc,EAAC;wBACb,iBAAiB,EAAE,OAAO;wBAC1B,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,EAAa;qBAChE,CAAC,CACH,EAAA;;gBATK,MAAM,GAAG,SASd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AApCW,QAAA,2BAA2B,+BAoCtC","sourcesContent":["import { Address, getSocketConnector, getSocketVault } from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { getTokenDetails, scale } from '../token/common';\nimport { encodeBridgeAndDepositPassivePool } from './encode';\nimport {\n BridgeAndDepositPassivePoolParams,\n BridgeAndDepositPassivePoolResult,\n} from './types';\n\nexport const bridgeAndDepositPassivePool = async (\n params: BridgeAndDepositPassivePoolParams,\n): Promise<BridgeAndDepositPassivePoolResult> => {\n const network = await params.signer.provider?.getNetwork();\n const chainId = Number(network?.chainId);\n\n const { tokenDecimals } = getTokenDetails(params.pool.tokenAddress);\n const amount = scale(tokenDecimals)(params.amount);\n\n const { calldata: data, value } = encodeBridgeAndDepositPassivePool(\n getAddress(chainId, ContractType.PERIPHERY_PROXY),\n BigInt('10000000'),\n getSocketConnector({\n chainId: chainId,\n tokenAddress: params.pool.tokenAddress.toLowerCase() as Address,\n }),\n params.pool.id,\n params.ownerAddress,\n amount,\n BigInt(0),\n );\n\n const result = await executeTransaction(\n params.signer,\n data,\n value,\n chainId,\n getSocketVault({\n moneyInOutChainId: chainId,\n tokenAddress: params.pool.tokenAddress.toLowerCase() as Address,\n }),\n );\n\n return {\n transactionHash: result?.hash || null,\n };\n};\n"]}
1
+ {"version":3,"file":"bridgeAndDepositPassivePool.js","sourceRoot":"/","sources":["services/lp/bridgeAndDepositPassivePool.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAKyB;AACzB,mEAAyE;AACzE,4DAA2D;AAC3D,0CAAyD;AACzD,mCAA6D;AAMtD,IAAM,2BAA2B,GAAG,UACzC,MAAyC;;;;;oBAEzB,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;gBAEjC,aAAa,GAAK,IAAA,wBAAe,EAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,cAA9C,CAA+C;gBAC9D,MAAM,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAE7C,KAA4B,IAAA,0CAAiC,EACjE,IAAA,8BAAU,EAAC,OAAO,EAAE,gCAAY,CAAC,eAAe,CAAC,EACjD,MAAM,CAAC,UAAU,CAAC,EAClB,IAAA,2BAAkB,EAAC;oBACjB,OAAO,EAAE,OAAO;oBAChB,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,EAAa;iBAChE,CAAC,EACF,IAAA,sBAAa,EAAC;oBACZ,iBAAiB,EAAE,OAAO;iBAC3B,CAAC,EACF,MAAM,CAAC,IAAI,CAAC,EAAE,EACd,MAAM,CAAC,YAAY,EACnB,MAAM,EACN,MAAM,CAAC,CAAC,CAAC,CACV,EAdiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAc3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,IAAA,uBAAc,EAAC;wBACb,iBAAiB,EAAE,OAAO;wBAC1B,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,EAAa;qBAChE,CAAC,CACH,EAAA;;gBATK,MAAM,GAAG,SASd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AAvCW,QAAA,2BAA2B,+BAuCtC","sourcesContent":["import {\n Address,\n getSocketConnector,\n getSocketFees,\n getSocketVault,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { getTokenDetails, scale } from '../token/common';\nimport { encodeBridgeAndDepositPassivePool } from './encode';\nimport {\n BridgeAndDepositPassivePoolParams,\n BridgeAndDepositPassivePoolResult,\n} from './types';\n\nexport const bridgeAndDepositPassivePool = async (\n params: BridgeAndDepositPassivePoolParams,\n): Promise<BridgeAndDepositPassivePoolResult> => {\n const network = await params.signer.provider?.getNetwork();\n const chainId = Number(network?.chainId);\n\n const { tokenDecimals } = getTokenDetails(params.pool.tokenAddress);\n const amount = scale(tokenDecimals)(params.amount);\n\n const { calldata: data, value } = encodeBridgeAndDepositPassivePool(\n getAddress(chainId, ContractType.PERIPHERY_PROXY),\n BigInt('10000000'),\n getSocketConnector({\n chainId: chainId,\n tokenAddress: params.pool.tokenAddress.toLowerCase() as Address,\n }),\n getSocketFees({\n moneyInOutChainId: chainId,\n }),\n params.pool.id,\n params.ownerAddress,\n amount,\n BigInt(0),\n );\n\n const result = await executeTransaction(\n params.signer,\n data,\n value,\n chainId,\n getSocketVault({\n moneyInOutChainId: chainId,\n tokenAddress: params.pool.tokenAddress.toLowerCase() as Address,\n }),\n );\n\n return {\n transactionHash: result?.hash || null,\n };\n};\n"]}
@@ -36,7 +36,7 @@ var encodeTransferFromMAToPool = function (accountId, amount, sig, poolId, owner
36
36
  return { calldata: calldata, value: BigInt(0).toString(10) };
37
37
  };
38
38
  exports.encodeTransferFromMAToPool = encodeTransferFromMAToPool;
39
- var encodeWithdrawPassivePoolAndBridge = function (owner, poolId, sharesAmount, minOut, sig, socketMsgGasLimit, sockerConnector, socketController, receiver) {
39
+ var encodeWithdrawPassivePoolAndBridge = function (owner, poolId, sharesAmount, minOut, sig, socketMsgGasLimit, socketConnector, socketController, receiver) {
40
40
  var functionSignature = 'withdrawPassivePool';
41
41
  var parameters = [
42
42
  {
@@ -46,7 +46,7 @@ var encodeWithdrawPassivePoolAndBridge = function (owner, poolId, sharesAmount,
46
46
  minOut: minOut,
47
47
  sig: sig,
48
48
  socketMsgGasLimit: socketMsgGasLimit,
49
- sockerConnector: sockerConnector,
49
+ socketConnector: socketConnector,
50
50
  socketController: socketController,
51
51
  receiver: receiver,
52
52
  },
@@ -56,20 +56,20 @@ var encodeWithdrawPassivePoolAndBridge = function (owner, poolId, sharesAmount,
56
56
  return { calldata: calldata, value: BigInt(0).toString(10) };
57
57
  };
58
58
  exports.encodeWithdrawPassivePoolAndBridge = encodeWithdrawPassivePoolAndBridge;
59
- var encodeBridgeAndDepositPassivePool = function (receiver, msgGasLimit, connector, poolId, owner, amount, minShares) {
59
+ var encodeBridgeAndDepositPassivePool = function (receiver, socketMsgGasLimit, socketConnector, socketFees, poolId, owner, amount, minShares) {
60
60
  var PERIPHERY_INTERFACE = new ethers_1.Interface(Periphery_json_1.abi);
61
61
  var peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData('depositPassivePool', [{ poolId: poolId, owner: owner, amount: amount, minShares: minShares }]);
62
62
  var functionSignature = 'depositToAppChain';
63
63
  var parameters = [
64
64
  receiver,
65
65
  amount,
66
- msgGasLimit,
67
- connector,
66
+ socketMsgGasLimit,
67
+ socketConnector,
68
68
  peripheryCalldata,
69
69
  ];
70
70
  var INTERFACE = new ethers_1.Interface(VaultWithPayload_json_1.abi);
71
71
  var calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
72
- return { calldata: calldata, value: BigInt(0).toString(10) };
72
+ return { calldata: calldata, value: socketFees.toString(10) };
73
73
  };
74
74
  exports.encodeBridgeAndDepositPassivePool = encodeBridgeAndDepositPassivePool;
75
75
  //# sourceMappingURL=encode.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"encode.js","sourceRoot":"/","sources":["services/lp/encode.ts"],"names":[],"mappings":"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","sourcesContent":["import { MethodParameters } from '../../utils/action';\nimport { Interface } from 'ethers';\nimport { EIP712Signature } from '../sign';\nimport { abi as peripheryAbi } from '../../abis/Periphery.json';\nimport { abi as Socket_VaultWithPayloadAbi } from '../../abis/socket/VaultWithPayload.json';\n\n// @todo Update ABI\nconst provideLiquidityAbi = [\n 'function addLiquidity(uint128 poolId, address owner, uint256 amount, uint256 minShares) returns (uint256)',\n];\n\n// @todo Update ABI\nconst removeLiquidityabi = [\n 'function removeLiquidity(uint128 poolId, uint256 sharesAmount, uint256 minOut) returns (uint256)',\n];\nexport const encodeProvideLiquidityCall = (\n poolId: number,\n accountOwner: string,\n amount: bigint,\n minShares: number,\n): MethodParameters => {\n const functionSignature = 'addLiquidity';\n const parameters = [poolId, accountOwner, amount, minShares];\n const INTERFACE = new Interface(provideLiquidityAbi);\n const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n return { calldata: calldata, value: BigInt(0).toString(10) };\n};\n\nexport const encodeRemoveLiquidityCall = (\n poolId: number,\n sharesAmount: bigint,\n minOut: number,\n): MethodParameters => {\n const functionSignature = 'removeLiquidity';\n const parameters = [poolId, sharesAmount, minOut];\n const INTERFACE = new Interface(removeLiquidityabi);\n const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n return { calldata: calldata, value: BigInt(0).toString(10) };\n};\n\nexport const encodeTransferFromMAToPool = (\n accountId: number,\n amount: bigint,\n sig: EIP712Signature,\n poolId: number,\n owner: string,\n minShares: bigint,\n): MethodParameters => {\n const functionSignature = 'transferFromMAToPool';\n const parameters = [{ accountId, amount, sig, poolId, owner, minShares }];\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 encodeWithdrawPassivePoolAndBridge = (\n owner: string,\n poolId: number,\n sharesAmount: bigint,\n minOut: bigint,\n sig: EIP712Signature,\n socketMsgGasLimit: bigint,\n sockerConnector: string,\n socketController: string,\n receiver: string,\n): MethodParameters => {\n const functionSignature = 'withdrawPassivePool';\n const parameters = [\n {\n owner,\n poolId,\n sharesAmount,\n minOut,\n sig,\n socketMsgGasLimit,\n sockerConnector,\n socketController,\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 encodeBridgeAndDepositPassivePool = (\n receiver: string,\n msgGasLimit: bigint,\n connector: string,\n poolId: number,\n owner: string,\n amount: bigint,\n minShares: bigint,\n): MethodParameters => {\n const PERIPHERY_INTERFACE = new Interface(peripheryAbi);\n const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(\n 'depositPassivePool',\n [{ poolId, owner, amount, minShares }],\n );\n\n const functionSignature = 'depositToAppChain';\n const parameters = [\n receiver,\n amount,\n msgGasLimit,\n connector,\n peripheryCalldata,\n ];\n const INTERFACE = new Interface(Socket_VaultWithPayloadAbi);\n const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n return { calldata: calldata, value: BigInt(0).toString(10) };\n};\n"]}
1
+ {"version":3,"file":"encode.js","sourceRoot":"/","sources":["services/lp/encode.ts"],"names":[],"mappings":"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","sourcesContent":["import { MethodParameters } from '../../utils/action';\nimport { Interface } from 'ethers';\nimport { EIP712Signature } from '../sign';\nimport { abi as peripheryAbi } from '../../abis/Periphery.json';\nimport { abi as Socket_VaultWithPayloadAbi } from '../../abis/socket/VaultWithPayload.json';\n\n// @todo Update ABI\nconst provideLiquidityAbi = [\n 'function addLiquidity(uint128 poolId, address owner, uint256 amount, uint256 minShares) returns (uint256)',\n];\n\n// @todo Update ABI\nconst removeLiquidityabi = [\n 'function removeLiquidity(uint128 poolId, uint256 sharesAmount, uint256 minOut) returns (uint256)',\n];\nexport const encodeProvideLiquidityCall = (\n poolId: number,\n accountOwner: string,\n amount: bigint,\n minShares: number,\n): MethodParameters => {\n const functionSignature = 'addLiquidity';\n const parameters = [poolId, accountOwner, amount, minShares];\n const INTERFACE = new Interface(provideLiquidityAbi);\n const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n return { calldata: calldata, value: BigInt(0).toString(10) };\n};\n\nexport const encodeRemoveLiquidityCall = (\n poolId: number,\n sharesAmount: bigint,\n minOut: number,\n): MethodParameters => {\n const functionSignature = 'removeLiquidity';\n const parameters = [poolId, sharesAmount, minOut];\n const INTERFACE = new Interface(removeLiquidityabi);\n const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n return { calldata: calldata, value: BigInt(0).toString(10) };\n};\n\nexport const encodeTransferFromMAToPool = (\n accountId: number,\n amount: bigint,\n sig: EIP712Signature,\n poolId: number,\n owner: string,\n minShares: bigint,\n): MethodParameters => {\n const functionSignature = 'transferFromMAToPool';\n const parameters = [{ accountId, amount, sig, poolId, owner, minShares }];\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 encodeWithdrawPassivePoolAndBridge = (\n owner: string,\n poolId: number,\n sharesAmount: bigint,\n minOut: bigint,\n sig: EIP712Signature,\n socketMsgGasLimit: bigint,\n socketConnector: string,\n socketController: string,\n receiver: string,\n): MethodParameters => {\n const functionSignature = 'withdrawPassivePool';\n const parameters = [\n {\n owner,\n poolId,\n sharesAmount,\n minOut,\n sig,\n socketMsgGasLimit,\n socketConnector,\n socketController,\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 encodeBridgeAndDepositPassivePool = (\n receiver: string,\n socketMsgGasLimit: bigint,\n socketConnector: string,\n socketFees: bigint,\n poolId: number,\n owner: string,\n amount: bigint,\n minShares: bigint,\n): MethodParameters => {\n const PERIPHERY_INTERFACE = new Interface(peripheryAbi);\n const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(\n 'depositPassivePool',\n [{ poolId, owner, amount, minShares }],\n );\n\n const functionSignature = 'depositToAppChain';\n const parameters = [\n receiver,\n amount,\n socketMsgGasLimit,\n socketConnector,\n peripheryCalldata,\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"]}
@@ -20,4 +20,7 @@ __exportStar(require("./bridgeAndDepositPassivePool"), exports);
20
20
  __exportStar(require("./transferFromMAToPool"), exports);
21
21
  __exportStar(require("./withdrawPassivePoolAndBridge"), exports);
22
22
  __exportStar(require("./simulateTransferFromMAToPool"), exports);
23
+ __exportStar(require("./simulateBridgeAndDepositPassivePool"), exports);
24
+ __exportStar(require("./simulateWithdrawPassivePoolAndBridge"), exports);
25
+ __exportStar(require("./simulateBridgeAndDepositPassivePool"), exports);
23
26
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"/","sources":["services/lp/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,uCAAqB;AACrB,gEAA8C;AAC9C,yDAAuC;AACvC,iEAA+C;AAC/C,iEAA+C","sourcesContent":["export * from './types';\nexport * from './lp';\nexport * from './bridgeAndDepositPassivePool';\nexport * from './transferFromMAToPool';\nexport * from './withdrawPassivePoolAndBridge';\nexport * from './simulateTransferFromMAToPool';\n"]}
1
+ {"version":3,"file":"index.js","sourceRoot":"/","sources":["services/lp/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,uCAAqB;AACrB,gEAA8C;AAC9C,yDAAuC;AACvC,iEAA+C;AAC/C,iEAA+C;AAC/C,wEAAsD;AACtD,yEAAuD;AACvD,wEAAsD","sourcesContent":["export * from './types';\nexport * from './lp';\nexport * from './bridgeAndDepositPassivePool';\nexport * from './transferFromMAToPool';\nexport * from './withdrawPassivePoolAndBridge';\nexport * from './simulateTransferFromMAToPool';\nexport * from './simulateBridgeAndDepositPassivePool';\nexport * from './simulateWithdrawPassivePoolAndBridge';\nexport * from './simulateBridgeAndDepositPassivePool';\n"]}
@@ -0,0 +1,67 @@
1
+ "use strict";
2
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
+ return new (P || (P = Promise))(function (resolve, reject) {
5
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
9
+ });
10
+ };
11
+ var __generator = (this && this.__generator) || function (thisArg, body) {
12
+ var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
13
+ return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
14
+ function verb(n) { return function (v) { return step([n, v]); }; }
15
+ function step(op) {
16
+ if (f) throw new TypeError("Generator is already executing.");
17
+ while (g && (g = 0, op[0] && (_ = 0)), _) try {
18
+ if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
19
+ if (y = 0, t) op = [op[0] & 2, t.value];
20
+ switch (op[0]) {
21
+ case 0: case 1: t = op; break;
22
+ case 4: _.label++; return { value: op[1], done: false };
23
+ case 5: _.label++; y = op[1]; op = [0]; continue;
24
+ case 7: op = _.ops.pop(); _.trys.pop(); continue;
25
+ default:
26
+ if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
27
+ if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
28
+ if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
29
+ if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
30
+ if (t[2]) _.ops.pop();
31
+ _.trys.pop(); continue;
32
+ }
33
+ op = body.call(thisArg, _);
34
+ } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
35
+ if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
36
+ }
37
+ };
38
+ Object.defineProperty(exports, "__esModule", { value: true });
39
+ exports.simulateBridgeAndDepositPassivePool = void 0;
40
+ // The maximum is inclusive and the minimum is inclusive
41
+ function getRandomIntInclusive(min, max) {
42
+ min = Math.ceil(min);
43
+ max = Math.floor(max);
44
+ return Math.floor(Math.random() * (max - min + 1) + min);
45
+ }
46
+ var randomSimulation = function () {
47
+ return {
48
+ bridgeGasFees: getRandomIntInclusive(1000, 100000),
49
+ estimatedDepositedAmount: getRandomIntInclusive(1000, 100000),
50
+ };
51
+ };
52
+ var simulateBridgeAndDepositPassivePool = function (
53
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
54
+ params) { return __awaiter(void 0, void 0, void 0, function () {
55
+ return __generator(this, function (_a) {
56
+ switch (_a.label) {
57
+ case 0: return [4 /*yield*/, new Promise(function (resolve) {
58
+ setTimeout(function () {
59
+ resolve(randomSimulation());
60
+ }, Math.random() * 100 + 1000);
61
+ })];
62
+ case 1: return [2 /*return*/, _a.sent()];
63
+ }
64
+ });
65
+ }); };
66
+ exports.simulateBridgeAndDepositPassivePool = simulateBridgeAndDepositPassivePool;
67
+ //# sourceMappingURL=simulateBridgeAndDepositPassivePool.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"simulateBridgeAndDepositPassivePool.js","sourceRoot":"/","sources":["services/lp/simulateBridgeAndDepositPassivePool.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAKA,wDAAwD;AACxD,SAAS,qBAAqB,CAAC,GAAW,EAAE,GAAW;IACrD,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACrB,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACtB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,GAAG,GAAG,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC;AAC3D,CAAC;AAED,IAAM,gBAAgB,GAAG;IACvB,OAAO;QACL,aAAa,EAAE,qBAAqB,CAAC,IAAI,EAAE,MAAM,CAAC;QAClD,wBAAwB,EAAE,qBAAqB,CAAC,IAAI,EAAE,MAAM,CAAC;KAC9D,CAAC;AACJ,CAAC,CAAC;AAEK,IAAM,mCAAmC,GAAG;AACjD,6DAA6D;AAC7D,MAAiD;;;oBAE1C,qBAAM,IAAI,OAAO,CAAC,UAAC,OAAO;oBAC/B,UAAU,CACR;wBACE,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;oBAC9B,CAAC,EACD,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,GAAG,IAAI,CAC3B,CAAC;gBACJ,CAAC,CAAC,EAAA;oBAPF,sBAAO,SAOL,EAAC;;;KACJ,CAAC;AAZW,QAAA,mCAAmC,uCAY9C","sourcesContent":["import {\n SimulateBridgeAndDepositPassivePoolParams,\n SimulateBridgeAndDepositPassivePoolResult,\n} from './types';\n\n// The maximum is inclusive and the minimum is inclusive\nfunction getRandomIntInclusive(min: number, max: number) {\n min = Math.ceil(min);\n max = Math.floor(max);\n return Math.floor(Math.random() * (max - min + 1) + min);\n}\n\nconst randomSimulation = (): SimulateBridgeAndDepositPassivePoolResult => {\n return {\n bridgeGasFees: getRandomIntInclusive(1000, 100000),\n estimatedDepositedAmount: getRandomIntInclusive(1000, 100000),\n };\n};\n\nexport const simulateBridgeAndDepositPassivePool = async (\n // eslint-disable-next-line @typescript-eslint/no-unused-vars\n params: SimulateBridgeAndDepositPassivePoolParams,\n): Promise<SimulateBridgeAndDepositPassivePoolResult> => {\n return await new Promise((resolve) => {\n setTimeout(\n () => {\n resolve(randomSimulation());\n },\n Math.random() * 100 + 1000,\n );\n });\n};\n"]}
@@ -0,0 +1,66 @@
1
+ "use strict";
2
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
+ return new (P || (P = Promise))(function (resolve, reject) {
5
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
9
+ });
10
+ };
11
+ var __generator = (this && this.__generator) || function (thisArg, body) {
12
+ var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
13
+ return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
14
+ function verb(n) { return function (v) { return step([n, v]); }; }
15
+ function step(op) {
16
+ if (f) throw new TypeError("Generator is already executing.");
17
+ while (g && (g = 0, op[0] && (_ = 0)), _) try {
18
+ if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
19
+ if (y = 0, t) op = [op[0] & 2, t.value];
20
+ switch (op[0]) {
21
+ case 0: case 1: t = op; break;
22
+ case 4: _.label++; return { value: op[1], done: false };
23
+ case 5: _.label++; y = op[1]; op = [0]; continue;
24
+ case 7: op = _.ops.pop(); _.trys.pop(); continue;
25
+ default:
26
+ if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
27
+ if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
28
+ if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
29
+ if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
30
+ if (t[2]) _.ops.pop();
31
+ _.trys.pop(); continue;
32
+ }
33
+ op = body.call(thisArg, _);
34
+ } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
35
+ if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
36
+ }
37
+ };
38
+ Object.defineProperty(exports, "__esModule", { value: true });
39
+ exports.simulateWithdrawPassivePoolAndBridge = void 0;
40
+ // The maximum is inclusive and the minimum is inclusive
41
+ function getRandomIntInclusive(min, max) {
42
+ min = Math.ceil(min);
43
+ max = Math.floor(max);
44
+ return Math.floor(Math.random() * (max - min + 1) + min);
45
+ }
46
+ var randomSimulation = function () {
47
+ return {
48
+ bridgeGasFees: getRandomIntInclusive(1000, 100000),
49
+ };
50
+ };
51
+ var simulateWithdrawPassivePoolAndBridge = function (
52
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
53
+ params) { return __awaiter(void 0, void 0, void 0, function () {
54
+ return __generator(this, function (_a) {
55
+ switch (_a.label) {
56
+ case 0: return [4 /*yield*/, new Promise(function (resolve) {
57
+ setTimeout(function () {
58
+ resolve(randomSimulation());
59
+ }, Math.random() * 100 + 1000);
60
+ })];
61
+ case 1: return [2 /*return*/, _a.sent()];
62
+ }
63
+ });
64
+ }); };
65
+ exports.simulateWithdrawPassivePoolAndBridge = simulateWithdrawPassivePoolAndBridge;
66
+ //# sourceMappingURL=simulateWithdrawPassivePoolAndBridge.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"simulateWithdrawPassivePoolAndBridge.js","sourceRoot":"/","sources":["services/lp/simulateWithdrawPassivePoolAndBridge.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAKA,wDAAwD;AACxD,SAAS,qBAAqB,CAAC,GAAW,EAAE,GAAW;IACrD,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACrB,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACtB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,GAAG,GAAG,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC;AAC3D,CAAC;AAED,IAAM,gBAAgB,GAAG;IACvB,OAAO;QACL,aAAa,EAAE,qBAAqB,CAAC,IAAI,EAAE,MAAM,CAAC;KACnD,CAAC;AACJ,CAAC,CAAC;AAEK,IAAM,oCAAoC,GAAG;AAClD,6DAA6D;AAC7D,MAAkD;;;oBAE3C,qBAAM,IAAI,OAAO,CAAC,UAAC,OAAO;oBAC/B,UAAU,CACR;wBACE,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;oBAC9B,CAAC,EACD,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,GAAG,IAAI,CAC3B,CAAC;gBACJ,CAAC,CAAC,EAAA;oBAPF,sBAAO,SAOL,EAAC;;;KACJ,CAAC;AAZW,QAAA,oCAAoC,wCAY/C","sourcesContent":["import {\n SimulateWithdrawPassivePoolAndBridgeParams,\n SimulateWithdrawPassivePoolAndBridgeResult,\n} from './types';\n\n// The maximum is inclusive and the minimum is inclusive\nfunction getRandomIntInclusive(min: number, max: number) {\n min = Math.ceil(min);\n max = Math.floor(max);\n return Math.floor(Math.random() * (max - min + 1) + min);\n}\n\nconst randomSimulation = (): SimulateWithdrawPassivePoolAndBridgeResult => {\n return {\n bridgeGasFees: getRandomIntInclusive(1000, 100000),\n };\n};\n\nexport const simulateWithdrawPassivePoolAndBridge = async (\n // eslint-disable-next-line @typescript-eslint/no-unused-vars\n params: SimulateWithdrawPassivePoolAndBridgeParams,\n): Promise<SimulateWithdrawPassivePoolAndBridgeResult> => {\n return await new Promise((resolve) => {\n setTimeout(\n () => {\n resolve(randomSimulation());\n },\n Math.random() * 100 + 1000,\n );\n });\n};\n"]}
@@ -1 +1 @@
1
- {"version":3,"file":"types.js","sourceRoot":"/","sources":["services/lp/types.ts"],"names":[],"mappings":"","sourcesContent":["import { JsonRpcSigner, Signer } from 'ethers';\nimport {\n LpPoolEntity,\n LpWithdrawBalanceEntity,\n MarginAccountEntity,\n OwnerMetadataEntity,\n} from '@reyaxyz/common';\n\nexport type ProvideLiquidityParams = {\n signer: Signer | JsonRpcSigner;\n amount: number;\n lpPoolId: LpPoolEntity['id'];\n};\n\nexport type RemoveLiquidityParams = {\n signer: Signer | JsonRpcSigner;\n lpPoolId: LpPoolEntity['id'];\n amount: number;\n};\n\nexport type ProvideLiquidityResult = {\n transactionHash: string | null;\n};\n\nexport type RemoveLiquidityResult = {\n transactionHash: string | null;\n};\n\nexport type TransferFromMAToPoolParams = {\n signer: Signer | JsonRpcSigner;\n owner: Pick<OwnerMetadataEntity, 'address' | 'coreSigNonce'>;\n marginAccountId: MarginAccountEntity['id'];\n pool: Pick<LpPoolEntity, 'id' | 'tokenAddress'>;\n amount: number;\n};\n\nexport type TransferFromMAToPoolResult = {\n transactionHash: string | null;\n};\n\nexport type WithdrawPassivePoolAndBridgeParams = {\n signer: Signer | JsonRpcSigner;\n owner: Pick<OwnerMetadataEntity, 'address' | 'poolSigNonce'>;\n pool: Pick<LpPoolEntity, 'id' | 'tokenAddress'>;\n amount: number;\n sharePrice: LpWithdrawBalanceEntity['poolSharePrice'];\n};\n\nexport type WithdrawPassivePoolAndBridgeResult = {\n transactionHash: string | null;\n};\n\nexport type BridgeAndDepositPassivePoolParams = {\n signer: Signer | JsonRpcSigner;\n ownerAddress: OwnerMetadataEntity['address'];\n pool: Pick<LpPoolEntity, 'id' | 'tokenAddress'>;\n amount: number;\n};\n\nexport type BridgeAndDepositPassivePoolResult = {\n transactionHash: string | null;\n};\n\nexport type SimulateTransferFromMAToPoolResult = {\n bridgeGasFees: number;\n estimatedDepositedAmount: number;\n};\n\n// TODO: Milan reevaluate these params\nexport type SimulateTransferFromMAToPoolParams = {\n signer: Signer | JsonRpcSigner;\n lpPoolId: LpPoolEntity['id'];\n tokenAddress: LpPoolEntity['tokenAddress'];\n amount: number;\n};\n"]}
1
+ {"version":3,"file":"types.js","sourceRoot":"/","sources":["services/lp/types.ts"],"names":[],"mappings":"","sourcesContent":["import { JsonRpcSigner, Signer } from 'ethers';\nimport {\n LpPoolEntity,\n LpWithdrawBalanceEntity,\n MarginAccountEntity,\n OwnerMetadataEntity,\n} from '@reyaxyz/common';\n\nexport type ProvideLiquidityParams = {\n signer: Signer | JsonRpcSigner;\n amount: number;\n lpPoolId: LpPoolEntity['id'];\n};\n\nexport type RemoveLiquidityParams = {\n signer: Signer | JsonRpcSigner;\n lpPoolId: LpPoolEntity['id'];\n amount: number;\n};\n\nexport type ProvideLiquidityResult = {\n transactionHash: string | null;\n};\n\nexport type RemoveLiquidityResult = {\n transactionHash: string | null;\n};\n\nexport type TransferFromMAToPoolParams = {\n signer: Signer | JsonRpcSigner;\n owner: Pick<OwnerMetadataEntity, 'address' | 'coreSigNonce'>;\n marginAccountId: MarginAccountEntity['id'];\n pool: Pick<LpPoolEntity, 'id' | 'tokenAddress'>;\n amount: number;\n};\n\nexport type TransferFromMAToPoolResult = {\n transactionHash: string | null;\n};\n\nexport type WithdrawPassivePoolAndBridgeParams = {\n signer: Signer | JsonRpcSigner;\n owner: Pick<OwnerMetadataEntity, 'address' | 'poolSigNonce'>;\n pool: Pick<LpPoolEntity, 'id' | 'tokenAddress'>;\n amount: number;\n sharePrice: LpWithdrawBalanceEntity['poolSharePrice'];\n};\n\nexport type WithdrawPassivePoolAndBridgeResult = {\n transactionHash: string | null;\n};\n\nexport type BridgeAndDepositPassivePoolParams = {\n signer: Signer | JsonRpcSigner;\n ownerAddress: OwnerMetadataEntity['address'];\n pool: Pick<LpPoolEntity, 'id' | 'tokenAddress'>;\n amount: number;\n};\n\nexport type BridgeAndDepositPassivePoolResult = {\n transactionHash: string | null;\n};\n\n// TODO: Milan, Alex reevaluate these params\nexport type SimulateTransferFromMAToPoolResult = {\n bridgeGasFees: number;\n estimatedDepositedAmount: number;\n};\n\n// TODO: Milan, Alex reevaluate these params\nexport type SimulateTransferFromMAToPoolParams = {\n signer: Signer | JsonRpcSigner;\n lpPoolId: LpPoolEntity['id'];\n tokenAddress: LpPoolEntity['tokenAddress'];\n amount: number;\n};\n\n// TODO: Milan, Alex reevaluate these params\nexport type SimulateBridgeAndDepositPassivePoolResult = {\n bridgeGasFees: number;\n estimatedDepositedAmount: number;\n};\n\n// TODO: Milan, Alex reevaluate these params\nexport type SimulateBridgeAndDepositPassivePoolParams = {\n signer: Signer | JsonRpcSigner;\n lpPoolId: LpPoolEntity['id'];\n tokenAddress: LpPoolEntity['tokenAddress'];\n amount: number;\n};\n\n// TODO: Milan, Alex reevaluate these params\nexport type SimulateWithdrawPassivePoolAndBridgeResult = {\n bridgeGasFees: number;\n};\n\n// TODO: Milan, Alex reevaluate these params\nexport type SimulateWithdrawPassivePoolAndBridgeParams = {\n signer: Signer | JsonRpcSigner;\n lpPoolId: LpPoolEntity['id'];\n tokenAddress: LpPoolEntity['tokenAddress'];\n amount: number;\n};\n"]}
@@ -61,6 +61,8 @@ var bridgeAndDepositExisingMA = function (params) { return __awaiter(void 0, voi
61
61
  _a = (0, encode_1.encodeBridgeAndDepositExistingMA)((0, contractAddresses_1.getAddress)(chainId, contractAddresses_1.ContractType.PERIPHERY_PROXY), BigInt('10000000'), (0, common_1.getSocketConnector)({
62
62
  chainId: chainId,
63
63
  tokenAddress: params.tokenAddress,
64
+ }), (0, common_1.getSocketFees)({
65
+ moneyInOutChainId: chainId,
64
66
  }), params.marginAccountId, params.tokenAddress, amount, eip712Signature), data = _a.calldata, value = _a.value;
65
67
  return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(params.signer, data, value, chainId, (0, common_1.getSocketVault)({
66
68
  moneyInOutChainId: chainId,
@@ -1 +1 @@
1
- {"version":3,"file":"bridgeAndDepositExistingMA.js","sourceRoot":"/","sources":["services/margin-accounts/bridgeAndDepositExistingMA.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAIyB;AACzB,mEAAyE;AACzE,4DAA2D;AAC3D,0CAAyD;AACzD,mCAA4D;AAK5D,gCAA2C;AAC3C,6CAAgE;AAEzD,IAAM,yBAAyB,GAAG,UACvC,MAAuC;;;;;oBAEvB,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;gBACjB,qBAAM,IAAA,uBAAgB,EAC5C,MAAM,CAAC,MAAM,EACb,OAAO,EACP,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,KAAK,CAAC,YAAY,EACzB,IAAA,qCAA4B,GAAE,GAAG,mCAA0B,CAC5D,EAAA;;gBANK,eAAe,GAAG,SAMvB;gBAEO,aAAa,GAAK,IAAA,wBAAe,EAAC,MAAM,CAAC,YAAY,CAAC,cAAzC,CAA0C;gBACzD,MAAM,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAE7C,KAA4B,IAAA,yCAAgC,EAChE,IAAA,8BAAU,EAAC,OAAO,EAAE,gCAAY,CAAC,eAAe,CAAC,EACjD,MAAM,CAAC,UAAU,CAAC,EAClB,IAAA,2BAAkB,EAAC;oBACjB,OAAO,EAAE,OAAO;oBAChB,YAAY,EAAE,MAAM,CAAC,YAAY;iBAClC,CAAC,EACF,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,YAAY,EACnB,MAAM,EACN,eAAe,CAChB,EAXiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAW3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,IAAA,uBAAc,EAAC;wBACb,iBAAiB,EAAE,OAAO;wBAC1B,YAAY,EAAE,MAAM,CAAC,YAAY;qBAClC,CAAC,CACH,EAAA;;gBATK,MAAM,GAAG,SASd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AA3CW,QAAA,yBAAyB,6BA2CpC","sourcesContent":["import {\n getCurrentTimestampInSeconds,\n getSocketConnector,\n getSocketVault,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { getTokenDetails, scale } from '../token/common';\nimport { encodeBridgeAndDepositExistingMA } from './encode';\nimport {\n BridgeAndDepositExisingMAParams,\n BridgeAndDepositExisingMAResult,\n} from './types';\nimport { signCoreCommands } from '../sign';\nimport { BRIDGE_DEADLINE_IN_SECONDS } from '../../utils/consts';\n\nexport const bridgeAndDepositExisingMA = async (\n params: BridgeAndDepositExisingMAParams,\n): Promise<BridgeAndDepositExisingMAResult> => {\n const network = await params.signer.provider?.getNetwork();\n const chainId = Number(network?.chainId);\n const eip712Signature = await signCoreCommands(\n params.signer,\n chainId,\n params.marginAccountId,\n params.owner.coreSigNonce,\n getCurrentTimestampInSeconds() + BRIDGE_DEADLINE_IN_SECONDS,\n );\n\n const { tokenDecimals } = getTokenDetails(params.tokenAddress);\n const amount = scale(tokenDecimals)(params.amount);\n\n const { calldata: data, value } = encodeBridgeAndDepositExistingMA(\n getAddress(chainId, ContractType.PERIPHERY_PROXY),\n BigInt('10000000'),\n getSocketConnector({\n chainId: chainId,\n tokenAddress: params.tokenAddress,\n }),\n params.marginAccountId,\n params.tokenAddress,\n amount,\n eip712Signature,\n );\n\n const result = await executeTransaction(\n params.signer,\n data,\n value,\n chainId,\n getSocketVault({\n moneyInOutChainId: chainId,\n tokenAddress: params.tokenAddress,\n }),\n );\n\n return {\n transactionHash: result?.hash || null,\n };\n};\n"]}
1
+ {"version":3,"file":"bridgeAndDepositExistingMA.js","sourceRoot":"/","sources":["services/margin-accounts/bridgeAndDepositExistingMA.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAKyB;AACzB,mEAAyE;AACzE,4DAA2D;AAC3D,0CAAyD;AACzD,mCAA4D;AAK5D,gCAA2C;AAC3C,6CAAgE;AAEzD,IAAM,yBAAyB,GAAG,UACvC,MAAuC;;;;;oBAEvB,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;gBACjB,qBAAM,IAAA,uBAAgB,EAC5C,MAAM,CAAC,MAAM,EACb,OAAO,EACP,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,KAAK,CAAC,YAAY,EACzB,IAAA,qCAA4B,GAAE,GAAG,mCAA0B,CAC5D,EAAA;;gBANK,eAAe,GAAG,SAMvB;gBAEO,aAAa,GAAK,IAAA,wBAAe,EAAC,MAAM,CAAC,YAAY,CAAC,cAAzC,CAA0C;gBACzD,MAAM,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAE7C,KAA4B,IAAA,yCAAgC,EAChE,IAAA,8BAAU,EAAC,OAAO,EAAE,gCAAY,CAAC,eAAe,CAAC,EACjD,MAAM,CAAC,UAAU,CAAC,EAClB,IAAA,2BAAkB,EAAC;oBACjB,OAAO,EAAE,OAAO;oBAChB,YAAY,EAAE,MAAM,CAAC,YAAY;iBAClC,CAAC,EACF,IAAA,sBAAa,EAAC;oBACZ,iBAAiB,EAAE,OAAO;iBAC3B,CAAC,EACF,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,YAAY,EACnB,MAAM,EACN,eAAe,CAChB,EAdiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAc3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,IAAA,uBAAc,EAAC;wBACb,iBAAiB,EAAE,OAAO;wBAC1B,YAAY,EAAE,MAAM,CAAC,YAAY;qBAClC,CAAC,CACH,EAAA;;gBATK,MAAM,GAAG,SASd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AA9CW,QAAA,yBAAyB,6BA8CpC","sourcesContent":["import {\n getCurrentTimestampInSeconds,\n getSocketConnector,\n getSocketFees,\n getSocketVault,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { getTokenDetails, scale } from '../token/common';\nimport { encodeBridgeAndDepositExistingMA } from './encode';\nimport {\n BridgeAndDepositExisingMAParams,\n BridgeAndDepositExisingMAResult,\n} from './types';\nimport { signCoreCommands } from '../sign';\nimport { BRIDGE_DEADLINE_IN_SECONDS } from '../../utils/consts';\n\nexport const bridgeAndDepositExisingMA = async (\n params: BridgeAndDepositExisingMAParams,\n): Promise<BridgeAndDepositExisingMAResult> => {\n const network = await params.signer.provider?.getNetwork();\n const chainId = Number(network?.chainId);\n const eip712Signature = await signCoreCommands(\n params.signer,\n chainId,\n params.marginAccountId,\n params.owner.coreSigNonce,\n getCurrentTimestampInSeconds() + BRIDGE_DEADLINE_IN_SECONDS,\n );\n\n const { tokenDecimals } = getTokenDetails(params.tokenAddress);\n const amount = scale(tokenDecimals)(params.amount);\n\n const { calldata: data, value } = encodeBridgeAndDepositExistingMA(\n getAddress(chainId, ContractType.PERIPHERY_PROXY),\n BigInt('10000000'),\n getSocketConnector({\n chainId: chainId,\n tokenAddress: params.tokenAddress,\n }),\n getSocketFees({\n moneyInOutChainId: chainId,\n }),\n params.marginAccountId,\n params.tokenAddress,\n amount,\n eip712Signature,\n );\n\n const result = await executeTransaction(\n params.signer,\n data,\n value,\n chainId,\n getSocketVault({\n moneyInOutChainId: chainId,\n tokenAddress: params.tokenAddress,\n }),\n );\n\n return {\n transactionHash: result?.hash || null,\n };\n};\n"]}
@@ -56,6 +56,8 @@ var bridgeAndDepositNewMA = function (params) { return __awaiter(void 0, void 0,
56
56
  _a = (0, encode_1.encodeBridgeAndDepositNewMA)((0, contractAddresses_1.getAddress)(chainId, contractAddresses_1.ContractType.PERIPHERY_PROXY), BigInt('10000000'), (0, common_1.getSocketConnector)({
57
57
  chainId: chainId,
58
58
  tokenAddress: params.tokenAddress,
59
+ }), (0, common_1.getSocketFees)({
60
+ moneyInOutChainId: chainId,
59
61
  }), params.ownerAddress, params.tokenAddress, amount), data = _a.calldata, value = _a.value;
60
62
  return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(params.signer, data, value, chainId, (0, common_1.getSocketVault)({
61
63
  moneyInOutChainId: chainId,
@@ -1 +1 @@
1
- {"version":3,"file":"bridgeAndDepositNewMA.js","sourceRoot":"/","sources":["services/margin-accounts/bridgeAndDepositNewMA.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAAqE;AACrE,mEAAyE;AACzE,4DAA2D;AAC3D,0CAAyD;AACzD,mCAAuD;AAMhD,IAAM,qBAAqB,GAAG,UACnC,MAAmC;;;;;oBAEnB,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;gBAEjC,aAAa,GAAK,IAAA,wBAAe,EAAC,MAAM,CAAC,YAAY,CAAC,cAAzC,CAA0C;gBACzD,MAAM,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAE7C,KAA4B,IAAA,oCAA2B,EAC3D,IAAA,8BAAU,EAAC,OAAO,EAAE,gCAAY,CAAC,eAAe,CAAC,EACjD,MAAM,CAAC,UAAU,CAAC,EAClB,IAAA,2BAAkB,EAAC;oBACjB,OAAO,EAAE,OAAO;oBAChB,YAAY,EAAE,MAAM,CAAC,YAAY;iBAClC,CAAC,EACF,MAAM,CAAC,YAAY,EACnB,MAAM,CAAC,YAAY,EACnB,MAAM,CACP,EAViB,IAAI,cAAA,EAAE,KAAK,WAAA,CAU3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,IAAA,uBAAc,EAAC;wBACb,iBAAiB,EAAE,OAAO;wBAC1B,YAAY,EAAE,MAAM,CAAC,YAAY;qBAClC,CAAC,CACH,EAAA;;gBATK,MAAM,GAAG,SASd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AAnCW,QAAA,qBAAqB,yBAmChC","sourcesContent":["import { getSocketConnector, getSocketVault } from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { getTokenDetails, scale } from '../token/common';\nimport { encodeBridgeAndDepositNewMA } from './encode';\nimport {\n BridgeAndDepositNewMAParams,\n BridgeAndDepositNewMAResult,\n} from './types';\n\nexport const bridgeAndDepositNewMA = async (\n params: BridgeAndDepositNewMAParams,\n): Promise<BridgeAndDepositNewMAResult> => {\n const network = await params.signer.provider?.getNetwork();\n const chainId = Number(network?.chainId);\n\n const { tokenDecimals } = getTokenDetails(params.tokenAddress);\n const amount = scale(tokenDecimals)(params.amount);\n\n const { calldata: data, value } = encodeBridgeAndDepositNewMA(\n getAddress(chainId, ContractType.PERIPHERY_PROXY),\n BigInt('10000000'),\n getSocketConnector({\n chainId: chainId,\n tokenAddress: params.tokenAddress,\n }),\n params.ownerAddress,\n params.tokenAddress,\n amount,\n );\n\n const result = await executeTransaction(\n params.signer,\n data,\n value,\n chainId,\n getSocketVault({\n moneyInOutChainId: chainId,\n tokenAddress: params.tokenAddress,\n }),\n );\n\n return {\n transactionHash: result?.hash || null,\n };\n};\n"]}
1
+ {"version":3,"file":"bridgeAndDepositNewMA.js","sourceRoot":"/","sources":["services/margin-accounts/bridgeAndDepositNewMA.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAIyB;AACzB,mEAAyE;AACzE,4DAA2D;AAC3D,0CAAyD;AACzD,mCAAuD;AAMhD,IAAM,qBAAqB,GAAG,UACnC,MAAmC;;;;;oBAEnB,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;gBAEjC,aAAa,GAAK,IAAA,wBAAe,EAAC,MAAM,CAAC,YAAY,CAAC,cAAzC,CAA0C;gBACzD,MAAM,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAE7C,KAA4B,IAAA,oCAA2B,EAC3D,IAAA,8BAAU,EAAC,OAAO,EAAE,gCAAY,CAAC,eAAe,CAAC,EACjD,MAAM,CAAC,UAAU,CAAC,EAClB,IAAA,2BAAkB,EAAC;oBACjB,OAAO,EAAE,OAAO;oBAChB,YAAY,EAAE,MAAM,CAAC,YAAY;iBAClC,CAAC,EACF,IAAA,sBAAa,EAAC;oBACZ,iBAAiB,EAAE,OAAO;iBAC3B,CAAC,EACF,MAAM,CAAC,YAAY,EACnB,MAAM,CAAC,YAAY,EACnB,MAAM,CACP,EAbiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAa3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,IAAA,uBAAc,EAAC;wBACb,iBAAiB,EAAE,OAAO;wBAC1B,YAAY,EAAE,MAAM,CAAC,YAAY;qBAClC,CAAC,CACH,EAAA;;gBATK,MAAM,GAAG,SASd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AAtCW,QAAA,qBAAqB,yBAsChC","sourcesContent":["import {\n getSocketConnector,\n getSocketFees,\n getSocketVault,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { getTokenDetails, scale } from '../token/common';\nimport { encodeBridgeAndDepositNewMA } from './encode';\nimport {\n BridgeAndDepositNewMAParams,\n BridgeAndDepositNewMAResult,\n} from './types';\n\nexport const bridgeAndDepositNewMA = async (\n params: BridgeAndDepositNewMAParams,\n): Promise<BridgeAndDepositNewMAResult> => {\n const network = await params.signer.provider?.getNetwork();\n const chainId = Number(network?.chainId);\n\n const { tokenDecimals } = getTokenDetails(params.tokenAddress);\n const amount = scale(tokenDecimals)(params.amount);\n\n const { calldata: data, value } = encodeBridgeAndDepositNewMA(\n getAddress(chainId, ContractType.PERIPHERY_PROXY),\n BigInt('10000000'),\n getSocketConnector({\n chainId: chainId,\n tokenAddress: params.tokenAddress,\n }),\n getSocketFees({\n moneyInOutChainId: chainId,\n }),\n params.ownerAddress,\n params.tokenAddress,\n amount,\n );\n\n const result = await executeTransaction(\n params.signer,\n data,\n value,\n chainId,\n getSocketVault({\n moneyInOutChainId: chainId,\n tokenAddress: params.tokenAddress,\n }),\n );\n\n return {\n transactionHash: result?.hash || null,\n };\n};\n"]}
@@ -69,36 +69,36 @@ var encodeWithdrawMAAndBridge = function (accountId, token, tokenAmount, sig, so
69
69
  return { calldata: calldata, value: BigInt(0).toString(10) };
70
70
  };
71
71
  exports.encodeWithdrawMAAndBridge = encodeWithdrawMAAndBridge;
72
- var encodeBridgeAndDepositNewMA = function (receiver, msgGasLimit, connector, accountOwner, token, tokenAmount) {
72
+ var encodeBridgeAndDepositNewMA = function (receiver, socketMsgGasLimit, socketConnector, socketFees, accountOwner, token, tokenAmount) {
73
73
  var PERIPHERY_INTERFACE = new ethers_1.Interface(Periphery_json_1.abi);
74
74
  var peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData('depositNewMA', [{ accountOwner: accountOwner, token: token, tokenAmount: tokenAmount }]);
75
75
  var functionSignature = 'depositToAppChain';
76
76
  var parameters = [
77
77
  receiver,
78
78
  tokenAmount,
79
- msgGasLimit,
80
- connector,
79
+ socketMsgGasLimit,
80
+ socketConnector,
81
81
  peripheryCalldata,
82
82
  ];
83
83
  var INTERFACE = new ethers_1.Interface(VaultWithPayload_json_1.abi);
84
84
  var calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
85
- return { calldata: calldata, value: BigInt(0).toString(10) };
85
+ return { calldata: calldata, value: socketFees.toString(10) };
86
86
  };
87
87
  exports.encodeBridgeAndDepositNewMA = encodeBridgeAndDepositNewMA;
88
- var encodeBridgeAndDepositExistingMA = function (receiver, msgGasLimit, connector, accountId, token, tokenAmount, sig) {
88
+ var encodeBridgeAndDepositExistingMA = function (receiver, socketMsgGasLimit, socketConnector, socketFees, accountId, token, tokenAmount, sig) {
89
89
  var PERIPHERY_INTERFACE = new ethers_1.Interface(Periphery_json_1.abi);
90
90
  var peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData('depositExistingMA', [{ accountId: accountId, token: token, tokenAmount: tokenAmount, sig: sig }]);
91
91
  var functionSignature = 'depositToAppChain';
92
92
  var parameters = [
93
93
  receiver,
94
94
  tokenAmount,
95
- msgGasLimit,
96
- connector,
95
+ socketMsgGasLimit,
96
+ socketConnector,
97
97
  peripheryCalldata,
98
98
  ];
99
99
  var INTERFACE = new ethers_1.Interface(VaultWithPayload_json_1.abi);
100
100
  var calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
101
- return { calldata: calldata, value: BigInt(0).toString(10) };
101
+ return { calldata: calldata, value: socketFees.toString(10) };
102
102
  };
103
103
  exports.encodeBridgeAndDepositExistingMA = encodeBridgeAndDepositExistingMA;
104
104
  //# sourceMappingURL=encode.js.map
@@ -1 +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/AccountModule.json';\nimport { abi as peripheryAbi } from '../../abis/Periphery.json';\nimport { abi as Socket_VaultWithPayloadAbi } from '../../abis/socket/VaultWithPayload.json';\nimport { EIP712Signature } from '../sign';\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 = (\n fromMarginAccountId: number,\n toMarginAccountId: number,\n token: string,\n amount: bigint,\n): MethodParameters => {\n const multiAction = new MultiAction();\n\n encodeSingleTransferMargin(toMarginAccountId, token, amount, multiAction);\n\n const value = BigInt(0);\n const call = encodeRouterCall(multiAction, fromMarginAccountId, value);\n\n return {\n ...call,\n };\n};\n\nexport const encodeWithdrawMAAndBridge = (\n accountId: number,\n token: string,\n tokenAmount: bigint,\n sig: EIP712Signature,\n socketMsgGasLimit: bigint,\n socketConnector: string,\n socketController: string,\n receiver: string,\n): MethodParameters => {\n const functionSignature = 'withdrawMA';\n const parameters = [\n {\n accountId,\n token,\n tokenAmount,\n sig,\n socketMsgGasLimit,\n socketConnector,\n socketController,\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 msgGasLimit: bigint,\n connector: string,\n accountOwner: string,\n token: string,\n tokenAmount: bigint,\n): MethodParameters => {\n const PERIPHERY_INTERFACE = new Interface(peripheryAbi);\n const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(\n 'depositNewMA',\n [{ accountOwner, token, tokenAmount }],\n );\n\n const functionSignature = 'depositToAppChain';\n const parameters = [\n receiver,\n tokenAmount,\n msgGasLimit,\n connector,\n peripheryCalldata,\n ];\n const INTERFACE = new Interface(Socket_VaultWithPayloadAbi);\n const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n return { calldata: calldata, value: BigInt(0).toString(10) };\n};\n\nexport const encodeBridgeAndDepositExistingMA = (\n receiver: string,\n msgGasLimit: bigint,\n connector: string,\n accountId: number,\n token: string,\n tokenAmount: bigint,\n sig: EIP712Signature,\n): MethodParameters => {\n const PERIPHERY_INTERFACE = new Interface(peripheryAbi);\n const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(\n 'depositExistingMA',\n [{ accountId, token, tokenAmount, sig }],\n );\n\n const functionSignature = 'depositToAppChain';\n const parameters = [\n receiver,\n tokenAmount,\n msgGasLimit,\n connector,\n peripheryCalldata,\n ];\n const INTERFACE = new Interface(Socket_VaultWithPayloadAbi);\n const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n return { calldata: calldata, value: BigInt(0).toString(10) };\n};\n"]}
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/AccountModule.json';\nimport { abi as peripheryAbi } from '../../abis/Periphery.json';\nimport { abi as Socket_VaultWithPayloadAbi } from '../../abis/socket/VaultWithPayload.json';\nimport { EIP712Signature } from '../sign';\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 = (\n fromMarginAccountId: number,\n toMarginAccountId: number,\n token: string,\n amount: bigint,\n): MethodParameters => {\n const multiAction = new MultiAction();\n\n encodeSingleTransferMargin(toMarginAccountId, token, amount, multiAction);\n\n const value = BigInt(0);\n const call = encodeRouterCall(multiAction, fromMarginAccountId, value);\n\n return {\n ...call,\n };\n};\n\nexport const encodeWithdrawMAAndBridge = (\n accountId: number,\n token: string,\n tokenAmount: bigint,\n sig: EIP712Signature,\n socketMsgGasLimit: bigint,\n socketConnector: string,\n socketController: string,\n receiver: string,\n): MethodParameters => {\n const functionSignature = 'withdrawMA';\n const parameters = [\n {\n accountId,\n token,\n tokenAmount,\n sig,\n socketMsgGasLimit,\n socketConnector,\n socketController,\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 socketFees: bigint,\n accountOwner: string,\n token: string,\n tokenAmount: bigint,\n): MethodParameters => {\n const PERIPHERY_INTERFACE = new Interface(peripheryAbi);\n const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(\n 'depositNewMA',\n [{ accountOwner, token, tokenAmount }],\n );\n\n const functionSignature = 'depositToAppChain';\n const parameters = [\n receiver,\n tokenAmount,\n socketMsgGasLimit,\n socketConnector,\n peripheryCalldata,\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 socketFees: bigint,\n accountId: number,\n token: string,\n tokenAmount: bigint,\n sig: EIP712Signature,\n): MethodParameters => {\n const PERIPHERY_INTERFACE = new Interface(peripheryAbi);\n const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(\n 'depositExistingMA',\n [{ accountId, token, tokenAmount, sig }],\n );\n\n const functionSignature = 'depositToAppChain';\n const parameters = [\n receiver,\n tokenAmount,\n socketMsgGasLimit,\n socketConnector,\n peripheryCalldata,\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"]}
@@ -1 +1 @@
1
- {"version":3,"file":"bridgeAndDepositPassivePool.d.ts","sourceRoot":"/","sources":["services/lp/bridgeAndDepositPassivePool.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,iCAAiC,EACjC,iCAAiC,EAClC,MAAM,SAAS,CAAC;AAEjB,eAAO,MAAM,2BAA2B,WAC9B,iCAAiC,KACxC,QAAQ,iCAAiC,CAkC3C,CAAC"}
1
+ {"version":3,"file":"bridgeAndDepositPassivePool.d.ts","sourceRoot":"/","sources":["services/lp/bridgeAndDepositPassivePool.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,iCAAiC,EACjC,iCAAiC,EAClC,MAAM,SAAS,CAAC;AAEjB,eAAO,MAAM,2BAA2B,WAC9B,iCAAiC,KACxC,QAAQ,iCAAiC,CAqC3C,CAAC"}
@@ -3,6 +3,6 @@ import { EIP712Signature } from '../sign';
3
3
  export declare const encodeProvideLiquidityCall: (poolId: number, accountOwner: string, amount: bigint, minShares: number) => MethodParameters;
4
4
  export declare const encodeRemoveLiquidityCall: (poolId: number, sharesAmount: bigint, minOut: number) => MethodParameters;
5
5
  export declare const encodeTransferFromMAToPool: (accountId: number, amount: bigint, sig: EIP712Signature, poolId: number, owner: string, minShares: bigint) => MethodParameters;
6
- export declare const encodeWithdrawPassivePoolAndBridge: (owner: string, poolId: number, sharesAmount: bigint, minOut: bigint, sig: EIP712Signature, socketMsgGasLimit: bigint, sockerConnector: string, socketController: string, receiver: string) => MethodParameters;
7
- export declare const encodeBridgeAndDepositPassivePool: (receiver: string, msgGasLimit: bigint, connector: string, poolId: number, owner: string, amount: bigint, minShares: bigint) => MethodParameters;
6
+ export declare const encodeWithdrawPassivePoolAndBridge: (owner: string, poolId: number, sharesAmount: bigint, minOut: bigint, sig: EIP712Signature, socketMsgGasLimit: bigint, socketConnector: string, socketController: string, receiver: string) => MethodParameters;
7
+ export declare const encodeBridgeAndDepositPassivePool: (receiver: string, socketMsgGasLimit: bigint, socketConnector: string, socketFees: bigint, poolId: number, owner: string, amount: bigint, minShares: bigint) => MethodParameters;
8
8
  //# sourceMappingURL=encode.d.ts.map
@@ -1 +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,SACP,MAAM,aACF,MAAM,KAChB,gBAMF,CAAC;AAEF,eAAO,MAAM,kCAAkC,UACtC,MAAM,UACL,MAAM,gBACA,MAAM,UACZ,MAAM,OACT,eAAe,qBACD,MAAM,mBACR,MAAM,oBACL,MAAM,YACd,MAAM,KACf,gBAkBF,CAAC;AAEF,eAAO,MAAM,iCAAiC,aAClC,MAAM,eACH,MAAM,aACR,MAAM,UACT,MAAM,SACP,MAAM,UACL,MAAM,aACH,MAAM,KAChB,gBAkBF,CAAC"}
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,SACP,MAAM,aACF,MAAM,KAChB,gBAMF,CAAC;AAEF,eAAO,MAAM,kCAAkC,UACtC,MAAM,UACL,MAAM,gBACA,MAAM,UACZ,MAAM,OACT,eAAe,qBACD,MAAM,mBACR,MAAM,oBACL,MAAM,YACd,MAAM,KACf,gBAkBF,CAAC;AAEF,eAAO,MAAM,iCAAiC,aAClC,MAAM,qBACG,MAAM,mBACR,MAAM,cACX,MAAM,UACV,MAAM,SACP,MAAM,UACL,MAAM,aACH,MAAM,KAChB,gBAkBF,CAAC"}
@@ -4,4 +4,7 @@ export * from './bridgeAndDepositPassivePool';
4
4
  export * from './transferFromMAToPool';
5
5
  export * from './withdrawPassivePoolAndBridge';
6
6
  export * from './simulateTransferFromMAToPool';
7
+ export * from './simulateBridgeAndDepositPassivePool';
8
+ export * from './simulateWithdrawPassivePoolAndBridge';
9
+ export * from './simulateBridgeAndDepositPassivePool';
7
10
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["services/lp/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,MAAM,CAAC;AACrB,cAAc,+BAA+B,CAAC;AAC9C,cAAc,wBAAwB,CAAC;AACvC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,gCAAgC,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["services/lp/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,MAAM,CAAC;AACrB,cAAc,+BAA+B,CAAC;AAC9C,cAAc,wBAAwB,CAAC;AACvC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,uCAAuC,CAAC;AACtD,cAAc,wCAAwC,CAAC;AACvD,cAAc,uCAAuC,CAAC"}
@@ -0,0 +1,3 @@
1
+ import { SimulateBridgeAndDepositPassivePoolParams, SimulateBridgeAndDepositPassivePoolResult } from './types';
2
+ export declare const simulateBridgeAndDepositPassivePool: (params: SimulateBridgeAndDepositPassivePoolParams) => Promise<SimulateBridgeAndDepositPassivePoolResult>;
3
+ //# sourceMappingURL=simulateBridgeAndDepositPassivePool.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"simulateBridgeAndDepositPassivePool.d.ts","sourceRoot":"/","sources":["services/lp/simulateBridgeAndDepositPassivePool.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,yCAAyC,EACzC,yCAAyC,EAC1C,MAAM,SAAS,CAAC;AAgBjB,eAAO,MAAM,mCAAmC,WAEtC,yCAAyC,KAChD,QAAQ,yCAAyC,CASnD,CAAC"}
@@ -0,0 +1,3 @@
1
+ import { SimulateWithdrawPassivePoolAndBridgeParams, SimulateWithdrawPassivePoolAndBridgeResult } from './types';
2
+ export declare const simulateWithdrawPassivePoolAndBridge: (params: SimulateWithdrawPassivePoolAndBridgeParams) => Promise<SimulateWithdrawPassivePoolAndBridgeResult>;
3
+ //# sourceMappingURL=simulateWithdrawPassivePoolAndBridge.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"simulateWithdrawPassivePoolAndBridge.d.ts","sourceRoot":"/","sources":["services/lp/simulateWithdrawPassivePoolAndBridge.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,0CAA0C,EAC1C,0CAA0C,EAC3C,MAAM,SAAS,CAAC;AAejB,eAAO,MAAM,oCAAoC,WAEvC,0CAA0C,KACjD,QAAQ,0CAA0C,CASpD,CAAC"}
@@ -55,4 +55,23 @@ export type SimulateTransferFromMAToPoolParams = {
55
55
  tokenAddress: LpPoolEntity['tokenAddress'];
56
56
  amount: number;
57
57
  };
58
+ export type SimulateBridgeAndDepositPassivePoolResult = {
59
+ bridgeGasFees: number;
60
+ estimatedDepositedAmount: number;
61
+ };
62
+ export type SimulateBridgeAndDepositPassivePoolParams = {
63
+ signer: Signer | JsonRpcSigner;
64
+ lpPoolId: LpPoolEntity['id'];
65
+ tokenAddress: LpPoolEntity['tokenAddress'];
66
+ amount: number;
67
+ };
68
+ export type SimulateWithdrawPassivePoolAndBridgeResult = {
69
+ bridgeGasFees: number;
70
+ };
71
+ export type SimulateWithdrawPassivePoolAndBridgeParams = {
72
+ signer: Signer | JsonRpcSigner;
73
+ lpPoolId: LpPoolEntity['id'];
74
+ tokenAddress: LpPoolEntity['tokenAddress'];
75
+ amount: number;
76
+ };
58
77
  //# sourceMappingURL=types.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/lp/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EACL,YAAY,EACZ,uBAAuB,EACvB,mBAAmB,EACnB,mBAAmB,EACpB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,sBAAsB,GAAG;IACnC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,QAAQ,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,KAAK,EAAE,IAAI,CAAC,mBAAmB,EAAE,SAAS,GAAG,cAAc,CAAC,CAAC;IAC7D,eAAe,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC3C,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,GAAG,cAAc,CAAC,CAAC;IAChD,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,kCAAkC,GAAG;IAC/C,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,KAAK,EAAE,IAAI,CAAC,mBAAmB,EAAE,SAAS,GAAG,cAAc,CAAC,CAAC;IAC7D,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,GAAG,cAAc,CAAC,CAAC;IAChD,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,uBAAuB,CAAC,gBAAgB,CAAC,CAAC;CACvD,CAAC;AAEF,MAAM,MAAM,kCAAkC,GAAG;IAC/C,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG;IAC9C,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,YAAY,EAAE,mBAAmB,CAAC,SAAS,CAAC,CAAC;IAC7C,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,GAAG,cAAc,CAAC,CAAC;IAChD,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG;IAC9C,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,kCAAkC,GAAG;IAC/C,aAAa,EAAE,MAAM,CAAC;IACtB,wBAAwB,EAAE,MAAM,CAAC;CAClC,CAAC;AAGF,MAAM,MAAM,kCAAkC,GAAG;IAC/C,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,QAAQ,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;IAC7B,YAAY,EAAE,YAAY,CAAC,cAAc,CAAC,CAAC;IAC3C,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/lp/types.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"bridgeAndDepositExistingMA.d.ts","sourceRoot":"/","sources":["services/margin-accounts/bridgeAndDepositExistingMA.ts"],"names":[],"mappings":"AASA,OAAO,EACL,+BAA+B,EAC/B,+BAA+B,EAChC,MAAM,SAAS,CAAC;AAIjB,eAAO,MAAM,yBAAyB,WAC5B,+BAA+B,KACtC,QAAQ,+BAA+B,CAyCzC,CAAC"}
1
+ {"version":3,"file":"bridgeAndDepositExistingMA.d.ts","sourceRoot":"/","sources":["services/margin-accounts/bridgeAndDepositExistingMA.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,+BAA+B,EAC/B,+BAA+B,EAChC,MAAM,SAAS,CAAC;AAIjB,eAAO,MAAM,yBAAyB,WAC5B,+BAA+B,KACtC,QAAQ,+BAA+B,CA4CzC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"bridgeAndDepositNewMA.d.ts","sourceRoot":"/","sources":["services/margin-accounts/bridgeAndDepositNewMA.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,2BAA2B,EAC3B,2BAA2B,EAC5B,MAAM,SAAS,CAAC;AAEjB,eAAO,MAAM,qBAAqB,WACxB,2BAA2B,KAClC,QAAQ,2BAA2B,CAiCrC,CAAC"}
1
+ {"version":3,"file":"bridgeAndDepositNewMA.d.ts","sourceRoot":"/","sources":["services/margin-accounts/bridgeAndDepositNewMA.ts"],"names":[],"mappings":"AASA,OAAO,EACL,2BAA2B,EAC3B,2BAA2B,EAC5B,MAAM,SAAS,CAAC;AAEjB,eAAO,MAAM,qBAAqB,WACxB,2BAA2B,KAClC,QAAQ,2BAA2B,CAoCrC,CAAC"}
@@ -5,6 +5,6 @@ export declare const encodeDeposit: (accountId: number, token: string, amount: b
5
5
  export declare const encodeWithdraw: (accountId: number, token: string, amount: bigint) => MethodParameters;
6
6
  export declare const encodeTransferMargin: (fromMarginAccountId: number, toMarginAccountId: number, token: string, amount: bigint) => MethodParameters;
7
7
  export declare const encodeWithdrawMAAndBridge: (accountId: number, token: string, tokenAmount: bigint, sig: EIP712Signature, socketMsgGasLimit: bigint, socketConnector: string, socketController: string, receiver: string) => MethodParameters;
8
- export declare const encodeBridgeAndDepositNewMA: (receiver: string, msgGasLimit: bigint, connector: string, accountOwner: string, token: string, tokenAmount: bigint) => MethodParameters;
9
- export declare const encodeBridgeAndDepositExistingMA: (receiver: string, msgGasLimit: bigint, connector: string, accountId: number, token: string, tokenAmount: bigint, sig: EIP712Signature) => MethodParameters;
8
+ export declare const encodeBridgeAndDepositNewMA: (receiver: string, socketMsgGasLimit: bigint, socketConnector: string, socketFees: bigint, accountOwner: string, token: string, tokenAmount: bigint) => MethodParameters;
9
+ export declare const encodeBridgeAndDepositExistingMA: (receiver: string, socketMsgGasLimit: bigint, socketConnector: string, socketFees: bigint, accountId: number, token: string, tokenAmount: bigint, sig: EIP712Signature) => MethodParameters;
10
10
  //# sourceMappingURL=encode.d.ts.map
@@ -1 +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;AAYnE,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE1C,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,wBACV,MAAM,qBACR,MAAM,SAClB,MAAM,UACL,MAAM,KACb,gBAWF,CAAC;AAEF,eAAO,MAAM,yBAAyB,cACzB,MAAM,SACV,MAAM,eACA,MAAM,OACd,eAAe,qBACD,MAAM,mBACR,MAAM,oBACL,MAAM,YACd,MAAM,KACf,gBAiBF,CAAC;AAEF,eAAO,MAAM,2BAA2B,aAC5B,MAAM,eACH,MAAM,aACR,MAAM,gBACH,MAAM,SACb,MAAM,eACA,MAAM,KAClB,gBAkBF,CAAC;AAEF,eAAO,MAAM,gCAAgC,aACjC,MAAM,eACH,MAAM,aACR,MAAM,aACN,MAAM,SACV,MAAM,eACA,MAAM,OACd,eAAe,KACnB,gBAkBF,CAAC"}
1
+ {"version":3,"file":"encode.d.ts","sourceRoot":"/","sources":["services/margin-accounts/encode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAe,MAAM,oBAAoB,CAAC;AAYnE,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE1C,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,wBACV,MAAM,qBACR,MAAM,SAClB,MAAM,UACL,MAAM,KACb,gBAWF,CAAC;AAEF,eAAO,MAAM,yBAAyB,cACzB,MAAM,SACV,MAAM,eACA,MAAM,OACd,eAAe,qBACD,MAAM,mBACR,MAAM,oBACL,MAAM,YACd,MAAM,KACf,gBAiBF,CAAC;AAEF,eAAO,MAAM,2BAA2B,aAC5B,MAAM,qBACG,MAAM,mBACR,MAAM,cACX,MAAM,gBACJ,MAAM,SACb,MAAM,eACA,MAAM,KAClB,gBAkBF,CAAC;AAEF,eAAO,MAAM,gCAAgC,aACjC,MAAM,qBACG,MAAM,mBACR,MAAM,cACX,MAAM,aACP,MAAM,SACV,MAAM,eACA,MAAM,OACd,eAAe,KACnB,gBAkBF,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@reyaxyz/sdk",
3
- "version": "0.21.2",
3
+ "version": "0.23.0",
4
4
  "publishConfig": {
5
5
  "access": "public",
6
6
  "registry": "https://registry.npmjs.org"
@@ -29,10 +29,10 @@
29
29
  "generate:coverage-badges": "npx istanbul-badges-readme --silent"
30
30
  },
31
31
  "dependencies": {
32
- "@reyaxyz/common": "0.16.0",
32
+ "@reyaxyz/common": "0.17.0",
33
33
  "bignumber.js": "^9.1.2",
34
34
  "ethers": "6.9.0"
35
35
  },
36
36
  "packageManager": "pnpm@8.10.4",
37
- "gitHead": "c5bb40cc3334b6335e2891fb9c0aa4a0f538569c"
37
+ "gitHead": "115a94cab6217538f96c94d37e2679607a424efd"
38
38
  }
@@ -1,4 +1,9 @@
1
- import { Address, getSocketConnector, getSocketVault } from '@reyaxyz/common';
1
+ import {
2
+ Address,
3
+ getSocketConnector,
4
+ getSocketFees,
5
+ getSocketVault,
6
+ } from '@reyaxyz/common';
2
7
  import { ContractType, getAddress } from '../../utils/contractAddresses';
3
8
  import { executeTransaction } from '../executeTransaction';
4
9
  import { getTokenDetails, scale } from '../token/common';
@@ -24,6 +29,9 @@ export const bridgeAndDepositPassivePool = async (
24
29
  chainId: chainId,
25
30
  tokenAddress: params.pool.tokenAddress.toLowerCase() as Address,
26
31
  }),
32
+ getSocketFees({
33
+ moneyInOutChainId: chainId,
34
+ }),
27
35
  params.pool.id,
28
36
  params.ownerAddress,
29
37
  amount,
@@ -60,7 +60,7 @@ export const encodeWithdrawPassivePoolAndBridge = (
60
60
  minOut: bigint,
61
61
  sig: EIP712Signature,
62
62
  socketMsgGasLimit: bigint,
63
- sockerConnector: string,
63
+ socketConnector: string,
64
64
  socketController: string,
65
65
  receiver: string,
66
66
  ): MethodParameters => {
@@ -73,7 +73,7 @@ export const encodeWithdrawPassivePoolAndBridge = (
73
73
  minOut,
74
74
  sig,
75
75
  socketMsgGasLimit,
76
- sockerConnector,
76
+ socketConnector,
77
77
  socketController,
78
78
  receiver,
79
79
  },
@@ -85,8 +85,9 @@ export const encodeWithdrawPassivePoolAndBridge = (
85
85
 
86
86
  export const encodeBridgeAndDepositPassivePool = (
87
87
  receiver: string,
88
- msgGasLimit: bigint,
89
- connector: string,
88
+ socketMsgGasLimit: bigint,
89
+ socketConnector: string,
90
+ socketFees: bigint,
90
91
  poolId: number,
91
92
  owner: string,
92
93
  amount: bigint,
@@ -102,11 +103,11 @@ export const encodeBridgeAndDepositPassivePool = (
102
103
  const parameters = [
103
104
  receiver,
104
105
  amount,
105
- msgGasLimit,
106
- connector,
106
+ socketMsgGasLimit,
107
+ socketConnector,
107
108
  peripheryCalldata,
108
109
  ];
109
110
  const INTERFACE = new Interface(Socket_VaultWithPayloadAbi);
110
111
  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
111
- return { calldata: calldata, value: BigInt(0).toString(10) };
112
+ return { calldata: calldata, value: socketFees.toString(10) };
112
113
  };
@@ -4,3 +4,6 @@ export * from './bridgeAndDepositPassivePool';
4
4
  export * from './transferFromMAToPool';
5
5
  export * from './withdrawPassivePoolAndBridge';
6
6
  export * from './simulateTransferFromMAToPool';
7
+ export * from './simulateBridgeAndDepositPassivePool';
8
+ export * from './simulateWithdrawPassivePoolAndBridge';
9
+ export * from './simulateBridgeAndDepositPassivePool';
@@ -0,0 +1,32 @@
1
+ import {
2
+ SimulateBridgeAndDepositPassivePoolParams,
3
+ SimulateBridgeAndDepositPassivePoolResult,
4
+ } from './types';
5
+
6
+ // The maximum is inclusive and the minimum is inclusive
7
+ function getRandomIntInclusive(min: number, max: number) {
8
+ min = Math.ceil(min);
9
+ max = Math.floor(max);
10
+ return Math.floor(Math.random() * (max - min + 1) + min);
11
+ }
12
+
13
+ const randomSimulation = (): SimulateBridgeAndDepositPassivePoolResult => {
14
+ return {
15
+ bridgeGasFees: getRandomIntInclusive(1000, 100000),
16
+ estimatedDepositedAmount: getRandomIntInclusive(1000, 100000),
17
+ };
18
+ };
19
+
20
+ export const simulateBridgeAndDepositPassivePool = async (
21
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
22
+ params: SimulateBridgeAndDepositPassivePoolParams,
23
+ ): Promise<SimulateBridgeAndDepositPassivePoolResult> => {
24
+ return await new Promise((resolve) => {
25
+ setTimeout(
26
+ () => {
27
+ resolve(randomSimulation());
28
+ },
29
+ Math.random() * 100 + 1000,
30
+ );
31
+ });
32
+ };
@@ -0,0 +1,31 @@
1
+ import {
2
+ SimulateWithdrawPassivePoolAndBridgeParams,
3
+ SimulateWithdrawPassivePoolAndBridgeResult,
4
+ } from './types';
5
+
6
+ // The maximum is inclusive and the minimum is inclusive
7
+ function getRandomIntInclusive(min: number, max: number) {
8
+ min = Math.ceil(min);
9
+ max = Math.floor(max);
10
+ return Math.floor(Math.random() * (max - min + 1) + min);
11
+ }
12
+
13
+ const randomSimulation = (): SimulateWithdrawPassivePoolAndBridgeResult => {
14
+ return {
15
+ bridgeGasFees: getRandomIntInclusive(1000, 100000),
16
+ };
17
+ };
18
+
19
+ export const simulateWithdrawPassivePoolAndBridge = async (
20
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
21
+ params: SimulateWithdrawPassivePoolAndBridgeParams,
22
+ ): Promise<SimulateWithdrawPassivePoolAndBridgeResult> => {
23
+ return await new Promise((resolve) => {
24
+ setTimeout(
25
+ () => {
26
+ resolve(randomSimulation());
27
+ },
28
+ Math.random() * 100 + 1000,
29
+ );
30
+ });
31
+ };
@@ -61,15 +61,43 @@ export type BridgeAndDepositPassivePoolResult = {
61
61
  transactionHash: string | null;
62
62
  };
63
63
 
64
+ // TODO: Milan, Alex reevaluate these params
64
65
  export type SimulateTransferFromMAToPoolResult = {
65
66
  bridgeGasFees: number;
66
67
  estimatedDepositedAmount: number;
67
68
  };
68
69
 
69
- // TODO: Milan reevaluate these params
70
+ // TODO: Milan, Alex reevaluate these params
70
71
  export type SimulateTransferFromMAToPoolParams = {
71
72
  signer: Signer | JsonRpcSigner;
72
73
  lpPoolId: LpPoolEntity['id'];
73
74
  tokenAddress: LpPoolEntity['tokenAddress'];
74
75
  amount: number;
75
76
  };
77
+
78
+ // TODO: Milan, Alex reevaluate these params
79
+ export type SimulateBridgeAndDepositPassivePoolResult = {
80
+ bridgeGasFees: number;
81
+ estimatedDepositedAmount: number;
82
+ };
83
+
84
+ // TODO: Milan, Alex reevaluate these params
85
+ export type SimulateBridgeAndDepositPassivePoolParams = {
86
+ signer: Signer | JsonRpcSigner;
87
+ lpPoolId: LpPoolEntity['id'];
88
+ tokenAddress: LpPoolEntity['tokenAddress'];
89
+ amount: number;
90
+ };
91
+
92
+ // TODO: Milan, Alex reevaluate these params
93
+ export type SimulateWithdrawPassivePoolAndBridgeResult = {
94
+ bridgeGasFees: number;
95
+ };
96
+
97
+ // TODO: Milan, Alex reevaluate these params
98
+ export type SimulateWithdrawPassivePoolAndBridgeParams = {
99
+ signer: Signer | JsonRpcSigner;
100
+ lpPoolId: LpPoolEntity['id'];
101
+ tokenAddress: LpPoolEntity['tokenAddress'];
102
+ amount: number;
103
+ };
@@ -1,6 +1,7 @@
1
1
  import {
2
2
  getCurrentTimestampInSeconds,
3
3
  getSocketConnector,
4
+ getSocketFees,
4
5
  getSocketVault,
5
6
  } from '@reyaxyz/common';
6
7
  import { ContractType, getAddress } from '../../utils/contractAddresses';
@@ -37,6 +38,9 @@ export const bridgeAndDepositExisingMA = async (
37
38
  chainId: chainId,
38
39
  tokenAddress: params.tokenAddress,
39
40
  }),
41
+ getSocketFees({
42
+ moneyInOutChainId: chainId,
43
+ }),
40
44
  params.marginAccountId,
41
45
  params.tokenAddress,
42
46
  amount,
@@ -1,4 +1,8 @@
1
- import { getSocketConnector, getSocketVault } from '@reyaxyz/common';
1
+ import {
2
+ getSocketConnector,
3
+ getSocketFees,
4
+ getSocketVault,
5
+ } from '@reyaxyz/common';
2
6
  import { ContractType, getAddress } from '../../utils/contractAddresses';
3
7
  import { executeTransaction } from '../executeTransaction';
4
8
  import { getTokenDetails, scale } from '../token/common';
@@ -24,6 +28,9 @@ export const bridgeAndDepositNewMA = async (
24
28
  chainId: chainId,
25
29
  tokenAddress: params.tokenAddress,
26
30
  }),
31
+ getSocketFees({
32
+ moneyInOutChainId: chainId,
33
+ }),
27
34
  params.ownerAddress,
28
35
  params.tokenAddress,
29
36
  amount,
@@ -104,8 +104,9 @@ export const encodeWithdrawMAAndBridge = (
104
104
 
105
105
  export const encodeBridgeAndDepositNewMA = (
106
106
  receiver: string,
107
- msgGasLimit: bigint,
108
- connector: string,
107
+ socketMsgGasLimit: bigint,
108
+ socketConnector: string,
109
+ socketFees: bigint,
109
110
  accountOwner: string,
110
111
  token: string,
111
112
  tokenAmount: bigint,
@@ -120,19 +121,20 @@ export const encodeBridgeAndDepositNewMA = (
120
121
  const parameters = [
121
122
  receiver,
122
123
  tokenAmount,
123
- msgGasLimit,
124
- connector,
124
+ socketMsgGasLimit,
125
+ socketConnector,
125
126
  peripheryCalldata,
126
127
  ];
127
128
  const INTERFACE = new Interface(Socket_VaultWithPayloadAbi);
128
129
  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
129
- return { calldata: calldata, value: BigInt(0).toString(10) };
130
+ return { calldata: calldata, value: socketFees.toString(10) };
130
131
  };
131
132
 
132
133
  export const encodeBridgeAndDepositExistingMA = (
133
134
  receiver: string,
134
- msgGasLimit: bigint,
135
- connector: string,
135
+ socketMsgGasLimit: bigint,
136
+ socketConnector: string,
137
+ socketFees: bigint,
136
138
  accountId: number,
137
139
  token: string,
138
140
  tokenAmount: bigint,
@@ -148,11 +150,11 @@ export const encodeBridgeAndDepositExistingMA = (
148
150
  const parameters = [
149
151
  receiver,
150
152
  tokenAmount,
151
- msgGasLimit,
152
- connector,
153
+ socketMsgGasLimit,
154
+ socketConnector,
153
155
  peripheryCalldata,
154
156
  ];
155
157
  const INTERFACE = new Interface(Socket_VaultWithPayloadAbi);
156
158
  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
157
- return { calldata: calldata, value: BigInt(0).toString(10) };
159
+ return { calldata: calldata, value: socketFees.toString(10) };
158
160
  };