@hyperlane-xyz/sdk 1.1.3 → 1.2.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 (170) hide show
  1. package/README.md +2 -2
  2. package/dist/HyperlaneApp.d.ts +7 -8
  3. package/dist/HyperlaneApp.d.ts.map +1 -1
  4. package/dist/HyperlaneApp.js +1 -4
  5. package/dist/HyperlaneApp.js.map +1 -1
  6. package/dist/consts/chainMetadata.d.ts +54 -25
  7. package/dist/consts/chainMetadata.d.ts.map +1 -1
  8. package/dist/consts/chainMetadata.js +65 -81
  9. package/dist/consts/chainMetadata.js.map +1 -1
  10. package/dist/consts/chains.d.ts +5 -5
  11. package/dist/consts/chains.d.ts.map +1 -1
  12. package/dist/consts/chains.js +5 -1
  13. package/dist/consts/chains.js.map +1 -1
  14. package/dist/consts/environments/index.d.ts +4 -2
  15. package/dist/consts/environments/index.d.ts.map +1 -1
  16. package/dist/consts/environments/mainnet.json +3 -1
  17. package/dist/core/HyperlaneCore.d.ts +10 -385
  18. package/dist/core/HyperlaneCore.d.ts.map +1 -1
  19. package/dist/core/HyperlaneCore.js +6 -11
  20. package/dist/core/HyperlaneCore.js.map +1 -1
  21. package/dist/core/HyperlaneCore.test.js +2 -3
  22. package/dist/core/HyperlaneCore.test.js.map +1 -1
  23. package/dist/core/TestCoreApp.d.ts +5 -5
  24. package/dist/core/TestCoreApp.d.ts.map +1 -1
  25. package/dist/core/TestCoreApp.js +2 -4
  26. package/dist/core/TestCoreApp.js.map +1 -1
  27. package/dist/core/TestCoreDeployer.d.ts +6 -6
  28. package/dist/core/TestCoreDeployer.d.ts.map +1 -1
  29. package/dist/core/TestCoreDeployer.js +1 -1
  30. package/dist/core/TestCoreDeployer.js.map +1 -1
  31. package/dist/core/testHyperlaneDeploy.hardhat-test.js +8 -12
  32. package/dist/core/testHyperlaneDeploy.hardhat-test.js.map +1 -1
  33. package/dist/deploy/HyperlaneAppChecker.d.ts +9 -7
  34. package/dist/deploy/HyperlaneAppChecker.d.ts.map +1 -1
  35. package/dist/deploy/HyperlaneAppChecker.js +32 -9
  36. package/dist/deploy/HyperlaneAppChecker.js.map +1 -1
  37. package/dist/deploy/HyperlaneDeployer.d.ts +15 -15
  38. package/dist/deploy/HyperlaneDeployer.d.ts.map +1 -1
  39. package/dist/deploy/HyperlaneDeployer.js +28 -35
  40. package/dist/deploy/HyperlaneDeployer.js.map +1 -1
  41. package/dist/deploy/core/HyperlaneCoreChecker.d.ts +9 -7
  42. package/dist/deploy/core/HyperlaneCoreChecker.d.ts.map +1 -1
  43. package/dist/deploy/core/HyperlaneCoreChecker.js +57 -3
  44. package/dist/deploy/core/HyperlaneCoreChecker.js.map +1 -1
  45. package/dist/deploy/core/HyperlaneCoreDeployer.d.ts +11 -11
  46. package/dist/deploy/core/HyperlaneCoreDeployer.d.ts.map +1 -1
  47. package/dist/deploy/core/HyperlaneCoreDeployer.js +12 -20
  48. package/dist/deploy/core/HyperlaneCoreDeployer.js.map +1 -1
  49. package/dist/deploy/core/types.d.ts +9 -1
  50. package/dist/deploy/core/types.d.ts.map +1 -1
  51. package/dist/deploy/core/types.js +1 -0
  52. package/dist/deploy/core/types.js.map +1 -1
  53. package/dist/deploy/middleware/LiquidityLayerApp.d.ts +17 -17
  54. package/dist/deploy/middleware/LiquidityLayerApp.d.ts.map +1 -1
  55. package/dist/deploy/middleware/LiquidityLayerApp.js +18 -23
  56. package/dist/deploy/middleware/LiquidityLayerApp.js.map +1 -1
  57. package/dist/deploy/middleware/LiquidityLayerRouterDeployer.d.ts +7 -7
  58. package/dist/deploy/middleware/LiquidityLayerRouterDeployer.d.ts.map +1 -1
  59. package/dist/deploy/middleware/LiquidityLayerRouterDeployer.js +6 -9
  60. package/dist/deploy/middleware/LiquidityLayerRouterDeployer.js.map +1 -1
  61. package/dist/deploy/middleware/deploy.d.ts +9 -9
  62. package/dist/deploy/middleware/deploy.d.ts.map +1 -1
  63. package/dist/deploy/middleware/deploy.js.map +1 -1
  64. package/dist/deploy/router/GasRouterDeployer.d.ts +12 -0
  65. package/dist/deploy/router/GasRouterDeployer.d.ts.map +1 -0
  66. package/dist/deploy/router/GasRouterDeployer.js +46 -0
  67. package/dist/deploy/router/GasRouterDeployer.js.map +1 -0
  68. package/dist/deploy/router/HyperlaneRouterChecker.d.ts +6 -6
  69. package/dist/deploy/router/HyperlaneRouterChecker.d.ts.map +1 -1
  70. package/dist/deploy/router/HyperlaneRouterChecker.js +2 -2
  71. package/dist/deploy/router/HyperlaneRouterChecker.js.map +1 -1
  72. package/dist/deploy/router/HyperlaneRouterDeployer.d.ts +7 -7
  73. package/dist/deploy/router/HyperlaneRouterDeployer.d.ts.map +1 -1
  74. package/dist/deploy/router/HyperlaneRouterDeployer.js +19 -22
  75. package/dist/deploy/router/HyperlaneRouterDeployer.js.map +1 -1
  76. package/dist/deploy/router/types.d.ts +5 -0
  77. package/dist/deploy/router/types.d.ts.map +1 -1
  78. package/dist/deploy/types.d.ts +9 -5
  79. package/dist/deploy/types.d.ts.map +1 -1
  80. package/dist/deploy/types.js +1 -0
  81. package/dist/deploy/types.js.map +1 -1
  82. package/dist/deploy/utils.d.ts +2 -6
  83. package/dist/deploy/utils.d.ts.map +1 -1
  84. package/dist/deploy/utils.js +1 -27
  85. package/dist/deploy/utils.js.map +1 -1
  86. package/dist/deploy/verify/ContractVerifier.d.ts +7 -7
  87. package/dist/deploy/verify/ContractVerifier.d.ts.map +1 -1
  88. package/dist/deploy/verify/ContractVerifier.js +2 -5
  89. package/dist/deploy/verify/ContractVerifier.js.map +1 -1
  90. package/dist/events.d.ts +4 -4
  91. package/dist/events.d.ts.map +1 -1
  92. package/dist/events.js +12 -9
  93. package/dist/events.js.map +1 -1
  94. package/dist/gas/calculator.d.ts +20 -20
  95. package/dist/gas/calculator.d.ts.map +1 -1
  96. package/dist/gas/calculator.hardhat-test.js +5 -4
  97. package/dist/gas/calculator.hardhat-test.js.map +1 -1
  98. package/dist/gas/calculator.js +9 -11
  99. package/dist/gas/calculator.js.map +1 -1
  100. package/dist/gas/calculator.test.js +2 -14
  101. package/dist/gas/calculator.test.js.map +1 -1
  102. package/dist/gas/token-prices.d.ts +4 -2
  103. package/dist/gas/token-prices.d.ts.map +1 -1
  104. package/dist/gas/token-prices.js +4 -2
  105. package/dist/gas/token-prices.js.map +1 -1
  106. package/dist/index.d.ts +30 -31
  107. package/dist/index.d.ts.map +1 -1
  108. package/dist/index.js +59 -66
  109. package/dist/index.js.map +1 -1
  110. package/dist/middleware/accounts.hardhat-test.js +23 -13
  111. package/dist/middleware/accounts.hardhat-test.js.map +1 -1
  112. package/dist/middleware/liquidity-layer.hardhat-test.js +10 -9
  113. package/dist/middleware/liquidity-layer.hardhat-test.js.map +1 -1
  114. package/dist/middleware/queries.hardhat-test.js +17 -13
  115. package/dist/middleware/queries.hardhat-test.js.map +1 -1
  116. package/dist/providers/MultiProvider.d.ts +186 -37
  117. package/dist/providers/MultiProvider.d.ts.map +1 -1
  118. package/dist/providers/MultiProvider.js +408 -63
  119. package/dist/providers/MultiProvider.js.map +1 -1
  120. package/dist/router.d.ts +11 -2
  121. package/dist/router.d.ts.map +1 -1
  122. package/dist/router.js +28 -0
  123. package/dist/router.js.map +1 -1
  124. package/dist/test/envSubsetDeployer/app.d.ts +12 -21
  125. package/dist/test/envSubsetDeployer/app.d.ts.map +1 -1
  126. package/dist/test/envSubsetDeployer/app.js +13 -18
  127. package/dist/test/envSubsetDeployer/app.js.map +1 -1
  128. package/dist/test/envSubsetDeployer/check-single-chain.js +1 -11
  129. package/dist/test/envSubsetDeployer/check-single-chain.js.map +1 -1
  130. package/dist/test/envSubsetDeployer/deploy-single-chain.js +3 -9
  131. package/dist/test/envSubsetDeployer/deploy-single-chain.js.map +1 -1
  132. package/dist/test/envSubsetDeployer/deploy.hardhat-test.js +4 -3
  133. package/dist/test/envSubsetDeployer/deploy.hardhat-test.js.map +1 -1
  134. package/dist/test/envSubsetDeployer/utils.d.ts +0 -3
  135. package/dist/test/envSubsetDeployer/utils.d.ts.map +1 -1
  136. package/dist/test/envSubsetDeployer/utils.js +2 -10
  137. package/dist/test/envSubsetDeployer/utils.js.map +1 -1
  138. package/dist/test/testUtils.d.ts +5 -1
  139. package/dist/test/testUtils.d.ts.map +1 -1
  140. package/dist/test/testUtils.js +8 -1
  141. package/dist/test/testUtils.js.map +1 -1
  142. package/dist/types.d.ts +2 -17
  143. package/dist/types.d.ts.map +1 -1
  144. package/dist/utils/MultiGeneric.d.ts +11 -12
  145. package/dist/utils/MultiGeneric.d.ts.map +1 -1
  146. package/dist/utils/MultiGeneric.js +3 -6
  147. package/dist/utils/MultiGeneric.js.map +1 -1
  148. package/dist/utils/wagmi.d.ts +4 -0
  149. package/dist/utils/wagmi.d.ts.map +1 -0
  150. package/dist/utils/wagmi.js +28 -0
  151. package/dist/utils/wagmi.js.map +1 -0
  152. package/logos/black/gnosis.svg +1 -0
  153. package/logos/color/gnosis.svg +1 -0
  154. package/package.json +5 -6
  155. package/dist/consts/chainConnectionConfigs.d.ts +0 -21
  156. package/dist/consts/chainConnectionConfigs.d.ts.map +0 -1
  157. package/dist/consts/chainConnectionConfigs.js +0 -35
  158. package/dist/consts/chainConnectionConfigs.js.map +0 -1
  159. package/dist/core/message.d.ts +0 -146
  160. package/dist/core/message.d.ts.map +0 -1
  161. package/dist/core/message.js +0 -285
  162. package/dist/core/message.js.map +0 -1
  163. package/dist/domains.d.ts +0 -4
  164. package/dist/domains.d.ts.map +0 -1
  165. package/dist/domains.js +0 -12
  166. package/dist/domains.js.map +0 -1
  167. package/dist/providers/ChainConnection.d.ts +0 -23
  168. package/dist/providers/ChainConnection.d.ts.map +0 -1
  169. package/dist/providers/ChainConnection.js +0 -67
  170. package/dist/providers/ChainConnection.js.map +0 -1
