@hyperlane-xyz/sdk 1.4.3-beta0 → 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/bytecode.js +1 -1
- package/dist/consts/bytecode.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 +26 -25
- package/dist/consts/chainMetadata.js.map +1 -1
- package/dist/consts/chains.d.ts +1 -1
- package/dist/consts/chains.d.ts.map +1 -1
- package/dist/consts/chains.js +2 -2
- package/dist/consts/chains.js.map +1 -1
- package/dist/consts/environments/index.d.ts +2 -2
- 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/contracts.d.ts +7 -7
- package/dist/contracts.d.ts.map +1 -1
- package/dist/contracts.js +33 -22
- package/dist/contracts.js.map +1 -1
- package/dist/core/CoreDeployer.hardhat-test.js +42 -33
- package/dist/core/CoreDeployer.hardhat-test.js.map +1 -1
- package/dist/core/HyperlaneCore.d.ts +3 -3
- package/dist/core/HyperlaneCore.d.ts.map +1 -1
- package/dist/core/HyperlaneCore.js +28 -15
- package/dist/core/HyperlaneCore.js.map +1 -1
- package/dist/core/HyperlaneCore.test.js +13 -4
- package/dist/core/HyperlaneCore.test.js.map +1 -1
- package/dist/core/HyperlaneCoreChecker.js +99 -80
- package/dist/core/HyperlaneCoreChecker.js.map +1 -1
- package/dist/core/HyperlaneCoreDeployer.d.ts +3 -3
- package/dist/core/HyperlaneCoreDeployer.d.ts.map +1 -1
- package/dist/core/HyperlaneCoreDeployer.js +62 -45
- package/dist/core/HyperlaneCoreDeployer.js.map +1 -1
- package/dist/core/TestCoreApp.js +45 -35
- package/dist/core/TestCoreApp.js.map +1 -1
- package/dist/core/TestCoreDeployer.js +27 -14
- package/dist/core/TestCoreDeployer.js.map +1 -1
- package/dist/core/contracts.d.ts +1 -1
- package/dist/core/contracts.d.ts.map +1 -1
- package/dist/core/events.d.ts +1 -1
- package/dist/core/events.d.ts.map +1 -1
- package/dist/core/testHyperlaneDeploy.hardhat-test.js +33 -24
- package/dist/core/testHyperlaneDeploy.hardhat-test.js.map +1 -1
- package/dist/core/types.d.ts +5 -5
- package/dist/core/types.d.ts.map +1 -1
- package/dist/core/types.js +2 -2
- package/dist/core/types.js.map +1 -1
- package/dist/deploy/HyperlaneAppChecker.d.ts +2 -2
- package/dist/deploy/HyperlaneAppChecker.d.ts.map +1 -1
- package/dist/deploy/HyperlaneAppChecker.js +126 -103
- package/dist/deploy/HyperlaneAppChecker.js.map +1 -1
- package/dist/deploy/HyperlaneDeployer.d.ts +3 -3
- package/dist/deploy/HyperlaneDeployer.d.ts.map +1 -1
- package/dist/deploy/HyperlaneDeployer.js +216 -176
- package/dist/deploy/HyperlaneDeployer.js.map +1 -1
- package/dist/deploy/proxy.d.ts +7 -7
- package/dist/deploy/proxy.d.ts.map +1 -1
- package/dist/deploy/proxy.js +27 -12
- package/dist/deploy/proxy.js.map +1 -1
- package/dist/deploy/types.js +1 -1
- package/dist/deploy/types.js.map +1 -1
- package/dist/deploy/verify/ContractVerifier.d.ts.map +1 -1
- package/dist/deploy/verify/ContractVerifier.js +131 -123
- package/dist/deploy/verify/ContractVerifier.js.map +1 -1
- package/dist/deploy/verify/types.d.ts +3 -3
- package/dist/deploy/verify/types.d.ts.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 -2
- package/dist/gas/HyperlaneIgpChecker.d.ts.map +1 -1
- package/dist/gas/HyperlaneIgpChecker.js +123 -101
- 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 +89 -70
- package/dist/gas/HyperlaneIgpDeployer.js.map +1 -1
- package/dist/gas/contracts.d.ts +1 -1
- package/dist/gas/contracts.d.ts.map +1 -1
- package/dist/gas/contracts.js +1 -6
- package/dist/gas/contracts.js.map +1 -1
- package/dist/gas/token-prices.d.ts +6 -6
- package/dist/gas/token-prices.d.ts.map +1 -1
- package/dist/gas/token-prices.js +54 -37
- package/dist/gas/token-prices.js.map +1 -1
- package/dist/gas/token-prices.test.js +20 -11
- package/dist/gas/token-prices.test.js.map +1 -1
- package/dist/gas/types.d.ts +10 -10
- package/dist/gas/types.d.ts.map +1 -1
- package/dist/gas/types.js +2 -2
- 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 +89 -70
- package/dist/hook/HyperlaneHookDeployer.js.map +1 -1
- package/dist/hook/contracts.d.ts +4 -4
- package/dist/hook/contracts.d.ts.map +1 -1
- package/dist/hook/contracts.js +1 -5
- package/dist/hook/contracts.js.map +1 -1
- package/dist/hook/types.d.ts +7 -7
- package/dist/hook/types.d.ts.map +1 -1
- package/dist/hook/types.js +1 -1
- package/dist/hook/types.js.map +1 -1
- package/dist/index.d.ts +4 -8
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -25
- 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.hardhat-test.js +23 -14
- package/dist/ism/HyperlaneIsmFactory.hardhat-test.js.map +1 -1
- package/dist/ism/HyperlaneIsmFactory.js +254 -232
- package/dist/ism/HyperlaneIsmFactory.js.map +1 -1
- package/dist/ism/HyperlaneIsmFactoryDeployer.d.ts.map +1 -1
- package/dist/ism/HyperlaneIsmFactoryDeployer.js +35 -19
- package/dist/ism/HyperlaneIsmFactoryDeployer.js.map +1 -1
- package/dist/ism/contracts.d.ts +1 -1
- package/dist/ism/contracts.d.ts.map +1 -1
- package/dist/ism/types.d.ts +8 -8
- package/dist/ism/types.d.ts.map +1 -1
- package/dist/ism/types.js +1 -1
- package/dist/ism/types.js.map +1 -1
- package/dist/metadata/agentConfig.d.ts +5 -5
- package/dist/metadata/agentConfig.d.ts.map +1 -1
- package/dist/metadata/agentConfig.js +6 -15
- package/dist/metadata/agentConfig.js.map +1 -1
- package/dist/metadata/chainMetadata.test.js +11 -28
- package/dist/metadata/chainMetadata.test.js.map +1 -1
- package/dist/metadata/chainMetadataTypes.d.ts +3 -12
- package/dist/metadata/chainMetadataTypes.d.ts.map +1 -1
- package/dist/metadata/chainMetadataTypes.js +6 -14
- package/dist/metadata/chainMetadataTypes.js.map +1 -1
- package/dist/metadata/deploymentArtifacts.d.ts +5 -5
- package/dist/metadata/deploymentArtifacts.d.ts.map +1 -1
- package/dist/middleware/account/InterchainAccountChecker.d.ts.map +1 -1
- package/dist/middleware/account/InterchainAccountChecker.js +3 -6
- package/dist/middleware/account/InterchainAccountChecker.js.map +1 -1
- package/dist/middleware/account/InterchainAccountDeployer.d.ts +1 -1
- package/dist/middleware/account/InterchainAccountDeployer.d.ts.map +1 -1
- package/dist/middleware/account/InterchainAccountDeployer.js +41 -28
- package/dist/middleware/account/InterchainAccountDeployer.js.map +1 -1
- package/dist/middleware/account/accounts.hardhat-test.js +30 -21
- package/dist/middleware/account/accounts.hardhat-test.js.map +1 -1
- package/dist/middleware/account/contracts.d.ts +1 -1
- package/dist/middleware/account/contracts.d.ts.map +1 -1
- package/dist/middleware/account/contracts.js +1 -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 +151 -129
- package/dist/middleware/liquidity-layer/LiquidityLayerApp.js.map +1 -1
- package/dist/middleware/liquidity-layer/LiquidityLayerRouterDeployer.d.ts +4 -4
- package/dist/middleware/liquidity-layer/LiquidityLayerRouterDeployer.d.ts.map +1 -1
- package/dist/middleware/liquidity-layer/LiquidityLayerRouterDeployer.js +110 -86
- package/dist/middleware/liquidity-layer/LiquidityLayerRouterDeployer.js.map +1 -1
- package/dist/middleware/liquidity-layer/contracts.d.ts +1 -1
- package/dist/middleware/liquidity-layer/contracts.d.ts.map +1 -1
- package/dist/middleware/liquidity-layer/contracts.js +1 -6
- package/dist/middleware/liquidity-layer/contracts.js.map +1 -1
- package/dist/middleware/liquidity-layer/liquidity-layer.hardhat-test.js +47 -43
- package/dist/middleware/liquidity-layer/liquidity-layer.hardhat-test.js.map +1 -1
- package/dist/middleware/query/InterchainQueryDeployer.d.ts +1 -1
- package/dist/middleware/query/InterchainQueryDeployer.d.ts.map +1 -1
- package/dist/middleware/query/InterchainQueryDeployer.js +27 -13
- package/dist/middleware/query/InterchainQueryDeployer.js.map +1 -1
- package/dist/middleware/query/contracts.d.ts +1 -1
- package/dist/middleware/query/contracts.d.ts.map +1 -1
- package/dist/middleware/query/contracts.js +1 -4
- package/dist/middleware/query/contracts.js.map +1 -1
- package/dist/middleware/query/queries.hardhat-test.js +33 -24
- package/dist/middleware/query/queries.hardhat-test.js.map +1 -1
- package/dist/providers/MultiProvider.d.ts +4 -4
- package/dist/providers/MultiProvider.d.ts.map +1 -1
- package/dist/providers/MultiProvider.js +88 -68
- package/dist/providers/MultiProvider.js.map +1 -1
- package/dist/providers/RetryProvider.d.ts +1 -1
- package/dist/providers/RetryProvider.d.ts.map +1 -1
- package/dist/providers/RetryProvider.js +18 -4
- 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 +32 -18
- package/dist/router/GasRouterDeployer.js.map +1 -1
- package/dist/router/HyperlaneRouterChecker.js +55 -37
- 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 +114 -87
- package/dist/router/HyperlaneRouterDeployer.js.map +1 -1
- package/dist/router/ProxiedRouterChecker.js +34 -14
- package/dist/router/ProxiedRouterChecker.js.map +1 -1
- package/dist/router/ProxiedRouterDeployer.js +39 -25
- 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 +16 -5
- package/dist/router/RouterApps.js.map +1 -1
- package/dist/router/types.d.ts +14 -14
- package/dist/router/types.d.ts.map +1 -1
- package/dist/router/types.js +1 -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 +25 -14
- package/dist/test/testUtils.js.map +1 -1
- package/dist/types.d.ts +5 -5
- package/dist/types.d.ts.map +1 -1
- package/dist/utils/MultiGeneric.js +4 -2
- package/dist/utils/MultiGeneric.js.map +1 -1
- package/dist/utils/fetch.js +16 -8
- package/dist/utils/fetch.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 +4 -3
- package/dist/utils/wagmi.js.map +1 -1
- package/package.json +7 -7
- package/dist/consts/agentStartBlocks.d.ts +0 -3
- package/dist/consts/agentStartBlocks.d.ts.map +0 -1
- package/dist/consts/agentStartBlocks.js +0 -28
- package/dist/consts/agentStartBlocks.js.map +0 -1
- 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,4 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
2
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
12
|
exports.InterchainAccountDeployer = void 0;
|
|
4
13
|
const ethers_1 = require("ethers");
|
|
@@ -9,36 +18,40 @@ class InterchainAccountDeployer extends ProxiedRouterDeployer_1.ProxiedRouterDep
|
|
|
9
18
|
super(multiProvider, contracts_1.interchainAccountFactories);
|
|
10
19
|
this.routerContractName = 'interchainAccountRouter';
|
|
11
20
|
}
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
21
|
+
constructorArgs(chain, __) {
|
|
22
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
23
|
+
const localDomain = this.multiProvider.getDomainId(chain);
|
|
24
|
+
return [localDomain];
|
|
25
|
+
});
|
|
15
26
|
}
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
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
|
+
});
|
|
27
41
|
}
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
}
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
};
|
|
42
|
+
deployContracts(chain, config) {
|
|
43
|
+
const _super = Object.create(null, {
|
|
44
|
+
deployContracts: { get: () => super.deployContracts }
|
|
45
|
+
});
|
|
46
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
47
|
+
if (config.interchainSecurityModule) {
|
|
48
|
+
throw new Error('Configuration of ISM not supported in ICA deployer');
|
|
49
|
+
}
|
|
50
|
+
const interchainAccountIsm = yield this.deployContract(chain, 'interchainAccountIsm', [config.mailbox]);
|
|
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 });
|
|
54
|
+
});
|
|
42
55
|
}
|
|
43
56
|
}
|
|
44
57
|
exports.InterchainAccountDeployer = InterchainAccountDeployer;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InterchainAccountDeployer.js","sourceRoot":"","sources":["../../../src/middleware/account/InterchainAccountDeployer.ts"],"names":[],"mappings":"
|
|
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,4 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
2
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
12
|
const chai_1 = require("chai");
|
|
4
13
|
const hardhat_1 = require("hardhat");
|
|
@@ -10,7 +19,7 @@ const testUtils_1 = require("../../test/testUtils");
|
|
|
10
19
|
const InterchainAccount_1 = require("./InterchainAccount");
|
|
11
20
|
const InterchainAccountChecker_1 = require("./InterchainAccountChecker");
|
|
12
21
|
const InterchainAccountDeployer_1 = require("./InterchainAccountDeployer");
|
|
13
|
-
describe('InterchainAccounts',
|
|
22
|
+
describe('InterchainAccounts', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
14
23
|
const localChain = chains_1.Chains.test1;
|
|
15
24
|
const remoteChain = chains_1.Chains.test2;
|
|
16
25
|
let signer;
|
|
@@ -20,37 +29,37 @@ describe('InterchainAccounts', async () => {
|
|
|
20
29
|
let multiProvider;
|
|
21
30
|
let coreApp;
|
|
22
31
|
let config;
|
|
23
|
-
before(
|
|
24
|
-
[signer] =
|
|
32
|
+
before(() => __awaiter(void 0, void 0, void 0, function* () {
|
|
33
|
+
[signer] = yield hardhat_1.ethers.getSigners();
|
|
25
34
|
multiProvider = MultiProvider_1.MultiProvider.createTestMultiProvider({ signer });
|
|
26
|
-
coreApp =
|
|
27
|
-
config =
|
|
28
|
-
});
|
|
29
|
-
beforeEach(
|
|
35
|
+
coreApp = yield new TestCoreDeployer_1.TestCoreDeployer(multiProvider).deployApp();
|
|
36
|
+
config = yield (0, testUtils_1.deployTestIgpsAndGetRouterConfig)(multiProvider, signer.address, coreApp.contractsMap);
|
|
37
|
+
}));
|
|
38
|
+
beforeEach(() => __awaiter(void 0, void 0, void 0, function* () {
|
|
30
39
|
const deployer = new InterchainAccountDeployer_1.InterchainAccountDeployer(multiProvider);
|
|
31
|
-
contracts =
|
|
40
|
+
contracts = yield deployer.deploy(config);
|
|
32
41
|
local = contracts[localChain].interchainAccountRouter;
|
|
33
42
|
remote = contracts[remoteChain].interchainAccountRouter;
|
|
34
|
-
});
|
|
35
|
-
it('checks',
|
|
43
|
+
}));
|
|
44
|
+
it('checks', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
36
45
|
const app = new InterchainAccount_1.InterchainAccount(contracts, multiProvider);
|
|
37
46
|
const checker = new InterchainAccountChecker_1.InterchainAccountChecker(multiProvider, app, config);
|
|
38
|
-
|
|
47
|
+
yield checker.check();
|
|
39
48
|
(0, chai_1.expect)(checker.violations.length).to.eql(0);
|
|
40
|
-
});
|
|
41
|
-
it('forwards calls from interchain account',
|
|
49
|
+
}));
|
|
50
|
+
it('forwards calls from interchain account', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
42
51
|
const recipientF = new core_1.TestRecipient__factory(signer);
|
|
43
|
-
const recipient =
|
|
52
|
+
const recipient = yield recipientF.deploy();
|
|
44
53
|
const fooMessage = 'Test';
|
|
45
54
|
const data = recipient.interface.encodeFunctionData('fooBar', [
|
|
46
55
|
1,
|
|
47
56
|
fooMessage,
|
|
48
57
|
]);
|
|
49
|
-
const icaAddress =
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
(0, chai_1.expect)(
|
|
53
|
-
(0, chai_1.expect)(
|
|
54
|
-
});
|
|
55
|
-
});
|
|
58
|
+
const icaAddress = yield remote['getLocalInterchainAccount(uint32,address,address,address)'](multiProvider.getDomainId(localChain), signer.address, local.address, hardhat_1.ethers.constants.AddressZero);
|
|
59
|
+
yield local['callRemote(uint32,address,uint256,bytes)'](multiProvider.getDomainId(remoteChain), recipient.address, 0, data);
|
|
60
|
+
yield coreApp.processMessages();
|
|
61
|
+
(0, chai_1.expect)(yield recipient.lastCallMessage()).to.eql(fooMessage);
|
|
62
|
+
(0, chai_1.expect)(yield recipient.lastCaller()).to.eql(icaAddress);
|
|
63
|
+
}));
|
|
64
|
+
}));
|
|
56
65
|
//# sourceMappingURL=accounts.hardhat-test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accounts.hardhat-test.js","sourceRoot":"","sources":["../../../src/middleware/account/accounts.hardhat-test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"accounts.hardhat-test.js","sourceRoot":"","sources":["../../../src/middleware/account/accounts.hardhat-test.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,5 +5,5 @@ export declare const interchainAccountFactories: {
|
|
|
5
5
|
interchainAccountRouter: InterchainAccountRouter__factory;
|
|
6
6
|
interchainAccountIsm: InterchainAccountIsm__factory;
|
|
7
7
|
};
|
|
8
|
-
export type InterchainAccountFactories = typeof interchainAccountFactories;
|
|
8
|
+
export declare type InterchainAccountFactories = typeof interchainAccountFactories;
|
|
9
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,EACjC,MAAM,qBAAqB,CAAC;AAI7B,eAAO,MAAM,0BAA0B;;;;;CAItC,CAAC;AAEF,
|
|
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"}
|
|
@@ -3,9 +3,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.interchainAccountFactories = void 0;
|
|
4
4
|
const core_1 = require("@hyperlane-xyz/core");
|
|
5
5
|
const types_1 = require("../../router/types");
|
|
6
|
-
exports.interchainAccountFactories = {
|
|
7
|
-
interchainAccountRouter: new core_1.InterchainAccountRouter__factory(),
|
|
8
|
-
interchainAccountIsm: new core_1.InterchainAccountIsm__factory(),
|
|
9
|
-
...types_1.proxiedFactories,
|
|
10
|
-
};
|
|
6
|
+
exports.interchainAccountFactories = Object.assign({ interchainAccountRouter: new core_1.InterchainAccountRouter__factory(), interchainAccountIsm: new core_1.InterchainAccountIsm__factory() }, types_1.proxiedFactories);
|
|
11
7
|
//# sourceMappingURL=contracts.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contracts.js","sourceRoot":"","sources":["../../../src/middleware/account/contracts.ts"],"names":[],"mappings":";;;AAAA,8CAG6B;AAE7B,8CAAsD;AAEzC,QAAA,0BAA0B,
|
|
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"}
|
|
@@ -1,4 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
2
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
12
|
exports.LiquidityLayerApp = void 0;
|
|
4
13
|
const ethers_1 = require("ethers");
|
|
@@ -23,149 +32,162 @@ class LiquidityLayerApp extends HyperlaneApp_1.HyperlaneApp {
|
|
|
23
32
|
this.multiProvider = multiProvider;
|
|
24
33
|
this.config = config;
|
|
25
34
|
}
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
35
|
+
fetchCircleMessageTransactions(chain) {
|
|
36
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
37
|
+
console.log(`Fetch circle messages for ${chain}`);
|
|
38
|
+
const url = new URL(this.multiProvider.getExplorerApiUrl(chain));
|
|
39
|
+
url.searchParams.set('module', 'logs');
|
|
40
|
+
url.searchParams.set('action', 'getLogs');
|
|
41
|
+
url.searchParams.set('address', this.getContracts(chain).circleBridgeAdapter.address);
|
|
42
|
+
url.searchParams.set('topic0', BridgedTokenTopic);
|
|
43
|
+
const req = yield (0, fetch_1.fetchWithTimeout)(url);
|
|
44
|
+
const response = yield req.json();
|
|
45
|
+
return response.result.map((tx) => tx.transactionHash).flat();
|
|
46
|
+
});
|
|
36
47
|
}
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
return response.result.map((tx) => tx.transactionHash).flat();
|
|
49
|
-
}
|
|
50
|
-
async parsePortalMessages(chain, txHash) {
|
|
51
|
-
const provider = this.multiProvider.getProvider(chain);
|
|
52
|
-
const receipt = await provider.getTransactionReceipt(txHash);
|
|
53
|
-
const matchingLogs = receipt.logs
|
|
54
|
-
.map((log) => {
|
|
55
|
-
try {
|
|
56
|
-
return [PortalAdapterInterface.parseLog(log)];
|
|
48
|
+
fetchPortalBridgeTransactions(chain) {
|
|
49
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
50
|
+
const url = new URL(this.multiProvider.getExplorerApiUrl(chain));
|
|
51
|
+
url.searchParams.set('module', 'logs');
|
|
52
|
+
url.searchParams.set('action', 'getLogs');
|
|
53
|
+
url.searchParams.set('address', this.getContracts(chain).portalAdapter.address);
|
|
54
|
+
url.searchParams.set('topic0', PortalBridgedTokenTopic);
|
|
55
|
+
const req = yield (0, fetch_1.fetchWithTimeout)(url);
|
|
56
|
+
const response = yield req.json();
|
|
57
|
+
if (!response.result) {
|
|
58
|
+
throw Error(`Expected result in response: ${response}`);
|
|
57
59
|
}
|
|
58
|
-
|
|
60
|
+
return response.result.map((tx) => tx.transactionHash).flat();
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
parsePortalMessages(chain, txHash) {
|
|
64
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
65
|
+
const provider = this.multiProvider.getProvider(chain);
|
|
66
|
+
const receipt = yield provider.getTransactionReceipt(txHash);
|
|
67
|
+
const matchingLogs = receipt.logs
|
|
68
|
+
.map((log) => {
|
|
69
|
+
try {
|
|
70
|
+
return [PortalAdapterInterface.parseLog(log)];
|
|
71
|
+
}
|
|
72
|
+
catch (_a) {
|
|
73
|
+
return [];
|
|
74
|
+
}
|
|
75
|
+
})
|
|
76
|
+
.flat();
|
|
77
|
+
if (matchingLogs.length == 0)
|
|
59
78
|
return [];
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
.
|
|
63
|
-
|
|
64
|
-
return [];
|
|
65
|
-
|
|
66
|
-
const portalSequence = event.args.portalSequence.toNumber();
|
|
67
|
-
const nonce = event.args.nonce.toNumber();
|
|
68
|
-
const destination = this.multiProvider.getChainName(event.args.destination);
|
|
69
|
-
return [{ origin: chain, nonce, portalSequence, destination }];
|
|
79
|
+
const event = matchingLogs.find((log) => log.name === 'BridgedToken');
|
|
80
|
+
const portalSequence = event.args.portalSequence.toNumber();
|
|
81
|
+
const nonce = event.args.nonce.toNumber();
|
|
82
|
+
const destination = this.multiProvider.getChainName(event.args.destination);
|
|
83
|
+
return [{ origin: chain, nonce, portalSequence, destination }];
|
|
84
|
+
});
|
|
70
85
|
}
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
return [TokenMessengerInterface.parseLog(log)];
|
|
79
|
-
}
|
|
80
|
-
catch {
|
|
86
|
+
parseCircleMessages(chain, txHash) {
|
|
87
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
88
|
+
console.debug(`Parse Circle messages for chain ${chain} ${txHash}`);
|
|
89
|
+
const provider = this.multiProvider.getProvider(chain);
|
|
90
|
+
const receipt = yield provider.getTransactionReceipt(txHash);
|
|
91
|
+
const matchingLogs = receipt.logs
|
|
92
|
+
.map((log) => {
|
|
81
93
|
try {
|
|
82
|
-
return [
|
|
94
|
+
return [TokenMessengerInterface.parseLog(log)];
|
|
83
95
|
}
|
|
84
|
-
catch {
|
|
96
|
+
catch (_a) {
|
|
85
97
|
try {
|
|
86
|
-
return [
|
|
98
|
+
return [CircleBridgeAdapterInterface.parseLog(log)];
|
|
87
99
|
}
|
|
88
|
-
catch {
|
|
89
|
-
|
|
100
|
+
catch (_b) {
|
|
101
|
+
try {
|
|
102
|
+
return [MailboxInterface.parseLog(log)];
|
|
103
|
+
}
|
|
104
|
+
catch (_c) {
|
|
105
|
+
return [];
|
|
106
|
+
}
|
|
90
107
|
}
|
|
91
108
|
}
|
|
92
|
-
}
|
|
93
|
-
|
|
94
|
-
.
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
.args
|
|
99
|
-
|
|
100
|
-
.
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
109
|
+
})
|
|
110
|
+
.flat();
|
|
111
|
+
if (matchingLogs.length == 0)
|
|
112
|
+
return [];
|
|
113
|
+
const message = matchingLogs.find((log) => log.name === 'MessageSent')
|
|
114
|
+
.args.message;
|
|
115
|
+
const nonce = matchingLogs.find((log) => log.name === 'BridgedToken').args
|
|
116
|
+
.nonce;
|
|
117
|
+
const destinationDomain = matchingLogs.find((log) => log.name === 'Dispatch').args.destination;
|
|
118
|
+
const remoteChain = this.multiProvider.getChainName(destinationDomain);
|
|
119
|
+
const domain = this.config[chain].circle.circleDomainMapping.find((mapping) => mapping.hyperlaneDomain === this.multiProvider.getDomainId(chain)).circleDomain;
|
|
120
|
+
return [
|
|
121
|
+
{
|
|
122
|
+
chain,
|
|
123
|
+
remoteChain,
|
|
124
|
+
txHash,
|
|
125
|
+
message,
|
|
126
|
+
nonce,
|
|
127
|
+
domain,
|
|
128
|
+
nonceHash: ethers_1.ethers.utils.solidityKeccak256(['uint32', 'uint64'], [domain, nonce]),
|
|
129
|
+
},
|
|
130
|
+
];
|
|
131
|
+
});
|
|
115
132
|
}
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
const wormholeOriginDomain = this.config[message.destination].portal.wormholeDomainMapping.find((mapping) => mapping.hyperlaneDomain ===
|
|
126
|
-
this.multiProvider.getDomainId(message.origin))?.wormholeDomain;
|
|
127
|
-
const emitter = utils_1.utils.strip0x(utils_1.utils.addressToBytes32(this.config[message.origin].portal.portalBridgeAddress));
|
|
128
|
-
const vaa = await (0, fetch_1.fetchWithTimeout)(`${PORTAL_VAA_SERVICE_TESTNET_BASE_URL}${wormholeOriginDomain}/${emitter}/${message.portalSequence}`).then((response) => response.json());
|
|
129
|
-
if (vaa.code && vaa.code === PORTAL_VAA_SERVICE_SUCCESS_CODE) {
|
|
130
|
-
console.log(`VAA not yet found for nonce ${message.nonce}`);
|
|
131
|
-
return;
|
|
132
|
-
}
|
|
133
|
-
console.debug(`Complete portal transfer for nonce ${message.nonce} on ${message.destination}`);
|
|
134
|
-
try {
|
|
135
|
-
await this.multiProvider.handleTx(message.destination, destinationPortalAdapter.completeTransfer(utils_1.utils.ensure0x(Buffer.from(vaa.vaaBytes, 'base64').toString('hex'))));
|
|
136
|
-
}
|
|
137
|
-
catch (error) {
|
|
138
|
-
if (error?.error?.reason?.includes('no wrapper for this token')) {
|
|
139
|
-
console.log('No wrapper for this token, you should register the token at https://wormhole-foundation.github.io/example-token-bridge-ui/#/register');
|
|
140
|
-
console.log(message);
|
|
133
|
+
attemptPortalTransferCompletion(message) {
|
|
134
|
+
var _a, _b, _c;
|
|
135
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
136
|
+
const destinationPortalAdapter = this.getContracts(message.destination)
|
|
137
|
+
.portalAdapter;
|
|
138
|
+
const transferId = yield destinationPortalAdapter.transferId(this.multiProvider.getDomainId(message.origin), message.nonce);
|
|
139
|
+
const transferTokenAddress = yield destinationPortalAdapter.portalTransfersProcessed(transferId);
|
|
140
|
+
if (!(0, utils_1.eqAddress)(transferTokenAddress, ethers_1.ethers.constants.AddressZero)) {
|
|
141
|
+
console.log(`Transfer with nonce ${message.nonce} from ${message.origin} to ${message.destination} already processed`);
|
|
141
142
|
return;
|
|
142
143
|
}
|
|
143
|
-
|
|
144
|
-
|
|
144
|
+
const wormholeOriginDomain = (_a = this.config[message.destination].portal.wormholeDomainMapping.find((mapping) => mapping.hyperlaneDomain ===
|
|
145
|
+
this.multiProvider.getDomainId(message.origin))) === null || _a === void 0 ? void 0 : _a.wormholeDomain;
|
|
146
|
+
const emitter = (0, utils_1.strip0x)((0, utils_1.addressToBytes32)(this.config[message.origin].portal.portalBridgeAddress));
|
|
147
|
+
const vaa = yield (0, fetch_1.fetchWithTimeout)(`${PORTAL_VAA_SERVICE_TESTNET_BASE_URL}${wormholeOriginDomain}/${emitter}/${message.portalSequence}`).then((response) => response.json());
|
|
148
|
+
if (vaa.code && vaa.code === PORTAL_VAA_SERVICE_SUCCESS_CODE) {
|
|
149
|
+
console.log(`VAA not yet found for nonce ${message.nonce}`);
|
|
150
|
+
return;
|
|
151
|
+
}
|
|
152
|
+
console.debug(`Complete portal transfer for nonce ${message.nonce} on ${message.destination}`);
|
|
153
|
+
try {
|
|
154
|
+
yield this.multiProvider.handleTx(message.destination, destinationPortalAdapter.completeTransfer((0, utils_1.ensure0x)(Buffer.from(vaa.vaaBytes, 'base64').toString('hex'))));
|
|
155
|
+
}
|
|
156
|
+
catch (error) {
|
|
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')) {
|
|
158
|
+
console.log('No wrapper for this token, you should register the token at https://wormhole-foundation.github.io/example-token-bridge-ui/#/register');
|
|
159
|
+
console.log(message);
|
|
160
|
+
return;
|
|
161
|
+
}
|
|
162
|
+
throw error;
|
|
163
|
+
}
|
|
164
|
+
});
|
|
145
165
|
}
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
166
|
+
attemptCircleAttestationSubmission(message) {
|
|
167
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
168
|
+
const signer = this.multiProvider.getSigner(message.remoteChain);
|
|
169
|
+
const transmitter = core_1.ICircleMessageTransmitter__factory.connect(this.config[message.remoteChain].circle.messageTransmitterAddress, signer);
|
|
170
|
+
const alreadyProcessed = yield transmitter.usedNonces(message.nonceHash);
|
|
171
|
+
if (alreadyProcessed) {
|
|
172
|
+
console.log(`Message sent on ${message.txHash} was already processed`);
|
|
173
|
+
return;
|
|
174
|
+
}
|
|
175
|
+
console.log(`Attempt Circle message delivery`, JSON.stringify(message));
|
|
176
|
+
const messageHash = ethers_1.ethers.utils.keccak256(message.message);
|
|
177
|
+
const baseurl = this.multiProvider.getChainMetadata(message.chain).isTestnet
|
|
178
|
+
? CIRCLE_ATTESTATIONS_TESTNET_BASE_URL
|
|
179
|
+
: CIRCLE_ATTESTATIONS_MAINNET_BASE_URL;
|
|
180
|
+
const attestationsB = yield (0, fetch_1.fetchWithTimeout)(`${baseurl}${messageHash}`);
|
|
181
|
+
const attestations = yield attestationsB.json();
|
|
182
|
+
if (attestations.status !== 'complete') {
|
|
183
|
+
console.log(`Attestations not available for message nonce ${message.nonce} on ${message.txHash}`);
|
|
184
|
+
return;
|
|
185
|
+
}
|
|
186
|
+
console.log(`Ready to submit attestations for message ${message.nonce}`);
|
|
187
|
+
const tx = yield transmitter.receiveMessage(message.message, attestations.attestation);
|
|
188
|
+
console.log(`Submitted attestations in ${this.multiProvider.tryGetExplorerTxUrl(message.remoteChain, tx)}`);
|
|
189
|
+
yield this.multiProvider.handleTx(message.remoteChain, tx);
|
|
190
|
+
});
|
|
169
191
|
}
|
|
170
192
|
}
|
|
171
193
|
exports.LiquidityLayerApp = LiquidityLayerApp;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LiquidityLayerApp.js","sourceRoot":"","sources":["../../../src/middleware/liquidity-layer/LiquidityLayerApp.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"LiquidityLayerApp.js","sourceRoot":"","sources":["../../../src/middleware/liquidity-layer/LiquidityLayerApp.ts"],"names":[],"mappings":"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"}
|