@hyperlane-xyz/sdk 1.2.2 → 1.3.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 (243) hide show
  1. package/dist/HyperlaneApp.d.ts +11 -7
  2. package/dist/HyperlaneApp.d.ts.map +1 -1
  3. package/dist/HyperlaneApp.js +14 -0
  4. package/dist/HyperlaneApp.js.map +1 -1
  5. package/dist/agents/types.d.ts +56 -0
  6. package/dist/agents/types.d.ts.map +1 -0
  7. package/dist/agents/types.js +43 -0
  8. package/dist/agents/types.js.map +1 -0
  9. package/dist/consts/bytecode.d.ts +11 -0
  10. package/dist/consts/bytecode.d.ts.map +1 -0
  11. package/dist/consts/bytecode.js +15 -0
  12. package/dist/consts/bytecode.js.map +1 -0
  13. package/dist/consts/chainMetadata.d.ts +2 -0
  14. package/dist/consts/chainMetadata.d.ts.map +1 -1
  15. package/dist/consts/chainMetadata.js +6 -3
  16. package/dist/consts/chainMetadata.js.map +1 -1
  17. package/dist/consts/environments/index.d.ts +64 -231
  18. package/dist/consts/environments/index.d.ts.map +1 -1
  19. package/dist/consts/environments/index.js +2 -12
  20. package/dist/consts/environments/index.js.map +1 -1
  21. package/dist/consts/environments/mainnet.json +28 -99
  22. package/dist/consts/environments/test.json +20 -44
  23. package/dist/consts/environments/testnet.json +27 -90
  24. package/dist/consts/multisigIsm.d.ts +4 -0
  25. package/dist/consts/multisigIsm.d.ts.map +1 -0
  26. package/dist/consts/multisigIsm.js +174 -0
  27. package/dist/consts/multisigIsm.js.map +1 -0
  28. package/dist/contracts.d.ts +16 -10
  29. package/dist/contracts.d.ts.map +1 -1
  30. package/dist/contracts.js +32 -43
  31. package/dist/contracts.js.map +1 -1
  32. package/dist/core/HyperlaneCore.d.ts +5 -16
  33. package/dist/core/HyperlaneCore.d.ts.map +1 -1
  34. package/dist/core/HyperlaneCore.js +7 -35
  35. package/dist/core/HyperlaneCore.js.map +1 -1
  36. package/dist/core/HyperlaneCoreChecker.d.ts +0 -6
  37. package/dist/core/HyperlaneCoreChecker.d.ts.map +1 -1
  38. package/dist/core/HyperlaneCoreChecker.js +20 -155
  39. package/dist/core/HyperlaneCoreChecker.js.map +1 -1
  40. package/dist/core/HyperlaneCoreDeployer.d.ts +8 -22
  41. package/dist/core/HyperlaneCoreDeployer.d.ts.map +1 -1
  42. package/dist/core/HyperlaneCoreDeployer.js +14 -141
  43. package/dist/core/HyperlaneCoreDeployer.js.map +1 -1
  44. package/dist/core/TestCoreApp.d.ts +8 -12
  45. package/dist/core/TestCoreApp.d.ts.map +1 -1
  46. package/dist/core/TestCoreApp.js +6 -3
  47. package/dist/core/TestCoreApp.js.map +1 -1
  48. package/dist/core/TestCoreDeployer.d.ts +2 -2
  49. package/dist/core/TestCoreDeployer.d.ts.map +1 -1
  50. package/dist/core/TestCoreDeployer.js +4 -25
  51. package/dist/core/TestCoreDeployer.js.map +1 -1
  52. package/dist/core/contracts.d.ts +3 -22
  53. package/dist/core/contracts.d.ts.map +1 -1
  54. package/dist/core/contracts.js +1 -7
  55. package/dist/core/contracts.js.map +1 -1
  56. package/dist/core/testHyperlaneDeploy.hardhat-test.js +2 -2
  57. package/dist/core/testHyperlaneDeploy.hardhat-test.js.map +1 -1
  58. package/dist/core/types.d.ts +4 -47
  59. package/dist/core/types.d.ts.map +1 -1
  60. package/dist/core/types.js +1 -16
  61. package/dist/core/types.js.map +1 -1
  62. package/dist/deploy/HyperlaneAppChecker.d.ts +2 -4
  63. package/dist/deploy/HyperlaneAppChecker.d.ts.map +1 -1
  64. package/dist/deploy/HyperlaneAppChecker.js +47 -21
  65. package/dist/deploy/HyperlaneAppChecker.js.map +1 -1
  66. package/dist/deploy/HyperlaneDeployer.d.ts +20 -18
  67. package/dist/deploy/HyperlaneDeployer.d.ts.map +1 -1
  68. package/dist/deploy/HyperlaneDeployer.js +120 -94
  69. package/dist/deploy/HyperlaneDeployer.js.map +1 -1
  70. package/dist/deploy/proxy.d.ts +1 -13
  71. package/dist/deploy/proxy.d.ts.map +1 -1
  72. package/dist/deploy/proxy.js +8 -13
  73. package/dist/deploy/proxy.js.map +1 -1
  74. package/dist/deploy/types.d.ts +7 -1
  75. package/dist/deploy/types.d.ts.map +1 -1
  76. package/dist/deploy/types.js +1 -0
  77. package/dist/deploy/types.js.map +1 -1
  78. package/dist/deploy/verify/ContractVerifier.d.ts.map +1 -1
  79. package/dist/deploy/verify/ContractVerifier.js +2 -1
  80. package/dist/deploy/verify/ContractVerifier.js.map +1 -1
  81. package/dist/deploy/verify/utils.d.ts +1 -0
  82. package/dist/deploy/verify/utils.d.ts.map +1 -1
  83. package/dist/deploy/verify/utils.js +9 -4
  84. package/dist/deploy/verify/utils.js.map +1 -1
  85. package/dist/gas/HyperlaneIgp.d.ts +53 -0
  86. package/dist/gas/HyperlaneIgp.d.ts.map +1 -0
  87. package/dist/gas/HyperlaneIgp.js +72 -0
  88. package/dist/gas/HyperlaneIgp.js.map +1 -0
  89. package/dist/gas/HyperlaneIgpChecker.d.ts +14 -0
  90. package/dist/gas/HyperlaneIgpChecker.d.ts.map +1 -0
  91. package/dist/gas/HyperlaneIgpChecker.js +148 -0
  92. package/dist/gas/HyperlaneIgpChecker.js.map +1 -0
  93. package/dist/gas/HyperlaneIgpDeployer.d.ts +22 -0
  94. package/dist/gas/HyperlaneIgpDeployer.d.ts.map +1 -0
  95. package/dist/gas/HyperlaneIgpDeployer.js +113 -0
  96. package/dist/gas/HyperlaneIgpDeployer.js.map +1 -0
  97. package/dist/gas/contracts.d.ts +9 -0
  98. package/dist/gas/contracts.d.ts.map +1 -0
  99. package/dist/gas/contracts.js +11 -0
  100. package/dist/gas/contracts.js.map +1 -0
  101. package/dist/gas/types.d.ts +35 -50
  102. package/dist/gas/types.d.ts.map +1 -1
  103. package/dist/gas/types.js +11 -17
  104. package/dist/gas/types.js.map +1 -1
  105. package/dist/index.d.ts +34 -26
  106. package/dist/index.d.ts.map +1 -1
  107. package/dist/index.js +68 -43
  108. package/dist/index.js.map +1 -1
  109. package/dist/middleware/MiddlewareRouterChecker.d.ts +8 -0
  110. package/dist/middleware/MiddlewareRouterChecker.d.ts.map +1 -0
  111. package/dist/middleware/MiddlewareRouterChecker.js +26 -0
  112. package/dist/middleware/MiddlewareRouterChecker.js.map +1 -0
  113. package/dist/middleware/MiddlewareRouterDeployer.d.ts +17 -0
  114. package/dist/middleware/MiddlewareRouterDeployer.d.ts.map +1 -0
  115. package/dist/middleware/MiddlewareRouterDeployer.js +62 -0
  116. package/dist/middleware/MiddlewareRouterDeployer.js.map +1 -0
  117. package/dist/middleware/account/InterchainAccount.d.ts +11 -0
  118. package/dist/middleware/account/InterchainAccount.d.ts.map +1 -0
  119. package/dist/middleware/account/InterchainAccount.js +21 -0
  120. package/dist/middleware/account/InterchainAccount.js.map +1 -0
  121. package/dist/middleware/account/InterchainAccountChecker.d.ts +7 -0
  122. package/dist/middleware/account/InterchainAccountChecker.d.ts.map +1 -0
  123. package/dist/middleware/account/InterchainAccountChecker.js +8 -0
  124. package/dist/middleware/account/InterchainAccountChecker.js.map +1 -0
  125. package/dist/middleware/account/InterchainAccountDeployer.d.ts +14 -0
  126. package/dist/middleware/account/InterchainAccountDeployer.d.ts.map +1 -0
  127. package/dist/middleware/account/InterchainAccountDeployer.js +64 -0
  128. package/dist/middleware/account/InterchainAccountDeployer.js.map +1 -0
  129. package/dist/middleware/account/accounts.hardhat-test.d.ts.map +1 -0
  130. package/dist/middleware/{accounts.hardhat-test.js → account/accounts.hardhat-test.js} +21 -24
  131. package/dist/middleware/account/accounts.hardhat-test.js.map +1 -0
  132. package/dist/middleware/account/contracts.d.ts +7 -0
  133. package/dist/middleware/account/contracts.d.ts.map +1 -0
  134. package/dist/middleware/account/contracts.js +9 -0
  135. package/dist/middleware/account/contracts.js.map +1 -0
  136. package/dist/middleware/liquidity-layer/LiquidityLayerApp.d.ts +5 -4
  137. package/dist/middleware/liquidity-layer/LiquidityLayerApp.d.ts.map +1 -1
  138. package/dist/middleware/liquidity-layer/LiquidityLayerApp.js +12 -2
  139. package/dist/middleware/liquidity-layer/LiquidityLayerApp.js.map +1 -1
  140. package/dist/middleware/liquidity-layer/LiquidityLayerRouterDeployer.d.ts +8 -6
  141. package/dist/middleware/liquidity-layer/LiquidityLayerRouterDeployer.d.ts.map +1 -1
  142. package/dist/middleware/liquidity-layer/LiquidityLayerRouterDeployer.js +13 -10
  143. package/dist/middleware/liquidity-layer/LiquidityLayerRouterDeployer.js.map +1 -1
  144. package/dist/middleware/liquidity-layer/contracts.d.ts +5 -8
  145. package/dist/middleware/liquidity-layer/contracts.d.ts.map +1 -1
  146. package/dist/middleware/liquidity-layer/contracts.js +2 -1
  147. package/dist/middleware/liquidity-layer/contracts.js.map +1 -1
  148. package/dist/middleware/liquidity-layer/liquidity-layer.hardhat-test.js +33 -30
  149. package/dist/middleware/liquidity-layer/liquidity-layer.hardhat-test.js.map +1 -1
  150. package/dist/middleware/query/InterchainQuery.d.ts +11 -0
  151. package/dist/middleware/query/InterchainQuery.d.ts.map +1 -0
  152. package/dist/middleware/query/InterchainQuery.js +21 -0
  153. package/dist/middleware/query/InterchainQuery.js.map +1 -0
  154. package/dist/middleware/query/InterchainQueryChecker.d.ts +7 -0
  155. package/dist/middleware/query/InterchainQueryChecker.d.ts.map +1 -0
  156. package/dist/middleware/query/InterchainQueryChecker.js +8 -0
  157. package/dist/middleware/query/InterchainQueryChecker.js.map +1 -0
  158. package/dist/middleware/query/InterchainQueryDeployer.d.ts +12 -0
  159. package/dist/middleware/query/InterchainQueryDeployer.d.ts.map +1 -0
  160. package/dist/middleware/query/InterchainQueryDeployer.js +13 -0
  161. package/dist/middleware/query/InterchainQueryDeployer.js.map +1 -0
  162. package/dist/middleware/query/contracts.d.ts +7 -0
  163. package/dist/middleware/query/contracts.d.ts.map +1 -0
  164. package/dist/middleware/query/contracts.js +9 -0
  165. package/dist/middleware/query/contracts.js.map +1 -0
  166. package/dist/middleware/query/queries.hardhat-test.d.ts.map +1 -0
  167. package/dist/middleware/{queries.hardhat-test.js → query/queries.hardhat-test.js} +21 -12
  168. package/dist/middleware/query/queries.hardhat-test.js.map +1 -0
  169. package/dist/providers/MultiProvider.d.ts +13 -2
  170. package/dist/providers/MultiProvider.d.ts.map +1 -1
  171. package/dist/providers/MultiProvider.js +60 -33
  172. package/dist/providers/MultiProvider.js.map +1 -1
  173. package/dist/router/GasRouterDeployer.d.ts +4 -4
  174. package/dist/router/GasRouterDeployer.d.ts.map +1 -1
  175. package/dist/router/GasRouterDeployer.js +1 -1
  176. package/dist/router/GasRouterDeployer.js.map +1 -1
  177. package/dist/router/HyperlaneRouterChecker.d.ts +3 -5
  178. package/dist/router/HyperlaneRouterChecker.d.ts.map +1 -1
  179. package/dist/router/HyperlaneRouterChecker.js +4 -8
  180. package/dist/router/HyperlaneRouterChecker.js.map +1 -1
  181. package/dist/router/HyperlaneRouterDeployer.d.ts +9 -6
  182. package/dist/router/HyperlaneRouterDeployer.d.ts.map +1 -1
  183. package/dist/router/HyperlaneRouterDeployer.js +13 -28
  184. package/dist/router/HyperlaneRouterDeployer.js.map +1 -1
  185. package/dist/router/RouterApps.d.ts +6 -4
  186. package/dist/router/RouterApps.d.ts.map +1 -1
  187. package/dist/router/RouterApps.js +2 -2
  188. package/dist/router/RouterApps.js.map +1 -1
  189. package/dist/router/types.d.ts +4 -16
  190. package/dist/router/types.d.ts.map +1 -1
  191. package/dist/test/envSubsetDeployer/app.d.ts +18 -11
  192. package/dist/test/envSubsetDeployer/app.d.ts.map +1 -1
  193. package/dist/test/envSubsetDeployer/app.js +14 -15
  194. package/dist/test/envSubsetDeployer/app.js.map +1 -1
  195. package/dist/test/envSubsetDeployer/check-single-chain.js +6 -4
  196. package/dist/test/envSubsetDeployer/check-single-chain.js.map +1 -1
  197. package/dist/test/envSubsetDeployer/deploy-single-chain.js +7 -5
  198. package/dist/test/envSubsetDeployer/deploy-single-chain.js.map +1 -1
  199. package/dist/test/envSubsetDeployer/deploy.hardhat-test.js +12 -13
  200. package/dist/test/envSubsetDeployer/deploy.hardhat-test.js.map +1 -1
  201. package/dist/test/testUtils.d.ts +10 -23
  202. package/dist/test/testUtils.d.ts.map +1 -1
  203. package/dist/test/testUtils.js +45 -60
  204. package/dist/test/testUtils.js.map +1 -1
  205. package/dist/utils/ism.d.ts +2 -0
  206. package/dist/utils/ism.d.ts.map +1 -0
  207. package/dist/utils/ism.js +18 -0
  208. package/dist/utils/ism.js.map +1 -0
  209. package/dist/utils/objects.d.ts +3 -1
  210. package/dist/utils/objects.d.ts.map +1 -1
  211. package/dist/utils/objects.js +35 -2
  212. package/dist/utils/objects.js.map +1 -1
  213. package/package.json +4 -4
  214. package/dist/deploy/utils.d.ts +0 -6
  215. package/dist/deploy/utils.d.ts.map +0 -1
  216. package/dist/deploy/utils.js +0 -13
  217. package/dist/deploy/utils.js.map +0 -1
  218. package/dist/gas/calculator.d.ts +0 -186
  219. package/dist/gas/calculator.d.ts.map +0 -1
  220. package/dist/gas/calculator.hardhat-test.d.ts +0 -2
  221. package/dist/gas/calculator.hardhat-test.d.ts.map +0 -1
  222. package/dist/gas/calculator.hardhat-test.js +0 -59
  223. package/dist/gas/calculator.hardhat-test.js.map +0 -1
  224. package/dist/gas/calculator.js +0 -301
  225. package/dist/gas/calculator.js.map +0 -1
  226. package/dist/gas/calculator.test.d.ts +0 -2
  227. package/dist/gas/calculator.test.d.ts.map +0 -1
  228. package/dist/gas/calculator.test.js +0 -197
  229. package/dist/gas/calculator.test.js.map +0 -1
  230. package/dist/middleware/accounts.hardhat-test.d.ts.map +0 -1
  231. package/dist/middleware/accounts.hardhat-test.js.map +0 -1
  232. package/dist/middleware/deploy.d.ts +0 -28
  233. package/dist/middleware/deploy.d.ts.map +0 -1
  234. package/dist/middleware/deploy.js +0 -68
  235. package/dist/middleware/deploy.js.map +0 -1
  236. package/dist/middleware/queries.hardhat-test.d.ts.map +0 -1
  237. package/dist/middleware/queries.hardhat-test.js.map +0 -1
  238. package/dist/proxy.d.ts +0 -21
  239. package/dist/proxy.d.ts.map +0 -1
  240. package/dist/proxy.js +0 -32
  241. package/dist/proxy.js.map +0 -1
  242. /package/dist/middleware/{accounts.hardhat-test.d.ts → account/accounts.hardhat-test.d.ts} +0 -0
  243. /package/dist/middleware/{queries.hardhat-test.d.ts → query/queries.hardhat-test.d.ts} +0 -0
