@reyaxyz/sdk 0.24.7 → 0.25.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 (84) hide show
  1. package/dist/services/lp/bridgeAndDepositPassivePool.js +2 -2
  2. package/dist/services/lp/bridgeAndDepositPassivePool.js.map +1 -1
  3. package/dist/services/lp/index.js +0 -2
  4. package/dist/services/lp/index.js.map +1 -1
  5. package/dist/services/lp/simulateBridgeAndDepositPassivePool.js +13 -60
  6. package/dist/services/lp/simulateBridgeAndDepositPassivePool.js.map +1 -1
  7. package/dist/services/lp/simulateWithdrawPassivePoolAndBridge.js +14 -58
  8. package/dist/services/lp/simulateWithdrawPassivePoolAndBridge.js.map +1 -1
  9. package/dist/services/lp/transferFromMAToPool.js +1 -1
  10. package/dist/services/lp/transferFromMAToPool.js.map +1 -1
  11. package/dist/services/lp/types.js.map +1 -1
  12. package/dist/services/lp/withdrawPassivePoolAndBridge.js +1 -2
  13. package/dist/services/lp/withdrawPassivePoolAndBridge.js.map +1 -1
  14. package/dist/services/margin-accounts/bridgeAndDepositExistingMA.js +2 -2
  15. package/dist/services/margin-accounts/bridgeAndDepositExistingMA.js.map +1 -1
  16. package/dist/services/margin-accounts/bridgeAndDepositNewMA.js +2 -2
  17. package/dist/services/margin-accounts/bridgeAndDepositNewMA.js.map +1 -1
  18. package/dist/services/margin-accounts/deposit.js +2 -1
  19. package/dist/services/margin-accounts/deposit.js.map +1 -1
  20. package/dist/services/margin-accounts/index.js +0 -3
  21. package/dist/services/margin-accounts/index.js.map +1 -1
  22. package/dist/services/margin-accounts/transferMarginBetweenAccounts.js +3 -2
  23. package/dist/services/margin-accounts/transferMarginBetweenAccounts.js.map +1 -1
  24. package/dist/services/margin-accounts/withdraw.js +2 -1
  25. package/dist/services/margin-accounts/withdraw.js.map +1 -1
  26. package/dist/services/margin-accounts/withdrawMAAndBridge.js +1 -1
  27. package/dist/services/margin-accounts/withdrawMAAndBridge.js.map +1 -1
  28. package/dist/services/token/common.js +5 -18
  29. package/dist/services/token/common.js.map +1 -1
  30. package/dist/types/services/lp/bridgeAndDepositPassivePool.d.ts.map +1 -1
  31. package/dist/types/services/lp/index.d.ts +0 -2
  32. package/dist/types/services/lp/index.d.ts.map +1 -1
  33. package/dist/types/services/lp/simulateBridgeAndDepositPassivePool.d.ts +1 -1
  34. package/dist/types/services/lp/simulateBridgeAndDepositPassivePool.d.ts.map +1 -1
  35. package/dist/types/services/lp/simulateWithdrawPassivePoolAndBridge.d.ts +1 -1
  36. package/dist/types/services/lp/simulateWithdrawPassivePoolAndBridge.d.ts.map +1 -1
  37. package/dist/types/services/lp/types.d.ts +10 -22
  38. package/dist/types/services/lp/types.d.ts.map +1 -1
  39. package/dist/types/services/margin-accounts/bridgeAndDepositExistingMA.d.ts.map +1 -1
  40. package/dist/types/services/margin-accounts/bridgeAndDepositNewMA.d.ts.map +1 -1
  41. package/dist/types/services/margin-accounts/deposit.d.ts.map +1 -1
  42. package/dist/types/services/margin-accounts/index.d.ts +0 -3
  43. package/dist/types/services/margin-accounts/index.d.ts.map +1 -1
  44. package/dist/types/services/margin-accounts/transferMarginBetweenAccounts.d.ts.map +1 -1
  45. package/dist/types/services/margin-accounts/withdraw.d.ts.map +1 -1
  46. package/dist/types/services/margin-accounts/withdrawMAAndBridge.d.ts.map +1 -1
  47. package/dist/types/services/token/common.d.ts +0 -2
  48. package/dist/types/services/token/common.d.ts.map +1 -1
  49. package/package.json +3 -3
  50. package/src/services/lp/bridgeAndDepositPassivePool.ts +4 -3
  51. package/src/services/lp/index.ts +0 -2
  52. package/src/services/lp/simulateBridgeAndDepositPassivePool.ts +16 -23
  53. package/src/services/lp/simulateWithdrawPassivePoolAndBridge.ts +17 -22
  54. package/src/services/lp/transferFromMAToPool.ts +2 -2
  55. package/src/services/lp/types.ts +12 -29
  56. package/src/services/lp/withdrawPassivePoolAndBridge.ts +1 -1
  57. package/src/services/margin-accounts/bridgeAndDepositExistingMA.ts +4 -3
  58. package/src/services/margin-accounts/bridgeAndDepositNewMA.ts +4 -3
  59. package/src/services/margin-accounts/deposit.ts +2 -1
  60. package/src/services/margin-accounts/index.ts +0 -3
  61. package/src/services/margin-accounts/transferMarginBetweenAccounts.ts +2 -1
  62. package/src/services/margin-accounts/withdraw.ts +2 -1
  63. package/src/services/margin-accounts/withdrawMAAndBridge.ts +2 -1
  64. package/src/services/token/common.ts +2 -19
  65. package/dist/services/lp/simulateTransferFromMAToPool.js +0 -67
  66. package/dist/services/lp/simulateTransferFromMAToPool.js.map +0 -1
  67. package/dist/services/margin-accounts/simulateDeposit.js +0 -68
  68. package/dist/services/margin-accounts/simulateDeposit.js.map +0 -1
  69. package/dist/services/margin-accounts/simulateTransferMarginBetweenAccounts.js +0 -68
  70. package/dist/services/margin-accounts/simulateTransferMarginBetweenAccounts.js.map +0 -1
  71. package/dist/services/margin-accounts/simulateWithdraw.js +0 -68
  72. package/dist/services/margin-accounts/simulateWithdraw.js.map +0 -1
  73. package/dist/types/services/lp/simulateTransferFromMAToPool.d.ts +0 -3
  74. package/dist/types/services/lp/simulateTransferFromMAToPool.d.ts.map +0 -1
  75. package/dist/types/services/margin-accounts/simulateDeposit.d.ts +0 -3
  76. package/dist/types/services/margin-accounts/simulateDeposit.d.ts.map +0 -1
  77. package/dist/types/services/margin-accounts/simulateTransferMarginBetweenAccounts.d.ts +0 -3
  78. package/dist/types/services/margin-accounts/simulateTransferMarginBetweenAccounts.d.ts.map +0 -1
  79. package/dist/types/services/margin-accounts/simulateWithdraw.d.ts +0 -3
  80. package/dist/types/services/margin-accounts/simulateWithdraw.d.ts.map +0 -1
  81. package/src/services/lp/simulateTransferFromMAToPool.ts +0 -32
  82. package/src/services/margin-accounts/simulateDeposit.ts +0 -30
  83. package/src/services/margin-accounts/simulateTransferMarginBetweenAccounts.ts +0 -33
  84. package/src/services/margin-accounts/simulateWithdraw.ts +0 -30
