@hyperlane-xyz/sdk 4.0.0-beta → 4.0.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/s3.js +1 -1
- package/dist/aws/s3.js.map +1 -1
- package/dist/aws/validator.d.ts +3 -1
- package/dist/aws/validator.d.ts.map +1 -1
- package/dist/aws/validator.js +8 -1
- package/dist/aws/validator.js.map +1 -1
- package/dist/consts/multisigIsm.d.ts.map +1 -1
- package/dist/consts/multisigIsm.js +30 -0
- package/dist/consts/multisigIsm.js.map +1 -1
- package/dist/consts/testChains.d.ts.map +1 -1
- package/dist/consts/testChains.js +0 -5
- package/dist/consts/testChains.js.map +1 -1
- package/dist/core/HyperlaneCore.d.ts.map +1 -1
- package/dist/core/HyperlaneCore.js +4 -2
- package/dist/core/HyperlaneCore.js.map +1 -1
- package/dist/core/HyperlaneCoreChecker.js +1 -1
- package/dist/core/HyperlaneCoreChecker.js.map +1 -1
- package/dist/deploy/EvmModuleDeployer.d.ts +76 -0
- package/dist/deploy/EvmModuleDeployer.d.ts.map +1 -0
- package/dist/deploy/EvmModuleDeployer.js +150 -0
- package/dist/deploy/EvmModuleDeployer.js.map +1 -0
- package/dist/deploy/HyperlaneDeployer.d.ts.map +1 -1
- package/dist/deploy/HyperlaneDeployer.js +4 -3
- package/dist/deploy/HyperlaneDeployer.js.map +1 -1
- package/dist/deploy/verify/utils.d.ts +9 -0
- package/dist/deploy/verify/utils.d.ts.map +1 -1
- package/dist/deploy/verify/utils.js +14 -0
- package/dist/deploy/verify/utils.js.map +1 -1
- package/dist/deploy/verify/utils.test.d.ts +2 -0
- package/dist/deploy/verify/utils.test.d.ts.map +1 -0
- package/dist/deploy/verify/utils.test.js +49 -0
- package/dist/deploy/verify/utils.test.js.map +1 -0
- package/dist/gas/HyperlaneIgpDeployer.d.ts +1 -1
- package/dist/gas/HyperlaneIgpDeployer.d.ts.map +1 -1
- package/dist/gas/HyperlaneIgpDeployer.js +2 -1
- package/dist/gas/HyperlaneIgpDeployer.js.map +1 -1
- package/dist/hook/EvmHookModule.d.ts +67 -12
- package/dist/hook/EvmHookModule.d.ts.map +1 -1
- package/dist/hook/EvmHookModule.hardhat-test.d.ts +2 -0
- package/dist/hook/EvmHookModule.hardhat-test.d.ts.map +1 -0
- package/dist/hook/EvmHookModule.hardhat-test.js +380 -0
- package/dist/hook/EvmHookModule.hardhat-test.js.map +1 -0
- package/dist/hook/EvmHookModule.js +354 -9
- package/dist/hook/EvmHookModule.js.map +1 -1
- package/dist/hook/EvmHookReader.d.ts +8 -2
- package/dist/hook/EvmHookReader.d.ts.map +1 -1
- package/dist/hook/EvmHookReader.js +58 -27
- package/dist/hook/EvmHookReader.js.map +1 -1
- package/dist/hook/EvmHookReader.test.js +18 -0
- package/dist/hook/EvmHookReader.test.js.map +1 -1
- package/dist/ism/EvmIsmModule.d.ts +7 -15
- package/dist/ism/EvmIsmModule.d.ts.map +1 -1
- package/dist/ism/EvmIsmModule.hardhat-test.js +36 -38
- package/dist/ism/EvmIsmModule.hardhat-test.js.map +1 -1
- package/dist/ism/EvmIsmModule.js +54 -52
- package/dist/ism/EvmIsmModule.js.map +1 -1
- package/dist/ism/HyperlaneIsmFactory.d.ts.map +1 -1
- package/dist/ism/HyperlaneIsmFactory.js +15 -2
- package/dist/ism/HyperlaneIsmFactory.js.map +1 -1
- package/dist/ism/metadata/multisig.d.ts.map +1 -1
- package/dist/ism/metadata/multisig.js.map +1 -1
- package/dist/ism/multisig.js.map +1 -1
- package/dist/metadata/agentConfig.d.ts +3 -0
- package/dist/metadata/agentConfig.d.ts.map +1 -1
- package/dist/metadata/agentConfig.js +12 -0
- package/dist/metadata/agentConfig.js.map +1 -1
- package/dist/providers/SmartProvider/HyperlaneEtherscanProvider.d.ts.map +1 -1
- package/dist/providers/SmartProvider/HyperlaneEtherscanProvider.js +1 -0
- package/dist/providers/SmartProvider/HyperlaneEtherscanProvider.js.map +1 -1
- package/dist/providers/SmartProvider/HyperlaneJsonRpcProvider.d.ts +1 -0
- package/dist/providers/SmartProvider/HyperlaneJsonRpcProvider.d.ts.map +1 -1
- package/dist/providers/SmartProvider/HyperlaneJsonRpcProvider.js +6 -0
- package/dist/providers/SmartProvider/HyperlaneJsonRpcProvider.js.map +1 -1
- package/dist/providers/SmartProvider/ProviderMethods.d.ts +2 -1
- package/dist/providers/SmartProvider/ProviderMethods.d.ts.map +1 -1
- package/dist/providers/SmartProvider/ProviderMethods.js +1 -0
- package/dist/providers/SmartProvider/ProviderMethods.js.map +1 -1
- package/dist/providers/SmartProvider/SmartProvider.d.ts +5 -2
- package/dist/providers/SmartProvider/SmartProvider.d.ts.map +1 -1
- package/dist/providers/SmartProvider/SmartProvider.js +33 -2
- package/dist/providers/SmartProvider/SmartProvider.js.map +1 -1
- package/dist/test/testUtils.d.ts.map +1 -1
- package/dist/test/testUtils.js +20 -12
- package/dist/test/testUtils.js.map +1 -1
- package/dist/token/EvmERC20WarpRouteReader.d.ts +6 -0
- package/dist/token/EvmERC20WarpRouteReader.d.ts.map +1 -1
- package/dist/token/EvmERC20WarpRouteReader.js +21 -3
- package/dist/token/EvmERC20WarpRouteReader.js.map +1 -1
- package/dist/token/Token.d.ts.map +1 -1
- package/dist/token/Token.js +11 -1
- package/dist/token/Token.js.map +1 -1
- package/dist/token/Token.test.js +16 -0
- package/dist/token/Token.test.js.map +1 -1
- package/dist/token/TokenStandard.d.ts +3 -0
- package/dist/token/TokenStandard.d.ts.map +1 -1
- package/dist/token/TokenStandard.js +12 -2
- package/dist/token/TokenStandard.js.map +1 -1
- package/dist/token/adapters/EvmTokenAdapter.d.ts +28 -2
- package/dist/token/adapters/EvmTokenAdapter.d.ts.map +1 -1
- package/dist/token/adapters/EvmTokenAdapter.js +49 -1
- package/dist/token/adapters/EvmTokenAdapter.js.map +1 -1
- package/dist/token/adapters/ITokenAdapter.d.ts +4 -0
- package/dist/token/adapters/ITokenAdapter.d.ts.map +1 -1
- package/dist/token/config.d.ts +1 -1
- package/dist/token/config.d.ts.map +1 -1
- package/dist/token/config.js.map +1 -1
- package/dist/token/deploy.d.ts.map +1 -1
- package/dist/token/deploy.js +15 -8
- package/dist/token/deploy.js.map +1 -1
- package/dist/utils/gnosisSafe.js +11 -1
- package/dist/warp/WarpCore.d.ts +8 -0
- package/dist/warp/WarpCore.d.ts.map +1 -1
- package/dist/warp/WarpCore.js +43 -3
- package/dist/warp/WarpCore.js.map +1 -1
- package/dist/warp/WarpCore.test.js +2 -2
- package/package.json +3 -3
|
@@ -139,6 +139,24 @@ describe('EvmHookReader', () => {
|
|
|
139
139
|
const config = await evmHookReader.deriveOpStackConfig(mockAddress);
|
|
140
140
|
expect(config).to.deep.equal(hookConfig);
|
|
141
141
|
});
|
|
142
|
+
it('should return an empty config if deriving fails', async () => {
|
|
143
|
+
const mockAddress = generateRandomAddress();
|
|
144
|
+
const mockOwner = generateRandomAddress();
|
|
145
|
+
// Mocking the connect method + returned what we need from contract object
|
|
146
|
+
const mockContract = {
|
|
147
|
+
// No type
|
|
148
|
+
owner: sandbox.stub().resolves(mockOwner),
|
|
149
|
+
};
|
|
150
|
+
sandbox
|
|
151
|
+
.stub(MerkleTreeHook__factory, 'connect')
|
|
152
|
+
.returns(mockContract);
|
|
153
|
+
sandbox
|
|
154
|
+
.stub(IPostDispatchHook__factory, 'connect')
|
|
155
|
+
.returns(mockContract);
|
|
156
|
+
// top-level method infers hook type
|
|
157
|
+
const hookConfig = await evmHookReader.deriveHookConfig(mockAddress);
|
|
158
|
+
expect(hookConfig).to.be.undefined;
|
|
159
|
+
});
|
|
142
160
|
/*
|
|
143
161
|
Testing for more nested hook types can be done manually by reading from existing contracts onchain.
|
|
144
162
|
Examples of nested hook types include:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EvmHookReader.test.js","sourceRoot":"","sources":["../../src/hook/EvmHookReader.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"EvmHookReader.test.js","sourceRoot":"","sources":["../../src/hook/EvmHookReader.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import { Logger } from 'pino';
|
|
2
|
-
import { DomainRoutingIsm, IAggregationIsm, IMultisigIsm, IRoutingIsm
|
|
2
|
+
import { DomainRoutingIsm, IAggregationIsm, IMultisigIsm, IRoutingIsm } from '@hyperlane-xyz/core';
|
|
3
3
|
import { Address, ProtocolType } from '@hyperlane-xyz/utils';
|
|
4
4
|
import { Domain } from '@hyperlane-xyz/utils';
|
|
5
5
|
import { HyperlaneAddresses, HyperlaneContracts } from '../contracts/types.js';
|
|
6
6
|
import { HyperlaneModule, HyperlaneModuleParams } from '../core/AbstractHyperlaneModule.js';
|
|
7
|
-
import {
|
|
7
|
+
import { EvmModuleDeployer } from '../deploy/EvmModuleDeployer.js';
|
|
8
8
|
import { ProxyFactoryFactories } from '../deploy/contracts.js';
|
|
9
|
+
import { ContractVerifier } from '../deploy/verify/ContractVerifier.js';
|
|
9
10
|
import { MultiProvider } from '../providers/MultiProvider.js';
|
|
10
11
|
import { AnnotatedEV5Transaction } from '../providers/ProviderType.js';
|
|
11
12
|
import { ChainName, ChainNameOrId } from '../types.js';
|
|
@@ -17,20 +18,19 @@ type IsmModuleAddresses = {
|
|
|
17
18
|
};
|
|
18
19
|
export declare class EvmIsmModule extends HyperlaneModule<ProtocolType.Ethereum, IsmConfig, HyperlaneAddresses<ProxyFactoryFactories> & IsmModuleAddresses> {
|
|
19
20
|
protected readonly multiProvider: MultiProvider;
|
|
20
|
-
protected readonly deployer: HyperlaneDeployer<any, any>;
|
|
21
21
|
protected readonly logger: import("pino").default.Logger<never>;
|
|
22
22
|
protected readonly reader: EvmIsmReader;
|
|
23
|
+
protected readonly deployer: EvmModuleDeployer<any>;
|
|
23
24
|
protected readonly factories: HyperlaneContracts<ProxyFactoryFactories>;
|
|
24
25
|
readonly chain: ChainName;
|
|
25
26
|
readonly domainId: Domain;
|
|
26
|
-
protected constructor(multiProvider: MultiProvider,
|
|
27
|
+
protected constructor(multiProvider: MultiProvider, params: HyperlaneModuleParams<IsmConfig, HyperlaneAddresses<ProxyFactoryFactories> & IsmModuleAddresses>, contractVerifier?: ContractVerifier);
|
|
27
28
|
read(): Promise<IsmConfig>;
|
|
28
29
|
update(targetConfig: IsmConfig): Promise<AnnotatedEV5Transaction[]>;
|
|
29
|
-
static create(
|
|
30
|
+
static create({ chain, config, proxyFactoryFactories, mailbox, multiProvider, }: {
|
|
30
31
|
chain: ChainNameOrId;
|
|
31
32
|
config: IsmConfig;
|
|
32
|
-
|
|
33
|
-
factories: HyperlaneAddresses<ProxyFactoryFactories>;
|
|
33
|
+
proxyFactoryFactories: HyperlaneAddresses<ProxyFactoryFactories>;
|
|
34
34
|
mailbox: Address;
|
|
35
35
|
multiProvider: MultiProvider;
|
|
36
36
|
}): Promise<EvmIsmModule>;
|
|
@@ -60,14 +60,6 @@ export declare class EvmIsmModule extends HyperlaneModule<ProtocolType.Ethereum,
|
|
|
60
60
|
logger: Logger;
|
|
61
61
|
}): Promise<IAggregationIsm>;
|
|
62
62
|
setNewMailbox(newMailboxAddress: Address): void;
|
|
63
|
-
static deployStaticAddressSet({ chain, factory, values, logger, threshold, multiProvider, }: {
|
|
64
|
-
chain: ChainName;
|
|
65
|
-
factory: StaticThresholdAddressSetFactory | StaticAddressSetFactory;
|
|
66
|
-
values: Address[];
|
|
67
|
-
logger: Logger;
|
|
68
|
-
threshold?: number;
|
|
69
|
-
multiProvider: MultiProvider;
|
|
70
|
-
}): Promise<Address>;
|
|
71
63
|
private filterRoutingIsmDomains;
|
|
72
64
|
}
|
|
73
65
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EvmIsmModule.d.ts","sourceRoot":"","sources":["../../src/ism/EvmIsmModule.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE9B,OAAO,EAEL,gBAAgB,EAGhB,eAAe,EAGf,YAAY,EAEZ,WAAW,
|
|
1
|
+
{"version":3,"file":"EvmIsmModule.d.ts","sourceRoot":"","sources":["../../src/ism/EvmIsmModule.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,44 +32,44 @@ function randomModuleType() {
|
|
|
32
32
|
}
|
|
33
33
|
const randomIsmConfig = (depth = 0, maxDepth = 2) => {
|
|
34
34
|
const moduleType = depth == maxDepth ? ModuleType.MERKLE_ROOT_MULTISIG : randomModuleType();
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
35
|
+
switch (moduleType) {
|
|
36
|
+
case ModuleType.MERKLE_ROOT_MULTISIG: {
|
|
37
|
+
const n = randomInt(5, 1);
|
|
38
|
+
return randomMultisigIsmConfig(randomInt(n, 1), n);
|
|
39
|
+
}
|
|
40
|
+
case ModuleType.ROUTING: {
|
|
41
|
+
const config = {
|
|
42
|
+
type: IsmType.ROUTING,
|
|
43
|
+
owner: randomAddress(),
|
|
44
|
+
domains: Object.fromEntries(testChains.map((c) => [c, randomIsmConfig(depth + 1)])),
|
|
45
|
+
};
|
|
46
|
+
return config;
|
|
47
|
+
}
|
|
48
|
+
case ModuleType.AGGREGATION: {
|
|
49
|
+
const n = randomInt(5, 1);
|
|
50
|
+
const modules = new Array(n)
|
|
51
|
+
.fill(0)
|
|
52
|
+
.map(() => randomIsmConfig(depth + 1));
|
|
53
|
+
const config = {
|
|
54
|
+
type: IsmType.AGGREGATION,
|
|
55
|
+
threshold: randomInt(n, 1),
|
|
56
|
+
modules,
|
|
57
|
+
};
|
|
58
|
+
return config;
|
|
59
|
+
}
|
|
60
|
+
case ModuleType.NULL: {
|
|
61
|
+
const config = {
|
|
62
|
+
type: IsmType.TRUSTED_RELAYER,
|
|
63
|
+
relayer: randomAddress(),
|
|
64
|
+
};
|
|
65
|
+
return config;
|
|
66
|
+
}
|
|
67
|
+
default:
|
|
68
|
+
throw new Error(`Unsupported ISM type: ${moduleType}`);
|
|
68
69
|
}
|
|
69
70
|
};
|
|
70
71
|
describe('EvmIsmModule', async () => {
|
|
71
72
|
let multiProvider;
|
|
72
|
-
let ismFactoryDeployer;
|
|
73
73
|
let exampleRoutingConfig;
|
|
74
74
|
let mailboxAddress;
|
|
75
75
|
let newMailboxAddress;
|
|
@@ -81,8 +81,7 @@ describe('EvmIsmModule', async () => {
|
|
|
81
81
|
const [signer, funder] = await hre.ethers.getSigners();
|
|
82
82
|
fundingAccount = funder;
|
|
83
83
|
multiProvider = MultiProvider.createTestMultiProvider({ signer });
|
|
84
|
-
|
|
85
|
-
const contractsMap = await ismFactoryDeployer.deploy(multiProvider.mapKnownChains(() => ({})));
|
|
84
|
+
const contractsMap = await new HyperlaneProxyFactoryDeployer(multiProvider).deploy(multiProvider.mapKnownChains(() => ({})));
|
|
86
85
|
// get addresses of factories for the chain
|
|
87
86
|
factoryContracts = contractsMap[chain];
|
|
88
87
|
factoryAddresses = Object.keys(factoryContracts).reduce((acc, key) => {
|
|
@@ -138,8 +137,7 @@ describe('EvmIsmModule', async () => {
|
|
|
138
137
|
const ism = await EvmIsmModule.create({
|
|
139
138
|
chain,
|
|
140
139
|
config,
|
|
141
|
-
|
|
142
|
-
factories: factoryAddresses,
|
|
140
|
+
proxyFactoryFactories: factoryAddresses,
|
|
143
141
|
mailbox: mailboxAddress,
|
|
144
142
|
multiProvider,
|
|
145
143
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EvmIsmModule.hardhat-test.js","sourceRoot":"","sources":["../../src/ism/EvmIsmModule.hardhat-test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"EvmIsmModule.hardhat-test.js","sourceRoot":"","sources":["../../src/ism/EvmIsmModule.hardhat-test.ts"],"names":[],"mappings":"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"}
|
package/dist/ism/EvmIsmModule.js
CHANGED
|
@@ -3,6 +3,7 @@ import { DefaultFallbackRoutingIsm__factory, DomainRoutingIsmFactory__factory, D
|
|
|
3
3
|
import { assert, configDeepEquals, eqAddress, normalizeConfig, objFilter, rootLogger, } from '@hyperlane-xyz/utils';
|
|
4
4
|
import { attachAndConnectContracts } from '../contracts/contracts.js';
|
|
5
5
|
import { HyperlaneModule, } from '../core/AbstractHyperlaneModule.js';
|
|
6
|
+
import { EvmModuleDeployer } from '../deploy/EvmModuleDeployer.js';
|
|
6
7
|
import { proxyFactoryFactories, } from '../deploy/contracts.js';
|
|
7
8
|
import { findMatchingLogEvents } from '../utils/logUtils.js';
|
|
8
9
|
import { EvmIsmReader } from './EvmIsmReader.js';
|
|
@@ -10,22 +11,27 @@ import { IsmType, MUTABLE_ISM_TYPE, } from './types.js';
|
|
|
10
11
|
import { calculateDomainRoutingDelta } from './utils.js';
|
|
11
12
|
export class EvmIsmModule extends HyperlaneModule {
|
|
12
13
|
multiProvider;
|
|
13
|
-
deployer;
|
|
14
14
|
logger = rootLogger.child({ module: 'EvmIsmModule' });
|
|
15
15
|
reader;
|
|
16
|
+
deployer;
|
|
16
17
|
factories;
|
|
17
18
|
// Adding these to reduce how often we need to grab from MultiProvider.
|
|
18
19
|
chain;
|
|
19
20
|
// We use domainId here because MultiProvider.getDomainId() will always
|
|
20
21
|
// return a number, and EVM the domainId and chainId are the same.
|
|
21
22
|
domainId;
|
|
22
|
-
constructor(multiProvider,
|
|
23
|
+
constructor(multiProvider, params, contractVerifier) {
|
|
23
24
|
super(params);
|
|
24
25
|
this.multiProvider = multiProvider;
|
|
25
|
-
this.deployer = deployer;
|
|
26
26
|
this.reader = new EvmIsmReader(multiProvider, params.chain);
|
|
27
|
-
|
|
28
|
-
this.factories = attachAndConnectContracts(
|
|
27
|
+
this.deployer = new EvmModuleDeployer(this.multiProvider, {}, this.logger, contractVerifier);
|
|
28
|
+
this.factories = attachAndConnectContracts({
|
|
29
|
+
staticMerkleRootMultisigIsmFactory: params.addresses.staticMerkleRootMultisigIsmFactory,
|
|
30
|
+
staticMessageIdMultisigIsmFactory: params.addresses.staticMessageIdMultisigIsmFactory,
|
|
31
|
+
staticAggregationIsmFactory: params.addresses.staticAggregationIsmFactory,
|
|
32
|
+
staticAggregationHookFactory: params.addresses.staticAggregationHookFactory,
|
|
33
|
+
domainRoutingIsmFactory: params.addresses.domainRoutingIsmFactory,
|
|
34
|
+
}, proxyFactoryFactories, multiProvider.getSigner(params.chain));
|
|
29
35
|
this.chain = this.multiProvider.getChainName(this.args.chain);
|
|
30
36
|
this.domainId = this.multiProvider.getDomainId(this.chain);
|
|
31
37
|
}
|
|
@@ -56,9 +62,9 @@ export class EvmIsmModule extends HyperlaneModule {
|
|
|
56
62
|
return [];
|
|
57
63
|
}
|
|
58
64
|
// Else, we have to figure out what an update for this ISM entails
|
|
59
|
-
// If target config is
|
|
60
|
-
// if config ->
|
|
61
|
-
// if
|
|
65
|
+
// If target config is an address ISM, just update the address
|
|
66
|
+
// if config -> address ISM, update address
|
|
67
|
+
// if address ISM -> address ISM, update address
|
|
62
68
|
if (typeof targetConfig === 'string') {
|
|
63
69
|
// TODO: https://github.com/hyperlane-xyz/hyperlane-monorepo/issues/3773
|
|
64
70
|
this.args.addresses.deployedIsm = targetConfig;
|
|
@@ -66,7 +72,7 @@ export class EvmIsmModule extends HyperlaneModule {
|
|
|
66
72
|
}
|
|
67
73
|
// Check if we need to deploy a new ISM
|
|
68
74
|
if (
|
|
69
|
-
// if
|
|
75
|
+
// if address ISM -> config, do a new deploy
|
|
70
76
|
typeof currentConfig === 'string' ||
|
|
71
77
|
// if config -> config, AND types are different, do a new deploy
|
|
72
78
|
currentConfig.type !== targetConfig.type ||
|
|
@@ -92,7 +98,7 @@ export class EvmIsmModule extends HyperlaneModule {
|
|
|
92
98
|
logger.debug(`Updating ${targetConfig.type} on ${this.chain}`);
|
|
93
99
|
// if it's a fallback routing ISM, do a mailbox diff check and deploy a new ISM if needed
|
|
94
100
|
if (targetConfig.type === IsmType.FALLBACK_ROUTING) {
|
|
95
|
-
// can only
|
|
101
|
+
// can only retrieve mailbox address if current ISM type is also Fallback Routing
|
|
96
102
|
const mailboxAddress = currentConfig.type === IsmType.FALLBACK_ROUTING
|
|
97
103
|
? await MailboxClient__factory.connect(this.args.addresses.deployedIsm, provider).mailbox()
|
|
98
104
|
: ''; // empty string to force a mailbox diff
|
|
@@ -130,12 +136,11 @@ export class EvmIsmModule extends HyperlaneModule {
|
|
|
130
136
|
return updateTxs;
|
|
131
137
|
}
|
|
132
138
|
// manually write static create function
|
|
133
|
-
static async create(
|
|
134
|
-
const { chain, config, deployer, factories, mailbox, multiProvider } = params;
|
|
139
|
+
static async create({ chain, config, proxyFactoryFactories, mailbox, multiProvider, }) {
|
|
135
140
|
// instantiate new EvmIsmModule
|
|
136
|
-
const module = new EvmIsmModule(multiProvider,
|
|
141
|
+
const module = new EvmIsmModule(multiProvider, {
|
|
137
142
|
addresses: {
|
|
138
|
-
...
|
|
143
|
+
...proxyFactoryFactories,
|
|
139
144
|
mailbox,
|
|
140
145
|
deployedIsm: ethers.constants.AddressZero,
|
|
141
146
|
},
|
|
@@ -183,10 +188,10 @@ export class EvmIsmModule extends HyperlaneModule {
|
|
|
183
188
|
return updateTxs;
|
|
184
189
|
}
|
|
185
190
|
async deploy({ config, }) {
|
|
186
|
-
// If it's
|
|
191
|
+
// If it's an address ISM, just return a base ISM
|
|
187
192
|
if (typeof config === 'string') {
|
|
188
193
|
// TODO: https://github.com/hyperlane-xyz/hyperlane-monorepo/issues/3773
|
|
189
|
-
// we can remove the ts-ignore once we have a proper type for
|
|
194
|
+
// we can remove the ts-ignore once we have a proper type for address ISMs
|
|
190
195
|
// @ts-ignore
|
|
191
196
|
return IInterchainSecurityModule__factory.connect(config, this.multiProvider.getSignerOrProvider(this.args.chain));
|
|
192
197
|
}
|
|
@@ -212,14 +217,34 @@ export class EvmIsmModule extends HyperlaneModule {
|
|
|
212
217
|
logger,
|
|
213
218
|
});
|
|
214
219
|
case IsmType.OP_STACK:
|
|
215
|
-
return this.deployer.deployContractFromFactory(
|
|
220
|
+
return this.deployer.deployContractFromFactory({
|
|
221
|
+
chain: this.chain,
|
|
222
|
+
factory: new OPStackIsm__factory(),
|
|
223
|
+
contractName: IsmType.OP_STACK,
|
|
224
|
+
constructorArgs: [config.nativeBridge],
|
|
225
|
+
});
|
|
216
226
|
case IsmType.PAUSABLE:
|
|
217
|
-
return this.deployer.deployContractFromFactory(
|
|
227
|
+
return this.deployer.deployContractFromFactory({
|
|
228
|
+
chain: this.chain,
|
|
229
|
+
factory: new PausableIsm__factory(),
|
|
230
|
+
contractName: IsmType.PAUSABLE,
|
|
231
|
+
constructorArgs: [config.owner],
|
|
232
|
+
});
|
|
218
233
|
case IsmType.TRUSTED_RELAYER:
|
|
219
234
|
assert(this.args.addresses.mailbox, `Mailbox address is required for deploying ${ismType}`);
|
|
220
|
-
return this.deployer.deployContractFromFactory(
|
|
235
|
+
return this.deployer.deployContractFromFactory({
|
|
236
|
+
chain: this.chain,
|
|
237
|
+
factory: new TrustedRelayerIsm__factory(),
|
|
238
|
+
contractName: IsmType.TRUSTED_RELAYER,
|
|
239
|
+
constructorArgs: [this.args.addresses.mailbox, config.relayer],
|
|
240
|
+
});
|
|
221
241
|
case IsmType.TEST_ISM:
|
|
222
|
-
return this.deployer.deployContractFromFactory(
|
|
242
|
+
return this.deployer.deployContractFromFactory({
|
|
243
|
+
chain: this.chain,
|
|
244
|
+
factory: new TestIsm__factory(),
|
|
245
|
+
contractName: IsmType.TEST_ISM,
|
|
246
|
+
constructorArgs: [],
|
|
247
|
+
});
|
|
223
248
|
default:
|
|
224
249
|
throw new Error(`Unsupported ISM type ${ismType}`);
|
|
225
250
|
}
|
|
@@ -229,7 +254,7 @@ export class EvmIsmModule extends HyperlaneModule {
|
|
|
229
254
|
const factoryName = config.type === IsmType.MERKLE_ROOT_MULTISIG
|
|
230
255
|
? 'staticMerkleRootMultisigIsmFactory'
|
|
231
256
|
: 'staticMessageIdMultisigIsmFactory';
|
|
232
|
-
const address = await
|
|
257
|
+
const address = await EvmModuleDeployer.deployStaticAddressSet({
|
|
233
258
|
chain: this.chain,
|
|
234
259
|
factory: this.factories[factoryName],
|
|
235
260
|
values: config.validators,
|
|
@@ -275,8 +300,13 @@ export class EvmIsmModule extends HyperlaneModule {
|
|
|
275
300
|
const overrides = this.multiProvider.getTransactionOverrides(this.args.chain);
|
|
276
301
|
const signer = this.multiProvider.getSigner(this.args.chain);
|
|
277
302
|
const domainRoutingIsmFactory = DomainRoutingIsmFactory__factory.connect(this.args.addresses.domainRoutingIsmFactory, signer);
|
|
278
|
-
//
|
|
279
|
-
const
|
|
303
|
+
// estimate gas
|
|
304
|
+
const estimatedGas = await domainRoutingIsmFactory.estimateGas.deploy(owner, domainIds, submoduleAddresses, overrides);
|
|
305
|
+
// deploying new domain routing ISM, add 10% buffer
|
|
306
|
+
const tx = await domainRoutingIsmFactory.deploy(owner, domainIds, submoduleAddresses, {
|
|
307
|
+
...overrides,
|
|
308
|
+
gasLimit: estimatedGas.add(estimatedGas.div(10)), // 10% buffer
|
|
309
|
+
});
|
|
280
310
|
const receipt = await this.multiProvider.handleTx(this.args.chain, tx);
|
|
281
311
|
const dispatchLogs = findMatchingLogEvents(receipt.logs, domainRoutingIsmFactory.interface, 'ModuleDeployed');
|
|
282
312
|
if (dispatchLogs.length === 0) {
|
|
@@ -293,7 +323,7 @@ export class EvmIsmModule extends HyperlaneModule {
|
|
|
293
323
|
addresses.push(submodule.address);
|
|
294
324
|
}
|
|
295
325
|
const factoryName = 'staticAggregationIsmFactory';
|
|
296
|
-
const address = await
|
|
326
|
+
const address = await EvmModuleDeployer.deployStaticAddressSet({
|
|
297
327
|
chain: this.chain,
|
|
298
328
|
factory: this.factories[factoryName],
|
|
299
329
|
values: addresses,
|
|
@@ -316,34 +346,6 @@ export class EvmIsmModule extends HyperlaneModule {
|
|
|
316
346
|
// Update the mailbox address in the arguments
|
|
317
347
|
this.args.addresses.mailbox = newMailboxAddress;
|
|
318
348
|
}
|
|
319
|
-
// Public so it can be reused by the hook module.
|
|
320
|
-
// Caller of this function is responsible for verifying the contract
|
|
321
|
-
// because they know exactly which factory is being called.
|
|
322
|
-
static async deployStaticAddressSet({ chain, factory, values, logger, threshold = values.length, multiProvider, }) {
|
|
323
|
-
const address = await factory['getAddress(address[],uint8)'](values, threshold);
|
|
324
|
-
const code = await multiProvider.getProvider(chain).getCode(address);
|
|
325
|
-
if (code === '0x') {
|
|
326
|
-
logger.debug(`Deploying new ${threshold} of ${values.length} address set to ${chain}`);
|
|
327
|
-
const overrides = multiProvider.getTransactionOverrides(chain);
|
|
328
|
-
const hash = await factory['deploy(address[],uint8)'](values, threshold, overrides);
|
|
329
|
-
await multiProvider.handleTx(chain, hash);
|
|
330
|
-
}
|
|
331
|
-
else {
|
|
332
|
-
logger.debug(`Recovered ${threshold} of ${values.length} address set on ${chain}: ${address}`);
|
|
333
|
-
}
|
|
334
|
-
// TODO: figure out how to get the constructor arguments for manual deploy TXs
|
|
335
|
-
// const verificationInput = buildVerificationInput(
|
|
336
|
-
// NAME,
|
|
337
|
-
// ADDRESS,
|
|
338
|
-
// CONSTRUCTOR_ARGS,
|
|
339
|
-
// );
|
|
340
|
-
// await this.deployer.verifyContract(
|
|
341
|
-
// this.chainName,
|
|
342
|
-
// verificationInput,
|
|
343
|
-
// logger,
|
|
344
|
-
// );
|
|
345
|
-
return address;
|
|
346
|
-
}
|
|
347
349
|
// filtering out domains which are not part of the multiprovider
|
|
348
350
|
filterRoutingIsmDomains({ config }) {
|
|
349
351
|
const availableDomainIds = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EvmIsmModule.js","sourceRoot":"","sources":["../../src/ism/EvmIsmModule.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"EvmIsmModule.js","sourceRoot":"","sources":["../../src/ism/EvmIsmModule.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HyperlaneIsmFactory.d.ts","sourceRoot":"","sources":["../../src/ism/HyperlaneIsmFactory.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE9B,OAAO,EAKL,eAAe,EAGf,YAAY,EAEZ,WAAW,EAGX,uBAAuB,EACvB,gCAAgC,EAGjC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,OAAO,EAMR,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EACL,qBAAqB,EAEtB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAElD,OAAO,EACL,oBAAoB,EACpB,WAAW,EAEX,SAAS,EAET,iBAAiB,EACjB,gBAAgB,EAEjB,MAAM,YAAY,CAAC;AAGpB,qBAAa,mBAAoB,SAAQ,YAAY,CAAC,qBAAqB,CAAC;IAInE,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAM;IAExC,SAAS,CAAC,QAAQ,CAAC,EAAE,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACjD,WAAW,CAAC,QAAQ,EAAE,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI;IAIxD,MAAM,CAAC,gBAAgB,CACrB,YAAY,EAAE,qBAAqB,CAAC,GAAG,CAAC,EACxC,aAAa,EAAE,aAAa,GAC3B,mBAAmB;IAahB,MAAM,CAAC,CAAC,SAAS,SAAS,EAAE,MAAM,EAAE;QACxC,WAAW,EAAE,SAAS,CAAC;QACvB,MAAM,EAAE,CAAC,CAAC;QACV,MAAM,CAAC,EAAE,SAAS,CAAC;QACnB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,kBAAkB,CAAC,EAAE,OAAO,CAAC;KAC9B,GAAG,OAAO,CAAC,WAAW,CAAC;cAsHR,iBAAiB,CAC/B,WAAW,EAAE,SAAS,EACtB,MAAM,EAAE,iBAAiB,EACzB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,YAAY,CAAC;cAkBR,gBAAgB,CAAC,MAAM,EAAE;QACvC,WAAW,EAAE,SAAS,CAAC;QACvB,MAAM,EAAE,gBAAgB,CAAC;QACzB,MAAM,CAAC,EAAE,SAAS,CAAC;QACnB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,kBAAkB,CAAC,EAAE,OAAO,CAAC;QAC7B,MAAM,EAAE,MAAM,CAAC;KAChB,GAAG,OAAO,CAAC,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"HyperlaneIsmFactory.d.ts","sourceRoot":"","sources":["../../src/ism/HyperlaneIsmFactory.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE9B,OAAO,EAKL,eAAe,EAGf,YAAY,EAEZ,WAAW,EAGX,uBAAuB,EACvB,gCAAgC,EAGjC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,OAAO,EAMR,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EACL,qBAAqB,EAEtB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAElD,OAAO,EACL,oBAAoB,EACpB,WAAW,EAEX,SAAS,EAET,iBAAiB,EACjB,gBAAgB,EAEjB,MAAM,YAAY,CAAC;AAGpB,qBAAa,mBAAoB,SAAQ,YAAY,CAAC,qBAAqB,CAAC;IAInE,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAM;IAExC,SAAS,CAAC,QAAQ,CAAC,EAAE,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACjD,WAAW,CAAC,QAAQ,EAAE,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI;IAIxD,MAAM,CAAC,gBAAgB,CACrB,YAAY,EAAE,qBAAqB,CAAC,GAAG,CAAC,EACxC,aAAa,EAAE,aAAa,GAC3B,mBAAmB;IAahB,MAAM,CAAC,CAAC,SAAS,SAAS,EAAE,MAAM,EAAE;QACxC,WAAW,EAAE,SAAS,CAAC;QACvB,MAAM,EAAE,CAAC,CAAC;QACV,MAAM,CAAC,EAAE,SAAS,CAAC;QACnB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,kBAAkB,CAAC,EAAE,OAAO,CAAC;KAC9B,GAAG,OAAO,CAAC,WAAW,CAAC;cAsHR,iBAAiB,CAC/B,WAAW,EAAE,SAAS,EACtB,MAAM,EAAE,iBAAiB,EACzB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,YAAY,CAAC;cAkBR,gBAAgB,CAAC,MAAM,EAAE;QACvC,WAAW,EAAE,SAAS,CAAC;QACvB,MAAM,EAAE,gBAAgB,CAAC;QACzB,MAAM,CAAC,EAAE,SAAS,CAAC;QACnB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,kBAAkB,CAAC,EAAE,OAAO,CAAC;QAC7B,MAAM,EAAE,MAAM,CAAC;KAChB,GAAG,OAAO,CAAC,WAAW,CAAC;cA2KR,oBAAoB,CAAC,MAAM,EAAE;QAC3C,WAAW,EAAE,SAAS,CAAC;QACvB,MAAM,EAAE,oBAAoB,CAAC;QAC7B,MAAM,CAAC,EAAE,SAAS,CAAC;QACnB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,MAAM,EAAE,MAAM,CAAC;KAChB,GAAG,OAAO,CAAC,eAAe,CAAC;IAyBtB,sBAAsB,CAC1B,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE,gCAAgC,GAAG,uBAAuB,EACnE,MAAM,EAAE,OAAO,EAAE,EACjB,MAAM,EAAE,MAAM,EACd,SAAS,SAAgB,GACxB,OAAO,CAAC,OAAO,CAAC;CAmCpB"}
|
|
@@ -186,7 +186,14 @@ export class HyperlaneIsmFactory extends HyperlaneApp {
|
|
|
186
186
|
}
|
|
187
187
|
else {
|
|
188
188
|
// deploying new domain routing ISM
|
|
189
|
-
const
|
|
189
|
+
const owner = config.owner;
|
|
190
|
+
// estimate gas
|
|
191
|
+
const estimatedGas = await domainRoutingIsmFactory.estimateGas.deploy(owner, safeConfigDomains, submoduleAddresses, overrides);
|
|
192
|
+
// add 10% buffer
|
|
193
|
+
const tx = await domainRoutingIsmFactory.deploy(owner, safeConfigDomains, submoduleAddresses, {
|
|
194
|
+
...overrides,
|
|
195
|
+
gasLimit: estimatedGas.add(estimatedGas.div(10)), // 10% buffer
|
|
196
|
+
});
|
|
190
197
|
receipt = await this.multiProvider.handleTx(destination, tx);
|
|
191
198
|
// TODO: Break this out into a generalized function
|
|
192
199
|
const dispatchLogs = receipt.logs
|
|
@@ -232,7 +239,13 @@ export class HyperlaneIsmFactory extends HyperlaneApp {
|
|
|
232
239
|
if (code === '0x') {
|
|
233
240
|
logger.debug(`Deploying new ${threshold} of ${values.length} address set to ${chain}`);
|
|
234
241
|
const overrides = this.multiProvider.getTransactionOverrides(chain);
|
|
235
|
-
|
|
242
|
+
// estimate gas
|
|
243
|
+
const estimatedGas = await factory.estimateGas['deploy(address[],uint8)'](sorted, threshold, overrides);
|
|
244
|
+
// add 10% buffer
|
|
245
|
+
const hash = await factory['deploy(address[],uint8)'](sorted, threshold, {
|
|
246
|
+
...overrides,
|
|
247
|
+
gasLimit: estimatedGas.add(estimatedGas.div(10)), // 10% buffer
|
|
248
|
+
});
|
|
236
249
|
await this.multiProvider.handleTx(chain, hash);
|
|
237
250
|
// TODO: add proxy verification artifact?
|
|
238
251
|
}
|