@hyperlane-xyz/sdk 7.1.0 → 7.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.
- package/dist/aws/validator.d.ts +3 -1
- package/dist/aws/validator.d.ts.map +1 -1
- package/dist/aws/validator.js +12 -4
- package/dist/aws/validator.js.map +1 -1
- package/dist/consts/multisigIsm.d.ts +1 -0
- package/dist/consts/multisigIsm.d.ts.map +1 -1
- package/dist/consts/multisigIsm.js +1148 -358
- package/dist/consts/multisigIsm.js.map +1 -1
- package/dist/consts/multisigIsm.test.js +16 -2
- package/dist/consts/multisigIsm.test.js.map +1 -1
- package/dist/consts/multisigIsmVerifyCosts.d.ts.map +1 -1
- package/dist/consts/multisigIsmVerifyCosts.js +0 -1
- package/dist/consts/multisigIsmVerifyCosts.js.map +1 -1
- package/dist/core/CoreDeployer.hardhat-test.d.ts.map +1 -1
- package/dist/core/CoreDeployer.hardhat-test.js +27 -8
- package/dist/core/CoreDeployer.hardhat-test.js.map +1 -1
- package/dist/core/EvmCoreModule.d.ts +6 -4
- package/dist/core/EvmCoreModule.d.ts.map +1 -1
- package/dist/core/EvmCoreModule.js +23 -3
- package/dist/core/EvmCoreModule.js.map +1 -1
- package/dist/core/EvmCoreReader.d.ts +14 -6
- package/dist/core/EvmCoreReader.d.ts.map +1 -1
- package/dist/core/EvmCoreReader.js +14 -8
- package/dist/core/EvmCoreReader.js.map +1 -1
- package/dist/core/EvmIcaModule.d.ts +13 -5
- package/dist/core/EvmIcaModule.d.ts.map +1 -1
- package/dist/core/EvmIcaModule.js +81 -4
- package/dist/core/EvmIcaModule.js.map +1 -1
- package/dist/core/HyperlaneRelayer.d.ts +40 -40
- package/dist/core/HyperlaneRelayer.d.ts.map +1 -1
- package/dist/core/HyperlaneRelayer.js +3 -3
- package/dist/core/HyperlaneRelayer.js.map +1 -1
- package/dist/core/schemas.d.ts +3572 -676
- package/dist/core/schemas.d.ts.map +1 -1
- package/dist/core/schemas.js +9 -4
- package/dist/core/schemas.js.map +1 -1
- package/dist/core/types.d.ts +2 -1
- package/dist/core/types.d.ts.map +1 -1
- package/dist/core/types.js.map +1 -1
- package/dist/deploy/HyperlaneAppChecker.d.ts +1 -0
- package/dist/deploy/HyperlaneAppChecker.d.ts.map +1 -1
- package/dist/deploy/HyperlaneAppChecker.js +6 -3
- package/dist/deploy/HyperlaneAppChecker.js.map +1 -1
- package/dist/deploy/HyperlaneDeployer.d.ts +1 -1
- package/dist/deploy/HyperlaneDeployer.d.ts.map +1 -1
- package/dist/deploy/verify/ContractVerifier.js +1 -1
- package/dist/deploy/verify/ContractVerifier.js.map +1 -1
- package/dist/gas/adapters/SealevelIgpAdapter.d.ts +40 -4
- package/dist/gas/adapters/SealevelIgpAdapter.d.ts.map +1 -1
- package/dist/gas/adapters/SealevelIgpAdapter.js +107 -12
- package/dist/gas/adapters/SealevelIgpAdapter.js.map +1 -1
- package/dist/gas/adapters/serialization.d.ts +29 -0
- package/dist/gas/adapters/serialization.d.ts.map +1 -1
- package/dist/gas/adapters/serialization.js +71 -2
- package/dist/gas/adapters/serialization.js.map +1 -1
- package/dist/gas/types.d.ts +1 -1
- package/dist/gas/types.d.ts.map +1 -1
- package/dist/gcp/storage.d.ts +24 -0
- package/dist/gcp/storage.d.ts.map +1 -0
- package/dist/gcp/storage.js +69 -0
- package/dist/gcp/storage.js.map +1 -0
- package/dist/gcp/validator.d.ts +21 -0
- package/dist/gcp/validator.d.ts.map +1 -0
- package/dist/gcp/validator.js +99 -0
- package/dist/gcp/validator.js.map +1 -0
- package/dist/hook/EvmHookModule.d.ts +2 -2
- package/dist/hook/EvmHookModule.d.ts.map +1 -1
- package/dist/hook/EvmHookModule.hardhat-test.js +0 -1
- package/dist/hook/EvmHookModule.hardhat-test.js.map +1 -1
- package/dist/hook/EvmHookModule.js +1 -2
- package/dist/hook/EvmHookModule.js.map +1 -1
- package/dist/hook/EvmHookReader.js +2 -2
- package/dist/hook/EvmHookReader.js.map +1 -1
- package/dist/hook/EvmHookReader.test.js +0 -1
- package/dist/hook/EvmHookReader.test.js.map +1 -1
- package/dist/hook/types.d.ts +244 -1
- package/dist/hook/types.d.ts.map +1 -1
- package/dist/hook/types.js +65 -0
- package/dist/hook/types.js.map +1 -1
- package/dist/ica/EvmIcaReader.d.ts +10 -0
- package/dist/ica/EvmIcaReader.d.ts.map +1 -0
- package/dist/ica/EvmIcaReader.hardhat-test.d.ts +2 -0
- package/dist/ica/EvmIcaReader.hardhat-test.d.ts.map +1 -0
- package/dist/ica/EvmIcaReader.hardhat-test.js +44 -0
- package/dist/ica/EvmIcaReader.hardhat-test.js.map +1 -0
- package/dist/ica/EvmIcaReader.js +52 -0
- package/dist/ica/EvmIcaReader.js.map +1 -0
- package/dist/ica/schemas.d.ts +107 -0
- package/dist/ica/schemas.d.ts.map +1 -0
- package/dist/ica/schemas.js +25 -0
- package/dist/ica/schemas.js.map +1 -0
- package/dist/ica/types.d.ts +5 -0
- package/dist/ica/types.d.ts.map +1 -0
- package/dist/ica/types.js +2 -0
- package/dist/ica/types.js.map +1 -0
- package/dist/index.d.ts +14 -10
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +11 -8
- package/dist/index.js.map +1 -1
- package/dist/ism/EvmIsmModule.d.ts +3 -3
- package/dist/ism/EvmIsmModule.d.ts.map +1 -1
- package/dist/ism/EvmIsmModule.hardhat-test.js +5 -1
- package/dist/ism/EvmIsmModule.hardhat-test.js.map +1 -1
- package/dist/ism/EvmIsmModule.js +1 -2
- package/dist/ism/EvmIsmModule.js.map +1 -1
- package/dist/ism/EvmIsmReader.d.ts.map +1 -1
- package/dist/ism/EvmIsmReader.js +25 -11
- package/dist/ism/EvmIsmReader.js.map +1 -1
- package/dist/ism/HyperlaneIsmFactory.d.ts +2 -0
- package/dist/ism/HyperlaneIsmFactory.d.ts.map +1 -1
- package/dist/ism/HyperlaneIsmFactory.hardhat-test.d.ts.map +1 -1
- package/dist/ism/HyperlaneIsmFactory.hardhat-test.js.map +1 -1
- package/dist/ism/HyperlaneIsmFactory.js +20 -2
- package/dist/ism/HyperlaneIsmFactory.js.map +1 -1
- package/dist/ism/adapters/CosmWasmMultisigAdapter.d.ts +2 -2
- package/dist/ism/adapters/CosmWasmMultisigAdapter.d.ts.map +1 -1
- package/dist/ism/adapters/CosmWasmMultisigAdapter.js +1 -1
- package/dist/ism/adapters/CosmWasmMultisigAdapter.js.map +1 -1
- package/dist/ism/metadata/aggregation.d.ts +2 -1
- package/dist/ism/metadata/aggregation.d.ts.map +1 -1
- package/dist/ism/metadata/aggregation.js +2 -2
- package/dist/ism/metadata/aggregation.js.map +1 -1
- package/dist/ism/metadata/arbL2ToL1.d.ts +1 -1
- package/dist/ism/metadata/arbL2ToL1.d.ts.map +1 -1
- package/dist/ism/metadata/arbL2ToL1.hardhat-test.js +1 -2
- package/dist/ism/metadata/arbL2ToL1.hardhat-test.js.map +1 -1
- package/dist/ism/metadata/builder.d.ts +6 -19
- package/dist/ism/metadata/builder.d.ts.map +1 -1
- package/dist/ism/metadata/builder.hardhat-test.js +2 -1
- package/dist/ism/metadata/builder.hardhat-test.js.map +1 -1
- package/dist/ism/metadata/builder.js +7 -26
- package/dist/ism/metadata/builder.js.map +1 -1
- package/dist/ism/metadata/decode.d.ts +3 -0
- package/dist/ism/metadata/decode.d.ts.map +1 -0
- package/dist/ism/metadata/decode.js +31 -0
- package/dist/ism/metadata/decode.js.map +1 -0
- package/dist/ism/metadata/multisig.d.ts +1 -1
- package/dist/ism/metadata/multisig.d.ts.map +1 -1
- package/dist/ism/metadata/null.d.ts +1 -1
- package/dist/ism/metadata/null.d.ts.map +1 -1
- package/dist/ism/metadata/routing.d.ts +5 -4
- package/dist/ism/metadata/routing.d.ts.map +1 -1
- package/dist/ism/metadata/routing.js +24 -10
- package/dist/ism/metadata/routing.js.map +1 -1
- package/dist/ism/metadata/types.d.ts +20 -0
- package/dist/ism/metadata/types.d.ts.map +1 -0
- package/dist/ism/metadata/types.js +2 -0
- package/dist/ism/metadata/types.js.map +1 -0
- package/dist/ism/multisig.d.ts +1 -0
- package/dist/ism/multisig.d.ts.map +1 -1
- package/dist/ism/multisig.js +9 -12
- package/dist/ism/multisig.js.map +1 -1
- package/dist/ism/types.d.ts +257 -4
- package/dist/ism/types.d.ts.map +1 -1
- package/dist/ism/types.js +84 -1
- package/dist/ism/types.js.map +1 -1
- package/dist/ism/types.test.d.ts +2 -0
- package/dist/ism/types.test.d.ts.map +1 -0
- package/dist/ism/{schemas.test.js → types.test.js} +2 -3
- package/dist/ism/types.test.js.map +1 -0
- package/dist/ism/utils.d.ts +2 -2
- package/dist/ism/utils.d.ts.map +1 -1
- package/dist/ism/utils.js +15 -6
- package/dist/ism/utils.js.map +1 -1
- package/dist/metadata/agentConfig.d.ts +5 -5
- package/dist/middleware/liquidity-layer/LiquidityLayerApp.d.ts.map +1 -1
- package/dist/middleware/liquidity-layer/LiquidityLayerApp.js +14 -13
- package/dist/middleware/liquidity-layer/LiquidityLayerApp.js.map +1 -1
- package/dist/providers/SmartProvider/SmartProvider.d.ts +1 -1
- package/dist/providers/SmartProvider/SmartProvider.d.ts.map +1 -1
- package/dist/providers/SmartProvider/SmartProvider.js +1 -1
- package/dist/providers/SmartProvider/SmartProvider.js.map +1 -1
- package/dist/providers/transactions/submitter/builder/TxSubmitterBuilder.d.ts +1 -2
- package/dist/providers/transactions/submitter/builder/TxSubmitterBuilder.d.ts.map +1 -1
- package/dist/providers/transactions/submitter/builder/TxSubmitterBuilder.js.map +1 -1
- package/dist/router/HyperlaneRouterChecker.d.ts.map +1 -1
- package/dist/router/HyperlaneRouterChecker.js +3 -2
- package/dist/router/HyperlaneRouterChecker.js.map +1 -1
- package/dist/router/HyperlaneRouterDeployer.d.ts.map +1 -1
- package/dist/router/HyperlaneRouterDeployer.js +3 -3
- package/dist/router/HyperlaneRouterDeployer.js.map +1 -1
- package/dist/router/types.d.ts +1220 -1
- package/dist/router/types.d.ts.map +1 -1
- package/dist/router/types.js +29 -0
- package/dist/router/types.js.map +1 -1
- package/dist/schemas.d.ts +10 -0
- package/dist/schemas.d.ts.map +1 -1
- package/dist/schemas.js +3 -0
- package/dist/schemas.js.map +1 -1
- package/dist/token/EvmERC20WarpModule.d.ts +28 -7
- package/dist/token/EvmERC20WarpModule.d.ts.map +1 -1
- package/dist/token/EvmERC20WarpModule.hardhat-test.js +158 -39
- package/dist/token/EvmERC20WarpModule.hardhat-test.js.map +1 -1
- package/dist/token/EvmERC20WarpModule.js +147 -39
- package/dist/token/EvmERC20WarpModule.js.map +1 -1
- package/dist/token/EvmERC20WarpRouteReader.d.ts.map +1 -1
- package/dist/token/EvmERC20WarpRouteReader.hardhat-test.js +1 -1
- package/dist/token/EvmERC20WarpRouteReader.hardhat-test.js.map +1 -1
- package/dist/token/EvmERC20WarpRouteReader.js +8 -3
- package/dist/token/EvmERC20WarpRouteReader.js.map +1 -1
- package/dist/token/IToken.d.ts +2 -2
- package/dist/token/adapters/CosmWasmTokenAdapter.d.ts +2 -0
- package/dist/token/adapters/CosmWasmTokenAdapter.d.ts.map +1 -1
- package/dist/token/adapters/CosmWasmTokenAdapter.js +6 -0
- package/dist/token/adapters/CosmWasmTokenAdapter.js.map +1 -1
- package/dist/token/adapters/CosmWasmTokenAdapter.test.d.ts.map +1 -1
- package/dist/token/adapters/CosmWasmTokenAdapter.test.js +19 -8
- package/dist/token/adapters/CosmWasmTokenAdapter.test.js.map +1 -1
- package/dist/token/adapters/CosmosTokenAdapter.d.ts +1 -0
- package/dist/token/adapters/CosmosTokenAdapter.d.ts.map +1 -1
- package/dist/token/adapters/CosmosTokenAdapter.js +3 -0
- package/dist/token/adapters/CosmosTokenAdapter.js.map +1 -1
- package/dist/token/adapters/EvmTokenAdapter.d.ts +1 -0
- package/dist/token/adapters/EvmTokenAdapter.d.ts.map +1 -1
- package/dist/token/adapters/EvmTokenAdapter.js +3 -0
- package/dist/token/adapters/EvmTokenAdapter.js.map +1 -1
- package/dist/token/adapters/ITokenAdapter.d.ts +2 -1
- package/dist/token/adapters/ITokenAdapter.d.ts.map +1 -1
- package/dist/token/adapters/SealevelTokenAdapter.d.ts +10 -7
- package/dist/token/adapters/SealevelTokenAdapter.d.ts.map +1 -1
- package/dist/token/adapters/SealevelTokenAdapter.js +78 -47
- package/dist/token/adapters/SealevelTokenAdapter.js.map +1 -1
- package/dist/token/checker.d.ts +6 -0
- package/dist/token/checker.d.ts.map +1 -1
- package/dist/token/checker.js +72 -11
- package/dist/token/checker.js.map +1 -1
- package/dist/token/deploy.d.ts.map +1 -1
- package/dist/token/deploy.js +0 -1
- package/dist/token/deploy.js.map +1 -1
- package/dist/token/schemas.d.ts +196 -290
- package/dist/token/schemas.d.ts.map +1 -1
- package/dist/token/schemas.js +1 -1
- package/dist/token/schemas.js.map +1 -1
- package/dist/utils/gnosisSafe.js +1 -1
- package/dist/utils/ism.js +1 -1
- package/dist/utils/ism.js.map +1 -1
- package/dist/utils/logUtils.js +1 -1
- package/dist/utils/logUtils.js.map +1 -1
- package/dist/utils/sealevelSerialization.d.ts +10 -0
- package/dist/utils/sealevelSerialization.d.ts.map +1 -1
- package/dist/utils/sealevelSerialization.js +21 -1
- package/dist/utils/sealevelSerialization.js.map +1 -1
- package/dist/utils/validator.d.ts +4 -0
- package/dist/utils/validator.d.ts.map +1 -0
- package/dist/utils/validator.js +14 -0
- package/dist/utils/validator.js.map +1 -0
- package/dist/warp/WarpCore.d.ts +5 -3
- package/dist/warp/WarpCore.d.ts.map +1 -1
- package/dist/warp/WarpCore.js +24 -5
- package/dist/warp/WarpCore.js.map +1 -1
- package/dist/warp/WarpCore.test.js +9 -0
- package/dist/warp/WarpCore.test.js.map +1 -1
- package/dist/warp/types.d.ts +4 -4
- package/package.json +16 -9
- package/dist/hook/schemas.d.ts +0 -247
- package/dist/hook/schemas.d.ts.map +0 -1
- package/dist/hook/schemas.js +0 -67
- package/dist/hook/schemas.js.map +0 -1
- package/dist/ism/schemas.d.ts +0 -246
- package/dist/ism/schemas.d.ts.map +0 -1
- package/dist/ism/schemas.js +0 -78
- package/dist/ism/schemas.js.map +0 -1
- package/dist/ism/schemas.test.d.ts +0 -2
- package/dist/ism/schemas.test.d.ts.map +0 -1
- package/dist/ism/schemas.test.js.map +0 -1
- package/dist/router/schemas.d.ts +0 -1317
- package/dist/router/schemas.d.ts.map +0 -1
- package/dist/router/schemas.js +0 -30
- package/dist/router/schemas.js.map +0 -1
|
@@ -1,19 +1,27 @@
|
|
|
1
|
-
import { ProtocolType } from '@hyperlane-xyz/utils';
|
|
1
|
+
import { Domain, EvmChainId, ProtocolType } from '@hyperlane-xyz/utils';
|
|
2
2
|
import { HyperlaneAddresses } from '../contracts/types.js';
|
|
3
3
|
import { ContractVerifier } from '../deploy/verify/ContractVerifier.js';
|
|
4
|
+
import { EvmIcaRouterReader } from '../ica/EvmIcaReader.js';
|
|
5
|
+
import { DerivedIcaRouterConfig } from '../ica/types.js';
|
|
4
6
|
import { InterchainAccountFactories } from '../middleware/account/contracts.js';
|
|
5
7
|
import { MultiProvider } from '../providers/MultiProvider.js';
|
|
6
8
|
import { AnnotatedEV5Transaction } from '../providers/ProviderType.js';
|
|
7
9
|
import { ProxiedRouterConfig } from '../router/types.js';
|
|
8
10
|
import { ChainNameOrId } from '../types.js';
|
|
9
11
|
import { HyperlaneModule, HyperlaneModuleParams } from './AbstractHyperlaneModule.js';
|
|
10
|
-
export type InterchainAccountConfig = ProxiedRouterConfig
|
|
12
|
+
export type InterchainAccountConfig = ProxiedRouterConfig & Partial<Pick<DerivedIcaRouterConfig, 'remoteIcaRouters'>>;
|
|
11
13
|
export declare class EvmIcaModule extends HyperlaneModule<ProtocolType.Ethereum, InterchainAccountConfig, HyperlaneAddresses<InterchainAccountFactories>> {
|
|
12
14
|
protected readonly multiProvider: MultiProvider;
|
|
13
15
|
protected logger: import("pino").default.Logger<never>;
|
|
14
|
-
protected
|
|
15
|
-
|
|
16
|
-
|
|
16
|
+
protected icaRouterReader: EvmIcaRouterReader;
|
|
17
|
+
readonly domainId: Domain;
|
|
18
|
+
readonly chainId: EvmChainId;
|
|
19
|
+
constructor(multiProvider: MultiProvider, args: HyperlaneModuleParams<InterchainAccountConfig, HyperlaneAddresses<InterchainAccountFactories>>);
|
|
20
|
+
read(): Promise<DerivedIcaRouterConfig>;
|
|
21
|
+
update(expectedConfig: InterchainAccountConfig): Promise<AnnotatedEV5Transaction[]>;
|
|
22
|
+
private updateRemoteRoutersEnrollment;
|
|
23
|
+
private getEnrollRemoteIcaRoutersTxs;
|
|
24
|
+
private getUnenrollRemoteIcaRoutersTxs;
|
|
17
25
|
/**
|
|
18
26
|
* Creates a new EvmIcaModule instance by deploying an ICA with an ICA ISM.
|
|
19
27
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EvmIcaModule.d.ts","sourceRoot":"","sources":["../../src/core/EvmIcaModule.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"EvmIcaModule.d.ts","sourceRoot":"","sources":["../../src/core/EvmIcaModule.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,MAAM,EACN,UAAU,EACV,YAAY,EAKb,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAEzD,OAAO,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAChF,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EACL,eAAe,EACf,qBAAqB,EACtB,MAAM,8BAA8B,CAAC;AAEtC,MAAM,MAAM,uBAAuB,GAAG,mBAAmB,GACvD,OAAO,CAAC,IAAI,CAAC,sBAAsB,EAAE,kBAAkB,CAAC,CAAC,CAAC;AAE5D,qBAAa,YAAa,SAAQ,eAAe,CAC/C,YAAY,CAAC,QAAQ,EACrB,uBAAuB,EACvB,kBAAkB,CAAC,0BAA0B,CAAC,CAC/C;IAOG,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa;IANjD,SAAS,CAAC,MAAM,uCAAgD;IAChE,SAAS,CAAC,eAAe,EAAE,kBAAkB,CAAC;IAC9C,SAAgB,QAAQ,EAAE,MAAM,CAAC;IACjC,SAAgB,OAAO,EAAE,UAAU,CAAC;gBAGf,aAAa,EAAE,aAAa,EAC/C,IAAI,EAAE,qBAAqB,CACzB,uBAAuB,EACvB,kBAAkB,CAAC,0BAA0B,CAAC,CAC/C;IAUU,IAAI,IAAI,OAAO,CAAC,sBAAsB,CAAC;IAMvC,MAAM,CACjB,cAAc,EAAE,uBAAuB,GACtC,OAAO,CAAC,uBAAuB,EAAE,CAAC;YAmBvB,6BAA6B;YAkB7B,4BAA4B;YA6D5B,8BAA8B;IA4C5C;;;;;;;OAOG;WACiB,MAAM,CAAC,EACzB,KAAK,EACL,MAAM,EACN,aAAa,EACb,gBAAgB,GACjB,EAAE;QACD,KAAK,EAAE,aAAa,CAAC;QACrB,MAAM,EAAE,uBAAuB,CAAC;QAChC,aAAa,EAAE,aAAa,CAAC;QAC7B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;KACrC,GAAG,OAAO,CAAC,YAAY,CAAC;CAgB1B"}
|
|
@@ -1,19 +1,96 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ethers } from 'ethers';
|
|
2
|
+
import { InterchainAccountRouter__factory } from '@hyperlane-xyz/core';
|
|
3
|
+
import { addressToBytes32, bytes32ToAddress, difference, rootLogger, } from '@hyperlane-xyz/utils';
|
|
2
4
|
import { serializeContracts } from '../contracts/contracts.js';
|
|
5
|
+
import { proxyAdminUpdateTxs } from '../deploy/proxy.js';
|
|
6
|
+
import { EvmIcaRouterReader } from '../ica/EvmIcaReader.js';
|
|
3
7
|
import { InterchainAccountDeployer } from '../middleware/account/InterchainAccountDeployer.js';
|
|
4
8
|
import { HyperlaneModule, } from './AbstractHyperlaneModule.js';
|
|
5
9
|
export class EvmIcaModule extends HyperlaneModule {
|
|
6
10
|
multiProvider;
|
|
7
11
|
logger = rootLogger.child({ module: 'EvmIcaModule' });
|
|
12
|
+
icaRouterReader;
|
|
13
|
+
domainId;
|
|
14
|
+
chainId;
|
|
8
15
|
constructor(multiProvider, args) {
|
|
9
16
|
super(args);
|
|
10
17
|
this.multiProvider = multiProvider;
|
|
18
|
+
this.icaRouterReader = new EvmIcaRouterReader(multiProvider.getProvider(this.args.chain));
|
|
19
|
+
this.domainId = multiProvider.getDomainId(args.chain);
|
|
20
|
+
this.chainId = multiProvider.getEvmChainId(args.chain);
|
|
11
21
|
}
|
|
12
22
|
async read() {
|
|
13
|
-
|
|
23
|
+
return this.icaRouterReader.deriveConfig(this.args.addresses.interchainAccountRouter);
|
|
14
24
|
}
|
|
15
|
-
async update(
|
|
16
|
-
|
|
25
|
+
async update(expectedConfig) {
|
|
26
|
+
const actualConfig = await this.read();
|
|
27
|
+
const transactions = [
|
|
28
|
+
...(await this.updateRemoteRoutersEnrollment(actualConfig.remoteIcaRouters, expectedConfig.remoteIcaRouters)),
|
|
29
|
+
...proxyAdminUpdateTxs(this.chainId, this.args.addresses.interchainAccountIsm, actualConfig, expectedConfig),
|
|
30
|
+
];
|
|
31
|
+
return transactions;
|
|
32
|
+
}
|
|
33
|
+
async updateRemoteRoutersEnrollment(actualConfig, expectedConfig = {}) {
|
|
34
|
+
const transactions = [
|
|
35
|
+
...(await this.getEnrollRemoteIcaRoutersTxs(actualConfig, expectedConfig)),
|
|
36
|
+
...(await this.getUnenrollRemoteIcaRoutersTxs(actualConfig, expectedConfig)),
|
|
37
|
+
];
|
|
38
|
+
return transactions;
|
|
39
|
+
}
|
|
40
|
+
async getEnrollRemoteIcaRoutersTxs(actualConfig, expectedConfig = {}) {
|
|
41
|
+
const transactions = [];
|
|
42
|
+
const routesToEnroll = Array.from(difference(new Set(Object.keys(expectedConfig)), new Set(Object.keys(actualConfig))));
|
|
43
|
+
if (routesToEnroll.length === 0) {
|
|
44
|
+
return transactions;
|
|
45
|
+
}
|
|
46
|
+
const domainsToEnroll = [];
|
|
47
|
+
const remoteDomainIca = [];
|
|
48
|
+
const remoteIsm = [];
|
|
49
|
+
for (const domainId of routesToEnroll) {
|
|
50
|
+
domainsToEnroll.push(domainId);
|
|
51
|
+
remoteDomainIca.push(addressToBytes32(expectedConfig[domainId].address));
|
|
52
|
+
remoteIsm.push(expectedConfig[domainId].interchainSecurityModule
|
|
53
|
+
? addressToBytes32(expectedConfig[domainId].interchainSecurityModule)
|
|
54
|
+
: ethers.utils.hexZeroPad('0x', 32));
|
|
55
|
+
}
|
|
56
|
+
const remoteTransactions = domainsToEnroll.map((domainId) => ({
|
|
57
|
+
annotation: `Enrolling InterchainAccountRouter on domain ${this.domainId} on InterchainAccountRouter at ${expectedConfig[domainId].address} on domain ${domainId}`,
|
|
58
|
+
chainId: this.multiProvider.getEvmChainId(domainId),
|
|
59
|
+
to: expectedConfig[domainId].address,
|
|
60
|
+
data: InterchainAccountRouter__factory.createInterface().encodeFunctionData('enrollRemoteRouter(uint32,bytes32)', [
|
|
61
|
+
this.domainId,
|
|
62
|
+
addressToBytes32(this.args.addresses.interchainAccountRouter),
|
|
63
|
+
]),
|
|
64
|
+
}));
|
|
65
|
+
transactions.push({
|
|
66
|
+
annotation: `Enrolling remote InterchainAccountRouters on domain ${this.domainId}`,
|
|
67
|
+
chainId: this.chainId,
|
|
68
|
+
to: this.args.addresses.interchainAccountRouter,
|
|
69
|
+
data: InterchainAccountRouter__factory.createInterface().encodeFunctionData('enrollRemoteRouterAndIsms(uint32[],bytes32[],bytes32[])', [domainsToEnroll, remoteDomainIca, remoteIsm]),
|
|
70
|
+
});
|
|
71
|
+
transactions.push(...remoteTransactions);
|
|
72
|
+
return transactions;
|
|
73
|
+
}
|
|
74
|
+
async getUnenrollRemoteIcaRoutersTxs(actualConfig, expectedConfig = {}) {
|
|
75
|
+
const transactions = [];
|
|
76
|
+
const routesToUnenroll = Array.from(difference(new Set(Object.keys(actualConfig)), new Set(Object.keys(expectedConfig))));
|
|
77
|
+
if (routesToUnenroll.length === 0) {
|
|
78
|
+
return transactions;
|
|
79
|
+
}
|
|
80
|
+
transactions.push({
|
|
81
|
+
annotation: `Unenrolling remote InterchainAccountRouters from chain ${this.domainId}`,
|
|
82
|
+
chainId: this.chainId,
|
|
83
|
+
to: this.args.addresses.interchainAccountRouter,
|
|
84
|
+
data: InterchainAccountRouter__factory.createInterface().encodeFunctionData('unenrollRemoteRouters(uint32[])', [routesToUnenroll]),
|
|
85
|
+
});
|
|
86
|
+
const remoteTransactions = routesToUnenroll.map((domainId) => ({
|
|
87
|
+
annotation: `Removing InterchainAccountRouter on domain ${this.domainId} from InterchainAccountRouter at ${actualConfig[domainId].address} on domain ${domainId}`,
|
|
88
|
+
chainId: this.multiProvider.getEvmChainId(domainId),
|
|
89
|
+
to: bytes32ToAddress(actualConfig[domainId].address),
|
|
90
|
+
data: InterchainAccountRouter__factory.createInterface().encodeFunctionData('unenrollRemoteRouter(uint32)', [this.domainId]),
|
|
91
|
+
}));
|
|
92
|
+
transactions.push(...remoteTransactions);
|
|
93
|
+
return transactions;
|
|
17
94
|
}
|
|
18
95
|
/**
|
|
19
96
|
* Creates a new EvmIcaModule instance by deploying an ICA with an ICA ISM.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EvmIcaModule.js","sourceRoot":"","sources":["../../src/core/EvmIcaModule.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"EvmIcaModule.js","sourceRoot":"","sources":["../../src/core/EvmIcaModule.ts"],"names":[],"mappings":"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"}
|
|
@@ -298,25 +298,7 @@ export declare const RelayerCacheSchema: z.ZodObject<{
|
|
|
298
298
|
} | import("@hyperlane-xyz/sdk").DomainRoutingHookConfig | import("@hyperlane-xyz/sdk").FallbackRoutingHookConfig | import("@hyperlane-xyz/sdk").AggregationHookConfig) & {
|
|
299
299
|
address: string;
|
|
300
300
|
}>>;
|
|
301
|
-
ism: Record<string, Record<string, (string | {
|
|
302
|
-
type: import("@hyperlane-xyz/sdk").IsmType.TEST_ISM;
|
|
303
|
-
} | {
|
|
304
|
-
type: import("@hyperlane-xyz/sdk").IsmType.TRUSTED_RELAYER;
|
|
305
|
-
relayer: string;
|
|
306
|
-
} | {
|
|
307
|
-
type: import("@hyperlane-xyz/sdk").IsmType.OP_STACK;
|
|
308
|
-
origin: string;
|
|
309
|
-
nativeBridge: string;
|
|
310
|
-
} | {
|
|
311
|
-
type: import("@hyperlane-xyz/sdk").IsmType.ARB_L2_TO_L1;
|
|
312
|
-
bridge: string;
|
|
313
|
-
} | import("@hyperlane-xyz/sdk").RoutingIsmConfig | ({
|
|
314
|
-
owner: string;
|
|
315
|
-
paused: boolean;
|
|
316
|
-
ownerOverrides?: Record<string, string> | undefined;
|
|
317
|
-
} & {
|
|
318
|
-
type: import("@hyperlane-xyz/sdk").IsmType.PAUSABLE;
|
|
319
|
-
}) | ({
|
|
301
|
+
ism: Record<string, Record<string, (string | ({
|
|
320
302
|
validators: string[];
|
|
321
303
|
threshold: number;
|
|
322
304
|
} & {
|
|
@@ -329,7 +311,25 @@ export declare const RelayerCacheSchema: z.ZodObject<{
|
|
|
329
311
|
thresholdWeight: number;
|
|
330
312
|
} & {
|
|
331
313
|
type: import("@hyperlane-xyz/sdk").IsmType.WEIGHTED_MERKLE_ROOT_MULTISIG | import("@hyperlane-xyz/sdk").IsmType.WEIGHTED_MESSAGE_ID_MULTISIG;
|
|
332
|
-
}) |
|
|
314
|
+
}) | {
|
|
315
|
+
type: import("@hyperlane-xyz/sdk").IsmType.TEST_ISM;
|
|
316
|
+
} | ({
|
|
317
|
+
owner: string;
|
|
318
|
+
paused: boolean;
|
|
319
|
+
ownerOverrides?: Record<string, string> | undefined;
|
|
320
|
+
} & {
|
|
321
|
+
type: import("@hyperlane-xyz/sdk").IsmType.PAUSABLE;
|
|
322
|
+
}) | {
|
|
323
|
+
type: import("@hyperlane-xyz/sdk").IsmType.OP_STACK;
|
|
324
|
+
origin: string;
|
|
325
|
+
nativeBridge: string;
|
|
326
|
+
} | {
|
|
327
|
+
type: import("@hyperlane-xyz/sdk").IsmType.TRUSTED_RELAYER;
|
|
328
|
+
relayer: string;
|
|
329
|
+
} | {
|
|
330
|
+
type: import("@hyperlane-xyz/sdk").IsmType.ARB_L2_TO_L1;
|
|
331
|
+
bridge: string;
|
|
332
|
+
} | import("@hyperlane-xyz/sdk").RoutingIsmConfig | import("@hyperlane-xyz/sdk").AggregationIsmConfig) & {
|
|
333
333
|
address: string;
|
|
334
334
|
}>>;
|
|
335
335
|
backlog: {
|
|
@@ -379,25 +379,7 @@ export declare const RelayerCacheSchema: z.ZodObject<{
|
|
|
379
379
|
} | import("@hyperlane-xyz/sdk").DomainRoutingHookConfig | import("@hyperlane-xyz/sdk").FallbackRoutingHookConfig | import("@hyperlane-xyz/sdk").AggregationHookConfig) & {
|
|
380
380
|
address: string;
|
|
381
381
|
}>>;
|
|
382
|
-
ism: Record<string, Record<string, (string | {
|
|
383
|
-
type: import("@hyperlane-xyz/sdk").IsmType.TEST_ISM;
|
|
384
|
-
} | {
|
|
385
|
-
type: import("@hyperlane-xyz/sdk").IsmType.TRUSTED_RELAYER;
|
|
386
|
-
relayer: string;
|
|
387
|
-
} | {
|
|
388
|
-
type: import("@hyperlane-xyz/sdk").IsmType.OP_STACK;
|
|
389
|
-
origin: string;
|
|
390
|
-
nativeBridge: string;
|
|
391
|
-
} | {
|
|
392
|
-
type: import("@hyperlane-xyz/sdk").IsmType.ARB_L2_TO_L1;
|
|
393
|
-
bridge: string;
|
|
394
|
-
} | import("@hyperlane-xyz/sdk").RoutingIsmConfig | ({
|
|
395
|
-
owner: string;
|
|
396
|
-
paused: boolean;
|
|
397
|
-
ownerOverrides?: Record<string, string> | undefined;
|
|
398
|
-
} & {
|
|
399
|
-
type: import("@hyperlane-xyz/sdk").IsmType.PAUSABLE;
|
|
400
|
-
}) | ({
|
|
382
|
+
ism: Record<string, Record<string, (string | ({
|
|
401
383
|
validators: string[];
|
|
402
384
|
threshold: number;
|
|
403
385
|
} & {
|
|
@@ -410,7 +392,25 @@ export declare const RelayerCacheSchema: z.ZodObject<{
|
|
|
410
392
|
thresholdWeight: number;
|
|
411
393
|
} & {
|
|
412
394
|
type: import("@hyperlane-xyz/sdk").IsmType.WEIGHTED_MERKLE_ROOT_MULTISIG | import("@hyperlane-xyz/sdk").IsmType.WEIGHTED_MESSAGE_ID_MULTISIG;
|
|
413
|
-
}) |
|
|
395
|
+
}) | {
|
|
396
|
+
type: import("@hyperlane-xyz/sdk").IsmType.TEST_ISM;
|
|
397
|
+
} | ({
|
|
398
|
+
owner: string;
|
|
399
|
+
paused: boolean;
|
|
400
|
+
ownerOverrides?: Record<string, string> | undefined;
|
|
401
|
+
} & {
|
|
402
|
+
type: import("@hyperlane-xyz/sdk").IsmType.PAUSABLE;
|
|
403
|
+
}) | {
|
|
404
|
+
type: import("@hyperlane-xyz/sdk").IsmType.OP_STACK;
|
|
405
|
+
origin: string;
|
|
406
|
+
nativeBridge: string;
|
|
407
|
+
} | {
|
|
408
|
+
type: import("@hyperlane-xyz/sdk").IsmType.TRUSTED_RELAYER;
|
|
409
|
+
relayer: string;
|
|
410
|
+
} | {
|
|
411
|
+
type: import("@hyperlane-xyz/sdk").IsmType.ARB_L2_TO_L1;
|
|
412
|
+
bridge: string;
|
|
413
|
+
} | import("@hyperlane-xyz/sdk").RoutingIsmConfig | import("@hyperlane-xyz/sdk").AggregationIsmConfig) & {
|
|
414
414
|
address: string;
|
|
415
415
|
}>>;
|
|
416
416
|
backlog: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HyperlaneRelayer.d.ts","sourceRoot":"","sources":["../../src/core/HyperlaneRelayer.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"HyperlaneRelayer.d.ts","sourceRoot":"","sources":["../../src/core/HyperlaneRelayer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC9B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EACL,OAAO,EACP,aAAa,EASd,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,iBAAiB,EAAiB,MAAM,0BAA0B,CAAC;AAE5E,OAAO,EAAE,gBAAgB,EAAgB,MAAM,wBAAwB,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAEjE,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAoB/C,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAI7B,CAAC;AAEH,KAAK,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAEvD,KAAK,gBAAgB,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;AAI/C,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,gBAAgB,EAC3B,OAAO,EAAE,aAAa,GACrB,OAAO,CAuBT;AAED,qBAAa,gBAAgB;IAC3B,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC;IACvC,SAAS,CAAC,eAAe,EAAE,mBAAmB,CAAC;IAC/C,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;IACvC,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAExC,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAE1D,OAAO,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC;IACjC,KAAK,EAAE,YAAY,GAAG,SAAS,CAAC;IAEvC,SAAS,CAAC,mBAAmB,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IAE5E,SAAgB,MAAM,EAAE,MAAM,CAAC;gBAEnB,EACV,IAAI,EACJ,OAAc,EACd,YAAmB,EACnB,SAAqB,GACtB,EAAE;QACD,IAAI,EAAE,aAAa,CAAC;QACpB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,SAAS,CAAC,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;KACjC;IAuBK,aAAa,CACjB,KAAK,EAAE,SAAS,EAChB,IAAI,EAAE,OAAO,EACb,cAAc,CAAC,EAAE,iBAAiB,GACjC,OAAO,CAAC,iBAAiB,CAAC;IAyBvB,YAAY,CAChB,KAAK,EAAE,SAAS,EAChB,GAAG,EAAE,OAAO,EACZ,cAAc,CAAC,EAAE,iBAAiB,GACjC,OAAO,CAAC,gBAAgB,CAAC;IA0BtB,mBAAmB,CACvB,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,iBAAiB,CAAC;IAMvB,qBAAqB,CACzB,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,gBAAgB,CAAC;IAMtB,YAAY,CAChB,UAAU,EAAE,SAAS,CAAC,kBAAkB,EACxC,YAAY,SAAI,EAChB,OAAO,oBAAgE,GACtE,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC;IA2ClC,OAAO,CAAC,KAAK,EAAE,YAAY,GAAG,IAAI;IAM5B,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;cAetB,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IA4C7C,SAAS,CAAC,eAAe,IAAI,MAAM,EAAE,GAAG,SAAS;IAIjD,KAAK,IAAI,IAAI;IA+Bb,IAAI,IAAI,IAAI;CASb"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
2
|
import { assert, bytes32ToAddress, messageId, objMap, objMerge, parseMessage, promiseObjAll, sleep, } from '@hyperlane-xyz/utils';
|
|
3
3
|
import { EvmHookReader } from '../hook/EvmHookReader.js';
|
|
4
|
-
import { HookConfigSchema } from '../hook/
|
|
4
|
+
import { HookConfigSchema } from '../hook/types.js';
|
|
5
5
|
import { EvmIsmReader } from '../ism/EvmIsmReader.js';
|
|
6
6
|
import { BaseMetadataBuilder } from '../ism/metadata/builder.js';
|
|
7
|
-
import { IsmConfigSchema } from '../ism/
|
|
7
|
+
import { IsmConfigSchema } from '../ism/types.js';
|
|
8
8
|
import { HyperlaneCore } from './HyperlaneCore.js';
|
|
9
9
|
const WithAddressSchema = z.object({
|
|
10
10
|
address: z.string(),
|
|
@@ -190,7 +190,7 @@ export class HyperlaneRelayer {
|
|
|
190
190
|
// TODO: handle batching
|
|
191
191
|
await this.relayMessage(dispatchReceipt, undefined, dispatchMsg);
|
|
192
192
|
}
|
|
193
|
-
catch
|
|
193
|
+
catch {
|
|
194
194
|
this.logger.error(`Failed to relay message ${id} (attempt #${attempts + 1})`);
|
|
195
195
|
this.backlog.push({
|
|
196
196
|
...backlogMsg,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HyperlaneRelayer.js","sourceRoot":"","sources":["../../src/core/HyperlaneRelayer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAGL,MAAM,EACN,gBAAgB,EAChB,SAAS,EACT,MAAM,EACN,QAAQ,EACR,YAAY,EACZ,aAAa,EACb,KAAK,GACN,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAqB,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"HyperlaneRelayer.js","sourceRoot":"","sources":["../../src/core/HyperlaneRelayer.ts"],"names":[],"mappings":"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"}
|