@@ -1,33 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.getChainToOwnerMap = exports.getTestMultiProvider = void 0;
4
- const ethers_1 = require("ethers");
5
- const chainConnectionConfigs_1 = require("../consts/chainConnectionConfigs");
6
- const MultiProvider_1 = require("../providers/MultiProvider");
3
+ exports.getChainToOwnerMap = void 0;
7
4
  const objects_1 = require("../utils/objects");
8
- function getTestMultiProvider(signerOrProvider, configs = chainConnectionConfigs_1.testChainConnectionConfigs) {
9
- let signer;
10
- let provider;
11
- if (ethers_1.Signer.isSigner(signerOrProvider) && signerOrProvider.provider) {
12
- signer = signerOrProvider;
13
- provider = signerOrProvider.provider;
14
- }
15
- else if (ethers_1.providers.Provider.isProvider(signerOrProvider)) {
16
- provider = signerOrProvider;
17
- }
18
- else {
19
- throw new Error('signerOrProvider is invalid');
20
- }
21
- const chainProviders = (0, objects_1.objMap)(configs, (_, config) => ({
22
- signer,
23
- provider,
24
- id: config.id,
25
- confirmations: config.confirmations,
26
- overrides: config.overrides,
27
- }));
28
- return new MultiProvider_1.MultiProvider(chainProviders);
29
- }
30
- exports.getTestMultiProvider = getTestMultiProvider;
31
5
  function getChainToOwnerMap(configMap, owner) {
32
6
  return (0, objects_1.objMap)(configMap, () => {
33
7
  return {
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/deploy/utils.ts"],"names":[],"mappings":";;;AAAA,mCAA2C;AAI3C,6EAA8E;AAC9E,8DAA2D;AAE3D,8CAA0C;AAI1C,SAAgB,oBAAoB,CAClC,gBAA6C,EAC7C,UAAoC,mDAA0B;IAE9D,IAAI,MAA0B,CAAC;IAC/B,IAAI,QAA4B,CAAC;IACjC,IAAI,eAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,IAAI,gBAAgB,CAAC,QAAQ,EAAE;QAClE,MAAM,GAAG,gBAAgB,CAAC;QAC1B,QAAQ,GAAG,gBAAgB,CAAC,QAAQ,CAAC;KACtC;SAAM,IAAI,kBAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE;QAC1D,QAAQ,GAAG,gBAAgB,CAAC;KAC7B;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;KAChD;IAED,MAAM,cAAc,GAAG,IAAA,gBAAM,EAAC,OAAO,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QACrD,MAAM;QACN,QAAQ;QACR,EAAE,EAAE,MAAM,CAAC,EAAE;QACb,aAAa,EAAE,MAAM,CAAC,aAAa;QACnC,SAAS,EAAE,MAAM,CAAC,SAAS;KAC5B,CAAC,CAAC,CAAC;IACJ,OAAO,IAAI,6BAAa,CAAC,cAAc,CAAC,CAAC;AAC3C,CAAC;AAvBD,oDAuBC;AAED,SAAgB,kBAAkB,CAChC,SAA+B,EAC/B,KAAoB;IAEpB,OAAO,IAAA,gBAAM,EAAC,SAAS,EAAE,GAAG,EAAE;QAC5B,OAAO;YACL,KAAK;SACN,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AATD,gDASC"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/deploy/utils.ts"],"names":[],"mappings":";;;AAGA,8CAA0C;AAE1C,SAAgB,kBAAkB,CAChC,SAAwB,EACxB,KAAoB;IAEpB,OAAO,IAAA,gBAAM,EAAC,SAAS,EAAE,GAAG,EAAE;QAC5B,OAAO;YACL,KAAK;SACN,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AATD,gDASC"}
@@ -3,17 +3,17 @@ import { MultiProvider } from '../../providers/MultiProvider';
3
3
  import { ChainMap, ChainName } from '../../types';
4
4
  import { MultiGeneric } from '../../utils/MultiGeneric';
5
5
  import { CompilerOptions, ContractVerificationInput, VerificationInput } from './types';
6
- export declare class ContractVerifier<Chain extends ChainName> extends MultiGeneric<Chain, VerificationInput> {
7
- protected readonly multiProvider: MultiProvider<Chain>;
8
- protected readonly apiKeys: ChainMap<Chain, string>;
6
+ export declare class ContractVerifier extends MultiGeneric<VerificationInput> {
7
+ protected readonly multiProvider: MultiProvider;
8
+ protected readonly apiKeys: ChainMap<string>;
9
9
  protected readonly flattenedSource: string;
10
10
  protected readonly compilerOptions: CompilerOptions;
11
11
  protected logger: Debugger;
12
- constructor(verificationInputs: ChainMap<Chain, VerificationInput>, multiProvider: MultiProvider<Chain>, apiKeys: ChainMap<Chain, string>, flattenedSource: string, // flattened source code from eg `hardhat flatten`
12
+ constructor(verificationInputs: ChainMap<VerificationInput>, multiProvider: MultiProvider, apiKeys: ChainMap<string>, flattenedSource: string, // flattened source code from eg `hardhat flatten`
13
13
  compilerOptions: CompilerOptions);
14
- verify(targets?: Chain[]): Promise<PromiseSettledResult<void>[]>;
15
- verifyChain(chain: Chain, inputs: VerificationInput): Promise<void>;
14
+ verify(targets?: string[]): Promise<PromiseSettledResult<void>[]>;
15
+ verifyChain(chain: ChainName, inputs: VerificationInput): Promise<void>;
16
16
  private submitForm;
17
- verifyContract(chain: Chain, input: ContractVerificationInput): Promise<void>;
17
+ verifyContract(chain: ChainName, input: ContractVerificationInput): Promise<void>;
18
18
  }
19
19
  //# sourceMappingURL=ContractVerifier.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"ContractVerifier.d.ts","sourceRoot":"","sources":["../../../src/deploy/verify/ContractVerifier.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAS,MAAM,OAAO,CAAC;AAKxC,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,EACL,eAAe,EACf,yBAAyB,EACzB,iBAAiB,EAClB,MAAM,SAAS,CAAC;AAgBjB,qBAAa,gBAAgB,CAAC,KAAK,SAAS,SAAS,CAAE,SAAQ,YAAY,CACzE,KAAK,EACL,iBAAiB,CAClB;IAKG,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC,KAAK,CAAC;IACtD,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACnD,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM;IAC1C,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe;IAPrD,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC;gBAGzB,kBAAkB,EAAE,QAAQ,CAAC,KAAK,EAAE,iBAAiB,CAAC,EACnC,aAAa,EAAE,aAAa,CAAC,KAAK,CAAC,EACnC,OAAO,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,EAChC,eAAe,EAAE,MAAM,EAAE,kDAAkD;IAC3E,eAAe,EAAE,eAAe;IAMrD,MAAM,CAAC,OAAO,UAAgB,GAAG,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,CAAC;IAMhE,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;YAO3D,UAAU;IAuDlB,cAAc,CAClB,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,yBAAyB,GAC/B,OAAO,CAAC,IAAI,CAAC;CAuEjB"}
1
+ {"version":3,"file":"ContractVerifier.d.ts","sourceRoot":"","sources":["../../../src/deploy/verify/ContractVerifier.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAS,MAAM,OAAO,CAAC;AAKxC,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,EACL,eAAe,EACf,yBAAyB,EACzB,iBAAiB,EAClB,MAAM,SAAS,CAAC;AAgBjB,qBAAa,gBAAiB,SAAQ,YAAY,CAAC,iBAAiB,CAAC;IAKjE,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa;IAC/C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC;IAC5C,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM;IAC1C,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe;IAPrD,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC;gBAGzB,kBAAkB,EAAE,QAAQ,CAAC,iBAAiB,CAAC,EAC5B,aAAa,EAAE,aAAa,EAC5B,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,EACzB,eAAe,EAAE,MAAM,EAAE,kDAAkD;IAC3E,eAAe,EAAE,eAAe;IAMrD,MAAM,CAAC,OAAO,WAAgB,GAAG,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,CAAC;IAMhE,WAAW,CACf,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,iBAAiB,GACxB,OAAO,CAAC,IAAI,CAAC;YAOF,UAAU;IAsDlB,cAAc,CAClB,KAAK,EAAE,SAAS,EAChB,KAAK,EAAE,yBAAyB,GAC/B,OAAO,CAAC,IAAI,CAAC;CAwEjB"}
@@ -55,8 +55,7 @@ class ContractVerifier extends MultiGeneric_1.MultiGeneric {
55
55
  }
56
56
  submitForm(chain, action, options) {
57
57
  return __awaiter(this, void 0, void 0, function* () {
58
- const chainConnection = this.multiProvider.getChainConnection(chain);
59
- const apiUrl = chainConnection.getApiUrl();
58
+ const apiUrl = this.multiProvider.getExplorerApiUrl(chain);
60
59
  const params = new URLSearchParams(Object.assign({ apikey: this.apiKeys[chain], module: 'contract', action }, options));
61
60
  let response;
62
61
  if (action === ExplorerApiActions.CHECK_STATUS ||
@@ -107,9 +106,7 @@ class ContractVerifier extends MultiGeneric_1.MultiGeneric {
107
106
  // TYPO IS ENFORCED BY API
108
107
  constructorArguements: utils_1.utils.strip0x((_a = input.constructorArguments) !== null && _a !== void 0 ? _a : '') }, this.compilerOptions);
109
108
  const guid = yield this.submitForm(chain, ExplorerApiActions.VERIFY_IMPLEMENTATION, data);
110
- const addressUrl = yield this.multiProvider
111
- .getChainConnection(chain)
112
- .getAddressUrl(input.address);
109
+ const addressUrl = yield this.multiProvider.getExplorerAddressUrl(chain, input.address);
113
110
  // poll for verified status
114
111
  if (guid) {
115
112
  try {
@@ -1 +1 @@
1
- {"version":3,"file":"ContractVerifier.js","sourceRoot":"","sources":["../../../src/deploy/verify/ContractVerifier.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ContractVerifier.js","sourceRoot":"","sources":["../../../src/deploy/verify/ContractVerifier.ts"],"names":[],"mappings":"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"}
package/dist/events.d.ts CHANGED
@@ -18,8 +18,8 @@ export declare class Annotated<T extends TypedEvent> {
18
18
  export interface TSContract<T extends TypedEvent> {
19
19
  queryFilter(event: TypedEventFilter<T>, fromBlockOrBlockhash?: number | undefined, toBlock?: number | undefined): Promise<Array<T>>;
20
20
  }
21
- export declare function queryAnnotatedEvents<T extends TypedEvent>(multiprovider: MultiProvider<any>, chain: ChainName, contract: TSContract<T>, filter: TypedEventFilter<T>, startBlock?: number, endBlock?: number): Promise<Array<Annotated<T>>>;
22
- export declare function findAnnotatedSingleEvent<T extends TypedEvent>(multiprovider: MultiProvider<any>, chain: ChainName, contract: TSContract<T>, filter: TypedEventFilter<T>, startBlock?: number): Promise<Array<Annotated<T>>>;
23
- export declare function getEvents<T extends TypedEvent>(multiprovider: MultiProvider<any>, chain: ChainName, contract: TSContract<T>, filter: TypedEventFilter<T>, startBlock?: number, endBlock?: number): Promise<Array<T>>;
24
- export declare function findEvent<T extends TypedEvent>(multiprovider: MultiProvider<any>, chain: ChainName, contract: TSContract<T>, filter: TypedEventFilter<T>, startBlock?: number): Promise<Array<T>>;
21
+ export declare function queryAnnotatedEvents<T extends TypedEvent>(multiprovider: MultiProvider, chain: ChainName, contract: TSContract<T>, filter: TypedEventFilter<T>, startBlock?: number, endBlock?: number): Promise<Array<Annotated<T>>>;
22
+ export declare function findAnnotatedSingleEvent<T extends TypedEvent>(multiprovider: MultiProvider, chain: ChainName, contract: TSContract<T>, filter: TypedEventFilter<T>, startBlock?: number): Promise<Array<Annotated<T>>>;
23
+ export declare function getEvents<T extends TypedEvent>(multiprovider: MultiProvider, chain: ChainName, contract: TSContract<T>, filter: TypedEventFilter<T>, startBlock?: number, endBlock?: number): Promise<Array<T>>;
24
+ export declare function findEvent<T extends TypedEvent>(multiprovider: MultiProvider, chain: ChainName, contract: TSContract<T>, filter: TypedEventFilter<T>, startBlock?: number): Promise<Array<T>>;
25
25
  //# sourceMappingURL=events.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../src/events.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEnC,OAAO,KAAK,EACV,UAAU,EACV,gBAAgB,EACjB,MAAM,iCAAiC,CAAC;AAGzC,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAEpC,qBAAa,SAAS,CAAC,CAAC,SAAS,UAAU;IACzC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAClB,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC,kBAAkB,CAAC;gBAE7C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,SAAS,CAAC,kBAAkB,EACrC,KAAK,EAAE,CAAC,EACR,2BAA2B,UAAQ;WAYxB,SAAS,CAAC,CAAC,SAAS,UAAU,EACzC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,CAAC,GACP,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;WAKX,UAAU,CAAC,CAAC,SAAS,UAAU,EAC1C,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,CAAC,EAAE,GACV,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;IAM1B,IAAI,eAAe,IAAI,MAAM,CAQ5B;IAED,IAAI,eAAe,IAAI,MAAM,CAE5B;IAED,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,IAAI,SAAS,IAAI,MAAM,CAEtB;CACF;AAGD,MAAM,WAAW,UAAU,CAAC,CAAC,SAAS,UAAU;IAC9C,WAAW,CACT,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAC1B,oBAAoB,CAAC,EAAE,MAAM,GAAG,SAAS,EACzC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAC3B,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;CACtB;AAED,wBAAsB,oBAAoB,CAAC,CAAC,SAAS,UAAU,EAC7D,aAAa,EAAE,aAAa,CAAC,GAAG,CAAC,EACjC,KAAK,EAAE,SAAS,EAChB,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,EACvB,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAC3B,UAAU,CAAC,EAAE,MAAM,EACnB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAU9B;AAED,wBAAsB,wBAAwB,CAAC,CAAC,SAAS,UAAU,EACjE,aAAa,EAAE,aAAa,CAAC,GAAG,CAAC,EACjC,KAAK,EAAE,SAAS,EAChB,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,EACvB,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAC3B,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAS9B;AAED,wBAAsB,SAAS,CAAC,CAAC,SAAS,UAAU,EAClD,aAAa,EAAE,aAAa,CAAC,GAAG,CAAC,EACjC,KAAK,EAAE,SAAS,EAChB,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,EACvB,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAC3B,UAAU,CAAC,EAAE,MAAM,EACnB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAanB;AAED,wBAAsB,SAAS,CAAC,CAAC,SAAS,UAAU,EAClD,aAAa,EAAE,aAAa,CAAC,GAAG,CAAC,EACjC,KAAK,EAAE,SAAS,EAChB,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,EACvB,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAC3B,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAYnB"}
1
+ {"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../src/events.ts"],"names":[],"mappings":"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"}
package/dist/events.js CHANGED
@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
10
10
  };
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.findEvent = exports.getEvents = exports.findAnnotatedSingleEvent = exports.queryAnnotatedEvents = exports.Annotated = void 0;
13
- const chainMetadata_1 = require("./consts/chainMetadata");
14
13
  class Annotated {
15
14
  constructor(domain, receipt, event, callerKnowsWhatTheyAreDoing = false) {
16
15
  var _a;
@@ -55,20 +54,21 @@ exports.Annotated = Annotated;
55
54
  function queryAnnotatedEvents(multiprovider, chain, contract, filter, startBlock, endBlock) {
56
55
  return __awaiter(this, void 0, void 0, function* () {
57
56
  const events = yield getEvents(multiprovider, chain, contract, filter, startBlock, endBlock);
58
- return Annotated.fromEvents(chainMetadata_1.chainMetadata[chain].id, events);
57
+ return Annotated.fromEvents(multiprovider.getChainId(chain), events);
59
58
  });
60
59
  }
61
60
  exports.queryAnnotatedEvents = queryAnnotatedEvents;
62
61
  function findAnnotatedSingleEvent(multiprovider, chain, contract, filter, startBlock) {
63
62
  return __awaiter(this, void 0, void 0, function* () {
64
63
  const events = yield findEvent(multiprovider, chain, contract, filter, startBlock);
65
- return Annotated.fromEvents(chainMetadata_1.chainMetadata[chain].id, events);
64
+ return Annotated.fromEvents(multiprovider.getChainId(chain), events);
66
65
  });
67
66
  }
68
67
  exports.findAnnotatedSingleEvent = findAnnotatedSingleEvent;
69
68
  function getEvents(multiprovider, chain, contract, filter, startBlock, endBlock) {
70
69
  return __awaiter(this, void 0, void 0, function* () {
71
- const mustPaginate = !!chainMetadata_1.chainMetadata[chain].publicRpcUrls[0].pagination;
70
+ const metadata = multiprovider.getChainMetadata(chain);
71
+ const mustPaginate = !!metadata.publicRpcUrls[0].pagination;
72
72
  if (mustPaginate) {
73
73
  return getPaginatedEvents(multiprovider, chain, contract, filter, startBlock, endBlock);
74
74
  }
@@ -78,7 +78,8 @@ function getEvents(multiprovider, chain, contract, filter, startBlock, endBlock)
78
78
  exports.getEvents = getEvents;
79
79
  function findEvent(multiprovider, chain, contract, filter, startBlock) {
80
80
  return __awaiter(this, void 0, void 0, function* () {
81
- const mustPaginate = !!chainMetadata_1.chainMetadata[chain].publicRpcUrls[0].pagination;
81
+ const metadata = multiprovider.getChainMetadata(chain);
82
+ const mustPaginate = !!metadata.publicRpcUrls[0].pagination;
82
83
  if (mustPaginate) {
83
84
  return findFromPaginatedEvents(multiprovider, chain, contract, filter, startBlock);
84
85
  }
@@ -88,7 +89,8 @@ function findEvent(multiprovider, chain, contract, filter, startBlock) {
88
89
  exports.findEvent = findEvent;
89
90
  function getPaginatedEvents(multiprovider, chain, contract, filter, startBlock, endBlock) {
90
91
  return __awaiter(this, void 0, void 0, function* () {
91
- const pagination = chainMetadata_1.chainMetadata[chain].publicRpcUrls[0].pagination;
92
+ const metadata = multiprovider.getChainMetadata(chain);
93
+ const pagination = metadata.publicRpcUrls[0].pagination;
92
94
  if (!pagination) {
93
95
  throw new Error('Domain need not be paginated');
94
96
  }
@@ -101,7 +103,7 @@ function getPaginatedEvents(multiprovider, chain, contract, filter, startBlock,
101
103
  // or current block number
102
104
  let lastBlock;
103
105
  if (!endBlock) {
104
- const provider = multiprovider.getChainConnection(chain).provider;
106
+ const provider = multiprovider.getProvider(chain);
105
107
  lastBlock = yield provider.getBlockNumber();
106
108
  }
107
109
  else {
@@ -126,7 +128,8 @@ function getPaginatedEvents(multiprovider, chain, contract, filter, startBlock,
126
128
  }
127
129
  function findFromPaginatedEvents(multiprovider, chain, contract, filter, startBlock, endBlock) {
128
130
  return __awaiter(this, void 0, void 0, function* () {
129
- const pagination = chainMetadata_1.chainMetadata[chain].publicRpcUrls[0].pagination;
131
+ const metadata = multiprovider.getChainMetadata(chain);
132
+ const pagination = metadata.publicRpcUrls[0].pagination;
130
133
  if (!pagination) {
131
134
  throw new Error('Domain need not be paginated');
132
135
  }
@@ -139,7 +142,7 @@ function findFromPaginatedEvents(multiprovider, chain, contract, filter, startBl
139
142
  // or current block number
140
143
  let lastBlock;
141
144
  if (!endBlock) {
142
- const provider = multiprovider.getChainConnection(chain).provider;
145
+ const provider = multiprovider.getProvider(chain);
143
146
  lastBlock = yield provider.getBlockNumber();
144
147
  }
145
148
  else {
@@ -1 +1 @@
1
- {"version":3,"file":"events.js","sourceRoot":"","sources":["../src/events.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"events.js","sourceRoot":"","sources":["../src/events.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,8 @@
1
1
  import { BigNumber } from 'ethers';
2
2
  import { types } from '@hyperlane-xyz/utils';
3
- import { CoreEnvironment, CoreEnvironmentChain, HyperlaneCore } from '../core/HyperlaneCore';
3
+ import { CoreEnvironment, HyperlaneCore } from '../core/HyperlaneCore';
4
4
  import { MultiProvider } from '../providers/MultiProvider';
5
- import { ChainName, Remotes } from '../types';
5
+ import { ChainName } from '../types';
6
6
  import { TokenPriceGetter } from './token-prices';
7
7
  export interface InterchainGasCalculatorConfig {
8
8
  /**
@@ -27,24 +27,24 @@ export interface InterchainGasCalculatorConfig {
27
27
  */
28
28
  tokenPriceGetter?: TokenPriceGetter;
29
29
  }
30
- export declare type ParsedMessage<Chain extends ChainName, Destination extends Chain> = {
31
- origin: Exclude<Chain, Destination>;
30
+ export interface ParsedMessage {
31
+ origin: ChainName;
32
32
  sender: string;
33
- destination: Destination;
33
+ destination: ChainName;
34
34
  recipient: string;
35
35
  body: string;
36
- };
36
+ }
37
37
  /**
38
38
  * Calculates interchain gas payments.
39
39
  */
40
- export declare class InterchainGasCalculator<Chain extends ChainName> {
40
+ export declare class InterchainGasCalculator {
41
41
  private core;
42
42
  private multiProvider;
43
43
  private tokenPriceGetter;
44
44
  private paymentEstimateMultiplier;
45
45
  private messageGasEstimateBuffer;
46
- static fromEnvironment<Env extends CoreEnvironment>(env: Env, multiProvider: MultiProvider<CoreEnvironmentChain<Env>>, config?: InterchainGasCalculatorConfig): InterchainGasCalculator<CoreEnvironmentChain<Env>>;
47
- constructor(multiProvider: MultiProvider<Chain>, core: HyperlaneCore<Chain>, config?: InterchainGasCalculatorConfig);
46
+ static fromEnvironment<Env extends CoreEnvironment>(env: Env, multiProvider: MultiProvider, config?: InterchainGasCalculatorConfig): InterchainGasCalculator;
47
+ constructor(multiProvider: MultiProvider, core: HyperlaneCore, config?: InterchainGasCalculatorConfig);
48
48
  /**
49
49
  * Only intended for IGPs that quote gas payments on-chain.
50
50
  * Calls the default ISM IGP's `quoteGasPayment` function to get the amount of native tokens
@@ -59,7 +59,7 @@ export declare class InterchainGasCalculator<Chain extends ChainName> {
59
59
  * function.
60
60
  * @returns The amount of native tokens required to pay for interchain gas.
61
61
  */
62
- quoteGasPaymentForDefaultIsmIgp<Destination extends Chain>(origin: Exclude<Chain, Destination>, destination: Destination, gasAmount: BigNumber): Promise<BigNumber>;
62
+ quoteGasPaymentForDefaultIsmIgp(origin: ChainName, destination: ChainName, gasAmount: BigNumber): Promise<BigNumber>;
63
63
  /**
64
64
  * Only intended for IGPs that quote gas payments on-chain.
65
65
  * Calls the "base" IGP's `quoteGasPayment` function to get the amount of native tokens
@@ -74,7 +74,7 @@ export declare class InterchainGasCalculator<Chain extends ChainName> {
74
74
  * gas cost.
75
75
  * @returns The amount of native tokens required to pay for interchain gas.
76
76
  */
77
- quoteGasPayment<Destination extends Chain>(origin: Exclude<Chain, Destination>, destination: Destination, gasAmount: BigNumber): Promise<BigNumber>;
77
+ quoteGasPayment(origin: ChainName, destination: ChainName, gasAmount: BigNumber): Promise<BigNumber>;
78
78
  /**
79
79
  * Only intended for IGPs that quote gas payments on-chain.
80
80
  * Calls the origin's default IGP's `quoteGasPayment` function to get the
@@ -89,7 +89,7 @@ export declare class InterchainGasCalculator<Chain extends ChainName> {
89
89
  * function.
90
90
  * @returns The amount of native tokens required to pay for interchain gas.
91
91
  */
92
- quoteGasPaymentForIGP<Destination extends Chain>(origin: Exclude<Chain, Destination>, destination: Destination, gasAmount: BigNumber, interchainGasPaymasterAddress: types.Address): Promise<BigNumber>;
92
+ quoteGasPaymentForIGP(origin: ChainName, destination: ChainName, gasAmount: BigNumber, interchainGasPaymasterAddress: types.Address): Promise<BigNumber>;
93
93
  /**
94
94
  * Only intended for IGPs that do *not* quote gas payments on-chain.
95
95
  * Given an amount of gas to consume on the destination chain, calculates the
@@ -102,7 +102,7 @@ export declare class InterchainGasCalculator<Chain extends ChainName> {
102
102
  * @returns An estimated amount of origin chain tokens to cover gas costs on the
103
103
  * destination chain.
104
104
  */
105
- estimatePaymentForGas<Destination extends Chain>(origin: Exclude<Chain, Destination>, destination: Destination, gas: BigNumber): Promise<BigNumber>;
105
+ estimatePaymentForGas(origin: ChainName, destination: ChainName, gas: BigNumber): Promise<BigNumber>;
106
106
  /**
107
107
  * Only intended for IGPs that do *not* quote gas payments on-chain.
108
108
  * Given an amount of gas the message's recipient `handle` function is expected
@@ -119,7 +119,7 @@ export declare class InterchainGasCalculator<Chain extends ChainName> {
119
119
  * @returns An estimated amount of origin chain tokens to cover gas costs of the
120
120
  * message on the destination chain.
121
121
  */
122
- estimatePaymentForHandleGas<Destination extends Chain>(origin: Exclude<Chain, Destination>, destination: Destination, handleGas: BigNumber): Promise<BigNumber>;
122
+ estimatePaymentForHandleGas(origin: ChainName, destination: ChainName, handleGas: BigNumber): Promise<BigNumber>;
123
123
  /**
124
124
  * Only intended for IGPs that do *not* quote gas payments on-chain.
125
125
  * Calculates the estimated payment to process the message on its destination chain,
@@ -132,7 +132,7 @@ export declare class InterchainGasCalculator<Chain extends ChainName> {
132
132
  * @returns An estimated amount of origin chain tokens to cover gas costs of the
133
133
  * message on the destination chain.
134
134
  */
135
- protected estimatePaymentForMessage<Destination extends Chain>(message: ParsedMessage<Chain, Destination>): Promise<BigNumber>;
135
+ protected estimatePaymentForMessage(message: ParsedMessage): Promise<BigNumber>;
136
136
  /**
137
137
  * Using the exchange rates provided by tokenPriceGetter, returns the amount of
138
138
  * `toChain` native tokens equivalent in value to the provided `fromAmount` of
@@ -143,19 +143,19 @@ export declare class InterchainGasCalculator<Chain extends ChainName> {
143
143
  * @returns The amount of `toChain` native tokens whose value is equivalent to
144
144
  * `fromAmount` of `fromChain` native tokens.
145
145
  */
146
- protected convertBetweenTokens(fromChain: Chain, toChain: Chain, value: BigNumber): Promise<BigNumber>;
146
+ protected convertBetweenTokens(fromChain: ChainName, toChain: ChainName, value: BigNumber): Promise<BigNumber>;
147
147
  /**
148
148
  * Gets a suggested gas price for a chain.
149
149
  * @param chainName The name of the chain to get the gas price for
150
150
  * @returns The suggested gas price in wei on the destination chain.
151
151
  */
152
- protected getGasPrice(chain: Chain): Promise<BigNumber>;
152
+ protected getGasPrice(chain: ChainName): Promise<BigNumber>;
153
153
  /**
154
154
  * Gets the number of decimals of the provided chain's native token.
155
155
  * @param chain The chain.
156
156
  * @returns The number of decimals of `chain`'s native token.
157
157
  */
158
- protected tokenDecimals(chain: Chain): number;
158
+ protected tokenDecimals(chain: ChainName): number;
159
159
  /**
160
160
  * Estimates the amount of gas used by message's recipient `handle` function
161
161
  * on its destination chain. This does not assume the Inbox of the destination
@@ -170,13 +170,13 @@ export declare class InterchainGasCalculator<Chain extends ChainName> {
170
170
  * @returns The estimated gas required by the message's recipient handle function
171
171
  * on the destination chain.
172
172
  */
173
- protected estimateGasForHandle<LocalChain extends Chain>(message: ParsedMessage<Chain, LocalChain>): Promise<BigNumber>;
173
+ protected estimateGasForHandle(message: ParsedMessage): Promise<BigNumber>;
174
174
  /**
175
175
  * @returns A generous estimation of the gas consumption of all process
176
176
  * operations within Inbox.sol, including intrinsic gas. Does not include any gas
177
177
  * consumed within a message's recipient `handle` function.
178
178
  */
179
- protected estimateGasForProcess<Destination extends Chain>(origin: Remotes<Chain, Destination>, destination: Destination): Promise<BigNumber>;
179
+ protected estimateGasForProcess(origin: ChainName, destination: ChainName): Promise<BigNumber>;
180
180
  /**
181
181
  * @returns The intrinsic gas of a basic transaction. Note this does not consider calldata
182
182
  * costs or potentially different intrinsic gas costs for different chains.
@@ -1 +1 @@
1
- {"version":3,"file":"calculator.d.ts","sourceRoot":"","sources":["../../src/gas/calculator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"calculator.d.ts","sourceRoot":"","sources":["../../src/gas/calculator.ts"],"names":[],"mappings":"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"}
@@ -12,13 +12,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
12
12
  const chai_1 = require("chai");
13
13
  const ethers_1 = require("ethers");
14
14
  const hardhat_1 = require("hardhat");
15
+ const chains_1 = require("../consts/chains");
15
16
  const HyperlaneCore_1 = require("../core/HyperlaneCore");
16
17
  const TestCoreDeployer_1 = require("../core/TestCoreDeployer");
17
- const utils_1 = require("../deploy/utils");
18
+ const MultiProvider_1 = require("../providers/MultiProvider");
18
19
  const calculator_1 = require("./calculator");
19
20
  describe('InterchainGasCalculator', () => __awaiter(void 0, void 0, void 0, function* () {
20
- const localChain = 'test1';
21
- const remoteChain = 'test2';
21
+ const localChain = chains_1.Chains.test1;
22
+ const remoteChain = chains_1.Chains.test2;
22
23
  const expectedDefaultQuote = ethers_1.BigNumber.from('1');
23
24
  const testGasAmount = ethers_1.BigNumber.from('100000');
24
25
  let signer;
@@ -27,7 +28,7 @@ describe('InterchainGasCalculator', () => __awaiter(void 0, void 0, void 0, func
27
28
  let igp;
28
29
  before(() => __awaiter(void 0, void 0, void 0, function* () {
29
30
  [signer] = yield hardhat_1.ethers.getSigners();
30
- multiProvider = (0, utils_1.getTestMultiProvider)(signer);
31
+ multiProvider = MultiProvider_1.MultiProvider.createTestMultiProvider({ signer });
31
32
  const coreDeployer = new TestCoreDeployer_1.TestCoreDeployer(multiProvider);
32
33
  const coreContractsMaps = yield coreDeployer.deploy();
33
34
  const core = new HyperlaneCore_1.HyperlaneCore(coreContractsMaps, multiProvider);
@@ -1 +1 @@
1
- {"version":3,"file":"calculator.hardhat-test.js","sourceRoot":"","sources":["../../src/gas/calculator.hardhat-test.ts"],"names":[],"mappings":";;;;;;;;;;;AACA,+BAA8B;AAC9B,mCAAmC;AACnC,qCAAiC;AAIjC,yDAAsD;AACtD,+DAA4D;AAC5D,2CAAuD;AAIvD,6CAAuD;AAEvD,QAAQ,CAAC,yBAAyB,EAAE,GAAS,EAAE;IAC7C,MAAM,UAAU,GAAG,OAAO,CAAC;IAC3B,MAAM,WAAW,GAAG,OAAO,CAAC;IAE5B,MAAM,oBAAoB,GAAG,kBAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACjD,MAAM,aAAa,GAAG,kBAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAE/C,IAAI,MAAyB,CAAC;IAC9B,IAAI,aAA4C,CAAC;IAEjD,IAAI,UAAmD,CAAC;IACxD,IAAI,GAAkB,CAAC;IAEvB,MAAM,CAAC,GAAS,EAAE;QAChB,CAAC,MAAM,CAAC,GAAG,MAAM,gBAAM,CAAC,UAAU,EAAE,CAAC;QAErC,aAAa,GAAG,IAAA,4BAAoB,EAAC,MAAM,CAAC,CAAC;QAE7C,MAAM,YAAY,GAAG,IAAI,mCAAgB,CAAC,aAAa,CAAC,CAAC;QACzD,MAAM,iBAAiB,GAAG,MAAM,YAAY,CAAC,MAAM,EAAE,CAAC;QACtD,MAAM,IAAI,GAAG,IAAI,6BAAa,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAC;QACjE,UAAU,GAAG,IAAI,oCAAuB,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QAC9D,GAAG,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAC,sBAAsB,CAAC,OAAO,CAAC;IACrE,CAAC,CAAA,CAAC,CAAC;IAEH,QAAQ,CAAC,iCAAiC,EAAE,GAAG,EAAE;QAC/C,EAAE,CAAC,sDAAsD,EAAE,GAAS,EAAE;YACpE,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,+BAA+B,CAC5D,UAAU,EACV,WAAW,EACX,aAAa,CACd,CAAC;YAEF,IAAA,aAAM,EAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;QAC/C,CAAC,CAAA,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;QAC/B,EAAE,CAAC,0CAA0C,EAAE,GAAS,EAAE;YACxD,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,eAAe,CAC5C,UAAU,EACV,WAAW,EACX,aAAa,CACd,CAAC;YAEF,IAAA,aAAM,EAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;QAC/C,CAAC,CAAA,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;QACrC,EAAE,CAAC,0CAA0C,EAAE,GAAS,EAAE;YACxD,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,qBAAqB,CAClD,UAAU,EACV,WAAW,EACX,aAAa,EACb,GAAG,CACJ,CAAC;YAEF,IAAA,aAAM,EAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;QAC/C,CAAC,CAAA,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAA,CAAC,CAAC"}
1
+ {"version":3,"file":"calculator.hardhat-test.js","sourceRoot":"","sources":["../../src/gas/calculator.hardhat-test.ts"],"names":[],"mappings":";;;;;;;;;;;AACA,+BAA8B;AAC9B,mCAAmC;AACnC,qCAAiC;AAIjC,6CAA0C;AAC1C,yDAAsD;AACtD,+DAA4D;AAC5D,8DAA2D;AAE3D,6CAAuD;AAEvD,QAAQ,CAAC,yBAAyB,EAAE,GAAS,EAAE;IAC7C,MAAM,UAAU,GAAG,eAAM,CAAC,KAAK,CAAC;IAChC,MAAM,WAAW,GAAG,eAAM,CAAC,KAAK,CAAC;IAEjC,MAAM,oBAAoB,GAAG,kBAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACjD,MAAM,aAAa,GAAG,kBAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAE/C,IAAI,MAAyB,CAAC;IAC9B,IAAI,aAA4B,CAAC;IAEjC,IAAI,UAAmC,CAAC;IACxC,IAAI,GAAkB,CAAC;IAEvB,MAAM,CAAC,GAAS,EAAE;QAChB,CAAC,MAAM,CAAC,GAAG,MAAM,gBAAM,CAAC,UAAU,EAAE,CAAC;QAErC,aAAa,GAAG,6BAAa,CAAC,uBAAuB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;QAElE,MAAM,YAAY,GAAG,IAAI,mCAAgB,CAAC,aAAa,CAAC,CAAC;QACzD,MAAM,iBAAiB,GAAG,MAAM,YAAY,CAAC,MAAM,EAAE,CAAC;QACtD,MAAM,IAAI,GAAG,IAAI,6BAAa,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAC;QACjE,UAAU,GAAG,IAAI,oCAAuB,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QAC9D,GAAG,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAC,sBAAsB,CAAC,OAAO,CAAC;IACrE,CAAC,CAAA,CAAC,CAAC;IAEH,QAAQ,CAAC,iCAAiC,EAAE,GAAG,EAAE;QAC/C,EAAE,CAAC,sDAAsD,EAAE,GAAS,EAAE;YACpE,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,+BAA+B,CAC5D,UAAU,EACV,WAAW,EACX,aAAa,CACd,CAAC;YAEF,IAAA,aAAM,EAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;QAC/C,CAAC,CAAA,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;QAC/B,EAAE,CAAC,0CAA0C,EAAE,GAAS,EAAE;YACxD,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,eAAe,CAC5C,UAAU,EACV,WAAW,EACX,aAAa,CACd,CAAC;YAEF,IAAA,aAAM,EAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;QAC/C,CAAC,CAAA,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;QACrC,EAAE,CAAC,0CAA0C,EAAE,GAAS,EAAE;YACxD,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,qBAAqB,CAClD,UAAU,EACV,WAAW,EACX,aAAa,EACb,GAAG,CACJ,CAAC;YAEF,IAAA,aAAM,EAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;QAC/C,CAAC,CAAA,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAA,CAAC,CAAC"}
@@ -17,9 +17,7 @@ const coingecko_api_1 = __importDefault(require("coingecko-api"));
17
17
  const ethers_1 = require("ethers");
18
18
  const core_1 = require("@hyperlane-xyz/core");
19
19
  const utils_1 = require("@hyperlane-xyz/utils");
20
- const chainMetadata_1 = require("../consts/chainMetadata");
21
20
  const HyperlaneCore_1 = require("../core/HyperlaneCore");
22
- const domains_1 = require("../domains");
23
21
  const number_1 = require("../utils/number");
24
22
  const token_prices_1 = require("./token-prices");
25
23
  /**
@@ -124,9 +122,10 @@ class InterchainGasCalculator {
124
122
  */
125
123
  quoteGasPaymentForIGP(origin, destination, gasAmount, interchainGasPaymasterAddress) {
126
124
  return __awaiter(this, void 0, void 0, function* () {
127
- const originProvider = this.multiProvider.getChainProvider(origin);
125
+ const originProvider = this.multiProvider.getProvider(origin);
128
126
  const igp = core_1.InterchainGasPaymaster__factory.connect(interchainGasPaymasterAddress, originProvider);
129
- return igp.quoteGasPayment(domains_1.ChainNameToDomainId[destination], gasAmount);
127
+ const domainId = this.multiProvider.getDomainId(destination);
128
+ return igp.quoteGasPayment(domainId, gasAmount);
130
129
  });
131
130
  }
132
131
  /**
@@ -216,7 +215,7 @@ class InterchainGasCalculator {
216
215
  */
217
216
  getGasPrice(chain) {
218
217
  return __awaiter(this, void 0, void 0, function* () {
219
- const provider = this.multiProvider.getChainConnection(chain).provider;
218
+ const provider = this.multiProvider.getProvider(chain);
220
219
  if (provider == undefined) {
221
220
  throw new Error(`Missing provider for ${chain}`);
222
221
  }
@@ -229,8 +228,8 @@ class InterchainGasCalculator {
229
228
  * @returns The number of decimals of `chain`'s native token.
230
229
  */
231
230
  tokenDecimals(chain) {
232
- var _a;
233
- return (_a = chainMetadata_1.chainMetadata[chain].nativeToken.decimals) !== null && _a !== void 0 ? _a : DEFAULT_TOKEN_DECIMALS;
231
+ var _a, _b, _c;
232
+ return ((_c = (_b = (_a = this.multiProvider.tryGetChainMetadata(chain)) === null || _a === void 0 ? void 0 : _a.nativeToken) === null || _b === void 0 ? void 0 : _b.decimals) !== null && _c !== void 0 ? _c : DEFAULT_TOKEN_DECIMALS);
234
233
  }
235
234
  /**
236
235
  * Estimates the amount of gas used by message's recipient `handle` function
@@ -248,8 +247,7 @@ class InterchainGasCalculator {
248
247
  */
249
248
  estimateGasForHandle(message) {
250
249
  return __awaiter(this, void 0, void 0, function* () {
251
- const provider = this.multiProvider.getChainConnection(message.destination)
252
- .provider;
250
+ const provider = this.multiProvider.getProvider(message.destination);
253
251
  const mailbox = this.core.getContracts(message.destination).mailbox
254
252
  .contract;
255
253
  const handlerInterface = new ethers_1.ethers.utils.Interface([
@@ -262,7 +260,7 @@ class InterchainGasCalculator {
262
260
  to: utils_1.utils.bytes32ToAddress(message.recipient),
263
261
  from: mailbox.address,
264
262
  data: handlerInterface.encodeFunctionData('handle', [
265
- chainMetadata_1.chainMetadata[message.origin].id,
263
+ this.multiProvider.getChainId(message.origin),
266
264
  utils_1.utils.addressToBytes32(message.sender),
267
265
  message.body,
268
266
  ]),
@@ -285,7 +283,7 @@ class InterchainGasCalculator {
285
283
  return __awaiter(this, void 0, void 0, function* () {
286
284
  // TODO: Check the recipient module
287
285
  const module = this.core.getContracts(destination).multisigIsm;
288
- const threshold = yield module.threshold(domains_1.ChainNameToDomainId[origin]);
286
+ const threshold = yield module.threshold(this.multiProvider.getDomainId(origin));
289
287
  return ethers_1.BigNumber.from(threshold)
290
288
  .mul(GAS_OVERHEAD_PER_SIGNATURE)
291
289
  .add(GAS_OVERHEAD_BASE);
@@ -1 +1 @@
1
- {"version":3,"file":"calculator.js","sourceRoot":"","sources":["../../src/gas/calculator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kEAAsC;AACtC,mCAAwD;AAExD,8CAAsE;AACtE,gDAAoD;AAEpD,2DAAwD;AACxD,yDAI+B;AAC/B,wCAAiD;AAGjD,4CAAsE;AAEtE,iDAA6E;AAE7E;;;;;;;;;;GAUG;AAEH,mFAAmF;AACnF,MAAM,sBAAsB,GAAG,EAAE,CAAC;AAElC,sFAAsF;AACtF,sCAAsC;AACtC,MAAM,aAAa,GAAG,KAAM,CAAC;AAE7B,kEAAkE;AAClE,2FAA2F;AAC3F,qEAAqE;AACrE,MAAM,iBAAiB,GAAG,MAAO,CAAC;AAElC,qEAAqE;AACrE,iCAAiC;AACjC,gEAAgE;AAChE,MAAM,0BAA0B,GAAG,IAAK,CAAC;AAqCzC;;GAEG;AACH,MAAa,uBAAuB;IAkBlC,YACE,aAAmC,EACnC,IAA0B,EAC1B,MAAsC;;QAEtC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QAEjB,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,gBAAgB,EAAE;YAC5B,IAAI,CAAC,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,CAAC;SACjD;aAAM;YACL,MAAM,SAAS,GAAG,IAAI,uBAAS,EAAE,CAAC;YAClC,IAAI,CAAC,gBAAgB,GAAG,IAAI,wCAAyB,CAAC,SAAS,CAAC,CAAC;SAClE;QAED,IAAI,CAAC,yBAAyB,GAAG,oBAAW,CAAC,IAAI,CAC/C,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,yBAAyB,mCAAI,MAAM,CAC5C,CAAC;QACF,IAAI,CAAC,wBAAwB,GAAG,kBAAS,CAAC,IAAI,CAC5C,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,wBAAwB,mCAAI,KAAM,CAC3C,CAAC;IACJ,CAAC;IA9BD,MAAM,CAAC,eAAe,CACpB,GAAQ,EACR,aAAuD,EACvD,MAAsC;QAEtC,MAAM,IAAI,GAAG,6BAAa,CAAC,eAAe,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;QAC/D,OAAO,IAAI,uBAAuB,CAAC,aAAa,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IAClE,CAAC;IAyBD;;;;;;;;;;;;;OAaG;IACG,+BAA+B,CACnC,MAAmC,EACnC,WAAwB,EACxB,SAAoB;;YAEpB,MAAM,UAAU,GACd,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,gCAAgC,CAAC;YAClE,OAAO,IAAI,CAAC,qBAAqB,CAC/B,MAAM,EACN,WAAW,EACX,SAAS,EACT,UAAU,CAAC,OAAO,CACnB,CAAC;QACJ,CAAC;KAAA;IAED;;;;;;;;;;;;;OAaG;IACG,eAAe,CACnB,MAAmC,EACnC,WAAwB,EACxB,SAAoB;;YAEpB,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,sBAAsB,CAAC;YACzE,OAAO,IAAI,CAAC,qBAAqB,CAC/B,MAAM,EACN,WAAW,EACX,SAAS,EACT,UAAU,CAAC,OAAO,CACnB,CAAC;QACJ,CAAC;KAAA;IAED;;;;;;;;;;;;;OAaG;IACG,qBAAqB,CACzB,MAAmC,EACnC,WAAwB,EACxB,SAAoB,EACpB,6BAA4C;;YAE5C,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;YACnE,MAAM,GAAG,GAAG,sCAA+B,CAAC,OAAO,CACjD,6BAA6B,EAC7B,cAAc,CACf,CAAC;YACF,OAAO,GAAG,CAAC,eAAe,CAAC,6BAAmB,CAAC,WAAW,CAAC,EAAE,SAAS,CAAC,CAAC;QAC1E,CAAC;KAAA;IAED;;;;;;;;;;;OAWG;IACG,qBAAqB,CACzB,MAAmC,EACnC,WAAwB,EACxB,GAAc;;YAEd,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;YAChE,MAAM,kBAAkB,GAAG,GAAG,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;YACxD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,oBAAoB,CACnD,WAAW,EACX,MAAM,EACN,kBAAkB,CACnB,CAAC;YACF,uBAAuB;YACvB,OAAO,IAAA,uBAAc,EACnB,aAAa,EACb,IAAI,CAAC,yBAAyB,EAC9B,IAAI,CACL,CAAC;QACJ,CAAC;KAAA;IAED;;;;;;;;;;;;;;;OAeG;IACG,2BAA2B,CAC/B,MAAmC,EACnC,WAAwB,EACxB,SAAoB;;YAEpB,MAAM,cAAc,GAAG,SAAS,CAAC,GAAG,CAClC,MAAM,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,WAAW,CAAC,CACtD,CAAC;YACF,OAAO,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC;QACzE,CAAC;KAAA;IAED;;;;;;;;;;;OAWG;IACa,yBAAyB,CACvC,OAA0C;;YAE1C,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;YAC3D,OAAO,IAAI,CAAC,2BAA2B,CACrC,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,WAAW,EACnB,SAAS,CACV,CAAC;QACJ,CAAC;KAAA;IAED;;;;;;;;;OASG;IACa,oBAAoB,CAClC,SAAgB,EAChB,OAAc,EACd,KAAgB;;YAEhB,+CAA+C;YAC/C,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,CACnE,SAAS,EACT,OAAO,CACR,CAAC;YAEF,oBAAoB;YACpB,MAAM,SAAS,GAAG,IAAI,CAAC;YAEvB,OAAO,IAAA,4BAAmB,EACxB,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,EAC9D,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,EAC7B,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAC5B,CAAC;QACJ,CAAC;KAAA;IAED;;;;OAIG;IACa,WAAW,CAAC,KAAY;;YACtC,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,QAAS,CAAC;YACxE,IAAI,QAAQ,IAAI,SAAS,EAAE;gBACzB,MAAM,IAAI,KAAK,CAAC,wBAAwB,KAAK,EAAE,CAAC,CAAC;aAClD;YACD,OAAO,QAAQ,CAAC,WAAW,EAAE,CAAC;QAChC,CAAC;KAAA;IAED;;;;OAIG;IACO,aAAa,CAAC,KAAY;;QAClC,OAAO,MAAA,6BAAa,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,QAAQ,mCAAI,sBAAsB,CAAC;IAC7E,CAAC;IAED;;;;;;;;;;;;;OAaG;IACa,oBAAoB,CAClC,OAAyC;;YAEzC,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,OAAO,CAAC,WAAW,CAAC;iBACxE,QAAS,CAAC;YAEb,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,OAAO;iBAChE,QAAQ,CAAC;YAEZ,MAAM,gBAAgB,GAAG,IAAI,eAAM,CAAC,KAAK,CAAC,SAAS,CAAC;gBAClD,uCAAuC;aACxC,CAAC,CAAC;YACH,oEAAoE;YACpE,4CAA4C;YAC5C,+BAA+B;YAC/B,MAAM,mBAAmB,GAAG,MAAM,QAAQ,CAAC,WAAW,CAAC;gBACrD,EAAE,EAAE,aAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,SAAS,CAAC;gBAC7C,IAAI,EAAE,OAAO,CAAC,OAAO;gBACrB,IAAI,EAAE,gBAAgB,CAAC,kBAAkB,CAAC,QAAQ,EAAE;oBAClD,6BAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE;oBAChC,aAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,MAAM,CAAC;oBACtC,OAAO,CAAC,IAAI;iBACb,CAAC;aACH,CAAC,CAAC;YAEH,oEAAoE;YACpE,6EAA6E;YAC7E,iFAAiF;YACjF,mEAAmE;YACnE,OAAO,mBAAmB;iBACvB,GAAG,CAAC,IAAI,CAAC,wBAAwB,CAAC;iBAClC,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;QAC9B,CAAC;KAAA;IAED;;;;OAIG;IACa,qBAAqB,CACnC,MAAmC,EACnC,WAAwB;;YAExB,mCAAmC;YACnC,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,WAAW,CAAC;YAC/D,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,6BAAmB,CAAC,MAAM,CAAC,CAAC,CAAC;YACtE,OAAO,kBAAS,CAAC,IAAI,CAAC,SAAS,CAAC;iBAC7B,GAAG,CAAC,0BAA0B,CAAC;iBAC/B,GAAG,CAAC,iBAAiB,CAAC,CAAC;QAC5B,CAAC;KAAA;IAED;;;OAGG;IACO,YAAY;QACpB,OAAO,kBAAS,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACvC,CAAC;CACF;AA7UD,0DA6UC"}
1
+ {"version":3,"file":"calculator.js","sourceRoot":"","sources":["../../src/gas/calculator.ts"],"names":[],"mappings":"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"}
@@ -15,7 +15,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
15
15
  const chai_1 = require("chai");
16
16
  const ethers_1 = require("ethers");
17
17
  const sinon_1 = __importDefault(require("sinon"));
18
- const chainMetadata_1 = require("../consts/chainMetadata");
19
18
  const chains_1 = require("../consts/chains");
20
19
  const HyperlaneCore_1 = require("../core/HyperlaneCore");
21
20
  const MultiProvider_1 = require("../providers/MultiProvider");
@@ -44,16 +43,7 @@ class TestInterchainGasCalculator extends calculator_1.InterchainGasCalculator {
44
43
  }
45
44
  describe('InterchainGasCalculator', () => {
46
45
  const provider = new testUtils_1.MockProvider();
47
- // TODO: fix types to not require the <any> here.
48
- // This is because InterchainGasCalculator isn't very strongly typed,
49
- // which is because ParsedMessage isn't very strongly typed. This results
50
- // in InterchainGasCalculator expecting a multiprovider with providers for
51
- // every chain.
52
- const multiProvider = new MultiProvider_1.MultiProvider({
53
- test1: { id: chainMetadata_1.chainMetadata.test1.id, provider },
54
- test2: { id: chainMetadata_1.chainMetadata.test2.id, provider },
55
- test3: { id: chainMetadata_1.chainMetadata.test3.id, provider },
56
- });
46
+ const multiProvider = MultiProvider_1.MultiProvider.createTestMultiProvider({ provider });
57
47
  const core = HyperlaneCore_1.HyperlaneCore.fromEnvironment('test', multiProvider);
58
48
  const origin = chains_1.Chains.test1;
59
49
  const destination = chains_1.Chains.test2;
@@ -153,9 +143,7 @@ describe('InterchainGasCalculator', () => {
153
143
  (0, chai_1.expect)(originWei.toNumber()).to.equal(60500);
154
144
  }));
155
145
  it('considers when the origin token decimals < the destination token decimals', () => __awaiter(void 0, void 0, void 0, function* () {
156
- sinon_1.default
157
- .stub(calculator, 'tokenDecimals')
158
- .callsFake((chain) => {
146
+ sinon_1.default.stub(calculator, 'tokenDecimals').callsFake((chain) => {
159
147
  if (chain === origin) {
160
148
  return 16;
161
149
  }