@@ -1 +1 @@
1
- {"version":3,"file":"common.js","sourceRoot":"/","sources":["services/token/common.ts"],"names":[],"mappings":"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","sourcesContent":["import { Contract, ethers, Signer } from 'ethers';\nimport { tokenDetails } from './consts';\nimport { exponentialBackoff } from '../../utils/retry';\nimport { GetERC20AllowanceParams } from './types';\n\nexport const descale = (tokenDecimals: number) => {\n const f = (value: bigint) => {\n return Number(ethers.formatUnits(value.toString(), tokenDecimals));\n };\n\n return f;\n};\n\nexport const scale = (tokenDecimals: number) => {\n const f = (value: number) => {\n return BigInt(\n ethers.parseUnits(value.toFixed(tokenDecimals), tokenDecimals),\n );\n };\n\n return f;\n};\n\nexport const getERC20TokenContract = (\n tokenAddress: string,\n subject: Signer,\n): Contract => {\n const abi: string[] = [\n `function approve(address, uint256) external returns (bool)`,\n `function balanceOf(address) external view returns (uint256)`,\n `function allowance(address,address) external view returns (uint256)`,\n `function approve(address,uint256) external returns (bool)`,\n ];\n\n const contract = new Contract(tokenAddress, abi, subject);\n\n return contract;\n};\n\nexport type Address = Lowercase<string>;\n\nexport const convertToAddress = (str: string): Address => {\n return str.toLowerCase() as Address;\n};\n\nexport const getTokenDetails = (\n caseSensitiveAddress: string,\n): {\n tokenName: Uppercase<string>;\n tokenDecimals: number;\n tokenDescaler: (value: bigint) => number;\n} => {\n const address = convertToAddress(caseSensitiveAddress);\n\n if (!Object.keys(tokenDetails).includes(address)) {\n throw new Error(`Token details not found for ${address}.`);\n }\n\n const { tokenName, tokenDecimals } = tokenDetails[address];\n\n return {\n tokenName,\n tokenDecimals,\n tokenDescaler: descale(tokenDecimals),\n };\n};\n\nexport const getERC20Allowance = async ({\n walletAddress,\n tokenAddress,\n spenderAddress,\n subject,\n}: GetERC20AllowanceParams): Promise<number> => {\n const tokenContract = getERC20TokenContract(tokenAddress, subject);\n const { tokenDecimals } = getTokenDetails(tokenAddress);\n\n const allowance = await exponentialBackoff(() =>\n tokenContract.allowance(walletAddress, spenderAddress),\n );\n\n return BigInt(allowance) > scale(tokenDecimals)(Number.MAX_SAFE_INTEGER)\n ? Number.MAX_SAFE_INTEGER\n : descale(tokenDecimals)(allowance);\n};\n\nexport type GetERC20BalanceArgs = {\n tokenAddress: string;\n walletAddress: string;\n subject: Signer;\n};\n\nexport const getERC20Balance = async ({\n tokenAddress,\n walletAddress,\n subject,\n}: GetERC20BalanceArgs): Promise<number> => {\n const token = getERC20TokenContract(tokenAddress, subject);\n\n const { tokenDescaler } = getTokenDetails(tokenAddress);\n\n const currentBalance = await exponentialBackoff(() =>\n token.balanceOf(walletAddress),\n );\n\n return tokenDescaler(currentBalance);\n};\n"]}
1
+ {"version":3,"file":"common.js","sourceRoot":"/","sources":["services/token/common.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAA0C;AAC1C,mCAAwC;AACxC,2CAAuD;AAEvD,0CAAiD;AAE1C,IAAM,qBAAqB,GAAG,UACnC,YAAoB,EACpB,OAAe;IAEf,IAAM,GAAG,GAAa;QACpB,4DAA4D;QAC5D,6DAA6D;QAC7D,qEAAqE;QACrE,2DAA2D;KAC5D,CAAC;IAEF,IAAM,QAAQ,GAAG,IAAI,iBAAQ,CAAC,YAAY,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;IAE1D,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAdW,QAAA,qBAAqB,yBAchC;AAIK,IAAM,gBAAgB,GAAG,UAAC,GAAW;IAC1C,OAAO,GAAG,CAAC,WAAW,EAAa,CAAC;AACtC,CAAC,CAAC;AAFW,QAAA,gBAAgB,oBAE3B;AAEK,IAAM,eAAe,GAAG,UAC7B,oBAA4B;IAM5B,IAAM,OAAO,GAAG,IAAA,wBAAgB,EAAC,oBAAoB,CAAC,CAAC;IAEvD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qBAAY,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QACjD,MAAM,IAAI,KAAK,CAAC,sCAA+B,OAAO,MAAG,CAAC,CAAC;IAC7D,CAAC;IAEK,IAAA,KAA+B,qBAAY,CAAC,OAAO,CAAC,EAAlD,SAAS,eAAA,EAAE,aAAa,mBAA0B,CAAC;IAE3D,OAAO;QACL,SAAS,WAAA;QACT,aAAa,eAAA;QACb,aAAa,EAAE,IAAA,gBAAO,EAAC,aAAa,CAAC;KACtC,CAAC;AACJ,CAAC,CAAC;AApBW,QAAA,eAAe,mBAoB1B;AAEK,IAAM,iBAAiB,GAAG,UAAO,EAKd;QAJxB,aAAa,mBAAA,EACb,YAAY,kBAAA,EACZ,cAAc,oBAAA,EACd,OAAO,aAAA;;;;;;oBAED,aAAa,GAAG,IAAA,6BAAqB,EAAC,YAAY,EAAE,OAAO,CAAC,CAAC;oBAC3D,aAAa,GAAK,IAAA,uBAAe,EAAC,YAAY,CAAC,cAAlC,CAAmC;oBAEtC,qBAAM,IAAA,0BAAkB,EAAC;4BACzC,OAAA,aAAa,CAAC,SAAS,CAAC,aAAa,EAAE,cAAc,CAAC;wBAAtD,CAAsD,CACvD,EAAA;;oBAFK,SAAS,GAAG,SAEjB;oBAED,sBAAO,MAAM,CAAC,SAAS,CAAC,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC;4BACtE,CAAC,CAAC,MAAM,CAAC,gBAAgB;4BACzB,CAAC,CAAC,IAAA,gBAAO,EAAC,aAAa,CAAC,CAAC,SAAS,CAAC,EAAC;;;;CACvC,CAAC;AAhBW,QAAA,iBAAiB,qBAgB5B;AAQK,IAAM,eAAe,GAAG,UAAO,EAIhB;QAHpB,YAAY,kBAAA,EACZ,aAAa,mBAAA,EACb,OAAO,aAAA;;;;;;oBAED,KAAK,GAAG,IAAA,6BAAqB,EAAC,YAAY,EAAE,OAAO,CAAC,CAAC;oBAEnD,aAAa,GAAK,IAAA,uBAAe,EAAC,YAAY,CAAC,cAAlC,CAAmC;oBAEjC,qBAAM,IAAA,0BAAkB,EAAC;4BAC9C,OAAA,KAAK,CAAC,SAAS,CAAC,aAAa,CAAC;wBAA9B,CAA8B,CAC/B,EAAA;;oBAFK,cAAc,GAAG,SAEtB;oBAED,sBAAO,aAAa,CAAC,cAAc,CAAC,EAAC;;;;CACtC,CAAC;AAdW,QAAA,eAAe,mBAc1B","sourcesContent":["import { Contract, Signer } from 'ethers';\nimport { tokenDetails } from './consts';\nimport { exponentialBackoff } from '../../utils/retry';\nimport { GetERC20AllowanceParams } from './types';\nimport { descale, scale } from '@reyaxyz/common';\n\nexport const getERC20TokenContract = (\n tokenAddress: string,\n subject: Signer,\n): Contract => {\n const abi: string[] = [\n `function approve(address, uint256) external returns (bool)`,\n `function balanceOf(address) external view returns (uint256)`,\n `function allowance(address,address) external view returns (uint256)`,\n `function approve(address,uint256) external returns (bool)`,\n ];\n\n const contract = new Contract(tokenAddress, abi, subject);\n\n return contract;\n};\n\nexport type Address = Lowercase<string>;\n\nexport const convertToAddress = (str: string): Address => {\n return str.toLowerCase() as Address;\n};\n\nexport const getTokenDetails = (\n caseSensitiveAddress: string,\n): {\n tokenName: Uppercase<string>;\n tokenDecimals: number;\n tokenDescaler: (value: bigint) => number;\n} => {\n const address = convertToAddress(caseSensitiveAddress);\n\n if (!Object.keys(tokenDetails).includes(address)) {\n throw new Error(`Token details not found for ${address}.`);\n }\n\n const { tokenName, tokenDecimals } = tokenDetails[address];\n\n return {\n tokenName,\n tokenDecimals,\n tokenDescaler: descale(tokenDecimals),\n };\n};\n\nexport const getERC20Allowance = async ({\n walletAddress,\n tokenAddress,\n spenderAddress,\n subject,\n}: GetERC20AllowanceParams): Promise<number> => {\n const tokenContract = getERC20TokenContract(tokenAddress, subject);\n const { tokenDecimals } = getTokenDetails(tokenAddress);\n\n const allowance = await exponentialBackoff(() =>\n tokenContract.allowance(walletAddress, spenderAddress),\n );\n\n return BigInt(allowance) > scale(tokenDecimals)(Number.MAX_SAFE_INTEGER)\n ? Number.MAX_SAFE_INTEGER\n : descale(tokenDecimals)(allowance);\n};\n\nexport type GetERC20BalanceArgs = {\n tokenAddress: string;\n walletAddress: string;\n subject: Signer;\n};\n\nexport const getERC20Balance = async ({\n tokenAddress,\n walletAddress,\n subject,\n}: GetERC20BalanceArgs): Promise<number> => {\n const token = getERC20TokenContract(tokenAddress, subject);\n\n const { tokenDescaler } = getTokenDetails(tokenAddress);\n\n const currentBalance = await exponentialBackoff(() =>\n token.balanceOf(walletAddress),\n );\n\n return tokenDescaler(currentBalance);\n};\n"]}
@@ -1 +1 @@
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"}
1
+ {"version":3,"file":"bridgeAndDepositPassivePool.d.ts","sourceRoot":"/","sources":["services/lp/bridgeAndDepositPassivePool.ts"],"names":[],"mappings":"AAWA,OAAO,EACL,iCAAiC,EACjC,iCAAiC,EAClC,MAAM,SAAS,CAAC;AAEjB,eAAO,MAAM,2BAA2B,WAC9B,iCAAiC,KACxC,QAAQ,iCAAiC,CAqC3C,CAAC"}
@@ -3,8 +3,6 @@ export * from './lp';
3
3
  export * from './bridgeAndDepositPassivePool';
4
4
  export * from './transferFromMAToPool';
5
5
  export * from './withdrawPassivePoolAndBridge';
6
- export * from './simulateTransferFromMAToPool';
7
6
  export * from './simulateBridgeAndDepositPassivePool';
8
7
  export * from './simulateWithdrawPassivePoolAndBridge';
9
- export * from './simulateBridgeAndDepositPassivePool';
10
8
  //# 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;AAC/C,cAAc,uCAAuC,CAAC;AACtD,cAAc,wCAAwC,CAAC;AACvD,cAAc,uCAAuC,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,uCAAuC,CAAC;AACtD,cAAc,wCAAwC,CAAC"}
@@ -1,3 +1,3 @@
1
1
  import { SimulateBridgeAndDepositPassivePoolParams, SimulateBridgeAndDepositPassivePoolResult } from './types';
2
- export declare const simulateBridgeAndDepositPassivePool: (params: SimulateBridgeAndDepositPassivePoolParams) => Promise<SimulateBridgeAndDepositPassivePoolResult>;
2
+ export declare const simulateBridgeAndDepositPassivePool: (params: SimulateBridgeAndDepositPassivePoolParams) => SimulateBridgeAndDepositPassivePoolResult;
3
3
  //# sourceMappingURL=simulateBridgeAndDepositPassivePool.d.ts.map
@@ -1 +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"}
1
+ {"version":3,"file":"simulateBridgeAndDepositPassivePool.d.ts","sourceRoot":"/","sources":["services/lp/simulateBridgeAndDepositPassivePool.ts"],"names":[],"mappings":"AACA,OAAO,EACL,yCAAyC,EACzC,yCAAyC,EAC1C,MAAM,SAAS,CAAC;AAEjB,eAAO,MAAM,mCAAmC,WACtC,yCAAyC,KAChD,yCAgBF,CAAC"}
@@ -1,3 +1,3 @@
1
1
  import { SimulateWithdrawPassivePoolAndBridgeParams, SimulateWithdrawPassivePoolAndBridgeResult } from './types';
2
- export declare const simulateWithdrawPassivePoolAndBridge: (params: SimulateWithdrawPassivePoolAndBridgeParams) => Promise<SimulateWithdrawPassivePoolAndBridgeResult>;
2
+ export declare const simulateWithdrawPassivePoolAndBridge: (params: SimulateWithdrawPassivePoolAndBridgeParams) => SimulateWithdrawPassivePoolAndBridgeResult;
3
3
  //# sourceMappingURL=simulateWithdrawPassivePoolAndBridge.d.ts.map
@@ -1 +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"}
1
+ {"version":3,"file":"simulateWithdrawPassivePoolAndBridge.d.ts","sourceRoot":"/","sources":["services/lp/simulateWithdrawPassivePoolAndBridge.ts"],"names":[],"mappings":"AACA,OAAO,EACL,0CAA0C,EAC1C,0CAA0C,EAC3C,MAAM,SAAS,CAAC;AAEjB,eAAO,MAAM,oCAAoC,WAEvC,0CAA0C,KACjD,0CAgBF,CAAC"}
@@ -1,5 +1,5 @@
1
1
  import { JsonRpcSigner, Signer } from 'ethers';
2
- import { LpPoolEntity, LpWithdrawBalanceEntity, MarginAccountEntity, OwnerMetadataEntity } from '@reyaxyz/common';
2
+ import { LpPoolEntity, LpWithdrawBalanceEntity, MarginAccountEntity, MoneyInOutChainId, OwnerMetadataEntity, ReyaChainId, TokenEntity } from '@reyaxyz/common';
3
3
  export type ProvideLiquidityParams = {
4
4
  signer: Signer | JsonRpcSigner;
5
5
  amount: number;
@@ -45,33 +45,21 @@ export type BridgeAndDepositPassivePoolParams = {
45
45
  export type BridgeAndDepositPassivePoolResult = {
46
46
  transactionHash: string | null;
47
47
  };
48
- export type SimulateTransferFromMAToPoolResult = {
49
- bridgeGasFees: number;
50
- estimatedDepositedAmount: number;
51
- };
52
- export type SimulateTransferFromMAToPoolParams = {
53
- signer: Signer | JsonRpcSigner;
54
- lpPoolId: LpPoolEntity['id'];
55
- tokenAddress: LpPoolEntity['tokenAddress'];
56
- amount: number;
57
- };
58
48
  export type SimulateBridgeAndDepositPassivePoolResult = {
59
- bridgeGasFees: number;
60
- estimatedDepositedAmount: number;
49
+ fees: number;
50
+ feesUnit: string;
51
+ bridgeTimeInMS: number;
61
52
  };
62
53
  export type SimulateBridgeAndDepositPassivePoolParams = {
63
- signer: Signer | JsonRpcSigner;
64
- lpPoolId: LpPoolEntity['id'];
65
- tokenAddress: LpPoolEntity['tokenAddress'];
66
- amount: number;
54
+ moneyInOutChainId: MoneyInOutChainId;
67
55
  };
68
56
  export type SimulateWithdrawPassivePoolAndBridgeResult = {
69
- bridgeGasFees: number;
57
+ fees: number;
58
+ bridgeTimeInMS: number;
70
59
  };
71
60
  export type SimulateWithdrawPassivePoolAndBridgeParams = {
72
- signer: Signer | JsonRpcSigner;
73
- lpPoolId: LpPoolEntity['id'];
74
- tokenAddress: LpPoolEntity['tokenAddress'];
75
- amount: number;
61
+ reyaChainId: ReyaChainId;
62
+ moneyInOutChainId: MoneyInOutChainId;
63
+ tokenAddress: TokenEntity['address'];
76
64
  };
77
65
  //# sourceMappingURL=types.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/lp/types.ts"],"names":[],"mappings":"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"}
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,iBAAiB,EACjB,mBAAmB,EACnB,WAAW,EACX,WAAW,EACZ,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,yCAAyC,GAAG;IACtD,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,yCAAyC,GAAG;IACtD,iBAAiB,EAAE,iBAAiB,CAAC;CACtC,CAAC;AAEF,MAAM,MAAM,0CAA0C,GAAG;IACvD,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,0CAA0C,GAAG;IACvD,WAAW,EAAE,WAAW,CAAC;IACzB,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,YAAY,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;CACtC,CAAC"}
@@ -1 +1 @@
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
+ {"version":3,"file":"bridgeAndDepositExistingMA.d.ts","sourceRoot":"/","sources":["services/margin-accounts/bridgeAndDepositExistingMA.ts"],"names":[],"mappings":"AAWA,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":"AASA,OAAO,EACL,2BAA2B,EAC3B,2BAA2B,EAC5B,MAAM,SAAS,CAAC;AAEjB,eAAO,MAAM,qBAAqB,WACxB,2BAA2B,KAClC,QAAQ,2BAA2B,CAoCrC,CAAC"}
1
+ {"version":3,"file":"bridgeAndDepositNewMA.d.ts","sourceRoot":"/","sources":["services/margin-accounts/bridgeAndDepositNewMA.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,2BAA2B,EAC3B,2BAA2B,EAC5B,MAAM,SAAS,CAAC;AAEjB,eAAO,MAAM,qBAAqB,WACxB,2BAA2B,KAClC,QAAQ,2BAA2B,CAoCrC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"deposit.d.ts","sourceRoot":"/","sources":["services/margin-accounts/deposit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAMvD,eAAO,MAAM,OAAO,WACV,aAAa,KACpB,QAAQ,aAAa,CAuBvB,CAAC"}
1
+ {"version":3,"file":"deposit.d.ts","sourceRoot":"/","sources":["services/margin-accounts/deposit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAOvD,eAAO,MAAM,OAAO,WACV,aAAa,KACpB,QAAQ,aAAa,CAuBvB,CAAC"}
@@ -1,12 +1,9 @@
1
1
  export * from './types';
2
2
  export * from './account';
3
3
  export * from './deposit';
4
- export * from './simulateDeposit';
5
- export * from './simulateWithdraw';
6
4
  export * from './withdraw';
7
5
  export * from './bridgeAndDepositExistingMA';
8
6
  export * from './bridgeAndDepositNewMA';
9
7
  export * from './transferMarginBetweenAccounts';
10
8
  export * from './withdrawMAAndBridge';
11
- export * from './simulateTransferMarginBetweenAccounts';
12
9
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["services/margin-accounts/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,YAAY,CAAC;AAC3B,cAAc,8BAA8B,CAAC;AAC7C,cAAc,yBAAyB,CAAC;AACxC,cAAc,iCAAiC,CAAC;AAChD,cAAc,uBAAuB,CAAC;AACtC,cAAc,yCAAyC,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["services/margin-accounts/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,8BAA8B,CAAC;AAC7C,cAAc,yBAAyB,CAAC;AACxC,cAAc,iCAAiC,CAAC;AAChD,cAAc,uBAAuB,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"transferMarginBetweenAccounts.d.ts","sourceRoot":"/","sources":["services/margin-accounts/transferMarginBetweenAccounts.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,mCAAmC,EACnC,mCAAmC,EACpC,MAAM,SAAS,CAAC;AAEjB,eAAO,MAAM,6BAA6B,WAChC,mCAAmC,KAC1C,QAAQ,mCAAmC,CAwB7C,CAAC"}
1
+ {"version":3,"file":"transferMarginBetweenAccounts.d.ts","sourceRoot":"/","sources":["services/margin-accounts/transferMarginBetweenAccounts.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,mCAAmC,EACnC,mCAAmC,EACpC,MAAM,SAAS,CAAC;AAEjB,eAAO,MAAM,6BAA6B,WAChC,mCAAmC,KAC1C,QAAQ,mCAAmC,CAwB7C,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"withdraw.d.ts","sourceRoot":"/","sources":["services/margin-accounts/withdraw.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAMzD,eAAO,MAAM,QAAQ,WACX,cAAc,KACrB,QAAQ,cAAc,CAwBxB,CAAC"}
1
+ {"version":3,"file":"withdraw.d.ts","sourceRoot":"/","sources":["services/margin-accounts/withdraw.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAOzD,eAAO,MAAM,QAAQ,WACX,cAAc,KACrB,QAAQ,cAAc,CAwBxB,CAAC"}
@@ -1 +1 @@
1
- {"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;AAGjB,eAAO,MAAM,mBAAmB,+EAO7B,yBAAyB,KAAG,QAAQ,+BAA+B,CA0CrE,CAAC"}
1
+ {"version":3,"file":"withdrawMAAndBridge.d.ts","sourceRoot":"/","sources":["services/margin-accounts/withdrawMAAndBridge.ts"],"names":[],"mappings":"AAWA,OAAO,EACL,yBAAyB,EACzB,+BAA+B,EAChC,MAAM,SAAS,CAAC;AAGjB,eAAO,MAAM,mBAAmB,+EAO7B,yBAAyB,KAAG,QAAQ,+BAA+B,CA0CrE,CAAC"}
@@ -1,7 +1,5 @@
1
1
  import { Contract, Signer } from 'ethers';
2
2
  import { GetERC20AllowanceParams } from './types';
3
- export declare const descale: (tokenDecimals: number) => (value: bigint) => number;
4
- export declare const scale: (tokenDecimals: number) => (value: number) => bigint;
5
3
  export declare const getERC20TokenContract: (tokenAddress: string, subject: Signer) => Contract;
6
4
  export type Address = Lowercase<string>;
7
5
  export declare const convertToAddress: (str: string) => Address;
@@ -1 +1 @@
1
- {"version":3,"file":"common.d.ts","sourceRoot":"/","sources":["services/token/common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAU,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGlD,OAAO,EAAE,uBAAuB,EAAE,MAAM,SAAS,CAAC;AAElD,eAAO,MAAM,OAAO,kBAAmB,MAAM,aACzB,MAAM,WAKzB,CAAC;AAEF,eAAO,MAAM,KAAK,kBAAmB,MAAM,aACvB,MAAM,WAOzB,CAAC;AAEF,eAAO,MAAM,qBAAqB,iBAClB,MAAM,WACX,MAAM,KACd,QAWF,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;AAExC,eAAO,MAAM,gBAAgB,QAAS,MAAM,KAAG,OAE9C,CAAC;AAEF,eAAO,MAAM,eAAe,yBACJ,MAAM;eAEjB,UAAU,MAAM,CAAC;mBACb,MAAM;2BACE,MAAM,KAAK,MAAM;CAezC,CAAC;AAEF,eAAO,MAAM,iBAAiB,8DAK3B,uBAAuB,KAAG,QAAQ,MAAM,CAW1C,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,eAAe,8CAIzB,mBAAmB,KAAG,QAAQ,MAAM,CAUtC,CAAC"}
1
+ {"version":3,"file":"common.d.ts","sourceRoot":"/","sources":["services/token/common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAG1C,OAAO,EAAE,uBAAuB,EAAE,MAAM,SAAS,CAAC;AAGlD,eAAO,MAAM,qBAAqB,iBAClB,MAAM,WACX,MAAM,KACd,QAWF,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;AAExC,eAAO,MAAM,gBAAgB,QAAS,MAAM,KAAG,OAE9C,CAAC;AAEF,eAAO,MAAM,eAAe,yBACJ,MAAM;eAEjB,UAAU,MAAM,CAAC;mBACb,MAAM;2BACE,MAAM,KAAK,MAAM;CAezC,CAAC;AAEF,eAAO,MAAM,iBAAiB,8DAK3B,uBAAuB,KAAG,QAAQ,MAAM,CAW1C,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,eAAe,8CAIzB,mBAAmB,KAAG,QAAQ,MAAM,CAUtC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@reyaxyz/sdk",
3
- "version": "0.24.7",
3
+ "version": "0.25.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.21.1",
32
+ "@reyaxyz/common": "0.23.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": "f87b0e30d3a004c8d77dea7b131c646e75bc4a87"
37
+ "gitHead": "eccb0c061d91c383ae02680b3193ff8ee07a4ad6"
38
38
  }
@@ -1,12 +1,13 @@
1
1
  import {
2
2
  Address,
3
3
  getSocketConnector,
4
- getSocketFees,
4
+ getSocketDepositFeesAsBigInt,
5
5
  getSocketVault,
6
+ scale,
6
7
  } from '@reyaxyz/common';
7
8
  import { ContractType, getAddress } from '../../utils/contractAddresses';
8
9
  import { executeTransaction } from '../executeTransaction';
9
- import { getTokenDetails, scale } from '../token/common';
10
+ import { getTokenDetails } from '../token/common';
10
11
  import { encodeBridgeAndDepositPassivePool } from './encode';
11
12
  import {
12
13
  BridgeAndDepositPassivePoolParams,
@@ -29,7 +30,7 @@ export const bridgeAndDepositPassivePool = async (
29
30
  chainId: chainId,
30
31
  tokenAddress: params.pool.tokenAddress.toLowerCase() as Address,
31
32
  }),
32
- getSocketFees({
33
+ getSocketDepositFeesAsBigInt({
33
34
  moneyInOutChainId: chainId,
34
35
  }),
35
36
  params.pool.id,
@@ -3,7 +3,5 @@ export * from './lp';
3
3
  export * from './bridgeAndDepositPassivePool';
4
4
  export * from './transferFromMAToPool';
5
5
  export * from './withdrawPassivePoolAndBridge';
6
- export * from './simulateTransferFromMAToPool';
7
6
  export * from './simulateBridgeAndDepositPassivePool';
8
7
  export * from './simulateWithdrawPassivePoolAndBridge';
9
- export * from './simulateBridgeAndDepositPassivePool';
@@ -1,32 +1,25 @@
1
+ import { getSocketBridgeTime, getSocketDepositFees } from '@reyaxyz/common';
1
2
  import {
2
3
  SimulateBridgeAndDepositPassivePoolParams,
3
4
  SimulateBridgeAndDepositPassivePoolResult,
4
5
  } from './types';
5
6
 
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
- }
7
+ export const simulateBridgeAndDepositPassivePool = (
8
+ params: SimulateBridgeAndDepositPassivePoolParams,
9
+ ): SimulateBridgeAndDepositPassivePoolResult => {
10
+ const bridgeTimeInMS = getSocketBridgeTime({
11
+ moneyInOutChainId: params.moneyInOutChainId,
12
+ }).bridgeTimeInMS;
13
+
14
+ const fees = getSocketDepositFees({
15
+ moneyInOutChainId: params.moneyInOutChainId,
16
+ });
12
17
 
13
- const randomSimulation = (): SimulateBridgeAndDepositPassivePoolResult => {
14
- return {
15
- bridgeGasFees: getRandomIntInclusive(1000, 100000),
16
- estimatedDepositedAmount: getRandomIntInclusive(1000, 100000),
18
+ const result: SimulateBridgeAndDepositPassivePoolResult = {
19
+ fees: fees.fees,
20
+ feesUnit: fees.feesUnit,
21
+ bridgeTimeInMS: bridgeTimeInMS,
17
22
  };
18
- };
19
23
 
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
- });
24
+ return result;
32
25
  };
@@ -1,31 +1,26 @@
1
+ import { getSocketBridgeTime, getSocketWithdrawFees } from '@reyaxyz/common';
1
2
  import {
2
3
  SimulateWithdrawPassivePoolAndBridgeParams,
3
4
  SimulateWithdrawPassivePoolAndBridgeResult,
4
5
  } from './types';
5
6
 
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 (
7
+ export const simulateWithdrawPassivePoolAndBridge = (
20
8
  // eslint-disable-next-line @typescript-eslint/no-unused-vars
21
9
  params: SimulateWithdrawPassivePoolAndBridgeParams,
22
- ): Promise<SimulateWithdrawPassivePoolAndBridgeResult> => {
23
- return await new Promise((resolve) => {
24
- setTimeout(
25
- () => {
26
- resolve(randomSimulation());
27
- },
28
- Math.random() * 100 + 1000,
29
- );
10
+ ): SimulateWithdrawPassivePoolAndBridgeResult => {
11
+ const bridgeTimeInMS = getSocketBridgeTime({
12
+ moneyInOutChainId: params.moneyInOutChainId,
13
+ }).bridgeTimeInMS;
14
+
15
+ const fees = getSocketWithdrawFees({
16
+ reyaChainId: params.reyaChainId,
17
+ tokenAddress: params.tokenAddress,
30
18
  });
19
+
20
+ const result: SimulateWithdrawPassivePoolAndBridgeResult = {
21
+ fees: fees.fees,
22
+ bridgeTimeInMS: bridgeTimeInMS,
23
+ };
24
+
25
+ return result;
31
26
  };
@@ -1,8 +1,8 @@
1
- import { getCurrentTimestampInSeconds } from '@reyaxyz/common';
1
+ import { getCurrentTimestampInSeconds, scale } from '@reyaxyz/common';
2
2
  import { ContractType } from '../../utils/contractAddresses';
3
3
  import { executeTransaction } from '../executeTransaction';
4
4
  import { signCoreCommands } from '../sign';
5
- import { getTokenDetails, scale } from '../token/common';
5
+ import { getTokenDetails } from '../token/common';
6
6
  import { encodeTransferFromMAToPool } from './encode';
7
7
  import {
8
8
  TransferFromMAToPoolParams,
@@ -3,7 +3,10 @@ import {
3
3
  LpPoolEntity,
4
4
  LpWithdrawBalanceEntity,
5
5
  MarginAccountEntity,
6
+ MoneyInOutChainId,
6
7
  OwnerMetadataEntity,
8
+ ReyaChainId,
9
+ TokenEntity,
7
10
  } from '@reyaxyz/common';
8
11
 
9
12
  export type ProvideLiquidityParams = {
@@ -61,43 +64,23 @@ export type BridgeAndDepositPassivePoolResult = {
61
64
  transactionHash: string | null;
62
65
  };
63
66
 
64
- // TODO: Milan, Alex reevaluate these params
65
- export type SimulateTransferFromMAToPoolResult = {
66
- bridgeGasFees: number;
67
- estimatedDepositedAmount: number;
68
- };
69
-
70
- // TODO: Milan, Alex reevaluate these params
71
- export type SimulateTransferFromMAToPoolParams = {
72
- signer: Signer | JsonRpcSigner;
73
- lpPoolId: LpPoolEntity['id'];
74
- tokenAddress: LpPoolEntity['tokenAddress'];
75
- amount: number;
76
- };
77
-
78
- // TODO: Milan, Alex reevaluate these params
79
67
  export type SimulateBridgeAndDepositPassivePoolResult = {
80
- bridgeGasFees: number;
81
- estimatedDepositedAmount: number;
68
+ fees: number;
69
+ feesUnit: string;
70
+ bridgeTimeInMS: number;
82
71
  };
83
72
 
84
- // TODO: Milan, Alex reevaluate these params
85
73
  export type SimulateBridgeAndDepositPassivePoolParams = {
86
- signer: Signer | JsonRpcSigner;
87
- lpPoolId: LpPoolEntity['id'];
88
- tokenAddress: LpPoolEntity['tokenAddress'];
89
- amount: number;
74
+ moneyInOutChainId: MoneyInOutChainId;
90
75
  };
91
76
 
92
- // TODO: Milan, Alex reevaluate these params
93
77
  export type SimulateWithdrawPassivePoolAndBridgeResult = {
94
- bridgeGasFees: number;
78
+ fees: number;
79
+ bridgeTimeInMS: number;
95
80
  };
96
81
 
97
- // TODO: Milan, Alex reevaluate these params
98
82
  export type SimulateWithdrawPassivePoolAndBridgeParams = {
99
- signer: Signer | JsonRpcSigner;
100
- lpPoolId: LpPoolEntity['id'];
101
- tokenAddress: LpPoolEntity['tokenAddress'];
102
- amount: number;
83
+ reyaChainId: ReyaChainId;
84
+ moneyInOutChainId: MoneyInOutChainId;
85
+ tokenAddress: TokenEntity['address'];
103
86
  };
@@ -11,9 +11,9 @@ import {
11
11
  getCurrentTimestampInSeconds,
12
12
  getSocketConnector,
13
13
  getSocketController,
14
+ scale,
14
15
  } from '@reyaxyz/common';
15
16
  import { BRIDGE_DEADLINE_IN_SECONDS } from '../../utils/consts';
16
- import { scale } from '../token/common';
17
17
 
18
18
  export const withdrawPassivePoolAndBridge = async (
19
19
  params: WithdrawPassivePoolAndBridgeParams,
@@ -1,12 +1,13 @@
1
1
  import {
2
2
  getCurrentTimestampInSeconds,
3
3
  getSocketConnector,
4
- getSocketFees,
4
+ getSocketDepositFeesAsBigInt,
5
5
  getSocketVault,
6
+ scale,
6
7
  } from '@reyaxyz/common';
7
8
  import { ContractType, getAddress } from '../../utils/contractAddresses';
8
9
  import { executeTransaction } from '../executeTransaction';
9
- import { getTokenDetails, scale } from '../token/common';
10
+ import { getTokenDetails } from '../token/common';
10
11
  import { encodeBridgeAndDepositExistingMA } from './encode';
11
12
  import {
12
13
  BridgeAndDepositExisingMAParams,
@@ -38,7 +39,7 @@ export const bridgeAndDepositExisingMA = async (
38
39
  chainId: chainId,
39
40
  tokenAddress: params.tokenAddress,
40
41
  }),
41
- getSocketFees({
42
+ getSocketDepositFeesAsBigInt({
42
43
  moneyInOutChainId: chainId,
43
44
  }),
44
45
  params.marginAccountId,
@@ -1,11 +1,12 @@
1
1
  import {
2
2
  getSocketConnector,
3
- getSocketFees,
3
+ getSocketDepositFeesAsBigInt,
4
4
  getSocketVault,
5
+ scale,
5
6
  } from '@reyaxyz/common';
6
7
  import { ContractType, getAddress } from '../../utils/contractAddresses';
7
8
  import { executeTransaction } from '../executeTransaction';
8
- import { getTokenDetails, scale } from '../token/common';
9
+ import { getTokenDetails } from '../token/common';
9
10
  import { encodeBridgeAndDepositNewMA } from './encode';
10
11
  import {
11
12
  BridgeAndDepositNewMAParams,
@@ -28,7 +29,7 @@ export const bridgeAndDepositNewMA = async (
28
29
  chainId: chainId,
29
30
  tokenAddress: params.tokenAddress,
30
31
  }),
31
- getSocketFees({
32
+ getSocketDepositFeesAsBigInt({
32
33
  moneyInOutChainId: chainId,
33
34
  }),
34
35
  params.ownerAddress,
@@ -1,8 +1,9 @@
1
1
  import { DepositParams, DepositResult } from './types';
2
2
  import { encodeDeposit } from './encode';
3
3
  import { executeTransaction } from '../executeTransaction';
4
- import { getTokenDetails, scale } from '../token/common';
4
+ import { getTokenDetails } from '../token/common';
5
5
  import { ContractType } from '../../utils/contractAddresses';
6
+ import { scale } from '@reyaxyz/common';
6
7
 
7
8
  export const deposit = async (
8
9
  params: DepositParams,
@@ -1,11 +1,8 @@
1
1
  export * from './types';
2
2
  export * from './account';
3
3
  export * from './deposit';
4
- export * from './simulateDeposit';
5
- export * from './simulateWithdraw';
6
4
  export * from './withdraw';
7
5
  export * from './bridgeAndDepositExistingMA';
8
6
  export * from './bridgeAndDepositNewMA';
9
7
  export * from './transferMarginBetweenAccounts';
10
8
  export * from './withdrawMAAndBridge';
11
- export * from './simulateTransferMarginBetweenAccounts';
@@ -1,6 +1,7 @@
1
+ import { scale } from '@reyaxyz/common';
1
2
  import { ContractType } from '../../utils/contractAddresses';
2
3
  import { executeTransaction } from '../executeTransaction';
3
- import { getTokenDetails, scale } from '../token/common';
4
+ import { getTokenDetails } from '../token/common';
4
5
  import { encodeTransferMargin } from './encode';
5
6
  import {
6
7
  TransferMarginBetweenAccountsParams,
@@ -1,8 +1,9 @@
1
1
  import { WithdrawParams, WithdrawResult } from './types';
2
2
  import { encodeWithdraw } from './encode';
3
3
  import { executeTransaction } from '../executeTransaction';
4
- import { getTokenDetails, scale } from '../token/common';
4
+ import { getTokenDetails } from '../token/common';
5
5
  import { ContractType } from '../../utils/contractAddresses';
6
+ import { scale } from '@reyaxyz/common';
6
7
 
7
8
  export const withdraw = async (
8
9
  params: WithdrawParams,
@@ -2,11 +2,12 @@ import {
2
2
  getCurrentTimestampInSeconds,
3
3
  getSocketConnector,
4
4
  getSocketController,
5
+ scale,
5
6
  } from '@reyaxyz/common';
6
7
  import { ContractType } from '../../utils/contractAddresses';
7
8
  import { executeTransaction } from '../executeTransaction';
8
9
  import { signCoreCommands } from '../sign';
9
- import { getTokenDetails, scale } from '../token/common';
10
+ import { getTokenDetails } from '../token/common';
10
11
  import { encodeWithdrawMAAndBridge } from './encode';
11
12
  import {
12
13
  WithdrawMAAndBridgeParams,
@@ -1,25 +1,8 @@
1
- import { Contract, ethers, Signer } from 'ethers';
1
+ import { Contract, Signer } from 'ethers';
2
2
  import { tokenDetails } from './consts';
3
3
  import { exponentialBackoff } from '../../utils/retry';
4
4
  import { GetERC20AllowanceParams } from './types';
5
-
6
- export const descale = (tokenDecimals: number) => {
7
- const f = (value: bigint) => {
8
- return Number(ethers.formatUnits(value.toString(), tokenDecimals));
9
- };
10
-
11
- return f;
12
- };
13
-
14
- export const scale = (tokenDecimals: number) => {
15
- const f = (value: number) => {
16
- return BigInt(
17
- ethers.parseUnits(value.toFixed(tokenDecimals), tokenDecimals),
18
- );
19
- };
20
-
21
- return f;
22
- };
5
+ import { descale, scale } from '@reyaxyz/common';
23
6
 
24
7
  export const getERC20TokenContract = (
25
8
  tokenAddress: string,