@@ -1 +1 @@
1
- {"version":3,"file":"HyperlaneRouterDeployer.d.ts","sourceRoot":"","sources":["../../src/router/HyperlaneRouterDeployer.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,eAAe,EACf,iBAAiB,EAClB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EACL,YAAY,EACZ,eAAe,EACf,eAAe,EAChB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAGpC,8BAAsB,uBAAuB,CAC3C,MAAM,SAAS,YAAY,EAC3B,SAAS,SAAS,eAAe,EACjC,SAAS,SAAS,eAAe,CACjC,SAAQ,iBAAiB,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,CAAC;gBAErD,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,EAC3B,SAAS,EAAE,SAAS,EACpB,OAAO,CAAC,EAAE,eAAe;IAQrB,oBAAoB,CAAC,YAAY,EAAE,QAAQ,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAuCtE,mBAAmB,CACvB,YAAY,EAAE,QAAQ,CAAC,eAAe,CAAC,GACtC,OAAO,CAAC,IAAI,CAAC;IAoDV,iBAAiB,CAAC,YAAY,EAAE,QAAQ,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBnE,MAAM,CACV,iBAAiB,CAAC,EAAE,QAAQ,CAAC,SAAS,CAAC,GACtC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;CAShC"}
1
+ {"version":3,"file":"HyperlaneRouterDeployer.d.ts","sourceRoot":"","sources":["../../src/router/HyperlaneRouterDeployer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAG7C,OAAO,EACL,kBAAkB,EAClB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,eAAe,EACf,iBAAiB,EAClB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAGpC,8BAAsB,uBAAuB,CAC3C,MAAM,SAAS,YAAY,EAC3B,SAAS,SAAS,kBAAkB,CACpC,SAAQ,iBAAiB,CAAC,MAAM,EAAE,SAAS,CAAC;gBAE1C,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,EAC3B,SAAS,EAAE,SAAS,EACpB,OAAO,CAAC,EAAE,eAAe;IAQ3B,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,kBAAkB,CAAC,SAAS,CAAC,GAAG,MAAM;IAE3D,qBAAqB,CACzB,YAAY,EAAE,qBAAqB,CAAC,SAAS,CAAC,GAC7C,OAAO,CAAC,IAAI,CAAC;IAYV,mBAAmB,CACvB,YAAY,EAAE,qBAAqB,CAAC,SAAS,CAAC,GAC7C,OAAO,CAAC,IAAI,CAAC;IAkDV,iBAAiB,CACrB,YAAY,EAAE,qBAAqB,CAAC,SAAS,CAAC,GAC7C,OAAO,CAAC,IAAI,CAAC;IAsBV,MAAM,CACV,iBAAiB,CAAC,EAAE,qBAAqB,CAAC,SAAS,CAAC,GACnD,OAAO,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;CAS7C"}
@@ -18,28 +18,13 @@ class HyperlaneRouterDeployer extends HyperlaneDeployer_1.HyperlaneDeployer {
18
18
  constructor(multiProvider, configMap, factories, options) {
19
19
  super(multiProvider, configMap, factories, Object.assign({ logger: (0, debug_1.debug)('hyperlane:RouterDeployer') }, options));
20
20
  }
21
- initConnectionClient(contractsMap) {
21
+ initConnectionClients(contractsMap) {
22
+ const _super = Object.create(null, {
23
+ initConnectionClient: { get: () => super.initConnectionClient }
24
+ });
22
25
  return __awaiter(this, void 0, void 0, function* () {
23
- this.logger(`Initializing connection clients (if not already)...`);
24
26
  yield (0, objects_1.promiseObjAll)((0, objects_1.objMap)(contractsMap, (local, contracts) => __awaiter(this, void 0, void 0, function* () {
25
- // set mailbox if not already set (and configured)
26
- const mailbox = this.configMap[local].mailbox;
27
- if (mailbox !== (yield contracts.router.mailbox())) {
28
- this.logger(`Set mailbox on ${local}`);
29
- yield this.multiProvider.handleTx(local, contracts.router.setMailbox(mailbox));
30
- }
31
- // set interchain gas paymaster if not already set (and configured)
32
- const igp = this.configMap[local].interchainGasPaymaster;
33
- if (igp !== (yield contracts.router.interchainGasPaymaster())) {
34
- this.logger(`Set interchain gas paymaster on ${local}`);
35
- yield this.multiProvider.handleTx(local, contracts.router.setInterchainGasPaymaster(igp));
36
- }
37
- const ism = this.configMap[local].interchainSecurityModule;
38
- if (ism &&
39
- ism !== (yield contracts.router.interchainSecurityModule())) {
40
- this.logger(`Set interchain security module on ${local}`);
41
- yield this.multiProvider.handleTx(local, contracts.router.setInterchainSecurityModule(ism));
42
- }
27
+ return _super.initConnectionClient.call(this, local, this.router(contracts), this.configMap[local]);
43
28
  })));
44
29
  });
45
30
  }
@@ -58,8 +43,8 @@ class HyperlaneRouterDeployer extends HyperlaneDeployer_1.HyperlaneDeployer {
58
43
  .filter((c) => deployedChains.includes(c));
59
44
  const enrollEntries = yield Promise.all(deployedRemoteChains.map((remote) => __awaiter(this, void 0, void 0, function* () {
60
45
  const remoteDomain = this.multiProvider.getDomainId(remote);
61
- const current = yield contracts.router.routers(remoteDomain);
62
- const expected = utils_1.utils.addressToBytes32(contractsMap[remote].router.address);
46
+ const current = yield this.router(contracts).routers(remoteDomain);
47
+ const expected = utils_1.utils.addressToBytes32(this.router(contractsMap[remote]).address);
63
48
  return current !== expected ? [remoteDomain, expected] : undefined;
64
49
  })));
65
50
  const entries = enrollEntries.filter((entry) => entry !== undefined);
@@ -69,10 +54,10 @@ class HyperlaneRouterDeployer extends HyperlaneDeployer_1.HyperlaneDeployer {
69
54
  if (domains.length === 0) {
70
55
  return;
71
56
  }
72
- yield _super.runIfOwner.call(this, chain, contracts.router, () => __awaiter(this, void 0, void 0, function* () {
57
+ yield _super.runIfOwner.call(this, chain, this.router(contracts), () => __awaiter(this, void 0, void 0, function* () {
73
58
  const chains = domains.map((id) => this.multiProvider.getChainName(id));
74
59
  this.logger(`Enrolling remote routers (${chains.join(', ')}) on ${chain}`);
75
- yield this.multiProvider.handleTx(chain, contracts.router.enrollRemoteRouters(domains, addresses, this.multiProvider.getTransactionOverrides(chain)));
60
+ yield this.multiProvider.handleTx(chain, this.router(contracts).enrollRemoteRouters(domains, addresses, this.multiProvider.getTransactionOverrides(chain)));
76
61
  }));
77
62
  }
78
63
  });
@@ -85,11 +70,11 @@ class HyperlaneRouterDeployer extends HyperlaneDeployer_1.HyperlaneDeployer {
85
70
  this.logger(`Transferring ownership of routers...`);
86
71
  yield (0, objects_1.promiseObjAll)((0, objects_1.objMap)(contractsMap, (chain, contracts) => __awaiter(this, void 0, void 0, function* () {
87
72
  const owner = this.configMap[chain].owner;
88
- const currentOwner = yield contracts.router.owner();
73
+ const currentOwner = yield this.router(contracts).owner();
89
74
  if (owner != currentOwner) {
90
75
  this.logger(`Transfer ownership of ${chain}'s router to ${owner}`);
91
- yield _super.runIfOwner.call(this, chain, contracts.router, () => __awaiter(this, void 0, void 0, function* () {
92
- yield this.multiProvider.handleTx(chain, contracts.router.transferOwnership(owner, this.multiProvider.getTransactionOverrides(chain)));
76
+ yield _super.runIfOwner.call(this, chain, this.router(contracts), () => __awaiter(this, void 0, void 0, function* () {
77
+ yield this.multiProvider.handleTx(chain, this.router(contracts).transferOwnership(owner, this.multiProvider.getTransactionOverrides(chain)));
93
78
  }));
94
79
  }
95
80
  })));
@@ -102,7 +87,7 @@ class HyperlaneRouterDeployer extends HyperlaneDeployer_1.HyperlaneDeployer {
102
87
  return __awaiter(this, void 0, void 0, function* () {
103
88
  const contractsMap = yield _super.deploy.call(this, partialDeployment);
104
89
  yield this.enrollRemoteRouters(contractsMap);
105
- yield this.initConnectionClient(contractsMap);
90
+ yield this.initConnectionClients(contractsMap);
106
91
  yield this.transferOwnership(contractsMap);
107
92
  return contractsMap;
108
93
  });
@@ -1 +1 @@
1
- {"version":3,"file":"HyperlaneRouterDeployer.js","sourceRoot":"","sources":["../../src/router/HyperlaneRouterDeployer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"HyperlaneRouterDeployer.js","sourceRoot":"","sources":["../../src/router/HyperlaneRouterDeployer.ts"],"names":[],"mappings":"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"}
@@ -1,15 +1,17 @@
1
1
  import type { BigNumber } from 'ethers';
2
- import { GasRouter } from '@hyperlane-xyz/core';
2
+ import { GasRouter, Router } from '@hyperlane-xyz/core';
3
3
  import type { types } from '@hyperlane-xyz/utils';
4
4
  import { HyperlaneApp } from '../HyperlaneApp';
5
+ import { HyperlaneContracts, HyperlaneFactories } from '../contracts';
5
6
  import { ChainMap, ChainName } from '../types';
6
- import { RouterContracts } from './types';
7
7
  export { Router } from '@hyperlane-xyz/core';
8
- export declare class RouterApp<Contracts extends RouterContracts> extends HyperlaneApp<Contracts> {
8
+ export declare abstract class RouterApp<Factories extends HyperlaneFactories> extends HyperlaneApp<Factories> {
9
+ abstract router(contracts: HyperlaneContracts<Factories>): Router;
9
10
  getSecurityModules: () => Promise<ChainMap<types.Address>>;
10
11
  getOwners: () => Promise<ChainMap<types.Address>>;
11
12
  }
12
- export declare class GasRouterApp<Contracts extends RouterContracts<GasRouter>> extends RouterApp<Contracts> {
13
+ export declare abstract class GasRouterApp<Factories extends HyperlaneFactories, R extends GasRouter> extends RouterApp<Factories> {
14
+ abstract router(contracts: HyperlaneContracts<Factories>): R;
13
15
  quoteGasPayment(origin: ChainName, destination: ChainName): Promise<BigNumber>;
14
16
  }
15
17
  //# sourceMappingURL=RouterApps.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"RouterApps.d.ts","sourceRoot":"","sources":["../../src/router/RouterApps.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAExC,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAG/C,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE1C,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAE7C,qBAAa,SAAS,CACpB,SAAS,SAAS,eAAe,CACjC,SAAQ,YAAY,CAAC,SAAS,CAAC;IAC/B,kBAAkB,QAAO,QAAQ,SAAS,MAAM,OAAO,CAAC,CAAC,CAKrD;IAEJ,SAAS,QAAO,QAAQ,SAAS,MAAM,OAAO,CAAC,CAAC,CAG5C;CACL;AAED,qBAAa,YAAY,CACvB,SAAS,SAAS,eAAe,CAAC,SAAS,CAAC,CAC5C,SAAQ,SAAS,CAAC,SAAS,CAAC;IACtB,eAAe,CACnB,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,SAAS,GACrB,OAAO,CAAC,SAAS,CAAC;CAKtB"}
1
+ {"version":3,"file":"RouterApps.d.ts","sourceRoot":"","sources":["../../src/router/RouterApps.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAExC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACtE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAG/C,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAE7C,8BAAsB,SAAS,CAC7B,SAAS,SAAS,kBAAkB,CACpC,SAAQ,YAAY,CAAC,SAAS,CAAC;IAC/B,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,kBAAkB,CAAC,SAAS,CAAC,GAAG,MAAM;IAEjE,kBAAkB,QAAO,QAAQ,SAAS,MAAM,OAAO,CAAC,CAAC,CAKrD;IAEJ,SAAS,QAAO,QAAQ,SAAS,MAAM,OAAO,CAAC,CAAC,CAK5C;CACL;AAED,8BAAsB,YAAY,CAChC,SAAS,SAAS,kBAAkB,EACpC,CAAC,SAAS,SAAS,CACnB,SAAQ,SAAS,CAAC,SAAS,CAAC;IAC5B,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,kBAAkB,CAAC,SAAS,CAAC,GAAG,CAAC;IAEtD,eAAe,CACnB,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,SAAS,GACrB,OAAO,CAAC,SAAS,CAAC;CAKtB"}
@@ -15,8 +15,8 @@ const objects_1 = require("../utils/objects");
15
15
  class RouterApp extends HyperlaneApp_1.HyperlaneApp {
16
16
  constructor() {
17
17
  super(...arguments);
18
- this.getSecurityModules = () => (0, objects_1.promiseObjAll)((0, objects_1.objMap)(this.contractsMap, (_, contracts) => contracts.router.interchainSecurityModule()));
19
- this.getOwners = () => (0, objects_1.promiseObjAll)((0, objects_1.objMap)(this.contractsMap, (_, contracts) => contracts.router.owner()));
18
+ this.getSecurityModules = () => (0, objects_1.promiseObjAll)((0, objects_1.objMap)(this.contractsMap, (_, contracts) => this.router(contracts).interchainSecurityModule()));
19
+ this.getOwners = () => (0, objects_1.promiseObjAll)((0, objects_1.objMap)(this.contractsMap, (_, contracts) => this.router(contracts).owner()));
20
20
  }
21
21
  }
22
22
  exports.RouterApp = RouterApp;
@@ -1 +1 @@
1
- {"version":3,"file":"RouterApps.js","sourceRoot":"","sources":["../../src/router/RouterApps.ts"],"names":[],"mappings":";;;;;;;;;;;;AAKA,kDAA+C;AAE/C,8CAAyD;AAMzD,MAAa,SAEX,SAAQ,2BAAuB;IAFjC;;QAGE,uBAAkB,GAAG,GAAqC,EAAE,CAC1D,IAAA,uBAAa,EACX,IAAA,gBAAM,EAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,CACzC,SAAS,CAAC,MAAM,CAAC,wBAAwB,EAAE,CAC5C,CACF,CAAC;QAEJ,cAAS,GAAG,GAAqC,EAAE,CACjD,IAAA,uBAAa,EACX,IAAA,gBAAM,EAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CACtE,CAAC;IACN,CAAC;CAAA;AAdD,8BAcC;AAED,MAAa,YAEX,SAAQ,SAAoB;IACtB,eAAe,CACnB,MAAiB,EACjB,WAAsB;;YAEtB,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,eAAe,CACrD,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,WAAW,CAAC,CAC5C,CAAC;QACJ,CAAC;KAAA;CACF;AAXD,oCAWC"}
1
+ {"version":3,"file":"RouterApps.js","sourceRoot":"","sources":["../../src/router/RouterApps.ts"],"names":[],"mappings":";;;;;;;;;;;;AAKA,kDAA+C;AAG/C,8CAAyD;AAIzD,MAAsB,SAEpB,SAAQ,2BAAuB;IAFjC;;QAKE,uBAAkB,GAAG,GAAqC,EAAE,CAC1D,IAAA,uBAAa,EACX,IAAA,gBAAM,EAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,CACzC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,wBAAwB,EAAE,CAClD,CACF,CAAC;QAEJ,cAAS,GAAG,GAAqC,EAAE,CACjD,IAAA,uBAAa,EACX,IAAA,gBAAM,EAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,CACzC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,CAC/B,CACF,CAAC;IACN,CAAC;CAAA;AAlBD,8BAkBC;AAED,MAAsB,YAGpB,SAAQ,SAAoB;IAGtB,eAAe,CACnB,MAAiB,EACjB,WAAsB;;YAEtB,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,eAAe,CACrD,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,WAAW,CAAC,CAC5C,CAAC;QACJ,CAAC;KAAA;CACF;AAdD,oCAcC"}
@@ -1,8 +1,6 @@
1
- import { ethers } from 'ethers';
2
- import { ProxyAdmin, Router } from '@hyperlane-xyz/core';
1
+ import { ProxyAdmin__factory } from '@hyperlane-xyz/core';
3
2
  import type { types } from '@hyperlane-xyz/utils';
4
- import { HyperlaneContracts, HyperlaneFactories } from '../contracts';
5
- import { ProxiedContract, TransparentProxyAddresses } from '../proxy';
3
+ import { HyperlaneFactories } from '../contracts';
6
4
  export declare type OwnableConfig = {
7
5
  owner: types.Address;
8
6
  };
@@ -11,18 +9,8 @@ declare type GasConfig = {
11
9
  gas: number;
12
10
  };
13
11
  export declare type GasRouterConfig = RouterConfig & GasConfig;
14
- export declare type RouterContracts<RouterContract extends Router = Router> = HyperlaneContracts & {
15
- router: RouterContract;
16
- };
17
- export declare type ProxiedRouterContracts<RouterContract extends Router = Router> = RouterContracts<RouterContract> & {
18
- proxyAdmin: ProxyAdmin;
19
- proxiedRouter: ProxiedContract<RouterContract, TransparentProxyAddresses>;
20
- };
21
- declare type RouterFactory<RouterContract extends Router = Router> = ethers.ContractFactory & {
22
- deploy: (...args: any[]) => Promise<RouterContract>;
23
- };
24
- export declare type RouterFactories<RouterContract extends Router = Router> = HyperlaneFactories & {
25
- router: RouterFactory<RouterContract>;
12
+ export declare type ProxiedFactories = HyperlaneFactories & {
13
+ proxyAdmin: ProxyAdmin__factory;
26
14
  };
27
15
  export declare type ConnectionClientConfig = {
28
16
  mailbox: types.Address;
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/router/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AAEtE,oBAAY,aAAa,GAAG;IAC1B,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC;CACtB,CAAC;AAEF,oBAAY,YAAY,GAAG,sBAAsB,GAAG,aAAa,CAAC;AAElE,aAAK,SAAS,GAAG;IACf,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,oBAAY,eAAe,GAAG,YAAY,GAAG,SAAS,CAAC;AAEvD,oBAAY,eAAe,CAAC,cAAc,SAAS,MAAM,GAAG,MAAM,IAChE,kBAAkB,GAAG;IACnB,MAAM,EAAE,cAAc,CAAC;CACxB,CAAC;AAEJ,oBAAY,sBAAsB,CAAC,cAAc,SAAS,MAAM,GAAG,MAAM,IACvE,eAAe,CAAC,cAAc,CAAC,GAAG;IAChC,UAAU,EAAE,UAAU,CAAC;IACvB,aAAa,EAAE,eAAe,CAAC,cAAc,EAAE,yBAAyB,CAAC,CAAC;CAC3E,CAAC;AAEJ,aAAK,aAAa,CAAC,cAAc,SAAS,MAAM,GAAG,MAAM,IACvD,MAAM,CAAC,eAAe,GAAG;IACvB,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;CACrD,CAAC;AAEJ,oBAAY,eAAe,CAAC,cAAc,SAAS,MAAM,GAAG,MAAM,IAChE,kBAAkB,GAAG;IACnB,MAAM,EAAE,aAAa,CAAC,cAAc,CAAC,CAAC;CACvC,CAAC;AAEJ,oBAAY,sBAAsB,GAAG;IACnC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC;IACvB,sBAAsB,EAAE,KAAK,CAAC,OAAO,CAAC;IACtC,wBAAwB,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC;CAC1C,CAAC"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/router/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAElD,oBAAY,aAAa,GAAG;IAC1B,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC;CACtB,CAAC;AAEF,oBAAY,YAAY,GAAG,sBAAsB,GAAG,aAAa,CAAC;AAElE,aAAK,SAAS,GAAG;IACf,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,oBAAY,eAAe,GAAG,YAAY,GAAG,SAAS,CAAC;AAEvD,oBAAY,gBAAgB,GAAG,kBAAkB,GAAG;IAClD,UAAU,EAAE,mBAAmB,CAAC;CACjC,CAAC;AAEF,oBAAY,sBAAsB,GAAG;IACnC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC;IACvB,sBAAsB,EAAE,KAAK,CAAC,OAAO,CAAC;IACtC,wBAAwB,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC;CAC1C,CAAC"}
@@ -1,26 +1,33 @@
1
- import { HyperlaneApp } from '../../HyperlaneApp';
1
+ import { TestRouter, TestRouter__factory } from '@hyperlane-xyz/core';
2
2
  import { Chains } from '../../consts/chains';
3
3
  import { HyperlaneCore } from '../../core/HyperlaneCore';
4
4
  import { MultiProvider } from '../../providers/MultiProvider';
5
5
  import { HyperlaneRouterChecker } from '../../router/HyperlaneRouterChecker';
6
6
  import { HyperlaneRouterDeployer } from '../../router/HyperlaneRouterDeployer';
7
- import { RouterConfig, RouterContracts, RouterFactories } from '../../router/types';
7
+ import { RouterApp } from '../../router/RouterApps';
8
+ import { RouterConfig } from '../../router/types';
8
9
  import { ChainMap, ChainName } from '../../types';
9
- export declare const fullTestEnvConfigs: Record<"polygon" | "test1" | "test2" | "test3" | "arbitrum" | "avalanche" | "bsc" | "celo" | "goerli" | "gnosis" | "optimism" | "sepolia" | "alfajores" | "arbitrumgoerli" | "bsctestnet" | "ethereum" | "fuji" | "moonbasealpha" | "moonbeam" | "mumbai" | "optimismgoerli", import("../../consts/chainMetadata").ChainMetadata>;
10
- export declare const subsetTestConfigs: Record<Chains.test1 | Chains.test2, import("../../consts/chainMetadata").ChainMetadata>;
11
10
  export declare const alfajoresChainConfig: Record<Chains.alfajores, import("../../consts/chainMetadata").ChainMetadata>;
12
- export declare class EnvSubsetApp extends HyperlaneApp<RouterContracts> {
11
+ export declare type TestRouterContracts = {
12
+ router: TestRouter;
13
+ };
14
+ export declare type TestRouterFactories = {
15
+ router: TestRouter__factory;
16
+ };
17
+ export declare const testRouterFactories: TestRouterFactories;
18
+ export declare class EnvSubsetApp extends RouterApp<typeof testRouterFactories> {
19
+ router(contracts: TestRouterContracts): TestRouter;
13
20
  }
14
- export declare class EnvSubsetChecker extends HyperlaneRouterChecker<EnvSubsetApp, RouterConfig, RouterContracts> {
21
+ export declare class EnvSubsetChecker extends HyperlaneRouterChecker<typeof testRouterFactories, EnvSubsetApp, RouterConfig> {
15
22
  }
16
- export declare const envSubsetFactories: RouterFactories;
17
- export declare class EnvSubsetDeployer extends HyperlaneRouterDeployer<RouterConfig, RouterContracts, RouterFactories> {
23
+ export declare class EnvSubsetDeployer extends HyperlaneRouterDeployer<RouterConfig, TestRouterFactories> {
18
24
  protected core: HyperlaneCore;
19
25
  constructor(multiProvider: MultiProvider, configMap: ChainMap<RouterConfig>, core: HyperlaneCore);
20
- initRouter(contractsMap: ChainMap<RouterContracts>): Promise<void>;
21
- deploy(): Promise<ChainMap<RouterContracts>>;
26
+ router(contracts: TestRouterContracts): TestRouter;
27
+ initRouter(contractsMap: ChainMap<TestRouterContracts>): Promise<void>;
28
+ deploy(): Promise<ChainMap<TestRouterContracts>>;
22
29
  deployContracts(chain: ChainName): Promise<{
23
- router: import("@hyperlane-xyz/core").Router;
30
+ router: TestRouter;
24
31
  }>;
25
32
  }
26
33
  //# sourceMappingURL=app.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../../src/test/envSubsetDeployer/app.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,OAAO,EAAE,MAAM,EAAc,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzD,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAC/E,OAAO,EACL,YAAY,EACZ,eAAe,EACf,eAAe,EAChB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGlD,eAAO,MAAM,kBAAkB,mUAAkC,CAAC;AAElE,eAAO,MAAM,iBAAiB,yFAG5B,CAAC;AAEH,eAAO,MAAM,oBAAoB,8EAA0C,CAAC;AAE5E,qBAAa,YAAa,SAAQ,YAAY,CAAC,eAAe,CAAC;CAAG;AAElE,qBAAa,gBAAiB,SAAQ,sBAAsB,CAC1D,YAAY,EACZ,YAAY,EACZ,eAAe,CAChB;CAAG;AAEJ,eAAO,MAAM,kBAAkB,EAAE,eAEhC,CAAC;AAEF,qBAAa,iBAAkB,SAAQ,uBAAuB,CAC5D,YAAY,EACZ,eAAe,EACf,eAAe,CAChB;IAIG,SAAS,CAAC,IAAI,EAAE,aAAa;gBAF7B,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,QAAQ,CAAC,YAAY,CAAC,EACvB,IAAI,EAAE,aAAa;IAMzB,UAAU,CAAC,YAAY,EAAE,QAAQ,CAAC,eAAe,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBlE,MAAM,IAAI,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IAS5C,eAAe,CAAC,KAAK,EAAE,SAAS;;;CAMvC"}
1
+ {"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../../src/test/envSubsetDeployer/app.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAGtE,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzD,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAC/E,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGlD,eAAO,MAAM,oBAAoB,8EAA0C,CAAC;AAE5E,oBAAY,mBAAmB,GAAG;IAChC,MAAM,EAAE,UAAU,CAAC;CACpB,CAAC;AAEF,oBAAY,mBAAmB,GAAG;IAChC,MAAM,EAAE,mBAAmB,CAAC;CAC7B,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,mBAEjC,CAAC;AAEF,qBAAa,YAAa,SAAQ,SAAS,CAAC,OAAO,mBAAmB,CAAC;IACrE,MAAM,CAAC,SAAS,EAAE,mBAAmB;CAGtC;AAED,qBAAa,gBAAiB,SAAQ,sBAAsB,CAC1D,OAAO,mBAAmB,EAC1B,YAAY,EACZ,YAAY,CACb;CAAG;AAEJ,qBAAa,iBAAkB,SAAQ,uBAAuB,CAC5D,YAAY,EACZ,mBAAmB,CACpB;IAIG,SAAS,CAAC,IAAI,EAAE,aAAa;gBAF7B,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,QAAQ,CAAC,YAAY,CAAC,EACvB,IAAI,EAAE,aAAa;IAK/B,MAAM,CAAC,SAAS,EAAE,mBAAmB,GAAG,UAAU;IAK5C,UAAU,CAAC,YAAY,EAAE,QAAQ,CAAC,mBAAmB,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAetE,MAAM,IAAI,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;IAShD,eAAe,CAAC,KAAK,EAAE,SAAS;;;CAMvC"}
@@ -9,35 +9,36 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
9
9
  });
10
10
  };
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
- exports.EnvSubsetDeployer = exports.envSubsetFactories = exports.EnvSubsetChecker = exports.EnvSubsetApp = exports.alfajoresChainConfig = exports.subsetTestConfigs = exports.fullTestEnvConfigs = void 0;
12
+ exports.EnvSubsetDeployer = exports.EnvSubsetChecker = exports.EnvSubsetApp = exports.testRouterFactories = exports.alfajoresChainConfig = void 0;
13
13
  const core_1 = require("@hyperlane-xyz/core");
14
- const HyperlaneApp_1 = require("../../HyperlaneApp");
15
14
  const chainMetadata_1 = require("../../consts/chainMetadata");
16
15
  const chains_1 = require("../../consts/chains");
17
16
  const HyperlaneDeployer_1 = require("../../deploy/HyperlaneDeployer");
18
17
  const HyperlaneRouterChecker_1 = require("../../router/HyperlaneRouterChecker");
19
18
  const HyperlaneRouterDeployer_1 = require("../../router/HyperlaneRouterDeployer");
19
+ const RouterApps_1 = require("../../router/RouterApps");
20
20
  const objects_1 = require("../../utils/objects");
21
- exports.fullTestEnvConfigs = (0, objects_1.pick)(chainMetadata_1.chainMetadata, chains_1.TestChains);
22
- exports.subsetTestConfigs = (0, objects_1.pick)(chainMetadata_1.chainMetadata, [
23
- chains_1.Chains.test1,
24
- chains_1.Chains.test2,
25
- ]);
26
21
  exports.alfajoresChainConfig = (0, objects_1.pick)(chainMetadata_1.chainMetadata, [chains_1.Chains.alfajores]);
27
- class EnvSubsetApp extends HyperlaneApp_1.HyperlaneApp {
22
+ exports.testRouterFactories = {
23
+ router: new core_1.TestRouter__factory(),
24
+ };
25
+ class EnvSubsetApp extends RouterApps_1.RouterApp {
26
+ router(contracts) {
27
+ return contracts.router;
28
+ }
28
29
  }
29
30
  exports.EnvSubsetApp = EnvSubsetApp;
30
31
  class EnvSubsetChecker extends HyperlaneRouterChecker_1.HyperlaneRouterChecker {
31
32
  }
32
33
  exports.EnvSubsetChecker = EnvSubsetChecker;
33
- exports.envSubsetFactories = {
34
- router: new core_1.TestRouter__factory(),
35
- };
36
34
  class EnvSubsetDeployer extends HyperlaneRouterDeployer_1.HyperlaneRouterDeployer {
37
35
  constructor(multiProvider, configMap, core) {
38
- super(multiProvider, configMap, exports.envSubsetFactories, {});
36
+ super(multiProvider, configMap, exports.testRouterFactories, {});
39
37
  this.core = core;
40
38
  }
39
+ router(contracts) {
40
+ return contracts.router;
41
+ }
41
42
  // Consider moving this up to HyperlaneRouterDeployer
42
43
  initRouter(contractsMap) {
43
44
  return __awaiter(this, void 0, void 0, function* () {
@@ -46,9 +47,7 @@ class EnvSubsetDeployer extends HyperlaneRouterDeployer_1.HyperlaneRouterDeploye
46
47
  const mailbox = this.configMap[chain].mailbox;
47
48
  const igp = this.configMap[chain].interchainGasPaymaster;
48
49
  const overrides = this.multiProvider.getTransactionOverrides(chain);
49
- yield this.multiProvider.handleTx(chain,
50
- // @ts-ignore TestRouter does implement this, though Router type does not
51
- contracts.router.initialize(mailbox, igp, overrides));
50
+ yield this.multiProvider.handleTx(chain, this.router(contracts).initialize(mailbox, igp, overrides));
52
51
  })));
53
52
  });
54
53
  }
@@ -1 +1 @@
1
- {"version":3,"file":"app.js","sourceRoot":"","sources":["../../../src/test/envSubsetDeployer/app.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAA0D;AAE1D,qDAAkD;AAClD,8DAA2D;AAC3D,gDAAyD;AAEzD,sEAAmE;AAEnE,gFAA6E;AAC7E,kFAA+E;AAO/E,iDAAkE;AAErD,QAAA,kBAAkB,GAAG,IAAA,cAAI,EAAC,6BAAa,EAAE,mBAAU,CAAC,CAAC;AAErD,QAAA,iBAAiB,GAAG,IAAA,cAAI,EAAC,6BAAa,EAAE;IACnD,eAAM,CAAC,KAAK;IACZ,eAAM,CAAC,KAAK;CACb,CAAC,CAAC;AAEU,QAAA,oBAAoB,GAAG,IAAA,cAAI,EAAC,6BAAa,EAAE,CAAC,eAAM,CAAC,SAAS,CAAC,CAAC,CAAC;AAE5E,MAAa,YAAa,SAAQ,2BAA6B;CAAG;AAAlE,oCAAkE;AAElE,MAAa,gBAAiB,SAAQ,+CAIrC;CAAG;AAJJ,4CAII;AAES,QAAA,kBAAkB,GAAoB;IACjD,MAAM,EAAE,IAAI,0BAAmB,EAAE;CAClC,CAAC;AAEF,MAAa,iBAAkB,SAAQ,iDAItC;IACC,YACE,aAA4B,EAC5B,SAAiC,EACvB,IAAmB;QAE7B,KAAK,CAAC,aAAa,EAAE,SAAS,EAAE,0BAAkB,EAAE,EAAE,CAAC,CAAC;QAF9C,SAAI,GAAJ,IAAI,CAAe;IAG/B,CAAC;IAED,qDAAqD;IAC/C,UAAU,CAAC,YAAuC;;YACtD,IAAI,CAAC,MAAM,CAAC,kCAAkC,CAAC,CAAC;YAChD,MAAM,IAAA,uBAAa,EACjB,IAAA,gBAAM,EAAC,YAAY,EAAE,CAAO,KAAK,EAAE,SAAS,EAAE,EAAE;gBAC9C,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC;gBAC9C,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,sBAAsB,CAAC;gBACzD,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC;gBACpE,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,CAC/B,KAAK;gBACL,yEAAyE;gBACzE,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,EAAE,SAAS,CAAC,CACrD,CAAC;YACJ,CAAC,CAAA,CAAC,CACH,CAAC;QACJ,CAAC;KAAA;IAEK,MAAM;;YACV,MAAM,YAAY,GAAG,CAAC,MAAM,qCAAiB,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAClE,IAAI,CACL,CAA8B,CAAC;YAChC,MAAM,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;YACpC,MAAM,IAAI,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAC;YAC7C,OAAO,YAAY,CAAC;QACtB,CAAC;KAAA;IAEK,eAAe,CAAC,KAAgB;;YACpC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;YAC9D,OAAO;gBACL,MAAM;aACP,CAAC;QACJ,CAAC;KAAA;CACF;AA7CD,8CA6CC"}
1
+ {"version":3,"file":"app.js","sourceRoot":"","sources":["../../../src/test/envSubsetDeployer/app.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAAsE;AAEtE,8DAA2D;AAC3D,gDAA6C;AAE7C,sEAAmE;AAEnE,gFAA6E;AAC7E,kFAA+E;AAC/E,wDAAoD;AAGpD,iDAAkE;AAErD,QAAA,oBAAoB,GAAG,IAAA,cAAI,EAAC,6BAAa,EAAE,CAAC,eAAM,CAAC,SAAS,CAAC,CAAC,CAAC;AAU/D,QAAA,mBAAmB,GAAwB;IACtD,MAAM,EAAE,IAAI,0BAAmB,EAAE;CAClC,CAAC;AAEF,MAAa,YAAa,SAAQ,sBAAqC;IACrE,MAAM,CAAC,SAA8B;QACnC,OAAO,SAAS,CAAC,MAAM,CAAC;IAC1B,CAAC;CACF;AAJD,oCAIC;AAED,MAAa,gBAAiB,SAAQ,+CAIrC;CAAG;AAJJ,4CAII;AAEJ,MAAa,iBAAkB,SAAQ,iDAGtC;IACC,YACE,aAA4B,EAC5B,SAAiC,EACvB,IAAmB;QAE7B,KAAK,CAAC,aAAa,EAAE,SAAS,EAAE,2BAAmB,EAAE,EAAE,CAAC,CAAC;QAF/C,SAAI,GAAJ,IAAI,CAAe;IAG/B,CAAC;IAED,MAAM,CAAC,SAA8B;QACnC,OAAO,SAAS,CAAC,MAAM,CAAC;IAC1B,CAAC;IAED,qDAAqD;IAC/C,UAAU,CAAC,YAA2C;;YAC1D,IAAI,CAAC,MAAM,CAAC,kCAAkC,CAAC,CAAC;YAChD,MAAM,IAAA,uBAAa,EACjB,IAAA,gBAAM,EAAC,YAAY,EAAE,CAAO,KAAK,EAAE,SAAS,EAAE,EAAE;gBAC9C,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC;gBAC9C,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,sBAAsB,CAAC;gBACzD,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC;gBACpE,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,CAC/B,KAAK,EACL,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,EAAE,SAAS,CAAC,CAC3D,CAAC;YACJ,CAAC,CAAA,CAAC,CACH,CAAC;QACJ,CAAC;KAAA;IAEK,MAAM;;YACV,MAAM,YAAY,GAAG,CAAC,MAAM,qCAAiB,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAClE,IAAI,CACL,CAAkC,CAAC;YACpC,MAAM,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;YACpC,MAAM,IAAI,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAC;YAC7C,OAAO,YAAY,CAAC;QACtB,CAAC;KAAA;IAEK,eAAe,CAAC,KAAgB;;YACpC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;YAC9D,OAAO;gBACL,MAAM;aACP,CAAC;QACJ,CAAC;KAAA;CACF;AA/CD,8CA+CC"}
@@ -11,11 +11,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
12
  const contracts_1 = require("../../contracts");
13
13
  const HyperlaneCore_1 = require("../../core/HyperlaneCore");
14
- const utils_1 = require("../../deploy/utils");
14
+ const HyperlaneIgp_1 = require("../../gas/HyperlaneIgp");
15
15
  const MultiProvider_1 = require("../../providers/MultiProvider");
16
+ const testUtils_1 = require("../testUtils");
16
17
  const app_1 = require("./app");
17
18
  // Copied from output of deploy-single-chain.ts script
18
- const deploymentAddresses = {
19
+ const deploymentAddressesMap = {
19
20
  alfajores: {
20
21
  router: '0x0666AD4F636210B6a418f97790b7BAABAC54b9A4',
21
22
  },
@@ -25,10 +26,11 @@ function check() {
25
26
  return __awaiter(this, void 0, void 0, function* () {
26
27
  console.info('Preparing utilities');
27
28
  const multiProvider = new MultiProvider_1.MultiProvider();
28
- const contractsMap = (0, contracts_1.buildContracts)(deploymentAddresses, app_1.envSubsetFactories);
29
+ const contractsMap = (0, contracts_1.attachContractsMap)(deploymentAddressesMap, app_1.testRouterFactories);
29
30
  const app = new app_1.EnvSubsetApp(contractsMap, multiProvider);
30
31
  const core = HyperlaneCore_1.HyperlaneCore.fromEnvironment('testnet', multiProvider);
31
- const config = core.extendWithConnectionClientConfig((0, utils_1.getChainToOwnerMap)(app_1.alfajoresChainConfig, ownerAddress));
32
+ const igp = HyperlaneIgp_1.HyperlaneIgp.fromEnvironment('testnet', multiProvider);
33
+ const config = (0, testUtils_1.createRouterConfigMap)(ownerAddress, core.contractsMap, igp.contractsMap);
32
34
  const envSubsetChecker = new app_1.EnvSubsetChecker(multiProvider, app, config);
33
35
  console.info('Starting check');
34
36
  yield envSubsetChecker.check();
@@ -1 +1 @@
1
- {"version":3,"file":"check-single-chain.js","sourceRoot":"","sources":["../../../src/test/envSubsetDeployer/check-single-chain.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+CAAiD;AACjD,4DAAyD;AACzD,8CAAwD;AACxD,iEAA8D;AAI9D,+BAKe;AAEf,sDAAsD;AACtD,MAAM,mBAAmB,GAAG;IAC1B,SAAS,EAAE;QACT,MAAM,EAAE,4CAA4C;KACrD;CACF,CAAC;AAEF,MAAM,YAAY,GAAG,4CAA4C,CAAC;AAElE,SAAe,KAAK;;QAClB,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QACpC,MAAM,aAAa,GAAG,IAAI,6BAAa,EAAE,CAAC;QAE1C,MAAM,YAAY,GAAG,IAAA,0BAAc,EACjC,mBAAmB,EACnB,wBAAkB,CACU,CAAC;QAC/B,MAAM,GAAG,GAAG,IAAI,kBAAY,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;QAC1D,MAAM,IAAI,GAAG,6BAAa,CAAC,eAAe,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;QACrE,MAAM,MAAM,GAAG,IAAI,CAAC,gCAAgC,CAClD,IAAA,0BAAkB,EAAC,0BAAoB,EAAE,YAAY,CAAC,CACvD,CAAC;QACF,MAAM,gBAAgB,GAAG,IAAI,sBAAgB,CAAC,aAAa,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;QAE1E,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC/B,MAAM,gBAAgB,CAAC,KAAK,EAAE,CAAC;QAC/B,gBAAgB,CAAC,WAAW,EAAE,CAAC;IACjC,CAAC;CAAA;AAED,KAAK,EAAE;KACJ,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;KAC1C,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC"}
1
+ {"version":3,"file":"check-single-chain.js","sourceRoot":"","sources":["../../../src/test/envSubsetDeployer/check-single-chain.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+CAAqD;AACrD,4DAAyD;AACzD,yDAAsD;AACtD,iEAA8D;AAC9D,4CAAqD;AAErD,+BAA4E;AAE5E,sDAAsD;AACtD,MAAM,sBAAsB,GAAG;IAC7B,SAAS,EAAE;QACT,MAAM,EAAE,4CAA4C;KACrD;CACF,CAAC;AAEF,MAAM,YAAY,GAAG,4CAA4C,CAAC;AAElE,SAAe,KAAK;;QAClB,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QACpC,MAAM,aAAa,GAAG,IAAI,6BAAa,EAAE,CAAC;QAE1C,MAAM,YAAY,GAAG,IAAA,8BAAkB,EACrC,sBAAsB,EACtB,yBAAmB,CACpB,CAAC;QACF,MAAM,GAAG,GAAG,IAAI,kBAAY,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;QAC1D,MAAM,IAAI,GAAG,6BAAa,CAAC,eAAe,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;QACrE,MAAM,GAAG,GAAG,2BAAY,CAAC,eAAe,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;QACnE,MAAM,MAAM,GAAG,IAAA,iCAAqB,EAClC,YAAY,EACZ,IAAI,CAAC,YAAY,EACjB,GAAG,CAAC,YAAY,CACjB,CAAC;QAEF,MAAM,gBAAgB,GAAG,IAAI,sBAAgB,CAAC,aAAa,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;QAE1E,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC/B,MAAM,gBAAgB,CAAC,KAAK,EAAE,CAAC;QAC/B,gBAAgB,CAAC,WAAW,EAAE,CAAC;IACjC,CAAC;CAAA;AAED,KAAK,EAAE;KACJ,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;KAC1C,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC"}
@@ -12,22 +12,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
12
12
  const chains_1 = require("../../consts/chains");
13
13
  const contracts_1 = require("../../contracts");
14
14
  const HyperlaneCore_1 = require("../../core/HyperlaneCore");
15
- const utils_1 = require("../../deploy/utils");
15
+ const HyperlaneIgp_1 = require("../../gas/HyperlaneIgp");
16
16
  const MultiProvider_1 = require("../../providers/MultiProvider");
17
+ const testUtils_1 = require("../testUtils");
17
18
  const app_1 = require("./app");
18
- const utils_2 = require("./utils");
19
+ const utils_1 = require("./utils");
19
20
  function main() {
20
21
  return __awaiter(this, void 0, void 0, function* () {
21
- const signer = (0, utils_2.getAlfajoresSigner)();
22
+ const signer = (0, utils_1.getAlfajoresSigner)();
22
23
  console.info('Preparing utilities');
23
24
  const multiProvider = new MultiProvider_1.MultiProvider();
24
25
  multiProvider.setSigner(chains_1.Chains.alfajores, signer);
25
26
  const core = HyperlaneCore_1.HyperlaneCore.fromEnvironment('testnet', multiProvider);
26
- const config = core.extendWithConnectionClientConfig((0, utils_1.getChainToOwnerMap)(app_1.alfajoresChainConfig, signer.address));
27
+ const igp = HyperlaneIgp_1.HyperlaneIgp.fromEnvironment('testnet', multiProvider);
28
+ const config = (0, testUtils_1.createRouterConfigMap)(signer.address, core.contractsMap, igp.contractsMap);
27
29
  console.info('Starting deployment');
28
30
  const deployer = new app_1.EnvSubsetDeployer(multiProvider, config, core);
29
31
  const chainToContracts = yield deployer.deploy();
30
- const addresses = (0, contracts_1.serializeContracts)(chainToContracts);
32
+ const addresses = (0, contracts_1.serializeContractsMap)(chainToContracts);
31
33
  console.info('===Contract Addresses===');
32
34
  console.info(JSON.stringify(addresses));
33
35
  });
@@ -1 +1 @@
1
- {"version":3,"file":"deploy-single-chain.js","sourceRoot":"","sources":["../../../src/test/envSubsetDeployer/deploy-single-chain.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,gDAA6C;AAC7C,+CAAqD;AACrD,4DAAyD;AACzD,8CAAwD;AACxD,iEAA8D;AAE9D,+BAAgE;AAChE,mCAA6C;AAE7C,SAAe,IAAI;;QACjB,MAAM,MAAM,GAAG,IAAA,0BAAkB,GAAE,CAAC;QAEpC,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QACpC,MAAM,aAAa,GAAG,IAAI,6BAAa,EAAE,CAAC;QAC1C,aAAa,CAAC,SAAS,CAAC,eAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAElD,MAAM,IAAI,GAAG,6BAAa,CAAC,eAAe,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;QACrE,MAAM,MAAM,GAAG,IAAI,CAAC,gCAAgC,CAClD,IAAA,0BAAkB,EAAC,0BAAoB,EAAE,MAAM,CAAC,OAAO,CAAC,CACzD,CAAC;QAEF,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QACpC,MAAM,QAAQ,GAAG,IAAI,uBAAiB,CAAC,aAAa,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QACpE,MAAM,gBAAgB,GAAG,MAAM,QAAQ,CAAC,MAAM,EAAE,CAAC;QACjD,MAAM,SAAS,GAAG,IAAA,8BAAkB,EAAC,gBAAgB,CAAC,CAAC;QACvD,OAAO,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;QACzC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC;IAC1C,CAAC;CAAA;AAED,IAAI,EAAE;KACH,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;KAC3C,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC"}
1
+ {"version":3,"file":"deploy-single-chain.js","sourceRoot":"","sources":["../../../src/test/envSubsetDeployer/deploy-single-chain.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,gDAA6C;AAC7C,+CAAwD;AACxD,4DAAyD;AACzD,yDAAsD;AACtD,iEAA8D;AAC9D,4CAAqD;AAErD,+BAA0C;AAC1C,mCAA6C;AAE7C,SAAe,IAAI;;QACjB,MAAM,MAAM,GAAG,IAAA,0BAAkB,GAAE,CAAC;QAEpC,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QACpC,MAAM,aAAa,GAAG,IAAI,6BAAa,EAAE,CAAC;QAC1C,aAAa,CAAC,SAAS,CAAC,eAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAElD,MAAM,IAAI,GAAG,6BAAa,CAAC,eAAe,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;QACrE,MAAM,GAAG,GAAG,2BAAY,CAAC,eAAe,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;QACnE,MAAM,MAAM,GAAG,IAAA,iCAAqB,EAClC,MAAM,CAAC,OAAO,EACd,IAAI,CAAC,YAAY,EACjB,GAAG,CAAC,YAAY,CACjB,CAAC;QAEF,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QACpC,MAAM,QAAQ,GAAG,IAAI,uBAAiB,CAAC,aAAa,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QACpE,MAAM,gBAAgB,GAAG,MAAM,QAAQ,CAAC,MAAM,EAAE,CAAC;QACjD,MAAM,SAAS,GAAG,IAAA,iCAAqB,EAAC,gBAAgB,CAAC,CAAC;QAC1D,OAAO,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;QACzC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC;IAC1C,CAAC;CAAA;AAED,IAAI,EAAE;KACH,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;KAC3C,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC"}
@@ -11,10 +11,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
12
  require("@nomiclabs/hardhat-waffle");
13
13
  const hardhat_1 = require("hardhat");
14
+ const chains_1 = require("../../consts/chains");
14
15
  const TestCoreApp_1 = require("../../core/TestCoreApp");
15
16
  const TestCoreDeployer_1 = require("../../core/TestCoreDeployer");
16
- const utils_1 = require("../../deploy/utils");
17
17
  const MultiProvider_1 = require("../../providers/MultiProvider");
18
+ const testUtils_1 = require("../testUtils");
18
19
  const app_1 = require("./app");
19
20
  // Tests deploying the basic EnvSubsetApp to a local hardhat-based test env
20
21
  describe('deploy app for full test env', () => __awaiter(void 0, void 0, void 0, function* () {
@@ -24,7 +25,7 @@ describe('deploy app for full test env', () => __awaiter(void 0, void 0, void 0,
24
25
  let contracts;
25
26
  let app;
26
27
  before(() => __awaiter(void 0, void 0, void 0, function* () {
27
- const testEnv = yield initTestEnv(app_1.fullTestEnvConfigs);
28
+ const testEnv = yield initTestEnv(chains_1.TestChains);
28
29
  multiProvider = testEnv.multiProvider;
29
30
  config = testEnv.config;
30
31
  deployer = testEnv.deployer;
@@ -49,13 +50,10 @@ describe('deploy app to test env subset', () => __awaiter(void 0, void 0, void 0
49
50
  let contracts;
50
51
  let app;
51
52
  before(() => __awaiter(void 0, void 0, void 0, function* () {
52
- const testEnv = yield initTestEnv(app_1.subsetTestConfigs);
53
- multiProvider = testEnv.multiProvider;
54
- config = {
55
- test1: testEnv.config.test1,
56
- test2: testEnv.config.test2,
57
- };
58
- deployer = testEnv.deployer;
53
+ ({ multiProvider, config, deployer } = yield initTestEnv([
54
+ 'test1',
55
+ 'test2',
56
+ ]));
59
57
  }));
60
58
  it('deploys', () => __awaiter(void 0, void 0, void 0, function* () {
61
59
  contracts = yield deployer.deploy();
@@ -69,14 +67,15 @@ describe('deploy app to test env subset', () => __awaiter(void 0, void 0, void 0
69
67
  checker.expectEmpty();
70
68
  }));
71
69
  }));
72
- function initTestEnv(environmentConfig) {
70
+ function initTestEnv(chains) {
73
71
  return __awaiter(this, void 0, void 0, function* () {
74
72
  const [signer] = yield hardhat_1.ethers.getSigners();
75
- const multiProvider = MultiProvider_1.MultiProvider.createTestMultiProvider({ signer });
76
- const coreDeployer = new TestCoreDeployer_1.TestCoreDeployer(multiProvider);
73
+ const multiProvider = MultiProvider_1.MultiProvider.createTestMultiProvider({ signer }, chains);
74
+ const coreConfig = (0, testUtils_1.testCoreConfig)(chains);
75
+ const coreDeployer = new TestCoreDeployer_1.TestCoreDeployer(multiProvider, coreConfig);
77
76
  const coreContractsMaps = yield coreDeployer.deploy();
78
77
  const core = new TestCoreApp_1.TestCoreApp(coreContractsMaps, multiProvider);
79
- const config = core.extendWithConnectionClientConfig((0, utils_1.getChainToOwnerMap)(environmentConfig, signer.address));
78
+ const config = yield (0, testUtils_1.deployTestIgpsAndGetRouterConfig)(multiProvider, signer.address, coreContractsMaps);
80
79
  const deployer = new app_1.EnvSubsetDeployer(multiProvider, config, core);
81
80
  return { multiProvider, config, deployer };
82
81
  });
@@ -1 +1 @@
1
- {"version":3,"file":"deploy.hardhat-test.js","sourceRoot":"","sources":["../../../src/test/envSubsetDeployer/deploy.hardhat-test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"deploy.hardhat-test.js","sourceRoot":"","sources":["../../../src/test/envSubsetDeployer/deploy.hardhat-test.ts"],"names":[],"mappings":"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"}
@@ -1,21 +1,15 @@
1
- import { ethers } from 'ethers';
2
1
  import { types } from '@hyperlane-xyz/utils';
3
- import { CoinGeckoInterface, CoinGeckoResponse, CoinGeckoSimpleInterface, CoinGeckoSimplePriceParams, TokenPriceGetter } from '../gas/token-prices';
2
+ import { HyperlaneContractsMap } from '../contracts';
3
+ import { CoreFactories } from '../core/contracts';
4
+ import { CoreConfig } from '../core/types';
5
+ import { IgpFactories } from '../gas/contracts';
6
+ import { CoinGeckoInterface, CoinGeckoResponse, CoinGeckoSimpleInterface, CoinGeckoSimplePriceParams } from '../gas/token-prices';
7
+ import { MultiProvider } from '../providers/MultiProvider';
8
+ import { RouterConfig } from '../router/types';
4
9
  import { ChainMap, ChainName } from '../types';
5
- export declare function getTestOwnerConfig(owner: types.Address): ChainMap<{
6
- owner: types.Address;
7
- }>;
8
- export declare class MockProvider extends ethers.providers.BaseProvider {
9
- private methodResolveValues;
10
- constructor();
11
- detectNetwork(): Promise<{
12
- name: string;
13
- chainId: number;
14
- }>;
15
- perform(method: string, params: any): Promise<any>;
16
- setMethodResolveValue(method: string, value: any): void;
17
- clearMethodResolveValues(): void;
18
- }
10
+ export declare function createRouterConfigMap(owner: types.Address, coreContracts: HyperlaneContractsMap<CoreFactories>, igpContracts: HyperlaneContractsMap<IgpFactories>): ChainMap<RouterConfig>;
11
+ export declare function deployTestIgpsAndGetRouterConfig(multiProvider: MultiProvider, owner: types.Address, coreContracts: HyperlaneContractsMap<CoreFactories>): Promise<ChainMap<RouterConfig>>;
12
+ export declare function testCoreConfig(chains: ChainName[]): ChainMap<CoreConfig>;
19
13
  export declare class MockCoinGecko implements CoinGeckoInterface {
20
14
  private tokenPrices;
21
15
  private fail;
@@ -25,11 +19,4 @@ export declare class MockCoinGecko implements CoinGeckoInterface {
25
19
  setTokenPrice(chain: ChainName, price: number): void;
26
20
  setFail(chain: ChainName, fail: boolean): void;
27
21
  }
28
- export declare class MockTokenPriceGetter implements TokenPriceGetter {
29
- private tokenPrices;
30
- constructor();
31
- getTokenExchangeRate(base: ChainName, quote: ChainName): Promise<number>;
32
- getTokenPrice(chain: ChainName): Promise<number>;
33
- setTokenPrice(chain: ChainName, price: number): void;
34
- }
35
22
  //# sourceMappingURL=testUtils.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"testUtils.d.ts","sourceRoot":"","sources":["../../src/test/testUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAI7C,OAAO,EACL,kBAAkB,EAClB,iBAAiB,EACjB,wBAAwB,EACxB,0BAA0B,EAC1B,gBAAgB,EACjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE/C,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO;WACrB,MAAM,OAAO;GAG9C;AAQD,qBAAa,YAAa,SAAQ,MAAM,CAAC,SAAS,CAAC,YAAY;IAC7D,OAAO,CAAC,mBAAmB,CAAyB;;IAS9C,aAAa;;;;IAInB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IASlD,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG;IAIhD,wBAAwB;CAGzB;AAGD,qBAAa,aAAc,YAAW,kBAAkB;IAEtD,OAAO,CAAC,WAAW,CAAyB;IAE5C,OAAO,CAAC,IAAI,CAA0B;;IAOtC,KAAK,CAAC,MAAM,EAAE,0BAA0B,GAAG,iBAAiB;IAkB5D,IAAI,MAAM,IAAI,wBAAwB,CAErC;IAED,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM;IAK7C,OAAO,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO;CAIxC;AAGD,qBAAa,oBAAqB,YAAW,gBAAgB;IAC3D,OAAO,CAAC,WAAW,CAA4B;;IAMzC,oBAAoB,CACxB,IAAI,EAAE,SAAS,EACf,KAAK,EAAE,SAAS,GACf,OAAO,CAAC,MAAM,CAAC;IAMlB,aAAa,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;IAQhD,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM;CAG9C"}
1
+ {"version":3,"file":"testUtils.d.ts","sourceRoot":"","sources":["../../src/test/testUtils.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAG7C,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EACL,kBAAkB,EAClB,iBAAiB,EACjB,wBAAwB,EACxB,0BAA0B,EAC3B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAG/C,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,KAAK,CAAC,OAAO,EACpB,aAAa,EAAE,qBAAqB,CAAC,aAAa,CAAC,EACnD,YAAY,EAAE,qBAAqB,CAAC,YAAY,CAAC,GAChD,QAAQ,CAAC,YAAY,CAAC,CASxB;AAED,wBAAsB,gCAAgC,CACpD,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,KAAK,CAAC,OAAO,EACpB,aAAa,EAAE,qBAAqB,CAAC,aAAa,CAAC,GAClD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAejC;AAKD,wBAAgB,cAAc,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,QAAQ,CAAC,UAAU,CAAC,CAkBxE;AAGD,qBAAa,aAAc,YAAW,kBAAkB;IAEtD,OAAO,CAAC,WAAW,CAAyB;IAE5C,OAAO,CAAC,IAAI,CAA0B;;IAOtC,KAAK,CAAC,MAAM,EAAE,0BAA0B,GAAG,iBAAiB;IAkB5D,IAAI,MAAM,IAAI,wBAAwB,CAErC;IAED,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM;IAK7C,OAAO,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO;CAIxC"}