@hyperlane-xyz/sdk 41.0.0 → 41.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/block-explorer/etherscan.d.ts +16 -0
- package/dist/block-explorer/etherscan.d.ts.map +1 -1
- package/dist/block-explorer/etherscan.js +42 -30
- package/dist/block-explorer/etherscan.js.map +1 -1
- package/dist/core/types.d.ts +136 -0
- package/dist/core/types.d.ts.map +1 -1
- package/dist/deploy/proxy.d.ts +41 -4
- package/dist/deploy/proxy.d.ts.map +1 -1
- package/dist/deploy/proxy.js +38 -8
- package/dist/deploy/proxy.js.map +1 -1
- package/dist/deploy/warp.d.ts.map +1 -1
- package/dist/deploy/warp.js +18 -1
- package/dist/deploy/warp.js.map +1 -1
- package/dist/ica/types.d.ts +80 -0
- package/dist/ica/types.d.ts.map +1 -1
- package/dist/ism/EvmIsmModule.d.ts +2 -0
- package/dist/ism/EvmIsmModule.d.ts.map +1 -1
- package/dist/ism/EvmIsmModule.hardhat-test.js +162 -9
- package/dist/ism/EvmIsmModule.hardhat-test.js.map +1 -1
- package/dist/ism/EvmIsmModule.js +35 -8
- package/dist/ism/EvmIsmModule.js.map +1 -1
- package/dist/ism/EvmIsmModule.test.d.ts +2 -0
- package/dist/ism/EvmIsmModule.test.d.ts.map +1 -0
- package/dist/ism/EvmIsmModule.test.js +200 -0
- package/dist/ism/EvmIsmModule.test.js.map +1 -0
- package/dist/ism/EvmIsmReader.d.ts +12 -0
- package/dist/ism/EvmIsmReader.d.ts.map +1 -1
- package/dist/ism/EvmIsmReader.js +29 -12
- package/dist/ism/EvmIsmReader.js.map +1 -1
- package/dist/ism/EvmIsmReader.test.js +227 -8
- package/dist/ism/EvmIsmReader.test.js.map +1 -1
- package/dist/ism/HyperlaneIsmFactory.d.ts.map +1 -1
- package/dist/ism/HyperlaneIsmFactory.hardhat-test.js +166 -2
- package/dist/ism/HyperlaneIsmFactory.hardhat-test.js.map +1 -1
- package/dist/ism/HyperlaneIsmFactory.js +3 -2
- package/dist/ism/HyperlaneIsmFactory.js.map +1 -1
- package/dist/ism/blacklist.d.ts +62 -0
- package/dist/ism/blacklist.d.ts.map +1 -0
- package/dist/ism/blacklist.js +98 -0
- package/dist/ism/blacklist.js.map +1 -0
- package/dist/ism/types.test.js +20 -1
- package/dist/ism/types.test.js.map +1 -1
- package/dist/ism/utils.d.ts.map +1 -1
- package/dist/ism/utils.js +26 -8
- package/dist/ism/utils.js.map +1 -1
- package/dist/metadata/ChainMetadataManager.d.ts +6 -0
- package/dist/metadata/ChainMetadataManager.d.ts.map +1 -1
- package/dist/metadata/ChainMetadataManager.js +21 -16
- package/dist/metadata/ChainMetadataManager.js.map +1 -1
- package/dist/metadata/ChainMetadataManager.test.js +30 -0
- package/dist/metadata/ChainMetadataManager.test.js.map +1 -1
- package/dist/providers/SmartProvider/HyperlaneEtherscanProvider.d.ts.map +1 -1
- package/dist/providers/SmartProvider/HyperlaneEtherscanProvider.js +21 -6
- package/dist/providers/SmartProvider/HyperlaneEtherscanProvider.js.map +1 -1
- package/dist/providers/SmartProvider/SmartProvider.d.ts +4 -0
- package/dist/providers/SmartProvider/SmartProvider.d.ts.map +1 -1
- package/dist/providers/SmartProvider/SmartProvider.js +1 -1
- package/dist/providers/SmartProvider/SmartProvider.js.map +1 -1
- package/dist/providers/SmartProvider/SmartProvider.test.js +82 -0
- package/dist/providers/SmartProvider/SmartProvider.test.js.map +1 -1
- package/dist/router/ProxiedRouterDeployer.d.ts.map +1 -1
- package/dist/router/ProxiedRouterDeployer.js +9 -0
- package/dist/router/ProxiedRouterDeployer.js.map +1 -1
- package/dist/router/types.d.ts +80 -0
- package/dist/router/types.d.ts.map +1 -1
- package/dist/router/types.js +4 -1
- package/dist/router/types.js.map +1 -1
- package/dist/router/types.test.js +76 -0
- package/dist/router/types.test.js.map +1 -1
- package/dist/rpc/evm/EvmEventLogsReader.d.ts +14 -0
- package/dist/rpc/evm/EvmEventLogsReader.d.ts.map +1 -1
- package/dist/rpc/evm/EvmEventLogsReader.hardhat-test.js +209 -3
- package/dist/rpc/evm/EvmEventLogsReader.hardhat-test.js.map +1 -1
- package/dist/rpc/evm/EvmEventLogsReader.js +96 -11
- package/dist/rpc/evm/EvmEventLogsReader.js.map +1 -1
- package/dist/rpc/evm/utils.d.ts +7 -11
- package/dist/rpc/evm/utils.d.ts.map +1 -1
- package/dist/rpc/evm/utils.hardhat-test.js +34 -9
- package/dist/rpc/evm/utils.hardhat-test.js.map +1 -1
- package/dist/rpc/evm/utils.js +10 -20
- package/dist/rpc/evm/utils.js.map +1 -1
- package/dist/test/contractDouble.d.ts +8 -0
- package/dist/test/contractDouble.d.ts.map +1 -0
- package/dist/test/contractDouble.js +12 -0
- package/dist/test/contractDouble.js.map +1 -0
- package/dist/timelock/evm/constants.d.ts +1 -0
- package/dist/timelock/evm/constants.d.ts.map +1 -1
- package/dist/timelock/evm/constants.js +1 -0
- package/dist/timelock/evm/constants.js.map +1 -1
- package/dist/timelock/evm/errors.d.ts +2 -0
- package/dist/timelock/evm/errors.d.ts.map +1 -0
- package/dist/timelock/evm/errors.js +19 -0
- package/dist/timelock/evm/errors.js.map +1 -0
- package/dist/timelock/evm/errors.test.d.ts +2 -0
- package/dist/timelock/evm/errors.test.d.ts.map +1 -0
- package/dist/timelock/evm/errors.test.js +33 -0
- package/dist/timelock/evm/errors.test.js.map +1 -0
- package/dist/token/EvmWarpModule.d.ts +13 -0
- package/dist/token/EvmWarpModule.d.ts.map +1 -1
- package/dist/token/EvmWarpModule.hardhat-test.js +35 -0
- package/dist/token/EvmWarpModule.hardhat-test.js.map +1 -1
- package/dist/token/EvmWarpModule.js +99 -2
- package/dist/token/EvmWarpModule.js.map +1 -1
- package/dist/token/EvmWarpModule.test.js +232 -8
- package/dist/token/EvmWarpModule.test.js.map +1 -1
- package/dist/token/configUtils.d.ts.map +1 -1
- package/dist/token/configUtils.js +2 -0
- package/dist/token/configUtils.js.map +1 -1
- package/dist/token/deploy.d.ts +1 -0
- package/dist/token/deploy.d.ts.map +1 -1
- package/dist/token/deploy.js +8 -1
- package/dist/token/deploy.js.map +1 -1
- package/dist/token/types.d.ts +6146 -2899
- package/dist/token/types.d.ts.map +1 -1
- package/dist/token/types.js +20 -3
- package/dist/token/types.js.map +1 -1
- package/dist/token/types.test.js +21 -0
- package/dist/token/types.test.js.map +1 -1
- package/dist/token/warpCheck.d.ts.map +1 -1
- package/dist/token/warpCheck.js +88 -2
- package/dist/token/warpCheck.js.map +1 -1
- package/dist/token/warpCheck.test.js +101 -1
- package/dist/token/warpCheck.test.js.map +1 -1
- package/package.json +11 -11
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"warp.d.ts","sourceRoot":"","sources":["../../src/deploy/warp.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAElE,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAStE,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,EAOL,UAAU,IAAI,kBAAkB,EAEjC,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EACL,OAAO,
|
|
1
|
+
{"version":3,"file":"warp.d.ts","sourceRoot":"","sources":["../../src/deploy/warp.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAElE,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAStE,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,EAOL,UAAU,IAAI,kBAAkB,EAEjC,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EACL,OAAO,EAaR,MAAM,sBAAsB,CAAC;AAgB9B,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,yBAAyB,EAAE,MAAM,8BAA8B,CAAC;AAUzE,OAAO,EAEL,oCAAoC,EAErC,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AASvC,KAAK,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAgB7C;;;;;;;;;;;GAWG;AACH,wBAAgB,uCAAuC,CACrD,MAAM,EAAE,oCAAoC,CAAC,MAAM,CAAC,EACpD,WAAW,EAAE,WAAW,GACvB,cAAc,CAmChB;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,oCAAoC,CAAC,MAAM,CAAC,EACpD,KAAK,EAAE,MAAM,EACb,QAAQ,CAAC,EAAE,YAAY,GACtB,kBAAkB,CAuGpB;AA0CD,wBAAsB,iBAAiB,CACrC,gBAAgB,EAAE,oCAAoC,EACtD,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,EAC7D,iBAAiB,EAAE,QAAQ,CAAC,cAAc,CAAC,EAC3C,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,GACxB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAkO5B;AAmUD,wBAAsB,uBAAuB,CAC3C,EACE,aAAa,EACb,YAAY,EACZ,iBAAiB,EACjB,gBAAgB,GACjB,EAAE;IACD,aAAa,EAAE,aAAa,CAAC;IAC7B,YAAY,EAAE,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC;IAC9D,iBAAiB,EAAE,QAAQ,CAAC,cAAc,CAAC,CAAC;IAC5C,gBAAgB,EAAE,oCAAoC,CAAC;CACxD,EACD,iBAAiB,EAAE,QAAQ,CAAC,OAAO,CAAC,GACnC,OAAO,CAAC,QAAQ,CAAC,yBAAyB,EAAE,CAAC,CAAC,CA8NhD"}
|
package/dist/deploy/warp.js
CHANGED
|
@@ -6,7 +6,7 @@ import { ArtifactState } from '@hyperlane-xyz/provider-sdk/artifact';
|
|
|
6
6
|
import { hookConfigToArtifact, } from '@hyperlane-xyz/provider-sdk/hook';
|
|
7
7
|
import { ismConfigToArtifact, } from '@hyperlane-xyz/provider-sdk/ism';
|
|
8
8
|
import { DEFAULT_CROSS_COLLATERAL_FEE_ROUTER_KEY, TokenType as ProviderTokenType, warpConfigToArtifact, } from '@hyperlane-xyz/provider-sdk/warp';
|
|
9
|
-
import { addressToBytes32, assert, isNullish, isObjEmpty, mapAllSettled, mustGet, objFilter, objKeys, objMap, promiseObjAll, rootLogger, } from '@hyperlane-xyz/utils';
|
|
9
|
+
import { addressToBytes32, assert, isEVMLike, isNullish, isObjEmpty, mapAllSettled, mustGet, objFilter, objKeys, objMap, promiseObjAll, rootLogger, } from '@hyperlane-xyz/utils';
|
|
10
10
|
import { ExplorerLicenseType } from '../block-explorer/etherscan.js';
|
|
11
11
|
import { CCIPContractCache } from '../ccip/utils.js';
|
|
12
12
|
import { tokenFeeInputToFeeConfig } from '../fee/feeConfigMapping.js';
|
|
@@ -20,6 +20,7 @@ import { EvmWarpModule } from '../token/EvmWarpModule.js';
|
|
|
20
20
|
import { MAX_GAS_OVERHEAD, TokenType, gasOverhead } from '../token/config.js';
|
|
21
21
|
import { hypERC20factories } from '../token/contracts.js';
|
|
22
22
|
import { HypERC20Deployer, HypERC721Deployer } from '../token/deploy.js';
|
|
23
|
+
import { assertTimelockConfigHasNoProxyAdminOwnerOverride, } from '../token/types.js';
|
|
23
24
|
import { extractIsmAndHookFactoryAddresses, ismTreeContainsRateLimited, } from '../utils/ism.js';
|
|
24
25
|
import { HyperlaneProxyFactoryDeployer } from './HyperlaneProxyFactoryDeployer.js';
|
|
25
26
|
import { ContractVerifier } from './verify/ContractVerifier.js';
|
|
@@ -76,6 +77,7 @@ export function validateWarpConfigForAltVM(config, chain, protocol) {
|
|
|
76
77
|
throw new Error(`Unsupported token type '${config.type}' for Alt-VM chain '${chain}'.\n` +
|
|
77
78
|
`Supported token types: ${supportedTypes}.`);
|
|
78
79
|
}
|
|
80
|
+
assert(!config.timelock, `Timelock config is not supported on Alt-VM chain '${chain}'.`);
|
|
79
81
|
if (config.interchainSecurityModule) {
|
|
80
82
|
validateIsmConfig(config.interchainSecurityModule, chain, 'warp config', protocol);
|
|
81
83
|
}
|
|
@@ -147,6 +149,13 @@ export function validateWarpConfigForAltVM(config, chain, protocol) {
|
|
|
147
149
|
throw new Error(`Unhandled token type '${config.type}' for Alt-VM chain '${chain}'.`);
|
|
148
150
|
}
|
|
149
151
|
}
|
|
152
|
+
function assertWarpConfigTimelocksSupportedByProtocols({ multiProvider, warpDeployConfig, }) {
|
|
153
|
+
for (const [chain, config] of Object.entries(warpDeployConfig)) {
|
|
154
|
+
assertTimelockConfigHasNoProxyAdminOwnerOverride(config, chain);
|
|
155
|
+
const protocol = multiProvider.tryGetProtocol(chain);
|
|
156
|
+
assert(!config.timelock || (protocol && isEVMLike(protocol)), `Timelock config is not supported on Alt-VM chain '${chain}'.`);
|
|
157
|
+
}
|
|
158
|
+
}
|
|
150
159
|
// Subclass that injects rate-limited hook deployment between configureClients and
|
|
151
160
|
// transferOwnership so that setHook() is called while the deployer signer still owns the token.
|
|
152
161
|
class RateLimitedHookERC20Deployer extends HypERC20Deployer {
|
|
@@ -160,6 +169,10 @@ class RateLimitedHookERC20Deployer extends HypERC20Deployer {
|
|
|
160
169
|
}
|
|
161
170
|
}
|
|
162
171
|
export async function executeWarpDeploy(warpDeployConfig, multiProvider, altVmSigners, registryAddresses, apiKeys) {
|
|
172
|
+
assertWarpConfigTimelocksSupportedByProtocols({
|
|
173
|
+
multiProvider,
|
|
174
|
+
warpDeployConfig,
|
|
175
|
+
});
|
|
163
176
|
const contractVerifier = new ContractVerifier(multiProvider, apiKeys, coreBuildArtifact, ExplorerLicenseType.MIT);
|
|
164
177
|
const ismFactoryDeployer = new HyperlaneProxyFactoryDeployer(multiProvider, contractVerifier);
|
|
165
178
|
// Capture ISM configs that contain a RATE_LIMITED node before resolveWarpIsmAndHook
|
|
@@ -458,6 +471,10 @@ async function createWarpHook({ ccipContractCache, chain, chainAddresses, multiP
|
|
|
458
471
|
}
|
|
459
472
|
export async function enrollCrossChainRouters({ multiProvider, altVmSigners, registryAddresses, warpDeployConfig, }, deployedContracts) {
|
|
460
473
|
rootLogger.info(`Start enrolling cross chain routers`);
|
|
474
|
+
assertWarpConfigTimelocksSupportedByProtocols({
|
|
475
|
+
multiProvider,
|
|
476
|
+
warpDeployConfig,
|
|
477
|
+
});
|
|
461
478
|
const resolvedConfigMap = objMap(warpDeployConfig, (_, config) => ({
|
|
462
479
|
gas: gasOverhead(config.type),
|
|
463
480
|
...config,
|
package/dist/deploy/warp.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"warp.js","sourceRoot":"","sources":["../../src/deploy/warp.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sBAAsB,EACtB,mBAAmB,GACpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,aAAa,IAAI,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AAC1F,OAAO,EACL,gBAAgB,EAChB,eAAe,EACf,qBAAqB,EACrB,iBAAiB,GAClB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAS,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAGrE,OAAO,EAEL,oBAAoB,GACrB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAEL,mBAAmB,GACpB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAGL,uCAAuC,EAGvC,SAAS,IAAI,iBAAiB,EAE9B,oBAAoB,GACrB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAEL,gBAAgB,EAChB,MAAM,EACN,SAAS,EACT,UAAU,EACV,aAAa,EACb,OAAO,EACP,SAAS,EACT,OAAO,EACP,MAAM,EACN,aAAa,EACb,UAAU,GACX,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAKrD,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzD,OAAO,EAAE,2BAA2B,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAGvE,OAAO,EAGL,sBAAsB,GACvB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAC9E,OAAO,EAAqB,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC7E,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAMzE,OAAO,EACL,iCAAiC,EACjC,0BAA0B,GAC3B,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,6BAA6B,EAAE,MAAM,oCAAoC,CAAC;AACnF,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAWhE,MAAM,2BAA2B,GAAG,IAAI,GAAG,CAAY;IACrD,SAAS,CAAC,SAAS;IACnB,SAAS,CAAC,UAAU;IACpB,SAAS,CAAC,MAAM;IAChB,SAAS,CAAC,eAAe;CAC1B,CAAC,CAAC;AAEH;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,uCAAuC,CACrD,MAAoD,EACpD,WAAwB;IAExB,MAAM,qBAAqB,GAAgC,EAAE,CAAC;IAE9D,KAAK,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAClD,MAAM,CAAC,aAAa,IAAI,EAAE,CAC3B,EAAE,CAAC;QACF,MAAM,MAAM,GAAG,WAAW,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;QACtD,IAAI,SAAS,CAAC,MAAM,CAAC;YAAE,SAAS;QAChC,MAAM,QAAQ,GAAG,qBAAqB,CAAC,MAAM,CAAC,IAAI,IAAI,GAAG,EAAE,CAAC;QAC5D,qBAAqB,CAAC,MAAM,CAAC,GAAG,IAAI,GAAG,CAAC;YACtC,GAAG,QAAQ;YACX,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC;YAChC,uCAAuC;SACxC,CAAC,CAAC;IACL,CAAC;IAED,IACE,MAAM,CAAC,IAAI,KAAK,SAAS,CAAC,eAAe;QACzC,MAAM,CAAC,sBAAsB,EAC7B,CAAC;QACD,KAAK,MAAM,CAAC,aAAa,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CACnD,MAAM,CAAC,sBAAsB,CAC9B,EAAE,CAAC;YACF,MAAM,MAAM,GAAG,WAAW,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;YACtD,IAAI,SAAS,CAAC,MAAM,CAAC;gBAAE,SAAS;YAChC,MAAM,QAAQ,GAAG,qBAAqB,CAAC,MAAM,CAAC,IAAI,IAAI,GAAG,EAAE,CAAC;YAC5D,qBAAqB,CAAC,MAAM,CAAC,GAAG,IAAI,GAAG,CAAC;gBACtC,GAAG,QAAQ;gBACX,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;gBAC1C,uCAAuC;aACxC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,OAAO,EAAE,qBAAqB,EAAE,CAAC;AACnC,CAAC;AAED,MAAM,UAAU,0BAA0B,CACxC,MAAoD,EACpD,KAAa,EACb,QAAuB;IAEvB,IAAI,CAAC,2BAA2B,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QAClD,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1E,MAAM,IAAI,KAAK,CACb,2BAA2B,MAAM,CAAC,IAAI,uBAAuB,KAAK,MAAM;YACtE,0BAA0B,cAAc,GAAG,CAC9C,CAAC;IACJ,CAAC;IAED,IAAI,MAAM,CAAC,wBAAwB,EAAE,CAAC;QACpC,iBAAiB,CACf,MAAM,CAAC,wBAAsD,EAC7D,KAAK,EACL,aAAa,EACb,QAAQ,CACT,CAAC;IACJ,CAAC;IAED,IAAI,KAAyB,CAAC;IAC9B,IAAI,OAAO,MAAM,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;QACrC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;IACvB,CAAC;SAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QACpC,MAAM,CACJ,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,EACtC,oCAAoC,CACrC,CAAC;QAEF,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAC5E,CAAC;IAED,MAAM,UAAU,GAAG;QACjB,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,wBAAwB,EAAE,MAAM,CAAC,wBAGpB;QACb,IAAI,EAAE,MAAM,CAAC,IAA+C;QAC5D,aAAa,EAAE,MAAM,CAAC,aAAa;QACnC,cAAc,EAAE,MAAM,CAAC,cAAc;QACrC,KAAK;QACL,eAAe,EAAE,MAAM,CAAC,eAAe;QACvC,GAAG,EAAE,MAAM,CAAC,QAAQ;YAClB,CAAC,CAAC,wBAAwB,CAAC,MAAM,CAAC,QAAQ,CAAC;YAC3C,CAAC,CAAC,SAAS;KACd,CAAC;IAEF,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;QACpB,KAAK,SAAS,CAAC,UAAU,EAAE,CAAC;YAC1B,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;gBAClB,MAAM,IAAI,KAAK,CACb,sCAAsC,KAAK,gCAAgC,CAC5E,CAAC;YACJ,CAAC;YACD,MAAM,MAAM,GAAyB;gBACnC,GAAG,UAAU;gBACb,IAAI,EAAE,iBAAiB,CAAC,UAAU;gBAClC,KAAK,EAAE,MAAM,CAAC,KAAK;aACpB,CAAC;YACF,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,KAAK,SAAS,CAAC,SAAS,EAAE,CAAC;YACzB,MAAM,MAAM,GAAwB;gBAClC,GAAG,UAAU;gBACb,IAAI,EAAE,iBAAiB,CAAC,SAAS;gBACjC,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,WAAW,EAAE,MAAM,CAAC,WAAW;gBAC/B,KAAK,EAAE,MAAM,CAAC,KAAK;aACpB,CAAC;YACF,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,KAAK,SAAS,CAAC,eAAe,EAAE,CAAC;YAC/B,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;gBAClB,MAAM,IAAI,KAAK,CACb,4CAA4C,KAAK,gCAAgC,CAClF,CAAC;YACJ,CAAC;YACD,MAAM,MAAM,GAA8B;gBACxC,GAAG,UAAU;gBACb,IAAI,EAAE,iBAAiB,CAAC,eAAe;gBACvC,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,sBAAsB,EAAE,MAAM,CAAC,sBAAsB;aACtD,CAAC;YACF,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,KAAK,SAAS,CAAC,MAAM,EAAE,CAAC;YACtB,MAAM,MAAM,GAAqB;gBAC/B,GAAG,UAAU;gBACb,IAAI,EAAE,iBAAiB,CAAC,MAAM;aAC/B,CAAC;YACF,OAAO,MAAM,CAAC;QAChB,CAAC;QACD;YACE,MAAM,IAAI,KAAK,CACb,yBAAyB,MAAM,CAAC,IAAI,uBAAuB,KAAK,IAAI,CACrE,CAAC;IACN,CAAC;AACH,CAAC;AAED,kFAAkF;AAClF,gGAAgG;AAChG,MAAM,4BAA6B,SAAQ,gBAAgB;IAKtC,aAAa;IAJhC,YACE,aAA4B,EAC5B,UAA2C,EAC3C,gBAA8C,EAC7B,aAEC;QAElB,KAAK,CAAC,aAAa,EAAE,UAAU,EAAE,gBAAgB,CAAC,CAAC;6BAJlC,aAAa;IAKhC,CAAC;IAEkB,KAAK,CAAC,uBAAuB,CAC9C,YAAsD;QAEtD,MAAM,IAAI,CAAC,aAAa,CACtB,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CACrE,CAAC;IACJ,CAAC;CACF;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,gBAAsD,EACtD,aAA4B,EAC5B,YAA6D,EAC7D,iBAA2C,EAC3C,OAAyB;IAEzB,MAAM,gBAAgB,GAAG,IAAI,gBAAgB,CAC3C,aAAa,EACb,OAAO,EACP,iBAAiB,EACjB,mBAAmB,CAAC,GAAG,CACxB,CAAC;IAEF,MAAM,kBAAkB,GAAG,IAAI,6BAA6B,CAC1D,aAAa,EACb,gBAAgB,CACjB,CAAC;IAEF,oFAAoF;IACpF,kFAAkF;IAClF,iFAAiF;IACjF,gFAAgF;IAChF,+EAA+E;IAC/E,uFAAuF;IACvF,MAAM,mBAAmB,GAAwB,EAAE,CAAC;IACpD,KAAK,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC;QAC/D,IAAI,OAAO,MAAM,CAAC,wBAAwB,KAAK,QAAQ;YAAE,SAAS;QAClE,MAAM,GAAG,GAAG,MAAM,CAAC,wBAAwB,CAAC;QAC5C,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC;YAAE,SAAS;QAC/C,MAAM,QAAQ,GAAG,aAAa,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAClD,MAAM,CACJ,QAAQ,KAAK,YAAY,CAAC,QAAQ,IAAI,QAAQ,KAAK,YAAY,CAAC,IAAI,EACpE,2EAA2E,KAAK,iBAAiB,QAAQ,EAAE,CAC5G,CAAC;QACF,wEAAwE;QACxE,kEAAkE;QAClE,mBAAmB,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC;IACnC,CAAC;IAED,8FAA8F;IAC9F,6FAA6F;IAC7F,iFAAiF;IACjF,MAAM,wBAAwB,GAAyC,EAAE,CAAC;IAE1E,0FAA0F;IAC1F,6EAA6E;IAC7E,MAAM,cAAc,GAAG,MAAM,qBAAqB,CAChD,gBAAgB,EAChB,aAAa,EACb,YAAY,EACZ,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,EAChB,wBAAwB,CACzB,CAAC;IAEF,+DAA+D;IAC/D,IAAI,iBAAiB,GAAsB,MAAM,CAC/C,SAAS,CACP,gBAAgB,EAChB,CACE,MAAM,EACN,MAAM,EACkD,EAAE,CAC1D,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAC7B,EACD,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;QAChB,MAAM,CACJ,MAAM,CAAC,iBAAiB,EACxB,qDAAqD,KAAK,kBAAkB,CAC7E,CAAC;QAEF,OAAO,MAAM,CAAC,iBAAiB,CAAC;IAClC,CAAC,CACF,CAAC;IAEF,+BAA+B;IAC/B,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAC1B,IAAI,GAAG,CACL,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAC5C,aAAa,CAAC,WAAW,CAAC,SAAS,CAAC,CACrC,CACF,CACF,CAAC;IAEF,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,MAAM,sBAAsB,GAAG,SAAS,CACtC,cAAc,EACd,CACE,SAAS,EACT,MAAM,EACkD,EAAE,CAC1D,aAAa,CAAC,WAAW,CAAC,SAAS,CAAC,KAAK,QAAQ;YACjD,CAAC,MAAM,CAAC,iBAAiB,CAC5B,CAAC;QAEF,IAAI,UAAU,CAAC,sBAAsB,CAAC,EAAE,CAAC;YACvC,SAAS;QACX,CAAC;QAED,QAAQ,QAAQ,EAAE,CAAC;YACjB,KAAK,YAAY,CAAC,IAAI,CAAC;YACvB,KAAK,YAAY,CAAC,QAAQ,EAAE,CAAC;gBAC3B,MAAM,UAAU,GAAG,mBAAmB,CAAC,gBAAgB,CACrD,iBAAiB,EACjB,aAAa,EACb,SAAS,EACT,gBAAgB,CACjB,CAAC;gBAEF,MAAM,CACJ,CAAC,gBAAgB,CAAC,KAAK,IAAI,UAAU,CAAC,wBAAwB,CAAC,EAC/D,sHAAsH,CACvH,CAAC;gBAEF,MAAM,QAAQ,GAAG,gBAAgB,CAAC,KAAK;oBACrC,CAAC,CAAC,IAAI,iBAAiB,CAAC,aAAa,CAAC;oBACtC,CAAC,CAAC,UAAU,CAAC,wBAAwB,CAAC;wBACpC,CAAC,CAAC,IAAI,gBAAgB,CAAC,aAAa,EAAE,UAAU,EAAE,gBAAgB,CAAC,CAAC,wCAAwC;wBAC5G,CAAC,CAAC,IAAI,4BAA4B,CAC9B,aAAa,EACb,UAAU,EACV,gBAAgB;wBAChB,+EAA+E;wBAC/E,KAAK,EAAE,cAAc,EAAE,EAAE;4BACvB,MAAM,cAAc,GAAG,SAAS,CAC9B,wBAAwB,EACxB,CAAC,KAAK,EAAE,EAAE,EAAoC,EAAE,CAC9C,KAAK,IAAI,cAAc,CAC1B,CAAC;4BACF,IAAI,UAAU,CAAC,cAAc,CAAC;gCAAE,OAAO;4BACvC,MAAM,aAAa,GAAG,MAAM,6BAA6B,CACvD,cAAc,EACd,cAAc,EACd,aAAa,EACb,gBAAgB,CACjB,CAAC;4BACF,KAAK,MAAM,CAAC,KAAK,EAAE,WAAW,CAAC,IAAI,MAAM,CAAC,OAAO,CAC/C,aAAa,CACd,EAAE,CAAC;gCACF,gBAAgB,CAAC,KAAK,CAAC,CAAC,IAAI,GAAG,WAAW,CAAC;4BAC7C,CAAC;wBACH,CAAC,CACF,CAAC;gBAER,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC,CAAC;gBAC9D,MAAM,mBAAmB,GAAG,SAAS,CACnC,mBAAmB,EACnB,CAAC,MAAM,EAAE,UAAU,EAA2B,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CACtE,CAAC;gBACF,oEAAoE;gBACpE,sEAAsE;gBACtE,uEAAuE;gBACvE,wEAAwE;gBACxE,gEAAgE;gBAChE,yEAAyE;gBACzE,uEAAuE;gBACvE,MAAM,uBAAuB,GAAG,MAAM,aAAa,CACjD,MAAM,CAAC,sBAAsB,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;oBACvD,GAAG,MAAM;oBACT,KAAK,EAAE,MAAM,aAAa,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,UAAU,EAAE;iBACzD,CAAC,CAAC,CACJ,CAAC;gBACF,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,MAAM,CACxC,uBAAuB,EACvB,mBAAmB,CACpB,CAAC;gBACF,iBAAiB,GAAG;oBAClB,GAAG,iBAAiB;oBACpB,GAAG,MAAM,CACP,YAAwD,EACxD,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,OAAO,CAC/C;iBACF,CAAC;gBAEF,MAAM;YACR,CAAC;YACD,SAAS,CAAC;gBACR,MAAM,WAAW,GAAG,gBAAgB,CAAC,aAAa,CAAC,CAAC;gBAEpD,MAAM,aAAa,GAAsB,EAAE,CAAC;gBAC5C,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,sBAAsB,CAAC,EAAE,CAAC;oBACpD,MAAM,MAAM,GAAG,OAAO,CAAC,sBAAsB,EAAE,KAAK,CAAC,CAAC;oBACtD,MAAM,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;oBAC5C,MAAM,aAAa,GAAG,WAAW,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;oBAC1D,MAAM,MAAM,GAAG,qBAAqB,CAClC,aAAa,EACb,WAAW,EACX,MAAM,CACP,CAAC;oBAEF,+DAA+D;oBAC/D,qEAAqE;oBACrE,iEAAiE;oBACjE,oEAAoE;oBACpE,oEAAoE;oBACpE,gDAAgD;oBAChD,MAAM,uBAAuB,GAAG;wBAC9B,GAAG,MAAM;wBACT,KAAK,EAAE,MAAM,CAAC,gBAAgB,EAAE;qBACjC,CAAC;oBAEF,MAAM,QAAQ,GAAG,oBAAoB,CACnC,0BAA0B,CACxB,uBAAuB,EACvB,KAAK,EACL,aAAa,CAAC,QAAQ,CACvB,EACD,WAAW,CACZ,CAAC;oBAEF,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;oBACjD,aAAa,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC;gBACnD,CAAC;gBAED,iBAAiB,GAAG;oBAClB,GAAG,iBAAiB;oBACpB,GAAG,aAAa;iBACjB,CAAC;gBAEF,MAAM;YACR,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AAED,KAAK,UAAU,6BAA6B,CAC1C,SAA+C,EAC/C,cAAiC,EACjC,aAA4B,EAC5B,gBAAmC;IAEnC,OAAO,aAAa,CAClB,MAAM,CACJ,SAAS,EACT,KAAK,EACH,KAAK,EACL,EAAE,UAAU,EAAE,cAAc,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,EACpE,EAAE;QACF,MAAM,YAAY,GAAG,OAAO,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;QACpD,MAAM,CAAC,cAAc,EAAE,6BAA6B,KAAK,EAAE,CAAC,CAAC;QAE7D,MAAM,yBAAyB,GAC7B,iBAAiB;YACjB,CACE,MAAM,aAAa,CAAC,YAAY,CAC9B,KAAK,EACL,IAAI,mBAAmB,EAAE,EACzB,EAAE,CACH,CACF,CAAC,OAAO,CAAC;QAEZ,MAAM,aAAa,GAAG,MAAM,aAAa,CAAC,MAAM,CAAC;YAC/C,KAAK;YACL,aAAa;YACb,aAAa,EAAE;gBACb,OAAO,EAAE,cAAc,CAAC,OAAO;gBAC/B,UAAU,EAAE,yBAAyB;gBACrC,iBAAiB,EAAE,YAAY;aAChC;YACD,MAAM,EAAE,UAAU;YAClB,iBAAiB;YACjB,qBAAqB,EACnB,iCAAiC,CAAC,cAAc,CAAC;YACnD,gBAAgB;SACjB,CAAC,CAAC;QAEH,MAAM,EAAE,YAAY,EAAE,GAAG,aAAa,CAAC,SAAS,EAAE,CAAC;QACnD,MAAM,CACJ,YAAY,EACZ,2CAA2C,KAAK,EAAE,CACnD,CAAC;QAEF,UAAU,CAAC,IAAI,CACb,0BAA0B,YAAY,aAAa,YAAY,OAAO,KAAK,EAAE,CAC9E,CAAC;QACF,MAAM,WAAW,GAAG,aAAa,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC;QACjE,MAAM,MAAM,GAAG,aAAa,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAC9C,MAAM,KAAK,GAAG,sBAAsB,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;QACnE,MAAM,aAAa,CAAC,QAAQ,CAC1B,KAAK,EACL,KAAK,CAAC,OAAO,CAAC,YAAY,EAAE,WAAW,CAAC,CACzC,CAAC;QAEF,OAAO,YAAY,CAAC;IACtB,CAAC,CACF,CACF,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,qBAAqB,CAClC,UAAgD,EAChD,aAA4B,EAC5B,YAA6D,EAC7D,iBAA2C,EAC3C,kBAAiD,EACjD,gBAAkC,EAClC,wBAA8D;IAE9D,OAAO,aAAa,CAClB,MAAM,CAAC,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QACzC,MAAM,iBAAiB,GAAG,IAAI,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;QACnE,MAAM,cAAc,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAEhD,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,4CAA4C,KAAK,GAAG,CAAC,CAAC;QACxE,CAAC;QAED,MAAM,GAAG,GAAG,MAAM,aAAa,CAAC;YAC9B,iBAAiB;YACjB,KAAK;YACL,cAAc;YACd,aAAa;YACb,YAAY;YACZ,gBAAgB;YAChB,kBAAkB;YAClB,UAAU,EAAE,MAAM;SACnB,CAAC,CAAC,CAAC,kBAAkB;QAEtB,MAAM,IAAI,GAAG,MAAM,cAAc,CAAC;YAChC,iBAAiB;YACjB,KAAK;YACL,cAAc;YACd,aAAa;YACb,YAAY;YACZ,gBAAgB;YAChB,kBAAkB;YAClB,UAAU,EAAE,MAAM;YAClB,wBAAwB;SACzB,CAAC,CAAC;QAEH,4EAA4E;QAC5E,4EAA4E;QAC5E,8DAA8D;QAC9D,OAAO;YACL,GAAG,MAAM;YACT,wBAAwB,EAAE,GAAG;YAC7B,IAAI;SACL,CAAC;IACJ,CAAC,CAAC,CACH,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,KAAK,UAAU,aAAa,CAAC,EAC3B,iBAAiB,EACjB,KAAK,EACL,cAAc,EACd,aAAa,EACb,YAAY,EACZ,gBAAgB,EAChB,UAAU,GAUX;IACC,MAAM,EAAE,wBAAwB,EAAE,GAAG,UAAU,CAAC;IAChD,IACE,CAAC,wBAAwB;QACzB,OAAO,wBAAwB,KAAK,QAAQ,EAC5C,CAAC;QACD,UAAU,CAAC,IAAI,CACb,iBACE,CAAC,wBAAwB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,wBACxC,wBAAwB,CACzB,CAAC;QACF,OAAO,wBAAwB,CAAC;IAClC,CAAC;IAED,6EAA6E;IAC7E,mFAAmF;IACnF,gFAAgF;IAChF,0EAA0E;IAC1E,iCAAiC;IACjC,IAAI,0BAA0B,CAAC,wBAAwB,CAAC,EAAE,CAAC;QACzD,UAAU,CAAC,IAAI,CACb,+BAA+B,KAAK,sDAAsD,CAC3F,CAAC;QACF,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,UAAU,CAAC,IAAI,CAAC,0CAA0C,KAAK,KAAK,CAAC,CAAC;IAEtE,UAAU,CAAC,IAAI,CACb,YAAY,wBAAwB,CAAC,IAAI,qBAAqB,KAAK,WAAW,CAC/E,CAAC;IAEF,UAAU,CAAC,IAAI,CACb,qBAAqB,wBAAwB,CAAC,IAAI,qBAAqB,KAAK,SAAS,CACtF,CAAC;IAEF,MAAM,YAAY,GAAG,aAAa,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAEtD,QAAQ,YAAY,EAAE,CAAC;QACrB,KAAK,YAAY,CAAC,IAAI,CAAC;QACvB,KAAK,YAAY,CAAC,QAAQ,EAAE,CAAC;YAC3B,MAAM,YAAY,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC;gBAC7C,KAAK;gBACL,OAAO,EAAE,cAAc,CAAC,OAAO;gBAC/B,aAAa,EAAE,aAAa;gBAC5B,qBAAqB,EACnB,iCAAiC,CAAC,cAAc,CAAC;gBACnD,MAAM,EAAE,wBAAwB;gBAChC,iBAAiB;gBACjB,gBAAgB;aACjB,CAAC,CAAC;YACH,MAAM,EAAE,WAAW,EAAE,GAAG,YAAY,CAAC,SAAS,EAAE,CAAC;YACjD,OAAO,WAAW,CAAC;QACrB,CAAC;QACD,SAAS,CAAC;YACR,MAAM,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;YAC5C,MAAM,WAAW,GAAG,gBAAgB,CAAC,aAAa,CAAC,CAAC;YACpD,MAAM,aAAa,GAAG,WAAW,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;YAC1D,MAAM,MAAM,GAAG,eAAe,CAAC,aAAa,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;YACnE,MAAM,QAAQ,GAAG,mBAAmB;YAClC,6CAA6C;YAC7C,wBAA6C,EAC7C,WAAW,CACZ,CAAC;YACF,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YACjD,OAAO,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC;QACnC,CAAC;IACH,CAAC;AACH,CAAC;AAED,KAAK,UAAU,cAAc,CAAC,EAC5B,iBAAiB,EACjB,KAAK,EACL,cAAc,EACd,aAAa,EACb,YAAY,EACZ,gBAAgB,EAChB,UAAU,EACV,wBAAwB,GAWzB;IACC,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC;IAE5B,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QACtC,UAAU,CAAC,IAAI,CACb,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,wBAAwB,CACjE,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;IAED,8FAA8F;IAC9F,kGAAkG;IAClG,IAAI,2BAA2B,CAAC,IAAI,CAAC,EAAE,CAAC;QACtC,MAAM,CACJ,CAAC,UAAU,CAAC,iBAAiB,EAC7B,mCAAmC,KAAK,mEAAmE,CAC5G,CAAC;QACF,MAAM,QAAQ,GAAG,aAAa,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAClD,MAAM,CACJ,QAAQ,KAAK,YAAY,CAAC,QAAQ,IAAI,QAAQ,KAAK,YAAY,CAAC,IAAI,EACpE,2DAA2D,KAAK,kBAAkB,QAAQ,EAAE,CAC7F,CAAC;QACF,UAAU,CAAC,IAAI,CACb,wBAAwB,KAAK,sDAAsD,CACpF,CAAC;QACF,wBAAwB,CAAC,KAAK,CAAC,GAAG;YAChC,UAAU,EAAE,IAAI;YAChB,cAAc;YACd,iBAAiB;YACjB,iBAAiB,EAAE,UAAU,CAAC,UAAU,EAAE,OAAO;SAClD,CAAC;QACF,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,UAAU,CAAC,IAAI,CAAC,0CAA0C,KAAK,KAAK,CAAC,CAAC;IAEtE,UAAU,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,IAAI,sBAAsB,KAAK,WAAW,CAAC,CAAC;IAE7E,MAAM,YAAY,GAAG,aAAa,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAEtD,QAAQ,YAAY,EAAE,CAAC;QACrB,KAAK,YAAY,CAAC,IAAI,CAAC;QACvB,KAAK,YAAY,CAAC,QAAQ,EAAE,CAAC;YAC3B,UAAU,CAAC,IAAI,CAAC,0CAA0C,KAAK,KAAK,CAAC,CAAC;YAEtE,UAAU,CAAC,IAAI,CACb,YAAY,IAAI,CAAC,IAAI,sBAAsB,KAAK,WAAW,CAC5D,CAAC;YAEF,wFAAwF;YACxF,MAAM,iBAAiB,GACrB,UAAU,CAAC,UAAU,EAAE,OAAO;gBAC9B,CAAC,MAAM,aAAa,CAAC,YAAY,CAAC,KAAK,EAAE,IAAI,mBAAmB,EAAE,EAAE,EAAE,CAAC,CAAC;qBACrE,OAAO,CAAC;YAEb,MAAM,aAAa,GAAG,MAAM,aAAa,CAAC,MAAM,CAAC;gBAC/C,KAAK;gBACL,aAAa,EAAE,aAAa;gBAC5B,aAAa,EAAE;oBACb,OAAO,EAAE,cAAc,CAAC,OAAO;oBAC/B,UAAU,EAAE,iBAAiB;iBAC9B;gBACD,MAAM,EAAE,IAAI;gBACZ,iBAAiB;gBACjB,gBAAgB;gBAChB,qBAAqB,EACnB,iCAAiC,CAAC,cAAc,CAAC;aACpD,CAAC,CAAC;YACH,UAAU,CAAC,IAAI,CACb,qBAAqB,IAAI,CAAC,IAAI,sBAAsB,KAAK,SAAS,CACnE,CAAC;YACF,MAAM,EAAE,YAAY,EAAE,GAAG,aAAa,CAAC,SAAS,EAAE,CAAC;YACnD,OAAO,YAAY,CAAC;QACtB,CAAC;QACD,SAAS,CAAC;YACR,MAAM,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;YAC5C,MAAM,WAAW,GAAG,gBAAgB,CAAC,aAAa,CAAC,CAAC;YACpD,MAAM,QAAQ,GAAG,aAAa,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;YAEvD,6DAA6D;YAC7D,MAAM,MAAM,GAAG,gBAAgB,CAAC,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE;gBAC7D,OAAO,EAAE,cAAc,CAAC,OAAO;aAChC,CAAC,CAAC;YACH,MAAM,QAAQ,GAAG,oBAAoB,CACnC,IAA0B,EAC1B,WAAW,CACZ,CAAC;YACF,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YACjD,OAAO,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC;QACnC,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,EACE,aAAa,EACb,YAAY,EACZ,iBAAiB,EACjB,gBAAgB,GAMjB,EACD,iBAAoC;IAEpC,UAAU,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAC;IAEvD,MAAM,iBAAiB,GAAG,MAAM,CAAC,gBAAgB,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QACjE,GAAG,EAAE,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC;QAC7B,GAAG,MAAM;KACV,CAAC,CAAC,CAAC;IAEJ,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CACjC,SAAS,CACP,iBAAiB,EACjB,CAAC,CAAC,EAAE,MAAW,EAAiB,EAAE,CAChC,CAAC,MAAM,CAAC,iBAAiB;QACzB,MAAM,CAAC,IAAI,KAAK,SAAS,CAAC,wBAAwB,CACrD,CACF,CAAC;IAEF,4DAA4D;IAC5D,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,MAAM,aAAa,CACjD,eAAe,EACf,KAAK,EAAE,YAAY,EAAE,EAAE;QACrB,MAAM,QAAQ,GAAG,aAAa,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;QAEzD,8EAA8E;QAC9E,MAAM,iBAAiB,GAAkB,MAAM,CAC7C,sBAAsB,CACpB,aAAa,EACb,iBAAiB,CAAC,YAAY,CAAC,CAAC,aAAa,IAAI,EAAE,CACpD,EACD,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,gBAAgB,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAC7D,CAAC;QAEF,8DAA8D;QAC9D,MAAM,aAAa,GAAkB;YACnC,GAAG,iBAAiB;YACpB,GAAG,MAAM,CAAC,WAAW,CACnB,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC;iBAC9B,MAAM,CAAC,CAAC,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,KAAK,KAAK,YAAY,CAAC;iBACrD,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC;gBACzB,aAAa,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE;gBAC3C;oBACE,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC;iBACnC;aACF,CAAC,CACL;SACF,CAAC;QAEF,4CAA4C;QAC5C,MAAM,kBAAkB,GAAmB,sBAAsB,CAC/D,aAAa,EACb,iBAAiB,CAAC,YAAY,CAAC,CAAC,cAAc,IAAI,EAAE,CACrD,CAAC;QAEF,gGAAgG;QAChG,MAAM,wBAAwB,GAAmB,MAAM,CACrD,iBAAiB,EACjB,CAAC,QAAQ,EAAE,EAAE,CACX,kBAAkB,CAAC,QAAQ,CAAC,IAAI,gBAAgB,CAAC,QAAQ,EAAE,CAC9D,CAAC;QAEF,8EAA8E;QAC9E,MAAM,cAAc,GAAmB;YACrC,GAAG,wBAAwB;YAC3B,GAAG,MAAM,CAAC,WAAW,CACnB,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC;iBAC9B,MAAM,CAAC,CAAC,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,KAAK,KAAK,YAAY,CAAC;iBACrD,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC;gBAC1B,aAAa,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE;gBAC3C,iBAAiB,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE;aACxC,CAAC,CACL;SACF,CAAC;QAEF,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;YAClD,UAAU,CAAC,KAAK,CACd,oEAAoE,QAAQ,gBAAgB,aAAa,CAAC,QAAQ,CAAC,aAAa,YAAY,EAAE,CAC/I,CAAC;QACJ,CAAC;QAED,IAAI,YAAY,GAAgC,EAAE,CAAC;QAEnD,QAAQ,QAAQ,EAAE,CAAC;YACjB,KAAK,YAAY,CAAC,IAAI,CAAC;YACvB,KAAK,YAAY,CAAC,QAAQ,EAAE,CAAC;gBAC3B,MAAM,EACJ,uBAAuB,EACvB,kCAAkC,EAClC,kCAAkC,EAClC,iCAAiC,EACjC,2BAA2B,EAC3B,4BAA4B,EAC5B,0CAA0C,EAC1C,yCAAyC,GAC1C,GAAG,iBAAiB,CAAC,YAAY,CAAC,CAAC;gBAEpC,MAAM,aAAa,GAAG,IAAI,aAAa,CAAC,aAAa,EAAE;oBACrD,KAAK,EAAE,YAAY;oBACnB,MAAM,EAAE,iBAAiB,CAAC,YAAY,CAAC;oBACvC,SAAS,EAAE;wBACT,kBAAkB,EAAE,iBAAiB,CAAC,YAAY,CAAC;wBACnD,uBAAuB;wBACvB,kCAAkC;wBAClC,kCAAkC;wBAClC,iCAAiC;wBACjC,2BAA2B;wBAC3B,4BAA4B;wBAC5B,0CAA0C;wBAC1C,yCAAyC;qBAC1C;iBACF,CAAC,CAAC;gBAEH,MAAM,YAAY,GAAG,MAAM,aAAa,CAAC,IAAI,EAAE,CAAC;gBAChD,MAAM,cAAc,GAAyB;oBAC3C,GAAG,YAAY;oBACf,KAAK,EAAE,iBAAiB,CAAC,YAAY,CAAC,CAAC,KAAK;oBAC5C,qEAAqE;oBACrE,qEAAqE;oBACrE,oEAAoE;oBACpE,8DAA8D;oBAC9D,mDAAmD;oBACnD,UAAU,EAAE,YAAY,CAAC,UAAU,IAAI;wBACrC,OAAO,EAAE,YAAY,CAAC,UAAU,CAAC,OAAO;wBACxC,KAAK,EACH,iBAAiB,CAAC,YAAY,CAAC,CAAC,UAAU,EAAE,KAAK;4BACjD,iBAAiB,CAAC,YAAY,CAAC,CAAC,KAAK;qBACxC;oBACD,aAAa;oBACb,cAAc;oBACd,+DAA+D;oBAC/D,oEAAoE;oBACpE,iEAAiE;oBACjE,6CAA6C;oBAC7C,kEAAkE;oBAClE,0DAA0D;oBAC1D,6DAA6D;oBAC7D,wDAAwD;oBACxD,GAAG,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC,QAAQ,IAAI;wBAC9C,QAAQ,EAAE,iBAAiB,CAAC,YAAY,CAAC,CAAC,QAAQ;qBACnD,CAAC;iBACH,CAAC;gBAEF,YAAY,GAAG,MAAM,aAAa,CAAC,MAAM,CAAC,cAAc,EAAE;oBACxD,mBAAmB,EAAE,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAC7D,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC,CACrB;iBACF,CAAC,CAAC;gBAEH,MAAM;YACR,CAAC;YACD,SAAS,CAAC;gBACR,MAAM,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;gBACnD,MAAM,WAAW,GAAG,gBAAgB,CAAC,aAAa,CAAC,CAAC;gBACpD,MAAM,aAAa,GAAG,WAAW,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;gBAEjE,MAAM,MAAM,GAAG,qBAAqB,CAClC,aAAa,EACb,WAAW,EACX,MAAM,CACP,CAAC;gBAEF,MAAM,cAAc,GAAiD;oBACnE,GAAG,iBAAiB,CAAC,YAAY,CAAC;oBAClC,aAAa;oBACb,cAAc;iBACf,CAAC;gBAEF,MAAM,QAAQ,GAAG,oBAAoB,CACnC,0BAA0B,CACxB,cAAc,EACd,YAAY,EACZ,aAAa,CAAC,QAAQ,CACvB,EACD,WAAW,CACZ,CAAC;gBAEF,MAAM,gBAAgB,GAAG;oBACvB,aAAa,EAAE,aAAa,CAAC,QAAQ;oBACrC,MAAM,EAAE,QAAQ,CAAC,MAAM;oBACvB,QAAQ,EAAE,EAAE,OAAO,EAAE,iBAAiB,CAAC,YAAY,CAAC,EAAE;iBACvD,CAAC;gBAEF,YAAY,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;YACvD,CAAC;QACH,CAAC;QAED,UAAU,CAAC,KAAK,CACd,uDAAuD,YAAY,EAAE,CACtE,CAAC;QAEF,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC;IAC/C,CAAC,EACD,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CACjB,CAAC;IAEF,mDAAmD;IACnD,MAAM,kBAAkB,GAAG,EAA2C,CAAC;IACvE,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,KAAK,MAAM,CAAC,EAAE,MAAM,CAAC,IAAI,SAAS,EAAE,CAAC;QACnC,IAAI,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC;YAC/B,kBAAkB,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,YAAY,CAAC;QACzD,CAAC;IACH,CAAC;IAED,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,QAAQ,EAAE,CAAC;QACtC,UAAU,CAAC,KAAK,CACd,yDAAyD,KAAK,KAAK,KAAK,CAAC,OAAO,EAAE,CACnF,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CACb,uDAAuD,MAAM,CAAC,MAAM,cAAc,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACtG,CAAC;IACJ,CAAC;IAED,OAAO,kBAAkB,CAAC;AAC5B,CAAC;AAED,SAAS,SAAS,CAAC,SAAgD;IACjE,KAAK,MAAM,GAAG,IAAI,OAAO,CAAC,iBAAiB,CAAC,EAAE,CAAC;QAC7C,IAAI,SAAS,CAAC,GAAG,CAAC;YAAE,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC;IAC5C,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;AACjD,CAAC"}
|
|
1
|
+
{"version":3,"file":"warp.js","sourceRoot":"","sources":["../../src/deploy/warp.ts"],"names":[],"mappings":"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"}
|
package/dist/ica/types.d.ts
CHANGED
|
@@ -300,6 +300,32 @@ export declare const IcaRouterConfigSchema: z.ZodObject<{
|
|
|
300
300
|
interchainSecurityModule: z.ZodOptional<z.ZodType<import("../ism/types.js").IsmConfig, z.ZodTypeDef, unknown>>;
|
|
301
301
|
} & {
|
|
302
302
|
foreignDeployment: z.ZodOptional<z.ZodString>;
|
|
303
|
+
} & {
|
|
304
|
+
timelock: z.ZodOptional<z.ZodObject<{
|
|
305
|
+
delay: z.ZodEffects<z.ZodNumber, number, number>;
|
|
306
|
+
roles: z.ZodObject<{
|
|
307
|
+
executor: z.ZodEffects<z.ZodString, string, string>;
|
|
308
|
+
proposer: z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>;
|
|
309
|
+
}, "strip", z.ZodTypeAny, {
|
|
310
|
+
executor: string;
|
|
311
|
+
proposer: string;
|
|
312
|
+
}, {
|
|
313
|
+
executor: string;
|
|
314
|
+
proposer: string;
|
|
315
|
+
}>;
|
|
316
|
+
}, "strip", z.ZodTypeAny, {
|
|
317
|
+
delay: number;
|
|
318
|
+
roles: {
|
|
319
|
+
executor: string;
|
|
320
|
+
proposer: string;
|
|
321
|
+
};
|
|
322
|
+
}, {
|
|
323
|
+
delay: number;
|
|
324
|
+
roles: {
|
|
325
|
+
executor: string;
|
|
326
|
+
proposer: string;
|
|
327
|
+
};
|
|
328
|
+
}>>;
|
|
303
329
|
} & {
|
|
304
330
|
remoteRouters: z.ZodOptional<z.ZodRecord<z.ZodUnion<[z.ZodString, z.ZodNumber]>, z.ZodObject<{
|
|
305
331
|
address: z.ZodString;
|
|
@@ -587,6 +613,13 @@ export declare const IcaRouterConfigSchema: z.ZodObject<{
|
|
|
587
613
|
}, "strip", z.ZodTypeAny, {
|
|
588
614
|
owner: string;
|
|
589
615
|
ownerOverrides?: Record<string, string> | undefined;
|
|
616
|
+
timelock?: {
|
|
617
|
+
delay: number;
|
|
618
|
+
roles: {
|
|
619
|
+
executor: string;
|
|
620
|
+
proposer: string;
|
|
621
|
+
};
|
|
622
|
+
} | undefined;
|
|
590
623
|
mailbox: string;
|
|
591
624
|
hook?: string | import("../index.js").AggregationHookConfig | import("../hook/types.js").AmountRoutingHookConfig | import("../index.js").ArbL2ToL1HookConfig | {
|
|
592
625
|
owner: string;
|
|
@@ -715,6 +748,13 @@ export declare const IcaRouterConfigSchema: z.ZodObject<{
|
|
|
715
748
|
}, {
|
|
716
749
|
owner: string;
|
|
717
750
|
ownerOverrides?: Record<string, string> | undefined;
|
|
751
|
+
timelock?: {
|
|
752
|
+
delay: number;
|
|
753
|
+
roles: {
|
|
754
|
+
executor: string;
|
|
755
|
+
proposer: string;
|
|
756
|
+
};
|
|
757
|
+
} | undefined;
|
|
718
758
|
mailbox: string;
|
|
719
759
|
hook?: unknown;
|
|
720
760
|
interchainSecurityModule?: unknown;
|
|
@@ -1058,6 +1098,32 @@ export declare const DerivedIcaRouterConfigSchema: z.ZodObject<{
|
|
|
1058
1098
|
interchainSecurityModule: z.ZodOptional<z.ZodType<import("../ism/types.js").IsmConfig, z.ZodTypeDef, unknown>>;
|
|
1059
1099
|
} & {
|
|
1060
1100
|
foreignDeployment: z.ZodOptional<z.ZodString>;
|
|
1101
|
+
} & {
|
|
1102
|
+
timelock: z.ZodOptional<z.ZodObject<{
|
|
1103
|
+
delay: z.ZodEffects<z.ZodNumber, number, number>;
|
|
1104
|
+
roles: z.ZodObject<{
|
|
1105
|
+
executor: z.ZodEffects<z.ZodString, string, string>;
|
|
1106
|
+
proposer: z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>;
|
|
1107
|
+
}, "strip", z.ZodTypeAny, {
|
|
1108
|
+
executor: string;
|
|
1109
|
+
proposer: string;
|
|
1110
|
+
}, {
|
|
1111
|
+
executor: string;
|
|
1112
|
+
proposer: string;
|
|
1113
|
+
}>;
|
|
1114
|
+
}, "strip", z.ZodTypeAny, {
|
|
1115
|
+
delay: number;
|
|
1116
|
+
roles: {
|
|
1117
|
+
executor: string;
|
|
1118
|
+
proposer: string;
|
|
1119
|
+
};
|
|
1120
|
+
}, {
|
|
1121
|
+
delay: number;
|
|
1122
|
+
roles: {
|
|
1123
|
+
executor: string;
|
|
1124
|
+
proposer: string;
|
|
1125
|
+
};
|
|
1126
|
+
}>>;
|
|
1061
1127
|
} & {
|
|
1062
1128
|
remoteRouters: z.ZodOptional<z.ZodRecord<z.ZodUnion<[z.ZodString, z.ZodNumber]>, z.ZodObject<{
|
|
1063
1129
|
address: z.ZodString;
|
|
@@ -1347,6 +1413,13 @@ export declare const DerivedIcaRouterConfigSchema: z.ZodObject<{
|
|
|
1347
1413
|
}, "strip", z.ZodTypeAny, {
|
|
1348
1414
|
owner: string;
|
|
1349
1415
|
ownerOverrides?: Record<string, string> | undefined;
|
|
1416
|
+
timelock?: {
|
|
1417
|
+
delay: number;
|
|
1418
|
+
roles: {
|
|
1419
|
+
executor: string;
|
|
1420
|
+
proposer: string;
|
|
1421
|
+
};
|
|
1422
|
+
} | undefined;
|
|
1350
1423
|
mailbox: string;
|
|
1351
1424
|
hook?: string | import("../index.js").AggregationHookConfig | import("../hook/types.js").AmountRoutingHookConfig | import("../index.js").ArbL2ToL1HookConfig | {
|
|
1352
1425
|
owner: string;
|
|
@@ -1476,6 +1549,13 @@ export declare const DerivedIcaRouterConfigSchema: z.ZodObject<{
|
|
|
1476
1549
|
}, {
|
|
1477
1550
|
owner: string;
|
|
1478
1551
|
ownerOverrides?: Record<string, string> | undefined;
|
|
1552
|
+
timelock?: {
|
|
1553
|
+
delay: number;
|
|
1554
|
+
roles: {
|
|
1555
|
+
executor: string;
|
|
1556
|
+
proposer: string;
|
|
1557
|
+
};
|
|
1558
|
+
} | undefined;
|
|
1479
1559
|
mailbox: string;
|
|
1480
1560
|
hook?: unknown;
|
|
1481
1561
|
interchainSecurityModule?: unknown;
|
package/dist/ica/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/ica/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAMxB,oBAAY,aAAa;IACvB,OAAO,YAAY;IACnB,OAAO,YAAY;CACpB;AAED;;;GAGG;AACH,eAAO,MAAM,sBAAsB;IACjC,+BAA+B;;IAE/B,uEAAuE;;;;;;;;EAEvE,CAAC;AAEH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAEtE,eAAO,MAAM,qBAAqB
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/ica/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAMxB,oBAAY,aAAa;IACvB,OAAO,YAAY;IACnB,OAAO,YAAY;CACpB;AAED;;;GAGG;AACH,eAAO,MAAM,sBAAsB;IACjC,+BAA+B;;IAE/B,uEAAuE;;;;;;;;EAEvE,CAAC;AAEH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAEtE,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAChC;wFACoF;;IAEpF,yFAAyF;;;;;;;;;;;;;;;;;;IAEzF;;;;OAIG;;QAlBH,+BAA+B;;QAE/B,uEAAuE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAkBvE,CAAC;AAEH,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AAEpE,eAAO,MAAM,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAfvC;wFACoF;;IAEpF,yFAAyF;;;;;;;;;;;;;;;;;;IAEzF;;;;OAIG;;QAlBH,+BAA+B;;QAE/B,uEAAuE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAwBvE,CAAC;AAEH,MAAM,MAAM,sBAAsB,GAAG,CAAC,CAAC,KAAK,CAC1C,OAAO,4BAA4B,CACpC,CAAC"}
|
|
@@ -61,6 +61,8 @@ export declare class EvmIsmModule extends HyperlaneModule<ProtocolType.Ethereum,
|
|
|
61
61
|
current: RateLimitedIsmConfig;
|
|
62
62
|
target: RateLimitedIsmConfig;
|
|
63
63
|
}): AnnotatedEV5Transaction[];
|
|
64
|
+
private isEnumerableBlacklistIsm;
|
|
65
|
+
private blacklistCanBeUpdatedInPlace;
|
|
64
66
|
protected updateBlacklistIsm({ current, target, }: {
|
|
65
67
|
current: BlacklistIsmConfig;
|
|
66
68
|
target: BlacklistIsmConfig;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EvmIsmModule.d.ts","sourceRoot":"","sources":["../../src/ism/EvmIsmModule.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAW9B,OAAO,EACL,OAAO,EACP,MAAM,EACN,UAAU,EACV,YAAY,EAQb,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EACL,eAAe,EACf,qBAAqB,EACtB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"EvmIsmModule.d.ts","sourceRoot":"","sources":["../../src/ism/EvmIsmModule.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,12 +2,14 @@ import assert from 'assert';
|
|
|
2
2
|
import chai, { expect } from 'chai';
|
|
3
3
|
import chaiAsPromised from 'chai-as-promised';
|
|
4
4
|
import hre from 'hardhat';
|
|
5
|
-
import
|
|
6
|
-
import {
|
|
5
|
+
import sinon from 'sinon';
|
|
6
|
+
import { BlacklistIsm__factory, RateLimitedIsm__factory, StaticAggregationIsm__factory, TestLegacyBlacklistIsm__factory, } from '@hyperlane-xyz/core';
|
|
7
|
+
import { eqAddress, rootLogger } from '@hyperlane-xyz/utils';
|
|
7
8
|
import { TestChainName, testChains } from '../consts/testChains.js';
|
|
8
9
|
import { TestCoreDeployer } from '../core/TestCoreDeployer.js';
|
|
9
10
|
import { HyperlaneProxyFactoryDeployer } from '../deploy/HyperlaneProxyFactoryDeployer.js';
|
|
10
11
|
import { MultiProvider } from '../providers/MultiProvider.js';
|
|
12
|
+
import { EvmEventLogsReader } from '../rpc/evm/EvmEventLogsReader.js';
|
|
11
13
|
import { randomAddress, randomIsmConfig, randomMultisigIsmConfig, } from '../test/testUtils.js';
|
|
12
14
|
import { normalizeConfig } from '../utils/ism.js';
|
|
13
15
|
import { EvmIsmModule } from './EvmIsmModule.js';
|
|
@@ -26,6 +28,9 @@ describe('EvmIsmModule', async () => {
|
|
|
26
28
|
const chain = TestChainName.test4;
|
|
27
29
|
let factoryAddresses;
|
|
28
30
|
let factoryContracts;
|
|
31
|
+
const legacyDeploymentBlocks = new Map();
|
|
32
|
+
let legacyExplorerMetadataStub;
|
|
33
|
+
let legacyDeploymentBlockStub;
|
|
29
34
|
before(async () => {
|
|
30
35
|
const [signer, funder] = await hre.ethers.getSigners();
|
|
31
36
|
fundingAccount = funder;
|
|
@@ -80,14 +85,22 @@ describe('EvmIsmModule', async () => {
|
|
|
80
85
|
let testConfig;
|
|
81
86
|
// expect that the ISM matches the config after all tests
|
|
82
87
|
afterEach(async () => {
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
88
|
+
try {
|
|
89
|
+
const derivedConfiig = await testIsm.read();
|
|
90
|
+
const normalizedDerivedConfig = normalizeConfig(derivedConfiig);
|
|
91
|
+
const normalizedConfig = normalizeConfig(testConfig);
|
|
92
|
+
// recipient is a deploy-time constructor arg not returned by read()
|
|
93
|
+
if (normalizedConfig.type === IsmType.RATE_LIMITED) {
|
|
94
|
+
delete normalizedConfig.recipient;
|
|
95
|
+
}
|
|
96
|
+
assert.deepStrictEqual(normalizedDerivedConfig, normalizedConfig);
|
|
97
|
+
}
|
|
98
|
+
finally {
|
|
99
|
+
legacyExplorerMetadataStub?.restore();
|
|
100
|
+
legacyDeploymentBlockStub?.restore();
|
|
101
|
+
legacyExplorerMetadataStub = undefined;
|
|
102
|
+
legacyDeploymentBlockStub = undefined;
|
|
89
103
|
}
|
|
90
|
-
assert.deepStrictEqual(normalizedDerivedConfig, normalizedConfig);
|
|
91
104
|
});
|
|
92
105
|
// create a new ISM and verify that it matches the config
|
|
93
106
|
async function createIsm(config) {
|
|
@@ -102,6 +115,44 @@ describe('EvmIsmModule', async () => {
|
|
|
102
115
|
testConfig = config;
|
|
103
116
|
return { ism, initialIsmAddress: ism.serialize().deployedIsm };
|
|
104
117
|
}
|
|
118
|
+
// Registers an externally built ISM with the afterEach state check.
|
|
119
|
+
function adoptIsm(ism, config) {
|
|
120
|
+
testIsm = ism;
|
|
121
|
+
testConfig = config;
|
|
122
|
+
return ism;
|
|
123
|
+
}
|
|
124
|
+
// Builds a StaticAggregationIsm whose blacklist submodule is the pre-audit
|
|
125
|
+
// contract that is still deployed on mainnet: no `values()`, and an event per
|
|
126
|
+
// entry even when the entry is already blacklisted.
|
|
127
|
+
async function deployLegacyBlacklistAggregation(owner, blacklistedIds) {
|
|
128
|
+
const ismFactory = HyperlaneIsmFactory.fromAddressesMap({ [chain]: factoryAddresses }, multiProvider);
|
|
129
|
+
const multisigConfig = randomMultisigIsmConfig(3, 5);
|
|
130
|
+
const multisigIsm = await ismFactory.deploy({
|
|
131
|
+
destination: chain,
|
|
132
|
+
config: multisigConfig,
|
|
133
|
+
});
|
|
134
|
+
const legacyIsm = await new TestLegacyBlacklistIsm__factory(multiProvider.getSigner(chain)).deploy(owner);
|
|
135
|
+
const deploymentReceipt = await legacyIsm.deployTransaction.wait();
|
|
136
|
+
legacyDeploymentBlocks.set(legacyIsm.address.toLowerCase(), deploymentReceipt.blockNumber);
|
|
137
|
+
for (const blacklistedId of blacklistedIds) {
|
|
138
|
+
await multiProvider.handleTx(chain, legacyIsm.blacklist([blacklistedId]));
|
|
139
|
+
}
|
|
140
|
+
// re-add everything so the log replay has to de-duplicate
|
|
141
|
+
await multiProvider.handleTx(chain, legacyIsm.blacklist(blacklistedIds));
|
|
142
|
+
const aggregationAddress = await ismFactory.deployStaticAddressSet(chain, factoryContracts.staticAggregationIsmFactory, [multisigIsm.address, legacyIsm.address], rootLogger, 2);
|
|
143
|
+
return { aggregationAddress, multisigConfig };
|
|
144
|
+
}
|
|
145
|
+
function moduleForAggregation(deployedIsm, config) {
|
|
146
|
+
return new EvmIsmModule(multiProvider, {
|
|
147
|
+
chain,
|
|
148
|
+
config,
|
|
149
|
+
addresses: {
|
|
150
|
+
...factoryAddresses,
|
|
151
|
+
mailbox: mailboxAddress,
|
|
152
|
+
deployedIsm,
|
|
153
|
+
},
|
|
154
|
+
});
|
|
155
|
+
}
|
|
105
156
|
describe('create', async () => {
|
|
106
157
|
it('deploys a simple ism', async () => {
|
|
107
158
|
const config = randomMultisigIsmConfig(3, 5);
|
|
@@ -612,6 +663,108 @@ describe('EvmIsmModule', async () => {
|
|
|
612
663
|
}
|
|
613
664
|
expect(blacklistFound).to.be.true;
|
|
614
665
|
});
|
|
666
|
+
describe('blacklist submodule that predates on-chain enumeration', () => {
|
|
667
|
+
beforeEach(() => {
|
|
668
|
+
legacyDeploymentBlocks.clear();
|
|
669
|
+
legacyDeploymentBlockStub = sinon
|
|
670
|
+
.stub(EvmEventLogsReader.prototype, 'getContractDeploymentBlockFromExplorer')
|
|
671
|
+
.callsFake(async (address) => {
|
|
672
|
+
const block = legacyDeploymentBlocks.get(address.toLowerCase());
|
|
673
|
+
assert(block !== undefined, `Missing deployment block for ${address}`);
|
|
674
|
+
return block;
|
|
675
|
+
});
|
|
676
|
+
// The test chain metadata declares an Etherscan explorer with a
|
|
677
|
+
// placeholder API key, which would send the log reader to the live
|
|
678
|
+
// Etherscan API before falling back to the RPC.
|
|
679
|
+
legacyExplorerMetadataStub = sinon
|
|
680
|
+
.stub(multiProvider, 'tryGetEvmExplorerMetadata')
|
|
681
|
+
.returns(null);
|
|
682
|
+
});
|
|
683
|
+
it('derives the submodule as a blacklist ISM with the ids replayed from logs', async () => {
|
|
684
|
+
const owner = await multiProvider.getSignerAddress(chain);
|
|
685
|
+
const firstId = randomBytes32();
|
|
686
|
+
const secondId = randomBytes32();
|
|
687
|
+
const { aggregationAddress, multisigConfig } = await deployLegacyBlacklistAggregation(owner, [firstId, secondId]);
|
|
688
|
+
const config = {
|
|
689
|
+
type: IsmType.AGGREGATION,
|
|
690
|
+
modules: [
|
|
691
|
+
multisigConfig,
|
|
692
|
+
{
|
|
693
|
+
type: IsmType.BLACKLIST,
|
|
694
|
+
owner,
|
|
695
|
+
blacklistedIds: [firstId, secondId],
|
|
696
|
+
},
|
|
697
|
+
],
|
|
698
|
+
threshold: 2,
|
|
699
|
+
};
|
|
700
|
+
const ism = adoptIsm(moduleForAggregation(aggregationAddress, config), config);
|
|
701
|
+
const derived = await ism.read();
|
|
702
|
+
assert(typeof derived !== 'string' && derived.type === IsmType.AGGREGATION, 'expected the derived config to be an aggregation');
|
|
703
|
+
const blacklistModule = derived.modules.find((module) => typeof module !== 'string' && module.type === IsmType.BLACKLIST);
|
|
704
|
+
assert(blacklistModule !== undefined &&
|
|
705
|
+
typeof blacklistModule !== 'string' &&
|
|
706
|
+
blacklistModule.type === IsmType.BLACKLIST, 'expected a blacklist submodule in the derived config');
|
|
707
|
+
expect(blacklistModule.blacklistedIds).to.have.members([
|
|
708
|
+
firstId.toLowerCase(),
|
|
709
|
+
secondId.toLowerCase(),
|
|
710
|
+
]);
|
|
711
|
+
});
|
|
712
|
+
it('applies no transactions when the submodule already matches', async () => {
|
|
713
|
+
const owner = await multiProvider.getSignerAddress(chain);
|
|
714
|
+
const blacklistedId = randomBytes32();
|
|
715
|
+
const { aggregationAddress, multisigConfig } = await deployLegacyBlacklistAggregation(owner, [blacklistedId]);
|
|
716
|
+
const config = {
|
|
717
|
+
type: IsmType.AGGREGATION,
|
|
718
|
+
modules: [
|
|
719
|
+
multisigConfig,
|
|
720
|
+
{ type: IsmType.BLACKLIST, owner, blacklistedIds: [blacklistedId] },
|
|
721
|
+
],
|
|
722
|
+
threshold: 2,
|
|
723
|
+
};
|
|
724
|
+
const ism = adoptIsm(moduleForAggregation(aggregationAddress, config), config);
|
|
725
|
+
await expectTxsAndUpdate(ism, config, 0);
|
|
726
|
+
expect(eqAddress(aggregationAddress, ism.serialize().deployedIsm)).to.be
|
|
727
|
+
.true;
|
|
728
|
+
});
|
|
729
|
+
it('redeploys instead of blacklisting in place when an id is added', async () => {
|
|
730
|
+
const owner = await multiProvider.getSignerAddress(chain);
|
|
731
|
+
const existingId = randomBytes32();
|
|
732
|
+
const newId = randomBytes32();
|
|
733
|
+
const { aggregationAddress, multisigConfig } = await deployLegacyBlacklistAggregation(owner, [existingId]);
|
|
734
|
+
const config = {
|
|
735
|
+
type: IsmType.AGGREGATION,
|
|
736
|
+
modules: [
|
|
737
|
+
multisigConfig,
|
|
738
|
+
{
|
|
739
|
+
type: IsmType.BLACKLIST,
|
|
740
|
+
owner,
|
|
741
|
+
blacklistedIds: [existingId, newId],
|
|
742
|
+
},
|
|
743
|
+
],
|
|
744
|
+
threshold: 2,
|
|
745
|
+
};
|
|
746
|
+
const ism = adoptIsm(moduleForAggregation(aggregationAddress, config), config);
|
|
747
|
+
// update() redeploys internally and emits no txs
|
|
748
|
+
await expectTxsAndUpdate(ism, config, 0);
|
|
749
|
+
expect(eqAddress(aggregationAddress, ism.serialize().deployedIsm)).to.be
|
|
750
|
+
.false;
|
|
751
|
+
const provider = multiProvider.getProvider(chain);
|
|
752
|
+
const [moduleAddresses] = await StaticAggregationIsm__factory.connect(ism.serialize().deployedIsm, provider).modulesAndThreshold(hre.ethers.constants.AddressZero);
|
|
753
|
+
let blacklistFound = false;
|
|
754
|
+
for (const moduleAddress of moduleAddresses) {
|
|
755
|
+
const blacklistIsm = BlacklistIsm__factory.connect(moduleAddress, provider);
|
|
756
|
+
if ((await blacklistIsm.moduleType()) === ModuleType.NULL) {
|
|
757
|
+
// the replacement exposes on-chain enumeration and carries both ids
|
|
758
|
+
expect(await blacklistIsm.values()).to.have.members([
|
|
759
|
+
existingId,
|
|
760
|
+
newId,
|
|
761
|
+
]);
|
|
762
|
+
blacklistFound = true;
|
|
763
|
+
}
|
|
764
|
+
}
|
|
765
|
+
expect(blacklistFound).to.be.true;
|
|
766
|
+
});
|
|
767
|
+
});
|
|
615
768
|
});
|
|
616
769
|
});
|
|
617
770
|
//# sourceMappingURL=EvmIsmModule.hardhat-test.js.map
|