@hyperlane-xyz/cli 5.7.0 → 7.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/src/config/core.d.ts +210 -205
- package/dist/src/config/core.d.ts.map +1 -1
- package/dist/src/config/core.js +12 -2
- package/dist/src/config/core.js.map +1 -1
- package/dist/src/config/hooks.d.ts.map +1 -1
- package/dist/src/config/hooks.js +12 -4
- package/dist/src/config/hooks.js.map +1 -1
- package/dist/src/config/ism.d.ts +7 -18
- package/dist/src/config/ism.d.ts.map +1 -1
- package/dist/src/config/ism.js +23 -33
- package/dist/src/config/ism.js.map +1 -1
- package/dist/src/config/submit.d.ts.map +1 -1
- package/dist/src/config/submit.js +3 -17
- package/dist/src/config/submit.js.map +1 -1
- package/dist/src/deploy/core.d.ts.map +1 -1
- package/dist/src/deploy/core.js.map +1 -1
- package/dist/src/deploy/warp.js +8 -2
- package/dist/src/deploy/warp.js.map +1 -1
- package/dist/src/submit/submit.js +3 -1
- package/dist/src/submit/submit.js.map +1 -1
- package/dist/src/tests/commands/core.d.ts +13 -0
- package/dist/src/tests/commands/core.d.ts.map +1 -1
- package/dist/src/tests/commands/core.js +31 -0
- package/dist/src/tests/commands/core.js.map +1 -1
- package/dist/src/tests/commands/helpers.d.ts +1 -1
- package/dist/src/tests/commands/helpers.d.ts.map +1 -1
- package/dist/src/tests/commands/helpers.js +2 -2
- package/dist/src/tests/commands/helpers.js.map +1 -1
- package/dist/src/tests/core.e2e-test.d.ts +2 -0
- package/dist/src/tests/core.e2e-test.d.ts.map +1 -0
- package/dist/src/tests/core.e2e-test.js +113 -0
- package/dist/src/tests/core.e2e-test.js.map +1 -0
- package/dist/src/tests/warp-apply.e2e-test.js +9 -9
- package/dist/src/tests/warp-apply.e2e-test.js.map +1 -1
- package/dist/src/tests/warp-deploy.e2e-test.js +4 -3
- package/dist/src/tests/warp-deploy.e2e-test.js.map +1 -1
- package/dist/src/utils/input.d.ts +1 -2
- package/dist/src/utils/input.d.ts.map +1 -1
- package/dist/src/utils/input.js +1 -2
- package/dist/src/utils/input.js.map +1 -1
- package/dist/src/version.d.ts +1 -1
- package/dist/src/version.js +1 -1
- package/examples/submit/strategy/impersonated-account-strategy.yaml +1 -0
- package/examples/submit/strategy/json-rpc-chain-strategy.yaml +2 -0
- package/examples/submit/strategy/json-rpc-strategy.yaml +1 -0
- package/package.json +3 -3
- package/dist/src/tests/multisig.test.d.ts +0 -2
- package/dist/src/tests/multisig.test.d.ts.map +0 -1
- package/dist/src/tests/multisig.test.js +0 -34
- package/dist/src/tests/multisig.test.js.map +0 -1
|
@@ -0,0 +1,113 @@
|
|
|
1
|
+
import { expect } from 'chai';
|
|
2
|
+
import { Wallet, ethers } from 'ethers';
|
|
3
|
+
import { ProxyAdmin__factory } from '@hyperlane-xyz/core';
|
|
4
|
+
import { randomAddress, } from '@hyperlane-xyz/sdk';
|
|
5
|
+
import { readYamlOrJson, writeYamlOrJson } from '../utils/files.js';
|
|
6
|
+
import { hyperlaneCoreApply, hyperlaneCoreDeploy, readCoreConfig, } from './commands/core.js';
|
|
7
|
+
import { ANVIL_KEY, REGISTRY_PATH } from './commands/helpers.js';
|
|
8
|
+
const CHAIN_NAME = 'anvil2';
|
|
9
|
+
const EXAMPLES_PATH = './examples';
|
|
10
|
+
const CORE_CONFIG_PATH = `${EXAMPLES_PATH}/core-config.yaml`;
|
|
11
|
+
const TEMP_PATH = '/tmp'; // /temp gets removed at the end of all-test.sh
|
|
12
|
+
const CORE_READ_CONFIG_PATH = `${TEMP_PATH}/anvil2/core-config-read.yaml`;
|
|
13
|
+
const TEST_TIMEOUT = 100000; // Long timeout since these tests can take a while
|
|
14
|
+
describe('hyperlane core e2e tests', async function () {
|
|
15
|
+
this.timeout(TEST_TIMEOUT);
|
|
16
|
+
let signer;
|
|
17
|
+
let initialOwnerAddress;
|
|
18
|
+
before(async () => {
|
|
19
|
+
const chainMetadata = readYamlOrJson(`${REGISTRY_PATH}/chains/${CHAIN_NAME}/metadata.yaml`);
|
|
20
|
+
const provider = new ethers.providers.JsonRpcProvider(chainMetadata.rpcUrls[0].http);
|
|
21
|
+
const wallet = new Wallet(ANVIL_KEY);
|
|
22
|
+
signer = wallet.connect(provider);
|
|
23
|
+
initialOwnerAddress = await signer.getAddress();
|
|
24
|
+
});
|
|
25
|
+
describe('core.deploy', () => {
|
|
26
|
+
it('should create a core deployment with the signer as the mailbox owner', async () => {
|
|
27
|
+
await hyperlaneCoreDeploy(CHAIN_NAME, CORE_CONFIG_PATH);
|
|
28
|
+
const coreConfig = await readCoreConfig(CHAIN_NAME, CORE_READ_CONFIG_PATH);
|
|
29
|
+
expect(coreConfig.owner).to.equal(initialOwnerAddress);
|
|
30
|
+
expect(coreConfig.proxyAdmin?.owner).to.equal(initialOwnerAddress);
|
|
31
|
+
// Assuming that the ProtocolFeeHook is used for deployment
|
|
32
|
+
expect(coreConfig.requiredHook.owner).to.equal(initialOwnerAddress);
|
|
33
|
+
});
|
|
34
|
+
it('should create a core deployment with the mailbox owner set to the address in the config', async () => {
|
|
35
|
+
const coreConfig = await readYamlOrJson(CORE_CONFIG_PATH);
|
|
36
|
+
const newOwner = randomAddress().toLowerCase();
|
|
37
|
+
coreConfig.owner = newOwner;
|
|
38
|
+
writeYamlOrJson(CORE_READ_CONFIG_PATH, coreConfig);
|
|
39
|
+
// Deploy the core contracts with the updated mailbox owner
|
|
40
|
+
await hyperlaneCoreDeploy(CHAIN_NAME, CORE_READ_CONFIG_PATH);
|
|
41
|
+
// Verify that the owner has been set correctly without modifying any other owner values
|
|
42
|
+
const updatedConfig = await readCoreConfig(CHAIN_NAME, CORE_READ_CONFIG_PATH);
|
|
43
|
+
expect(updatedConfig.owner.toLowerCase()).to.equal(newOwner);
|
|
44
|
+
expect(updatedConfig.proxyAdmin?.owner).to.equal(initialOwnerAddress);
|
|
45
|
+
// Assuming that the ProtocolFeeHook is used for deployment
|
|
46
|
+
expect(updatedConfig.requiredHook.owner).to.equal(initialOwnerAddress);
|
|
47
|
+
});
|
|
48
|
+
it('should create a core deployment with ProxyAdmin owner of the mailbox set to the address in the config', async () => {
|
|
49
|
+
const coreConfig = await readYamlOrJson(CORE_CONFIG_PATH);
|
|
50
|
+
const newOwner = randomAddress().toLowerCase();
|
|
51
|
+
coreConfig.proxyAdmin = { owner: newOwner };
|
|
52
|
+
writeYamlOrJson(CORE_READ_CONFIG_PATH, coreConfig);
|
|
53
|
+
// Deploy the core contracts with the updated mailbox owner
|
|
54
|
+
await hyperlaneCoreDeploy(CHAIN_NAME, CORE_READ_CONFIG_PATH);
|
|
55
|
+
// Verify that the owner has been set correctly without modifying any other owner values
|
|
56
|
+
const updatedConfig = await readCoreConfig(CHAIN_NAME, CORE_READ_CONFIG_PATH);
|
|
57
|
+
expect(updatedConfig.owner).to.equal(initialOwnerAddress);
|
|
58
|
+
expect(updatedConfig.proxyAdmin?.owner.toLowerCase()).to.equal(newOwner);
|
|
59
|
+
// Assuming that the ProtocolFeeHook is used for deployment
|
|
60
|
+
expect(updatedConfig.requiredHook.owner).to.equal(initialOwnerAddress);
|
|
61
|
+
});
|
|
62
|
+
});
|
|
63
|
+
describe('core.apply', () => {
|
|
64
|
+
it('should update the mailbox owner', async () => {
|
|
65
|
+
await hyperlaneCoreDeploy(CHAIN_NAME, CORE_CONFIG_PATH);
|
|
66
|
+
const coreConfig = await readCoreConfig(CHAIN_NAME, CORE_READ_CONFIG_PATH);
|
|
67
|
+
expect(coreConfig.owner).to.equal(initialOwnerAddress);
|
|
68
|
+
const newOwner = randomAddress().toLowerCase();
|
|
69
|
+
coreConfig.owner = newOwner;
|
|
70
|
+
writeYamlOrJson(CORE_READ_CONFIG_PATH, coreConfig);
|
|
71
|
+
await hyperlaneCoreApply(CHAIN_NAME, CORE_READ_CONFIG_PATH);
|
|
72
|
+
// Verify that the owner has been set correctly without modifying any other owner values
|
|
73
|
+
const updatedConfig = await readCoreConfig(CHAIN_NAME, CORE_READ_CONFIG_PATH);
|
|
74
|
+
expect(updatedConfig.owner.toLowerCase()).to.equal(newOwner);
|
|
75
|
+
expect(updatedConfig.proxyAdmin?.owner).to.equal(initialOwnerAddress);
|
|
76
|
+
// Assuming that the ProtocolFeeHook is used for deployment
|
|
77
|
+
expect(updatedConfig.requiredHook.owner).to.equal(initialOwnerAddress);
|
|
78
|
+
});
|
|
79
|
+
it('should update the ProxyAdmin to a new one for the mailbox', async () => {
|
|
80
|
+
await hyperlaneCoreDeploy(CHAIN_NAME, CORE_CONFIG_PATH);
|
|
81
|
+
const coreConfig = await readCoreConfig(CHAIN_NAME, CORE_READ_CONFIG_PATH);
|
|
82
|
+
expect(coreConfig.owner).to.equal(initialOwnerAddress);
|
|
83
|
+
const proxyFactory = new ProxyAdmin__factory().connect(signer);
|
|
84
|
+
const deployTx = await proxyFactory.deploy();
|
|
85
|
+
const newProxyAdmin = await deployTx.deployed();
|
|
86
|
+
coreConfig.proxyAdmin.address = newProxyAdmin.address;
|
|
87
|
+
writeYamlOrJson(CORE_READ_CONFIG_PATH, coreConfig);
|
|
88
|
+
await hyperlaneCoreApply(CHAIN_NAME, CORE_READ_CONFIG_PATH);
|
|
89
|
+
// Verify that the owner has been set correctly without modifying any other owner values
|
|
90
|
+
const updatedConfig = await readCoreConfig(CHAIN_NAME, CORE_READ_CONFIG_PATH);
|
|
91
|
+
expect(updatedConfig.owner).to.equal(initialOwnerAddress);
|
|
92
|
+
expect(updatedConfig.proxyAdmin?.address).to.equal(newProxyAdmin.address);
|
|
93
|
+
// Assuming that the ProtocolFeeHook is used for deployment
|
|
94
|
+
expect(updatedConfig.requiredHook.owner).to.equal(initialOwnerAddress);
|
|
95
|
+
});
|
|
96
|
+
it('should update the ProxyAdmin owner for the mailbox', async () => {
|
|
97
|
+
await hyperlaneCoreDeploy(CHAIN_NAME, CORE_CONFIG_PATH);
|
|
98
|
+
const coreConfig = await readCoreConfig(CHAIN_NAME, CORE_READ_CONFIG_PATH);
|
|
99
|
+
expect(coreConfig.owner).to.equal(initialOwnerAddress);
|
|
100
|
+
const newOwner = randomAddress().toLowerCase();
|
|
101
|
+
coreConfig.proxyAdmin.owner = newOwner;
|
|
102
|
+
writeYamlOrJson(CORE_READ_CONFIG_PATH, coreConfig);
|
|
103
|
+
await hyperlaneCoreApply(CHAIN_NAME, CORE_READ_CONFIG_PATH);
|
|
104
|
+
// Verify that the owner has been set correctly without modifying any other owner values
|
|
105
|
+
const updatedConfig = await readCoreConfig(CHAIN_NAME, CORE_READ_CONFIG_PATH);
|
|
106
|
+
expect(updatedConfig.owner).to.equal(initialOwnerAddress);
|
|
107
|
+
expect(updatedConfig.proxyAdmin?.owner.toLowerCase()).to.equal(newOwner);
|
|
108
|
+
// Assuming that the ProtocolFeeHook is used for deployment
|
|
109
|
+
expect(updatedConfig.requiredHook.owner).to.equal(initialOwnerAddress);
|
|
110
|
+
});
|
|
111
|
+
});
|
|
112
|
+
});
|
|
113
|
+
//# sourceMappingURL=core.e2e-test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"core.e2e-test.js","sourceRoot":"","sources":["../../../src/tests/core.e2e-test.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { expect } from 'chai';
|
|
|
2
2
|
import { Wallet } from 'ethers';
|
|
3
3
|
import { TokenType, } from '@hyperlane-xyz/sdk';
|
|
4
4
|
import { readYamlOrJson, writeYamlOrJson } from '../utils/files.js';
|
|
5
|
-
import { ANVIL_KEY, REGISTRY_PATH, deployOrUseExistingCore, extendWarpConfig,
|
|
5
|
+
import { ANVIL_KEY, REGISTRY_PATH, deployOrUseExistingCore, extendWarpConfig, getDomainId, updateOwner, } from './commands/helpers.js';
|
|
6
6
|
import { hyperlaneWarpApply, hyperlaneWarpDeploy, readWarpConfig, } from './commands/warp.js';
|
|
7
7
|
const CHAIN_NAME_2 = 'anvil2';
|
|
8
8
|
const CHAIN_NAME_3 = 'anvil3';
|
|
@@ -64,12 +64,12 @@ describe('WarpApply e2e tests', async function () {
|
|
|
64
64
|
const COMBINED_WARP_CORE_CONFIG_PATH = `${REGISTRY_PATH}/deployments/warp_routes/ETH/anvil2-anvil3-config.yaml`;
|
|
65
65
|
// Check that chain2 is enrolled in chain1
|
|
66
66
|
const updatedWarpDeployConfig1 = await readWarpConfig(CHAIN_NAME_2, COMBINED_WARP_CORE_CONFIG_PATH, warpConfigPath);
|
|
67
|
-
const chain2Id = await
|
|
67
|
+
const chain2Id = await getDomainId(CHAIN_NAME_3, ANVIL_KEY);
|
|
68
68
|
const remoteRouterKeys1 = Object.keys(updatedWarpDeployConfig1[CHAIN_NAME_2].remoteRouters);
|
|
69
69
|
expect(remoteRouterKeys1).to.include(chain2Id);
|
|
70
70
|
// Check that chain1 is enrolled in chain2
|
|
71
71
|
const updatedWarpDeployConfig2 = await readWarpConfig(CHAIN_NAME_3, COMBINED_WARP_CORE_CONFIG_PATH, warpConfigPath);
|
|
72
|
-
const chain1Id = await
|
|
72
|
+
const chain1Id = await getDomainId(CHAIN_NAME_2, ANVIL_KEY);
|
|
73
73
|
const remoteRouterKeys2 = Object.keys(updatedWarpDeployConfig2[CHAIN_NAME_3].remoteRouters);
|
|
74
74
|
expect(remoteRouterKeys2).to.include(chain1Id);
|
|
75
75
|
});
|
|
@@ -98,12 +98,12 @@ describe('WarpApply e2e tests', async function () {
|
|
|
98
98
|
const COMBINED_WARP_CORE_CONFIG_PATH = `${REGISTRY_PATH}/deployments/warp_routes/ETH/anvil2-anvil3-config.yaml`;
|
|
99
99
|
// Check that chain2 is enrolled in chain1
|
|
100
100
|
const updatedWarpDeployConfig1 = await readWarpConfig(CHAIN_NAME_2, COMBINED_WARP_CORE_CONFIG_PATH, warpConfigPath);
|
|
101
|
-
const chain2Id = await
|
|
101
|
+
const chain2Id = await getDomainId(CHAIN_NAME_3, ANVIL_KEY);
|
|
102
102
|
const remoteRouterKeys1 = Object.keys(updatedWarpDeployConfig1[CHAIN_NAME_2].remoteRouters);
|
|
103
103
|
expect(remoteRouterKeys1).to.include(chain2Id);
|
|
104
104
|
// Check that chain1 is enrolled in chain2
|
|
105
105
|
const updatedWarpDeployConfig2 = await readWarpConfig(CHAIN_NAME_3, COMBINED_WARP_CORE_CONFIG_PATH, warpConfigPath);
|
|
106
|
-
const chain1Id = await
|
|
106
|
+
const chain1Id = await getDomainId(CHAIN_NAME_2, ANVIL_KEY);
|
|
107
107
|
const remoteRouterKeys2 = Object.keys(updatedWarpDeployConfig2[CHAIN_NAME_3].remoteRouters);
|
|
108
108
|
expect(remoteRouterKeys2).to.include(chain1Id);
|
|
109
109
|
});
|
|
@@ -134,8 +134,8 @@ describe('WarpApply e2e tests', async function () {
|
|
|
134
134
|
// Also, anvil3 owner is not burned
|
|
135
135
|
expect(updatedWarpDeployConfig_3.anvil3.owner).to.equal(randomOwner);
|
|
136
136
|
// Check that both chains enrolled
|
|
137
|
-
const chain2Id = await
|
|
138
|
-
const chain3Id = await
|
|
137
|
+
const chain2Id = await getDomainId(CHAIN_NAME_2, ANVIL_KEY);
|
|
138
|
+
const chain3Id = await getDomainId(CHAIN_NAME_3, ANVIL_KEY);
|
|
139
139
|
const remoteRouterKeys2 = Object.keys(updatedWarpDeployConfig_2[CHAIN_NAME_2].remoteRouters);
|
|
140
140
|
const remoteRouterKeys3 = Object.keys(updatedWarpDeployConfig_3[CHAIN_NAME_3].remoteRouters);
|
|
141
141
|
expect(remoteRouterKeys2).to.include(chain3Id);
|
|
@@ -164,8 +164,8 @@ describe('WarpApply e2e tests', async function () {
|
|
|
164
164
|
const COMBINED_WARP_CORE_CONFIG_PATH = `${REGISTRY_PATH}/deployments/warp_routes/ETH/anvil2-anvil3-config.yaml`;
|
|
165
165
|
// Check that chain2 is enrolled in chain1
|
|
166
166
|
const updatedWarpDeployConfig_2 = await readWarpConfig(CHAIN_NAME_2, COMBINED_WARP_CORE_CONFIG_PATH, warpConfigPath);
|
|
167
|
-
const chain2Id = await
|
|
168
|
-
const chain3Id = await
|
|
167
|
+
const chain2Id = await getDomainId(CHAIN_NAME_2, ANVIL_KEY);
|
|
168
|
+
const chain3Id = await getDomainId(CHAIN_NAME_3, ANVIL_KEY);
|
|
169
169
|
// Destination gas should be set in the existing chain (chain2) to include the extended chain (chain3)
|
|
170
170
|
const destinationGas_2 = updatedWarpDeployConfig_2[CHAIN_NAME_2].destinationGas;
|
|
171
171
|
expect(Object.keys(destinationGas_2)).to.include(chain3Id);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"warp-apply.e2e-test.js","sourceRoot":"","sources":["../../../src/tests/warp-apply.e2e-test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGhC,OAAO,EAEL,SAAS,GAEV,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpE,OAAO,EACL,SAAS,EACT,aAAa,EACb,uBAAuB,EACvB,gBAAgB,EAChB,
|
|
1
|
+
{"version":3,"file":"warp-apply.e2e-test.js","sourceRoot":"","sources":["../../../src/tests/warp-apply.e2e-test.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,12 +18,13 @@ const WARP_CORE_CONFIG_PATH_2_3 = `${REGISTRY_PATH}/deployments/warp_routes/VAUL
|
|
|
18
18
|
const TEST_TIMEOUT = 60000; // Long timeout since these tests can take a while
|
|
19
19
|
describe('WarpDeploy e2e tests', async function () {
|
|
20
20
|
let chain2Addresses = {};
|
|
21
|
+
let chain3Addresses = {};
|
|
21
22
|
let token;
|
|
22
23
|
let vault;
|
|
23
24
|
this.timeout(TEST_TIMEOUT);
|
|
24
25
|
before(async function () {
|
|
25
26
|
chain2Addresses = await deployOrUseExistingCore(CHAIN_NAME_2, CORE_CONFIG_PATH, ANVIL_KEY);
|
|
26
|
-
await deployOrUseExistingCore(CHAIN_NAME_3, CORE_CONFIG_PATH, ANVIL_KEY);
|
|
27
|
+
chain3Addresses = await deployOrUseExistingCore(CHAIN_NAME_3, CORE_CONFIG_PATH, ANVIL_KEY);
|
|
27
28
|
token = await deployToken(ANVIL_KEY, CHAIN_NAME_2);
|
|
28
29
|
vault = await deploy4626Vault(ANVIL_KEY, CHAIN_NAME_2, token.address);
|
|
29
30
|
});
|
|
@@ -54,8 +55,8 @@ describe('WarpDeploy e2e tests', async function () {
|
|
|
54
55
|
},
|
|
55
56
|
[CHAIN_NAME_3]: {
|
|
56
57
|
type: TokenType.syntheticRebase,
|
|
57
|
-
mailbox:
|
|
58
|
-
owner:
|
|
58
|
+
mailbox: chain3Addresses.mailbox,
|
|
59
|
+
owner: chain3Addresses.mailbox,
|
|
59
60
|
collateralChainName: CHAIN_NAME_2,
|
|
60
61
|
},
|
|
61
62
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"warp-deploy.e2e-test.js","sourceRoot":"","sources":["../../../src/tests/warp-deploy.e2e-test.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAG9C,OAAO,EAAE,SAAS,EAAyB,MAAM,oBAAoB,CAAC;AAEtE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EACL,SAAS,EACT,aAAa,EACb,eAAe,EACf,uBAAuB,EACvB,WAAW,EACX,6BAA6B,GAC9B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEzE,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;AACzB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;AAC3B,IAAI,CAAC,MAAM,EAAE,CAAC;AAEd,MAAM,YAAY,GAAG,QAAQ,CAAC;AAC9B,MAAM,YAAY,GAAG,QAAQ,CAAC;AAE9B,MAAM,aAAa,GAAG,YAAY,CAAC;AACnC,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,+CAA+C;AAEzE,MAAM,gBAAgB,GAAG,GAAG,aAAa,mBAAmB,CAAC;AAC7D,MAAM,gBAAgB,GAAG,GAAG,SAAS,oCAAoC,CAAC;AAC1E,MAAM,yBAAyB,GAAG,GAAG,aAAa,0DAA0D,CAAC;AAE7G,MAAM,YAAY,GAAG,KAAM,CAAC,CAAC,kDAAkD;AAC/E,QAAQ,CAAC,sBAAsB,EAAE,KAAK;IACpC,IAAI,eAAe,GAAmB,EAAE,CAAC;IACzC,IAAI,KAAU,CAAC;IACf,IAAI,KAAU,CAAC;IAEf,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAE3B,MAAM,CAAC,KAAK;QACV,eAAe,GAAG,MAAM,uBAAuB,CAC7C,YAAY,EACZ,gBAAgB,EAChB,SAAS,CACV,CAAC;QAEF,MAAM,uBAAuB,
|
|
1
|
+
{"version":3,"file":"warp-deploy.e2e-test.js","sourceRoot":"","sources":["../../../src/tests/warp-deploy.e2e-test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { Separator } from '@inquirer/core';
|
|
2
|
-
import { ChainName, DeployedOwnableConfig } from '@hyperlane-xyz/sdk';
|
|
3
|
-
import { WarpCoreConfig } from '@hyperlane-xyz/sdk';
|
|
2
|
+
import { ChainName, DeployedOwnableConfig, WarpCoreConfig } from '@hyperlane-xyz/sdk';
|
|
4
3
|
import { Address } from '@hyperlane-xyz/utils';
|
|
5
4
|
import { CommandContext } from '../context/types.js';
|
|
6
5
|
export declare function detectAndConfirmOrPrompt(detect: () => Promise<string | undefined>, prompt: string, label: string, source?: string): Promise<string>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"input.d.ts","sourceRoot":"","sources":["../../../src/utils/input.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EAYV,MAAM,gBAAgB,CAAC;AAQxB,OAAO,
|
|
1
|
+
{"version":3,"file":"input.d.ts","sourceRoot":"","sources":["../../../src/utils/input.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EAYV,MAAM,gBAAgB,CAAC;AAQxB,OAAO,EACL,SAAS,EACT,qBAAqB,EACrB,cAAc,EACf,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAyB,MAAM,sBAAsB,CAAC;AAGtE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAMrD,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,EACzC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,CAAC,CAiBjB;AAMD,wBAAsB,aAAa,CAAC,EAClC,OAAO,EACP,IAA6C,EAC7C,aAAa,GACd,EAAE;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,GAAG,OAAO,CAAC,MAAM,CAAC,CAYlB;AAED;;GAEG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,cAAc,EACvB,KAAK,EAAE,SAAS,EAChB,cAAc,EAAE,OAAO,GACtB,OAAO,CAAC,qBAAqB,CAAC,CA4ChC;AAED;;;;;GAKG;AACH,wBAAsB,uBAAuB,CAAC,EAC5C,OAAO,EACP,MAAM,EACN,IAAI,GACL,EAAE;IACD,OAAO,EAAE,cAAc,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,GAAG,OAAO,CAAC,cAAc,CAAC,CAY1B;AAgDD,MAAM,MAAM,wBAAwB,CAAC,KAAK,IAAI;IAC5C,KAAK,EAAE,KAAK,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC;AAwRF,eAAO,MAAM,kBAAkB;aA/QpB,MAAM;;;;;;;;yEAUV,OAAO,GAAG,MAAM,GAAG,QAAQ,MAAM,GAAG,OAAO,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;iHAkalD,CAAC"}
|
package/dist/src/utils/input.js
CHANGED
|
@@ -6,8 +6,7 @@ import chalk from 'chalk';
|
|
|
6
6
|
import { ProxyAdmin__factory } from '@hyperlane-xyz/core';
|
|
7
7
|
import { isAddress, rootLogger } from '@hyperlane-xyz/utils';
|
|
8
8
|
import { readWarpCoreConfig } from '../config/warp.js';
|
|
9
|
-
import { logGray } from '../logger.js';
|
|
10
|
-
import { logRed } from '../logger.js';
|
|
9
|
+
import { logGray, logRed } from '../logger.js';
|
|
11
10
|
import { indentYamlOrJson } from './files.js';
|
|
12
11
|
import { selectRegistryWarpRoute } from './tokens.js';
|
|
13
12
|
export async function detectAndConfirmOrPrompt(detect, prompt, label, source) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"input.js","sourceRoot":"","sources":["../../../src/utils/input.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"input.js","sourceRoot":"","sources":["../../../src/utils/input.ts"],"names":[],"mappings":"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"}
|
package/dist/src/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const VERSION = "
|
|
1
|
+
export declare const VERSION = "7.0.0";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
package/dist/src/version.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const VERSION = '
|
|
1
|
+
export const VERSION = '7.0.0';
|
|
2
2
|
//# sourceMappingURL=version.js.map
|
package/package.json
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@hyperlane-xyz/cli",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "7.0.0",
|
|
4
4
|
"description": "A command-line utility for common Hyperlane operations",
|
|
5
5
|
"dependencies": {
|
|
6
6
|
"@aws-sdk/client-kms": "^3.577.0",
|
|
7
7
|
"@aws-sdk/client-s3": "^3.577.0",
|
|
8
8
|
"@hyperlane-xyz/registry": "4.7.0",
|
|
9
|
-
"@hyperlane-xyz/sdk": "
|
|
10
|
-
"@hyperlane-xyz/utils": "
|
|
9
|
+
"@hyperlane-xyz/sdk": "7.0.0",
|
|
10
|
+
"@hyperlane-xyz/utils": "7.0.0",
|
|
11
11
|
"@inquirer/core": "9.0.10",
|
|
12
12
|
"@inquirer/figures": "1.0.5",
|
|
13
13
|
"@inquirer/prompts": "^3.0.0",
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"multisig.test.d.ts","sourceRoot":"","sources":["../../../src/tests/multisig.test.ts"],"names":[],"mappings":""}
|
|
@@ -1,34 +0,0 @@
|
|
|
1
|
-
import { expect } from 'chai';
|
|
2
|
-
import { readMultisigConfig } from '../config/multisig.js';
|
|
3
|
-
describe('readMultisigConfig', () => {
|
|
4
|
-
it('parses and validates example correctly', () => {
|
|
5
|
-
const multisig = readMultisigConfig('examples/ism.yaml');
|
|
6
|
-
const exampleMultisigConfig = {
|
|
7
|
-
anvil1: {
|
|
8
|
-
threshold: 1,
|
|
9
|
-
validators: ['0xa0Ee7A142d267C1f36714E4a8F75612F20a79720'],
|
|
10
|
-
},
|
|
11
|
-
anvil2: {
|
|
12
|
-
threshold: 1,
|
|
13
|
-
validators: ['0xa0Ee7A142d267C1f36714E4a8F75612F20a79720'],
|
|
14
|
-
},
|
|
15
|
-
};
|
|
16
|
-
expect(multisig).to.deep.equal(exampleMultisigConfig);
|
|
17
|
-
});
|
|
18
|
-
it('parsing failure', () => {
|
|
19
|
-
expect(function () {
|
|
20
|
-
readMultisigConfig('src/tests/multisig/safe-parse-fail.yaml');
|
|
21
|
-
}).to.throw('Invalid multisig config: anvil2,validators => Required');
|
|
22
|
-
});
|
|
23
|
-
it('threshold cannot be greater than the # of validators', () => {
|
|
24
|
-
expect(function () {
|
|
25
|
-
readMultisigConfig('src/tests/multisig/threshold-gt-fail.yaml');
|
|
26
|
-
}).to.throw('Threshold cannot be greater than number of validators');
|
|
27
|
-
});
|
|
28
|
-
it('invalid address', () => {
|
|
29
|
-
expect(function () {
|
|
30
|
-
readMultisigConfig('src/tests/multisig/invalid-address-fail.yaml');
|
|
31
|
-
}).to.throw('Invalid multisig config: anvil2,validators,0 => Invalid');
|
|
32
|
-
});
|
|
33
|
-
});
|
|
34
|
-
//# sourceMappingURL=multisig.test.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"multisig.test.js","sourceRoot":"","sources":["../../../src/tests/multisig.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAI9B,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE3D,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;QAChD,MAAM,QAAQ,GAAG,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;QAEzD,MAAM,qBAAqB,GAA6B;YACtD,MAAM,EAAE;gBACN,SAAS,EAAE,CAAC;gBACZ,UAAU,EAAE,CAAC,4CAA4C,CAAC;aAC3D;YACD,MAAM,EAAE;gBACN,SAAS,EAAE,CAAC;gBACZ,UAAU,EAAE,CAAC,4CAA4C,CAAC;aAC3D;SACF,CAAC;QACF,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iBAAiB,EAAE,GAAG,EAAE;QACzB,MAAM,CAAC;YACL,kBAAkB,CAAC,yCAAyC,CAAC,CAAC;QAChE,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,wDAAwD,CAAC,CAAC;IACxE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sDAAsD,EAAE,GAAG,EAAE;QAC9D,MAAM,CAAC;YACL,kBAAkB,CAAC,2CAA2C,CAAC,CAAC;QAClE,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,uDAAuD,CAAC,CAAC;IACvE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iBAAiB,EAAE,GAAG,EAAE;QACzB,MAAM,CAAC;YACL,kBAAkB,CAAC,8CAA8C,CAAC,CAAC;QACrE,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,yDAAyD,CAAC,CAAC;IACzE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|