@hyperlane-xyz/sdk 4.0.0 → 4.2.0-beta.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/aws/validator.js +1 -1
- package/dist/aws/validator.js.map +1 -1
- package/dist/consts/multisigIsm.d.ts.map +1 -1
- package/dist/consts/multisigIsm.js +78 -19
- package/dist/consts/multisigIsm.js.map +1 -1
- package/dist/core/EvmCoreModule.d.ts +4 -0
- package/dist/core/EvmCoreModule.d.ts.map +1 -1
- package/dist/core/EvmCoreModule.js +8 -9
- package/dist/core/EvmCoreModule.js.map +1 -1
- package/dist/core/EvmCoreReader.d.ts +1 -0
- package/dist/core/EvmCoreReader.d.ts.map +1 -1
- package/dist/core/EvmCoreReader.js +11 -2
- package/dist/core/EvmCoreReader.js.map +1 -1
- package/dist/core/EvmIcaModule.d.ts +3 -1
- package/dist/core/EvmIcaModule.d.ts.map +1 -1
- package/dist/core/EvmIcaModule.js +2 -2
- package/dist/core/EvmIcaModule.js.map +1 -1
- package/dist/core/HyperlaneCore.d.ts +23 -7
- package/dist/core/HyperlaneCore.d.ts.map +1 -1
- package/dist/core/HyperlaneCore.js +82 -24
- package/dist/core/HyperlaneCore.js.map +1 -1
- package/dist/core/HyperlaneCoreChecker.d.ts.map +1 -1
- package/dist/core/HyperlaneCoreChecker.js +1 -1
- package/dist/core/HyperlaneCoreChecker.js.map +1 -1
- package/dist/core/HyperlaneCoreDeployer.d.ts.map +1 -1
- package/dist/core/HyperlaneCoreDeployer.js +6 -1
- package/dist/core/HyperlaneCoreDeployer.js.map +1 -1
- package/dist/core/HyperlaneRelayer.d.ts +328 -0
- package/dist/core/HyperlaneRelayer.d.ts.map +1 -0
- package/dist/core/HyperlaneRelayer.js +144 -0
- package/dist/core/HyperlaneRelayer.js.map +1 -0
- package/dist/core/schemas.d.ts +842 -842
- package/dist/deploy/EvmModuleDeployer.d.ts +4 -3
- package/dist/deploy/EvmModuleDeployer.d.ts.map +1 -1
- package/dist/deploy/EvmModuleDeployer.js +11 -4
- package/dist/deploy/EvmModuleDeployer.js.map +1 -1
- package/dist/deploy/HyperlaneDeployer.d.ts +1 -1
- package/dist/deploy/HyperlaneDeployer.d.ts.map +1 -1
- package/dist/deploy/HyperlaneDeployer.js +20 -9
- package/dist/deploy/HyperlaneDeployer.js.map +1 -1
- package/dist/deploy/proxy.d.ts +1 -0
- package/dist/deploy/proxy.d.ts.map +1 -1
- package/dist/deploy/proxy.js +6 -0
- package/dist/deploy/proxy.js.map +1 -1
- package/dist/deploy/schemas.d.ts +20 -0
- package/dist/deploy/schemas.d.ts.map +1 -1
- package/dist/deploy/schemas.js +7 -0
- package/dist/deploy/schemas.js.map +1 -1
- package/dist/deploy/verify/ContractVerifier.d.ts +20 -6
- package/dist/deploy/verify/ContractVerifier.d.ts.map +1 -1
- package/dist/deploy/verify/ContractVerifier.js +187 -97
- package/dist/deploy/verify/ContractVerifier.js.map +1 -1
- package/dist/deploy/verify/types.d.ts +15 -4
- package/dist/deploy/verify/types.d.ts.map +1 -1
- package/dist/deploy/verify/types.js +4 -3
- package/dist/deploy/verify/types.js.map +1 -1
- package/dist/deploy/verify/utils.d.ts +9 -2
- package/dist/deploy/verify/utils.d.ts.map +1 -1
- package/dist/deploy/verify/utils.js +4 -3
- package/dist/deploy/verify/utils.js.map +1 -1
- package/dist/hook/EvmHookModule.d.ts +45 -6
- package/dist/hook/EvmHookModule.d.ts.map +1 -1
- package/dist/hook/EvmHookModule.hardhat-test.js +334 -106
- package/dist/hook/EvmHookModule.hardhat-test.js.map +1 -1
- package/dist/hook/EvmHookModule.js +293 -75
- package/dist/hook/EvmHookModule.js.map +1 -1
- package/dist/hook/EvmHookReader.d.ts +7 -12
- package/dist/hook/EvmHookReader.d.ts.map +1 -1
- package/dist/hook/EvmHookReader.js +44 -41
- package/dist/hook/EvmHookReader.js.map +1 -1
- package/dist/hook/EvmHookReader.test.js +7 -3
- package/dist/hook/EvmHookReader.test.js.map +1 -1
- package/dist/hook/schemas.d.ts +4 -4
- package/dist/hook/types.d.ts +1 -0
- package/dist/hook/types.d.ts.map +1 -1
- package/dist/hook/types.js +8 -0
- package/dist/hook/types.js.map +1 -1
- package/dist/index.d.ts +61 -58
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +46 -46
- package/dist/index.js.map +1 -1
- package/dist/ism/EvmIsmModule.d.ts +7 -7
- package/dist/ism/EvmIsmModule.d.ts.map +1 -1
- package/dist/ism/EvmIsmModule.hardhat-test.js +30 -28
- package/dist/ism/EvmIsmModule.hardhat-test.js.map +1 -1
- package/dist/ism/EvmIsmModule.js +42 -60
- package/dist/ism/EvmIsmModule.js.map +1 -1
- package/dist/ism/EvmIsmReader.d.ts +5 -4
- package/dist/ism/EvmIsmReader.d.ts.map +1 -1
- package/dist/ism/EvmIsmReader.js +56 -36
- package/dist/ism/EvmIsmReader.js.map +1 -1
- package/dist/ism/HyperlaneIsmFactory.d.ts.map +1 -1
- package/dist/ism/HyperlaneIsmFactory.js +2 -0
- package/dist/ism/HyperlaneIsmFactory.js.map +1 -1
- package/dist/ism/metadata/aggregation.test.js +1 -1
- package/dist/ism/metadata/aggregation.test.js.map +1 -1
- package/dist/ism/metadata/builder.hardhat-test.js +29 -14
- package/dist/ism/metadata/builder.hardhat-test.js.map +1 -1
- package/dist/ism/metadata/multisig.d.ts.map +1 -1
- package/dist/ism/metadata/multisig.js +1 -1
- package/dist/ism/metadata/multisig.js.map +1 -1
- package/dist/ism/utils.js +2 -2
- package/dist/ism/utils.js.map +1 -1
- package/dist/metadata/ChainMetadataManager.d.ts +2 -0
- package/dist/metadata/ChainMetadataManager.d.ts.map +1 -1
- package/dist/metadata/ChainMetadataManager.js +6 -0
- package/dist/metadata/ChainMetadataManager.js.map +1 -1
- package/dist/metadata/agentConfig.d.ts +1968 -1723
- package/dist/metadata/agentConfig.d.ts.map +1 -1
- package/dist/metadata/chainMetadataTypes.d.ts +724 -618
- package/dist/metadata/chainMetadataTypes.d.ts.map +1 -1
- package/dist/metadata/chainMetadataTypes.js +63 -51
- package/dist/metadata/chainMetadataTypes.js.map +1 -1
- package/dist/metadata/deploymentArtifacts.d.ts +2 -2
- package/dist/providers/MultiProvider.d.ts +7 -0
- package/dist/providers/MultiProvider.d.ts.map +1 -1
- package/dist/providers/MultiProvider.js +9 -1
- package/dist/providers/MultiProvider.js.map +1 -1
- package/dist/providers/SmartProvider/SmartProvider.d.ts +2 -1
- package/dist/providers/SmartProvider/SmartProvider.d.ts.map +1 -1
- package/dist/providers/SmartProvider/SmartProvider.foundry-test.js +58 -0
- package/dist/providers/SmartProvider/SmartProvider.foundry-test.js.map +1 -1
- package/dist/providers/SmartProvider/SmartProvider.js +34 -9
- package/dist/providers/SmartProvider/SmartProvider.js.map +1 -1
- package/dist/providers/transactions/schemas.d.ts +15 -2
- package/dist/providers/transactions/schemas.d.ts.map +1 -1
- package/dist/providers/transactions/schemas.js +1 -0
- package/dist/providers/transactions/schemas.js.map +1 -1
- package/dist/providers/transactions/submitter/builder/schemas.d.ts +67 -146
- package/dist/providers/transactions/submitter/builder/schemas.d.ts.map +1 -1
- package/dist/providers/transactions/submitter/ethersV5/EV5GnosisSafeTxSubmitter.d.ts +2 -2
- package/dist/providers/transactions/submitter/ethersV5/EV5GnosisSafeTxSubmitter.d.ts.map +1 -1
- package/dist/providers/transactions/submitter/ethersV5/EV5GnosisSafeTxSubmitter.js.map +1 -1
- package/dist/providers/transactions/submitter/ethersV5/EV5ImpersonatedAccountTxSubmitter.d.ts +2 -2
- package/dist/providers/transactions/submitter/ethersV5/EV5ImpersonatedAccountTxSubmitter.d.ts.map +1 -1
- package/dist/providers/transactions/submitter/ethersV5/EV5ImpersonatedAccountTxSubmitter.js.map +1 -1
- package/dist/providers/transactions/submitter/ethersV5/EV5JsonRpcTxSubmitter.d.ts +2 -2
- package/dist/providers/transactions/submitter/ethersV5/EV5JsonRpcTxSubmitter.d.ts.map +1 -1
- package/dist/providers/transactions/submitter/ethersV5/EV5JsonRpcTxSubmitter.js.map +1 -1
- package/dist/providers/transactions/submitter/schemas.d.ts +9 -34
- package/dist/providers/transactions/submitter/schemas.d.ts.map +1 -1
- package/dist/providers/transactions/submitter/schemas.js +2 -3
- package/dist/providers/transactions/submitter/schemas.js.map +1 -1
- package/dist/providers/transactions/transformer/ethersV5/EV5InterchainAccountTxTransformer.d.ts +2 -2
- package/dist/providers/transactions/transformer/ethersV5/EV5InterchainAccountTxTransformer.d.ts.map +1 -1
- package/dist/providers/transactions/transformer/ethersV5/EV5InterchainAccountTxTransformer.js +5 -5
- package/dist/providers/transactions/transformer/ethersV5/EV5InterchainAccountTxTransformer.js.map +1 -1
- package/dist/providers/transactions/transformer/schemas.d.ts +36 -76
- package/dist/providers/transactions/transformer/schemas.d.ts.map +1 -1
- package/dist/providers/transactions/transformer/schemas.js +1 -1
- package/dist/providers/transactions/transformer/schemas.js.map +1 -1
- package/dist/providers/transactions/types.d.ts +2 -1
- package/dist/providers/transactions/types.d.ts.map +1 -1
- package/dist/router/schemas.d.ts +196 -90
- package/dist/router/schemas.d.ts.map +1 -1
- package/dist/router/schemas.js +8 -1
- package/dist/router/schemas.js.map +1 -1
- package/dist/router/types.d.ts +2 -1
- package/dist/router/types.d.ts.map +1 -1
- package/dist/router/types.js.map +1 -1
- package/dist/test/testUtils.js +1 -1
- package/dist/test/testUtils.js.map +1 -1
- package/dist/token/EvmERC20WarpModule.d.ts +40 -5
- package/dist/token/EvmERC20WarpModule.d.ts.map +1 -1
- package/dist/token/EvmERC20WarpModule.hardhat-test.js +252 -1
- package/dist/token/EvmERC20WarpModule.hardhat-test.js.map +1 -1
- package/dist/token/EvmERC20WarpModule.js +136 -9
- package/dist/token/EvmERC20WarpModule.js.map +1 -1
- package/dist/token/EvmERC20WarpRouteReader.d.ts +4 -9
- package/dist/token/EvmERC20WarpRouteReader.d.ts.map +1 -1
- package/dist/token/EvmERC20WarpRouteReader.hardhat-test.js +27 -2
- package/dist/token/EvmERC20WarpRouteReader.hardhat-test.js.map +1 -1
- package/dist/token/EvmERC20WarpRouteReader.js +19 -21
- package/dist/token/EvmERC20WarpRouteReader.js.map +1 -1
- package/dist/token/IToken.d.ts +6 -6
- package/dist/token/TokenConnection.d.ts +2 -2
- package/dist/token/deploy.d.ts +2 -2
- package/dist/token/deploy.d.ts.map +1 -1
- package/dist/token/deploy.js +20 -5
- package/dist/token/deploy.js.map +1 -1
- package/dist/token/schemas.d.ts +176 -88
- package/dist/token/schemas.d.ts.map +1 -1
- package/dist/utils/HyperlaneReader.d.ts +17 -0
- package/dist/utils/HyperlaneReader.d.ts.map +1 -0
- package/dist/utils/HyperlaneReader.js +21 -0
- package/dist/utils/HyperlaneReader.js.map +1 -0
- package/dist/utils/cosmos.d.ts +5 -0
- package/dist/utils/cosmos.d.ts.map +1 -1
- package/dist/utils/cosmos.js +7 -1
- package/dist/utils/cosmos.js.map +1 -1
- package/dist/warp/WarpCore.d.ts +12 -0
- package/dist/warp/WarpCore.d.ts.map +1 -1
- package/dist/warp/WarpCore.js +63 -32
- package/dist/warp/WarpCore.js.map +1 -1
- package/dist/warp/types.d.ts +10 -10
- package/package.json +3 -3
|
@@ -1,17 +1,29 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { MailboxClient__factory, Ownable__factory, TokenRouter__factory, } from '@hyperlane-xyz/core';
|
|
2
|
+
import { buildArtifact as coreBuildArtifact } from '@hyperlane-xyz/core/buildArtifact.js';
|
|
3
|
+
import { ContractVerifier, ExplorerLicenseType } from '@hyperlane-xyz/sdk';
|
|
4
|
+
import { addressToBytes32, assert, deepEquals, eqAddress, isObjEmpty, normalizeConfig, rootLogger, } from '@hyperlane-xyz/utils';
|
|
2
5
|
import { HyperlaneModule, } from '../core/AbstractHyperlaneModule.js';
|
|
6
|
+
import { EvmIsmModule } from '../ism/EvmIsmModule.js';
|
|
3
7
|
import { EvmERC20WarpRouteReader } from './EvmERC20WarpRouteReader.js';
|
|
4
8
|
import { HypERC20Deployer } from './deploy.js';
|
|
9
|
+
import { TokenRouterConfigSchema } from './schemas.js';
|
|
5
10
|
export class EvmERC20WarpModule extends HyperlaneModule {
|
|
6
11
|
multiProvider;
|
|
12
|
+
contractVerifier;
|
|
7
13
|
logger = rootLogger.child({
|
|
8
14
|
module: 'EvmERC20WarpModule',
|
|
9
15
|
});
|
|
10
16
|
reader;
|
|
11
|
-
|
|
17
|
+
// We use domainId here because MultiProvider.getDomainId() will always
|
|
18
|
+
// return a number, and EVM the domainId and chainId are the same.
|
|
19
|
+
domainId;
|
|
20
|
+
constructor(multiProvider, args, contractVerifier) {
|
|
12
21
|
super(args);
|
|
13
22
|
this.multiProvider = multiProvider;
|
|
23
|
+
this.contractVerifier = contractVerifier;
|
|
14
24
|
this.reader = new EvmERC20WarpRouteReader(multiProvider, args.chain);
|
|
25
|
+
this.domainId = multiProvider.getDomainId(args.chain);
|
|
26
|
+
this.contractVerifier ??= new ContractVerifier(multiProvider, {}, coreBuildArtifact, ExplorerLicenseType.MIT);
|
|
15
27
|
}
|
|
16
28
|
/**
|
|
17
29
|
* Retrieves the token router configuration for the specified address.
|
|
@@ -25,13 +37,122 @@ export class EvmERC20WarpModule extends HyperlaneModule {
|
|
|
25
37
|
/**
|
|
26
38
|
* Updates the Warp Route contract with the provided configuration.
|
|
27
39
|
*
|
|
28
|
-
* @remark Currently only supports updating ISM or hook.
|
|
29
|
-
*
|
|
30
40
|
* @param expectedConfig - The configuration for the token router to be updated.
|
|
31
41
|
* @returns An array of Ethereum transactions that were executed to update the contract, or an error if the update failed.
|
|
32
42
|
*/
|
|
33
|
-
async update(
|
|
34
|
-
|
|
43
|
+
async update(expectedConfig) {
|
|
44
|
+
TokenRouterConfigSchema.parse(expectedConfig);
|
|
45
|
+
const actualConfig = await this.read();
|
|
46
|
+
const transactions = [];
|
|
47
|
+
transactions.push(...(await this.updateIsm(actualConfig, expectedConfig)), ...this.updateRemoteRouters(actualConfig, expectedConfig), ...this.updateOwnership(actualConfig, expectedConfig));
|
|
48
|
+
return transactions;
|
|
49
|
+
}
|
|
50
|
+
/**
|
|
51
|
+
* Updates the remote routers for the Warp Route contract.
|
|
52
|
+
*
|
|
53
|
+
* @param actualConfig - The on-chain router configuration, including the remoteRouters array.
|
|
54
|
+
* @param expectedConfig - The expected token router configuration.
|
|
55
|
+
* @returns A array with a single Ethereum transaction that need to be executed to enroll the routers
|
|
56
|
+
*/
|
|
57
|
+
updateRemoteRouters(actualConfig, expectedConfig) {
|
|
58
|
+
const updateTransactions = [];
|
|
59
|
+
if (!expectedConfig.remoteRouters) {
|
|
60
|
+
return [];
|
|
61
|
+
}
|
|
62
|
+
// We normalize the addresses for comparison
|
|
63
|
+
actualConfig.remoteRouters = normalizeConfig(actualConfig.remoteRouters);
|
|
64
|
+
expectedConfig.remoteRouters = normalizeConfig(expectedConfig.remoteRouters);
|
|
65
|
+
assert(actualConfig.remoteRouters, 'actualRemoteRouters is undefined');
|
|
66
|
+
assert(expectedConfig.remoteRouters, 'actualRemoteRouters is undefined');
|
|
67
|
+
const { remoteRouters: actualRemoteRouters } = actualConfig;
|
|
68
|
+
const { remoteRouters: expectedRemoteRouters } = expectedConfig;
|
|
69
|
+
if (!deepEquals(actualRemoteRouters, expectedRemoteRouters)) {
|
|
70
|
+
const contractToUpdate = TokenRouter__factory.connect(this.args.addresses.deployedTokenRoute, this.multiProvider.getProvider(this.domainId));
|
|
71
|
+
updateTransactions.push({
|
|
72
|
+
annotation: `Enrolling Router ${this.args.addresses.deployedTokenRoute} on ${this.args.chain}`,
|
|
73
|
+
chainId: this.domainId,
|
|
74
|
+
to: contractToUpdate.address,
|
|
75
|
+
data: contractToUpdate.interface.encodeFunctionData('enrollRemoteRouters', [
|
|
76
|
+
Object.keys(expectedRemoteRouters).map((k) => Number(k)),
|
|
77
|
+
Object.values(expectedRemoteRouters).map((a) => addressToBytes32(a)),
|
|
78
|
+
]),
|
|
79
|
+
});
|
|
80
|
+
}
|
|
81
|
+
return updateTransactions;
|
|
82
|
+
}
|
|
83
|
+
/**
|
|
84
|
+
* Updates an existing Warp route ISM with a given config.
|
|
85
|
+
*
|
|
86
|
+
* @param actualConfig - The on-chain router configuration, including the ISM configuration, and address.
|
|
87
|
+
* @param expectedConfig - The expected token router configuration, including the ISM configuration.
|
|
88
|
+
* @returns Ethereum transaction that need to be executed to update the ISM configuration.
|
|
89
|
+
*/
|
|
90
|
+
async updateIsm(actualConfig, expectedConfig) {
|
|
91
|
+
const updateTransactions = [];
|
|
92
|
+
if (!expectedConfig.interchainSecurityModule) {
|
|
93
|
+
return [];
|
|
94
|
+
}
|
|
95
|
+
if (expectedConfig.ismFactoryAddresses) {
|
|
96
|
+
const actualDeployedIsm = actualConfig.interchainSecurityModule.address;
|
|
97
|
+
// Try to update (may also deploy) Ism with the expected config
|
|
98
|
+
const { deployedIsm: expectedDeployedIsm, updateTransactions: ismUpdateTransactions, } = await this.deployOrUpdateIsm(actualConfig, expectedConfig);
|
|
99
|
+
// If an ISM is updated in-place, push the update txs
|
|
100
|
+
updateTransactions.push(...ismUpdateTransactions);
|
|
101
|
+
// If a new ISM is deployed, push the setInterchainSecurityModule tx
|
|
102
|
+
if (actualDeployedIsm !== expectedDeployedIsm) {
|
|
103
|
+
const contractToUpdate = MailboxClient__factory.connect(this.args.addresses.deployedTokenRoute, this.multiProvider.getProvider(this.domainId));
|
|
104
|
+
updateTransactions.push({
|
|
105
|
+
annotation: `Setting ISM for Warp Route to ${expectedDeployedIsm}`,
|
|
106
|
+
chainId: this.domainId,
|
|
107
|
+
to: contractToUpdate.address,
|
|
108
|
+
data: contractToUpdate.interface.encodeFunctionData('setInterchainSecurityModule', [expectedDeployedIsm]),
|
|
109
|
+
});
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
return updateTransactions;
|
|
113
|
+
}
|
|
114
|
+
/**
|
|
115
|
+
* Transfer ownership of an existing Warp route with a given config.
|
|
116
|
+
*
|
|
117
|
+
* @param actualConfig - The on-chain router configuration.
|
|
118
|
+
* @param expectedConfig - The expected token router configuration.
|
|
119
|
+
* @returns Ethereum transaction that need to be executed to update the owner.
|
|
120
|
+
*/
|
|
121
|
+
updateOwnership(actualConfig, expectedConfig) {
|
|
122
|
+
const updateTransactions = [];
|
|
123
|
+
if (!eqAddress(actualConfig.owner, expectedConfig.owner)) {
|
|
124
|
+
const { deployedTokenRoute } = this.args.addresses;
|
|
125
|
+
const { owner: newOwner } = expectedConfig;
|
|
126
|
+
updateTransactions.push({
|
|
127
|
+
annotation: `Transferring ownership of Warp route ${deployedTokenRoute} to ${newOwner}`,
|
|
128
|
+
chainId: this.domainId,
|
|
129
|
+
to: deployedTokenRoute,
|
|
130
|
+
data: Ownable__factory.createInterface().encodeFunctionData('transferOwnership(address)', [newOwner]),
|
|
131
|
+
});
|
|
132
|
+
}
|
|
133
|
+
return updateTransactions;
|
|
134
|
+
}
|
|
135
|
+
/**
|
|
136
|
+
* Updates or deploys the ISM using the provided configuration.
|
|
137
|
+
*
|
|
138
|
+
* @returns Object with deployedIsm address, and update Transactions
|
|
139
|
+
*/
|
|
140
|
+
async deployOrUpdateIsm(actualConfig, expectedConfig) {
|
|
141
|
+
assert(expectedConfig.interchainSecurityModule, 'Ism not derived correctly');
|
|
142
|
+
assert(expectedConfig.ismFactoryAddresses, 'Ism Factories addresses not provided');
|
|
143
|
+
const ismModule = new EvmIsmModule(this.multiProvider, {
|
|
144
|
+
chain: this.args.chain,
|
|
145
|
+
config: expectedConfig.interchainSecurityModule,
|
|
146
|
+
addresses: {
|
|
147
|
+
...expectedConfig.ismFactoryAddresses,
|
|
148
|
+
mailbox: expectedConfig.mailbox,
|
|
149
|
+
deployedIsm: actualConfig.interchainSecurityModule.address,
|
|
150
|
+
},
|
|
151
|
+
}, this.contractVerifier);
|
|
152
|
+
this.logger.info(`Comparing target ISM config with ${this.args.chain} chain`);
|
|
153
|
+
const updateTransactions = await ismModule.update(expectedConfig.interchainSecurityModule);
|
|
154
|
+
const { deployedIsm } = ismModule.serialize();
|
|
155
|
+
return { deployedIsm, updateTransactions };
|
|
35
156
|
}
|
|
36
157
|
/**
|
|
37
158
|
* Deploys the Warp Route.
|
|
@@ -42,17 +163,23 @@ export class EvmERC20WarpModule extends HyperlaneModule {
|
|
|
42
163
|
* @returns A new instance of the EvmERC20WarpHyperlaneModule.
|
|
43
164
|
*/
|
|
44
165
|
static async create(params) {
|
|
45
|
-
const { chain, config, multiProvider } = params;
|
|
166
|
+
const { chain, config, multiProvider, contractVerifier } = params;
|
|
46
167
|
const chainName = multiProvider.getChainName(chain);
|
|
47
168
|
const deployer = new HypERC20Deployer(multiProvider);
|
|
48
169
|
const deployedContracts = await deployer.deployContracts(chainName, config);
|
|
49
|
-
|
|
170
|
+
const warpModule = new EvmERC20WarpModule(multiProvider, {
|
|
50
171
|
addresses: {
|
|
51
172
|
deployedTokenRoute: deployedContracts[config.type].address,
|
|
52
173
|
},
|
|
53
174
|
chain,
|
|
54
175
|
config,
|
|
55
|
-
});
|
|
176
|
+
}, contractVerifier);
|
|
177
|
+
if (config.remoteRouters && !isObjEmpty(config.remoteRouters)) {
|
|
178
|
+
const enrollRemoteTxs = await warpModule.update(config); // @TODO Remove when EvmERC20WarpModule.create can be used
|
|
179
|
+
const onlyTxIndex = 0;
|
|
180
|
+
await multiProvider.sendTransaction(chain, enrollRemoteTxs[onlyTxIndex]);
|
|
181
|
+
}
|
|
182
|
+
return warpModule;
|
|
56
183
|
}
|
|
57
184
|
}
|
|
58
185
|
//# sourceMappingURL=EvmERC20WarpModule.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EvmERC20WarpModule.js","sourceRoot":"","sources":["../../src/token/EvmERC20WarpModule.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"EvmERC20WarpModule.js","sourceRoot":"","sources":["../../src/token/EvmERC20WarpModule.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,17 @@
|
|
|
1
|
-
import { providers } from 'ethers';
|
|
2
1
|
import { MailboxClientConfig, TokenRouterConfig, TokenType } from '@hyperlane-xyz/sdk';
|
|
3
2
|
import { Address } from '@hyperlane-xyz/utils';
|
|
4
3
|
import { EvmHookReader } from '../hook/EvmHookReader.js';
|
|
5
4
|
import { EvmIsmReader } from '../ism/EvmIsmReader.js';
|
|
6
5
|
import { MultiProvider } from '../providers/MultiProvider.js';
|
|
6
|
+
import { RemoteRouters } from '../router/types.js';
|
|
7
7
|
import { ChainNameOrId } from '../types.js';
|
|
8
|
+
import { HyperlaneReader } from '../utils/HyperlaneReader.js';
|
|
8
9
|
import { TokenMetadata } from './types.js';
|
|
9
|
-
export declare class EvmERC20WarpRouteReader {
|
|
10
|
+
export declare class EvmERC20WarpRouteReader extends HyperlaneReader {
|
|
10
11
|
protected readonly multiProvider: MultiProvider;
|
|
11
12
|
protected readonly chain: ChainNameOrId;
|
|
12
13
|
protected readonly concurrency: number;
|
|
13
14
|
protected readonly logger: import("pino").default.Logger<never>;
|
|
14
|
-
provider: providers.Provider;
|
|
15
15
|
evmHookReader: EvmHookReader;
|
|
16
16
|
evmIsmReader: EvmIsmReader;
|
|
17
17
|
constructor(multiProvider: MultiProvider, chain: ChainNameOrId, concurrency?: number);
|
|
@@ -48,11 +48,6 @@ export declare class EvmERC20WarpRouteReader {
|
|
|
48
48
|
token?: string;
|
|
49
49
|
}>;
|
|
50
50
|
fetchERC20Metadata(tokenAddress: Address): Promise<TokenMetadata>;
|
|
51
|
-
|
|
52
|
-
* Conditionally sets the log level for a smart provider.
|
|
53
|
-
*
|
|
54
|
-
* @param level - The log level to set, e.g. 'debug', 'info', 'warn', 'error'.
|
|
55
|
-
*/
|
|
56
|
-
protected setSmartProviderLogLevel(level: string): void;
|
|
51
|
+
fetchRemoteRouters(warpRouteAddress: Address): Promise<RemoteRouters>;
|
|
57
52
|
}
|
|
58
53
|
//# sourceMappingURL=EvmERC20WarpRouteReader.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EvmERC20WarpRouteReader.d.ts","sourceRoot":"","sources":["../../src/token/EvmERC20WarpRouteReader.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"EvmERC20WarpRouteReader.d.ts","sourceRoot":"","sources":["../../src/token/EvmERC20WarpRouteReader.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,mBAAmB,EACnB,iBAAiB,EACjB,SAAS,EACV,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,OAAO,EAKR,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAG9D,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C,qBAAa,uBAAwB,SAAQ,eAAe;IAQxD,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa;IAC/C,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,aAAa;IACvC,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM;IATxC,SAAS,CAAC,QAAQ,CAAC,MAAM,uCAEtB;IACH,aAAa,EAAE,aAAa,CAAC;IAC7B,YAAY,EAAE,YAAY,CAAC;gBAGN,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,aAAa,EACpB,WAAW,GAAE,MAA0C;IAO5E;;;;;;OAMG;IACG,qBAAqB,CACzB,gBAAgB,EAAE,OAAO,GACxB,OAAO,CAAC,iBAAiB,CAAC;IAe7B;;;;;OAKG;IACG,eAAe,CAAC,gBAAgB,EAAE,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC;IAuDpE;;;;;OAKG;IACG,wBAAwB,CAC5B,aAAa,EAAE,OAAO,GACrB,OAAO,CAAC,mBAAmB,CAAC;IA2B/B;;;;;;OAMG;IACG,kBAAkB,CACtB,IAAI,EAAE,SAAS,EACf,YAAY,EAAE,OAAO,GACpB,OAAO,CAAC,aAAa,GAAG;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IA8BxC,kBAAkB,CAAC,YAAY,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC;IAYjE,kBAAkB,CAAC,gBAAgB,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC;CAe5E"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { expect } from 'chai';
|
|
2
2
|
import hre from 'hardhat';
|
|
3
3
|
import { ERC20Test__factory, ERC4626Test__factory, Mailbox__factory, } from '@hyperlane-xyz/core';
|
|
4
|
-
import { TestChainName, } from '@hyperlane-xyz/sdk';
|
|
4
|
+
import { TestChainName, test3, } from '@hyperlane-xyz/sdk';
|
|
5
5
|
import { TestCoreDeployer } from '../core/TestCoreDeployer.js';
|
|
6
6
|
import { HyperlaneProxyFactoryDeployer } from '../deploy/HyperlaneProxyFactoryDeployer.js';
|
|
7
7
|
import { HyperlaneIsmFactory } from '../ism/HyperlaneIsmFactory.js';
|
|
@@ -28,7 +28,7 @@ describe('ERC20WarpRouterReader', async () => {
|
|
|
28
28
|
let mailbox;
|
|
29
29
|
let evmERC20WarpRouteReader;
|
|
30
30
|
let vault;
|
|
31
|
-
|
|
31
|
+
beforeEach(async () => {
|
|
32
32
|
[signer] = await hre.ethers.getSigners();
|
|
33
33
|
multiProvider = MultiProvider.createTestMultiProvider({ signer });
|
|
34
34
|
const ismFactoryDeployer = new HyperlaneProxyFactoryDeployer(multiProvider);
|
|
@@ -172,5 +172,30 @@ describe('ERC20WarpRouterReader', async () => {
|
|
|
172
172
|
const derivedConfig = await evmERC20WarpRouteReader.deriveWarpRouteConfig(warpRoute[chain].collateral.address);
|
|
173
173
|
expect(derivedConfig.interchainSecurityModule).to.be.undefined;
|
|
174
174
|
});
|
|
175
|
+
it('should return the remote routers', async () => {
|
|
176
|
+
// Create config
|
|
177
|
+
const otherChain = TestChainName.test3;
|
|
178
|
+
const otherChainMetadata = test3;
|
|
179
|
+
const config = {
|
|
180
|
+
[chain]: {
|
|
181
|
+
type: TokenType.collateral,
|
|
182
|
+
token: token.address,
|
|
183
|
+
hook: await mailbox.defaultHook(),
|
|
184
|
+
...baseConfig,
|
|
185
|
+
},
|
|
186
|
+
[otherChain]: {
|
|
187
|
+
type: TokenType.collateral,
|
|
188
|
+
token: token.address,
|
|
189
|
+
hook: await mailbox.defaultHook(),
|
|
190
|
+
...baseConfig,
|
|
191
|
+
},
|
|
192
|
+
};
|
|
193
|
+
// Deploy with config
|
|
194
|
+
const warpRoute = await deployer.deploy(config);
|
|
195
|
+
// Derive config and check if remote router matches
|
|
196
|
+
const derivedConfig = await evmERC20WarpRouteReader.deriveWarpRouteConfig(warpRoute[chain].collateral.address);
|
|
197
|
+
expect(Object.keys(derivedConfig.remoteRouters).length).to.equal(1);
|
|
198
|
+
expect(derivedConfig.remoteRouters[otherChainMetadata.domainId]).to.be.equal(warpRoute[otherChain].collateral.address);
|
|
199
|
+
});
|
|
175
200
|
});
|
|
176
201
|
//# sourceMappingURL=EvmERC20WarpRouteReader.hardhat-test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EvmERC20WarpRouteReader.hardhat-test.js","sourceRoot":"","sources":["../../src/token/EvmERC20WarpRouteReader.hardhat-test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC9B,OAAO,GAAG,MAAM,SAAS,CAAC;AAE1B,OAAO,EAEL,kBAAkB,EAElB,oBAAoB,EAEpB,gBAAgB,GACjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAGL,aAAa,
|
|
1
|
+
{"version":3,"file":"EvmERC20WarpRouteReader.hardhat-test.js","sourceRoot":"","sources":["../../src/token/EvmERC20WarpRouteReader.hardhat-test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,26 +1,26 @@
|
|
|
1
1
|
import { BigNumber, constants } from 'ethers';
|
|
2
|
-
import { HypERC20CollateralVaultDeposit__factory, HypERC20Collateral__factory, HypERC20__factory, } from '@hyperlane-xyz/core';
|
|
2
|
+
import { HypERC20CollateralVaultDeposit__factory, HypERC20Collateral__factory, HypERC20__factory, TokenRouter__factory, } from '@hyperlane-xyz/core';
|
|
3
3
|
import { TokenType, } from '@hyperlane-xyz/sdk';
|
|
4
|
-
import { eqAddress, getLogLevel, rootLogger, } from '@hyperlane-xyz/utils';
|
|
4
|
+
import { bytes32ToAddress, eqAddress, getLogLevel, rootLogger, } from '@hyperlane-xyz/utils';
|
|
5
5
|
import { DEFAULT_CONTRACT_READ_CONCURRENCY } from '../consts/concurrency.js';
|
|
6
6
|
import { EvmHookReader } from '../hook/EvmHookReader.js';
|
|
7
7
|
import { EvmIsmReader } from '../ism/EvmIsmReader.js';
|
|
8
|
+
import { HyperlaneReader } from '../utils/HyperlaneReader.js';
|
|
8
9
|
import { CollateralExtensions } from './config.js';
|
|
9
|
-
export class EvmERC20WarpRouteReader {
|
|
10
|
+
export class EvmERC20WarpRouteReader extends HyperlaneReader {
|
|
10
11
|
multiProvider;
|
|
11
12
|
chain;
|
|
12
13
|
concurrency;
|
|
13
14
|
logger = rootLogger.child({
|
|
14
15
|
module: 'EvmERC20WarpRouteReader',
|
|
15
16
|
});
|
|
16
|
-
provider;
|
|
17
17
|
evmHookReader;
|
|
18
18
|
evmIsmReader;
|
|
19
19
|
constructor(multiProvider, chain, concurrency = DEFAULT_CONTRACT_READ_CONCURRENCY) {
|
|
20
|
+
super(multiProvider, chain);
|
|
20
21
|
this.multiProvider = multiProvider;
|
|
21
22
|
this.chain = chain;
|
|
22
23
|
this.concurrency = concurrency;
|
|
23
|
-
this.provider = this.multiProvider.getProvider(chain);
|
|
24
24
|
this.evmHookReader = new EvmHookReader(multiProvider, chain, concurrency);
|
|
25
25
|
this.evmIsmReader = new EvmIsmReader(multiProvider, chain, concurrency);
|
|
26
26
|
}
|
|
@@ -34,11 +34,13 @@ export class EvmERC20WarpRouteReader {
|
|
|
34
34
|
async deriveWarpRouteConfig(warpRouteAddress) {
|
|
35
35
|
// Derive the config type
|
|
36
36
|
const type = await this.deriveTokenType(warpRouteAddress);
|
|
37
|
-
const
|
|
38
|
-
const
|
|
37
|
+
const baseMetadata = await this.fetchMailboxClientConfig(warpRouteAddress);
|
|
38
|
+
const tokenMetadata = await this.fetchTokenMetadata(type, warpRouteAddress);
|
|
39
|
+
const remoteRouters = await this.fetchRemoteRouters(warpRouteAddress);
|
|
39
40
|
return {
|
|
40
|
-
...
|
|
41
|
-
...
|
|
41
|
+
...baseMetadata,
|
|
42
|
+
...tokenMetadata,
|
|
43
|
+
remoteRouters,
|
|
42
44
|
type,
|
|
43
45
|
};
|
|
44
46
|
}
|
|
@@ -79,12 +81,12 @@ export class EvmERC20WarpRouteReader {
|
|
|
79
81
|
}
|
|
80
82
|
}
|
|
81
83
|
// Finally check native
|
|
82
|
-
// Using estimateGas to send
|
|
84
|
+
// Using estimateGas to send 0 wei. Success implies that the Warp Route has a receive() function
|
|
83
85
|
try {
|
|
84
86
|
await this.multiProvider.estimateGas(this.chain, {
|
|
85
87
|
to: warpRouteAddress,
|
|
86
88
|
from: await this.multiProvider.getSignerAddress(this.chain),
|
|
87
|
-
value: BigNumber.from(
|
|
89
|
+
value: BigNumber.from(0),
|
|
88
90
|
});
|
|
89
91
|
return TokenType.native;
|
|
90
92
|
}
|
|
@@ -163,16 +165,12 @@ export class EvmERC20WarpRouteReader {
|
|
|
163
165
|
]);
|
|
164
166
|
return { name, symbol, decimals, totalSupply: totalSupply.toString() };
|
|
165
167
|
}
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
if ('setLogLevel' in this.provider) {
|
|
173
|
-
//@ts-ignore
|
|
174
|
-
this.provider.setLogLevel(level);
|
|
175
|
-
}
|
|
168
|
+
async fetchRemoteRouters(warpRouteAddress) {
|
|
169
|
+
const warpRoute = TokenRouter__factory.connect(warpRouteAddress, this.provider);
|
|
170
|
+
const domains = await warpRoute.domains();
|
|
171
|
+
return Object.fromEntries(await Promise.all(domains.map(async (domain) => {
|
|
172
|
+
return [domain, bytes32ToAddress(await warpRoute.routers(domain))];
|
|
173
|
+
})));
|
|
176
174
|
}
|
|
177
175
|
}
|
|
178
176
|
//# sourceMappingURL=EvmERC20WarpRouteReader.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EvmERC20WarpRouteReader.js","sourceRoot":"","sources":["../../src/token/EvmERC20WarpRouteReader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"EvmERC20WarpRouteReader.js","sourceRoot":"","sources":["../../src/token/EvmERC20WarpRouteReader.ts"],"names":[],"mappings":"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"}
|
package/dist/token/IToken.d.ts
CHANGED
|
@@ -53,25 +53,25 @@ export declare const TokenConfigSchema: z.ZodObject<{
|
|
|
53
53
|
token: string;
|
|
54
54
|
sourcePort: string;
|
|
55
55
|
sourceChannel: string;
|
|
56
|
+
intermediateRouterAddress: string;
|
|
56
57
|
intermediateChainName: string;
|
|
57
58
|
intermediateIbcDenom: string;
|
|
58
|
-
intermediateRouterAddress: string;
|
|
59
59
|
}, {
|
|
60
60
|
type: import("./TokenConnection.js").TokenConnectionType.IbcHyperlane;
|
|
61
61
|
token: string;
|
|
62
62
|
sourcePort: string;
|
|
63
63
|
sourceChannel: string;
|
|
64
|
+
intermediateRouterAddress: string;
|
|
64
65
|
intermediateChainName: string;
|
|
65
66
|
intermediateIbcDenom: string;
|
|
66
|
-
intermediateRouterAddress: string;
|
|
67
67
|
}>]>, "many">>;
|
|
68
68
|
}, "strip", z.ZodTypeAny, {
|
|
69
69
|
symbol: string;
|
|
70
70
|
name: string;
|
|
71
71
|
decimals: number;
|
|
72
|
+
addressOrDenom: string | null;
|
|
72
73
|
chainName: string;
|
|
73
74
|
standard: TokenStandard;
|
|
74
|
-
addressOrDenom: string | null;
|
|
75
75
|
collateralAddressOrDenom?: string | undefined;
|
|
76
76
|
igpTokenAddressOrDenom?: string | undefined;
|
|
77
77
|
logoURI?: string | undefined;
|
|
@@ -88,17 +88,17 @@ export declare const TokenConfigSchema: z.ZodObject<{
|
|
|
88
88
|
token: string;
|
|
89
89
|
sourcePort: string;
|
|
90
90
|
sourceChannel: string;
|
|
91
|
+
intermediateRouterAddress: string;
|
|
91
92
|
intermediateChainName: string;
|
|
92
93
|
intermediateIbcDenom: string;
|
|
93
|
-
intermediateRouterAddress: string;
|
|
94
94
|
})[] | undefined;
|
|
95
95
|
}, {
|
|
96
96
|
symbol: string;
|
|
97
97
|
name: string;
|
|
98
98
|
decimals: number;
|
|
99
|
+
addressOrDenom: string | null;
|
|
99
100
|
chainName: string;
|
|
100
101
|
standard: TokenStandard;
|
|
101
|
-
addressOrDenom: string | null;
|
|
102
102
|
collateralAddressOrDenom?: string | undefined;
|
|
103
103
|
igpTokenAddressOrDenom?: string | undefined;
|
|
104
104
|
logoURI?: string | undefined;
|
|
@@ -115,9 +115,9 @@ export declare const TokenConfigSchema: z.ZodObject<{
|
|
|
115
115
|
token: string;
|
|
116
116
|
sourcePort: string;
|
|
117
117
|
sourceChannel: string;
|
|
118
|
+
intermediateRouterAddress: string;
|
|
118
119
|
intermediateChainName: string;
|
|
119
120
|
intermediateIbcDenom: string;
|
|
120
|
-
intermediateRouterAddress: string;
|
|
121
121
|
})[] | undefined;
|
|
122
122
|
}>;
|
|
123
123
|
export type TokenArgs = Omit<z.infer<typeof TokenConfigSchema>, 'addressOrDenom' | 'connections'> & {
|
|
@@ -65,17 +65,17 @@ export declare const TokenConnectionConfigSchema: z.ZodUnion<[z.ZodUnion<[z.ZodO
|
|
|
65
65
|
token: string;
|
|
66
66
|
sourcePort: string;
|
|
67
67
|
sourceChannel: string;
|
|
68
|
+
intermediateRouterAddress: string;
|
|
68
69
|
intermediateChainName: string;
|
|
69
70
|
intermediateIbcDenom: string;
|
|
70
|
-
intermediateRouterAddress: string;
|
|
71
71
|
}, {
|
|
72
72
|
type: TokenConnectionType.IbcHyperlane;
|
|
73
73
|
token: string;
|
|
74
74
|
sourcePort: string;
|
|
75
75
|
sourceChannel: string;
|
|
76
|
+
intermediateRouterAddress: string;
|
|
76
77
|
intermediateChainName: string;
|
|
77
78
|
intermediateIbcDenom: string;
|
|
78
|
-
intermediateRouterAddress: string;
|
|
79
79
|
}>]>;
|
|
80
80
|
export declare function getTokenConnectionId(protocol: ProtocolType, chainName: ChainName, address: Address): string;
|
|
81
81
|
export declare function parseTokenConnectionId(data: string): {
|
package/dist/token/deploy.d.ts
CHANGED
|
@@ -11,9 +11,9 @@ import { TokenMetadata, WarpRouteDeployConfig } from './types.js';
|
|
|
11
11
|
declare abstract class TokenDeployer<Factories extends TokenFactories> extends GasRouterDeployer<TokenRouterConfig, Factories> {
|
|
12
12
|
constructor(multiProvider: MultiProvider, factories: Factories, loggerName: string, ismFactory?: HyperlaneIsmFactory, contractVerifier?: ContractVerifier);
|
|
13
13
|
constructorArgs(_: ChainName, config: TokenRouterConfig): Promise<any>;
|
|
14
|
-
initializeArgs(
|
|
14
|
+
initializeArgs(chain: ChainName, config: TokenRouterConfig): Promise<any>;
|
|
15
15
|
static deriveTokenMetadata(multiProvider: MultiProvider, configMap: WarpRouteDeployConfig): Promise<TokenMetadata | undefined>;
|
|
16
|
-
deploy(configMap: WarpRouteDeployConfig): Promise<import("
|
|
16
|
+
deploy(configMap: WarpRouteDeployConfig): Promise<import("@hyperlane-xyz/sdk").HyperlaneContractsMap<Factories & import("@hyperlane-xyz/sdk").HyperlaneFactories & {
|
|
17
17
|
proxyAdmin: import("@hyperlane-xyz/core").ProxyAdmin__factory;
|
|
18
18
|
timelockController: import("@hyperlane-xyz/core").TimelockController__factory;
|
|
19
19
|
}>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/token/deploy.ts"],"names":[],"mappings":"AAGA,OAAO,EAGL,SAAS,
|
|
1
|
+
{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/token/deploy.ts"],"names":[],"mappings":"AAGA,OAAO,EAGL,SAAS,EAGV,MAAM,qBAAqB,CAAC;AAI7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,cAAc,EAKf,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,iBAAiB,EAKlB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAElE,uBAAe,aAAa,CAC1B,SAAS,SAAS,cAAc,CAChC,SAAQ,iBAAiB,CAAC,iBAAiB,EAAE,SAAS,CAAC;gBAErD,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,MAAM,EAClB,UAAU,CAAC,EAAE,mBAAmB,EAChC,gBAAgB,CAAC,EAAE,gBAAgB;IAS/B,eAAe,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,GAAG,CAAC;IAatE,cAAc,CAClB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,iBAAiB,GACxB,OAAO,CAAC,GAAG,CAAC;WAiBF,mBAAmB,CAC9B,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,qBAAqB,GAC/B,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAoE/B,MAAM,CAAC,SAAS,EAAE,qBAAqB;;;;CAmB9C;AAED,qBAAa,gBAAiB,SAAQ,aAAa,CAAC,iBAAiB,CAAC;gBAElE,aAAa,EAAE,aAAa,EAC5B,UAAU,CAAC,EAAE,mBAAmB,EAChC,gBAAgB,CAAC,EAAE,gBAAgB;IAWrC,MAAM,CAAC,SAAS,EAAE,kBAAkB,CAAC,iBAAiB,CAAC,GAAG,SAAS;IASnE,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,iBAAiB;IAKrE,kBAAkB,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM;CAGtD;AAED,qBAAa,iBAAkB,SAAQ,aAAa,CAAC,kBAAkB,CAAC;gBAEpE,aAAa,EAAE,aAAa,EAC5B,UAAU,CAAC,EAAE,mBAAmB,EAChC,gBAAgB,CAAC,EAAE,gBAAgB;IAWrC,MAAM,CAAC,SAAS,EAAE,kBAAkB,CAAC,kBAAkB,CAAC,GAAG,SAAS;IASpE,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,kBAAkB;IAKtE,kBAAkB,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM;CAGtD"}
|
package/dist/token/deploy.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
|
|
2
2
|
import { constants } from 'ethers';
|
|
3
|
-
import { ERC20__factory, ERC721Enumerable__factory, } from '@hyperlane-xyz/core';
|
|
3
|
+
import { ERC20__factory, ERC721Enumerable__factory, IERC4626__factory, IXERC20Lockbox__factory, } from '@hyperlane-xyz/core';
|
|
4
|
+
import { TokenType } from '@hyperlane-xyz/sdk';
|
|
4
5
|
import { assert, objKeys, objMap, rootLogger } from '@hyperlane-xyz/utils';
|
|
5
6
|
import { GasRouterDeployer } from '../router/GasRouterDeployer.js';
|
|
6
7
|
import { gasOverhead } from './config.js';
|
|
@@ -22,18 +23,20 @@ class TokenDeployer extends GasRouterDeployer {
|
|
|
22
23
|
return config.scale ? [config.scale, config.mailbox] : [config.mailbox];
|
|
23
24
|
}
|
|
24
25
|
else if (isSyntheticConfig(config)) {
|
|
25
|
-
assert(config.decimals); // decimals must be defined by this point
|
|
26
|
+
assert(config.decimals, 'decimals is undefined for config'); // decimals must be defined by this point
|
|
26
27
|
return [config.decimals, config.mailbox];
|
|
27
28
|
}
|
|
28
29
|
else {
|
|
29
30
|
throw new Error('Unknown token type when constructing arguments');
|
|
30
31
|
}
|
|
31
32
|
}
|
|
32
|
-
async initializeArgs(
|
|
33
|
+
async initializeArgs(chain, config) {
|
|
34
|
+
const signer = await this.multiProvider.getSigner(chain).getAddress();
|
|
33
35
|
const defaultArgs = [
|
|
34
36
|
config.hook ?? constants.AddressZero,
|
|
35
37
|
config.interchainSecurityModule ?? constants.AddressZero,
|
|
36
|
-
|
|
38
|
+
// TransferOwnership will happen later in RouterDeployer
|
|
39
|
+
signer,
|
|
37
40
|
];
|
|
38
41
|
if (isCollateralConfig(config) || isNativeConfig(config)) {
|
|
39
42
|
return defaultArgs;
|
|
@@ -72,7 +75,19 @@ class TokenDeployer extends GasRouterDeployer {
|
|
|
72
75
|
totalSupply: DERIVED_TOKEN_SUPPLY,
|
|
73
76
|
};
|
|
74
77
|
}
|
|
75
|
-
|
|
78
|
+
let token;
|
|
79
|
+
switch (config.type) {
|
|
80
|
+
case TokenType.XERC20Lockbox:
|
|
81
|
+
token = await IXERC20Lockbox__factory.connect(config.token, provider).callStatic.ERC20();
|
|
82
|
+
break;
|
|
83
|
+
case TokenType.collateralVault:
|
|
84
|
+
token = await IERC4626__factory.connect(config.token, provider).callStatic.asset();
|
|
85
|
+
break;
|
|
86
|
+
default:
|
|
87
|
+
token = config.token;
|
|
88
|
+
break;
|
|
89
|
+
}
|
|
90
|
+
const erc20 = ERC20__factory.connect(token, provider);
|
|
76
91
|
const [name, symbol, decimals] = await Promise.all([
|
|
77
92
|
erc20.name(),
|
|
78
93
|
erc20.symbol(),
|