@hyperlane-xyz/sdk 1.4.1 → 1.4.3-beta0

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 (217) hide show
  1. package/dist/consts/agentStartBlocks.d.ts +3 -0
  2. package/dist/consts/agentStartBlocks.d.ts.map +1 -0
  3. package/dist/consts/agentStartBlocks.js +28 -0
  4. package/dist/consts/agentStartBlocks.js.map +1 -0
  5. package/dist/consts/bytecode.js +1 -1
  6. package/dist/consts/bytecode.js.map +1 -1
  7. package/dist/consts/chainMetadata.js +3 -3
  8. package/dist/consts/chains.d.ts +1 -1
  9. package/dist/consts/chains.d.ts.map +1 -1
  10. package/dist/consts/chains.js +2 -2
  11. package/dist/consts/chains.js.map +1 -1
  12. package/dist/consts/environments/index.d.ts +40 -2
  13. package/dist/consts/environments/index.d.ts.map +1 -1
  14. package/dist/consts/environments/index.js.map +1 -1
  15. package/dist/consts/environments/mainnet.json +27 -9
  16. package/dist/consts/environments/testnet.json +36 -18
  17. package/dist/contracts.d.ts +5 -5
  18. package/dist/contracts.d.ts.map +1 -1
  19. package/dist/contracts.js +12 -23
  20. package/dist/contracts.js.map +1 -1
  21. package/dist/core/CoreDeployer.hardhat-test.js +33 -42
  22. package/dist/core/CoreDeployer.hardhat-test.js.map +1 -1
  23. package/dist/core/HyperlaneCore.d.ts +1 -1
  24. package/dist/core/HyperlaneCore.d.ts.map +1 -1
  25. package/dist/core/HyperlaneCore.js +12 -25
  26. package/dist/core/HyperlaneCore.js.map +1 -1
  27. package/dist/core/HyperlaneCore.test.js +4 -13
  28. package/dist/core/HyperlaneCore.test.js.map +1 -1
  29. package/dist/core/HyperlaneCoreChecker.d.ts +0 -1
  30. package/dist/core/HyperlaneCoreChecker.d.ts.map +1 -1
  31. package/dist/core/HyperlaneCoreChecker.js +79 -137
  32. package/dist/core/HyperlaneCoreChecker.js.map +1 -1
  33. package/dist/core/HyperlaneCoreDeployer.d.ts +1 -2
  34. package/dist/core/HyperlaneCoreDeployer.d.ts.map +1 -1
  35. package/dist/core/HyperlaneCoreDeployer.js +45 -71
  36. package/dist/core/HyperlaneCoreDeployer.js.map +1 -1
  37. package/dist/core/TestCoreApp.js +35 -45
  38. package/dist/core/TestCoreApp.js.map +1 -1
  39. package/dist/core/TestCoreDeployer.js +14 -27
  40. package/dist/core/TestCoreDeployer.js.map +1 -1
  41. package/dist/core/contracts.d.ts +1 -1
  42. package/dist/core/contracts.d.ts.map +1 -1
  43. package/dist/core/events.d.ts +1 -1
  44. package/dist/core/events.d.ts.map +1 -1
  45. package/dist/core/testHyperlaneDeploy.hardhat-test.js +23 -32
  46. package/dist/core/testHyperlaneDeploy.hardhat-test.js.map +1 -1
  47. package/dist/core/types.d.ts +4 -4
  48. package/dist/core/types.d.ts.map +1 -1
  49. package/dist/core/types.js +2 -3
  50. package/dist/core/types.js.map +1 -1
  51. package/dist/deploy/HyperlaneAppChecker.d.ts +3 -1
  52. package/dist/deploy/HyperlaneAppChecker.d.ts.map +1 -1
  53. package/dist/deploy/HyperlaneAppChecker.js +105 -83
  54. package/dist/deploy/HyperlaneAppChecker.js.map +1 -1
  55. package/dist/deploy/HyperlaneDeployer.d.ts +5 -1
  56. package/dist/deploy/HyperlaneDeployer.d.ts.map +1 -1
  57. package/dist/deploy/HyperlaneDeployer.js +179 -183
  58. package/dist/deploy/HyperlaneDeployer.js.map +1 -1
  59. package/dist/deploy/proxy.d.ts +9 -0
  60. package/dist/deploy/proxy.d.ts.map +1 -1
  61. package/dist/deploy/proxy.js +11 -26
  62. package/dist/deploy/proxy.js.map +1 -1
  63. package/dist/deploy/types.d.ts +18 -2
  64. package/dist/deploy/types.d.ts.map +1 -1
  65. package/dist/deploy/types.js +3 -1
  66. package/dist/deploy/types.js.map +1 -1
  67. package/dist/deploy/verify/ContractVerifier.js +122 -131
  68. package/dist/deploy/verify/ContractVerifier.js.map +1 -1
  69. package/dist/deploy/verify/types.d.ts +3 -3
  70. package/dist/deploy/verify/types.d.ts.map +1 -1
  71. package/dist/gas/HyperlaneIgpChecker.d.ts +0 -4
  72. package/dist/gas/HyperlaneIgpChecker.d.ts.map +1 -1
  73. package/dist/gas/HyperlaneIgpChecker.js +101 -121
  74. package/dist/gas/HyperlaneIgpChecker.js.map +1 -1
  75. package/dist/gas/HyperlaneIgpDeployer.d.ts.map +1 -1
  76. package/dist/gas/HyperlaneIgpDeployer.js +74 -77
  77. package/dist/gas/HyperlaneIgpDeployer.js.map +1 -1
  78. package/dist/gas/contracts.d.ts +4 -3
  79. package/dist/gas/contracts.d.ts.map +1 -1
  80. package/dist/gas/contracts.js +2 -1
  81. package/dist/gas/contracts.js.map +1 -1
  82. package/dist/gas/token-prices.d.ts +5 -5
  83. package/dist/gas/token-prices.d.ts.map +1 -1
  84. package/dist/gas/token-prices.js +37 -54
  85. package/dist/gas/token-prices.js.map +1 -1
  86. package/dist/gas/token-prices.test.js +11 -20
  87. package/dist/gas/token-prices.test.js.map +1 -1
  88. package/dist/gas/types.d.ts +5 -2
  89. package/dist/gas/types.d.ts.map +1 -1
  90. package/dist/gas/types.js +2 -2
  91. package/dist/gas/types.js.map +1 -1
  92. package/dist/hook/HyperlaneHookDeployer.js +69 -88
  93. package/dist/hook/HyperlaneHookDeployer.js.map +1 -1
  94. package/dist/hook/contracts.d.ts +4 -4
  95. package/dist/hook/contracts.d.ts.map +1 -1
  96. package/dist/hook/contracts.js +5 -1
  97. package/dist/hook/contracts.js.map +1 -1
  98. package/dist/hook/types.d.ts +3 -3
  99. package/dist/hook/types.d.ts.map +1 -1
  100. package/dist/hook/types.js +1 -1
  101. package/dist/hook/types.js.map +1 -1
  102. package/dist/index.d.ts +3 -2
  103. package/dist/index.d.ts.map +1 -1
  104. package/dist/index.js +6 -2
  105. package/dist/index.js.map +1 -1
  106. package/dist/ism/HyperlaneIsmFactory.d.ts +1 -1
  107. package/dist/ism/HyperlaneIsmFactory.d.ts.map +1 -1
  108. package/dist/ism/HyperlaneIsmFactory.hardhat-test.js +14 -23
  109. package/dist/ism/HyperlaneIsmFactory.hardhat-test.js.map +1 -1
  110. package/dist/ism/HyperlaneIsmFactory.js +215 -198
  111. package/dist/ism/HyperlaneIsmFactory.js.map +1 -1
  112. package/dist/ism/HyperlaneIsmFactoryDeployer.js +18 -34
  113. package/dist/ism/HyperlaneIsmFactoryDeployer.js.map +1 -1
  114. package/dist/ism/contracts.d.ts +1 -1
  115. package/dist/ism/contracts.d.ts.map +1 -1
  116. package/dist/ism/types.d.ts +5 -5
  117. package/dist/ism/types.d.ts.map +1 -1
  118. package/dist/ism/types.js +1 -1
  119. package/dist/ism/types.js.map +1 -1
  120. package/dist/metadata/agentConfig.d.ts +9 -4
  121. package/dist/metadata/agentConfig.d.ts.map +1 -1
  122. package/dist/metadata/agentConfig.js +26 -8
  123. package/dist/metadata/agentConfig.js.map +1 -1
  124. package/dist/metadata/agentConfig.test.d.ts +2 -0
  125. package/dist/metadata/agentConfig.test.d.ts.map +1 -0
  126. package/dist/metadata/agentConfig.test.js +33 -0
  127. package/dist/metadata/agentConfig.test.js.map +1 -0
  128. package/dist/metadata/chainMetadata.test.js +27 -9
  129. package/dist/metadata/chainMetadata.test.js.map +1 -1
  130. package/dist/metadata/chainMetadataTypes.d.ts +3 -3
  131. package/dist/metadata/chainMetadataTypes.d.ts.map +1 -1
  132. package/dist/metadata/chainMetadataTypes.js +3 -4
  133. package/dist/metadata/chainMetadataTypes.js.map +1 -1
  134. package/dist/metadata/deploymentArtifacts.d.ts +2 -2
  135. package/dist/metadata/deploymentArtifacts.d.ts.map +1 -1
  136. package/dist/middleware/account/InterchainAccountChecker.js +4 -1
  137. package/dist/middleware/account/InterchainAccountChecker.js.map +1 -1
  138. package/dist/middleware/account/InterchainAccountDeployer.d.ts +12 -6
  139. package/dist/middleware/account/InterchainAccountDeployer.d.ts.map +1 -1
  140. package/dist/middleware/account/InterchainAccountDeployer.js +34 -63
  141. package/dist/middleware/account/InterchainAccountDeployer.js.map +1 -1
  142. package/dist/middleware/account/accounts.hardhat-test.js +21 -30
  143. package/dist/middleware/account/accounts.hardhat-test.js.map +1 -1
  144. package/dist/middleware/account/contracts.d.ts +4 -3
  145. package/dist/middleware/account/contracts.d.ts.map +1 -1
  146. package/dist/middleware/account/contracts.js +2 -1
  147. package/dist/middleware/account/contracts.js.map +1 -1
  148. package/dist/middleware/liquidity-layer/LiquidityLayerApp.js +129 -151
  149. package/dist/middleware/liquidity-layer/LiquidityLayerApp.js.map +1 -1
  150. package/dist/middleware/liquidity-layer/LiquidityLayerRouterDeployer.d.ts +2 -2
  151. package/dist/middleware/liquidity-layer/LiquidityLayerRouterDeployer.d.ts.map +1 -1
  152. package/dist/middleware/liquidity-layer/LiquidityLayerRouterDeployer.js +85 -107
  153. package/dist/middleware/liquidity-layer/LiquidityLayerRouterDeployer.js.map +1 -1
  154. package/dist/middleware/liquidity-layer/contracts.d.ts +4 -3
  155. package/dist/middleware/liquidity-layer/contracts.d.ts.map +1 -1
  156. package/dist/middleware/liquidity-layer/contracts.js +2 -1
  157. package/dist/middleware/liquidity-layer/contracts.js.map +1 -1
  158. package/dist/middleware/liquidity-layer/liquidity-layer.hardhat-test.js +41 -46
  159. package/dist/middleware/liquidity-layer/liquidity-layer.hardhat-test.js.map +1 -1
  160. package/dist/middleware/query/InterchainQueryDeployer.d.ts +1 -1
  161. package/dist/middleware/query/InterchainQueryDeployer.d.ts.map +1 -1
  162. package/dist/middleware/query/InterchainQueryDeployer.js +13 -24
  163. package/dist/middleware/query/InterchainQueryDeployer.js.map +1 -1
  164. package/dist/middleware/query/contracts.d.ts +4 -3
  165. package/dist/middleware/query/contracts.d.ts.map +1 -1
  166. package/dist/middleware/query/contracts.js +2 -1
  167. package/dist/middleware/query/contracts.js.map +1 -1
  168. package/dist/middleware/query/queries.hardhat-test.js +23 -32
  169. package/dist/middleware/query/queries.hardhat-test.js.map +1 -1
  170. package/dist/providers/MultiProvider.d.ts +2 -2
  171. package/dist/providers/MultiProvider.d.ts.map +1 -1
  172. package/dist/providers/MultiProvider.js +63 -84
  173. package/dist/providers/MultiProvider.js.map +1 -1
  174. package/dist/providers/RetryProvider.d.ts +1 -1
  175. package/dist/providers/RetryProvider.d.ts.map +1 -1
  176. package/dist/providers/RetryProvider.js +2 -16
  177. package/dist/providers/RetryProvider.js.map +1 -1
  178. package/dist/router/GasRouterDeployer.js +18 -32
  179. package/dist/router/GasRouterDeployer.js.map +1 -1
  180. package/dist/router/HyperlaneRouterChecker.d.ts +0 -1
  181. package/dist/router/HyperlaneRouterChecker.d.ts.map +1 -1
  182. package/dist/router/HyperlaneRouterChecker.js +37 -51
  183. package/dist/router/HyperlaneRouterChecker.js.map +1 -1
  184. package/dist/router/HyperlaneRouterDeployer.d.ts.map +1 -1
  185. package/dist/router/HyperlaneRouterDeployer.js +89 -107
  186. package/dist/router/HyperlaneRouterDeployer.js.map +1 -1
  187. package/dist/router/ProxiedRouterChecker.d.ts +3 -2
  188. package/dist/router/ProxiedRouterChecker.d.ts.map +1 -1
  189. package/dist/router/ProxiedRouterChecker.js +15 -17
  190. package/dist/router/ProxiedRouterChecker.js.map +1 -1
  191. package/dist/router/ProxiedRouterDeployer.d.ts +2 -2
  192. package/dist/router/ProxiedRouterDeployer.d.ts.map +1 -1
  193. package/dist/router/ProxiedRouterDeployer.js +27 -28
  194. package/dist/router/ProxiedRouterDeployer.js.map +1 -1
  195. package/dist/router/RouterApps.d.ts.map +1 -1
  196. package/dist/router/RouterApps.js +4 -15
  197. package/dist/router/RouterApps.js.map +1 -1
  198. package/dist/router/types.d.ts +14 -9
  199. package/dist/router/types.d.ts.map +1 -1
  200. package/dist/router/types.js +7 -2
  201. package/dist/router/types.js.map +1 -1
  202. package/dist/test/testUtils.d.ts.map +1 -1
  203. package/dist/test/testUtils.js +21 -24
  204. package/dist/test/testUtils.js.map +1 -1
  205. package/dist/types.d.ts +5 -5
  206. package/dist/types.d.ts.map +1 -1
  207. package/dist/utils/MultiGeneric.js +2 -4
  208. package/dist/utils/MultiGeneric.js.map +1 -1
  209. package/dist/utils/fetch.js +8 -16
  210. package/dist/utils/fetch.js.map +1 -1
  211. package/dist/utils/number.js +2 -2
  212. package/dist/utils/number.js.map +1 -1
  213. package/dist/utils/objects.d.ts +2 -2
  214. package/dist/utils/objects.d.ts.map +1 -1
  215. package/dist/utils/wagmi.js +1 -2
  216. package/dist/utils/wagmi.js.map +1 -1
  217. package/package.json +9 -8
