@hyperlane-xyz/sdk 1.4.2 → 1.4.3-beta1
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/HyperlaneApp.d.ts.map +1 -1
- package/dist/HyperlaneApp.js +2 -2
- package/dist/HyperlaneApp.js.map +1 -1
- package/dist/consts/chainMetadata.d.ts +2 -1
- package/dist/consts/chainMetadata.d.ts.map +1 -1
- package/dist/consts/chainMetadata.js +29 -28
- package/dist/consts/chainMetadata.js.map +1 -1
- package/dist/consts/environments/index.d.ts +38 -0
- package/dist/consts/environments/index.d.ts.map +1 -1
- package/dist/consts/environments/index.js +2 -2
- package/dist/consts/environments/index.js.map +1 -1
- package/dist/consts/environments/mainnet.json +27 -9
- package/dist/consts/environments/testnet.json +36 -18
- package/dist/contracts.d.ts +2 -2
- package/dist/contracts.d.ts.map +1 -1
- package/dist/contracts.js +12 -12
- package/dist/contracts.js.map +1 -1
- package/dist/core/HyperlaneCore.d.ts +2 -2
- package/dist/core/HyperlaneCore.d.ts.map +1 -1
- package/dist/core/HyperlaneCore.js +5 -5
- package/dist/core/HyperlaneCore.js.map +1 -1
- package/dist/core/HyperlaneCoreChecker.d.ts +0 -1
- package/dist/core/HyperlaneCoreChecker.d.ts.map +1 -1
- package/dist/core/HyperlaneCoreChecker.js +5 -44
- package/dist/core/HyperlaneCoreChecker.js.map +1 -1
- package/dist/core/HyperlaneCoreDeployer.d.ts +4 -5
- package/dist/core/HyperlaneCoreDeployer.d.ts.map +1 -1
- package/dist/core/HyperlaneCoreDeployer.js +2 -11
- package/dist/core/HyperlaneCoreDeployer.js.map +1 -1
- package/dist/core/TestCoreApp.js +1 -1
- package/dist/core/TestCoreApp.js.map +1 -1
- package/dist/core/testHyperlaneDeploy.hardhat-test.js +2 -2
- package/dist/core/testHyperlaneDeploy.hardhat-test.js.map +1 -1
- package/dist/core/types.d.ts +7 -7
- package/dist/core/types.d.ts.map +1 -1
- package/dist/core/types.js +0 -1
- package/dist/core/types.js.map +1 -1
- package/dist/deploy/HyperlaneAppChecker.d.ts +4 -2
- package/dist/deploy/HyperlaneAppChecker.d.ts.map +1 -1
- package/dist/deploy/HyperlaneAppChecker.js +53 -8
- package/dist/deploy/HyperlaneAppChecker.js.map +1 -1
- package/dist/deploy/HyperlaneDeployer.d.ts +8 -4
- package/dist/deploy/HyperlaneDeployer.d.ts.map +1 -1
- package/dist/deploy/HyperlaneDeployer.js +51 -15
- package/dist/deploy/HyperlaneDeployer.js.map +1 -1
- package/dist/deploy/proxy.d.ts +13 -4
- package/dist/deploy/proxy.d.ts.map +1 -1
- package/dist/deploy/proxy.js +1 -1
- package/dist/deploy/proxy.js.map +1 -1
- package/dist/deploy/types.d.ts +18 -2
- package/dist/deploy/types.d.ts.map +1 -1
- package/dist/deploy/types.js +2 -0
- package/dist/deploy/types.js.map +1 -1
- package/dist/deploy/verify/ContractVerifier.d.ts.map +1 -1
- package/dist/deploy/verify/ContractVerifier.js +3 -4
- package/dist/deploy/verify/ContractVerifier.js.map +1 -1
- package/dist/gas/HyperlaneIgp.d.ts +2 -2
- package/dist/gas/HyperlaneIgp.d.ts.map +1 -1
- package/dist/gas/HyperlaneIgp.js.map +1 -1
- package/dist/gas/HyperlaneIgpChecker.d.ts +2 -6
- package/dist/gas/HyperlaneIgpChecker.d.ts.map +1 -1
- package/dist/gas/HyperlaneIgpChecker.js +16 -14
- package/dist/gas/HyperlaneIgpChecker.js.map +1 -1
- package/dist/gas/HyperlaneIgpDeployer.d.ts +2 -2
- package/dist/gas/HyperlaneIgpDeployer.d.ts.map +1 -1
- package/dist/gas/HyperlaneIgpDeployer.js +28 -12
- package/dist/gas/HyperlaneIgpDeployer.js.map +1 -1
- package/dist/gas/contracts.d.ts +3 -2
- package/dist/gas/contracts.d.ts.map +1 -1
- package/dist/gas/contracts.js +2 -6
- package/dist/gas/contracts.js.map +1 -1
- package/dist/gas/token-prices.d.ts +1 -1
- package/dist/gas/types.d.ts +10 -7
- package/dist/gas/types.d.ts.map +1 -1
- package/dist/gas/types.js.map +1 -1
- package/dist/hook/HyperlaneHookDeployer.d.ts +4 -4
- package/dist/hook/HyperlaneHookDeployer.d.ts.map +1 -1
- package/dist/hook/HyperlaneHookDeployer.js +1 -1
- package/dist/hook/HyperlaneHookDeployer.js.map +1 -1
- package/dist/hook/types.d.ts +4 -4
- package/dist/hook/types.d.ts.map +1 -1
- package/dist/index.d.ts +4 -7
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -21
- package/dist/index.js.map +1 -1
- package/dist/ism/HyperlaneIsmFactory.d.ts +3 -3
- package/dist/ism/HyperlaneIsmFactory.d.ts.map +1 -1
- package/dist/ism/HyperlaneIsmFactory.js +83 -40
- package/dist/ism/HyperlaneIsmFactory.js.map +1 -1
- package/dist/ism/HyperlaneIsmFactoryDeployer.d.ts.map +1 -1
- package/dist/ism/HyperlaneIsmFactoryDeployer.js +2 -2
- package/dist/ism/HyperlaneIsmFactoryDeployer.js.map +1 -1
- package/dist/ism/types.d.ts +3 -3
- package/dist/ism/types.d.ts.map +1 -1
- package/dist/metadata/agentConfig.d.ts +7 -2
- package/dist/metadata/agentConfig.d.ts.map +1 -1
- package/dist/metadata/agentConfig.js +12 -3
- package/dist/metadata/agentConfig.js.map +1 -1
- package/dist/metadata/agentConfig.test.d.ts +2 -0
- package/dist/metadata/agentConfig.test.d.ts.map +1 -0
- package/dist/metadata/agentConfig.test.js +33 -0
- package/dist/metadata/agentConfig.test.js.map +1 -0
- package/dist/metadata/chainMetadata.test.js +2 -1
- package/dist/metadata/chainMetadata.test.js.map +1 -1
- package/dist/metadata/chainMetadataTypes.d.ts +1 -10
- package/dist/metadata/chainMetadataTypes.d.ts.map +1 -1
- package/dist/metadata/chainMetadataTypes.js +3 -12
- package/dist/metadata/chainMetadataTypes.js.map +1 -1
- package/dist/metadata/deploymentArtifacts.d.ts +3 -3
- package/dist/middleware/account/InterchainAccountChecker.d.ts.map +1 -1
- package/dist/middleware/account/InterchainAccountChecker.js +2 -2
- package/dist/middleware/account/InterchainAccountChecker.js.map +1 -1
- package/dist/middleware/account/InterchainAccountDeployer.d.ts +12 -6
- package/dist/middleware/account/InterchainAccountDeployer.d.ts.map +1 -1
- package/dist/middleware/account/InterchainAccountDeployer.js +30 -46
- package/dist/middleware/account/InterchainAccountDeployer.js.map +1 -1
- package/dist/middleware/account/contracts.d.ts +3 -2
- package/dist/middleware/account/contracts.d.ts.map +1 -1
- package/dist/middleware/account/contracts.js +2 -5
- package/dist/middleware/account/contracts.js.map +1 -1
- package/dist/middleware/liquidity-layer/LiquidityLayerApp.d.ts.map +1 -1
- package/dist/middleware/liquidity-layer/LiquidityLayerApp.js +3 -3
- package/dist/middleware/liquidity-layer/LiquidityLayerApp.js.map +1 -1
- package/dist/middleware/liquidity-layer/LiquidityLayerRouterDeployer.d.ts +2 -2
- package/dist/middleware/liquidity-layer/LiquidityLayerRouterDeployer.d.ts.map +1 -1
- package/dist/middleware/liquidity-layer/LiquidityLayerRouterDeployer.js +8 -6
- package/dist/middleware/liquidity-layer/LiquidityLayerRouterDeployer.js.map +1 -1
- package/dist/middleware/liquidity-layer/contracts.d.ts +3 -2
- package/dist/middleware/liquidity-layer/contracts.d.ts.map +1 -1
- package/dist/middleware/liquidity-layer/contracts.js +2 -6
- package/dist/middleware/liquidity-layer/contracts.js.map +1 -1
- package/dist/middleware/liquidity-layer/liquidity-layer.hardhat-test.js +3 -4
- package/dist/middleware/liquidity-layer/liquidity-layer.hardhat-test.js.map +1 -1
- package/dist/middleware/query/InterchainQueryDeployer.d.ts.map +1 -1
- package/dist/middleware/query/InterchainQueryDeployer.js +3 -0
- package/dist/middleware/query/InterchainQueryDeployer.js.map +1 -1
- package/dist/middleware/query/contracts.d.ts +3 -2
- package/dist/middleware/query/contracts.d.ts.map +1 -1
- package/dist/middleware/query/contracts.js +2 -4
- package/dist/middleware/query/contracts.js.map +1 -1
- package/dist/middleware/query/queries.hardhat-test.js +1 -1
- package/dist/middleware/query/queries.hardhat-test.js.map +1 -1
- package/dist/providers/MultiProvider.d.ts +2 -2
- package/dist/providers/MultiProvider.d.ts.map +1 -1
- package/dist/providers/MultiProvider.js +6 -7
- package/dist/providers/MultiProvider.js.map +1 -1
- package/dist/providers/RetryProvider.js +3 -3
- package/dist/providers/RetryProvider.js.map +1 -1
- package/dist/router/GasRouterDeployer.d.ts +2 -2
- package/dist/router/GasRouterDeployer.d.ts.map +1 -1
- package/dist/router/GasRouterDeployer.js.map +1 -1
- package/dist/router/HyperlaneRouterChecker.d.ts +0 -1
- package/dist/router/HyperlaneRouterChecker.d.ts.map +1 -1
- package/dist/router/HyperlaneRouterChecker.js +13 -9
- package/dist/router/HyperlaneRouterChecker.js.map +1 -1
- package/dist/router/HyperlaneRouterDeployer.d.ts +2 -2
- package/dist/router/HyperlaneRouterDeployer.d.ts.map +1 -1
- package/dist/router/HyperlaneRouterDeployer.js +17 -8
- package/dist/router/HyperlaneRouterDeployer.js.map +1 -1
- package/dist/router/ProxiedRouterChecker.d.ts +3 -2
- package/dist/router/ProxiedRouterChecker.d.ts.map +1 -1
- package/dist/router/ProxiedRouterChecker.js +20 -2
- package/dist/router/ProxiedRouterChecker.js.map +1 -1
- package/dist/router/ProxiedRouterDeployer.d.ts +2 -2
- package/dist/router/ProxiedRouterDeployer.d.ts.map +1 -1
- package/dist/router/ProxiedRouterDeployer.js +19 -6
- package/dist/router/ProxiedRouterDeployer.js.map +1 -1
- package/dist/router/RouterApps.d.ts +3 -3
- package/dist/router/RouterApps.d.ts.map +1 -1
- package/dist/router/RouterApps.js +3 -3
- package/dist/router/RouterApps.js.map +1 -1
- package/dist/router/types.d.ts +12 -7
- package/dist/router/types.d.ts.map +1 -1
- package/dist/router/types.js +6 -1
- package/dist/router/types.js.map +1 -1
- package/dist/test/testUtils.d.ts +4 -4
- package/dist/test/testUtils.d.ts.map +1 -1
- package/dist/test/testUtils.js +12 -4
- package/dist/test/testUtils.js.map +1 -1
- package/dist/utils/filter.d.ts +3 -0
- package/dist/utils/filter.d.ts.map +1 -0
- package/dist/utils/filter.js +13 -0
- package/dist/utils/filter.js.map +1 -0
- package/dist/utils/wagmi.d.ts.map +1 -1
- package/dist/utils/wagmi.js +2 -2
- package/dist/utils/wagmi.js.map +1 -1
- package/package.json +6 -5
- package/dist/utils/ids.d.ts +0 -20
- package/dist/utils/ids.d.ts.map +0 -1
- package/dist/utils/ids.js +0 -47
- package/dist/utils/ids.js.map +0 -1
- package/dist/utils/number.d.ts +0 -32
- package/dist/utils/number.d.ts.map +0 -1
- package/dist/utils/number.js +0 -59
- package/dist/utils/number.js.map +0 -1
- package/dist/utils/objects.d.ts +0 -17
- package/dist/utils/objects.d.ts.map +0 -1
- package/dist/utils/objects.js +0 -77
- package/dist/utils/objects.js.map +0 -1
- package/dist/utils/time.d.ts +0 -8
- package/dist/utils/time.d.ts.map +0 -1
- package/dist/utils/time.js +0 -15
- package/dist/utils/time.js.map +0 -1
- package/dist/utils/utils.test.d.ts +0 -2
- package/dist/utils/utils.test.d.ts.map +0 -1
- package/dist/utils/utils.test.js +0 -41
- package/dist/utils/utils.test.js.map +0 -1
|
@@ -1,14 +1,5 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
|
-
|
|
3
|
-
Ethereum = "ethereum",
|
|
4
|
-
Sealevel = "sealevel",
|
|
5
|
-
Fuel = "fuel"
|
|
6
|
-
}
|
|
7
|
-
export declare type ProtocolTypeValue = `${ProtocolType}`;
|
|
8
|
-
export declare const ProtocolSmallestUnit: {
|
|
9
|
-
ethereum: string;
|
|
10
|
-
sealevel: string;
|
|
11
|
-
};
|
|
2
|
+
import { ProtocolType } from '@hyperlane-xyz/utils';
|
|
12
3
|
export declare enum ExplorerFamily {
|
|
13
4
|
Etherscan = "etherscan",
|
|
14
5
|
Blockscout = "blockscout",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chainMetadataTypes.d.ts","sourceRoot":"","sources":["../../src/metadata/chainMetadataTypes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,
|
|
1
|
+
{"version":3,"file":"chainMetadataTypes.d.ts","sourceRoot":"","sources":["../../src/metadata/chainMetadataTypes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,oBAAY,cAAc;IACxB,SAAS,cAAc;IACvB,UAAU,eAAe;IACzB,KAAK,UAAU;CAChB;AAED,oBAAY,mBAAmB,GAAG,GAAG,cAAc,EAAE,CAAC;AAEtD;;;GAGG;AACH,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAyK9B,CAAC;AAEH,oBAAY,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAEhE,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,aAAa,GAAG,OAAO,CAE9D;AAED,wBAAgB,WAAW,CAAC,aAAa,EAAE,aAAa,GAAG,MAAM,CAEhE"}
|
|
@@ -1,17 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getDomainId = exports.isValidChainMetadata = exports.ChainMetadataSchema = exports.ExplorerFamily =
|
|
3
|
+
exports.getDomainId = exports.isValidChainMetadata = exports.ChainMetadataSchema = exports.ExplorerFamily = void 0;
|
|
4
4
|
const zod_1 = require("zod");
|
|
5
|
-
|
|
6
|
-
(function (ProtocolType) {
|
|
7
|
-
ProtocolType["Ethereum"] = "ethereum";
|
|
8
|
-
ProtocolType["Sealevel"] = "sealevel";
|
|
9
|
-
ProtocolType["Fuel"] = "fuel";
|
|
10
|
-
})(ProtocolType = exports.ProtocolType || (exports.ProtocolType = {}));
|
|
11
|
-
exports.ProtocolSmallestUnit = {
|
|
12
|
-
[ProtocolType.Ethereum]: 'wei',
|
|
13
|
-
[ProtocolType.Sealevel]: 'lamports',
|
|
14
|
-
};
|
|
5
|
+
const utils_1 = require("@hyperlane-xyz/utils");
|
|
15
6
|
var ExplorerFamily;
|
|
16
7
|
(function (ExplorerFamily) {
|
|
17
8
|
ExplorerFamily["Etherscan"] = "etherscan";
|
|
@@ -24,7 +15,7 @@ var ExplorerFamily;
|
|
|
24
15
|
*/
|
|
25
16
|
exports.ChainMetadataSchema = zod_1.z.object({
|
|
26
17
|
protocol: zod_1.z
|
|
27
|
-
.nativeEnum(ProtocolType)
|
|
18
|
+
.nativeEnum(utils_1.ProtocolType)
|
|
28
19
|
.describe('The type of protocol used by this chain. See ProtocolType for valid values.'),
|
|
29
20
|
chainId: zod_1.z
|
|
30
21
|
.number()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chainMetadataTypes.js","sourceRoot":"","sources":["../../src/metadata/chainMetadataTypes.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAExB,
|
|
1
|
+
{"version":3,"file":"chainMetadataTypes.js","sourceRoot":"","sources":["../../src/metadata/chainMetadataTypes.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,7 @@ export declare type HyperlaneDeploymentArtifacts = z.infer<typeof HyperlaneDeplo
|
|
|
19
19
|
export declare const ChainMetadataWithArtifactsSchema: z.ZodObject<{
|
|
20
20
|
name: z.ZodString;
|
|
21
21
|
chainId: z.ZodNumber;
|
|
22
|
-
protocol: z.ZodNativeEnum<typeof import("
|
|
22
|
+
protocol: z.ZodNativeEnum<typeof import("@hyperlane-xyz/utils").ProtocolType>;
|
|
23
23
|
domainId: z.ZodOptional<z.ZodNumber>;
|
|
24
24
|
displayName: z.ZodOptional<z.ZodString>;
|
|
25
25
|
displayNameShort: z.ZodOptional<z.ZodString>;
|
|
@@ -131,7 +131,7 @@ export declare const ChainMetadataWithArtifactsSchema: z.ZodObject<{
|
|
|
131
131
|
}, "strip", z.ZodTypeAny, {
|
|
132
132
|
name: string;
|
|
133
133
|
chainId: number;
|
|
134
|
-
protocol: import("
|
|
134
|
+
protocol: import("@hyperlane-xyz/utils").ProtocolType;
|
|
135
135
|
interchainGasPaymaster: string;
|
|
136
136
|
mailbox: string;
|
|
137
137
|
rpcUrls: [{
|
|
@@ -189,7 +189,7 @@ export declare const ChainMetadataWithArtifactsSchema: z.ZodObject<{
|
|
|
189
189
|
}, {
|
|
190
190
|
name: string;
|
|
191
191
|
chainId: number;
|
|
192
|
-
protocol: import("
|
|
192
|
+
protocol: import("@hyperlane-xyz/utils").ProtocolType;
|
|
193
193
|
interchainGasPaymaster: string;
|
|
194
194
|
mailbox: string;
|
|
195
195
|
rpcUrls: [{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InterchainAccountChecker.d.ts","sourceRoot":"","sources":["../../../src/middleware/account/InterchainAccountChecker.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"InterchainAccountChecker.d.ts","sourceRoot":"","sources":["../../../src/middleware/account/InterchainAccountChecker.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AAEzD,qBAAa,wBAAyB,SAAQ,oBAAoB,CAChE,0BAA0B,EAC1B,iBAAiB,EACjB,uBAAuB,CACxB;gBAEG,aAAa,EAAE,aAAa,EAC5B,GAAG,EAAE,iBAAiB,EACtB,SAAS,EAAE,QAAQ,CAAC,uBAAuB,CAAC;CAkB/C"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.InterchainAccountChecker = void 0;
|
|
4
|
+
const utils_1 = require("@hyperlane-xyz/utils");
|
|
4
5
|
const ProxiedRouterChecker_1 = require("../../router/ProxiedRouterChecker");
|
|
5
|
-
const objects_1 = require("../../utils/objects");
|
|
6
6
|
class InterchainAccountChecker extends ProxiedRouterChecker_1.ProxiedRouterChecker {
|
|
7
7
|
constructor(multiProvider, app, configMap) {
|
|
8
8
|
// The checker does not expect an ISM in it's config.
|
|
9
9
|
// Instead, we set the ISM to match the ISM address from the app.
|
|
10
|
-
const configMapWithIsm = (0,
|
|
10
|
+
const configMapWithIsm = (0, utils_1.objMap)(configMap, (chain, config) => {
|
|
11
11
|
if (config.interchainSecurityModule) {
|
|
12
12
|
throw new Error('Configuration of ISM address not supported in ICA checker');
|
|
13
13
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InterchainAccountChecker.js","sourceRoot":"","sources":["../../../src/middleware/account/InterchainAccountChecker.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"InterchainAccountChecker.js","sourceRoot":"","sources":["../../../src/middleware/account/InterchainAccountChecker.ts"],"names":[],"mappings":";;;AAAA,gDAA8C;AAG9C,4EAAyE;AAOzE,MAAa,wBAAyB,SAAQ,2CAI7C;IACC,YACE,aAA4B,EAC5B,GAAsB,EACtB,SAA4C;QAE5C,qDAAqD;QACrD,iEAAiE;QACjE,MAAM,gBAAgB,GAAG,IAAA,cAAM,EAAC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAC3D,IAAI,MAAM,CAAC,wBAAwB,EAAE;gBACnC,MAAM,IAAI,KAAK,CACb,2DAA2D,CAC5D,CAAC;aACH;YACD,uCACK,MAAM,KACT,wBAAwB,EACtB,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAAC,OAAO,IACtD;QACJ,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,aAAa,EAAE,GAAG,EAAE,gBAAgB,CAAC,CAAC;IAC9C,CAAC;CACF;AA1BD,4DA0BC"}
|
|
@@ -1,14 +1,20 @@
|
|
|
1
|
-
import { Router } from '@hyperlane-xyz/core';
|
|
2
1
|
import { HyperlaneContracts } from '../../contracts';
|
|
3
2
|
import { MultiProvider } from '../../providers/MultiProvider';
|
|
4
|
-
import {
|
|
5
|
-
import { RouterConfig } from '../../router/types';
|
|
3
|
+
import { ProxiedRouterDeployer } from '../../router/ProxiedRouterDeployer';
|
|
4
|
+
import { ProxiedRouterConfig, RouterConfig } from '../../router/types';
|
|
6
5
|
import { ChainName } from '../../types';
|
|
7
6
|
import { InterchainAccountFactories } from './contracts';
|
|
8
|
-
export declare type InterchainAccountConfig =
|
|
9
|
-
export declare class InterchainAccountDeployer extends
|
|
7
|
+
export declare type InterchainAccountConfig = ProxiedRouterConfig;
|
|
8
|
+
export declare class InterchainAccountDeployer extends ProxiedRouterDeployer<InterchainAccountConfig, InterchainAccountFactories, 'interchainAccountRouter'> {
|
|
9
|
+
readonly routerContractName = "interchainAccountRouter";
|
|
10
10
|
constructor(multiProvider: MultiProvider);
|
|
11
|
-
|
|
11
|
+
constructorArgs(chain: string, __: RouterConfig): Promise<[number]>;
|
|
12
|
+
initializeArgs(chain: string, config: RouterConfig): Promise<[
|
|
13
|
+
_mailbox: string,
|
|
14
|
+
_interchainGasPaymaster: string,
|
|
15
|
+
_interchainSecurityModule: string,
|
|
16
|
+
_owner: string
|
|
17
|
+
]>;
|
|
12
18
|
deployContracts(chain: ChainName, config: InterchainAccountConfig): Promise<HyperlaneContracts<InterchainAccountFactories>>;
|
|
13
19
|
}
|
|
14
20
|
//# sourceMappingURL=InterchainAccountDeployer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InterchainAccountDeployer.d.ts","sourceRoot":"","sources":["../../../src/middleware/account/InterchainAccountDeployer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"InterchainAccountDeployer.d.ts","sourceRoot":"","sources":["../../../src/middleware/account/InterchainAccountDeployer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EACL,0BAA0B,EAE3B,MAAM,aAAa,CAAC;AAErB,oBAAY,uBAAuB,GAAG,mBAAmB,CAAC;AAE1D,qBAAa,yBAA0B,SAAQ,qBAAqB,CAClE,uBAAuB,EACvB,0BAA0B,EAC1B,yBAAyB,CAC1B;IACC,QAAQ,CAAC,kBAAkB,6BAA6B;gBAE5C,aAAa,EAAE,aAAa;IAIlC,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;IAKnE,cAAc,CAClB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,YAAY,GACnB,OAAO,CACR;QACE,QAAQ,EAAE,MAAM;QAChB,uBAAuB,EAAE,MAAM;QAC/B,yBAAyB,EAAE,MAAM;QACjC,MAAM,EAAE,MAAM;KACf,CACF;IAaK,eAAe,CACnB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,uBAAuB,GAC9B,OAAO,CAAC,kBAAkB,CAAC,0BAA0B,CAAC,CAAC;CAqB3D"}
|
|
@@ -10,63 +10,47 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.InterchainAccountDeployer = void 0;
|
|
13
|
-
const
|
|
14
|
-
const
|
|
13
|
+
const ethers_1 = require("ethers");
|
|
14
|
+
const ProxiedRouterDeployer_1 = require("../../router/ProxiedRouterDeployer");
|
|
15
15
|
const contracts_1 = require("./contracts");
|
|
16
|
-
class InterchainAccountDeployer extends
|
|
16
|
+
class InterchainAccountDeployer extends ProxiedRouterDeployer_1.ProxiedRouterDeployer {
|
|
17
17
|
constructor(multiProvider) {
|
|
18
|
-
super(multiProvider, contracts_1.interchainAccountFactories
|
|
18
|
+
super(multiProvider, contracts_1.interchainAccountFactories);
|
|
19
|
+
this.routerContractName = 'interchainAccountRouter';
|
|
19
20
|
}
|
|
20
|
-
|
|
21
|
-
return
|
|
21
|
+
constructorArgs(chain, __) {
|
|
22
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
23
|
+
const localDomain = this.multiProvider.getDomainId(chain);
|
|
24
|
+
return [localDomain];
|
|
25
|
+
});
|
|
26
|
+
}
|
|
27
|
+
initializeArgs(chain, config) {
|
|
28
|
+
var _a;
|
|
29
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
30
|
+
const owner = yield this.multiProvider.getSignerAddress(chain);
|
|
31
|
+
if (typeof config.interchainSecurityModule === 'object') {
|
|
32
|
+
throw new Error('ISM as object unimplemented');
|
|
33
|
+
}
|
|
34
|
+
return [
|
|
35
|
+
config.mailbox,
|
|
36
|
+
config.interchainGasPaymaster,
|
|
37
|
+
(_a = config.interchainSecurityModule) !== null && _a !== void 0 ? _a : ethers_1.ethers.constants.AddressZero,
|
|
38
|
+
owner,
|
|
39
|
+
];
|
|
40
|
+
});
|
|
22
41
|
}
|
|
23
|
-
// The OwnableMulticall implementation has an immutable owner address that
|
|
24
|
-
// must be set to the InterchainAccountRouter proxy address. To achieve this, we
|
|
25
|
-
// 1. deploy the proxy first with a dummy implementation
|
|
26
|
-
// 2. deploy the real InterchainAccountRouter and OwnableMulticall implementation with proxy address
|
|
27
|
-
// 3. upgrade the proxy to the real implementation and initialize
|
|
28
42
|
deployContracts(chain, config) {
|
|
29
43
|
const _super = Object.create(null, {
|
|
30
|
-
|
|
31
|
-
changeAdmin: { get: () => super.changeAdmin }
|
|
44
|
+
deployContracts: { get: () => super.deployContracts }
|
|
32
45
|
});
|
|
33
46
|
return __awaiter(this, void 0, void 0, function* () {
|
|
34
47
|
if (config.interchainSecurityModule) {
|
|
35
|
-
throw new Error('Configuration of ISM
|
|
48
|
+
throw new Error('Configuration of ISM not supported in ICA deployer');
|
|
36
49
|
}
|
|
37
|
-
const proxyAdmin = yield this.deployContract(chain, 'proxyAdmin', []);
|
|
38
50
|
const interchainAccountIsm = yield this.deployContract(chain, 'interchainAccountIsm', [config.mailbox]);
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
if (cachedRouter) {
|
|
43
|
-
interchainAccountRouter = cachedRouter;
|
|
44
|
-
}
|
|
45
|
-
else {
|
|
46
|
-
const deployer = yield this.multiProvider.getSignerAddress(chain);
|
|
47
|
-
// 1. deploy the proxy first with a dummy implementation (proxy admin contract)
|
|
48
|
-
const proxy = yield this.deployContractFromFactory(chain, new core_1.TransparentUpgradeableProxy__factory(), 'TransparentUpgradeableProxy', [proxyAdmin.address, deployer, '0x']);
|
|
49
|
-
// 2. deploy the real InterchainAccountRouter and OwnableMulticall implementation with proxy address
|
|
50
|
-
const domainId = this.multiProvider.getDomainId(chain);
|
|
51
|
-
const implementation = yield this.deployContract(chain, 'interchainAccountRouter', [domainId]);
|
|
52
|
-
// 3. upgrade the proxy to the real implementation and initialize
|
|
53
|
-
const owner = deployer;
|
|
54
|
-
yield _super.upgradeAndInitialize.call(this, chain, proxy, implementation, [
|
|
55
|
-
config.mailbox,
|
|
56
|
-
config.interchainGasPaymaster,
|
|
57
|
-
interchainAccountIsm.address,
|
|
58
|
-
owner,
|
|
59
|
-
]);
|
|
60
|
-
interchainAccountRouter = implementation.attach(proxy.address);
|
|
61
|
-
this.writeCache(chain, 'interchainAccountRouter', proxy.address);
|
|
62
|
-
}
|
|
63
|
-
const proxy = core_1.TransparentUpgradeableProxy__factory.connect(interchainAccountRouter.address, this.multiProvider.getSignerOrProvider(chain));
|
|
64
|
-
yield _super.changeAdmin.call(this, chain, proxy, proxyAdmin.address);
|
|
65
|
-
return {
|
|
66
|
-
proxyAdmin,
|
|
67
|
-
interchainAccountIsm,
|
|
68
|
-
interchainAccountRouter,
|
|
69
|
-
};
|
|
51
|
+
const modifiedConfig = Object.assign(Object.assign({}, config), { interchainSecurityModule: interchainAccountIsm.address });
|
|
52
|
+
const contracts = yield _super.deployContracts.call(this, chain, modifiedConfig);
|
|
53
|
+
return Object.assign(Object.assign({}, contracts), { interchainAccountIsm });
|
|
70
54
|
});
|
|
71
55
|
}
|
|
72
56
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InterchainAccountDeployer.js","sourceRoot":"","sources":["../../../src/middleware/account/InterchainAccountDeployer.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"InterchainAccountDeployer.js","sourceRoot":"","sources":["../../../src/middleware/account/InterchainAccountDeployer.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAgC;AAIhC,8EAA2E;AAI3E,2CAGqB;AAIrB,MAAa,yBAA0B,SAAQ,6CAI9C;IAGC,YAAY,aAA4B;QACtC,KAAK,CAAC,aAAa,EAAE,sCAA0B,CAAC,CAAC;QAH1C,uBAAkB,GAAG,yBAAyB,CAAC;IAIxD,CAAC;IAEK,eAAe,CAAC,KAAa,EAAE,EAAgB;;YACnD,MAAM,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YAC1D,OAAO,CAAC,WAAW,CAAC,CAAC;QACvB,CAAC;KAAA;IAEK,cAAc,CAClB,KAAa,EACb,MAAoB;;;YASpB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;YAC/D,IAAI,OAAO,MAAM,CAAC,wBAAwB,KAAK,QAAQ,EAAE;gBACvD,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;aAChD;YACD,OAAO;gBACL,MAAM,CAAC,OAAO;gBACd,MAAM,CAAC,sBAAsB;gBAC7B,MAAA,MAAM,CAAC,wBAAwB,mCAAI,eAAM,CAAC,SAAS,CAAC,WAAW;gBAC/D,KAAK;aACN,CAAC;;KACH;IAEK,eAAe,CACnB,KAAgB,EAChB,MAA+B;;;;;YAE/B,IAAI,MAAM,CAAC,wBAAwB,EAAE;gBACnC,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;aACvE;YAED,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,cAAc,CACpD,KAAK,EACL,sBAAsB,EACtB,CAAC,MAAM,CAAC,OAAO,CAAC,CACjB,CAAC;YACF,MAAM,cAAc,mCACf,MAAM,KACT,wBAAwB,EAAE,oBAAoB,CAAC,OAAO,GACvD,CAAC;YACF,MAAM,SAAS,GAAG,MAAM,OAAM,eAAe,YAAC,KAAK,EAAE,cAAc,CAAC,CAAC;YAErE,uCACK,SAAS,KACZ,oBAAoB,IACpB;QACJ,CAAC;KAAA;CACF;AA/DD,8DA+DC"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import { InterchainAccountIsm__factory, InterchainAccountRouter__factory
|
|
1
|
+
import { InterchainAccountIsm__factory, InterchainAccountRouter__factory } from '@hyperlane-xyz/core';
|
|
2
2
|
export declare const interchainAccountFactories: {
|
|
3
|
+
proxyAdmin: import("@hyperlane-xyz/core").ProxyAdmin__factory;
|
|
4
|
+
timelockController: import("@hyperlane-xyz/core").TimelockController__factory;
|
|
3
5
|
interchainAccountRouter: InterchainAccountRouter__factory;
|
|
4
6
|
interchainAccountIsm: InterchainAccountIsm__factory;
|
|
5
|
-
proxyAdmin: ProxyAdmin__factory;
|
|
6
7
|
};
|
|
7
8
|
export declare type InterchainAccountFactories = typeof interchainAccountFactories;
|
|
8
9
|
//# sourceMappingURL=contracts.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contracts.d.ts","sourceRoot":"","sources":["../../../src/middleware/account/contracts.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,6BAA6B,EAC7B,gCAAgC,
|
|
1
|
+
{"version":3,"file":"contracts.d.ts","sourceRoot":"","sources":["../../../src/middleware/account/contracts.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,6BAA6B,EAC7B,gCAAgC,EACjC,MAAM,qBAAqB,CAAC;AAI7B,eAAO,MAAM,0BAA0B;;;;;CAItC,CAAC;AAEF,oBAAY,0BAA0B,GAAG,OAAO,0BAA0B,CAAC"}
|
|
@@ -2,9 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.interchainAccountFactories = void 0;
|
|
4
4
|
const core_1 = require("@hyperlane-xyz/core");
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
interchainAccountIsm: new core_1.InterchainAccountIsm__factory(),
|
|
8
|
-
proxyAdmin: new core_1.ProxyAdmin__factory(),
|
|
9
|
-
};
|
|
5
|
+
const types_1 = require("../../router/types");
|
|
6
|
+
exports.interchainAccountFactories = Object.assign({ interchainAccountRouter: new core_1.InterchainAccountRouter__factory(), interchainAccountIsm: new core_1.InterchainAccountIsm__factory() }, types_1.proxiedFactories);
|
|
10
7
|
//# sourceMappingURL=contracts.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contracts.js","sourceRoot":"","sources":["../../../src/middleware/account/contracts.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"contracts.js","sourceRoot":"","sources":["../../../src/middleware/account/contracts.ts"],"names":[],"mappings":";;;AAAA,8CAG6B;AAE7B,8CAAsD;AAEzC,QAAA,0BAA0B,mBACrC,uBAAuB,EAAE,IAAI,uCAAgC,EAAE,EAC/D,oBAAoB,EAAE,IAAI,oCAA6B,EAAE,IACtD,wBAAgB,EACnB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LiquidityLayerApp.d.ts","sourceRoot":"","sources":["../../../src/middleware/liquidity-layer/LiquidityLayerApp.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"LiquidityLayerApp.d.ts","sourceRoot":"","sources":["../../../src/middleware/liquidity-layer/LiquidityLayerApp.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGlD,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAyBtD,UAAU,mBAAmB;IAC3B,KAAK,EAAE,SAAS,CAAC;IACjB,WAAW,EAAE,SAAS,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,mBAAmB;IAC3B,MAAM,EAAE,SAAS,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,SAAS,CAAC;CACxB;AAED,qBAAa,iBAAkB,SAAQ,YAAY,CACjD,OAAO,uBAAuB,CAC/B;aAEmB,YAAY,EAAE,QAAQ,CACpC,kBAAkB,CAAC,OAAO,uBAAuB,CAAC,CACnD;aACe,aAAa,EAAE,aAAa;aAC5B,MAAM,EAAE,QAAQ,CAAC,mBAAmB,CAAC;gBAJrC,YAAY,EAAE,QAAQ,CACpC,kBAAkB,CAAC,OAAO,uBAAuB,CAAC,CACnD,EACe,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,QAAQ,CAAC,mBAAmB,CAAC;IAKjD,8BAA8B,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAgBnE,6BAA6B,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAmBlE,mBAAmB,CACvB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAsB3B,mBAAmB,CACvB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAqD3B,+BAA+B,CACnC,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,IAAI,CAAC;IA8DV,kCAAkC,CACtC,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,IAAI,CAAC;CA4CjB"}
|
|
@@ -137,13 +137,13 @@ class LiquidityLayerApp extends HyperlaneApp_1.HyperlaneApp {
|
|
|
137
137
|
.portalAdapter;
|
|
138
138
|
const transferId = yield destinationPortalAdapter.transferId(this.multiProvider.getDomainId(message.origin), message.nonce);
|
|
139
139
|
const transferTokenAddress = yield destinationPortalAdapter.portalTransfersProcessed(transferId);
|
|
140
|
-
if (!utils_1.
|
|
140
|
+
if (!(0, utils_1.eqAddress)(transferTokenAddress, ethers_1.ethers.constants.AddressZero)) {
|
|
141
141
|
console.log(`Transfer with nonce ${message.nonce} from ${message.origin} to ${message.destination} already processed`);
|
|
142
142
|
return;
|
|
143
143
|
}
|
|
144
144
|
const wormholeOriginDomain = (_a = this.config[message.destination].portal.wormholeDomainMapping.find((mapping) => mapping.hyperlaneDomain ===
|
|
145
145
|
this.multiProvider.getDomainId(message.origin))) === null || _a === void 0 ? void 0 : _a.wormholeDomain;
|
|
146
|
-
const emitter = utils_1.
|
|
146
|
+
const emitter = (0, utils_1.strip0x)((0, utils_1.addressToBytes32)(this.config[message.origin].portal.portalBridgeAddress));
|
|
147
147
|
const vaa = yield (0, fetch_1.fetchWithTimeout)(`${PORTAL_VAA_SERVICE_TESTNET_BASE_URL}${wormholeOriginDomain}/${emitter}/${message.portalSequence}`).then((response) => response.json());
|
|
148
148
|
if (vaa.code && vaa.code === PORTAL_VAA_SERVICE_SUCCESS_CODE) {
|
|
149
149
|
console.log(`VAA not yet found for nonce ${message.nonce}`);
|
|
@@ -151,7 +151,7 @@ class LiquidityLayerApp extends HyperlaneApp_1.HyperlaneApp {
|
|
|
151
151
|
}
|
|
152
152
|
console.debug(`Complete portal transfer for nonce ${message.nonce} on ${message.destination}`);
|
|
153
153
|
try {
|
|
154
|
-
yield this.multiProvider.handleTx(message.destination, destinationPortalAdapter.completeTransfer(utils_1.
|
|
154
|
+
yield this.multiProvider.handleTx(message.destination, destinationPortalAdapter.completeTransfer((0, utils_1.ensure0x)(Buffer.from(vaa.vaaBytes, 'base64').toString('hex'))));
|
|
155
155
|
}
|
|
156
156
|
catch (error) {
|
|
157
157
|
if ((_c = (_b = error === null || error === void 0 ? void 0 : error.error) === null || _b === void 0 ? void 0 : _b.reason) === null || _c === void 0 ? void 0 : _c.includes('no wrapper for this token')) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LiquidityLayerApp.js","sourceRoot":"","sources":["../../../src/middleware/liquidity-layer/LiquidityLayerApp.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAgC;AAEhC,8CAM6B;AAC7B,
|
|
1
|
+
{"version":3,"file":"LiquidityLayerApp.js","sourceRoot":"","sources":["../../../src/middleware/liquidity-layer/LiquidityLayerApp.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { CircleBridgeAdapter, LiquidityLayerRouter, PortalAdapter } from '@hyperlane-xyz/core';
|
|
2
|
-
import {
|
|
2
|
+
import { Address } from '@hyperlane-xyz/utils';
|
|
3
3
|
import { HyperlaneContracts, HyperlaneContractsMap } from '../../contracts';
|
|
4
4
|
import { MultiProvider } from '../../providers/MultiProvider';
|
|
5
5
|
import { ProxiedRouterDeployer } from '../../router/ProxiedRouterDeployer';
|
|
@@ -43,7 +43,7 @@ export declare class LiquidityLayerDeployer extends ProxiedRouterDeployer<Liquid
|
|
|
43
43
|
_interchainSecurityModule: string,
|
|
44
44
|
_owner: string
|
|
45
45
|
]>;
|
|
46
|
-
enrollRemoteRouters(contractsMap: HyperlaneContractsMap<LiquidityLayerFactories>, configMap: ChainMap<LiquidityLayerConfig>, foreignRouters: ChainMap<
|
|
46
|
+
enrollRemoteRouters(contractsMap: HyperlaneContractsMap<LiquidityLayerFactories>, configMap: ChainMap<LiquidityLayerConfig>, foreignRouters: ChainMap<Address>): Promise<void>;
|
|
47
47
|
deployContracts(chain: ChainName, config: LiquidityLayerConfig): Promise<HyperlaneContracts<LiquidityLayerFactories>>;
|
|
48
48
|
deployPortalAdapter(chain: ChainName, adapterConfig: PortalAdapterConfig, owner: string, router: LiquidityLayerRouter): Promise<PortalAdapter>;
|
|
49
49
|
deployCircleBridgeAdapter(chain: ChainName, adapterConfig: CircleBridgeAdapterConfig, owner: string, router: LiquidityLayerRouter): Promise<CircleBridgeAdapter>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LiquidityLayerRouterDeployer.d.ts","sourceRoot":"","sources":["../../../src/middleware/liquidity-layer/LiquidityLayerRouterDeployer.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,mBAAmB,EACnB,oBAAoB,EACpB,aAAa,EACd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"LiquidityLayerRouterDeployer.d.ts","sourceRoot":"","sources":["../../../src/middleware/liquidity-layer/LiquidityLayerRouterDeployer.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,mBAAmB,EACnB,oBAAoB,EACpB,aAAa,EACd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAgC,MAAM,sBAAsB,CAAC;AAE7E,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAElD,OAAO,EAAE,uBAAuB,EAA2B,MAAM,aAAa,CAAC;AAE/E,oBAAY,iBAAiB;IAC3B,MAAM,WAAW;IACjB,MAAM,WAAW;CAClB;AAED,MAAM,WAAW,yBAAyB;IACxC,IAAI,EAAE,iBAAiB,CAAC,MAAM,CAAC;IAC/B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,yBAAyB,EAAE,MAAM,CAAC;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,mBAAmB,EAAE;QACnB,eAAe,EAAE,MAAM,CAAC;QACxB,YAAY,EAAE,MAAM,CAAC;KACtB,EAAE,CAAC;CACL;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,iBAAiB,CAAC,MAAM,CAAC;IAC/B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,qBAAqB,EAAE;QACrB,eAAe,EAAE,MAAM,CAAC;QACxB,cAAc,EAAE,MAAM,CAAC;KACxB,EAAE,CAAC;CACL;AAED,oBAAY,mBAAmB,GAAG;IAChC,MAAM,CAAC,EAAE,yBAAyB,CAAC;IACnC,MAAM,CAAC,EAAE,mBAAmB,CAAC;CAC9B,CAAC;AAEF,oBAAY,oBAAoB,GAAG,YAAY,GAAG,mBAAmB,CAAC;AAEtE,qBAAa,sBAAuB,SAAQ,qBAAqB,CAC/D,oBAAoB,EACpB,uBAAuB,EACvB,sBAAsB,CACvB;IACC,QAAQ,CAAC,kBAAkB,0BAA0B;gBAEzC,aAAa,EAAE,aAAa;IAIlC,eAAe,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,oBAAoB,GAAG,OAAO,CAAC,EAAE,CAAC;IAIjE,cAAc,CAClB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CACR;QACE,QAAQ,EAAE,MAAM;QAChB,uBAAuB,EAAE,MAAM;QAC/B,yBAAyB,EAAE,MAAM;QACjC,MAAM,EAAE,MAAM;KACf,CACF;IAaK,mBAAmB,CACvB,YAAY,EAAE,qBAAqB,CAAC,uBAAuB,CAAC,EAC5D,SAAS,EAAE,QAAQ,CAAC,oBAAoB,CAAC,EACzC,cAAc,EAAE,QAAQ,CAAC,OAAO,CAAC,GAChC,OAAO,CAAC,IAAI,CAAC;IAyCV,eAAe,CACnB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CAAC,kBAAkB,CAAC,uBAAuB,CAAC,CAAC;IAiCjD,mBAAmB,CACvB,KAAK,EAAE,SAAS,EAChB,aAAa,EAAE,mBAAmB,EAClC,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CAAC,aAAa,CAAC;IAqDnB,yBAAyB,CAC7B,KAAK,EAAE,SAAS,EAChB,aAAa,EAAE,yBAAyB,EACxC,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CAAC,mBAAmB,CAAC;CAqEhC"}
|
|
@@ -13,7 +13,6 @@ exports.LiquidityLayerDeployer = exports.BridgeAdapterType = void 0;
|
|
|
13
13
|
const ethers_1 = require("ethers");
|
|
14
14
|
const utils_1 = require("@hyperlane-xyz/utils");
|
|
15
15
|
const ProxiedRouterDeployer_1 = require("../../router/ProxiedRouterDeployer");
|
|
16
|
-
const objects_1 = require("../../utils/objects");
|
|
17
16
|
const contracts_1 = require("./contracts");
|
|
18
17
|
var BridgeAdapterType;
|
|
19
18
|
(function (BridgeAdapterType) {
|
|
@@ -34,6 +33,9 @@ class LiquidityLayerDeployer extends ProxiedRouterDeployer_1.ProxiedRouterDeploy
|
|
|
34
33
|
var _a;
|
|
35
34
|
return __awaiter(this, void 0, void 0, function* () {
|
|
36
35
|
const owner = yield this.multiProvider.getSignerAddress(chain);
|
|
36
|
+
if (typeof config.interchainSecurityModule === 'object') {
|
|
37
|
+
throw new Error('ISM as object unimplemented');
|
|
38
|
+
}
|
|
37
39
|
return [
|
|
38
40
|
config.mailbox,
|
|
39
41
|
config.interchainGasPaymaster,
|
|
@@ -51,12 +53,12 @@ class LiquidityLayerDeployer extends ProxiedRouterDeployer_1.ProxiedRouterDeploy
|
|
|
51
53
|
yield _super.enrollRemoteRouters.call(this, contractsMap, configMap, foreignRouters);
|
|
52
54
|
this.logger(`Enroll CircleBridgeAdapters with each other`);
|
|
53
55
|
// Hack to allow use of super.enrollRemoteRouters
|
|
54
|
-
yield _super.enrollRemoteRouters.call(this, (0,
|
|
56
|
+
yield _super.enrollRemoteRouters.call(this, (0, utils_1.objMap)((0, utils_1.objFilter)(contractsMap, (_, c) => !!c.circleBridgeAdapter), (_, contracts) => ({
|
|
55
57
|
liquidityLayerRouter: contracts.circleBridgeAdapter,
|
|
56
58
|
})), configMap, foreignRouters);
|
|
57
59
|
this.logger(`Enroll PortalAdapters with each other`);
|
|
58
60
|
// Hack to allow use of super.enrollRemoteRouters
|
|
59
|
-
yield _super.enrollRemoteRouters.call(this, (0,
|
|
61
|
+
yield _super.enrollRemoteRouters.call(this, (0, utils_1.objMap)((0, utils_1.objFilter)(contractsMap, (_, c) => !!c.portalAdapter), (_, contracts) => ({
|
|
60
62
|
liquidityLayerRouter: contracts.portalAdapter,
|
|
61
63
|
})), configMap, foreignRouters);
|
|
62
64
|
});
|
|
@@ -96,7 +98,7 @@ class LiquidityLayerDeployer extends ProxiedRouterDeployer_1.ProxiedRouterDeploy
|
|
|
96
98
|
this.logger(`Set wormhole domain ${wormholeDomain} for hyperlane domain ${hyperlaneDomain}`);
|
|
97
99
|
yield this.runIfOwner(chain, portalAdapter, () => this.multiProvider.handleTx(chain, portalAdapter.addDomain(hyperlaneDomain, wormholeDomain)));
|
|
98
100
|
}
|
|
99
|
-
if (!utils_1.
|
|
101
|
+
if (!(0, utils_1.eqAddress)(yield router.liquidityLayerAdapters('Portal'), portalAdapter.address)) {
|
|
100
102
|
this.logger('Set Portal as LiquidityLayerAdapter on Router');
|
|
101
103
|
yield this.runIfOwner(chain, portalAdapter, () => this.multiProvider.handleTx(chain, router.setLiquidityLayerAdapter(adapterConfig.type, portalAdapter.address)));
|
|
102
104
|
}
|
|
@@ -111,7 +113,7 @@ class LiquidityLayerDeployer extends ProxiedRouterDeployer_1.ProxiedRouterDeploy
|
|
|
111
113
|
adapterConfig.messageTransmitterAddress,
|
|
112
114
|
router.address,
|
|
113
115
|
]);
|
|
114
|
-
if (!utils_1.
|
|
116
|
+
if (!(0, utils_1.eqAddress)(yield circleBridgeAdapter.tokenSymbolToAddress('USDC'), adapterConfig.usdcAddress)) {
|
|
115
117
|
this.logger(`Set USDC token contract`);
|
|
116
118
|
yield this.runIfOwner(chain, circleBridgeAdapter, () => this.multiProvider.handleTx(chain, circleBridgeAdapter.addToken(adapterConfig.usdcAddress, 'USDC')));
|
|
117
119
|
}
|
|
@@ -123,7 +125,7 @@ class LiquidityLayerDeployer extends ProxiedRouterDeployer_1.ProxiedRouterDeploy
|
|
|
123
125
|
this.logger(`Set circle domain ${circleDomain} for hyperlane domain ${hyperlaneDomain}`);
|
|
124
126
|
yield this.runIfOwner(chain, circleBridgeAdapter, () => this.multiProvider.handleTx(chain, circleBridgeAdapter.addDomain(hyperlaneDomain, circleDomain)));
|
|
125
127
|
}
|
|
126
|
-
if (!utils_1.
|
|
128
|
+
if (!(0, utils_1.eqAddress)(yield router.liquidityLayerAdapters('Circle'), circleBridgeAdapter.address)) {
|
|
127
129
|
this.logger('Set Circle as LiquidityLayerAdapter on Router');
|
|
128
130
|
yield this.runIfOwner(chain, circleBridgeAdapter, () => this.multiProvider.handleTx(chain, router.setLiquidityLayerAdapter(adapterConfig.type, circleBridgeAdapter.address)));
|
|
129
131
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LiquidityLayerRouterDeployer.js","sourceRoot":"","sources":["../../../src/middleware/liquidity-layer/LiquidityLayerRouterDeployer.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAgC;AAOhC,
|
|
1
|
+
{"version":3,"file":"LiquidityLayerRouterDeployer.js","sourceRoot":"","sources":["../../../src/middleware/liquidity-layer/LiquidityLayerRouterDeployer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import { CircleBridgeAdapter__factory, LiquidityLayerRouter__factory, PortalAdapter__factory
|
|
1
|
+
import { CircleBridgeAdapter__factory, LiquidityLayerRouter__factory, PortalAdapter__factory } from '@hyperlane-xyz/core';
|
|
2
2
|
export declare const liquidityLayerFactories: {
|
|
3
|
+
proxyAdmin: import("@hyperlane-xyz/core").ProxyAdmin__factory;
|
|
4
|
+
timelockController: import("@hyperlane-xyz/core").TimelockController__factory;
|
|
3
5
|
circleBridgeAdapter: CircleBridgeAdapter__factory;
|
|
4
6
|
portalAdapter: PortalAdapter__factory;
|
|
5
|
-
proxyAdmin: ProxyAdmin__factory;
|
|
6
7
|
liquidityLayerRouter: LiquidityLayerRouter__factory;
|
|
7
8
|
};
|
|
8
9
|
export declare type LiquidityLayerFactories = typeof liquidityLayerFactories;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contracts.d.ts","sourceRoot":"","sources":["../../../src/middleware/liquidity-layer/contracts.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,4BAA4B,EAC5B,6BAA6B,EAC7B,sBAAsB,
|
|
1
|
+
{"version":3,"file":"contracts.d.ts","sourceRoot":"","sources":["../../../src/middleware/liquidity-layer/contracts.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,4BAA4B,EAC5B,6BAA6B,EAC7B,sBAAsB,EACvB,MAAM,qBAAqB,CAAC;AAI7B,eAAO,MAAM,uBAAuB;;;;;;CAKnC,CAAC;AAEF,oBAAY,uBAAuB,GAAG,OAAO,uBAAuB,CAAC"}
|
|
@@ -2,10 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.liquidityLayerFactories = void 0;
|
|
4
4
|
const core_1 = require("@hyperlane-xyz/core");
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
portalAdapter: new core_1.PortalAdapter__factory(),
|
|
8
|
-
proxyAdmin: new core_1.ProxyAdmin__factory(),
|
|
9
|
-
liquidityLayerRouter: new core_1.LiquidityLayerRouter__factory(),
|
|
10
|
-
};
|
|
5
|
+
const types_1 = require("../../router/types");
|
|
6
|
+
exports.liquidityLayerFactories = Object.assign({ circleBridgeAdapter: new core_1.CircleBridgeAdapter__factory(), portalAdapter: new core_1.PortalAdapter__factory(), liquidityLayerRouter: new core_1.LiquidityLayerRouter__factory() }, types_1.proxiedFactories);
|
|
11
7
|
//# sourceMappingURL=contracts.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contracts.js","sourceRoot":"","sources":["../../../src/middleware/liquidity-layer/contracts.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"contracts.js","sourceRoot":"","sources":["../../../src/middleware/liquidity-layer/contracts.ts"],"names":[],"mappings":";;;AAAA,8CAI6B;AAE7B,8CAAsD;AAEzC,QAAA,uBAAuB,mBAClC,mBAAmB,EAAE,IAAI,mCAA4B,EAAE,EACvD,aAAa,EAAE,IAAI,6BAAsB,EAAE,EAC3C,oBAAoB,EAAE,IAAI,oCAA6B,EAAE,IACtD,wBAAgB,EACnB"}
|
|
@@ -19,7 +19,6 @@ const TestCoreApp_1 = require("../../core/TestCoreApp");
|
|
|
19
19
|
const TestCoreDeployer_1 = require("../../core/TestCoreDeployer");
|
|
20
20
|
const MultiProvider_1 = require("../../providers/MultiProvider");
|
|
21
21
|
const testUtils_1 = require("../../test/testUtils");
|
|
22
|
-
const objects_1 = require("../../utils/objects");
|
|
23
22
|
const LiquidityLayerApp_1 = require("./LiquidityLayerApp");
|
|
24
23
|
const LiquidityLayerRouterDeployer_1 = require("./LiquidityLayerRouterDeployer");
|
|
25
24
|
describe('LiquidityLayerRouter', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
@@ -52,7 +51,7 @@ describe('LiquidityLayerRouter', () => __awaiter(void 0, void 0, void 0, functio
|
|
|
52
51
|
const messageTransmitterF = new core_1.MockCircleMessageTransmitter__factory(signer);
|
|
53
52
|
messageTransmitter = yield messageTransmitterF.deploy(mockToken.address);
|
|
54
53
|
const routerConfig = yield (0, testUtils_1.deployTestIgpsAndGetRouterConfig)(multiProvider, signer.address, coreContractsMaps);
|
|
55
|
-
config = (0,
|
|
54
|
+
config = (0, utils_1.objMap)(routerConfig, (chain, config) => {
|
|
56
55
|
return Object.assign(Object.assign({}, config), { circle: {
|
|
57
56
|
type: LiquidityLayerRouterDeployer_1.BridgeAdapterType.Circle,
|
|
58
57
|
tokenMessengerAddress: circleTokenMessenger.address,
|
|
@@ -96,7 +95,7 @@ describe('LiquidityLayerRouter', () => __awaiter(void 0, void 0, void 0, functio
|
|
|
96
95
|
const amount = 1000;
|
|
97
96
|
yield mockToken.mint(signer.address, amount);
|
|
98
97
|
yield mockToken.approve(local.address, amount);
|
|
99
|
-
yield local.dispatchWithTokens(remoteDomain, utils_1.
|
|
98
|
+
yield local.dispatchWithTokens(remoteDomain, (0, utils_1.addressToBytes32)(recipient.address), mockToken.address, amount, LiquidityLayerRouterDeployer_1.BridgeAdapterType.Circle, '0x01');
|
|
100
99
|
const transferNonce = yield circleTokenMessenger.nextNonce();
|
|
101
100
|
const nonceId = yield messageTransmitter.hashSourceAndNonce(localDomain, transferNonce);
|
|
102
101
|
yield messageTransmitter.process(nonceId, liquidityLayerApp.getContracts(remoteChain).circleBridgeAdapter.address, amount);
|
|
@@ -109,7 +108,7 @@ describe('LiquidityLayerRouter', () => __awaiter(void 0, void 0, void 0, functio
|
|
|
109
108
|
const amount = 1000;
|
|
110
109
|
yield mockToken.mint(signer.address, amount);
|
|
111
110
|
yield mockToken.approve(local.address, amount);
|
|
112
|
-
yield local.dispatchWithTokens(remoteDomain, utils_1.
|
|
111
|
+
yield local.dispatchWithTokens(remoteDomain, (0, utils_1.addressToBytes32)(recipient.address), mockToken.address, amount, LiquidityLayerRouterDeployer_1.BridgeAdapterType.Portal, '0x01');
|
|
113
112
|
const originAdapter = liquidityLayerApp.getContracts(localChain).portalAdapter;
|
|
114
113
|
const destinationAdapter = liquidityLayerApp.getContracts(remoteChain).portalAdapter;
|
|
115
114
|
yield destinationAdapter.completeTransfer(yield portalBridge.mockPortalVaa(localDomain, yield originAdapter.nonce(), amount));
|