@hyperlane-xyz/sdk 4.0.0-beta2 → 4.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/aws/s3.js +1 -1
- package/dist/aws/s3.js.map +1 -1
- package/dist/aws/validator.d.ts +3 -1
- package/dist/aws/validator.d.ts.map +1 -1
- package/dist/aws/validator.js +8 -1
- package/dist/aws/validator.js.map +1 -1
- package/dist/consts/multisigIsm.d.ts.map +1 -1
- package/dist/consts/multisigIsm.js +52 -0
- package/dist/consts/multisigIsm.js.map +1 -1
- package/dist/consts/testChains.d.ts.map +1 -1
- package/dist/consts/testChains.js +0 -5
- package/dist/consts/testChains.js.map +1 -1
- package/dist/core/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/HyperlaneCoreChecker.js +1 -1
- package/dist/core/HyperlaneCoreChecker.js.map +1 -1
- package/dist/deploy/HyperlaneDeployer.d.ts.map +1 -1
- package/dist/deploy/HyperlaneDeployer.js +4 -3
- package/dist/deploy/HyperlaneDeployer.js.map +1 -1
- package/dist/deploy/schemas.d.ts +19 -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/utils.d.ts +9 -0
- package/dist/deploy/verify/utils.d.ts.map +1 -1
- package/dist/deploy/verify/utils.js +14 -0
- package/dist/deploy/verify/utils.js.map +1 -1
- package/dist/deploy/verify/utils.test.d.ts +2 -0
- package/dist/deploy/verify/utils.test.d.ts.map +1 -0
- package/dist/deploy/verify/utils.test.js +49 -0
- package/dist/deploy/verify/utils.test.js.map +1 -0
- package/dist/gas/HyperlaneIgpDeployer.d.ts +1 -1
- package/dist/gas/HyperlaneIgpDeployer.d.ts.map +1 -1
- package/dist/gas/HyperlaneIgpDeployer.js +2 -1
- package/dist/gas/HyperlaneIgpDeployer.js.map +1 -1
- package/dist/hook/EvmHookReader.d.ts +6 -0
- package/dist/hook/EvmHookReader.d.ts.map +1 -1
- package/dist/hook/EvmHookReader.js +63 -26
- package/dist/hook/EvmHookReader.js.map +1 -1
- package/dist/hook/EvmHookReader.test.js +22 -0
- package/dist/hook/EvmHookReader.test.js.map +1 -1
- package/dist/ism/EvmIsmModule.d.ts +1 -1
- package/dist/ism/EvmIsmModule.d.ts.map +1 -1
- package/dist/ism/EvmIsmModule.hardhat-test.js +21 -0
- package/dist/ism/EvmIsmModule.hardhat-test.js.map +1 -1
- package/dist/ism/EvmIsmModule.js +5 -4
- package/dist/ism/EvmIsmModule.js.map +1 -1
- package/dist/ism/HyperlaneIsmFactory.d.ts.map +1 -1
- package/dist/ism/HyperlaneIsmFactory.js +15 -2
- package/dist/ism/HyperlaneIsmFactory.js.map +1 -1
- package/dist/metadata/agentConfig.d.ts +1899 -1651
- package/dist/metadata/agentConfig.d.ts.map +1 -1
- package/dist/metadata/agentConfig.js +4 -0
- package/dist/metadata/agentConfig.js.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/providers/transactions/schemas.d.ts +2 -2
- package/dist/router/schemas.d.ts +99 -0
- package/dist/router/schemas.d.ts.map +1 -1
- package/dist/router/schemas.js +2 -0
- package/dist/router/schemas.js.map +1 -1
- package/dist/test/testUtils.d.ts.map +1 -1
- package/dist/test/testUtils.js +20 -12
- package/dist/test/testUtils.js.map +1 -1
- package/dist/token/EvmERC20WarpModule.d.ts +20 -4
- package/dist/token/EvmERC20WarpModule.d.ts.map +1 -1
- package/dist/token/EvmERC20WarpModule.hardhat-test.js +131 -1
- package/dist/token/EvmERC20WarpModule.hardhat-test.js.map +1 -1
- package/dist/token/EvmERC20WarpModule.js +60 -5
- package/dist/token/EvmERC20WarpModule.js.map +1 -1
- package/dist/token/deploy.d.ts +2 -2
- package/dist/token/deploy.d.ts.map +1 -1
- package/dist/token/deploy.js +17 -11
- package/dist/token/deploy.js.map +1 -1
- package/dist/token/schemas.d.ts +80 -0
- package/dist/token/schemas.d.ts.map +1 -1
- package/dist/utils/gnosisSafe.js +11 -1
- package/package.json +3 -3
|
@@ -2,11 +2,13 @@ import { expect } from 'chai';
|
|
|
2
2
|
import { constants } from 'ethers';
|
|
3
3
|
import hre from 'hardhat';
|
|
4
4
|
import { ERC20Test__factory, ERC4626Test__factory, HypERC20CollateralVaultDeposit__factory, HypERC20__factory, HypNative__factory, Mailbox__factory, } from '@hyperlane-xyz/core';
|
|
5
|
-
import { TestChainName, } from '@hyperlane-xyz/sdk';
|
|
5
|
+
import { EvmIsmModule, IsmType, TestChainName, serializeContracts, } from '@hyperlane-xyz/sdk';
|
|
6
|
+
import { normalizeConfig } from '@hyperlane-xyz/utils';
|
|
6
7
|
import { TestCoreDeployer } from '../core/TestCoreDeployer.js';
|
|
7
8
|
import { HyperlaneProxyFactoryDeployer } from '../deploy/HyperlaneProxyFactoryDeployer.js';
|
|
8
9
|
import { HyperlaneIsmFactory } from '../ism/HyperlaneIsmFactory.js';
|
|
9
10
|
import { MultiProvider } from '../providers/MultiProvider.js';
|
|
11
|
+
import { randomAddress } from '../test/testUtils.js';
|
|
10
12
|
import { EvmERC20WarpModule } from './EvmERC20WarpModule.js';
|
|
11
13
|
import { TokenType } from './config.js';
|
|
12
14
|
describe('EvmERC20WarpHyperlaneModule', async () => {
|
|
@@ -16,8 +18,10 @@ describe('EvmERC20WarpHyperlaneModule', async () => {
|
|
|
16
18
|
const chain = TestChainName.test4;
|
|
17
19
|
let mailbox;
|
|
18
20
|
let hookAddress;
|
|
21
|
+
let ismAddress;
|
|
19
22
|
let ismFactory;
|
|
20
23
|
let factories;
|
|
24
|
+
let ismFactoryAddresses;
|
|
21
25
|
let erc20Factory;
|
|
22
26
|
let token;
|
|
23
27
|
let signer;
|
|
@@ -31,11 +35,17 @@ describe('EvmERC20WarpHyperlaneModule', async () => {
|
|
|
31
35
|
expect(await deployedToken.interchainSecurityModule()).to.equal(constants.AddressZero);
|
|
32
36
|
expect(await deployedToken.owner()).to.equal(signer.address);
|
|
33
37
|
}
|
|
38
|
+
async function sendTxs(txs) {
|
|
39
|
+
for (const tx of txs) {
|
|
40
|
+
await multiProvider.sendTransaction(chain, tx);
|
|
41
|
+
}
|
|
42
|
+
}
|
|
34
43
|
before(async () => {
|
|
35
44
|
[signer] = await hre.ethers.getSigners();
|
|
36
45
|
multiProvider = MultiProvider.createTestMultiProvider({ signer });
|
|
37
46
|
const ismFactoryDeployer = new HyperlaneProxyFactoryDeployer(multiProvider);
|
|
38
47
|
factories = await ismFactoryDeployer.deploy(multiProvider.mapKnownChains(() => ({})));
|
|
48
|
+
ismFactoryAddresses = serializeContracts(factories[chain]);
|
|
39
49
|
ismFactory = new HyperlaneIsmFactory(factories, multiProvider);
|
|
40
50
|
coreApp = await new TestCoreDeployer(multiProvider, ismFactory).deployApp();
|
|
41
51
|
routerConfigMap = coreApp.getRouterConfig(signer.address);
|
|
@@ -44,6 +54,7 @@ describe('EvmERC20WarpHyperlaneModule', async () => {
|
|
|
44
54
|
baseConfig = routerConfigMap[chain];
|
|
45
55
|
mailbox = Mailbox__factory.connect(baseConfig.mailbox, signer);
|
|
46
56
|
hookAddress = await mailbox.defaultHook();
|
|
57
|
+
ismAddress = await mailbox.defaultIsm();
|
|
47
58
|
});
|
|
48
59
|
it('should create with a collateral config', async () => {
|
|
49
60
|
const config = {
|
|
@@ -137,5 +148,124 @@ describe('EvmERC20WarpHyperlaneModule', async () => {
|
|
|
137
148
|
const nativeContract = HypNative__factory.connect(deployedTokenRoute, signer);
|
|
138
149
|
await validateCoreValues(nativeContract);
|
|
139
150
|
});
|
|
151
|
+
describe('Update Ism', async () => {
|
|
152
|
+
const ismConfigToUpdate = [
|
|
153
|
+
{
|
|
154
|
+
type: IsmType.TRUSTED_RELAYER,
|
|
155
|
+
relayer: randomAddress(),
|
|
156
|
+
},
|
|
157
|
+
{
|
|
158
|
+
type: IsmType.FALLBACK_ROUTING,
|
|
159
|
+
owner: randomAddress(),
|
|
160
|
+
domains: {},
|
|
161
|
+
},
|
|
162
|
+
{
|
|
163
|
+
type: IsmType.PAUSABLE,
|
|
164
|
+
owner: randomAddress(),
|
|
165
|
+
paused: false,
|
|
166
|
+
},
|
|
167
|
+
];
|
|
168
|
+
it('should deploy and set a new Ism', async () => {
|
|
169
|
+
const config = {
|
|
170
|
+
...baseConfig,
|
|
171
|
+
type: TokenType.native,
|
|
172
|
+
hook: hookAddress,
|
|
173
|
+
interchainSecurityModule: ismAddress,
|
|
174
|
+
};
|
|
175
|
+
// Deploy using WarpModule
|
|
176
|
+
const evmERC20WarpModule = await EvmERC20WarpModule.create({
|
|
177
|
+
chain,
|
|
178
|
+
config,
|
|
179
|
+
multiProvider,
|
|
180
|
+
});
|
|
181
|
+
const actualConfig = await evmERC20WarpModule.read();
|
|
182
|
+
for (const interchainSecurityModule of ismConfigToUpdate) {
|
|
183
|
+
const expectedConfig = {
|
|
184
|
+
...actualConfig,
|
|
185
|
+
ismFactoryAddresses,
|
|
186
|
+
interchainSecurityModule,
|
|
187
|
+
};
|
|
188
|
+
await sendTxs(await evmERC20WarpModule.update(expectedConfig));
|
|
189
|
+
const updatedConfig = normalizeConfig((await evmERC20WarpModule.read()).interchainSecurityModule);
|
|
190
|
+
expect(updatedConfig).to.deep.equal(interchainSecurityModule);
|
|
191
|
+
}
|
|
192
|
+
});
|
|
193
|
+
it('should not deploy and set a new Ism if the config is the same', async () => {
|
|
194
|
+
const config = {
|
|
195
|
+
...baseConfig,
|
|
196
|
+
type: TokenType.native,
|
|
197
|
+
hook: hookAddress,
|
|
198
|
+
interchainSecurityModule: ismAddress,
|
|
199
|
+
};
|
|
200
|
+
// Deploy using WarpModule
|
|
201
|
+
const evmERC20WarpModule = await EvmERC20WarpModule.create({
|
|
202
|
+
chain,
|
|
203
|
+
config,
|
|
204
|
+
multiProvider,
|
|
205
|
+
});
|
|
206
|
+
const actualConfig = await evmERC20WarpModule.read();
|
|
207
|
+
const owner = randomAddress();
|
|
208
|
+
const interchainSecurityModule = {
|
|
209
|
+
type: IsmType.PAUSABLE,
|
|
210
|
+
owner,
|
|
211
|
+
paused: false,
|
|
212
|
+
};
|
|
213
|
+
const expectedConfig = {
|
|
214
|
+
...actualConfig,
|
|
215
|
+
ismFactoryAddresses,
|
|
216
|
+
interchainSecurityModule,
|
|
217
|
+
};
|
|
218
|
+
await sendTxs(await evmERC20WarpModule.update(expectedConfig));
|
|
219
|
+
const updatedConfig = normalizeConfig((await evmERC20WarpModule.read()).interchainSecurityModule);
|
|
220
|
+
expect(updatedConfig).to.deep.equal(interchainSecurityModule);
|
|
221
|
+
// Deploy with the same config
|
|
222
|
+
const txs = await evmERC20WarpModule.update(expectedConfig);
|
|
223
|
+
expect(txs.length).to.equal(0);
|
|
224
|
+
});
|
|
225
|
+
it('should update a mutable Ism', async () => {
|
|
226
|
+
const ismConfig = {
|
|
227
|
+
type: IsmType.ROUTING,
|
|
228
|
+
owner: signer.address,
|
|
229
|
+
domains: {
|
|
230
|
+
'1': ismAddress,
|
|
231
|
+
},
|
|
232
|
+
};
|
|
233
|
+
const ism = await EvmIsmModule.create({
|
|
234
|
+
chain,
|
|
235
|
+
multiProvider,
|
|
236
|
+
config: ismConfig,
|
|
237
|
+
proxyFactoryFactories: ismFactoryAddresses,
|
|
238
|
+
mailbox: mailbox.address,
|
|
239
|
+
});
|
|
240
|
+
const { deployedIsm } = ism.serialize();
|
|
241
|
+
// Deploy using WarpModule
|
|
242
|
+
const config = {
|
|
243
|
+
...baseConfig,
|
|
244
|
+
type: TokenType.native,
|
|
245
|
+
hook: hookAddress,
|
|
246
|
+
interchainSecurityModule: deployedIsm,
|
|
247
|
+
};
|
|
248
|
+
const evmERC20WarpModule = await EvmERC20WarpModule.create({
|
|
249
|
+
chain,
|
|
250
|
+
config,
|
|
251
|
+
multiProvider,
|
|
252
|
+
});
|
|
253
|
+
const actualConfig = await evmERC20WarpModule.read();
|
|
254
|
+
const expectedConfig = {
|
|
255
|
+
...actualConfig,
|
|
256
|
+
ismFactoryAddresses,
|
|
257
|
+
interchainSecurityModule: {
|
|
258
|
+
type: IsmType.ROUTING,
|
|
259
|
+
owner: randomAddress(),
|
|
260
|
+
domains: {
|
|
261
|
+
'2': ismAddress,
|
|
262
|
+
},
|
|
263
|
+
},
|
|
264
|
+
};
|
|
265
|
+
await sendTxs(await evmERC20WarpModule.update(expectedConfig));
|
|
266
|
+
const updatedConfig = normalizeConfig((await evmERC20WarpModule.read()).interchainSecurityModule);
|
|
267
|
+
expect(updatedConfig).to.deep.equal(expectedConfig.interchainSecurityModule);
|
|
268
|
+
});
|
|
269
|
+
});
|
|
140
270
|
});
|
|
141
271
|
//# sourceMappingURL=EvmERC20WarpModule.hardhat-test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EvmERC20WarpModule.hardhat-test.js","sourceRoot":"","sources":["../../src/token/EvmERC20WarpModule.hardhat-test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,GAAG,MAAM,SAAS,CAAC;AAE1B,OAAO,EAEL,kBAAkB,EAClB,oBAAoB,EAEpB,uCAAuC,EACvC,iBAAiB,EACjB,kBAAkB,EAElB,gBAAgB,GACjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,
|
|
1
|
+
{"version":3,"file":"EvmERC20WarpModule.hardhat-test.js","sourceRoot":"","sources":["../../src/token/EvmERC20WarpModule.hardhat-test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,GAAG,MAAM,SAAS,CAAC;AAE1B,OAAO,EAEL,kBAAkB,EAClB,oBAAoB,EAEpB,uCAAuC,EACvC,iBAAiB,EACjB,kBAAkB,EAElB,gBAAgB,GACjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,YAAY,EAIZ,OAAO,EAEP,aAAa,EACb,kBAAkB,GACnB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAGvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,6BAA6B,EAAE,MAAM,4CAA4C,CAAC;AAE3F,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAE9D,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAGrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC,QAAQ,CAAC,6BAA6B,EAAE,KAAK,IAAI,EAAE;IACjD,MAAM,UAAU,GAAG,MAAM,CAAC;IAC1B,MAAM,YAAY,GAAG,uBAAuB,CAAC;IAC7C,MAAM,cAAc,GAAG,EAAE,CAAC;IAC1B,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC;IAClC,IAAI,OAAgB,CAAC;IACrB,IAAI,WAAmB,CAAC;IACxB,IAAI,UAAkB,CAAC;IACvB,IAAI,UAA+B,CAAC;IACpC,IAAI,SAAuD,CAAC;IAC5D,IAAI,mBAA8D,CAAC;IACnE,IAAI,YAAgC,CAAC;IACrC,IAAI,KAAgB,CAAC;IACrB,IAAI,MAAyB,CAAC;IAC9B,IAAI,aAA4B,CAAC;IACjC,IAAI,OAAoB,CAAC;IACzB,IAAI,eAAuC,CAAC;IAC5C,IAAI,UAAwB,CAAC;IAE7B,KAAK,UAAU,kBAAkB,CAAC,aAAwB;QACxD,MAAM,CAAC,MAAM,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAChE,MAAM,CAAC,MAAM,aAAa,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QACzD,MAAM,CAAC,MAAM,aAAa,CAAC,wBAAwB,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAC7D,SAAS,CAAC,WAAW,CACtB,CAAC;QACF,MAAM,CAAC,MAAM,aAAa,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC/D,CAAC;IAED,KAAK,UAAU,OAAO,CAAC,GAA8B;QACnD,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;YACrB,MAAM,aAAa,CAAC,eAAe,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACjD,CAAC;IACH,CAAC;IAED,MAAM,CAAC,KAAK,IAAI,EAAE;QAChB,CAAC,MAAM,CAAC,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;QACzC,aAAa,GAAG,aAAa,CAAC,uBAAuB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;QAClE,MAAM,kBAAkB,GAAG,IAAI,6BAA6B,CAAC,aAAa,CAAC,CAAC;QAC5E,SAAS,GAAG,MAAM,kBAAkB,CAAC,MAAM,CACzC,aAAa,CAAC,cAAc,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CACzC,CAAC;QACF,mBAAmB,GAAG,kBAAkB,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;QAC3D,UAAU,GAAG,IAAI,mBAAmB,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;QAC/D,OAAO,GAAG,MAAM,IAAI,gBAAgB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC,SAAS,EAAE,CAAC;QAC5E,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAE1D,YAAY,GAAG,IAAI,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAC9C,KAAK,GAAG,MAAM,YAAY,CAAC,MAAM,CAC/B,UAAU,EACV,UAAU,EACV,YAAY,EACZ,cAAc,CACf,CAAC;QAEF,UAAU,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;QAEpC,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC/D,WAAW,GAAG,MAAM,OAAO,CAAC,WAAW,EAAE,CAAC;QAC1C,UAAU,GAAG,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wCAAwC,EAAE,KAAK,IAAI,EAAE;QACtD,MAAM,MAAM,GAAG;YACb,GAAG,UAAU;YACb,IAAI,EAAE,SAAS,CAAC,UAAU;YAC1B,KAAK,EAAE,KAAK,CAAC,OAAO;YACpB,IAAI,EAAE,WAAW;SAClB,CAAC;QAEF,0BAA0B;QAC1B,MAAM,kBAAkB,GAAG,MAAM,kBAAkB,CAAC,MAAM,CAAC;YACzD,KAAK;YACL,MAAM;YACN,aAAa;SACd,CAAC,CAAC;QAEH,uCAAuC;QACvC,MAAM,EAAE,kBAAkB,EAAE,GAAG,kBAAkB,CAAC,SAAS,EAAE,CAAC;QAC9D,MAAM,SAAS,GACb,MAAM,kBAAkB,CAAC,MAAM,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC;QACtE,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;QAC5D,MAAM,YAAY,GAAG,IAAI,oBAAoB,CAAC,MAAM,CAAC,CAAC;QACtD,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,MAAM,CACrC,KAAK,CAAC,OAAO,EACb,UAAU,EACV,UAAU,CACX,CAAC;QACF,MAAM,MAAM,GAAG;YACb,IAAI,EAAE,SAAS,CAAC,eAAe;YAC/B,KAAK,EAAE,KAAK,CAAC,OAAO;YACpB,IAAI,EAAE,WAAW;YACjB,GAAG,UAAU;SACd,CAAC;QAEF,0BAA0B;QAC1B,MAAM,kBAAkB,GAAG,MAAM,kBAAkB,CAAC,MAAM,CAAC;YACzD,KAAK;YACL,MAAM;YACN,aAAa;SACd,CAAC,CAAC;QAEH,uCAAuC;QACvC,MAAM,EAAE,kBAAkB,EAAE,GAAG,kBAAkB,CAAC,SAAS,EAAE,CAAC;QAC9D,MAAM,SAAS,GACb,MAAM,kBAAkB,CAAC,MAAM,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC;QACtE,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;QAEtD,gCAAgC;QAChC,MAAM,uBAAuB,GAC3B,uCAAuC,CAAC,OAAO,CAC7C,kBAAkB,EAClB,MAAM,CACP,CAAC;QACJ,MAAM,kBAAkB,CAAC,uBAAuB,CAAC,CAAC;QAClD,MAAM,CAAC,MAAM,uBAAuB,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACtE,MAAM,CAAC,MAAM,uBAAuB,CAAC,YAAY,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAC3D,KAAK,CAAC,OAAO,CACd,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;QACrD,MAAM,MAAM,GAAG;YACb,IAAI,EAAE,SAAS,CAAC,SAAS;YACzB,KAAK,EAAE,KAAK,CAAC,OAAO;YACpB,IAAI,EAAE,WAAW;YACjB,IAAI,EAAE,UAAU;YAChB,MAAM,EAAE,UAAU;YAClB,QAAQ,EAAE,cAAc;YACxB,WAAW,EAAE,YAAY;YACzB,GAAG,UAAU;SACd,CAAC;QAEF,0BAA0B;QAC1B,MAAM,kBAAkB,GAAG,MAAM,kBAAkB,CAAC,MAAM,CAAC;YACzD,KAAK;YACL,MAAM;YACN,aAAa;SACd,CAAC,CAAC;QAEH,uCAAuC;QACvC,MAAM,EAAE,kBAAkB,EAAE,GAAG,kBAAkB,CAAC,SAAS,EAAE,CAAC;QAC9D,MAAM,SAAS,GACb,MAAM,kBAAkB,CAAC,MAAM,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC;QACtE,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAEhD,gCAAgC;QAChC,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,OAAO,CACjD,kBAAkB,EAClB,MAAM,CACP,CAAC;QACF,MAAM,kBAAkB,CAAC,iBAAiB,CAAC,CAAC;QAC5C,MAAM,CAAC,MAAM,iBAAiB,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAC5D,MAAM,CAAC,MAAM,iBAAiB,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAC9D,MAAM,CAAC,MAAM,iBAAiB,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QACpE,MAAM,CAAC,MAAM,iBAAiB,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IACvE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oCAAoC,EAAE,KAAK,IAAI,EAAE;QAClD,MAAM,MAAM,GAAG;YACb,IAAI,EAAE,SAAS,CAAC,MAAM;YACtB,IAAI,EAAE,WAAW;YACjB,GAAG,UAAU;SACO,CAAC;QAEvB,0BAA0B;QAC1B,MAAM,kBAAkB,GAAG,MAAM,kBAAkB,CAAC,MAAM,CAAC;YACzD,KAAK;YACL,MAAM;YACN,aAAa;SACd,CAAC,CAAC;QAEH,uCAAuC;QACvC,MAAM,EAAE,kBAAkB,EAAE,GAAG,kBAAkB,CAAC,SAAS,EAAE,CAAC;QAC9D,MAAM,SAAS,GACb,MAAM,kBAAkB,CAAC,MAAM,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC;QACtE,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAE7C,gCAAgC;QAChC,MAAM,cAAc,GAAG,kBAAkB,CAAC,OAAO,CAC/C,kBAAkB,EAClB,MAAM,CACP,CAAC;QACF,MAAM,kBAAkB,CAAC,cAAc,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,YAAY,EAAE,KAAK,IAAI,EAAE;QAChC,MAAM,iBAAiB,GAAgB;YACrC;gBACE,IAAI,EAAE,OAAO,CAAC,eAAe;gBAC7B,OAAO,EAAE,aAAa,EAAE;aACzB;YACD;gBACE,IAAI,EAAE,OAAO,CAAC,gBAAgB;gBAC9B,KAAK,EAAE,aAAa,EAAE;gBACtB,OAAO,EAAE,EAAE;aACZ;YACD;gBACE,IAAI,EAAE,OAAO,CAAC,QAAQ;gBACtB,KAAK,EAAE,aAAa,EAAE;gBACtB,MAAM,EAAE,KAAK;aACd;SACF,CAAC;QACF,EAAE,CAAC,iCAAiC,EAAE,KAAK,IAAI,EAAE;YAC/C,MAAM,MAAM,GAAG;gBACb,GAAG,UAAU;gBACb,IAAI,EAAE,SAAS,CAAC,MAAM;gBACtB,IAAI,EAAE,WAAW;gBACjB,wBAAwB,EAAE,UAAU;aAChB,CAAC;YAEvB,0BAA0B;YAC1B,MAAM,kBAAkB,GAAG,MAAM,kBAAkB,CAAC,MAAM,CAAC;gBACzD,KAAK;gBACL,MAAM;gBACN,aAAa;aACd,CAAC,CAAC;YACH,MAAM,YAAY,GAAG,MAAM,kBAAkB,CAAC,IAAI,EAAE,CAAC;YAErD,KAAK,MAAM,wBAAwB,IAAI,iBAAiB,EAAE,CAAC;gBACzD,MAAM,cAAc,GAAsB;oBACxC,GAAG,YAAY;oBACf,mBAAmB;oBACnB,wBAAwB;iBACzB,CAAC;gBACF,MAAM,OAAO,CAAC,MAAM,kBAAkB,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC;gBAC/D,MAAM,aAAa,GAAG,eAAe,CACnC,CAAC,MAAM,kBAAkB,CAAC,IAAI,EAAE,CAAC,CAAC,wBAAwB,CAC3D,CAAC;gBAEF,MAAM,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;YAChE,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,+DAA+D,EAAE,KAAK,IAAI,EAAE;YAC7E,MAAM,MAAM,GAAG;gBACb,GAAG,UAAU;gBACb,IAAI,EAAE,SAAS,CAAC,MAAM;gBACtB,IAAI,EAAE,WAAW;gBACjB,wBAAwB,EAAE,UAAU;aAChB,CAAC;YAEvB,0BAA0B;YAC1B,MAAM,kBAAkB,GAAG,MAAM,kBAAkB,CAAC,MAAM,CAAC;gBACzD,KAAK;gBACL,MAAM;gBACN,aAAa;aACd,CAAC,CAAC;YACH,MAAM,YAAY,GAAG,MAAM,kBAAkB,CAAC,IAAI,EAAE,CAAC;YAErD,MAAM,KAAK,GAAG,aAAa,EAAE,CAAC;YAC9B,MAAM,wBAAwB,GAAc;gBAC1C,IAAI,EAAE,OAAO,CAAC,QAAQ;gBACtB,KAAK;gBACL,MAAM,EAAE,KAAK;aACd,CAAC;YACF,MAAM,cAAc,GAAsB;gBACxC,GAAG,YAAY;gBACf,mBAAmB;gBACnB,wBAAwB;aACzB,CAAC;YAEF,MAAM,OAAO,CAAC,MAAM,kBAAkB,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC;YAE/D,MAAM,aAAa,GAAG,eAAe,CACnC,CAAC,MAAM,kBAAkB,CAAC,IAAI,EAAE,CAAC,CAAC,wBAAwB,CAC3D,CAAC;YAEF,MAAM,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;YAE9D,8BAA8B;YAC9B,MAAM,GAAG,GAAG,MAAM,kBAAkB,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;YAE5D,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,6BAA6B,EAAE,KAAK,IAAI,EAAE;YAC3C,MAAM,SAAS,GAAc;gBAC3B,IAAI,EAAE,OAAO,CAAC,OAAO;gBACrB,KAAK,EAAE,MAAM,CAAC,OAAO;gBACrB,OAAO,EAAE;oBACP,GAAG,EAAE,UAAU;iBAChB;aACF,CAAC;YACF,MAAM,GAAG,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC;gBACpC,KAAK;gBACL,aAAa;gBACb,MAAM,EAAE,SAAS;gBACjB,qBAAqB,EAAE,mBAAmB;gBAC1C,OAAO,EAAE,OAAO,CAAC,OAAO;aACzB,CAAC,CAAC;YAEH,MAAM,EAAE,WAAW,EAAE,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC;YACxC,0BAA0B;YAC1B,MAAM,MAAM,GAAG;gBACb,GAAG,UAAU;gBACb,IAAI,EAAE,SAAS,CAAC,MAAM;gBACtB,IAAI,EAAE,WAAW;gBACjB,wBAAwB,EAAE,WAAW;aACjB,CAAC;YAEvB,MAAM,kBAAkB,GAAG,MAAM,kBAAkB,CAAC,MAAM,CAAC;gBACzD,KAAK;gBACL,MAAM;gBACN,aAAa;aACd,CAAC,CAAC;YACH,MAAM,YAAY,GAAG,MAAM,kBAAkB,CAAC,IAAI,EAAE,CAAC;YACrD,MAAM,cAAc,GAAsB;gBACxC,GAAG,YAAY;gBACf,mBAAmB;gBACnB,wBAAwB,EAAE;oBACxB,IAAI,EAAE,OAAO,CAAC,OAAO;oBACrB,KAAK,EAAE,aAAa,EAAE;oBACtB,OAAO,EAAE;wBACP,GAAG,EAAE,UAAU;qBAChB;iBACF;aACF,CAAC;YAEF,MAAM,OAAO,CAAC,MAAM,kBAAkB,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC;YAE/D,MAAM,aAAa,GAAG,eAAe,CACnC,CAAC,MAAM,kBAAkB,CAAC,IAAI,EAAE,CAAC,CAAC,wBAAwB,CAC3D,CAAC;YAEF,MAAM,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CACjC,cAAc,CAAC,wBAAwB,CACxC,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1,17 +1,24 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { MailboxClient__factory } from '@hyperlane-xyz/core';
|
|
2
|
+
import { assert, rootLogger, } from '@hyperlane-xyz/utils';
|
|
2
3
|
import { HyperlaneModule, } from '../core/AbstractHyperlaneModule.js';
|
|
4
|
+
import { EvmIsmModule } from '../ism/EvmIsmModule.js';
|
|
3
5
|
import { EvmERC20WarpRouteReader } from './EvmERC20WarpRouteReader.js';
|
|
4
6
|
import { HypERC20Deployer } from './deploy.js';
|
|
7
|
+
import { TokenRouterConfigSchema } from './schemas.js';
|
|
5
8
|
export class EvmERC20WarpModule extends HyperlaneModule {
|
|
6
9
|
multiProvider;
|
|
7
10
|
logger = rootLogger.child({
|
|
8
11
|
module: 'EvmERC20WarpModule',
|
|
9
12
|
});
|
|
10
13
|
reader;
|
|
14
|
+
// We use domainId here because MultiProvider.getDomainId() will always
|
|
15
|
+
// return a number, and EVM the domainId and chainId are the same.
|
|
16
|
+
domainId;
|
|
11
17
|
constructor(multiProvider, args) {
|
|
12
18
|
super(args);
|
|
13
19
|
this.multiProvider = multiProvider;
|
|
14
20
|
this.reader = new EvmERC20WarpRouteReader(multiProvider, args.chain);
|
|
21
|
+
this.domainId = multiProvider.getDomainId(args.chain);
|
|
15
22
|
}
|
|
16
23
|
/**
|
|
17
24
|
* Retrieves the token router configuration for the specified address.
|
|
@@ -25,13 +32,61 @@ export class EvmERC20WarpModule extends HyperlaneModule {
|
|
|
25
32
|
/**
|
|
26
33
|
* Updates the Warp Route contract with the provided configuration.
|
|
27
34
|
*
|
|
28
|
-
* @remark Currently only supports updating ISM or hook.
|
|
29
|
-
*
|
|
30
35
|
* @param expectedConfig - The configuration for the token router to be updated.
|
|
31
36
|
* @returns An array of Ethereum transactions that were executed to update the contract, or an error if the update failed.
|
|
32
37
|
*/
|
|
33
|
-
async update(
|
|
34
|
-
|
|
38
|
+
async update(expectedConfig) {
|
|
39
|
+
TokenRouterConfigSchema.parse(expectedConfig);
|
|
40
|
+
const actualConfig = await this.read();
|
|
41
|
+
return this.updateIsm(actualConfig, expectedConfig);
|
|
42
|
+
}
|
|
43
|
+
/**
|
|
44
|
+
* Updates an existing Warp route ISM with a given config.
|
|
45
|
+
*
|
|
46
|
+
* @param actualConfig - The on-chain router configuration, including the ISM configuration, and address.
|
|
47
|
+
* @param expectedConfig - The expected token router configuration, including the ISM configuration.
|
|
48
|
+
* @returns Ethereum transaction that need to be executed to update the ISM configuration.
|
|
49
|
+
*/
|
|
50
|
+
async updateIsm(actualConfig, expectedConfig) {
|
|
51
|
+
const updateTransactions = [];
|
|
52
|
+
const actualDeployedIsm = actualConfig.interchainSecurityModule.address;
|
|
53
|
+
// Try to update (may also deploy) Ism with the expected config
|
|
54
|
+
const { deployedIsm: expectedDeployedIsm, updateTransactions: ismUpdateTransactions, } = await this.deployOrUpdateIsm(actualConfig, expectedConfig);
|
|
55
|
+
// If an ISM is updated in-place, push the update txs
|
|
56
|
+
updateTransactions.push(...ismUpdateTransactions);
|
|
57
|
+
// If a new ISM is deployed, push the setInterchainSecurityModule tx
|
|
58
|
+
if (actualDeployedIsm !== expectedDeployedIsm) {
|
|
59
|
+
const contractToUpdate = MailboxClient__factory.connect(this.args.addresses.deployedTokenRoute, this.multiProvider.getProvider(this.args.chain));
|
|
60
|
+
updateTransactions.push({
|
|
61
|
+
annotation: `Setting ISM for Warp Route to ${expectedDeployedIsm}`,
|
|
62
|
+
chainId: this.domainId,
|
|
63
|
+
to: contractToUpdate.address,
|
|
64
|
+
data: contractToUpdate.interface.encodeFunctionData('setInterchainSecurityModule', [expectedDeployedIsm]),
|
|
65
|
+
});
|
|
66
|
+
}
|
|
67
|
+
return updateTransactions;
|
|
68
|
+
}
|
|
69
|
+
/**
|
|
70
|
+
* Updates or deploys the ISM using the provided configuration.
|
|
71
|
+
*
|
|
72
|
+
* @returns Object with deployedIsm address, and update Transactions
|
|
73
|
+
*/
|
|
74
|
+
async deployOrUpdateIsm(actualConfig, expectedConfig) {
|
|
75
|
+
assert(expectedConfig.interchainSecurityModule, 'Ism not derived correctly');
|
|
76
|
+
assert(expectedConfig.ismFactoryAddresses, 'Ism Factories addresses not provided');
|
|
77
|
+
const ismModule = new EvmIsmModule(this.multiProvider, {
|
|
78
|
+
chain: this.args.chain,
|
|
79
|
+
config: expectedConfig.interchainSecurityModule,
|
|
80
|
+
addresses: {
|
|
81
|
+
...expectedConfig.ismFactoryAddresses,
|
|
82
|
+
mailbox: expectedConfig.mailbox,
|
|
83
|
+
deployedIsm: actualConfig.interchainSecurityModule
|
|
84
|
+
.address,
|
|
85
|
+
},
|
|
86
|
+
});
|
|
87
|
+
const updateTransactions = await ismModule.update(expectedConfig.interchainSecurityModule);
|
|
88
|
+
const { deployedIsm } = ismModule.serialize();
|
|
89
|
+
return { deployedIsm, updateTransactions };
|
|
35
90
|
}
|
|
36
91
|
/**
|
|
37
92
|
* Deploys the Warp Route.
|
|
@@ -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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"}
|
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,EAEV,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;IAyD/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, 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';
|
|
@@ -29,11 +30,13 @@ class TokenDeployer extends GasRouterDeployer {
|
|
|
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;
|
|
@@ -46,6 +49,8 @@ class TokenDeployer extends GasRouterDeployer {
|
|
|
46
49
|
}
|
|
47
50
|
}
|
|
48
51
|
static async deriveTokenMetadata(multiProvider, configMap) {
|
|
52
|
+
// this is used for synthetic token metadata and should always be 0
|
|
53
|
+
const DERIVED_TOKEN_SUPPLY = 0;
|
|
49
54
|
for (const [chain, config] of Object.entries(configMap)) {
|
|
50
55
|
if (isTokenMetadata(config)) {
|
|
51
56
|
return config;
|
|
@@ -53,32 +58,33 @@ class TokenDeployer extends GasRouterDeployer {
|
|
|
53
58
|
if (isNativeConfig(config)) {
|
|
54
59
|
const nativeToken = multiProvider.getChainMetadata(chain).nativeToken;
|
|
55
60
|
if (nativeToken) {
|
|
56
|
-
return { totalSupply:
|
|
61
|
+
return { totalSupply: DERIVED_TOKEN_SUPPLY, ...nativeToken };
|
|
57
62
|
}
|
|
58
63
|
}
|
|
59
64
|
if (isCollateralConfig(config)) {
|
|
60
65
|
const provider = multiProvider.getProvider(chain);
|
|
61
66
|
if (config.isNft) {
|
|
62
67
|
const erc721 = ERC721Enumerable__factory.connect(config.token, provider);
|
|
63
|
-
const [name, symbol
|
|
68
|
+
const [name, symbol] = await Promise.all([
|
|
64
69
|
erc721.name(),
|
|
65
70
|
erc721.symbol(),
|
|
66
|
-
erc721.totalSupply(),
|
|
67
71
|
]);
|
|
68
72
|
return {
|
|
69
73
|
name,
|
|
70
74
|
symbol,
|
|
71
|
-
totalSupply:
|
|
75
|
+
totalSupply: DERIVED_TOKEN_SUPPLY,
|
|
72
76
|
};
|
|
73
77
|
}
|
|
74
|
-
const
|
|
75
|
-
|
|
78
|
+
const token = config.type === TokenType.XERC20Lockbox
|
|
79
|
+
? await IXERC20Lockbox__factory.connect(config.token, provider).callStatic.ERC20()
|
|
80
|
+
: config.token;
|
|
81
|
+
const erc20 = ERC20__factory.connect(token, provider);
|
|
82
|
+
const [name, symbol, decimals] = await Promise.all([
|
|
76
83
|
erc20.name(),
|
|
77
84
|
erc20.symbol(),
|
|
78
|
-
erc20.totalSupply(),
|
|
79
85
|
erc20.decimals(),
|
|
80
86
|
]);
|
|
81
|
-
return { name, symbol, totalSupply:
|
|
87
|
+
return { name, symbol, decimals, totalSupply: DERIVED_TOKEN_SUPPLY };
|
|
82
88
|
}
|
|
83
89
|
}
|
|
84
90
|
return undefined;
|
package/dist/token/deploy.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../src/token/deploy.ts"],"names":[],"mappings":"AAAA,sEAAsE;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEnC,OAAO,EACL,cAAc,EACd,yBAAyB,
|
|
1
|
+
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../src/token/deploy.ts"],"names":[],"mappings":"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"}
|
package/dist/token/schemas.d.ts
CHANGED
|
@@ -421,6 +421,25 @@ export declare const TokenRouterConfigSchema: z.ZodIntersection<z.ZodDiscriminat
|
|
|
421
421
|
}, {
|
|
422
422
|
type: import("../index.js").IsmType.MERKLE_ROOT_MULTISIG | import("../index.js").IsmType.MESSAGE_ID_MULTISIG;
|
|
423
423
|
}>>, z.ZodType<import("../index.js").RoutingIsmConfig, z.ZodTypeDef, import("../index.js").RoutingIsmConfig>, z.ZodType<import("../index.js").AggregationIsmConfig, z.ZodTypeDef, import("../index.js").AggregationIsmConfig>]>>;
|
|
424
|
+
ismFactoryAddresses: z.ZodOptional<z.ZodObject<{
|
|
425
|
+
staticMerkleRootMultisigIsmFactory: z.ZodString;
|
|
426
|
+
staticMessageIdMultisigIsmFactory: z.ZodString;
|
|
427
|
+
staticAggregationIsmFactory: z.ZodString;
|
|
428
|
+
staticAggregationHookFactory: z.ZodString;
|
|
429
|
+
domainRoutingIsmFactory: z.ZodString;
|
|
430
|
+
}, "strip", z.ZodTypeAny, {
|
|
431
|
+
staticMerkleRootMultisigIsmFactory: string;
|
|
432
|
+
staticMessageIdMultisigIsmFactory: string;
|
|
433
|
+
staticAggregationIsmFactory: string;
|
|
434
|
+
staticAggregationHookFactory: string;
|
|
435
|
+
domainRoutingIsmFactory: string;
|
|
436
|
+
}, {
|
|
437
|
+
staticMerkleRootMultisigIsmFactory: string;
|
|
438
|
+
staticMessageIdMultisigIsmFactory: string;
|
|
439
|
+
staticAggregationIsmFactory: string;
|
|
440
|
+
staticAggregationHookFactory: string;
|
|
441
|
+
domainRoutingIsmFactory: string;
|
|
442
|
+
}>>;
|
|
424
443
|
foreignDeployment: z.ZodOptional<z.ZodString>;
|
|
425
444
|
gas: z.ZodOptional<z.ZodNumber>;
|
|
426
445
|
}, "strip", z.ZodTypeAny, {
|
|
@@ -480,6 +499,13 @@ export declare const TokenRouterConfigSchema: z.ZodIntersection<z.ZodDiscriminat
|
|
|
480
499
|
} & {
|
|
481
500
|
type: import("../index.js").IsmType.MERKLE_ROOT_MULTISIG | import("../index.js").IsmType.MESSAGE_ID_MULTISIG;
|
|
482
501
|
}) | import("../index.js").AggregationIsmConfig | undefined;
|
|
502
|
+
ismFactoryAddresses?: {
|
|
503
|
+
staticMerkleRootMultisigIsmFactory: string;
|
|
504
|
+
staticMessageIdMultisigIsmFactory: string;
|
|
505
|
+
staticAggregationIsmFactory: string;
|
|
506
|
+
staticAggregationHookFactory: string;
|
|
507
|
+
domainRoutingIsmFactory: string;
|
|
508
|
+
} | undefined;
|
|
483
509
|
foreignDeployment?: string | undefined;
|
|
484
510
|
gas?: number | undefined;
|
|
485
511
|
}, {
|
|
@@ -539,6 +565,13 @@ export declare const TokenRouterConfigSchema: z.ZodIntersection<z.ZodDiscriminat
|
|
|
539
565
|
} & {
|
|
540
566
|
type: import("../index.js").IsmType.MERKLE_ROOT_MULTISIG | import("../index.js").IsmType.MESSAGE_ID_MULTISIG;
|
|
541
567
|
}) | import("../index.js").AggregationIsmConfig | undefined;
|
|
568
|
+
ismFactoryAddresses?: {
|
|
569
|
+
staticMerkleRootMultisigIsmFactory: string;
|
|
570
|
+
staticMessageIdMultisigIsmFactory: string;
|
|
571
|
+
staticAggregationIsmFactory: string;
|
|
572
|
+
staticAggregationHookFactory: string;
|
|
573
|
+
domainRoutingIsmFactory: string;
|
|
574
|
+
} | undefined;
|
|
542
575
|
foreignDeployment?: string | undefined;
|
|
543
576
|
gas?: number | undefined;
|
|
544
577
|
}>>;
|
|
@@ -821,6 +854,25 @@ export declare const WarpRouteDeployConfigSchema: z.ZodEffects<z.ZodRecord<z.Zod
|
|
|
821
854
|
}, {
|
|
822
855
|
type: import("../index.js").IsmType.MERKLE_ROOT_MULTISIG | import("../index.js").IsmType.MESSAGE_ID_MULTISIG;
|
|
823
856
|
}>>, z.ZodType<import("../index.js").RoutingIsmConfig, z.ZodTypeDef, import("../index.js").RoutingIsmConfig>, z.ZodType<import("../index.js").AggregationIsmConfig, z.ZodTypeDef, import("../index.js").AggregationIsmConfig>]>>;
|
|
857
|
+
ismFactoryAddresses: z.ZodOptional<z.ZodObject<{
|
|
858
|
+
staticMerkleRootMultisigIsmFactory: z.ZodString;
|
|
859
|
+
staticMessageIdMultisigIsmFactory: z.ZodString;
|
|
860
|
+
staticAggregationIsmFactory: z.ZodString;
|
|
861
|
+
staticAggregationHookFactory: z.ZodString;
|
|
862
|
+
domainRoutingIsmFactory: z.ZodString;
|
|
863
|
+
}, "strip", z.ZodTypeAny, {
|
|
864
|
+
staticMerkleRootMultisigIsmFactory: string;
|
|
865
|
+
staticMessageIdMultisigIsmFactory: string;
|
|
866
|
+
staticAggregationIsmFactory: string;
|
|
867
|
+
staticAggregationHookFactory: string;
|
|
868
|
+
domainRoutingIsmFactory: string;
|
|
869
|
+
}, {
|
|
870
|
+
staticMerkleRootMultisigIsmFactory: string;
|
|
871
|
+
staticMessageIdMultisigIsmFactory: string;
|
|
872
|
+
staticAggregationIsmFactory: string;
|
|
873
|
+
staticAggregationHookFactory: string;
|
|
874
|
+
domainRoutingIsmFactory: string;
|
|
875
|
+
}>>;
|
|
824
876
|
foreignDeployment: z.ZodOptional<z.ZodString>;
|
|
825
877
|
gas: z.ZodOptional<z.ZodNumber>;
|
|
826
878
|
}, "strip", z.ZodTypeAny, {
|
|
@@ -880,6 +932,13 @@ export declare const WarpRouteDeployConfigSchema: z.ZodEffects<z.ZodRecord<z.Zod
|
|
|
880
932
|
} & {
|
|
881
933
|
type: import("../index.js").IsmType.MERKLE_ROOT_MULTISIG | import("../index.js").IsmType.MESSAGE_ID_MULTISIG;
|
|
882
934
|
}) | import("../index.js").AggregationIsmConfig | undefined;
|
|
935
|
+
ismFactoryAddresses?: {
|
|
936
|
+
staticMerkleRootMultisigIsmFactory: string;
|
|
937
|
+
staticMessageIdMultisigIsmFactory: string;
|
|
938
|
+
staticAggregationIsmFactory: string;
|
|
939
|
+
staticAggregationHookFactory: string;
|
|
940
|
+
domainRoutingIsmFactory: string;
|
|
941
|
+
} | undefined;
|
|
883
942
|
foreignDeployment?: string | undefined;
|
|
884
943
|
gas?: number | undefined;
|
|
885
944
|
}, {
|
|
@@ -939,6 +998,13 @@ export declare const WarpRouteDeployConfigSchema: z.ZodEffects<z.ZodRecord<z.Zod
|
|
|
939
998
|
} & {
|
|
940
999
|
type: import("../index.js").IsmType.MERKLE_ROOT_MULTISIG | import("../index.js").IsmType.MESSAGE_ID_MULTISIG;
|
|
941
1000
|
}) | import("../index.js").AggregationIsmConfig | undefined;
|
|
1001
|
+
ismFactoryAddresses?: {
|
|
1002
|
+
staticMerkleRootMultisigIsmFactory: string;
|
|
1003
|
+
staticMessageIdMultisigIsmFactory: string;
|
|
1004
|
+
staticAggregationIsmFactory: string;
|
|
1005
|
+
staticAggregationHookFactory: string;
|
|
1006
|
+
domainRoutingIsmFactory: string;
|
|
1007
|
+
} | undefined;
|
|
942
1008
|
foreignDeployment?: string | undefined;
|
|
943
1009
|
gas?: number | undefined;
|
|
944
1010
|
}>>>, Record<string, ({
|
|
@@ -1023,6 +1089,13 @@ export declare const WarpRouteDeployConfigSchema: z.ZodEffects<z.ZodRecord<z.Zod
|
|
|
1023
1089
|
} & {
|
|
1024
1090
|
type: import("../index.js").IsmType.MERKLE_ROOT_MULTISIG | import("../index.js").IsmType.MESSAGE_ID_MULTISIG;
|
|
1025
1091
|
}) | import("../index.js").AggregationIsmConfig | undefined;
|
|
1092
|
+
ismFactoryAddresses?: {
|
|
1093
|
+
staticMerkleRootMultisigIsmFactory: string;
|
|
1094
|
+
staticMessageIdMultisigIsmFactory: string;
|
|
1095
|
+
staticAggregationIsmFactory: string;
|
|
1096
|
+
staticAggregationHookFactory: string;
|
|
1097
|
+
domainRoutingIsmFactory: string;
|
|
1098
|
+
} | undefined;
|
|
1026
1099
|
foreignDeployment?: string | undefined;
|
|
1027
1100
|
gas?: number | undefined;
|
|
1028
1101
|
}>, Record<string, ({
|
|
@@ -1107,6 +1180,13 @@ export declare const WarpRouteDeployConfigSchema: z.ZodEffects<z.ZodRecord<z.Zod
|
|
|
1107
1180
|
} & {
|
|
1108
1181
|
type: import("../index.js").IsmType.MERKLE_ROOT_MULTISIG | import("../index.js").IsmType.MESSAGE_ID_MULTISIG;
|
|
1109
1182
|
}) | import("../index.js").AggregationIsmConfig | undefined;
|
|
1183
|
+
ismFactoryAddresses?: {
|
|
1184
|
+
staticMerkleRootMultisigIsmFactory: string;
|
|
1185
|
+
staticMessageIdMultisigIsmFactory: string;
|
|
1186
|
+
staticAggregationIsmFactory: string;
|
|
1187
|
+
staticAggregationHookFactory: string;
|
|
1188
|
+
domainRoutingIsmFactory: string;
|
|
1189
|
+
} | undefined;
|
|
1110
1190
|
foreignDeployment?: string | undefined;
|
|
1111
1191
|
gas?: number | undefined;
|
|
1112
1192
|
}>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schemas.d.ts","sourceRoot":"","sources":["../../src/token/schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAKxB,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;EAO9B,CAAC;AAEH,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;EAajC,CAAC;AAEH,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;EAE7B,CAAC;AAEH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;EAMhC,CAAC;AAEH;;;;GAIG;AACH,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAI5B,CAAC;AAEH,eAAO,MAAM,uBAAuB
|
|
1
|
+
{"version":3,"file":"schemas.d.ts","sourceRoot":"","sources":["../../src/token/schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAKxB,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;EAO9B,CAAC;AAEH,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;EAajC,CAAC;AAEH,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;EAE7B,CAAC;AAEH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;EAMhC,CAAC;AAEH;;;;GAIG;AACH,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAI5B,CAAC;AAEH,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAEnC,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAC;AACxE,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAC9D,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAEtE,eAAO,MAAM,iBAAiB;;;;;;;;CAAqC,CAAC;AACpE,eAAO,MAAM,kBAAkB;;;;;;;;;CAAsC,CAAC;AACtE,eAAO,MAAM,cAAc;;;;;;;;CAAkC,CAAC;AAC9D,eAAO,MAAM,eAAe;;;;;;;CAAmC,CAAC;AAEhE,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GASqD,CAAC"}
|
package/dist/utils/gnosisSafe.js
CHANGED
|
@@ -16,9 +16,19 @@ export function getSafeService(chain, multiProvider) {
|
|
|
16
16
|
export function getSafe(chain, multiProvider, safeAddress) {
|
|
17
17
|
const signer = multiProvider.getSigner(chain);
|
|
18
18
|
const ethAdapter = new EthersAdapter({ ethers, signerOrProvider: signer });
|
|
19
|
+
|
|
20
|
+
const domainId = multiProvider.getDomainId(chain);
|
|
21
|
+
const contractNetworks = {
|
|
22
|
+
[domainId]: {
|
|
23
|
+
multiSendAddress: safeAddress,
|
|
24
|
+
multiSendCallOnlyAddress: safeAddress,
|
|
25
|
+
},
|
|
26
|
+
};
|
|
27
|
+
|
|
19
28
|
return Safe.default.create({
|
|
20
29
|
ethAdapter,
|
|
21
|
-
safeAddress
|
|
30
|
+
safeAddress,
|
|
31
|
+
contractNetworks,
|
|
22
32
|
});
|
|
23
33
|
}
|
|
24
34
|
|
package/package.json
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@hyperlane-xyz/sdk",
|
|
3
3
|
"description": "The official SDK for the Hyperlane Network",
|
|
4
|
-
"version": "4.
|
|
4
|
+
"version": "4.1.0",
|
|
5
5
|
"dependencies": {
|
|
6
6
|
"@aws-sdk/client-s3": "^3.74.0",
|
|
7
7
|
"@cosmjs/cosmwasm-stargate": "^0.31.3",
|
|
8
8
|
"@cosmjs/stargate": "^0.31.3",
|
|
9
|
-
"@hyperlane-xyz/core": "4.
|
|
10
|
-
"@hyperlane-xyz/utils": "4.
|
|
9
|
+
"@hyperlane-xyz/core": "4.1.0",
|
|
10
|
+
"@hyperlane-xyz/utils": "4.1.0",
|
|
11
11
|
"@safe-global/api-kit": "1.3.0",
|
|
12
12
|
"@safe-global/protocol-kit": "1.3.0",
|
|
13
13
|
"@solana/spl-token": "^0.3.8",
|