@@ -1 +1 @@
1
- {"version":3,"file":"HyperlaneCoreChecker.js","sourceRoot":"","sources":["../../src/core/HyperlaneCoreChecker.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"HyperlaneCoreChecker.js","sourceRoot":"","sources":["../../src/core/HyperlaneCoreChecker.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import { Mailbox, TimelockController, ValidatorAnnounce } from '@hyperlane-xyz/core';
1
+ import { Mailbox, ValidatorAnnounce } from '@hyperlane-xyz/core';
2
2
  import { types } from '@hyperlane-xyz/utils';
3
3
  import { HyperlaneContracts } from '../contracts';
4
4
  import { HyperlaneDeployer } from '../deploy/HyperlaneDeployer';
@@ -12,7 +12,6 @@ export declare class HyperlaneCoreDeployer extends HyperlaneDeployer<CoreConfig,
12
12
  readonly ismFactory: HyperlaneIsmFactory;
13
13
  startingBlockNumbers: ChainMap<number | undefined>;
14
14
  constructor(multiProvider: MultiProvider, ismFactory: HyperlaneIsmFactory);
15
- deployTimelock(chain: ChainName, delay: number, owner: types.Address): Promise<TimelockController>;
16
15
  deployMailbox(chain: ChainName, ismConfig: IsmConfig, proxyAdmin: types.Address, owner: types.Address): Promise<Mailbox>;
17
16
  deployValidatorAnnounce(chain: ChainName, mailboxAddress: string): Promise<ValidatorAnnounce>;
18
17
  deployIsm(chain: ChainName, config: IsmConfig): Promise<types.Address>;
@@ -1 +1 @@
1
- {"version":3,"file":"HyperlaneCoreDeployer.d.ts","sourceRoot":"","sources":["../../src/core/HyperlaneCoreDeployer.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,OAAO,EACP,kBAAkB,EAElB,iBAAiB,EAClB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAE7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE/C,OAAO,EAAE,aAAa,EAAiB,MAAM,aAAa,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAErC,qBAAa,qBAAsB,SAAQ,iBAAiB,CAC1D,UAAU,EACV,aAAa,CACd;IAKG,QAAQ,CAAC,UAAU,EAAE,mBAAmB;IAJ1C,oBAAoB,EAAE,QAAQ,CAAC,MAAM,GAAG,SAAS,CAAC,CAAM;gBAGtD,aAAa,EAAE,aAAa,EACnB,UAAU,EAAE,mBAAmB;IAQpC,cAAc,CAClB,KAAK,EAAE,SAAS,EAChB,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,KAAK,CAAC,OAAO,GACnB,OAAO,CAAC,kBAAkB,CAAC;IAWxB,aAAa,CACjB,KAAK,EAAE,SAAS,EAChB,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,KAAK,CAAC,OAAO,EACzB,KAAK,EAAE,KAAK,CAAC,OAAO,GACnB,OAAO,CAAC,OAAO,CAAC;IAwBb,uBAAuB,CAC3B,KAAK,EAAE,SAAS,EAChB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,iBAAiB,CAAC;IASvB,SAAS,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC;IAMtE,eAAe,CACnB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,UAAU,GACjB,OAAO,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;CAsD9C"}
1
+ {"version":3,"file":"HyperlaneCoreDeployer.d.ts","sourceRoot":"","sources":["../../src/core/HyperlaneCoreDeployer.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,OAAO,EAGP,iBAAiB,EAClB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAE7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE/C,OAAO,EAAE,aAAa,EAAiB,MAAM,aAAa,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAErC,qBAAa,qBAAsB,SAAQ,iBAAiB,CAC1D,UAAU,EACV,aAAa,CACd;IAKG,QAAQ,CAAC,UAAU,EAAE,mBAAmB;IAJ1C,oBAAoB,EAAE,QAAQ,CAAC,MAAM,GAAG,SAAS,CAAC,CAAM;gBAGtD,aAAa,EAAE,aAAa,EACnB,UAAU,EAAE,mBAAmB;IAQpC,aAAa,CACjB,KAAK,EAAE,SAAS,EAChB,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,KAAK,CAAC,OAAO,EACzB,KAAK,EAAE,KAAK,CAAC,OAAO,GACnB,OAAO,CAAC,OAAO,CAAC;IAwBb,uBAAuB,CAC3B,KAAK,EAAE,SAAS,EAChB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,iBAAiB,CAAC;IASvB,SAAS,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC;IAMtE,eAAe,CACnB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,UAAU,GACjB,OAAO,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;CAqD9C"}
@@ -1,13 +1,4 @@
1
1
  "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
2
  var __importDefault = (this && this.__importDefault) || function (mod) {
12
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
13
4
  };
@@ -27,73 +18,56 @@ class HyperlaneCoreDeployer extends HyperlaneDeployer_1.HyperlaneDeployer {
27
18
  this.ismFactory = ismFactory;
28
19
  this.startingBlockNumbers = {};
29
20
  }
30
- deployTimelock(chain, delay, owner) {
31
- return __awaiter(this, void 0, void 0, function* () {
32
- const timelock = yield this.deployContract(chain, 'timelockController',
33
- // see https://docs.openzeppelin.com/contracts/4.x/api/governance#TimelockController-constructor-uint256-address---address---address-
34
- // delay, [proposers], [executors], admin
35
- [delay, [owner], [owner], ethers_1.ethers.constants.AddressZero]);
36
- return timelock;
37
- });
21
+ async deployMailbox(chain, ismConfig, proxyAdmin, owner) {
22
+ const cachedMailbox = this.readCache(chain, this.factories.mailbox, 'mailbox');
23
+ if (cachedMailbox) {
24
+ // let checker/governor handle cached mailbox default ISM configuration
25
+ // TODO: check if config matches AND deployer is owner?
26
+ return cachedMailbox;
27
+ }
28
+ const defaultIsmAddress = await this.deployIsm(chain, ismConfig);
29
+ const domain = this.multiProvider.getDomainId(chain);
30
+ return this.deployProxiedContract(chain, 'mailbox', proxyAdmin, [domain], [owner, defaultIsmAddress]);
38
31
  }
39
- deployMailbox(chain, ismConfig, proxyAdmin, owner) {
40
- return __awaiter(this, void 0, void 0, function* () {
41
- const cachedMailbox = this.readCache(chain, this.factories.mailbox, 'mailbox');
42
- if (cachedMailbox) {
43
- // let checker/governor handle cached mailbox default ISM configuration
44
- // TODO: check if config matches AND deployer is owner?
45
- return cachedMailbox;
46
- }
47
- const defaultIsmAddress = yield this.deployIsm(chain, ismConfig);
48
- const domain = this.multiProvider.getDomainId(chain);
49
- return this.deployProxiedContract(chain, 'mailbox', proxyAdmin, [domain], [owner, defaultIsmAddress]);
50
- });
32
+ async deployValidatorAnnounce(chain, mailboxAddress) {
33
+ const validatorAnnounce = await this.deployContract(chain, 'validatorAnnounce', [mailboxAddress]);
34
+ return validatorAnnounce;
51
35
  }
52
- deployValidatorAnnounce(chain, mailboxAddress) {
53
- return __awaiter(this, void 0, void 0, function* () {
54
- const validatorAnnounce = yield this.deployContract(chain, 'validatorAnnounce', [mailboxAddress]);
55
- return validatorAnnounce;
56
- });
36
+ async deployIsm(chain, config) {
37
+ this.logger(`Deploying new ISM to ${chain}`);
38
+ const ism = await this.ismFactory.deploy(chain, config);
39
+ return ism.address;
57
40
  }
58
- deployIsm(chain, config) {
59
- return __awaiter(this, void 0, void 0, function* () {
60
- this.logger(`Deploying new ISM to ${chain}`);
61
- const ism = yield this.ismFactory.deploy(chain, config);
62
- return ism.address;
63
- });
64
- }
65
- deployContracts(chain, config) {
66
- return __awaiter(this, void 0, void 0, function* () {
67
- if (config.remove) {
68
- // skip deploying to chains configured to be removed
69
- return undefined;
70
- }
71
- this.startingBlockNumbers[chain] = yield this.multiProvider
72
- .getProvider(chain)
73
- .getBlockNumber();
74
- const proxyAdmin = yield this.deployContract(chain, 'proxyAdmin', []);
75
- const mailbox = yield this.deployMailbox(chain, config.defaultIsm, proxyAdmin.address, config.owner);
76
- const validatorAnnounce = yield this.deployValidatorAnnounce(chain, mailbox.address);
77
- let timelockController;
78
- if (config.upgradeTimelockDelay) {
79
- timelockController = yield this.deployTimelock(chain, config.upgradeTimelockDelay, config.owner);
80
- yield this.transferOwnershipOfContracts(chain, timelockController.address, { proxyAdmin });
81
- }
82
- else {
83
- // mock this for consistent serialization
84
- timelockController = core_1.TimelockController__factory.connect(ethers_1.ethers.constants.AddressZero, this.multiProvider.getProvider(chain));
85
- yield this.transferOwnershipOfContracts(chain, config.owner, {
86
- mailbox,
87
- proxyAdmin,
88
- });
89
- }
90
- return {
41
+ async deployContracts(chain, config) {
42
+ if (config.remove) {
43
+ // skip deploying to chains configured to be removed
44
+ return undefined;
45
+ }
46
+ this.startingBlockNumbers[chain] = await this.multiProvider
47
+ .getProvider(chain)
48
+ .getBlockNumber();
49
+ const proxyAdmin = await this.deployContract(chain, 'proxyAdmin', []);
50
+ const mailbox = await this.deployMailbox(chain, config.defaultIsm, proxyAdmin.address, config.owner);
51
+ const validatorAnnounce = await this.deployValidatorAnnounce(chain, mailbox.address);
52
+ let timelockController;
53
+ if (config.upgrade) {
54
+ timelockController = await this.deployTimelock(chain, config.upgrade.timelock);
55
+ await this.transferOwnershipOfContracts(chain, timelockController.address, { proxyAdmin });
56
+ }
57
+ else {
58
+ // mock this for consistent serialization
59
+ timelockController = core_1.TimelockController__factory.connect(ethers_1.ethers.constants.AddressZero, this.multiProvider.getProvider(chain));
60
+ await this.transferOwnershipOfContracts(chain, config.owner, {
91
61
  mailbox,
92
62
  proxyAdmin,
93
- timelockController,
94
- validatorAnnounce,
95
- };
96
- });
63
+ });
64
+ }
65
+ return {
66
+ mailbox,
67
+ proxyAdmin,
68
+ timelockController,
69
+ validatorAnnounce,
70
+ };
97
71
  }
98
72
  }
99
73
  exports.HyperlaneCoreDeployer = HyperlaneCoreDeployer;
@@ -1 +1 @@
1
- {"version":3,"file":"HyperlaneCoreDeployer.js","sourceRoot":"","sources":["../../src/core/HyperlaneCoreDeployer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"HyperlaneCoreDeployer.js","sourceRoot":"","sources":["../../src/core/HyperlaneCoreDeployer.ts"],"names":[],"mappings":"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"}
@@ -1,61 +1,51 @@
1
1
  "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
2
  Object.defineProperty(exports, "__esModule", { value: true });
12
3
  exports.TestCoreApp = exports.testCoreFactories = void 0;
13
4
  const core_1 = require("@hyperlane-xyz/core");
14
5
  const utils_1 = require("@hyperlane-xyz/utils");
15
6
  const HyperlaneCore_1 = require("./HyperlaneCore");
16
7
  const contracts_1 = require("./contracts");
17
- exports.testCoreFactories = Object.assign(Object.assign({}, contracts_1.coreFactories), { mailbox: new core_1.TestMailbox__factory() });
8
+ exports.testCoreFactories = {
9
+ ...contracts_1.coreFactories,
10
+ mailbox: new core_1.TestMailbox__factory(),
11
+ };
18
12
  class TestCoreApp extends HyperlaneCore_1.HyperlaneCore {
19
13
  getContracts(chain) {
20
14
  return super.getContracts(chain);
21
15
  }
22
- processMessages() {
23
- return __awaiter(this, void 0, void 0, function* () {
24
- const responses = new Map();
25
- for (const origin of this.chains()) {
26
- const outbound = yield this.processOutboundMessages(origin);
27
- const originResponses = new Map();
28
- this.remoteChains(origin).forEach((destination) => originResponses.set(destination, outbound.get(destination)));
29
- responses.set(origin, originResponses);
30
- }
31
- return responses;
32
- });
16
+ async processMessages() {
17
+ const responses = new Map();
18
+ for (const origin of this.chains()) {
19
+ const outbound = await this.processOutboundMessages(origin);
20
+ const originResponses = new Map();
21
+ this.remoteChains(origin).forEach((destination) => originResponses.set(destination, outbound.get(destination)));
22
+ responses.set(origin, originResponses);
23
+ }
24
+ return responses;
33
25
  }
34
- processOutboundMessages(origin) {
35
- return __awaiter(this, void 0, void 0, function* () {
36
- const responses = new Map();
37
- const contracts = this.getContracts(origin);
38
- const outbox = contracts.mailbox;
39
- const dispatchFilter = outbox.filters.Dispatch();
40
- const dispatches = yield outbox.queryFilter(dispatchFilter);
41
- for (const dispatch of dispatches) {
42
- const destination = dispatch.args.destination;
43
- if (destination === this.multiProvider.getDomainId(origin)) {
44
- throw new Error('Dispatched message to local domain');
45
- }
46
- const destinationChain = this.multiProvider.getChainName(destination);
47
- const inbox = this.getContracts(destinationChain).mailbox;
48
- const id = utils_1.utils.messageId(dispatch.args.message);
49
- const delivered = yield inbox.delivered(id);
50
- if (!delivered) {
51
- const response = yield inbox.process('0x', dispatch.args.message);
52
- const destinationResponses = responses.get(destinationChain) || [];
53
- destinationResponses.push(response);
54
- responses.set(destinationChain, destinationResponses);
55
- }
26
+ async processOutboundMessages(origin) {
27
+ const responses = new Map();
28
+ const contracts = this.getContracts(origin);
29
+ const outbox = contracts.mailbox;
30
+ const dispatchFilter = outbox.filters.Dispatch();
31
+ const dispatches = await outbox.queryFilter(dispatchFilter);
32
+ for (const dispatch of dispatches) {
33
+ const destination = dispatch.args.destination;
34
+ if (destination === this.multiProvider.getDomainId(origin)) {
35
+ throw new Error('Dispatched message to local domain');
36
+ }
37
+ const destinationChain = this.multiProvider.getChainName(destination);
38
+ const inbox = this.getContracts(destinationChain).mailbox;
39
+ const id = utils_1.utils.messageId(dispatch.args.message);
40
+ const delivered = await inbox.delivered(id);
41
+ if (!delivered) {
42
+ const response = await inbox.process('0x', dispatch.args.message);
43
+ const destinationResponses = responses.get(destinationChain) || [];
44
+ destinationResponses.push(response);
45
+ responses.set(destinationChain, destinationResponses);
56
46
  }
57
- return responses;
58
- });
47
+ }
48
+ return responses;
59
49
  }
60
50
  }
61
51
  exports.TestCoreApp = TestCoreApp;
@@ -1 +1 @@
1
- {"version":3,"file":"TestCoreApp.js","sourceRoot":"","sources":["../../src/core/TestCoreApp.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,8CAAwE;AACxE,gDAA6C;AAK7C,mDAAgD;AAChD,2CAA4C;AAE/B,QAAA,iBAAiB,mCACzB,yBAAa,KAChB,OAAO,EAAE,IAAI,2BAAoB,EAAE,IACnC;AAEF,MAAa,WAAY,SAAQ,6BAAa;IAC5C,YAAY,CAAC,KAAgB;QAC3B,OAAO,KAAK,CAAC,YAAY,CAAC,KAAK,CAE9B,CAAC;IACJ,CAAC;IAEK,eAAe;;YAGnB,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;YAC5B,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE;gBAClC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;gBAC5D,MAAM,eAAe,GAAG,IAAI,GAAG,EAAE,CAAC;gBAClC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE,CAChD,eAAe,CAAC,GAAG,CAAC,WAAW,EAAE,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAC5D,CAAC;gBACF,SAAS,CAAC,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;aACxC;YACD,OAAO,SAAS,CAAC;QACnB,CAAC;KAAA;IAEK,uBAAuB,CAC3B,MAAiB;;YAEjB,MAAM,SAAS,GAAG,IAAI,GAAG,EAAkB,CAAC;YAC5C,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;YAC5C,MAAM,MAAM,GAAG,SAAS,CAAC,OAAsB,CAAC;YAEhD,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;YACjD,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;YAC5D,KAAK,MAAM,QAAQ,IAAI,UAAU,EAAE;gBACjC,MAAM,WAAW,GAAG,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC;gBAC9C,IAAI,WAAW,KAAK,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE;oBAC1D,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;iBACvD;gBACD,MAAM,gBAAgB,GAAG,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;gBACtE,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC;gBAC1D,MAAM,EAAE,GAAG,aAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAClD,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;gBAC5C,IAAI,CAAC,SAAS,EAAE;oBACd,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;oBAClE,MAAM,oBAAoB,GAAG,SAAS,CAAC,GAAG,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC;oBACnE,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;oBACpC,SAAS,CAAC,GAAG,CAAC,gBAAgB,EAAE,oBAAoB,CAAC,CAAC;iBACvD;aACF;YACD,OAAO,SAAS,CAAC;QACnB,CAAC;KAAA;CACF;AAjDD,kCAiDC"}
1
+ {"version":3,"file":"TestCoreApp.js","sourceRoot":"","sources":["../../src/core/TestCoreApp.ts"],"names":[],"mappings":";;;AAEA,8CAAwE;AACxE,gDAA6C;AAK7C,mDAAgD;AAChD,2CAA4C;AAE/B,QAAA,iBAAiB,GAAG;IAC/B,GAAG,yBAAa;IAChB,OAAO,EAAE,IAAI,2BAAoB,EAAE;CACpC,CAAC;AAEF,MAAa,WAAY,SAAQ,6BAAa;IAC5C,YAAY,CAAC,KAAgB;QAC3B,OAAO,KAAK,CAAC,YAAY,CAAC,KAAK,CAE9B,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,eAAe;QAGnB,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;QAC5B,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE;YAClC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;YAC5D,MAAM,eAAe,GAAG,IAAI,GAAG,EAAE,CAAC;YAClC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE,CAChD,eAAe,CAAC,GAAG,CAAC,WAAW,EAAE,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAC5D,CAAC;YACF,SAAS,CAAC,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;SACxC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,uBAAuB,CAC3B,MAAiB;QAEjB,MAAM,SAAS,GAAG,IAAI,GAAG,EAAkB,CAAC;QAC5C,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QAC5C,MAAM,MAAM,GAAG,SAAS,CAAC,OAAsB,CAAC;QAEhD,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QACjD,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;QAC5D,KAAK,MAAM,QAAQ,IAAI,UAAU,EAAE;YACjC,MAAM,WAAW,GAAG,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC;YAC9C,IAAI,WAAW,KAAK,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE;gBAC1D,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;aACvD;YACD,MAAM,gBAAgB,GAAG,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;YACtE,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC;YAC1D,MAAM,EAAE,GAAG,aAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAClD,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;YAC5C,IAAI,CAAC,SAAS,EAAE;gBACd,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAClE,MAAM,oBAAoB,GAAG,SAAS,CAAC,GAAG,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC;gBACnE,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACpC,SAAS,CAAC,GAAG,CAAC,gBAAgB,EAAE,oBAAoB,CAAC,CAAC;aACvD;SACF;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AAjDD,kCAiDC"}
@@ -1,13 +1,4 @@
1
1
  "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
2
  Object.defineProperty(exports, "__esModule", { value: true });
12
3
  exports.TestCoreDeployer = void 0;
13
4
  const core_1 = require("@hyperlane-xyz/core");
@@ -17,7 +8,12 @@ const testUtils_1 = require("../test/testUtils");
17
8
  const HyperlaneCoreDeployer_1 = require("./HyperlaneCoreDeployer");
18
9
  const TestCoreApp_1 = require("./TestCoreApp");
19
10
  const contracts_1 = require("./contracts");
20
- const testCoreFactories = Object.assign(Object.assign({}, contracts_1.coreFactories), { mailbox: new core_1.TestMailbox__factory(), interchainGasPaymaster: new core_1.TestInterchainGasPaymaster__factory(), testIsm: new core_1.TestMultisigIsm__factory() });
11
+ const testCoreFactories = {
12
+ ...contracts_1.coreFactories,
13
+ mailbox: new core_1.TestMailbox__factory(),
14
+ interchainGasPaymaster: new core_1.TestInterchainGasPaymaster__factory(),
15
+ testIsm: new core_1.TestMultisigIsm__factory(),
16
+ };
21
17
  class TestCoreDeployer extends HyperlaneCoreDeployer_1.HyperlaneCoreDeployer {
22
18
  constructor(multiProvider) {
23
19
  const ismFactory = new HyperlaneIsmFactory_1.HyperlaneIsmFactory({}, multiProvider);
@@ -25,25 +21,16 @@ class TestCoreDeployer extends HyperlaneCoreDeployer_1.HyperlaneCoreDeployer {
25
21
  this.multiProvider = multiProvider;
26
22
  }
27
23
  // deploy a test ISM instead of a real ISM
28
- deployIsm(chain) {
29
- return __awaiter(this, void 0, void 0, function* () {
30
- const testIsm = yield this.deployContractFromFactory(chain, testCoreFactories.testIsm, 'testIsm', []);
31
- yield testIsm.setAccept(true);
32
- return testIsm.address;
33
- });
24
+ async deployIsm(chain) {
25
+ const testIsm = await this.deployContractFromFactory(chain, testCoreFactories.testIsm, 'testIsm', []);
26
+ await testIsm.setAccept(true);
27
+ return testIsm.address;
34
28
  }
35
- deploy() {
36
- const _super = Object.create(null, {
37
- deploy: { get: () => super.deploy }
38
- });
39
- return __awaiter(this, void 0, void 0, function* () {
40
- return _super.deploy.call(this, (0, testUtils_1.testCoreConfig)(chains_1.TestChains));
41
- });
29
+ async deploy() {
30
+ return super.deploy((0, testUtils_1.testCoreConfig)(chains_1.TestChains));
42
31
  }
43
- deployApp() {
44
- return __awaiter(this, void 0, void 0, function* () {
45
- return new TestCoreApp_1.TestCoreApp(yield this.deploy(), this.multiProvider);
46
- });
32
+ async deployApp() {
33
+ return new TestCoreApp_1.TestCoreApp(await this.deploy(), this.multiProvider);
47
34
  }
48
35
  }
49
36
  exports.TestCoreDeployer = TestCoreDeployer;
@@ -1 +1 @@
1
- {"version":3,"file":"TestCoreDeployer.js","sourceRoot":"","sources":["../../src/core/TestCoreDeployer.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAI6B;AAE7B,6CAA8C;AAE9C,oEAAiE;AAEjE,iDAAmD;AAGnD,mEAAgE;AAChE,+CAA4C;AAC5C,2CAA2D;AAE3D,MAAM,iBAAiB,mCAClB,yBAAa,KAChB,OAAO,EAAE,IAAI,2BAAoB,EAAE,EACnC,sBAAsB,EAAE,IAAI,0CAAmC,EAAE,EACjE,OAAO,EAAE,IAAI,+BAAwB,EAAE,GACxC,CAAC;AAEF,MAAa,gBAAiB,SAAQ,6CAAqB;IACzD,YAA4B,aAA4B;QACtD,MAAM,UAAU,GAAG,IAAI,yCAAmB,CAAC,EAAE,EAAE,aAAa,CAAC,CAAC;QAC9D,KAAK,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;QAFP,kBAAa,GAAb,aAAa,CAAe;IAGxD,CAAC;IAED,0CAA0C;IACpC,SAAS,CAAC,KAAgB;;YAC9B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAClD,KAAK,EACL,iBAAiB,CAAC,OAAO,EACzB,SAAS,EACT,EAAE,CACH,CAAC;YACF,MAAM,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YAC9B,OAAO,OAAO,CAAC,OAAO,CAAC;QACzB,CAAC;KAAA;IAEK,MAAM;;;;;YACV,OAAO,OAAM,MAAM,YAAC,IAAA,0BAAc,EAAC,mBAAU,CAAC,EAAE;QAClD,CAAC;KAAA;IAEK,SAAS;;YACb,OAAO,IAAI,yBAAW,CAAC,MAAM,IAAI,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;QAClE,CAAC;KAAA;CACF;AAzBD,4CAyBC"}
1
+ {"version":3,"file":"TestCoreDeployer.js","sourceRoot":"","sources":["../../src/core/TestCoreDeployer.ts"],"names":[],"mappings":";;;AAAA,8CAI6B;AAE7B,6CAA8C;AAE9C,oEAAiE;AAEjE,iDAAmD;AAGnD,mEAAgE;AAChE,+CAA4C;AAC5C,2CAA2D;AAE3D,MAAM,iBAAiB,GAAG;IACxB,GAAG,yBAAa;IAChB,OAAO,EAAE,IAAI,2BAAoB,EAAE;IACnC,sBAAsB,EAAE,IAAI,0CAAmC,EAAE;IACjE,OAAO,EAAE,IAAI,+BAAwB,EAAE;CACxC,CAAC;AAEF,MAAa,gBAAiB,SAAQ,6CAAqB;IACzD,YAA4B,aAA4B;QACtD,MAAM,UAAU,GAAG,IAAI,yCAAmB,CAAC,EAAE,EAAE,aAAa,CAAC,CAAC;QAC9D,KAAK,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;QAFP,kBAAa,GAAb,aAAa,CAAe;IAGxD,CAAC;IAED,0CAA0C;IAC1C,KAAK,CAAC,SAAS,CAAC,KAAgB;QAC9B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAClD,KAAK,EACL,iBAAiB,CAAC,OAAO,EACzB,SAAS,EACT,EAAE,CACH,CAAC;QACF,MAAM,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC9B,OAAO,OAAO,CAAC,OAAO,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,MAAM;QACV,OAAO,KAAK,CAAC,MAAM,CAAC,IAAA,0BAAc,EAAC,mBAAU,CAAC,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,SAAS;QACb,OAAO,IAAI,yBAAW,CAAC,MAAM,IAAI,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;IAClE,CAAC;CACF;AAzBD,4CAyBC"}
@@ -5,5 +5,5 @@ export declare const coreFactories: {
5
5
  mailbox: Mailbox__factory;
6
6
  timelockController: TimelockController__factory;
7
7
  };
8
- export declare type CoreFactories = typeof coreFactories;
8
+ export type CoreFactories = typeof coreFactories;
9
9
  //# sourceMappingURL=contracts.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"contracts.d.ts","sourceRoot":"","sources":["../../src/core/contracts.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACnB,2BAA2B,EAC3B,0BAA0B,EAC3B,MAAM,qBAAqB,CAAC;AAE7B,eAAO,MAAM,aAAa;;;;;CAKzB,CAAC;AAEF,oBAAY,aAAa,GAAG,OAAO,aAAa,CAAC"}
1
+ {"version":3,"file":"contracts.d.ts","sourceRoot":"","sources":["../../src/core/contracts.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACnB,2BAA2B,EAC3B,0BAA0B,EAC3B,MAAM,qBAAqB,CAAC;AAE7B,eAAO,MAAM,aAAa;;;;;CAKzB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,OAAO,aAAa,CAAC"}
@@ -1,4 +1,4 @@
1
1
  import type { DispatchEvent, ProcessEvent } from '@hyperlane-xyz/core/dist/contracts/Mailbox';
2
2
  export { DispatchEvent, ProcessEvent };
3
- export declare type HyperlaneLifecyleEvent = ProcessEvent | DispatchEvent;
3
+ export type HyperlaneLifecyleEvent = ProcessEvent | DispatchEvent;
4
4
  //# sourceMappingURL=events.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../src/core/events.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EACb,YAAY,EACb,MAAM,4CAA4C,CAAC;AAEpD,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,CAAC;AAEvC,oBAAY,sBAAsB,GAAG,YAAY,GAAG,aAAa,CAAC"}
1
+ {"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../src/core/events.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EACb,YAAY,EACb,MAAM,4CAA4C,CAAC;AAEpD,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,CAAC;AAEvC,MAAM,MAAM,sBAAsB,GAAG,YAAY,GAAG,aAAa,CAAC"}
@@ -1,13 +1,4 @@
1
1
  "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
2
  Object.defineProperty(exports, "__esModule", { value: true });
12
3
  require("@nomiclabs/hardhat-ethers");
13
4
  require("@nomiclabs/hardhat-waffle");
@@ -21,42 +12,42 @@ const TestCoreDeployer_1 = require("./TestCoreDeployer");
21
12
  const localChain = chains_1.Chains.test1;
22
13
  const remoteChain = chains_1.Chains.test2;
23
14
  const message = '0xdeadbeef';
24
- describe('TestCoreDeployer', () => __awaiter(void 0, void 0, void 0, function* () {
15
+ describe('TestCoreDeployer', async () => {
25
16
  let testCoreApp, localMailbox, remoteMailbox, dispatchReceipt;
26
- beforeEach(() => __awaiter(void 0, void 0, void 0, function* () {
27
- const [signer] = yield hardhat_1.ethers.getSigners();
17
+ beforeEach(async () => {
18
+ const [signer] = await hardhat_1.ethers.getSigners();
28
19
  const multiProvider = MultiProvider_1.MultiProvider.createTestMultiProvider({ signer });
29
20
  const deployer = new TestCoreDeployer_1.TestCoreDeployer(multiProvider);
30
- testCoreApp = yield deployer.deployApp();
31
- const recipient = yield new core_1.TestRecipient__factory(signer).deploy();
21
+ testCoreApp = await deployer.deployApp();
22
+ const recipient = await new core_1.TestRecipient__factory(signer).deploy();
32
23
  localMailbox = testCoreApp.getContracts(localChain).mailbox;
33
24
  const dispatchResponse = localMailbox.dispatch(multiProvider.getDomainId(remoteChain), utils_1.utils.addressToBytes32(recipient.address), message);
34
- yield (0, chai_1.expect)(dispatchResponse).to.emit(localMailbox, 'Dispatch');
35
- dispatchReceipt = yield testCoreApp.multiProvider.handleTx(localChain, dispatchResponse);
25
+ await (0, chai_1.expect)(dispatchResponse).to.emit(localMailbox, 'Dispatch');
26
+ dispatchReceipt = await testCoreApp.multiProvider.handleTx(localChain, dispatchResponse);
36
27
  remoteMailbox = testCoreApp.getContracts(remoteChain).mailbox;
37
- yield (0, chai_1.expect)(remoteMailbox.dispatch(multiProvider.getDomainId(localChain), utils_1.utils.addressToBytes32(recipient.address), message)).to.emit(remoteMailbox, 'Dispatch');
38
- }));
39
- it('processes outbound messages for a single domain', () => __awaiter(void 0, void 0, void 0, function* () {
40
- const responses = yield testCoreApp.processOutboundMessages(localChain);
28
+ await (0, chai_1.expect)(remoteMailbox.dispatch(multiProvider.getDomainId(localChain), utils_1.utils.addressToBytes32(recipient.address), message)).to.emit(remoteMailbox, 'Dispatch');
29
+ });
30
+ it('processes outbound messages for a single domain', async () => {
31
+ const responses = await testCoreApp.processOutboundMessages(localChain);
41
32
  (0, chai_1.expect)(responses.get(remoteChain).length).to.equal(1);
42
- }));
43
- it('processes outbound messages for two domains', () => __awaiter(void 0, void 0, void 0, function* () {
44
- const localResponses = yield testCoreApp.processOutboundMessages(localChain);
33
+ });
34
+ it('processes outbound messages for two domains', async () => {
35
+ const localResponses = await testCoreApp.processOutboundMessages(localChain);
45
36
  (0, chai_1.expect)(localResponses.get(remoteChain).length).to.equal(1);
46
- const remoteResponses = yield testCoreApp.processOutboundMessages(remoteChain);
37
+ const remoteResponses = await testCoreApp.processOutboundMessages(remoteChain);
47
38
  (0, chai_1.expect)(remoteResponses.get(localChain).length).to.equal(1);
48
- }));
49
- it('processes all messages', () => __awaiter(void 0, void 0, void 0, function* () {
50
- const responses = yield testCoreApp.processMessages();
39
+ });
40
+ it('processes all messages', async () => {
41
+ const responses = await testCoreApp.processMessages();
51
42
  (0, chai_1.expect)(responses.get(localChain).get(remoteChain).length).to.equal(1);
52
43
  (0, chai_1.expect)(responses.get(remoteChain).get(localChain).length).to.equal(1);
53
- }));
54
- it('waits on message processing receipts', () => __awaiter(void 0, void 0, void 0, function* () {
55
- const [receipts] = yield Promise.all([
44
+ });
45
+ it('waits on message processing receipts', async () => {
46
+ const [receipts] = await Promise.all([
56
47
  testCoreApp.waitForMessageProcessing(dispatchReceipt),
57
48
  testCoreApp.processOutboundMessages(localChain),
58
49
  ]);
59
50
  (0, chai_1.expect)(receipts).to.have.length(1);
60
- }));
61
- }));
51
+ });
52
+ });
62
53
  //# sourceMappingURL=testHyperlaneDeploy.hardhat-test.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"testHyperlaneDeploy.hardhat-test.js","sourceRoot":"","sources":["../../src/core/testHyperlaneDeploy.hardhat-test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"testHyperlaneDeploy.hardhat-test.js","sourceRoot":"","sources":["../../src/core/testHyperlaneDeploy.hardhat-test.ts"],"names":[],"mappings":"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"}
@@ -1,19 +1,19 @@
1
1
  import { Mailbox } from '@hyperlane-xyz/core';
2
2
  import type { types } from '@hyperlane-xyz/utils';
3
+ import { UpgradeConfig } from '../deploy/proxy';
3
4
  import type { CheckerViolation } from '../deploy/types';
4
5
  import { IsmConfig } from '../ism/types';
5
6
  import { ChainName } from '../types';
6
- export declare type CoreConfig = {
7
+ export type CoreConfig = {
7
8
  defaultIsm: IsmConfig;
8
9
  owner: types.Address;
9
- upgradeTimelockDelay?: number;
10
10
  remove?: boolean;
11
+ upgrade?: UpgradeConfig;
11
12
  };
12
13
  export declare enum CoreViolationType {
13
14
  Mailbox = "Mailbox",
14
15
  ConnectionManager = "ConnectionManager",
15
- ValidatorAnnounce = "ValidatorAnnounce",
16
- TimelockController = "TimelockController"
16
+ ValidatorAnnounce = "ValidatorAnnounce"
17
17
  }
18
18
  export declare enum MailboxViolationType {
19
19
  DefaultIsm = "DefaultIsm"
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/core/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,oBAAY,UAAU,GAAG;IACvB,UAAU,EAAE,SAAS,CAAC;IACtB,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC;IACrB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,oBAAY,iBAAiB;IAC3B,OAAO,YAAY;IACnB,iBAAiB,sBAAsB;IACvC,iBAAiB,sBAAsB;IACvC,kBAAkB,uBAAuB;CAC1C;AAED,oBAAY,oBAAoB;IAC9B,UAAU,eAAe;CAC1B;AAED,MAAM,WAAW,gBAAiB,SAAQ,gBAAgB;IACxD,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC;IAChC,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,oBAAoB,CAAC;CACnC;AAED,MAAM,WAAW,2BAA4B,SAAQ,gBAAgB;IACnE,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC;IACtB,QAAQ,EAAE,SAAS,CAAC;CACrB;AAED,MAAM,WAAW,0BAA2B,SAAQ,gBAAgB;IAClE,IAAI,EAAE,iBAAiB,CAAC,iBAAiB,CAAC;IAC1C,KAAK,EAAE,SAAS,CAAC;IACjB,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;CACnB"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/core/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,MAAM,MAAM,UAAU,GAAG;IACvB,UAAU,EAAE,SAAS,CAAC;IACtB,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC;IACrB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,aAAa,CAAC;CACzB,CAAC;AAEF,oBAAY,iBAAiB;IAC3B,OAAO,YAAY;IACnB,iBAAiB,sBAAsB;IACvC,iBAAiB,sBAAsB;CACxC;AAED,oBAAY,oBAAoB;IAC9B,UAAU,eAAe;CAC1B;AAED,MAAM,WAAW,gBAAiB,SAAQ,gBAAgB;IACxD,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC;IAChC,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,oBAAoB,CAAC;CACnC;AAED,MAAM,WAAW,2BAA4B,SAAQ,gBAAgB;IACnE,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC;IACtB,QAAQ,EAAE,SAAS,CAAC;CACrB;AAED,MAAM,WAAW,0BAA2B,SAAQ,gBAAgB;IAClE,IAAI,EAAE,iBAAiB,CAAC,iBAAiB,CAAC;IAC1C,KAAK,EAAE,SAAS,CAAC;IACjB,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;CACnB"}
@@ -6,10 +6,9 @@ var CoreViolationType;
6
6
  CoreViolationType["Mailbox"] = "Mailbox";
7
7
  CoreViolationType["ConnectionManager"] = "ConnectionManager";
8
8
  CoreViolationType["ValidatorAnnounce"] = "ValidatorAnnounce";
9
- CoreViolationType["TimelockController"] = "TimelockController";
10
- })(CoreViolationType = exports.CoreViolationType || (exports.CoreViolationType = {}));
9
+ })(CoreViolationType || (exports.CoreViolationType = CoreViolationType = {}));
11
10
  var MailboxViolationType;
12
11
  (function (MailboxViolationType) {
13
12
  MailboxViolationType["DefaultIsm"] = "DefaultIsm";
14
- })(MailboxViolationType = exports.MailboxViolationType || (exports.MailboxViolationType = {}));
13
+ })(MailboxViolationType || (exports.MailboxViolationType = MailboxViolationType = {}));
15
14
  //# sourceMappingURL=types.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/core/types.ts"],"names":[],"mappings":";;;AAcA,IAAY,iBAKX;AALD,WAAY,iBAAiB;IAC3B,wCAAmB,CAAA;IACnB,4DAAuC,CAAA;IACvC,4DAAuC,CAAA;IACvC,8DAAyC,CAAA;AAC3C,CAAC,EALW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAK5B;AAED,IAAY,oBAEX;AAFD,WAAY,oBAAoB;IAC9B,iDAAyB,CAAA;AAC3B,CAAC,EAFW,oBAAoB,GAApB,4BAAoB,KAApB,4BAAoB,QAE/B"}
1
+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/core/types.ts"],"names":[],"mappings":";;;AAeA,IAAY,iBAIX;AAJD,WAAY,iBAAiB;IAC3B,wCAAmB,CAAA;IACnB,4DAAuC,CAAA;IACvC,4DAAuC,CAAA;AACzC,CAAC,EAJW,iBAAiB,iCAAjB,iBAAiB,QAI5B;AAED,IAAY,oBAEX;AAFD,WAAY,oBAAoB;IAC9B,iDAAyB,CAAA;AAC3B,CAAC,EAFW,oBAAoB,oCAApB,oBAAoB,QAE/B"}
@@ -3,6 +3,7 @@ import type { types } from '@hyperlane-xyz/utils';
3
3
  import { HyperlaneApp } from '../HyperlaneApp';
4
4
  import { MultiProvider } from '../providers/MultiProvider';
5
5
  import { ChainMap, ChainName } from '../types';
6
+ import { UpgradeConfig } from './proxy';
6
7
  import { CheckerViolation } from './types';
7
8
  export declare abstract class HyperlaneAppChecker<App extends HyperlaneApp<any>, Config> {
8
9
  readonly multiProvider: MultiProvider;
@@ -14,12 +15,13 @@ export declare abstract class HyperlaneAppChecker<App extends HyperlaneApp<any>,
14
15
  check(): Promise<void[]>;
15
16
  addViolation(violation: CheckerViolation): void;
16
17
  checkProxiedContracts(chain: ChainName): Promise<void>;
18
+ checkUpgrade(chain: ChainName, upgradeConfig: UpgradeConfig): Promise<void>;
17
19
  private removeBytecodeMetadata;
18
20
  checkBytecode(chain: ChainName, name: string, address: string, expectedBytecodeHashes: string[], modifyBytecodePriorToHash?: (bytecode: string) => string): Promise<void>;
19
21
  ownables(chain: ChainName): Promise<{
20
22
  [key: string]: Ownable;
21
23
  }>;
22
- checkOwnership(chain: ChainName, owner: types.Address, ownableOverrides?: Record<string, types.Address>): Promise<void>;
24
+ protected checkOwnership(chain: ChainName, owner: types.Address, ownableOverrides?: Record<string, types.Address>): Promise<void>;
23
25
  expectViolations(violationCounts: Record<string, number>): void;
24
26
  expectEmpty(): void;
25
27
  }
@@ -1 +1 @@
1
- {"version":3,"file":"HyperlaneAppChecker.d.ts","sourceRoot":"","sources":["../../src/deploy/HyperlaneAppChecker.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAGlD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAI/C,OAAO,EAEL,gBAAgB,EAIjB,MAAM,SAAS,CAAC;AAEjB,8BAAsB,mBAAmB,CACvC,GAAG,SAAS,YAAY,CAAC,GAAG,CAAC,EAC7B,MAAM;IAEN,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IACtC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAClB,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IACrC,QAAQ,CAAC,UAAU,EAAE,gBAAgB,EAAE,CAAC;gBAGtC,aAAa,EAAE,aAAa,EAC5B,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC;IAQ7B,QAAQ,CAAC,UAAU,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAE9C,KAAK,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;IAiB9B,YAAY,CAAC,SAAS,EAAE,gBAAgB,GAAG,IAAI;IAIzC,qBAAqB,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IA6B5D,OAAO,CAAC,sBAAsB;IAOxB,aAAa,CACjB,KAAK,EAAE,SAAS,EAChB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,sBAAsB,EAAE,MAAM,EAAE,EAChC,yBAAyB,GAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAiB,GACjE,OAAO,CAAC,IAAI,CAAC;IAiBV,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IAK/D,cAAc,CAClB,KAAK,EAAE,SAAS,EAChB,KAAK,EAAE,KAAK,CAAC,OAAO,EACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,GAC/C,OAAO,CAAC,IAAI,CAAC;IAmBhB,gBAAgB,CAAC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI;IAgB/D,WAAW,IAAI,IAAI;CAIpB"}
1
+ {"version":3,"file":"HyperlaneAppChecker.d.ts","sourceRoot":"","sources":["../../src/deploy/HyperlaneAppChecker.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAsB,MAAM,qBAAqB,CAAC;AAClE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAGlD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAG/C,OAAO,EAAE,aAAa,EAAuB,MAAM,SAAS,CAAC;AAC7D,OAAO,EAGL,gBAAgB,EAKjB,MAAM,SAAS,CAAC;AAEjB,8BAAsB,mBAAmB,CACvC,GAAG,SAAS,YAAY,CAAC,GAAG,CAAC,EAC7B,MAAM;IAEN,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IACtC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAClB,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IACrC,QAAQ,CAAC,UAAU,EAAE,gBAAgB,EAAE,CAAC;gBAGtC,aAAa,EAAE,aAAa,EAC5B,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC;IAQ7B,QAAQ,CAAC,UAAU,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAE9C,KAAK,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;IAiB9B,YAAY,CAAC,SAAS,EAAE,gBAAgB,GAAG,IAAI;IAIzC,qBAAqB,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IA6BtD,YAAY,CAChB,KAAK,EAAE,SAAS,EAChB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,IAAI,CAAC;IAoDhB,OAAO,CAAC,sBAAsB;IAOxB,aAAa,CACjB,KAAK,EAAE,SAAS,EAChB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,sBAAsB,EAAE,MAAM,EAAE,EAChC,yBAAyB,GAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAiB,GACjE,OAAO,CAAC,IAAI,CAAC;IAiBV,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;cAKrD,cAAc,CAC5B,KAAK,EAAE,SAAS,EAChB,KAAK,EAAE,KAAK,CAAC,OAAO,EACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,GAC/C,OAAO,CAAC,IAAI,CAAC;IAmBhB,gBAAgB,CAAC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI;IAgB/D,WAAW,IAAI,IAAI;CAIpB"}