@hyperlane-xyz/sdk 1.1.4 → 1.2.1
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 +7 -8
- package/dist/HyperlaneApp.d.ts.map +1 -1
- package/dist/HyperlaneApp.js +1 -4
- package/dist/HyperlaneApp.js.map +1 -1
- package/dist/consts/chainMetadata.d.ts +229 -25
- package/dist/consts/chainMetadata.d.ts.map +1 -1
- package/dist/consts/chainMetadata.js +132 -78
- package/dist/consts/chainMetadata.js.map +1 -1
- package/dist/consts/chainMetadata.test.d.ts +2 -0
- package/dist/consts/chainMetadata.test.d.ts.map +1 -0
- package/dist/consts/chainMetadata.test.js +40 -0
- package/dist/consts/chainMetadata.test.js.map +1 -0
- package/dist/consts/chains.d.ts +5 -5
- package/dist/consts/chains.d.ts.map +1 -1
- package/dist/consts/chains.js +5 -1
- package/dist/consts/chains.js.map +1 -1
- package/dist/consts/environments/index.d.ts +22 -2
- package/dist/consts/environments/index.d.ts.map +1 -1
- package/dist/consts/environments/mainnet.json +18 -9
- package/dist/consts/environments/test.json +25 -22
- package/dist/consts/environments/testnet.json +16 -8
- package/dist/core/HyperlaneCore.d.ts +10 -387
- package/dist/core/HyperlaneCore.d.ts.map +1 -1
- package/dist/core/HyperlaneCore.js +7 -12
- package/dist/core/HyperlaneCore.js.map +1 -1
- package/dist/core/HyperlaneCore.test.js +2 -3
- package/dist/core/HyperlaneCore.test.js.map +1 -1
- package/dist/core/TestCoreApp.d.ts +5 -5
- package/dist/core/TestCoreApp.d.ts.map +1 -1
- package/dist/core/TestCoreApp.js +2 -4
- package/dist/core/TestCoreApp.js.map +1 -1
- package/dist/core/TestCoreDeployer.d.ts +6 -6
- package/dist/core/TestCoreDeployer.d.ts.map +1 -1
- package/dist/core/TestCoreDeployer.js +15 -6
- package/dist/core/TestCoreDeployer.js.map +1 -1
- package/dist/core/contracts.d.ts +6 -2
- package/dist/core/contracts.d.ts.map +1 -1
- package/dist/core/contracts.js +1 -0
- package/dist/core/contracts.js.map +1 -1
- package/dist/core/testHyperlaneDeploy.hardhat-test.js +8 -12
- package/dist/core/testHyperlaneDeploy.hardhat-test.js.map +1 -1
- package/dist/deploy/HyperlaneAppChecker.d.ts +8 -8
- package/dist/deploy/HyperlaneAppChecker.d.ts.map +1 -1
- package/dist/deploy/HyperlaneAppChecker.js +5 -5
- package/dist/deploy/HyperlaneAppChecker.js.map +1 -1
- package/dist/deploy/HyperlaneDeployer.d.ts +15 -15
- package/dist/deploy/HyperlaneDeployer.d.ts.map +1 -1
- package/dist/deploy/HyperlaneDeployer.js +44 -39
- package/dist/deploy/HyperlaneDeployer.js.map +1 -1
- package/dist/deploy/core/HyperlaneCoreChecker.d.ts +12 -9
- package/dist/deploy/core/HyperlaneCoreChecker.d.ts.map +1 -1
- package/dist/deploy/core/HyperlaneCoreChecker.js +72 -12
- package/dist/deploy/core/HyperlaneCoreChecker.js.map +1 -1
- package/dist/deploy/core/HyperlaneCoreDeployer.d.ts +18 -14
- package/dist/deploy/core/HyperlaneCoreDeployer.d.ts.map +1 -1
- package/dist/deploy/core/HyperlaneCoreDeployer.js +69 -27
- package/dist/deploy/core/HyperlaneCoreDeployer.js.map +1 -1
- package/dist/deploy/core/types.d.ts +31 -3
- package/dist/deploy/core/types.d.ts.map +1 -1
- package/dist/deploy/core/types.js +11 -1
- package/dist/deploy/core/types.js.map +1 -1
- package/dist/deploy/middleware/LiquidityLayerApp.d.ts +17 -17
- package/dist/deploy/middleware/LiquidityLayerApp.d.ts.map +1 -1
- package/dist/deploy/middleware/LiquidityLayerApp.js +26 -35
- package/dist/deploy/middleware/LiquidityLayerApp.js.map +1 -1
- package/dist/deploy/middleware/LiquidityLayerRouterDeployer.d.ts +6 -9
- package/dist/deploy/middleware/LiquidityLayerRouterDeployer.d.ts.map +1 -1
- package/dist/deploy/middleware/LiquidityLayerRouterDeployer.js +15 -21
- package/dist/deploy/middleware/LiquidityLayerRouterDeployer.js.map +1 -1
- package/dist/deploy/middleware/deploy.d.ts +14 -17
- package/dist/deploy/middleware/deploy.d.ts.map +1 -1
- package/dist/deploy/middleware/deploy.js +25 -38
- package/dist/deploy/middleware/deploy.js.map +1 -1
- package/dist/deploy/router/GasRouterDeployer.d.ts +4 -4
- package/dist/deploy/router/GasRouterDeployer.d.ts.map +1 -1
- package/dist/deploy/router/GasRouterDeployer.js +3 -6
- package/dist/deploy/router/GasRouterDeployer.js.map +1 -1
- package/dist/deploy/router/HyperlaneRouterChecker.d.ts +6 -6
- package/dist/deploy/router/HyperlaneRouterChecker.d.ts.map +1 -1
- package/dist/deploy/router/HyperlaneRouterChecker.js +2 -2
- package/dist/deploy/router/HyperlaneRouterChecker.js.map +1 -1
- package/dist/deploy/router/HyperlaneRouterDeployer.d.ts +7 -7
- package/dist/deploy/router/HyperlaneRouterDeployer.d.ts.map +1 -1
- package/dist/deploy/router/HyperlaneRouterDeployer.js +18 -21
- package/dist/deploy/router/HyperlaneRouterDeployer.js.map +1 -1
- package/dist/deploy/types.d.ts +3 -4
- package/dist/deploy/types.d.ts.map +1 -1
- package/dist/deploy/types.js.map +1 -1
- package/dist/deploy/utils.d.ts +2 -6
- package/dist/deploy/utils.d.ts.map +1 -1
- package/dist/deploy/utils.js +1 -27
- package/dist/deploy/utils.js.map +1 -1
- package/dist/deploy/verify/ContractVerifier.d.ts +7 -7
- package/dist/deploy/verify/ContractVerifier.d.ts.map +1 -1
- package/dist/deploy/verify/ContractVerifier.js +3 -5
- package/dist/deploy/verify/ContractVerifier.js.map +1 -1
- package/dist/deploy/verify/utils.js +1 -1
- package/dist/deploy/verify/utils.js.map +1 -1
- package/dist/events.d.ts +4 -4
- package/dist/events.d.ts.map +1 -1
- package/dist/events.js +12 -9
- package/dist/events.js.map +1 -1
- package/dist/gas/calculator.d.ts +20 -20
- package/dist/gas/calculator.d.ts.map +1 -1
- package/dist/gas/calculator.hardhat-test.js +11 -8
- package/dist/gas/calculator.hardhat-test.js.map +1 -1
- package/dist/gas/calculator.js +9 -11
- package/dist/gas/calculator.js.map +1 -1
- package/dist/gas/calculator.test.js +2 -14
- package/dist/gas/calculator.test.js.map +1 -1
- package/dist/gas/token-prices.d.ts +5 -2
- package/dist/gas/token-prices.d.ts.map +1 -1
- package/dist/gas/token-prices.js +12 -2
- package/dist/gas/token-prices.js.map +1 -1
- package/dist/index.d.ts +28 -31
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +63 -71
- package/dist/index.js.map +1 -1
- package/dist/middleware/accounts.hardhat-test.js +19 -13
- package/dist/middleware/accounts.hardhat-test.js.map +1 -1
- package/dist/middleware/liquidity-layer.hardhat-test.js +11 -10
- package/dist/middleware/liquidity-layer.hardhat-test.js.map +1 -1
- package/dist/middleware/queries.hardhat-test.js +11 -10
- package/dist/middleware/queries.hardhat-test.js.map +1 -1
- package/dist/middleware.d.ts +4 -4
- package/dist/middleware.d.ts.map +1 -1
- package/dist/middleware.js.map +1 -1
- package/dist/providers/MultiProvider.d.ts +204 -37
- package/dist/providers/MultiProvider.d.ts.map +1 -1
- package/dist/providers/MultiProvider.js +455 -63
- package/dist/providers/MultiProvider.js.map +1 -1
- package/dist/proxy.d.ts.map +1 -1
- package/dist/proxy.js +3 -1
- package/dist/proxy.js.map +1 -1
- package/dist/router.d.ts +11 -6
- package/dist/router.d.ts.map +1 -1
- package/dist/router.js +1 -2
- package/dist/router.js.map +1 -1
- package/dist/test/envSubsetDeployer/app.d.ts +12 -21
- package/dist/test/envSubsetDeployer/app.d.ts.map +1 -1
- package/dist/test/envSubsetDeployer/app.js +13 -18
- package/dist/test/envSubsetDeployer/app.js.map +1 -1
- package/dist/test/envSubsetDeployer/check-single-chain.js +1 -11
- package/dist/test/envSubsetDeployer/check-single-chain.js.map +1 -1
- package/dist/test/envSubsetDeployer/deploy-single-chain.js +3 -9
- package/dist/test/envSubsetDeployer/deploy-single-chain.js.map +1 -1
- package/dist/test/envSubsetDeployer/deploy.hardhat-test.js +4 -3
- package/dist/test/envSubsetDeployer/deploy.hardhat-test.js.map +1 -1
- package/dist/test/envSubsetDeployer/utils.d.ts +0 -3
- package/dist/test/envSubsetDeployer/utils.d.ts.map +1 -1
- package/dist/test/envSubsetDeployer/utils.js +2 -10
- package/dist/test/envSubsetDeployer/utils.js.map +1 -1
- package/dist/test/testUtils.d.ts +5 -1
- package/dist/test/testUtils.d.ts.map +1 -1
- package/dist/test/testUtils.js +8 -1
- package/dist/test/testUtils.js.map +1 -1
- package/dist/types.d.ts +2 -17
- package/dist/types.d.ts.map +1 -1
- package/dist/utils/MultiGeneric.d.ts +11 -12
- package/dist/utils/MultiGeneric.d.ts.map +1 -1
- package/dist/utils/MultiGeneric.js +3 -6
- package/dist/utils/MultiGeneric.js.map +1 -1
- package/dist/utils/wagmi.d.ts +1 -1
- package/dist/utils/wagmi.d.ts.map +1 -1
- package/dist/utils/wagmi.js +7 -6
- package/dist/utils/wagmi.js.map +1 -1
- package/package.json +5 -5
- package/dist/consts/chainConnectionConfigs.d.ts +0 -21
- package/dist/consts/chainConnectionConfigs.d.ts.map +0 -1
- package/dist/consts/chainConnectionConfigs.js +0 -35
- package/dist/consts/chainConnectionConfigs.js.map +0 -1
- package/dist/core/message.d.ts +0 -146
- package/dist/core/message.d.ts.map +0 -1
- package/dist/core/message.js +0 -285
- package/dist/core/message.js.map +0 -1
- package/dist/domains.d.ts +0 -4
- package/dist/domains.d.ts.map +0 -1
- package/dist/domains.js +0 -12
- package/dist/domains.js.map +0 -1
- package/dist/providers/ChainConnection.d.ts +0 -23
- package/dist/providers/ChainConnection.d.ts.map +0 -1
- package/dist/providers/ChainConnection.js +0 -67
- package/dist/providers/ChainConnection.js.map +0 -1
|
@@ -11,7 +11,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.GasRouterDeployer = void 0;
|
|
13
13
|
const debug_1 = require("debug");
|
|
14
|
-
const domains_1 = require("../../domains");
|
|
15
14
|
const HyperlaneRouterDeployer_1 = require("./HyperlaneRouterDeployer");
|
|
16
15
|
class GasRouterDeployer extends HyperlaneRouterDeployer_1.HyperlaneRouterDeployer {
|
|
17
16
|
constructor(multiProvider, configMap, factories, options) {
|
|
@@ -25,9 +24,8 @@ class GasRouterDeployer extends HyperlaneRouterDeployer_1.HyperlaneRouterDeploye
|
|
|
25
24
|
yield _super.enrollRemoteRouters.call(this, contractsMap);
|
|
26
25
|
this.logger(`Setting enrolled router destination gas...`);
|
|
27
26
|
for (const [chain, contracts] of Object.entries(contractsMap)) {
|
|
28
|
-
const local = chain;
|
|
29
27
|
const remoteDomains = yield contracts.router.domains();
|
|
30
|
-
const remoteChains = remoteDomains.map((domain) =>
|
|
28
|
+
const remoteChains = remoteDomains.map((domain) => this.multiProvider.getChainName(domain));
|
|
31
29
|
const currentConfigs = yield Promise.all(remoteDomains.map((domain) => contracts.router.destinationGas(domain)));
|
|
32
30
|
const remoteConfigs = remoteDomains
|
|
33
31
|
.map((domain, i) => ({
|
|
@@ -38,9 +36,8 @@ class GasRouterDeployer extends HyperlaneRouterDeployer_1.HyperlaneRouterDeploye
|
|
|
38
36
|
if (remoteConfigs.length == 0) {
|
|
39
37
|
continue;
|
|
40
38
|
}
|
|
41
|
-
this.logger(`Set destination gas on ${
|
|
42
|
-
|
|
43
|
-
yield chainConnection.handleTx(contracts.router.setDestinationGas(remoteConfigs));
|
|
39
|
+
this.logger(`Set destination gas on ${chain} for ${remoteChains}`);
|
|
40
|
+
yield this.multiProvider.handleTx(chain, contracts.router.setDestinationGas(remoteConfigs));
|
|
44
41
|
}
|
|
45
42
|
});
|
|
46
43
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GasRouterDeployer.js","sourceRoot":"","sources":["../../../src/deploy/router/GasRouterDeployer.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iCAA8B;
|
|
1
|
+
{"version":3,"file":"GasRouterDeployer.js","sourceRoot":"","sources":["../../../src/deploy/router/GasRouterDeployer.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iCAA8B;AAS9B,uEAAoE;AAGpE,MAAsB,iBAIpB,SAAQ,iDAAqD;IAC7D,YACE,aAA4B,EAC5B,SAA2B,EAC3B,SAAoB,EACpB,OAAyB;QAEzB,KAAK,CAAC,aAAa,EAAE,SAAS,EAAE,SAAS,kBACvC,MAAM,EAAE,IAAA,aAAK,EAAC,6BAA6B,CAAC,IACzC,OAAO,EACV,CAAC;IACL,CAAC;IAEK,mBAAmB,CAAC,YAAiC;;;;;YACzD,MAAM,OAAM,mBAAmB,YAAC,YAAY,CAAC,CAAC;YAE9C,IAAI,CAAC,MAAM,CAAC,4CAA4C,CAAC,CAAC;YAC1D,KAAK,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,CAAY,YAAY,CAAC,EAAE;gBACxE,MAAM,aAAa,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;gBACvD,MAAM,YAAY,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAChD,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,MAAM,CAAC,CACxC,CAAC;gBACF,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,GAAG,CACtC,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CACvE,CAAC;gBACF,MAAM,aAAa,GAAG,aAAa;qBAChC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;oBACnB,MAAM;oBACN,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG;iBACzC,CAAC,CAAC;qBACF,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;gBAC9D,IAAI,aAAa,CAAC,MAAM,IAAI,CAAC,EAAE;oBAC7B,SAAS;iBACV;gBAED,IAAI,CAAC,MAAM,CAAC,0BAA0B,KAAK,QAAQ,YAAY,EAAE,CAAC,CAAC;gBACnE,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,CAC/B,KAAK,EACL,SAAS,CAAC,MAAM,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAClD,CAAC;aACH;QACH,CAAC;KAAA;CACF;AA9CD,8CA8CC"}
|
|
@@ -4,11 +4,11 @@ import { RouterContracts } from '../../router';
|
|
|
4
4
|
import { ChainName } from '../../types';
|
|
5
5
|
import { HyperlaneAppChecker } from '../HyperlaneAppChecker';
|
|
6
6
|
import { RouterConfig } from './types';
|
|
7
|
-
export declare class HyperlaneRouterChecker<
|
|
8
|
-
checkOwnership(chain:
|
|
9
|
-
checkChain(chain:
|
|
10
|
-
checkHyperlaneConnectionClient(chain:
|
|
11
|
-
checkEnrolledRouters(chain:
|
|
12
|
-
ownables(chain:
|
|
7
|
+
export declare class HyperlaneRouterChecker<App extends HyperlaneApp<Contracts>, Config extends RouterConfig, Contracts extends RouterContracts> extends HyperlaneAppChecker<App, Config> {
|
|
8
|
+
checkOwnership(chain: ChainName): Promise<void>;
|
|
9
|
+
checkChain(chain: ChainName): Promise<void>;
|
|
10
|
+
checkHyperlaneConnectionClient(chain: ChainName): Promise<void>;
|
|
11
|
+
checkEnrolledRouters(chain: ChainName): Promise<void>;
|
|
12
|
+
ownables(chain: ChainName): Ownable[];
|
|
13
13
|
}
|
|
14
14
|
//# sourceMappingURL=HyperlaneRouterChecker.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HyperlaneRouterChecker.d.ts","sourceRoot":"","sources":["../../../src/deploy/router/HyperlaneRouterChecker.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAG9C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAE7D,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,qBAAa,sBAAsB,CACjC,
|
|
1
|
+
{"version":3,"file":"HyperlaneRouterChecker.d.ts","sourceRoot":"","sources":["../../../src/deploy/router/HyperlaneRouterChecker.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAG9C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAE7D,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,qBAAa,sBAAsB,CACjC,GAAG,SAAS,YAAY,CAAC,SAAS,CAAC,EACnC,MAAM,SAAS,YAAY,EAC3B,SAAS,SAAS,eAAe,CACjC,SAAQ,mBAAmB,CAAC,GAAG,EAAE,MAAM,CAAC;IACxC,cAAc,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAMzC,UAAU,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAM3C,8BAA8B,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAoB/D,oBAAoB,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAa3D,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,EAAE;CAGtC"}
|
|
@@ -44,8 +44,8 @@ class HyperlaneRouterChecker extends HyperlaneAppChecker_1.HyperlaneAppChecker {
|
|
|
44
44
|
const router = this.app.getContracts(chain).router;
|
|
45
45
|
yield Promise.all(this.app.remoteChains(chain).map((remoteChain) => __awaiter(this, void 0, void 0, function* () {
|
|
46
46
|
const remoteRouter = this.app.getContracts(remoteChain).router;
|
|
47
|
-
const
|
|
48
|
-
const address = yield router.routers(
|
|
47
|
+
const remoteDomainId = this.multiProvider.getDomainId(remoteChain);
|
|
48
|
+
const address = yield router.routers(remoteDomainId);
|
|
49
49
|
utils_1.utils.assert(address === utils_1.utils.addressToBytes32(remoteRouter.address));
|
|
50
50
|
})));
|
|
51
51
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HyperlaneRouterChecker.js","sourceRoot":"","sources":["../../../src/deploy/router/HyperlaneRouterChecker.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAgC;AAGhC,gDAA6C;AAK7C,gEAA6D;AAI7D,MAAa,
|
|
1
|
+
{"version":3,"file":"HyperlaneRouterChecker.js","sourceRoot":"","sources":["../../../src/deploy/router/HyperlaneRouterChecker.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAgC;AAGhC,gDAA6C;AAK7C,gEAA6D;AAI7D,MAAa,sBAIX,SAAQ,yCAAgC;IACxC,cAAc,CAAC,KAAgB;QAC7B,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC;QAC1C,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACtC,OAAO,KAAK,CAAC,cAAc,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;IACtD,CAAC;IAEK,UAAU,CAAC,KAAgB;;YAC/B,MAAM,IAAI,CAAC,8BAA8B,CAAC,KAAK,CAAC,CAAC;YACjD,MAAM,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;YACvC,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QACnC,CAAC;KAAA;IAEK,8BAA8B,CAAC,KAAgB;;YACnD,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC;YACnD,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;YACvC,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,sBAAsB,EAAE,CAAC;YAClD,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,wBAAwB,EAAE,CAAC;YACpD,aAAK,CAAC,MAAM,CACV,aAAK,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,EACvD,kBAAkB,CACnB,CAAC;YACF,aAAK,CAAC,MAAM,CACV,aAAK,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,sBAAsB,CAAC,EAClE,cAAc,CACf,CAAC;YACF,aAAK,CAAC,MAAM,CACV,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,wBAAwB;gBAC5C,CAAC,CAAC,aAAK,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,wBAAyB,CAAC;gBACvE,CAAC,CAAC,aAAK,CAAC,SAAS,CAAC,GAAG,EAAE,eAAM,CAAC,SAAS,CAAC,WAAW,CAAC,CACvD,CAAC;QACJ,CAAC;KAAA;IAEK,oBAAoB,CAAC,KAAgB;;YACzC,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC;YAEnD,MAAM,OAAO,CAAC,GAAG,CACf,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAO,WAAW,EAAE,EAAE;gBACrD,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC;gBAC/D,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;gBACnE,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;gBACrD,aAAK,CAAC,MAAM,CAAC,OAAO,KAAK,aAAK,CAAC,gBAAgB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;YACzE,CAAC,CAAA,CAAC,CACH,CAAC;QACJ,CAAC;KAAA;IAED,QAAQ,CAAC,KAAgB;QACvB,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC;IAC/C,CAAC;CACF;AArDD,wDAqDC"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { MultiProvider } from '../../providers/MultiProvider';
|
|
2
2
|
import { RouterContracts, RouterFactories } from '../../router';
|
|
3
|
-
import { ChainMap
|
|
3
|
+
import { ChainMap } from '../../types';
|
|
4
4
|
import { DeployerOptions, HyperlaneDeployer } from '../HyperlaneDeployer';
|
|
5
5
|
import { RouterConfig } from './types';
|
|
6
|
-
export declare abstract class HyperlaneRouterDeployer<
|
|
7
|
-
constructor(multiProvider: MultiProvider
|
|
8
|
-
initConnectionClient(contractsMap: ChainMap<
|
|
9
|
-
enrollRemoteRouters(contractsMap: ChainMap<
|
|
10
|
-
transferOwnership(contractsMap: ChainMap<
|
|
11
|
-
deploy(partialDeployment?:
|
|
6
|
+
export declare abstract class HyperlaneRouterDeployer<Config extends RouterConfig, Contracts extends RouterContracts, Factories extends RouterFactories> extends HyperlaneDeployer<Config, Contracts, Factories> {
|
|
7
|
+
constructor(multiProvider: MultiProvider, configMap: ChainMap<Config>, factories: Factories, options?: DeployerOptions);
|
|
8
|
+
initConnectionClient(contractsMap: ChainMap<Contracts>): Promise<void>;
|
|
9
|
+
enrollRemoteRouters(contractsMap: ChainMap<RouterContracts>): Promise<void>;
|
|
10
|
+
transferOwnership(contractsMap: ChainMap<Contracts>): Promise<void>;
|
|
11
|
+
deploy(partialDeployment?: ChainMap<Contracts>): Promise<ChainMap<Contracts>>;
|
|
12
12
|
}
|
|
13
13
|
//# sourceMappingURL=HyperlaneRouterDeployer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HyperlaneRouterDeployer.d.ts","sourceRoot":"","sources":["../../../src/deploy/router/HyperlaneRouterDeployer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"HyperlaneRouterDeployer.d.ts","sourceRoot":"","sources":["../../../src/deploy/router/HyperlaneRouterDeployer.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAE1E,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,8BAAsB,uBAAuB,CAC3C,MAAM,SAAS,YAAY,EAC3B,SAAS,SAAS,eAAe,EACjC,SAAS,SAAS,eAAe,CACjC,SAAQ,iBAAiB,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,CAAC;gBAErD,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,EAC3B,SAAS,EAAE,SAAS,EACpB,OAAO,CAAC,EAAE,eAAe;IAQrB,oBAAoB,CAAC,YAAY,EAAE,QAAQ,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAuCtE,mBAAmB,CACvB,YAAY,EAAE,QAAQ,CAAC,eAAe,CAAC,GACtC,OAAO,CAAC,IAAI,CAAC;IAoDV,iBAAiB,CAAC,YAAY,EAAE,QAAQ,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBnE,MAAM,CACV,iBAAiB,CAAC,EAAE,QAAQ,CAAC,SAAS,CAAC,GACtC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;CAShC"}
|
|
@@ -11,9 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.HyperlaneRouterDeployer = void 0;
|
|
13
13
|
const debug_1 = require("debug");
|
|
14
|
-
const ethers_1 = require("ethers");
|
|
15
14
|
const utils_1 = require("@hyperlane-xyz/utils");
|
|
16
|
-
const domains_1 = require("../../domains");
|
|
17
15
|
const objects_1 = require("../../utils/objects");
|
|
18
16
|
const HyperlaneDeployer_1 = require("../HyperlaneDeployer");
|
|
19
17
|
class HyperlaneRouterDeployer extends HyperlaneDeployer_1.HyperlaneDeployer {
|
|
@@ -24,21 +22,23 @@ class HyperlaneRouterDeployer extends HyperlaneDeployer_1.HyperlaneDeployer {
|
|
|
24
22
|
return __awaiter(this, void 0, void 0, function* () {
|
|
25
23
|
this.logger(`Initializing connection clients (if not already)...`);
|
|
26
24
|
yield (0, objects_1.promiseObjAll)((0, objects_1.objMap)(contractsMap, (local, contracts) => __awaiter(this, void 0, void 0, function* () {
|
|
27
|
-
const chainConnection = this.multiProvider.getChainConnection(local);
|
|
28
25
|
// set mailbox if not already set (and configured)
|
|
29
26
|
const mailbox = this.configMap[local].mailbox;
|
|
30
|
-
if (mailbox
|
|
31
|
-
(yield contracts.router.mailbox()) === ethers_1.ethers.constants.AddressZero) {
|
|
27
|
+
if (mailbox !== (yield contracts.router.mailbox())) {
|
|
32
28
|
this.logger(`Set mailbox on ${local}`);
|
|
33
|
-
yield
|
|
29
|
+
yield this.multiProvider.handleTx(local, contracts.router.setMailbox(mailbox));
|
|
34
30
|
}
|
|
35
31
|
// set interchain gas paymaster if not already set (and configured)
|
|
36
|
-
const
|
|
37
|
-
if (interchainGasPaymaster
|
|
38
|
-
(yield contracts.router.interchainGasPaymaster()) ===
|
|
39
|
-
ethers_1.ethers.constants.AddressZero) {
|
|
32
|
+
const igp = this.configMap[local].interchainGasPaymaster;
|
|
33
|
+
if (igp !== (yield contracts.router.interchainGasPaymaster())) {
|
|
40
34
|
this.logger(`Set interchain gas paymaster on ${local}`);
|
|
41
|
-
yield
|
|
35
|
+
yield this.multiProvider.handleTx(local, contracts.router.setInterchainGasPaymaster(igp));
|
|
36
|
+
}
|
|
37
|
+
const ism = this.configMap[local].interchainSecurityModule;
|
|
38
|
+
if (ism &&
|
|
39
|
+
ism !== (yield contracts.router.interchainSecurityModule())) {
|
|
40
|
+
this.logger(`Set interchain security module on ${local}`);
|
|
41
|
+
yield this.multiProvider.handleTx(local, contracts.router.setInterchainSecurityModule(ism));
|
|
42
42
|
}
|
|
43
43
|
})));
|
|
44
44
|
});
|
|
@@ -52,14 +52,12 @@ class HyperlaneRouterDeployer extends HyperlaneDeployer_1.HyperlaneDeployer {
|
|
|
52
52
|
// Make all routers aware of each other.
|
|
53
53
|
const deployedChains = Object.keys(contractsMap);
|
|
54
54
|
for (const [chain, contracts] of Object.entries(contractsMap)) {
|
|
55
|
-
const local = chain;
|
|
56
|
-
const chainConnection = this.multiProvider.getChainConnection(local);
|
|
57
55
|
// only enroll chains which are deployed
|
|
58
56
|
const deployedRemoteChains = this.multiProvider
|
|
59
|
-
.
|
|
57
|
+
.getRemoteChains(chain)
|
|
60
58
|
.filter((c) => deployedChains.includes(c));
|
|
61
59
|
const enrollEntries = yield Promise.all(deployedRemoteChains.map((remote) => __awaiter(this, void 0, void 0, function* () {
|
|
62
|
-
const remoteDomain = this.multiProvider.
|
|
60
|
+
const remoteDomain = this.multiProvider.getDomainId(remote);
|
|
63
61
|
const current = yield contracts.router.routers(remoteDomain);
|
|
64
62
|
const expected = utils_1.utils.addressToBytes32(contractsMap[remote].router.address);
|
|
65
63
|
return current !== expected ? [remoteDomain, expected] : undefined;
|
|
@@ -71,10 +69,10 @@ class HyperlaneRouterDeployer extends HyperlaneDeployer_1.HyperlaneDeployer {
|
|
|
71
69
|
if (domains.length === 0) {
|
|
72
70
|
return;
|
|
73
71
|
}
|
|
74
|
-
yield _super.runIfOwner.call(this,
|
|
75
|
-
const chains = domains.map((id) =>
|
|
76
|
-
this.logger(`Enrolling remote routers (${chains.join(', ')}) on ${
|
|
77
|
-
yield
|
|
72
|
+
yield _super.runIfOwner.call(this, chain, contracts.router, () => __awaiter(this, void 0, void 0, function* () {
|
|
73
|
+
const chains = domains.map((id) => this.multiProvider.getChainName(id));
|
|
74
|
+
this.logger(`Enrolling remote routers (${chains.join(', ')}) on ${chain}`);
|
|
75
|
+
yield this.multiProvider.handleTx(chain, contracts.router.enrollRemoteRouters(domains, addresses, this.multiProvider.getTransactionOverrides(chain)));
|
|
78
76
|
}));
|
|
79
77
|
}
|
|
80
78
|
});
|
|
@@ -86,13 +84,12 @@ class HyperlaneRouterDeployer extends HyperlaneDeployer_1.HyperlaneDeployer {
|
|
|
86
84
|
return __awaiter(this, void 0, void 0, function* () {
|
|
87
85
|
this.logger(`Transferring ownership of routers...`);
|
|
88
86
|
yield (0, objects_1.promiseObjAll)((0, objects_1.objMap)(contractsMap, (chain, contracts) => __awaiter(this, void 0, void 0, function* () {
|
|
89
|
-
const chainConnection = this.multiProvider.getChainConnection(chain);
|
|
90
87
|
const owner = this.configMap[chain].owner;
|
|
91
88
|
const currentOwner = yield contracts.router.owner();
|
|
92
89
|
if (owner != currentOwner) {
|
|
93
90
|
this.logger(`Transfer ownership of ${chain}'s router to ${owner}`);
|
|
94
91
|
yield _super.runIfOwner.call(this, chain, contracts.router, () => __awaiter(this, void 0, void 0, function* () {
|
|
95
|
-
yield
|
|
92
|
+
yield this.multiProvider.handleTx(chain, contracts.router.transferOwnership(owner, this.multiProvider.getTransactionOverrides(chain)));
|
|
96
93
|
}));
|
|
97
94
|
}
|
|
98
95
|
})));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HyperlaneRouterDeployer.js","sourceRoot":"","sources":["../../../src/deploy/router/HyperlaneRouterDeployer.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iCAA8B;
|
|
1
|
+
{"version":3,"file":"HyperlaneRouterDeployer.js","sourceRoot":"","sources":["../../../src/deploy/router/HyperlaneRouterDeployer.ts"],"names":[],"mappings":"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"}
|
package/dist/deploy/types.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Contract } from 'ethers';
|
|
2
|
-
import { Ownable } from '@hyperlane-xyz/core';
|
|
3
|
-
import type {
|
|
1
|
+
import type { Contract } from 'ethers';
|
|
2
|
+
import type { Ownable } from '@hyperlane-xyz/core';
|
|
3
|
+
import type { ChainName } from '../types';
|
|
4
4
|
export interface CheckerViolation {
|
|
5
5
|
chain: ChainName;
|
|
6
6
|
type: string;
|
|
@@ -8,7 +8,6 @@ export interface CheckerViolation {
|
|
|
8
8
|
actual: any;
|
|
9
9
|
contract?: Contract;
|
|
10
10
|
}
|
|
11
|
-
export declare type EnvironmentConfig<Chain extends ChainName> = ChainMap<Chain, IChainConnection>;
|
|
12
11
|
export declare enum ViolationType {
|
|
13
12
|
Owner = "Owner",
|
|
14
13
|
NotDeployed = "NotDeployed",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/deploy/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/deploy/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAEvC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAEnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE1C,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,SAAS,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,GAAG,CAAC;IACd,MAAM,EAAE,GAAG,CAAC;IACZ,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AAED,oBAAY,aAAa;IACvB,KAAK,UAAU;IACf,WAAW,gBAAgB;IAC3B,gBAAgB,qBAAqB;CACtC;AAED,MAAM,WAAW,cAAe,SAAQ,gBAAgB;IACtD,IAAI,EAAE,aAAa,CAAC,KAAK,CAAC;IAC1B,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,oBAAqB,SAAQ,gBAAgB;IAC5D,IAAI,EAAE,aAAa,CAAC,WAAW,CAAC;CACjC;AAED,MAAM,WAAW,yBAA0B,SAAQ,gBAAgB;IACjE,IAAI,EAAE,aAAa,CAAC,gBAAgB,CAAC;IACrC,IAAI,EAAE,MAAM,CAAC;CACd"}
|
package/dist/deploy/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/deploy/types.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/deploy/types.ts"],"names":[],"mappings":";;;AAcA,IAAY,aAIX;AAJD,WAAY,aAAa;IACvB,gCAAe,CAAA;IACf,4CAA2B,CAAA;IAC3B,sDAAqC,CAAA;AACvC,CAAC,EAJW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAIxB"}
|
package/dist/deploy/utils.d.ts
CHANGED
|
@@ -1,10 +1,6 @@
|
|
|
1
|
-
import { Signer, providers } from 'ethers';
|
|
2
1
|
import { types } from '@hyperlane-xyz/utils';
|
|
3
|
-
import {
|
|
4
|
-
|
|
5
|
-
import { EnvironmentConfig } from './types';
|
|
6
|
-
export declare function getTestMultiProvider<Chain extends TestChainNames>(signerOrProvider: Signer | providers.Provider, configs?: EnvironmentConfig<Chain>): MultiProvider<Chain>;
|
|
7
|
-
export declare function getChainToOwnerMap<Chain extends ChainName>(configMap: ChainMap<Chain, any>, owner: types.Address): ChainMap<Chain, {
|
|
2
|
+
import { ChainMap } from '../types';
|
|
3
|
+
export declare function getChainToOwnerMap(configMap: ChainMap<any>, owner: types.Address): ChainMap<{
|
|
8
4
|
owner: string;
|
|
9
5
|
}>;
|
|
10
6
|
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/deploy/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/deploy/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAE7C,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAGpC,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,QAAQ,CAAC,GAAG,CAAC,EACxB,KAAK,EAAE,KAAK,CAAC,OAAO,GACnB,QAAQ,CAAC;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAM7B"}
|
package/dist/deploy/utils.js
CHANGED
|
@@ -1,33 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getChainToOwnerMap =
|
|
4
|
-
const ethers_1 = require("ethers");
|
|
5
|
-
const chainConnectionConfigs_1 = require("../consts/chainConnectionConfigs");
|
|
6
|
-
const MultiProvider_1 = require("../providers/MultiProvider");
|
|
3
|
+
exports.getChainToOwnerMap = void 0;
|
|
7
4
|
const objects_1 = require("../utils/objects");
|
|
8
|
-
function getTestMultiProvider(signerOrProvider, configs = chainConnectionConfigs_1.testChainConnectionConfigs) {
|
|
9
|
-
let signer;
|
|
10
|
-
let provider;
|
|
11
|
-
if (ethers_1.Signer.isSigner(signerOrProvider) && signerOrProvider.provider) {
|
|
12
|
-
signer = signerOrProvider;
|
|
13
|
-
provider = signerOrProvider.provider;
|
|
14
|
-
}
|
|
15
|
-
else if (ethers_1.providers.Provider.isProvider(signerOrProvider)) {
|
|
16
|
-
provider = signerOrProvider;
|
|
17
|
-
}
|
|
18
|
-
else {
|
|
19
|
-
throw new Error('signerOrProvider is invalid');
|
|
20
|
-
}
|
|
21
|
-
const chainProviders = (0, objects_1.objMap)(configs, (_, config) => ({
|
|
22
|
-
signer,
|
|
23
|
-
provider,
|
|
24
|
-
id: config.id,
|
|
25
|
-
confirmations: config.confirmations,
|
|
26
|
-
overrides: config.overrides,
|
|
27
|
-
}));
|
|
28
|
-
return new MultiProvider_1.MultiProvider(chainProviders);
|
|
29
|
-
}
|
|
30
|
-
exports.getTestMultiProvider = getTestMultiProvider;
|
|
31
5
|
function getChainToOwnerMap(configMap, owner) {
|
|
32
6
|
return (0, objects_1.objMap)(configMap, () => {
|
|
33
7
|
return {
|
package/dist/deploy/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/deploy/utils.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/deploy/utils.ts"],"names":[],"mappings":";;;AAGA,8CAA0C;AAE1C,SAAgB,kBAAkB,CAChC,SAAwB,EACxB,KAAoB;IAEpB,OAAO,IAAA,gBAAM,EAAC,SAAS,EAAE,GAAG,EAAE;QAC5B,OAAO;YACL,KAAK;SACN,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AATD,gDASC"}
|
|
@@ -3,17 +3,17 @@ import { MultiProvider } from '../../providers/MultiProvider';
|
|
|
3
3
|
import { ChainMap, ChainName } from '../../types';
|
|
4
4
|
import { MultiGeneric } from '../../utils/MultiGeneric';
|
|
5
5
|
import { CompilerOptions, ContractVerificationInput, VerificationInput } from './types';
|
|
6
|
-
export declare class ContractVerifier
|
|
7
|
-
protected readonly multiProvider: MultiProvider
|
|
8
|
-
protected readonly apiKeys: ChainMap<
|
|
6
|
+
export declare class ContractVerifier extends MultiGeneric<VerificationInput> {
|
|
7
|
+
protected readonly multiProvider: MultiProvider;
|
|
8
|
+
protected readonly apiKeys: ChainMap<string>;
|
|
9
9
|
protected readonly flattenedSource: string;
|
|
10
10
|
protected readonly compilerOptions: CompilerOptions;
|
|
11
11
|
protected logger: Debugger;
|
|
12
|
-
constructor(verificationInputs: ChainMap<
|
|
12
|
+
constructor(verificationInputs: ChainMap<VerificationInput>, multiProvider: MultiProvider, apiKeys: ChainMap<string>, flattenedSource: string, // flattened source code from eg `hardhat flatten`
|
|
13
13
|
compilerOptions: CompilerOptions);
|
|
14
|
-
verify(targets?:
|
|
15
|
-
verifyChain(chain:
|
|
14
|
+
verify(targets?: string[]): Promise<PromiseSettledResult<void>[]>;
|
|
15
|
+
verifyChain(chain: ChainName, inputs: VerificationInput): Promise<void>;
|
|
16
16
|
private submitForm;
|
|
17
|
-
verifyContract(chain:
|
|
17
|
+
verifyContract(chain: ChainName, input: ContractVerificationInput): Promise<void>;
|
|
18
18
|
}
|
|
19
19
|
//# sourceMappingURL=ContractVerifier.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ContractVerifier.d.ts","sourceRoot":"","sources":["../../../src/deploy/verify/ContractVerifier.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAS,MAAM,OAAO,CAAC;AAKxC,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,EACL,eAAe,EACf,yBAAyB,EACzB,iBAAiB,EAClB,MAAM,SAAS,CAAC;AAgBjB,qBAAa,
|
|
1
|
+
{"version":3,"file":"ContractVerifier.d.ts","sourceRoot":"","sources":["../../../src/deploy/verify/ContractVerifier.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAS,MAAM,OAAO,CAAC;AAKxC,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,EACL,eAAe,EACf,yBAAyB,EACzB,iBAAiB,EAClB,MAAM,SAAS,CAAC;AAgBjB,qBAAa,gBAAiB,SAAQ,YAAY,CAAC,iBAAiB,CAAC;IAKjE,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa;IAC/C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC;IAC5C,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM;IAC1C,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe;IAPrD,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC;gBAGzB,kBAAkB,EAAE,QAAQ,CAAC,iBAAiB,CAAC,EAC5B,aAAa,EAAE,aAAa,EAC5B,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,EACzB,eAAe,EAAE,MAAM,EAAE,kDAAkD;IAC3E,eAAe,EAAE,eAAe;IAMrD,MAAM,CAAC,OAAO,WAAgB,GAAG,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,CAAC;IAMhE,WAAW,CACf,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,iBAAiB,GACxB,OAAO,CAAC,IAAI,CAAC;YAOF,UAAU;IAsDlB,cAAc,CAClB,KAAK,EAAE,SAAS,EAChB,KAAK,EAAE,yBAAyB,GAC/B,OAAO,CAAC,IAAI,CAAC;CAwEjB"}
|
|
@@ -55,9 +55,9 @@ class ContractVerifier extends MultiGeneric_1.MultiGeneric {
|
|
|
55
55
|
}
|
|
56
56
|
submitForm(chain, action, options) {
|
|
57
57
|
return __awaiter(this, void 0, void 0, function* () {
|
|
58
|
-
const
|
|
59
|
-
const apiUrl = chainConnection.getApiUrl();
|
|
58
|
+
const apiUrl = new URL(this.multiProvider.getExplorerApiUrl(chain));
|
|
60
59
|
const params = new URLSearchParams(Object.assign({ apikey: this.apiKeys[chain], module: 'contract', action }, options));
|
|
60
|
+
apiUrl.search = params.toString();
|
|
61
61
|
let response;
|
|
62
62
|
if (action === ExplorerApiActions.CHECK_STATUS ||
|
|
63
63
|
action === ExplorerApiActions.CHECK_PROXY_STATUS) {
|
|
@@ -107,9 +107,7 @@ class ContractVerifier extends MultiGeneric_1.MultiGeneric {
|
|
|
107
107
|
// TYPO IS ENFORCED BY API
|
|
108
108
|
constructorArguements: utils_1.utils.strip0x((_a = input.constructorArguments) !== null && _a !== void 0 ? _a : '') }, this.compilerOptions);
|
|
109
109
|
const guid = yield this.submitForm(chain, ExplorerApiActions.VERIFY_IMPLEMENTATION, data);
|
|
110
|
-
const addressUrl = yield this.multiProvider
|
|
111
|
-
.getChainConnection(chain)
|
|
112
|
-
.getAddressUrl(input.address);
|
|
110
|
+
const addressUrl = yield this.multiProvider.tryGetExplorerAddressUrl(chain, input.address);
|
|
113
111
|
// poll for verified status
|
|
114
112
|
if (guid) {
|
|
115
113
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ContractVerifier.js","sourceRoot":"","sources":["../../../src/deploy/verify/ContractVerifier.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8DAAgC;AAChC,iCAAwC;AACxC,mCAAgC;AAEhC,gDAA6C;AAI7C,2DAAwD;AAQxD,IAAK,kBAKJ;AALD,WAAK,kBAAkB;IACrB,gEAA0C,CAAA;IAC1C,wDAAkC,CAAA;IAClC,wDAAkC,CAAA;IAClC,mEAA6C,CAAA;AAC/C,CAAC,EALI,kBAAkB,KAAlB,kBAAkB,QAKtB;AAED,IAAK,iBAKJ;AALD,WAAK,iBAAiB;IACpB,+EAA0D,CAAA;IAC1D,8DAAyC,CAAA;IACzC,8DAAyC,CAAA;IACzC,mIAA8G,CAAA;AAChH,CAAC,EALI,iBAAiB,KAAjB,iBAAiB,QAKrB;AAED,MAAa,
|
|
1
|
+
{"version":3,"file":"ContractVerifier.js","sourceRoot":"","sources":["../../../src/deploy/verify/ContractVerifier.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ function getConstructorArguments(contract, bytecode) {
|
|
|
15
15
|
exports.getConstructorArguments = getConstructorArguments;
|
|
16
16
|
function getContractVerificationInput(name, contract, bytecode, isProxy = name.endsWith('Proxy')) {
|
|
17
17
|
return {
|
|
18
|
-
name,
|
|
18
|
+
name: name.charAt(0).toUpperCase() + name.slice(1),
|
|
19
19
|
address: contract.address,
|
|
20
20
|
constructorArguments: getConstructorArguments(contract, bytecode),
|
|
21
21
|
isProxy,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/deploy/verify/utils.ts"],"names":[],"mappings":";;;AAIA,SAAgB,uBAAuB,CACrC,QAAwB,EACxB,IAAW;IAEX,MAAM,MAAM,GAAG,MAAM,CAAC,WAAW,CAC/B,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CACjE,CAAC;IACF,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AACzC,CAAC;AARD,0DAQC;AAED,SAAgB,uBAAuB,CACrC,QAAyB,EACzB,QAAgB;IAEhB,MAAM,EAAE,GAAG,QAAQ,CAAC,iBAAiB,CAAC;IACtC,IAAI,EAAE,KAAK,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;IACtE,OAAO,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;AACvC,CAAC;AAPD,0DAOC;AAED,SAAgB,4BAA4B,CAC1C,IAAY,EACZ,QAAyB,EACzB,QAAgB,EAChB,UAAmB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;IAEzC,OAAO;QACL,IAAI;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/deploy/verify/utils.ts"],"names":[],"mappings":";;;AAIA,SAAgB,uBAAuB,CACrC,QAAwB,EACxB,IAAW;IAEX,MAAM,MAAM,GAAG,MAAM,CAAC,WAAW,CAC/B,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CACjE,CAAC;IACF,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AACzC,CAAC;AARD,0DAQC;AAED,SAAgB,uBAAuB,CACrC,QAAyB,EACzB,QAAgB;IAEhB,MAAM,EAAE,GAAG,QAAQ,CAAC,iBAAiB,CAAC;IACtC,IAAI,EAAE,KAAK,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;IACtE,OAAO,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;AACvC,CAAC;AAPD,0DAOC;AAED,SAAgB,4BAA4B,CAC1C,IAAY,EACZ,QAAyB,EACzB,QAAgB,EAChB,UAAmB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;IAEzC,OAAO;QACL,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QAClD,OAAO,EAAE,QAAQ,CAAC,OAAO;QACzB,oBAAoB,EAAE,uBAAuB,CAAC,QAAQ,EAAE,QAAQ,CAAC;QACjE,OAAO;KACR,CAAC;AACJ,CAAC;AAZD,oEAYC"}
|
package/dist/events.d.ts
CHANGED
|
@@ -18,8 +18,8 @@ export declare class Annotated<T extends TypedEvent> {
|
|
|
18
18
|
export interface TSContract<T extends TypedEvent> {
|
|
19
19
|
queryFilter(event: TypedEventFilter<T>, fromBlockOrBlockhash?: number | undefined, toBlock?: number | undefined): Promise<Array<T>>;
|
|
20
20
|
}
|
|
21
|
-
export declare function queryAnnotatedEvents<T extends TypedEvent>(multiprovider: MultiProvider
|
|
22
|
-
export declare function findAnnotatedSingleEvent<T extends TypedEvent>(multiprovider: MultiProvider
|
|
23
|
-
export declare function getEvents<T extends TypedEvent>(multiprovider: MultiProvider
|
|
24
|
-
export declare function findEvent<T extends TypedEvent>(multiprovider: MultiProvider
|
|
21
|
+
export declare function queryAnnotatedEvents<T extends TypedEvent>(multiprovider: MultiProvider, chain: ChainName, contract: TSContract<T>, filter: TypedEventFilter<T>, startBlock?: number, endBlock?: number): Promise<Array<Annotated<T>>>;
|
|
22
|
+
export declare function findAnnotatedSingleEvent<T extends TypedEvent>(multiprovider: MultiProvider, chain: ChainName, contract: TSContract<T>, filter: TypedEventFilter<T>, startBlock?: number): Promise<Array<Annotated<T>>>;
|
|
23
|
+
export declare function getEvents<T extends TypedEvent>(multiprovider: MultiProvider, chain: ChainName, contract: TSContract<T>, filter: TypedEventFilter<T>, startBlock?: number, endBlock?: number): Promise<Array<T>>;
|
|
24
|
+
export declare function findEvent<T extends TypedEvent>(multiprovider: MultiProvider, chain: ChainName, contract: TSContract<T>, filter: TypedEventFilter<T>, startBlock?: number): Promise<Array<T>>;
|
|
25
25
|
//# sourceMappingURL=events.d.ts.map
|
package/dist/events.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../src/events.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEnC,OAAO,KAAK,EACV,UAAU,EACV,gBAAgB,EACjB,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../src/events.ts"],"names":[],"mappings":"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"}
|
package/dist/events.js
CHANGED
|
@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.findEvent = exports.getEvents = exports.findAnnotatedSingleEvent = exports.queryAnnotatedEvents = exports.Annotated = void 0;
|
|
13
|
-
const chainMetadata_1 = require("./consts/chainMetadata");
|
|
14
13
|
class Annotated {
|
|
15
14
|
constructor(domain, receipt, event, callerKnowsWhatTheyAreDoing = false) {
|
|
16
15
|
var _a;
|
|
@@ -55,20 +54,21 @@ exports.Annotated = Annotated;
|
|
|
55
54
|
function queryAnnotatedEvents(multiprovider, chain, contract, filter, startBlock, endBlock) {
|
|
56
55
|
return __awaiter(this, void 0, void 0, function* () {
|
|
57
56
|
const events = yield getEvents(multiprovider, chain, contract, filter, startBlock, endBlock);
|
|
58
|
-
return Annotated.fromEvents(
|
|
57
|
+
return Annotated.fromEvents(multiprovider.getChainId(chain), events);
|
|
59
58
|
});
|
|
60
59
|
}
|
|
61
60
|
exports.queryAnnotatedEvents = queryAnnotatedEvents;
|
|
62
61
|
function findAnnotatedSingleEvent(multiprovider, chain, contract, filter, startBlock) {
|
|
63
62
|
return __awaiter(this, void 0, void 0, function* () {
|
|
64
63
|
const events = yield findEvent(multiprovider, chain, contract, filter, startBlock);
|
|
65
|
-
return Annotated.fromEvents(
|
|
64
|
+
return Annotated.fromEvents(multiprovider.getChainId(chain), events);
|
|
66
65
|
});
|
|
67
66
|
}
|
|
68
67
|
exports.findAnnotatedSingleEvent = findAnnotatedSingleEvent;
|
|
69
68
|
function getEvents(multiprovider, chain, contract, filter, startBlock, endBlock) {
|
|
70
69
|
return __awaiter(this, void 0, void 0, function* () {
|
|
71
|
-
const
|
|
70
|
+
const metadata = multiprovider.getChainMetadata(chain);
|
|
71
|
+
const mustPaginate = !!metadata.publicRpcUrls[0].pagination;
|
|
72
72
|
if (mustPaginate) {
|
|
73
73
|
return getPaginatedEvents(multiprovider, chain, contract, filter, startBlock, endBlock);
|
|
74
74
|
}
|
|
@@ -78,7 +78,8 @@ function getEvents(multiprovider, chain, contract, filter, startBlock, endBlock)
|
|
|
78
78
|
exports.getEvents = getEvents;
|
|
79
79
|
function findEvent(multiprovider, chain, contract, filter, startBlock) {
|
|
80
80
|
return __awaiter(this, void 0, void 0, function* () {
|
|
81
|
-
const
|
|
81
|
+
const metadata = multiprovider.getChainMetadata(chain);
|
|
82
|
+
const mustPaginate = !!metadata.publicRpcUrls[0].pagination;
|
|
82
83
|
if (mustPaginate) {
|
|
83
84
|
return findFromPaginatedEvents(multiprovider, chain, contract, filter, startBlock);
|
|
84
85
|
}
|
|
@@ -88,7 +89,8 @@ function findEvent(multiprovider, chain, contract, filter, startBlock) {
|
|
|
88
89
|
exports.findEvent = findEvent;
|
|
89
90
|
function getPaginatedEvents(multiprovider, chain, contract, filter, startBlock, endBlock) {
|
|
90
91
|
return __awaiter(this, void 0, void 0, function* () {
|
|
91
|
-
const
|
|
92
|
+
const metadata = multiprovider.getChainMetadata(chain);
|
|
93
|
+
const pagination = metadata.publicRpcUrls[0].pagination;
|
|
92
94
|
if (!pagination) {
|
|
93
95
|
throw new Error('Domain need not be paginated');
|
|
94
96
|
}
|
|
@@ -101,7 +103,7 @@ function getPaginatedEvents(multiprovider, chain, contract, filter, startBlock,
|
|
|
101
103
|
// or current block number
|
|
102
104
|
let lastBlock;
|
|
103
105
|
if (!endBlock) {
|
|
104
|
-
const provider = multiprovider.
|
|
106
|
+
const provider = multiprovider.getProvider(chain);
|
|
105
107
|
lastBlock = yield provider.getBlockNumber();
|
|
106
108
|
}
|
|
107
109
|
else {
|
|
@@ -126,7 +128,8 @@ function getPaginatedEvents(multiprovider, chain, contract, filter, startBlock,
|
|
|
126
128
|
}
|
|
127
129
|
function findFromPaginatedEvents(multiprovider, chain, contract, filter, startBlock, endBlock) {
|
|
128
130
|
return __awaiter(this, void 0, void 0, function* () {
|
|
129
|
-
const
|
|
131
|
+
const metadata = multiprovider.getChainMetadata(chain);
|
|
132
|
+
const pagination = metadata.publicRpcUrls[0].pagination;
|
|
130
133
|
if (!pagination) {
|
|
131
134
|
throw new Error('Domain need not be paginated');
|
|
132
135
|
}
|
|
@@ -139,7 +142,7 @@ function findFromPaginatedEvents(multiprovider, chain, contract, filter, startBl
|
|
|
139
142
|
// or current block number
|
|
140
143
|
let lastBlock;
|
|
141
144
|
if (!endBlock) {
|
|
142
|
-
const provider = multiprovider.
|
|
145
|
+
const provider = multiprovider.getProvider(chain);
|
|
143
146
|
lastBlock = yield provider.getBlockNumber();
|
|
144
147
|
}
|
|
145
148
|
else {
|
package/dist/events.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"events.js","sourceRoot":"","sources":["../src/events.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"events.js","sourceRoot":"","sources":["../src/events.ts"],"names":[],"mappings":"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"}
|