@hyperlane-xyz/cli 1.5.8 → 3.1.2
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/cli.js +0 -0
- package/dist/logger.d.ts +1 -0
- package/dist/logger.d.ts.map +1 -1
- package/dist/logger.js +1 -0
- package/dist/logger.js.map +1 -1
- package/dist/src/commands/chains.js +11 -5
- package/dist/src/commands/chains.js.map +1 -1
- package/dist/src/commands/config.d.ts.map +1 -1
- package/dist/src/commands/config.js +18 -0
- package/dist/src/commands/config.js.map +1 -1
- package/dist/src/commands/deploy.js +14 -14
- package/dist/src/commands/deploy.js.map +1 -1
- package/dist/src/commands/options.d.ts.map +1 -1
- package/dist/src/commands/options.js +7 -3
- package/dist/src/commands/options.js.map +1 -1
- package/dist/src/commands/send.js +1 -1
- package/dist/src/commands/send.js.map +1 -1
- package/dist/src/config/artifacts.d.ts.map +1 -1
- package/dist/src/config/artifacts.js +4 -3
- package/dist/src/config/artifacts.js.map +1 -1
- package/dist/src/config/hooks.d.ts +289 -0
- package/dist/src/config/hooks.d.ts.map +1 -0
- package/dist/src/config/hooks.js +173 -0
- package/dist/src/config/hooks.js.map +1 -0
- package/dist/src/config/multisig.d.ts +10 -10
- package/dist/src/config/multisig.d.ts.map +1 -1
- package/dist/src/config/multisig.js +7 -14
- package/dist/src/config/multisig.js.map +1 -1
- package/dist/src/config/warp.d.ts +1 -1
- package/dist/src/config/warp.d.ts.map +1 -1
- package/dist/src/config/warp.js +1 -1
- package/dist/src/config/warp.js.map +1 -1
- package/dist/src/context.d.ts +263 -241
- package/dist/src/context.d.ts.map +1 -1
- package/dist/src/deploy/core.d.ts +5 -4
- package/dist/src/deploy/core.d.ts.map +1 -1
- package/dist/src/deploy/core.js +103 -61
- package/dist/src/deploy/core.js.map +1 -1
- package/dist/src/deploy/types.d.ts +1 -1
- package/dist/src/deploy/types.d.ts.map +1 -1
- package/dist/src/deploy/utils.d.ts +6 -0
- package/dist/src/deploy/utils.d.ts.map +1 -1
- package/dist/src/deploy/utils.js +13 -2
- package/dist/src/deploy/utils.js.map +1 -1
- package/dist/src/deploy/warp.d.ts.map +1 -1
- package/dist/src/deploy/warp.js +12 -9
- package/dist/src/deploy/warp.js.map +1 -1
- package/dist/src/send/message.d.ts.map +1 -1
- package/dist/src/send/message.js +8 -14
- package/dist/src/send/message.js.map +1 -1
- package/dist/src/send/transfer.d.ts +1 -2
- package/dist/src/send/transfer.d.ts.map +1 -1
- package/dist/src/send/transfer.js +2 -2
- package/dist/src/send/transfer.js.map +1 -1
- package/dist/src/utils/balances.js +1 -1
- package/dist/src/utils/balances.js.map +1 -1
- package/dist/src/utils/chains.d.ts +0 -4
- package/dist/src/utils/chains.d.ts.map +1 -1
- package/dist/src/utils/chains.js +8 -13
- package/dist/src/utils/chains.js.map +1 -1
- package/examples/hook-config.yaml +18 -0
- package/examples/multisig-ism.yaml +2 -2
- package/package.json +3 -4
|
@@ -0,0 +1,173 @@
|
|
|
1
|
+
import { confirm, input, select } from '@inquirer/prompts';
|
|
2
|
+
import { ethers } from 'ethers';
|
|
3
|
+
import { z } from 'zod';
|
|
4
|
+
import { GasOracleContractType, HookType, defaultMultisigIsmConfigs, multisigIsmVerificationCost, } from '@hyperlane-xyz/sdk';
|
|
5
|
+
import { objMap } from '@hyperlane-xyz/utils';
|
|
6
|
+
import { errorRed, log, logBlue, logGreen, logRed } from '../../logger.js';
|
|
7
|
+
import { runMultiChainSelectionStep } from '../utils/chains.js';
|
|
8
|
+
import { mergeYamlOrJson, readYamlOrJson } from '../utils/files.js';
|
|
9
|
+
import { readChainConfigIfExists } from './chain.js';
|
|
10
|
+
const ProtocolFeeSchema = z.object({
|
|
11
|
+
type: z.literal(HookType.PROTOCOL_FEE),
|
|
12
|
+
owner: z.string(),
|
|
13
|
+
beneficiary: z.string(),
|
|
14
|
+
maxProtocolFee: z.string(),
|
|
15
|
+
protocolFee: z.string(),
|
|
16
|
+
});
|
|
17
|
+
const MerkleTreeSchema = z.object({
|
|
18
|
+
type: z.literal(HookType.MERKLE_TREE),
|
|
19
|
+
});
|
|
20
|
+
const HookSchema = z.union([ProtocolFeeSchema, MerkleTreeSchema]);
|
|
21
|
+
const ConfigSchema = z.object({
|
|
22
|
+
required: HookSchema,
|
|
23
|
+
default: HookSchema,
|
|
24
|
+
});
|
|
25
|
+
const HookConfigMapSchema = z.object({}).catchall(ConfigSchema);
|
|
26
|
+
export function isValidHookConfigMap(config) {
|
|
27
|
+
return HookConfigMapSchema.safeParse(config).success;
|
|
28
|
+
}
|
|
29
|
+
export function presetHookConfigs(owner, local, destinationChains, ismConfig) {
|
|
30
|
+
const gasOracleType = destinationChains.reduce((acc, chain) => {
|
|
31
|
+
acc[chain] = GasOracleContractType.StorageGasOracle;
|
|
32
|
+
return acc;
|
|
33
|
+
}, {});
|
|
34
|
+
const overhead = destinationChains.reduce((acc, chain) => {
|
|
35
|
+
let validatorThreshold, validatorCount;
|
|
36
|
+
if (ismConfig) {
|
|
37
|
+
validatorThreshold = ismConfig.threshold;
|
|
38
|
+
validatorCount = ismConfig.validators.length;
|
|
39
|
+
}
|
|
40
|
+
else if (local in defaultMultisigIsmConfigs) {
|
|
41
|
+
validatorThreshold = defaultMultisigIsmConfigs[local].threshold;
|
|
42
|
+
validatorCount = defaultMultisigIsmConfigs[local].validators.length;
|
|
43
|
+
}
|
|
44
|
+
else {
|
|
45
|
+
throw new Error('Cannot estimate gas overhead for IGP hook');
|
|
46
|
+
}
|
|
47
|
+
acc[chain] = multisigIsmVerificationCost(validatorThreshold, validatorCount);
|
|
48
|
+
return acc;
|
|
49
|
+
}, {});
|
|
50
|
+
return {
|
|
51
|
+
required: {
|
|
52
|
+
type: HookType.PROTOCOL_FEE,
|
|
53
|
+
maxProtocolFee: ethers.utils.parseUnits('1', 'gwei'),
|
|
54
|
+
protocolFee: ethers.utils.parseUnits('0', 'wei'),
|
|
55
|
+
beneficiary: owner,
|
|
56
|
+
owner: owner,
|
|
57
|
+
},
|
|
58
|
+
default: {
|
|
59
|
+
type: HookType.AGGREGATION,
|
|
60
|
+
hooks: [
|
|
61
|
+
{
|
|
62
|
+
type: HookType.MERKLE_TREE,
|
|
63
|
+
},
|
|
64
|
+
{
|
|
65
|
+
type: HookType.INTERCHAIN_GAS_PAYMASTER,
|
|
66
|
+
owner: owner,
|
|
67
|
+
beneficiary: owner,
|
|
68
|
+
gasOracleType,
|
|
69
|
+
overhead,
|
|
70
|
+
oracleKey: owner,
|
|
71
|
+
},
|
|
72
|
+
],
|
|
73
|
+
},
|
|
74
|
+
};
|
|
75
|
+
}
|
|
76
|
+
export function readHookConfig(filePath) {
|
|
77
|
+
const config = readYamlOrJson(filePath);
|
|
78
|
+
if (!config) {
|
|
79
|
+
logRed(`No multisig config found at ${filePath}`);
|
|
80
|
+
return;
|
|
81
|
+
}
|
|
82
|
+
const result = HookConfigMapSchema.safeParse(config);
|
|
83
|
+
if (!result.success) {
|
|
84
|
+
const firstIssue = result.error.issues[0];
|
|
85
|
+
throw new Error(`Invalid hook config: ${firstIssue.path} => ${firstIssue.message}`);
|
|
86
|
+
}
|
|
87
|
+
const parsedConfig = result.data;
|
|
88
|
+
const defaultHook = objMap(parsedConfig, (_, config) => ({
|
|
89
|
+
type: config.default.type,
|
|
90
|
+
}));
|
|
91
|
+
logGreen(`All multisig configs in ${filePath} are valid`);
|
|
92
|
+
return defaultHook;
|
|
93
|
+
}
|
|
94
|
+
// TODO: read different hook configs
|
|
95
|
+
// export async function readProtocolFeeHookConfig(config: {type: HookType.PROTOCOL_FEE, ...}) {
|
|
96
|
+
export async function createHookConfig({ format, outPath, chainConfigPath, }) {
|
|
97
|
+
logBlue('Creating a new hook config');
|
|
98
|
+
const customChains = readChainConfigIfExists(chainConfigPath);
|
|
99
|
+
const chains = await runMultiChainSelectionStep(customChains);
|
|
100
|
+
const result = {};
|
|
101
|
+
for (const chain of chains) {
|
|
102
|
+
for (const hookRequirements of ['required', 'default']) {
|
|
103
|
+
log(`Setting ${hookRequirements} hook for chain ${chain}`);
|
|
104
|
+
const hookType = await select({
|
|
105
|
+
message: 'Select hook type',
|
|
106
|
+
choices: [
|
|
107
|
+
{ value: 'merkle_tree', name: 'MerkleTreeHook' },
|
|
108
|
+
{ value: 'protocol_fee', name: 'StaticProtocolFee' },
|
|
109
|
+
],
|
|
110
|
+
pageSize: 5,
|
|
111
|
+
});
|
|
112
|
+
switch (hookType) {
|
|
113
|
+
case 'merkle_tree': {
|
|
114
|
+
result[chain] = {
|
|
115
|
+
...result[chain],
|
|
116
|
+
[hookRequirements]: { type: HookType.MERKLE_TREE },
|
|
117
|
+
};
|
|
118
|
+
break;
|
|
119
|
+
}
|
|
120
|
+
case 'protocol_fee': {
|
|
121
|
+
const owner = await input({
|
|
122
|
+
message: 'Enter owner address',
|
|
123
|
+
});
|
|
124
|
+
const ownerAddress = ethers.utils.getAddress(owner);
|
|
125
|
+
let beneficiary;
|
|
126
|
+
let sameAsOwner = false;
|
|
127
|
+
sameAsOwner = await confirm({
|
|
128
|
+
message: 'Use this same address for the beneficiary?',
|
|
129
|
+
});
|
|
130
|
+
if (sameAsOwner) {
|
|
131
|
+
beneficiary = ownerAddress;
|
|
132
|
+
}
|
|
133
|
+
else {
|
|
134
|
+
beneficiary = await input({
|
|
135
|
+
message: 'Enter beneficiary address',
|
|
136
|
+
});
|
|
137
|
+
}
|
|
138
|
+
const beneficiaryAddress = ethers.utils.getAddress(beneficiary);
|
|
139
|
+
// TODO: input in gwei, wei, etc
|
|
140
|
+
const maxProtocolFee = ethers.utils.parseUnits(await input({
|
|
141
|
+
message: 'Enter max protocol fee (in 10^18)',
|
|
142
|
+
}), 'ether');
|
|
143
|
+
const protocolFee = ethers.utils.parseUnits(await input({
|
|
144
|
+
message: 'Enter protocol fee (in 10^18)',
|
|
145
|
+
}), 'ether');
|
|
146
|
+
if (protocolFee.gt(maxProtocolFee)) {
|
|
147
|
+
errorRed('Protocol fee cannot be greater than max protocol fee');
|
|
148
|
+
throw new Error('Invalid protocol fee');
|
|
149
|
+
}
|
|
150
|
+
result[chain] = {
|
|
151
|
+
...result[chain],
|
|
152
|
+
[hookRequirements]: {
|
|
153
|
+
type: HookType.PROTOCOL_FEE,
|
|
154
|
+
maxProtocolFee: maxProtocolFee.toString(),
|
|
155
|
+
protocolFee: protocolFee.toString(),
|
|
156
|
+
beneficiary: beneficiaryAddress,
|
|
157
|
+
owner: ownerAddress,
|
|
158
|
+
},
|
|
159
|
+
};
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
if (isValidHookConfigMap(result)) {
|
|
164
|
+
logGreen(`Hook config is valid, writing to file ${outPath}`);
|
|
165
|
+
mergeYamlOrJson(outPath, result, format);
|
|
166
|
+
}
|
|
167
|
+
else {
|
|
168
|
+
errorRed(`Hook config is invalid, please see https://github.com/hyperlane-xyz/hyperlane-monorepo/blob/main/typescript/cli/examples/hook-config.yaml for an example`);
|
|
169
|
+
throw new Error('Invalid hook config');
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
//# sourceMappingURL=hooks.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"hooks.js","sourceRoot":"","sources":["../../../src/config/hooks.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,40 +1,40 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
|
-
import { ChainMap, MultisigIsmConfig } from '@hyperlane-xyz/sdk';
|
|
2
|
+
import { ChainMap, IsmType, MultisigIsmConfig } from '@hyperlane-xyz/sdk';
|
|
3
3
|
import { FileFormat } from '../utils/files.js';
|
|
4
4
|
declare const MultisigConfigMapSchema: z.ZodObject<{}, "strip", z.ZodObject<{
|
|
5
|
-
type: z.
|
|
5
|
+
type: z.ZodNativeEnum<typeof IsmType>;
|
|
6
6
|
threshold: z.ZodNumber;
|
|
7
7
|
validators: z.ZodArray<z.ZodString, "many">;
|
|
8
8
|
}, "strip", z.ZodTypeAny, {
|
|
9
|
-
type:
|
|
9
|
+
type: IsmType;
|
|
10
10
|
threshold: number;
|
|
11
11
|
validators: string[];
|
|
12
12
|
}, {
|
|
13
|
-
type:
|
|
13
|
+
type: IsmType;
|
|
14
14
|
threshold: number;
|
|
15
15
|
validators: string[];
|
|
16
16
|
}>, z.objectOutputType<{}, z.ZodObject<{
|
|
17
|
-
type: z.
|
|
17
|
+
type: z.ZodNativeEnum<typeof IsmType>;
|
|
18
18
|
threshold: z.ZodNumber;
|
|
19
19
|
validators: z.ZodArray<z.ZodString, "many">;
|
|
20
20
|
}, "strip", z.ZodTypeAny, {
|
|
21
|
-
type:
|
|
21
|
+
type: IsmType;
|
|
22
22
|
threshold: number;
|
|
23
23
|
validators: string[];
|
|
24
24
|
}, {
|
|
25
|
-
type:
|
|
25
|
+
type: IsmType;
|
|
26
26
|
threshold: number;
|
|
27
27
|
validators: string[];
|
|
28
28
|
}>, "strip">, z.objectInputType<{}, z.ZodObject<{
|
|
29
|
-
type: z.
|
|
29
|
+
type: z.ZodNativeEnum<typeof IsmType>;
|
|
30
30
|
threshold: z.ZodNumber;
|
|
31
31
|
validators: z.ZodArray<z.ZodString, "many">;
|
|
32
32
|
}, "strip", z.ZodTypeAny, {
|
|
33
|
-
type:
|
|
33
|
+
type: IsmType;
|
|
34
34
|
threshold: number;
|
|
35
35
|
validators: string[];
|
|
36
36
|
}, {
|
|
37
|
-
type:
|
|
37
|
+
type: IsmType;
|
|
38
38
|
threshold: number;
|
|
39
39
|
validators: string[];
|
|
40
40
|
}>, "strip">>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"multisig.d.ts","sourceRoot":"","sources":["../../../src/config/multisig.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,QAAQ,
|
|
1
|
+
{"version":3,"file":"multisig.d.ts","sourceRoot":"","sources":["../../../src/config/multisig.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAK1E,OAAO,EAAE,UAAU,EAAmC,MAAM,mBAAmB,CAAC;AAIhF,QAAA,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAM5B,CAAC;AACF,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAExE,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,+BAuBlD;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,GAAG,WAEhD;AAED,wBAAsB,oBAAoB,CAAC,EACzC,MAAM,EACN,OAAO,EACP,eAAe,GAChB,EAAE;IACD,MAAM,EAAE,UAAU,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,MAAM,CAAC;CACzB,iBA0DA"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { confirm, input, select } from '@inquirer/prompts';
|
|
2
2
|
import { z } from 'zod';
|
|
3
|
-
import {
|
|
3
|
+
import { IsmType } from '@hyperlane-xyz/sdk';
|
|
4
4
|
import { objMap } from '@hyperlane-xyz/utils';
|
|
5
5
|
import { errorRed, log, logBlue, logGreen } from '../../logger.js';
|
|
6
6
|
import { runMultiChainSelectionStep } from '../utils/chains.js';
|
|
7
7
|
import { mergeYamlOrJson, readYamlOrJson } from '../utils/files.js';
|
|
8
8
|
import { readChainConfigIfExists } from './chain.js';
|
|
9
9
|
const MultisigConfigMapSchema = z.object({}).catchall(z.object({
|
|
10
|
-
type: z.
|
|
10
|
+
type: z.nativeEnum(IsmType),
|
|
11
11
|
threshold: z.number(),
|
|
12
12
|
validators: z.array(z.string()),
|
|
13
13
|
}));
|
|
@@ -22,8 +22,9 @@ export function readMultisigConfig(filePath) {
|
|
|
22
22
|
}
|
|
23
23
|
const parsedConfig = result.data;
|
|
24
24
|
const formattedConfig = objMap(parsedConfig, (_, config) => ({
|
|
25
|
-
|
|
26
|
-
|
|
25
|
+
type: config.type,
|
|
26
|
+
threshold: config.threshold,
|
|
27
|
+
validators: config.validators,
|
|
27
28
|
}));
|
|
28
29
|
logGreen(`All multisig configs in ${filePath} are valid`);
|
|
29
30
|
return formattedConfig;
|
|
@@ -31,13 +32,6 @@ export function readMultisigConfig(filePath) {
|
|
|
31
32
|
export function isValidMultisigConfig(config) {
|
|
32
33
|
return MultisigConfigMapSchema.safeParse(config).success;
|
|
33
34
|
}
|
|
34
|
-
function humanReadableIsmTypeToEnum(type) {
|
|
35
|
-
for (const [key, value] of Object.entries(ModuleType)) {
|
|
36
|
-
if (key.toLowerCase() === type)
|
|
37
|
-
return parseInt(value.toString(), 10);
|
|
38
|
-
}
|
|
39
|
-
throw new Error(`Invalid ISM type ${type}`);
|
|
40
|
-
}
|
|
41
35
|
export async function createMultisigConfig({ format, outPath, chainConfigPath, }) {
|
|
42
36
|
logBlue('Creating a new multisig config');
|
|
43
37
|
const customChains = readChainConfigIfExists(chainConfigPath);
|
|
@@ -59,9 +53,8 @@ export async function createMultisigConfig({ format, outPath, chainConfigPath, }
|
|
|
59
53
|
choices: [
|
|
60
54
|
// { value: 'routing, name: 'routing' }, // TODO add support
|
|
61
55
|
// { value: 'aggregation, name: 'aggregation' }, // TODO add support
|
|
62
|
-
{ value:
|
|
63
|
-
{ value:
|
|
64
|
-
{ value: 'message_id_multisig', name: 'message id multisig' },
|
|
56
|
+
{ value: IsmType.MERKLE_ROOT_MULTISIG, name: 'merkle root multisig' },
|
|
57
|
+
{ value: IsmType.MESSAGE_ID_MULTISIG, name: 'message id multisig' },
|
|
65
58
|
],
|
|
66
59
|
pageSize: 5,
|
|
67
60
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"multisig.js","sourceRoot":"","sources":["../../../src/config/multisig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAY,
|
|
1
|
+
{"version":3,"file":"multisig.js","sourceRoot":"","sources":["../../../src/config/multisig.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"warp.d.ts","sourceRoot":"","sources":["../../../src/config/warp.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,SAAS,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"warp.d.ts","sourceRoot":"","sources":["../../../src/config/warp.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAO/C,OAAO,EAAE,UAAU,EAAmC,MAAM,mBAAmB,CAAC;AAWhF,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAsBhC,CAAC;AAEH,KAAK,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AAE1D,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;IAC3B,UAAU,EAAE,KAAK,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAClD,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAWnD;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,GAAG,WAEjD;AAED,wBAAsB,gBAAgB,CAAC,EACrC,MAAM,EACN,OAAO,EACP,eAAe,GAChB,EAAE;IACD,MAAM,EAAE,UAAU,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,MAAM,CAAC;CACzB,iBA+CA"}
|
package/dist/src/config/warp.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { confirm, input } from '@inquirer/prompts';
|
|
2
2
|
import { ethers } from 'ethers';
|
|
3
3
|
import { z } from 'zod';
|
|
4
|
-
import { TokenType } from '@hyperlane-xyz/
|
|
4
|
+
import { TokenType } from '@hyperlane-xyz/sdk';
|
|
5
5
|
import { errorRed, logBlue, logGreen } from '../../logger.js';
|
|
6
6
|
import { runMultiChainSelectionStep, runSingleChainSelectionStep, } from '../utils/chains.js';
|
|
7
7
|
import { readYamlOrJson, writeYamlOrJson } from '../utils/files.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"warp.js","sourceRoot":"","sources":["../../../src/config/warp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,SAAS,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"warp.js","sourceRoot":"","sources":["../../../src/config/warp.ts"],"names":[],"mappings":"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"}
|