@hyperlane-xyz/cli 9.0.0 → 9.2.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/check/warp.d.ts +3 -3
- package/dist/src/check/warp.d.ts.map +1 -1
- package/dist/src/check/warp.js +2 -8
- package/dist/src/check/warp.js.map +1 -1
- package/dist/src/deploy/warp.d.ts +11 -1
- package/dist/src/deploy/warp.d.ts.map +1 -1
- package/dist/src/deploy/warp.js +71 -154
- package/dist/src/deploy/warp.js.map +1 -1
- package/dist/src/status/message.d.ts.map +1 -1
- package/dist/src/status/message.js +10 -3
- package/dist/src/status/message.js.map +1 -1
- package/dist/src/tests/commands/helpers.d.ts +15 -0
- package/dist/src/tests/commands/helpers.d.ts.map +1 -1
- package/dist/src/tests/commands/helpers.js +57 -2
- package/dist/src/tests/commands/helpers.js.map +1 -1
- package/dist/src/tests/commands/warp.d.ts +2 -2
- package/dist/src/tests/commands/warp.d.ts.map +1 -1
- package/dist/src/tests/commands/warp.js.map +1 -1
- package/dist/src/tests/warp/warp-apply-extend.e2e-test.js +246 -6
- package/dist/src/tests/warp/warp-apply-extend.e2e-test.js.map +1 -1
- package/dist/src/tests/warp/warp-apply.e2e-test.js +40 -2
- package/dist/src/tests/warp/warp-apply.e2e-test.js.map +1 -1
- package/dist/src/tests/warp/warp-check.e2e-test.js +25 -3
- package/dist/src/tests/warp/warp-check.e2e-test.js.map +1 -1
- package/dist/src/version.d.ts +1 -1
- package/dist/src/version.js +1 -1
- package/package.json +4 -4
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
import { ethers } from 'ethers';
|
|
1
|
+
import { Wallet, ethers } from 'ethers';
|
|
2
2
|
import { $ } from 'zx';
|
|
3
3
|
import { ERC20Test__factory, ERC4626Test__factory, XERC20LockboxTest__factory, XERC20VSTest__factory, } from '@hyperlane-xyz/core';
|
|
4
4
|
import { createWarpRouteConfigId, } from '@hyperlane-xyz/registry';
|
|
5
|
-
import { WarpCoreConfigSchema, } from '@hyperlane-xyz/sdk';
|
|
5
|
+
import { TokenType, WarpCoreConfigSchema, } from '@hyperlane-xyz/sdk';
|
|
6
6
|
import { sleep } from '@hyperlane-xyz/utils';
|
|
7
7
|
import { getContext } from '../../context/context.js';
|
|
8
|
+
import { extendWarpRoute as extendWarpRouteWithoutApplyTransactions } from '../../deploy/warp.js';
|
|
8
9
|
import { readYamlOrJson, writeYamlOrJson } from '../../utils/files.js';
|
|
9
10
|
import { hyperlaneCoreDeploy } from './core.js';
|
|
10
11
|
import { hyperlaneWarpApply, hyperlaneWarpSendRelay, readWarpConfig, } from './warp.js';
|
|
@@ -126,10 +127,64 @@ export async function extendWarpConfig(params) {
|
|
|
126
127
|
const { chain, chainToExtend, extendedConfig, warpCorePath, warpDeployPath, strategyUrl, } = params;
|
|
127
128
|
const warpDeployConfig = await readWarpConfig(chain, warpCorePath, warpDeployPath);
|
|
128
129
|
warpDeployConfig[chainToExtend] = extendedConfig;
|
|
130
|
+
// Remove remoteRouters and destinationGas as they are written in readWarpConfig
|
|
131
|
+
delete warpDeployConfig[chain].remoteRouters;
|
|
132
|
+
delete warpDeployConfig[chain].destinationGas;
|
|
129
133
|
writeYamlOrJson(warpDeployPath, warpDeployConfig);
|
|
130
134
|
await hyperlaneWarpApply(warpDeployPath, warpCorePath, strategyUrl);
|
|
131
135
|
return warpDeployPath;
|
|
132
136
|
}
|
|
137
|
+
/**
|
|
138
|
+
* Sets up an incomplete warp route extension for testing purposes.
|
|
139
|
+
*
|
|
140
|
+
* This function creates a new warp route configuration for the second chain.
|
|
141
|
+
*/
|
|
142
|
+
export async function setupIncompleteWarpRouteExtension(chain2Addresses) {
|
|
143
|
+
const warpConfigPath = `${TEMP_PATH}/warp-route-deployment-2.yaml`;
|
|
144
|
+
const chain2DomainId = await getDomainId(CHAIN_NAME_2, ANVIL_KEY);
|
|
145
|
+
const chain3DomainId = await getDomainId(CHAIN_NAME_3, ANVIL_KEY);
|
|
146
|
+
const configToExtend = {
|
|
147
|
+
decimals: 18,
|
|
148
|
+
mailbox: chain2Addresses.mailbox,
|
|
149
|
+
name: 'Ether',
|
|
150
|
+
owner: new Wallet(ANVIL_KEY).address,
|
|
151
|
+
symbol: 'ETH',
|
|
152
|
+
type: TokenType.native,
|
|
153
|
+
};
|
|
154
|
+
const context = await getContext({
|
|
155
|
+
registryUris: [REGISTRY_PATH],
|
|
156
|
+
key: ANVIL_KEY,
|
|
157
|
+
});
|
|
158
|
+
const warpCoreConfig = readYamlOrJson(WARP_CORE_CONFIG_PATH_2);
|
|
159
|
+
const warpDeployConfig = await readWarpConfig(CHAIN_NAME_2, WARP_CORE_CONFIG_PATH_2, warpConfigPath);
|
|
160
|
+
warpDeployConfig[CHAIN_NAME_3] = configToExtend;
|
|
161
|
+
const signer2 = new Wallet(ANVIL_KEY, context.multiProvider.getProvider(CHAIN_NAME_2));
|
|
162
|
+
const signer3 = new Wallet(ANVIL_KEY, context.multiProvider.getProvider(CHAIN_NAME_3));
|
|
163
|
+
context.multiProvider.setSigner(CHAIN_NAME_2, signer2);
|
|
164
|
+
context.multiProvider.setSigner(CHAIN_NAME_3, signer3);
|
|
165
|
+
await extendWarpRouteWithoutApplyTransactions({
|
|
166
|
+
context: {
|
|
167
|
+
...context,
|
|
168
|
+
signer: signer3,
|
|
169
|
+
key: ANVIL_KEY,
|
|
170
|
+
},
|
|
171
|
+
warpCoreConfig,
|
|
172
|
+
warpDeployConfig,
|
|
173
|
+
receiptsDir: TEMP_PATH,
|
|
174
|
+
}, {}, warpCoreConfig);
|
|
175
|
+
const combinedWarpCorePath = getCombinedWarpRoutePath('ETH', [
|
|
176
|
+
CHAIN_NAME_2,
|
|
177
|
+
CHAIN_NAME_3,
|
|
178
|
+
]);
|
|
179
|
+
return {
|
|
180
|
+
chain2DomainId,
|
|
181
|
+
chain3DomainId,
|
|
182
|
+
warpConfigPath,
|
|
183
|
+
configToExtend,
|
|
184
|
+
context,
|
|
185
|
+
combinedWarpCorePath,
|
|
186
|
+
};
|
|
187
|
+
}
|
|
133
188
|
/**
|
|
134
189
|
* Deploys new core contracts on the specified chain if it doesn't already exist, and returns the chain addresses.
|
|
135
190
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../src/tests/commands/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../src/tests/commands/helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ProcessPromise } from 'zx';
|
|
2
|
-
import { ChainName, WarpRouteDeployConfig } from '@hyperlane-xyz/sdk';
|
|
2
|
+
import { ChainName, WarpRouteDeployConfig, WarpRouteDeployConfigMailboxRequired } from '@hyperlane-xyz/sdk';
|
|
3
3
|
import { Address } from '@hyperlane-xyz/utils';
|
|
4
4
|
/**
|
|
5
5
|
* Deploys the Warp route to the specified chain using the provided config.
|
|
@@ -41,7 +41,7 @@ export declare function hyperlaneWarpSendRelay(origin: string, destination: stri
|
|
|
41
41
|
* @param warpDeployPath path to output the resulting read
|
|
42
42
|
* @returns The Warp route deployment config.
|
|
43
43
|
*/
|
|
44
|
-
export declare function readWarpConfig(chain: string, warpCorePath: string, warpDeployPath: string): Promise<
|
|
44
|
+
export declare function readWarpConfig(chain: string, warpCorePath: string, warpDeployPath: string): Promise<WarpRouteDeployConfigMailboxRequired>;
|
|
45
45
|
type GetWarpTokenConfigOptions = {
|
|
46
46
|
mailbox: Address;
|
|
47
47
|
owner: Address;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"warp.d.ts","sourceRoot":"","sources":["../../../../src/tests/commands/warp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAK,cAAc,EAAE,MAAM,IAAI,CAAC;AAEvC,OAAO,EACL,SAAS,EAGT,qBAAqB,
|
|
1
|
+
{"version":3,"file":"warp.d.ts","sourceRoot":"","sources":["../../../../src/tests/commands/warp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAK,cAAc,EAAE,MAAM,IAAI,CAAC;AAEvC,OAAO,EACL,SAAS,EAGT,qBAAqB,EACrB,oCAAoC,EAErC,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAQ/C;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,cAAc,CAOtE;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,EACrC,YAAY,EACZ,MAAM,EACN,uBAAuB,EACvB,UAAU,GACX,EAAE;IACD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,GAAG,cAAc,CASjB;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,YAAY,EAAE,MAAM,GAAG,cAAc,CAMxE;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CACtC,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,MAAM,EACpB,WAAW,SAAK,uCAUjB;AAED,wBAAgB,oBAAoB,CAAC,EACnC,KAAK,EACL,WAAW,EACX,UAAU,EACV,MAAM,GACP,EAAE;IACD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,GAAG,cAAc,CAQjB;AAED,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,GACrB,cAAc,CAMhB;AAED,wBAAgB,qBAAqB,CAAC,EACpC,cAAc,EACd,MAAM,GACP,EAAE;IACD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,GAAG,cAAc,CAMjB;AAED,wBAAgB,kBAAkB,CAChC,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,MAAM,GACb,cAAc,CAKhB;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,KAAK,UAAO,EACZ,KAAK,SAAI,GACR,cAAc,CAWhB;AAED;;;;;GAKG;AACH,wBAAsB,cAAc,CAClC,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,oCAAoC,CAAC,CAI/C;AAmGD,KAAK,yBAAyB,GAAG;IAC/B,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;IACf,SAAS,EAAE,SAAS,CAAC;CACtB,CAAC;AAEF,wBAAgB,mBAAmB,CACjC,YAAY,EAAE,yBAAyB,EACvC,YAAY,EAAE,yBAAyB,GACtC,aAAa,CAAC,qBAAqB,CAAC,CAwDtC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"warp.js","sourceRoot":"","sources":["../../../../src/tests/commands/warp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAkB,MAAM,IAAI,CAAC;AAEvC,OAAO,EAGL,SAAS,
|
|
1
|
+
{"version":3,"file":"warp.js","sourceRoot":"","sources":["../../../../src/tests/commands/warp.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import { expect } from 'chai';
|
|
2
2
|
import { Wallet } from 'ethers';
|
|
3
|
-
import {
|
|
3
|
+
import { TokenRouter__factory } from '@hyperlane-xyz/core';
|
|
4
|
+
import { TokenType, normalizeConfig, randomAddress, } from '@hyperlane-xyz/sdk';
|
|
5
|
+
import { getContext } from '../../context/context.js';
|
|
4
6
|
import { readYamlOrJson, writeYamlOrJson } from '../../utils/files.js';
|
|
5
|
-
import { ANVIL_KEY, CHAIN_NAME_2, CHAIN_NAME_3, CORE_CONFIG_PATH, DEFAULT_E2E_TEST_TIMEOUT, E2E_TEST_BURN_ADDRESS, EXAMPLES_PATH, TEMP_PATH, WARP_CONFIG_PATH_2, WARP_CONFIG_PATH_EXAMPLE, WARP_CORE_CONFIG_PATH_2, deployOrUseExistingCore, extendWarpConfig, getCombinedWarpRoutePath, getDomainId, } from '../commands/helpers.js';
|
|
7
|
+
import { ANVIL_KEY, CHAIN_NAME_2, CHAIN_NAME_3, CORE_CONFIG_PATH, DEFAULT_E2E_TEST_TIMEOUT, E2E_TEST_BURN_ADDRESS, EXAMPLES_PATH, REGISTRY_PATH, TEMP_PATH, WARP_CONFIG_PATH_2, WARP_CONFIG_PATH_EXAMPLE, WARP_CORE_CONFIG_PATH_2, deployOrUseExistingCore, extendWarpConfig, getCombinedWarpRoutePath, getDomainId, setupIncompleteWarpRouteExtension, } from '../commands/helpers.js';
|
|
6
8
|
import { hyperlaneWarpApply, hyperlaneWarpDeploy, readWarpConfig, } from '../commands/warp.js';
|
|
7
9
|
describe('hyperlane warp apply warp route extension tests', async function () {
|
|
8
10
|
this.timeout(2 * DEFAULT_E2E_TEST_TIMEOUT);
|
|
@@ -29,7 +31,6 @@ describe('hyperlane warp apply warp route extension tests', async function () {
|
|
|
29
31
|
name: 'Ether',
|
|
30
32
|
owner: new Wallet(ANVIL_KEY).address,
|
|
31
33
|
symbol: 'ETH',
|
|
32
|
-
totalSupply: 0,
|
|
33
34
|
type: TokenType.native,
|
|
34
35
|
};
|
|
35
36
|
await extendWarpConfig({
|
|
@@ -65,7 +66,6 @@ describe('hyperlane warp apply warp route extension tests', async function () {
|
|
|
65
66
|
name: 'Ether',
|
|
66
67
|
owner: new Wallet(ANVIL_KEY).address,
|
|
67
68
|
symbol: 'ETH',
|
|
68
|
-
totalSupply: 0,
|
|
69
69
|
type: TokenType.native,
|
|
70
70
|
};
|
|
71
71
|
await extendWarpConfig({
|
|
@@ -104,9 +104,11 @@ describe('hyperlane warp apply warp route extension tests', async function () {
|
|
|
104
104
|
name: 'Ether',
|
|
105
105
|
owner: randomOwner,
|
|
106
106
|
symbol: 'ETH',
|
|
107
|
-
totalSupply: 0,
|
|
108
107
|
type: TokenType.native,
|
|
109
108
|
};
|
|
109
|
+
// Remove remoteRouters and destinationGas as they are written in readWarpConfig
|
|
110
|
+
warpDeployConfig[CHAIN_NAME_2].remoteRouters = undefined;
|
|
111
|
+
warpDeployConfig[CHAIN_NAME_2].destinationGas = undefined;
|
|
110
112
|
warpDeployConfig[CHAIN_NAME_3] = extendedConfig;
|
|
111
113
|
writeYamlOrJson(warpDeployPath, warpDeployConfig);
|
|
112
114
|
await hyperlaneWarpApply(warpDeployPath, WARP_CORE_CONFIG_PATH_2);
|
|
@@ -141,10 +143,12 @@ describe('hyperlane warp apply warp route extension tests', async function () {
|
|
|
141
143
|
name: 'Ether',
|
|
142
144
|
owner: new Wallet(ANVIL_KEY).address,
|
|
143
145
|
symbol: 'ETH',
|
|
144
|
-
totalSupply: 0,
|
|
145
146
|
type: TokenType.native,
|
|
146
147
|
gas: GAS,
|
|
147
148
|
};
|
|
149
|
+
// Remove remoteRouters and destinationGas as they are written in readWarpConfig
|
|
150
|
+
warpDeployConfig[CHAIN_NAME_2].remoteRouters = undefined;
|
|
151
|
+
warpDeployConfig[CHAIN_NAME_2].destinationGas = undefined;
|
|
148
152
|
warpDeployConfig[CHAIN_NAME_3] = extendedConfig;
|
|
149
153
|
writeYamlOrJson(warpConfigPath, warpDeployConfig);
|
|
150
154
|
await hyperlaneWarpApply(warpConfigPath, WARP_CORE_CONFIG_PATH_2);
|
|
@@ -166,5 +170,241 @@ describe('hyperlane warp apply warp route extension tests', async function () {
|
|
|
166
170
|
expect(Object.keys(destinationGas_3)).to.include(chain2Id);
|
|
167
171
|
expect(destinationGas_3[chain2Id]).to.equal('7777');
|
|
168
172
|
});
|
|
173
|
+
it('should recover and re-enroll routers after direct contract-level unenrollment through TokenRouter interface (without having to specify the router table manually)', async () => {
|
|
174
|
+
const { multiProvider } = await getContext({
|
|
175
|
+
registryUris: [REGISTRY_PATH],
|
|
176
|
+
key: ANVIL_KEY,
|
|
177
|
+
});
|
|
178
|
+
const warpConfigPath = `${TEMP_PATH}/warp-route-deployment-2.yaml`;
|
|
179
|
+
// Initial setup with chain3 using extendWarpConfig
|
|
180
|
+
await extendWarpConfig({
|
|
181
|
+
chain: CHAIN_NAME_2,
|
|
182
|
+
chainToExtend: CHAIN_NAME_3,
|
|
183
|
+
extendedConfig: {
|
|
184
|
+
decimals: 18,
|
|
185
|
+
mailbox: chain2Addresses.mailbox,
|
|
186
|
+
name: 'Ether',
|
|
187
|
+
owner: new Wallet(ANVIL_KEY).address,
|
|
188
|
+
symbol: 'ETH',
|
|
189
|
+
type: TokenType.native,
|
|
190
|
+
},
|
|
191
|
+
warpCorePath: WARP_CORE_CONFIG_PATH_2,
|
|
192
|
+
warpDeployPath: warpConfigPath,
|
|
193
|
+
});
|
|
194
|
+
const COMBINED_WARP_CORE_CONFIG_PATH = getCombinedWarpRoutePath('ETH', [
|
|
195
|
+
CHAIN_NAME_2,
|
|
196
|
+
CHAIN_NAME_3,
|
|
197
|
+
]);
|
|
198
|
+
const warpCoreConfig = readYamlOrJson(COMBINED_WARP_CORE_CONFIG_PATH);
|
|
199
|
+
const deployedTokenRoute = warpCoreConfig.tokens.find((t) => t.chainName === CHAIN_NAME_2)?.addressOrDenom;
|
|
200
|
+
if (!deployedTokenRoute) {
|
|
201
|
+
throw new Error('Failed to find deployed token route address');
|
|
202
|
+
}
|
|
203
|
+
// Manually call unenrollRemoteRouters
|
|
204
|
+
const chain3Id = await getDomainId(CHAIN_NAME_3, ANVIL_KEY);
|
|
205
|
+
const tokenRouter = TokenRouter__factory.connect(deployedTokenRoute, new Wallet(ANVIL_KEY).connect(multiProvider.getProvider(CHAIN_NAME_2)));
|
|
206
|
+
await tokenRouter.unenrollRemoteRouters([chain3Id]);
|
|
207
|
+
// Verify the router was unenrolled
|
|
208
|
+
const beforeRecoveryConfig = await readWarpConfig(CHAIN_NAME_2, COMBINED_WARP_CORE_CONFIG_PATH, warpConfigPath);
|
|
209
|
+
expect(Object.keys(beforeRecoveryConfig[CHAIN_NAME_2].remoteRouters || {})).to.not.include(chain3Id.toString());
|
|
210
|
+
// Re-extend to fix the configuration
|
|
211
|
+
await extendWarpConfig({
|
|
212
|
+
chain: CHAIN_NAME_2,
|
|
213
|
+
chainToExtend: CHAIN_NAME_3,
|
|
214
|
+
extendedConfig: {
|
|
215
|
+
decimals: 18,
|
|
216
|
+
mailbox: chain2Addresses.mailbox,
|
|
217
|
+
name: 'Ether',
|
|
218
|
+
owner: new Wallet(ANVIL_KEY).address,
|
|
219
|
+
symbol: 'ETH',
|
|
220
|
+
type: TokenType.native,
|
|
221
|
+
},
|
|
222
|
+
warpCorePath: WARP_CORE_CONFIG_PATH_2,
|
|
223
|
+
warpDeployPath: warpConfigPath,
|
|
224
|
+
});
|
|
225
|
+
const recoveredConfig = await readWarpConfig(CHAIN_NAME_2, COMBINED_WARP_CORE_CONFIG_PATH, warpConfigPath);
|
|
226
|
+
expect(Object.keys(recoveredConfig[CHAIN_NAME_2].remoteRouters)).to.include(chain3Id.toString());
|
|
227
|
+
});
|
|
228
|
+
it('should complete warp route extension when previous attempt left incomplete enrollment or destination gas settings (second attempt on new combined config)', async () => {
|
|
229
|
+
const { chain2DomainId, chain3DomainId, warpConfigPath, configToExtend, combinedWarpCorePath, } = await setupIncompleteWarpRouteExtension(chain2Addresses);
|
|
230
|
+
// Verify initial state - neither chain should be enrolled in the other
|
|
231
|
+
const initialConfig2 = await readWarpConfig(CHAIN_NAME_2, combinedWarpCorePath, warpConfigPath);
|
|
232
|
+
const initialConfig3 = await readWarpConfig(CHAIN_NAME_3, combinedWarpCorePath, warpConfigPath);
|
|
233
|
+
// Check remote routers initial state
|
|
234
|
+
expect(Object.keys(initialConfig2[CHAIN_NAME_2].remoteRouters)).to.not.include(chain3DomainId);
|
|
235
|
+
expect(Object.keys(initialConfig3[CHAIN_NAME_3].remoteRouters)).to.not.include(chain2DomainId);
|
|
236
|
+
// Check destination gas initial state
|
|
237
|
+
expect(Object.keys(initialConfig2[CHAIN_NAME_2].destinationGas || {})).to.not.include(chain3DomainId);
|
|
238
|
+
expect(Object.keys(initialConfig3[CHAIN_NAME_3].destinationGas || {})).to.not.include(chain2DomainId);
|
|
239
|
+
// Complete the extension
|
|
240
|
+
await extendWarpConfig({
|
|
241
|
+
chain: CHAIN_NAME_2,
|
|
242
|
+
chainToExtend: CHAIN_NAME_3,
|
|
243
|
+
extendedConfig: configToExtend,
|
|
244
|
+
warpCorePath: combinedWarpCorePath,
|
|
245
|
+
warpDeployPath: warpConfigPath,
|
|
246
|
+
});
|
|
247
|
+
// Verify both chains are now properly configured
|
|
248
|
+
const finalConfig2 = await readWarpConfig(CHAIN_NAME_2, combinedWarpCorePath, warpConfigPath);
|
|
249
|
+
const finalConfig3 = await readWarpConfig(CHAIN_NAME_3, combinedWarpCorePath, warpConfigPath);
|
|
250
|
+
// Check remote routers final state
|
|
251
|
+
expect(Object.keys(finalConfig2[CHAIN_NAME_2].remoteRouters)).to.include(chain3DomainId);
|
|
252
|
+
expect(Object.keys(finalConfig3[CHAIN_NAME_3].remoteRouters)).to.include(chain2DomainId);
|
|
253
|
+
// Check destination gas final state
|
|
254
|
+
expect(Object.keys(finalConfig2[CHAIN_NAME_2].destinationGas)).to.include(chain3DomainId);
|
|
255
|
+
expect(Object.keys(finalConfig3[CHAIN_NAME_3].destinationGas)).to.include(chain2DomainId);
|
|
256
|
+
});
|
|
257
|
+
it('should complete warp route extension when previous attempt left incomplete enrollment or destination gas settings (second attempt with same config)', async () => {
|
|
258
|
+
const { chain2DomainId, chain3DomainId, warpConfigPath, configToExtend, combinedWarpCorePath, } = await setupIncompleteWarpRouteExtension(chain2Addresses);
|
|
259
|
+
// Verify initial state - neither chain should be enrolled in the other
|
|
260
|
+
const initialConfig2 = await readWarpConfig(CHAIN_NAME_2, combinedWarpCorePath, warpConfigPath);
|
|
261
|
+
const initialConfig3 = await readWarpConfig(CHAIN_NAME_3, combinedWarpCorePath, warpConfigPath);
|
|
262
|
+
// Check remote routers initial state
|
|
263
|
+
expect(Object.keys(initialConfig2[CHAIN_NAME_2].remoteRouters)).to.not.include(chain3DomainId);
|
|
264
|
+
expect(Object.keys(initialConfig3[CHAIN_NAME_3].remoteRouters)).to.not.include(chain2DomainId);
|
|
265
|
+
// Check destination gas initial state
|
|
266
|
+
expect(Object.keys(initialConfig2[CHAIN_NAME_2].destinationGas || {})).to.not.include(chain3DomainId);
|
|
267
|
+
expect(Object.keys(initialConfig3[CHAIN_NAME_3].destinationGas || {})).to.not.include(chain2DomainId);
|
|
268
|
+
// Complete the extension
|
|
269
|
+
await extendWarpConfig({
|
|
270
|
+
chain: CHAIN_NAME_2,
|
|
271
|
+
chainToExtend: CHAIN_NAME_3,
|
|
272
|
+
extendedConfig: configToExtend,
|
|
273
|
+
warpCorePath: WARP_CORE_CONFIG_PATH_2,
|
|
274
|
+
warpDeployPath: combinedWarpCorePath,
|
|
275
|
+
});
|
|
276
|
+
// Verify both chains are now properly configured
|
|
277
|
+
const finalConfig2 = await readWarpConfig(CHAIN_NAME_2, combinedWarpCorePath, warpConfigPath);
|
|
278
|
+
const finalConfig3 = await readWarpConfig(CHAIN_NAME_3, combinedWarpCorePath, warpConfigPath);
|
|
279
|
+
// Check remote routers final state
|
|
280
|
+
expect(Object.keys(finalConfig2[CHAIN_NAME_2].remoteRouters)).to.include(chain3DomainId);
|
|
281
|
+
expect(Object.keys(finalConfig3[CHAIN_NAME_3].remoteRouters)).to.include(chain2DomainId);
|
|
282
|
+
// Check destination gas final state
|
|
283
|
+
expect(Object.keys(finalConfig2[CHAIN_NAME_2].destinationGas)).to.include(chain3DomainId);
|
|
284
|
+
expect(Object.keys(finalConfig3[CHAIN_NAME_3].destinationGas)).to.include(chain2DomainId);
|
|
285
|
+
});
|
|
286
|
+
it('should set correct gas values when completing warp route extension (without having to specify the gas table manually)', async () => {
|
|
287
|
+
const { chain2DomainId, chain3DomainId, warpConfigPath, configToExtend, combinedWarpCorePath, } = await setupIncompleteWarpRouteExtension(chain2Addresses);
|
|
288
|
+
// Verify initial state - gas values should not be set
|
|
289
|
+
const initialConfig2 = await readWarpConfig(CHAIN_NAME_2, combinedWarpCorePath, warpConfigPath);
|
|
290
|
+
const initialConfig3 = await readWarpConfig(CHAIN_NAME_3, combinedWarpCorePath, warpConfigPath);
|
|
291
|
+
// Check initial gas values
|
|
292
|
+
expect(initialConfig2[CHAIN_NAME_2].destinationGas?.[chain3DomainId]).to.be
|
|
293
|
+
.undefined;
|
|
294
|
+
expect(initialConfig3[CHAIN_NAME_3].destinationGas?.[chain2DomainId]).to.be
|
|
295
|
+
.undefined;
|
|
296
|
+
// Set specific gas values for the extension
|
|
297
|
+
const customGasValue = '300000';
|
|
298
|
+
configToExtend.gas = parseInt(customGasValue);
|
|
299
|
+
// Complete the extension with custom gas value
|
|
300
|
+
await extendWarpConfig({
|
|
301
|
+
chain: CHAIN_NAME_2,
|
|
302
|
+
chainToExtend: CHAIN_NAME_3,
|
|
303
|
+
extendedConfig: configToExtend,
|
|
304
|
+
warpCorePath: combinedWarpCorePath,
|
|
305
|
+
warpDeployPath: warpConfigPath,
|
|
306
|
+
});
|
|
307
|
+
// Verify gas values are correctly set after extension
|
|
308
|
+
const finalConfig2 = await readWarpConfig(CHAIN_NAME_2, combinedWarpCorePath, warpConfigPath);
|
|
309
|
+
const finalConfig3 = await readWarpConfig(CHAIN_NAME_3, combinedWarpCorePath, warpConfigPath);
|
|
310
|
+
// Check gas value is set correctly
|
|
311
|
+
expect(finalConfig2[CHAIN_NAME_2].destinationGas[chain3DomainId]).to.equal(customGasValue);
|
|
312
|
+
// Verify remote routers are also properly set
|
|
313
|
+
expect(Object.keys(finalConfig2[CHAIN_NAME_2].remoteRouters)).to.include(chain3DomainId);
|
|
314
|
+
expect(Object.keys(finalConfig3[CHAIN_NAME_3].remoteRouters)).to.include(chain2DomainId);
|
|
315
|
+
});
|
|
316
|
+
it('should update destination gas configuration', async () => {
|
|
317
|
+
const warpDeployPath = `${TEMP_PATH}/warp-route-deployment-2.yaml`;
|
|
318
|
+
// Extend with new config
|
|
319
|
+
const config = {
|
|
320
|
+
decimals: 18,
|
|
321
|
+
mailbox: chain2Addresses.mailbox,
|
|
322
|
+
name: 'Ether',
|
|
323
|
+
owner: new Wallet(ANVIL_KEY).address,
|
|
324
|
+
symbol: 'ETH',
|
|
325
|
+
type: TokenType.native,
|
|
326
|
+
};
|
|
327
|
+
await extendWarpConfig({
|
|
328
|
+
chain: CHAIN_NAME_2,
|
|
329
|
+
chainToExtend: CHAIN_NAME_3,
|
|
330
|
+
extendedConfig: config,
|
|
331
|
+
warpCorePath: WARP_CORE_CONFIG_PATH_2,
|
|
332
|
+
warpDeployPath,
|
|
333
|
+
});
|
|
334
|
+
// First read the existing config
|
|
335
|
+
const warpDeployConfig = await readWarpConfig(CHAIN_NAME_2, WARP_CORE_CONFIG_PATH_2, warpDeployPath);
|
|
336
|
+
// Get the domain ID for chain 3
|
|
337
|
+
const chain3Id = await getDomainId(CHAIN_NAME_3, ANVIL_KEY);
|
|
338
|
+
// Update with new destination gas values
|
|
339
|
+
warpDeployConfig[CHAIN_NAME_2].destinationGas = {
|
|
340
|
+
[chain3Id]: '500000', // Set a specific gas value for chain 3
|
|
341
|
+
};
|
|
342
|
+
// Write the updated config
|
|
343
|
+
await writeYamlOrJson(warpDeployPath, warpDeployConfig);
|
|
344
|
+
// Apply the changes
|
|
345
|
+
await hyperlaneWarpApply(warpDeployPath, WARP_CORE_CONFIG_PATH_2);
|
|
346
|
+
// Read back the config to verify changes
|
|
347
|
+
const updatedConfig = await readWarpConfig(CHAIN_NAME_2, WARP_CORE_CONFIG_PATH_2, warpDeployPath);
|
|
348
|
+
// Verify the destination gas was updated correctly
|
|
349
|
+
expect(updatedConfig[CHAIN_NAME_2].destinationGas[chain3Id]).to.equal('500000');
|
|
350
|
+
});
|
|
351
|
+
it('should update remote routers configuration', async () => {
|
|
352
|
+
const warpDeployPath = `${TEMP_PATH}/warp-route-deployment-2.yaml`;
|
|
353
|
+
// Extend with new config
|
|
354
|
+
const config = {
|
|
355
|
+
decimals: 18,
|
|
356
|
+
mailbox: chain2Addresses.mailbox,
|
|
357
|
+
name: 'Ether',
|
|
358
|
+
owner: new Wallet(ANVIL_KEY).address,
|
|
359
|
+
symbol: 'ETH',
|
|
360
|
+
type: TokenType.native,
|
|
361
|
+
};
|
|
362
|
+
await extendWarpConfig({
|
|
363
|
+
chain: CHAIN_NAME_2,
|
|
364
|
+
chainToExtend: CHAIN_NAME_3,
|
|
365
|
+
extendedConfig: config,
|
|
366
|
+
warpCorePath: WARP_CORE_CONFIG_PATH_2,
|
|
367
|
+
warpDeployPath,
|
|
368
|
+
});
|
|
369
|
+
// First read the existing config
|
|
370
|
+
const warpDeployConfig = await readWarpConfig(CHAIN_NAME_2, WARP_CORE_CONFIG_PATH_2, warpDeployPath);
|
|
371
|
+
// Get the domain ID for chain 3
|
|
372
|
+
const chain3Id = await getDomainId(CHAIN_NAME_3, ANVIL_KEY);
|
|
373
|
+
// Generate a new router address to update
|
|
374
|
+
const newRouterAddress = randomAddress();
|
|
375
|
+
// Update with new remote router values
|
|
376
|
+
warpDeployConfig[CHAIN_NAME_2].remoteRouters = {
|
|
377
|
+
[chain3Id]: { address: newRouterAddress }, // Set a new router address for chain 3
|
|
378
|
+
};
|
|
379
|
+
// Write the updated config
|
|
380
|
+
await writeYamlOrJson(warpDeployPath, warpDeployConfig);
|
|
381
|
+
// Apply the changes
|
|
382
|
+
await hyperlaneWarpApply(warpDeployPath, WARP_CORE_CONFIG_PATH_2);
|
|
383
|
+
// Read back the config to verify changes
|
|
384
|
+
const updatedConfig = await readWarpConfig(CHAIN_NAME_2, WARP_CORE_CONFIG_PATH_2, warpDeployPath);
|
|
385
|
+
// Verify the remote router was updated correctly
|
|
386
|
+
expect(updatedConfig[CHAIN_NAME_2].remoteRouters[chain3Id].address.toLowerCase()).to.equal(newRouterAddress.toLowerCase());
|
|
387
|
+
});
|
|
388
|
+
it('should preserve deploy config when extending warp route', async () => {
|
|
389
|
+
const warpDeployPath = `${TEMP_PATH}/warp-route-deployment-2.yaml`;
|
|
390
|
+
const warpDeployConfig = await readWarpConfig(CHAIN_NAME_2, WARP_CORE_CONFIG_PATH_2, warpDeployPath);
|
|
391
|
+
// Extend with new config for chain 3
|
|
392
|
+
const extendedConfig = {
|
|
393
|
+
decimals: 18,
|
|
394
|
+
mailbox: chain2Addresses.mailbox,
|
|
395
|
+
name: 'Ether',
|
|
396
|
+
owner: new Wallet(ANVIL_KEY).address,
|
|
397
|
+
symbol: 'ETH',
|
|
398
|
+
type: TokenType.native,
|
|
399
|
+
};
|
|
400
|
+
warpDeployConfig[CHAIN_NAME_3] = extendedConfig;
|
|
401
|
+
// Remove remoteRouters and destinationGas as they are written in readWarpConfig
|
|
402
|
+
delete warpDeployConfig[CHAIN_NAME_2].remoteRouters;
|
|
403
|
+
delete warpDeployConfig[CHAIN_NAME_2].destinationGas;
|
|
404
|
+
await writeYamlOrJson(warpDeployPath, warpDeployConfig);
|
|
405
|
+
await hyperlaneWarpApply(warpDeployPath, WARP_CORE_CONFIG_PATH_2);
|
|
406
|
+
const updatedConfig = readYamlOrJson(warpDeployPath);
|
|
407
|
+
expect(normalizeConfig(warpDeployConfig)).to.deep.equal(normalizeConfig(updatedConfig), 'warp deploy config should remain unchanged after extension');
|
|
408
|
+
});
|
|
169
409
|
});
|
|
170
410
|
//# sourceMappingURL=warp-apply-extend.e2e-test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"warp-apply-extend.e2e-test.js","sourceRoot":"","sources":["../../../../src/tests/warp/warp-apply-extend.e2e-test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"warp-apply-extend.e2e-test.js","sourceRoot":"","sources":["../../../../src/tests/warp/warp-apply-extend.e2e-test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,15 @@
|
|
|
1
1
|
import { expect } from 'chai';
|
|
2
|
-
import {
|
|
2
|
+
import { Wallet } from 'ethers';
|
|
3
|
+
import { HookType, TokenType, normalizeConfig, randomAddress, } from '@hyperlane-xyz/sdk';
|
|
3
4
|
import { readYamlOrJson, writeYamlOrJson } from '../../utils/files.js';
|
|
4
|
-
import { ANVIL_KEY, CHAIN_NAME_2, CORE_CONFIG_PATH, DEFAULT_E2E_TEST_TIMEOUT, E2E_TEST_BURN_ADDRESS, TEMP_PATH, WARP_CONFIG_PATH_2, WARP_CONFIG_PATH_EXAMPLE, WARP_CORE_CONFIG_PATH_2, deployOrUseExistingCore, updateOwner, } from '../commands/helpers.js';
|
|
5
|
+
import { ANVIL_KEY, CHAIN_NAME_2, CHAIN_NAME_3, CORE_CONFIG_PATH, DEFAULT_E2E_TEST_TIMEOUT, E2E_TEST_BURN_ADDRESS, TEMP_PATH, WARP_CONFIG_PATH_2, WARP_CONFIG_PATH_EXAMPLE, WARP_CORE_CONFIG_PATH_2, deployOrUseExistingCore, extendWarpConfig, getCombinedWarpRoutePath, getDomainId, updateOwner, } from '../commands/helpers.js';
|
|
5
6
|
import { hyperlaneWarpApply, hyperlaneWarpDeploy, readWarpConfig, } from '../commands/warp.js';
|
|
6
7
|
describe('hyperlane warp apply owner update tests', async function () {
|
|
7
8
|
this.timeout(2 * DEFAULT_E2E_TEST_TIMEOUT);
|
|
9
|
+
let chain2Addresses = {};
|
|
8
10
|
before(async function () {
|
|
9
11
|
await deployOrUseExistingCore(CHAIN_NAME_2, CORE_CONFIG_PATH, ANVIL_KEY);
|
|
12
|
+
chain2Addresses = await deployOrUseExistingCore(CHAIN_NAME_3, CORE_CONFIG_PATH, ANVIL_KEY);
|
|
10
13
|
// Create a new warp config using the example
|
|
11
14
|
const warpConfig = readYamlOrJson(WARP_CONFIG_PATH_EXAMPLE);
|
|
12
15
|
const anvil2Config = { anvil2: { ...warpConfig.anvil1 } };
|
|
@@ -49,5 +52,40 @@ describe('hyperlane warp apply owner update tests', async function () {
|
|
|
49
52
|
// Verify the hook was updated with all properties
|
|
50
53
|
expect(normalizeConfig(updatedConfig[CHAIN_NAME_2].hook)).to.deep.equal(normalizeConfig(warpDeployConfig[CHAIN_NAME_2].hook));
|
|
51
54
|
});
|
|
55
|
+
it('should extend an existing warp route', async () => {
|
|
56
|
+
// Read existing config into a file
|
|
57
|
+
const warpConfigPath = `${TEMP_PATH}/warp-route-deployment-2.yaml`;
|
|
58
|
+
await readWarpConfig(CHAIN_NAME_2, WARP_CORE_CONFIG_PATH_2, warpConfigPath);
|
|
59
|
+
// Extend with new config
|
|
60
|
+
const config = {
|
|
61
|
+
decimals: 18,
|
|
62
|
+
mailbox: chain2Addresses.mailbox,
|
|
63
|
+
name: 'Ether',
|
|
64
|
+
owner: new Wallet(ANVIL_KEY).address,
|
|
65
|
+
symbol: 'ETH',
|
|
66
|
+
type: TokenType.native,
|
|
67
|
+
};
|
|
68
|
+
await extendWarpConfig({
|
|
69
|
+
chain: CHAIN_NAME_2,
|
|
70
|
+
chainToExtend: CHAIN_NAME_3,
|
|
71
|
+
extendedConfig: config,
|
|
72
|
+
warpCorePath: WARP_CORE_CONFIG_PATH_2,
|
|
73
|
+
warpDeployPath: warpConfigPath,
|
|
74
|
+
});
|
|
75
|
+
const COMBINED_WARP_CORE_CONFIG_PATH = getCombinedWarpRoutePath('ETH', [
|
|
76
|
+
CHAIN_NAME_2,
|
|
77
|
+
CHAIN_NAME_3,
|
|
78
|
+
]);
|
|
79
|
+
// Check that chain2 is enrolled in chain1
|
|
80
|
+
const updatedWarpDeployConfig1 = await readWarpConfig(CHAIN_NAME_2, COMBINED_WARP_CORE_CONFIG_PATH, warpConfigPath);
|
|
81
|
+
const chain2Id = await getDomainId(CHAIN_NAME_3, ANVIL_KEY);
|
|
82
|
+
const remoteRouterKeys1 = Object.keys(updatedWarpDeployConfig1[CHAIN_NAME_2].remoteRouters);
|
|
83
|
+
expect(remoteRouterKeys1).to.include(chain2Id);
|
|
84
|
+
// Check that chain1 is enrolled in chain2
|
|
85
|
+
const updatedWarpDeployConfig2 = await readWarpConfig(CHAIN_NAME_3, COMBINED_WARP_CORE_CONFIG_PATH, warpConfigPath);
|
|
86
|
+
const chain1Id = await getDomainId(CHAIN_NAME_2, ANVIL_KEY);
|
|
87
|
+
const remoteRouterKeys2 = Object.keys(updatedWarpDeployConfig2[CHAIN_NAME_3].remoteRouters);
|
|
88
|
+
expect(remoteRouterKeys2).to.include(chain1Id);
|
|
89
|
+
});
|
|
52
90
|
});
|
|
53
91
|
//# sourceMappingURL=warp-apply.e2e-test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"warp-apply.e2e-test.js","sourceRoot":"","sources":["../../../../src/tests/warp/warp-apply.e2e-test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"warp-apply.e2e-test.js","sourceRoot":"","sources":["../../../../src/tests/warp/warp-apply.e2e-test.ts"],"names":[],"mappings":"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"}
|