@hyperlane-xyz/sdk 4.0.0 → 4.2.0-beta.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/aws/validator.js +1 -1
- package/dist/aws/validator.js.map +1 -1
- package/dist/consts/multisigIsm.d.ts.map +1 -1
- package/dist/consts/multisigIsm.js +78 -19
- package/dist/consts/multisigIsm.js.map +1 -1
- package/dist/core/EvmCoreModule.d.ts +4 -0
- package/dist/core/EvmCoreModule.d.ts.map +1 -1
- package/dist/core/EvmCoreModule.js +8 -9
- package/dist/core/EvmCoreModule.js.map +1 -1
- package/dist/core/EvmCoreReader.d.ts +1 -0
- package/dist/core/EvmCoreReader.d.ts.map +1 -1
- package/dist/core/EvmCoreReader.js +11 -2
- package/dist/core/EvmCoreReader.js.map +1 -1
- package/dist/core/EvmIcaModule.d.ts +3 -1
- package/dist/core/EvmIcaModule.d.ts.map +1 -1
- package/dist/core/EvmIcaModule.js +2 -2
- package/dist/core/EvmIcaModule.js.map +1 -1
- package/dist/core/HyperlaneCore.d.ts +23 -7
- package/dist/core/HyperlaneCore.d.ts.map +1 -1
- package/dist/core/HyperlaneCore.js +82 -24
- package/dist/core/HyperlaneCore.js.map +1 -1
- package/dist/core/HyperlaneCoreChecker.d.ts.map +1 -1
- package/dist/core/HyperlaneCoreChecker.js +1 -1
- package/dist/core/HyperlaneCoreChecker.js.map +1 -1
- package/dist/core/HyperlaneCoreDeployer.d.ts.map +1 -1
- package/dist/core/HyperlaneCoreDeployer.js +6 -1
- package/dist/core/HyperlaneCoreDeployer.js.map +1 -1
- package/dist/core/HyperlaneRelayer.d.ts +328 -0
- package/dist/core/HyperlaneRelayer.d.ts.map +1 -0
- package/dist/core/HyperlaneRelayer.js +144 -0
- package/dist/core/HyperlaneRelayer.js.map +1 -0
- package/dist/core/schemas.d.ts +842 -842
- package/dist/deploy/EvmModuleDeployer.d.ts +4 -3
- package/dist/deploy/EvmModuleDeployer.d.ts.map +1 -1
- package/dist/deploy/EvmModuleDeployer.js +11 -4
- package/dist/deploy/EvmModuleDeployer.js.map +1 -1
- package/dist/deploy/HyperlaneDeployer.d.ts +1 -1
- package/dist/deploy/HyperlaneDeployer.d.ts.map +1 -1
- package/dist/deploy/HyperlaneDeployer.js +20 -9
- package/dist/deploy/HyperlaneDeployer.js.map +1 -1
- package/dist/deploy/proxy.d.ts +1 -0
- package/dist/deploy/proxy.d.ts.map +1 -1
- package/dist/deploy/proxy.js +6 -0
- package/dist/deploy/proxy.js.map +1 -1
- package/dist/deploy/schemas.d.ts +20 -0
- package/dist/deploy/schemas.d.ts.map +1 -1
- package/dist/deploy/schemas.js +7 -0
- package/dist/deploy/schemas.js.map +1 -1
- package/dist/deploy/verify/ContractVerifier.d.ts +20 -6
- package/dist/deploy/verify/ContractVerifier.d.ts.map +1 -1
- package/dist/deploy/verify/ContractVerifier.js +187 -97
- package/dist/deploy/verify/ContractVerifier.js.map +1 -1
- package/dist/deploy/verify/types.d.ts +15 -4
- package/dist/deploy/verify/types.d.ts.map +1 -1
- package/dist/deploy/verify/types.js +4 -3
- package/dist/deploy/verify/types.js.map +1 -1
- package/dist/deploy/verify/utils.d.ts +9 -2
- package/dist/deploy/verify/utils.d.ts.map +1 -1
- package/dist/deploy/verify/utils.js +4 -3
- package/dist/deploy/verify/utils.js.map +1 -1
- package/dist/hook/EvmHookModule.d.ts +45 -6
- package/dist/hook/EvmHookModule.d.ts.map +1 -1
- package/dist/hook/EvmHookModule.hardhat-test.js +334 -106
- package/dist/hook/EvmHookModule.hardhat-test.js.map +1 -1
- package/dist/hook/EvmHookModule.js +293 -75
- package/dist/hook/EvmHookModule.js.map +1 -1
- package/dist/hook/EvmHookReader.d.ts +7 -12
- package/dist/hook/EvmHookReader.d.ts.map +1 -1
- package/dist/hook/EvmHookReader.js +44 -41
- package/dist/hook/EvmHookReader.js.map +1 -1
- package/dist/hook/EvmHookReader.test.js +7 -3
- package/dist/hook/EvmHookReader.test.js.map +1 -1
- package/dist/hook/schemas.d.ts +4 -4
- package/dist/hook/types.d.ts +1 -0
- package/dist/hook/types.d.ts.map +1 -1
- package/dist/hook/types.js +8 -0
- package/dist/hook/types.js.map +1 -1
- package/dist/index.d.ts +61 -58
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +46 -46
- package/dist/index.js.map +1 -1
- package/dist/ism/EvmIsmModule.d.ts +7 -7
- package/dist/ism/EvmIsmModule.d.ts.map +1 -1
- package/dist/ism/EvmIsmModule.hardhat-test.js +30 -28
- package/dist/ism/EvmIsmModule.hardhat-test.js.map +1 -1
- package/dist/ism/EvmIsmModule.js +42 -60
- package/dist/ism/EvmIsmModule.js.map +1 -1
- package/dist/ism/EvmIsmReader.d.ts +5 -4
- package/dist/ism/EvmIsmReader.d.ts.map +1 -1
- package/dist/ism/EvmIsmReader.js +56 -36
- package/dist/ism/EvmIsmReader.js.map +1 -1
- package/dist/ism/HyperlaneIsmFactory.d.ts.map +1 -1
- package/dist/ism/HyperlaneIsmFactory.js +2 -0
- package/dist/ism/HyperlaneIsmFactory.js.map +1 -1
- package/dist/ism/metadata/aggregation.test.js +1 -1
- package/dist/ism/metadata/aggregation.test.js.map +1 -1
- package/dist/ism/metadata/builder.hardhat-test.js +29 -14
- package/dist/ism/metadata/builder.hardhat-test.js.map +1 -1
- package/dist/ism/metadata/multisig.d.ts.map +1 -1
- package/dist/ism/metadata/multisig.js +1 -1
- package/dist/ism/metadata/multisig.js.map +1 -1
- package/dist/ism/utils.js +2 -2
- package/dist/ism/utils.js.map +1 -1
- package/dist/metadata/ChainMetadataManager.d.ts +2 -0
- package/dist/metadata/ChainMetadataManager.d.ts.map +1 -1
- package/dist/metadata/ChainMetadataManager.js +6 -0
- package/dist/metadata/ChainMetadataManager.js.map +1 -1
- package/dist/metadata/agentConfig.d.ts +1968 -1723
- package/dist/metadata/agentConfig.d.ts.map +1 -1
- package/dist/metadata/chainMetadataTypes.d.ts +724 -618
- package/dist/metadata/chainMetadataTypes.d.ts.map +1 -1
- package/dist/metadata/chainMetadataTypes.js +63 -51
- package/dist/metadata/chainMetadataTypes.js.map +1 -1
- package/dist/metadata/deploymentArtifacts.d.ts +2 -2
- package/dist/providers/MultiProvider.d.ts +7 -0
- package/dist/providers/MultiProvider.d.ts.map +1 -1
- package/dist/providers/MultiProvider.js +9 -1
- package/dist/providers/MultiProvider.js.map +1 -1
- package/dist/providers/SmartProvider/SmartProvider.d.ts +2 -1
- package/dist/providers/SmartProvider/SmartProvider.d.ts.map +1 -1
- package/dist/providers/SmartProvider/SmartProvider.foundry-test.js +58 -0
- package/dist/providers/SmartProvider/SmartProvider.foundry-test.js.map +1 -1
- package/dist/providers/SmartProvider/SmartProvider.js +34 -9
- package/dist/providers/SmartProvider/SmartProvider.js.map +1 -1
- package/dist/providers/transactions/schemas.d.ts +15 -2
- package/dist/providers/transactions/schemas.d.ts.map +1 -1
- package/dist/providers/transactions/schemas.js +1 -0
- package/dist/providers/transactions/schemas.js.map +1 -1
- package/dist/providers/transactions/submitter/builder/schemas.d.ts +67 -146
- package/dist/providers/transactions/submitter/builder/schemas.d.ts.map +1 -1
- package/dist/providers/transactions/submitter/ethersV5/EV5GnosisSafeTxSubmitter.d.ts +2 -2
- package/dist/providers/transactions/submitter/ethersV5/EV5GnosisSafeTxSubmitter.d.ts.map +1 -1
- package/dist/providers/transactions/submitter/ethersV5/EV5GnosisSafeTxSubmitter.js.map +1 -1
- package/dist/providers/transactions/submitter/ethersV5/EV5ImpersonatedAccountTxSubmitter.d.ts +2 -2
- package/dist/providers/transactions/submitter/ethersV5/EV5ImpersonatedAccountTxSubmitter.d.ts.map +1 -1
- package/dist/providers/transactions/submitter/ethersV5/EV5ImpersonatedAccountTxSubmitter.js.map +1 -1
- package/dist/providers/transactions/submitter/ethersV5/EV5JsonRpcTxSubmitter.d.ts +2 -2
- package/dist/providers/transactions/submitter/ethersV5/EV5JsonRpcTxSubmitter.d.ts.map +1 -1
- package/dist/providers/transactions/submitter/ethersV5/EV5JsonRpcTxSubmitter.js.map +1 -1
- package/dist/providers/transactions/submitter/schemas.d.ts +9 -34
- package/dist/providers/transactions/submitter/schemas.d.ts.map +1 -1
- package/dist/providers/transactions/submitter/schemas.js +2 -3
- package/dist/providers/transactions/submitter/schemas.js.map +1 -1
- package/dist/providers/transactions/transformer/ethersV5/EV5InterchainAccountTxTransformer.d.ts +2 -2
- package/dist/providers/transactions/transformer/ethersV5/EV5InterchainAccountTxTransformer.d.ts.map +1 -1
- package/dist/providers/transactions/transformer/ethersV5/EV5InterchainAccountTxTransformer.js +5 -5
- package/dist/providers/transactions/transformer/ethersV5/EV5InterchainAccountTxTransformer.js.map +1 -1
- package/dist/providers/transactions/transformer/schemas.d.ts +36 -76
- package/dist/providers/transactions/transformer/schemas.d.ts.map +1 -1
- package/dist/providers/transactions/transformer/schemas.js +1 -1
- package/dist/providers/transactions/transformer/schemas.js.map +1 -1
- package/dist/providers/transactions/types.d.ts +2 -1
- package/dist/providers/transactions/types.d.ts.map +1 -1
- package/dist/router/schemas.d.ts +196 -90
- package/dist/router/schemas.d.ts.map +1 -1
- package/dist/router/schemas.js +8 -1
- package/dist/router/schemas.js.map +1 -1
- package/dist/router/types.d.ts +2 -1
- package/dist/router/types.d.ts.map +1 -1
- package/dist/router/types.js.map +1 -1
- package/dist/test/testUtils.js +1 -1
- package/dist/test/testUtils.js.map +1 -1
- package/dist/token/EvmERC20WarpModule.d.ts +40 -5
- package/dist/token/EvmERC20WarpModule.d.ts.map +1 -1
- package/dist/token/EvmERC20WarpModule.hardhat-test.js +252 -1
- package/dist/token/EvmERC20WarpModule.hardhat-test.js.map +1 -1
- package/dist/token/EvmERC20WarpModule.js +136 -9
- package/dist/token/EvmERC20WarpModule.js.map +1 -1
- package/dist/token/EvmERC20WarpRouteReader.d.ts +4 -9
- package/dist/token/EvmERC20WarpRouteReader.d.ts.map +1 -1
- package/dist/token/EvmERC20WarpRouteReader.hardhat-test.js +27 -2
- package/dist/token/EvmERC20WarpRouteReader.hardhat-test.js.map +1 -1
- package/dist/token/EvmERC20WarpRouteReader.js +19 -21
- package/dist/token/EvmERC20WarpRouteReader.js.map +1 -1
- package/dist/token/IToken.d.ts +6 -6
- package/dist/token/TokenConnection.d.ts +2 -2
- package/dist/token/deploy.d.ts +2 -2
- package/dist/token/deploy.d.ts.map +1 -1
- package/dist/token/deploy.js +20 -5
- package/dist/token/deploy.js.map +1 -1
- package/dist/token/schemas.d.ts +176 -88
- package/dist/token/schemas.d.ts.map +1 -1
- package/dist/utils/HyperlaneReader.d.ts +17 -0
- package/dist/utils/HyperlaneReader.d.ts.map +1 -0
- package/dist/utils/HyperlaneReader.js +21 -0
- package/dist/utils/HyperlaneReader.js.map +1 -0
- package/dist/utils/cosmos.d.ts +5 -0
- package/dist/utils/cosmos.d.ts.map +1 -1
- package/dist/utils/cosmos.js +7 -1
- package/dist/utils/cosmos.js.map +1 -1
- package/dist/warp/WarpCore.d.ts +12 -0
- package/dist/warp/WarpCore.d.ts.map +1 -1
- package/dist/warp/WarpCore.js +63 -32
- package/dist/warp/WarpCore.js.map +1 -1
- package/dist/warp/types.d.ts +10 -10
- package/package.json +3 -3
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import { providers } from 'ethers';
|
|
2
1
|
import { Address, WithAddress } from '@hyperlane-xyz/utils';
|
|
3
2
|
import { MultiProvider } from '../providers/MultiProvider.js';
|
|
4
3
|
import { ChainNameOrId } from '../types.js';
|
|
5
|
-
import {
|
|
4
|
+
import { HyperlaneReader } from '../utils/HyperlaneReader.js';
|
|
5
|
+
import { AggregationHookConfig, DomainRoutingHookConfig, FallbackRoutingHookConfig, HookConfig, IgpHookConfig, MerkleTreeHookConfig, OnchainHookType, OpStackHookConfig, PausableHookConfig, ProtocolFeeHookConfig } from './types.js';
|
|
6
6
|
export type DerivedHookConfig = WithAddress<Exclude<HookConfig, Address>>;
|
|
7
7
|
export interface HookReader {
|
|
8
|
-
deriveHookConfig(address: Address): Promise<WithAddress<HookConfig
|
|
8
|
+
deriveHookConfig(address: Address): Promise<WithAddress<HookConfig>>;
|
|
9
9
|
deriveMerkleTreeConfig(address: Address): Promise<WithAddress<MerkleTreeHookConfig>>;
|
|
10
10
|
deriveAggregationConfig(address: Address): Promise<WithAddress<AggregationHookConfig>>;
|
|
11
11
|
deriveIgpConfig(address: Address): Promise<WithAddress<IgpHookConfig>>;
|
|
@@ -14,15 +14,15 @@ export interface HookReader {
|
|
|
14
14
|
deriveDomainRoutingConfig(address: Address): Promise<WithAddress<DomainRoutingHookConfig>>;
|
|
15
15
|
deriveFallbackRoutingConfig(address: Address): Promise<WithAddress<FallbackRoutingHookConfig>>;
|
|
16
16
|
derivePausableConfig(address: Address): Promise<WithAddress<PausableHookConfig>>;
|
|
17
|
+
assertHookType(hookType: OnchainHookType, expectedType: OnchainHookType): void;
|
|
17
18
|
}
|
|
18
|
-
export declare class EvmHookReader implements HookReader {
|
|
19
|
+
export declare class EvmHookReader extends HyperlaneReader implements HookReader {
|
|
19
20
|
protected readonly multiProvider: MultiProvider;
|
|
20
21
|
protected readonly chain: ChainNameOrId;
|
|
21
22
|
protected readonly concurrency: number;
|
|
22
|
-
protected readonly provider: providers.Provider;
|
|
23
23
|
protected readonly logger: import("pino").default.Logger<never>;
|
|
24
24
|
constructor(multiProvider: MultiProvider, chain: ChainNameOrId, concurrency?: number);
|
|
25
|
-
deriveHookConfig(address: Address): Promise<DerivedHookConfig
|
|
25
|
+
deriveHookConfig(address: Address): Promise<DerivedHookConfig>;
|
|
26
26
|
deriveMerkleTreeConfig(address: Address): Promise<WithAddress<MerkleTreeHookConfig>>;
|
|
27
27
|
deriveAggregationConfig(address: Address): Promise<WithAddress<AggregationHookConfig>>;
|
|
28
28
|
deriveIgpConfig(address: Address): Promise<WithAddress<IgpHookConfig>>;
|
|
@@ -32,11 +32,6 @@ export declare class EvmHookReader implements HookReader {
|
|
|
32
32
|
deriveFallbackRoutingConfig(address: Address): Promise<WithAddress<FallbackRoutingHookConfig>>;
|
|
33
33
|
private fetchDomainHooks;
|
|
34
34
|
derivePausableConfig(address: Address): Promise<WithAddress<PausableHookConfig>>;
|
|
35
|
-
|
|
36
|
-
* Conditionally sets the log level for a smart provider.
|
|
37
|
-
*
|
|
38
|
-
* @param level - The log level to set, e.g. 'debug', 'info', 'warn', 'error'.
|
|
39
|
-
*/
|
|
40
|
-
protected setSmartProviderLogLevel(level: string): void;
|
|
35
|
+
assertHookType(hookType: OnchainHookType, expectedType: OnchainHookType): void;
|
|
41
36
|
}
|
|
42
37
|
//# sourceMappingURL=EvmHookReader.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EvmHookReader.d.ts","sourceRoot":"","sources":["../../src/hook/EvmHookReader.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"EvmHookReader.d.ts","sourceRoot":"","sources":["../../src/hook/EvmHookReader.ts"],"names":[],"mappings":"AAgBA,OAAO,EACL,OAAO,EACP,WAAW,EAMZ,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAE9D,OAAO,EACL,qBAAqB,EACrB,uBAAuB,EACvB,yBAAyB,EACzB,UAAU,EAEV,aAAa,EACb,oBAAoB,EACpB,eAAe,EACf,iBAAiB,EACjB,kBAAkB,EAClB,qBAAqB,EAEtB,MAAM,YAAY,CAAC;AAEpB,MAAM,MAAM,iBAAiB,GAAG,WAAW,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC;AAE1E,MAAM,WAAW,UAAU;IACzB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC;IACrE,sBAAsB,CACpB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,WAAW,CAAC,oBAAoB,CAAC,CAAC,CAAC;IAC9C,uBAAuB,CACrB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC,CAAC;IAC/C,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC;IACvE,uBAAuB,CACrB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC,CAAC;IAC/C,mBAAmB,CACjB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAC3C,yBAAyB,CACvB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,WAAW,CAAC,uBAAuB,CAAC,CAAC,CAAC;IACjD,2BAA2B,CACzB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,WAAW,CAAC,yBAAyB,CAAC,CAAC,CAAC;IACnD,oBAAoB,CAClB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAC5C,cAAc,CACZ,QAAQ,EAAE,eAAe,EACzB,YAAY,EAAE,eAAe,GAC5B,IAAI,CAAC;CACT;AAED,qBAAa,aAAc,SAAQ,eAAgB,YAAW,UAAU;IAIpE,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa;IAC/C,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,aAAa;IACvC,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM;IALxC,SAAS,CAAC,QAAQ,CAAC,MAAM,uCAAiD;gBAGrD,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,aAAa,EACpB,WAAW,GAAE,MAEM;IAKlC,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAiE9D,sBAAsB,CAC1B,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,WAAW,CAAC,oBAAoB,CAAC,CAAC;IAUvC,uBAAuB,CAC3B,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC;IAkBxC,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;IA4EtE,uBAAuB,CAC3B,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC;IAmBxC,mBAAmB,CACvB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC;IAmBpC,yBAAyB,CAC7B,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,WAAW,CAAC,uBAAuB,CAAC,CAAC;IAe1C,2BAA2B,CAC/B,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,WAAW,CAAC,yBAAyB,CAAC,CAAC;YAyBpC,gBAAgB;IAyBxB,oBAAoB,CACxB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC;IAc3C,cAAc,CACZ,QAAQ,EAAE,eAAe,EACzB,YAAY,EAAE,eAAe,GAC5B,IAAI;CAMR"}
|
|
@@ -2,62 +2,80 @@ import { ethers } from 'ethers';
|
|
|
2
2
|
import { DomainRoutingHook__factory, FallbackDomainRoutingHook__factory, IPostDispatchHook__factory, InterchainGasPaymaster__factory, MerkleTreeHook__factory, OPStackHook__factory, PausableHook__factory, ProtocolFee__factory, StaticAggregationHook__factory, StorageGasOracle__factory, } from '@hyperlane-xyz/core';
|
|
3
3
|
import { assert, concurrentMap, eqAddress, getLogLevel, rootLogger, } from '@hyperlane-xyz/utils';
|
|
4
4
|
import { DEFAULT_CONTRACT_READ_CONCURRENCY } from '../consts/concurrency.js';
|
|
5
|
+
import { HyperlaneReader } from '../utils/HyperlaneReader.js';
|
|
5
6
|
import { HookType, OnchainHookType, } from './types.js';
|
|
6
|
-
export class EvmHookReader {
|
|
7
|
+
export class EvmHookReader extends HyperlaneReader {
|
|
7
8
|
multiProvider;
|
|
8
9
|
chain;
|
|
9
10
|
concurrency;
|
|
10
|
-
provider;
|
|
11
11
|
logger = rootLogger.child({ module: 'EvmHookReader' });
|
|
12
12
|
constructor(multiProvider, chain, concurrency = multiProvider.tryGetRpcConcurrency(chain) ?? DEFAULT_CONTRACT_READ_CONCURRENCY) {
|
|
13
|
+
super(multiProvider, chain);
|
|
13
14
|
this.multiProvider = multiProvider;
|
|
14
15
|
this.chain = chain;
|
|
15
16
|
this.concurrency = concurrency;
|
|
16
|
-
this.provider = multiProvider.getProvider(chain);
|
|
17
17
|
}
|
|
18
18
|
async deriveHookConfig(address) {
|
|
19
19
|
let onchainHookType = undefined;
|
|
20
|
+
let derivedHookConfig;
|
|
20
21
|
try {
|
|
21
22
|
const hook = IPostDispatchHook__factory.connect(address, this.provider);
|
|
22
|
-
this.logger.debug('Deriving HookConfig', { address });
|
|
23
|
+
this.logger.debug('Deriving HookConfig:', { address });
|
|
23
24
|
// Temporarily turn off SmartProvider logging
|
|
24
25
|
// Provider errors are expected because deriving will call methods that may not exist in the Bytecode
|
|
25
26
|
this.setSmartProviderLogLevel('silent');
|
|
26
27
|
onchainHookType = await hook.hookType();
|
|
27
28
|
switch (onchainHookType) {
|
|
28
29
|
case OnchainHookType.ROUTING:
|
|
29
|
-
|
|
30
|
+
derivedHookConfig = await this.deriveDomainRoutingConfig(address);
|
|
31
|
+
break;
|
|
30
32
|
case OnchainHookType.AGGREGATION:
|
|
31
|
-
|
|
33
|
+
derivedHookConfig = await this.deriveAggregationConfig(address);
|
|
34
|
+
break;
|
|
32
35
|
case OnchainHookType.MERKLE_TREE:
|
|
33
|
-
|
|
36
|
+
derivedHookConfig = await this.deriveMerkleTreeConfig(address);
|
|
37
|
+
break;
|
|
34
38
|
case OnchainHookType.INTERCHAIN_GAS_PAYMASTER:
|
|
35
|
-
|
|
39
|
+
derivedHookConfig = await this.deriveIgpConfig(address);
|
|
40
|
+
break;
|
|
36
41
|
case OnchainHookType.FALLBACK_ROUTING:
|
|
37
|
-
|
|
42
|
+
derivedHookConfig = await this.deriveFallbackRoutingConfig(address);
|
|
43
|
+
break;
|
|
38
44
|
case OnchainHookType.PAUSABLE:
|
|
39
|
-
|
|
45
|
+
derivedHookConfig = await this.derivePausableConfig(address);
|
|
46
|
+
break;
|
|
40
47
|
case OnchainHookType.PROTOCOL_FEE:
|
|
41
|
-
|
|
48
|
+
derivedHookConfig = await this.deriveProtocolFeeConfig(address);
|
|
49
|
+
break;
|
|
42
50
|
// ID_AUTH_ISM could be OPStackHook, ERC5164Hook or LayerZeroV2Hook
|
|
43
51
|
// For now assume it's OP_STACK
|
|
44
52
|
case OnchainHookType.ID_AUTH_ISM:
|
|
45
|
-
|
|
53
|
+
derivedHookConfig = await this.deriveOpStackConfig(address);
|
|
54
|
+
break;
|
|
46
55
|
default:
|
|
47
56
|
throw new Error(`Unsupported HookType: ${OnchainHookType[onchainHookType]}`);
|
|
48
57
|
}
|
|
49
58
|
}
|
|
50
59
|
catch (e) {
|
|
51
|
-
|
|
60
|
+
let customMessage = `Failed to derive ${onchainHookType} hook (${address})`;
|
|
61
|
+
if (!onchainHookType &&
|
|
62
|
+
e.message.includes('Invalid response from provider')) {
|
|
63
|
+
customMessage = customMessage.concat(` [The provided hook contract might be outdated and not support hookType()]`);
|
|
64
|
+
this.logger.info(`${customMessage}:\n\t${e}`);
|
|
65
|
+
}
|
|
66
|
+
else {
|
|
67
|
+
this.logger.debug(`${customMessage}:\n\t${e}`);
|
|
68
|
+
}
|
|
69
|
+
throw new Error(`${customMessage}:\n\t${e}`);
|
|
52
70
|
}
|
|
53
71
|
finally {
|
|
54
72
|
this.setSmartProviderLogLevel(getLogLevel()); // returns to original level defined by rootLogger
|
|
55
73
|
}
|
|
56
|
-
return
|
|
74
|
+
return derivedHookConfig;
|
|
57
75
|
}
|
|
58
76
|
async deriveMerkleTreeConfig(address) {
|
|
59
77
|
const hook = MerkleTreeHook__factory.connect(address, this.provider);
|
|
60
|
-
|
|
78
|
+
this.assertHookType(await hook.hookType(), OnchainHookType.MERKLE_TREE);
|
|
61
79
|
return {
|
|
62
80
|
address,
|
|
63
81
|
type: HookType.MERKLE_TREE,
|
|
@@ -65,13 +83,9 @@ export class EvmHookReader {
|
|
|
65
83
|
}
|
|
66
84
|
async deriveAggregationConfig(address) {
|
|
67
85
|
const hook = StaticAggregationHook__factory.connect(address, this.provider);
|
|
68
|
-
|
|
86
|
+
this.assertHookType(await hook.hookType(), OnchainHookType.AGGREGATION);
|
|
69
87
|
const hooks = await hook.hooks(ethers.constants.AddressZero);
|
|
70
|
-
const hookConfigs = await concurrentMap(this.concurrency, hooks,
|
|
71
|
-
const hookConfig = await this.deriveHookConfig(hook);
|
|
72
|
-
assert(hookConfig, `No hook config found for ${hook}.`);
|
|
73
|
-
return hookConfig;
|
|
74
|
-
});
|
|
88
|
+
const hookConfigs = await concurrentMap(this.concurrency, hooks, (hook) => this.deriveHookConfig(hook));
|
|
75
89
|
return {
|
|
76
90
|
address,
|
|
77
91
|
type: HookType.AGGREGATION,
|
|
@@ -80,7 +94,7 @@ export class EvmHookReader {
|
|
|
80
94
|
}
|
|
81
95
|
async deriveIgpConfig(address) {
|
|
82
96
|
const hook = InterchainGasPaymaster__factory.connect(address, this.provider);
|
|
83
|
-
|
|
97
|
+
this.assertHookType(await hook.hookType(), OnchainHookType.INTERCHAIN_GAS_PAYMASTER);
|
|
84
98
|
const owner = await hook.owner();
|
|
85
99
|
const beneficiary = await hook.beneficiary();
|
|
86
100
|
const overhead = {};
|
|
@@ -124,7 +138,7 @@ export class EvmHookReader {
|
|
|
124
138
|
}
|
|
125
139
|
async deriveProtocolFeeConfig(address) {
|
|
126
140
|
const hook = ProtocolFee__factory.connect(address, this.provider);
|
|
127
|
-
|
|
141
|
+
this.assertHookType(await hook.hookType(), OnchainHookType.PROTOCOL_FEE);
|
|
128
142
|
const owner = await hook.owner();
|
|
129
143
|
const maxProtocolFee = await hook.MAX_PROTOCOL_FEE();
|
|
130
144
|
const protocolFee = await hook.protocolFee();
|
|
@@ -141,7 +155,7 @@ export class EvmHookReader {
|
|
|
141
155
|
async deriveOpStackConfig(address) {
|
|
142
156
|
const hook = OPStackHook__factory.connect(address, this.provider);
|
|
143
157
|
const owner = await hook.owner();
|
|
144
|
-
|
|
158
|
+
this.assertHookType(await hook.hookType(), OnchainHookType.ID_AUTH_ISM);
|
|
145
159
|
const messengerContract = await hook.l1Messenger();
|
|
146
160
|
const destinationDomain = await hook.destinationDomain();
|
|
147
161
|
const destinationChainName = this.multiProvider.getChainName(destinationDomain);
|
|
@@ -155,7 +169,7 @@ export class EvmHookReader {
|
|
|
155
169
|
}
|
|
156
170
|
async deriveDomainRoutingConfig(address) {
|
|
157
171
|
const hook = DomainRoutingHook__factory.connect(address, this.provider);
|
|
158
|
-
|
|
172
|
+
this.assertHookType(await hook.hookType(), OnchainHookType.ROUTING);
|
|
159
173
|
const owner = await hook.owner();
|
|
160
174
|
const domainHooks = await this.fetchDomainHooks(hook);
|
|
161
175
|
return {
|
|
@@ -167,12 +181,11 @@ export class EvmHookReader {
|
|
|
167
181
|
}
|
|
168
182
|
async deriveFallbackRoutingConfig(address) {
|
|
169
183
|
const hook = FallbackDomainRoutingHook__factory.connect(address, this.provider);
|
|
170
|
-
|
|
184
|
+
this.assertHookType(await hook.hookType(), OnchainHookType.FALLBACK_ROUTING);
|
|
171
185
|
const owner = await hook.owner();
|
|
172
186
|
const domainHooks = await this.fetchDomainHooks(hook);
|
|
173
187
|
const fallbackHook = await hook.fallbackHook();
|
|
174
188
|
const fallbackHookConfig = await this.deriveHookConfig(fallbackHook);
|
|
175
|
-
assert(fallbackHookConfig, `No fallback hook config found for ${fallbackHook}.`);
|
|
176
189
|
return {
|
|
177
190
|
owner,
|
|
178
191
|
address,
|
|
@@ -189,9 +202,7 @@ export class EvmHookReader {
|
|
|
189
202
|
try {
|
|
190
203
|
const domainHook = await hook.hooks(domainId);
|
|
191
204
|
if (domainHook !== ethers.constants.AddressZero) {
|
|
192
|
-
|
|
193
|
-
assert(hookConfig, `No hook config found for ${domainHook}.`);
|
|
194
|
-
domainHooks[chainName] = hookConfig;
|
|
205
|
+
domainHooks[chainName] = await this.deriveHookConfig(domainHook);
|
|
195
206
|
}
|
|
196
207
|
}
|
|
197
208
|
catch (error) {
|
|
@@ -202,7 +213,7 @@ export class EvmHookReader {
|
|
|
202
213
|
}
|
|
203
214
|
async derivePausableConfig(address) {
|
|
204
215
|
const hook = PausableHook__factory.connect(address, this.provider);
|
|
205
|
-
|
|
216
|
+
this.assertHookType(await hook.hookType(), OnchainHookType.PAUSABLE);
|
|
206
217
|
const owner = await hook.owner();
|
|
207
218
|
const paused = await hook.paused();
|
|
208
219
|
return {
|
|
@@ -212,16 +223,8 @@ export class EvmHookReader {
|
|
|
212
223
|
type: HookType.PAUSABLE,
|
|
213
224
|
};
|
|
214
225
|
}
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
*
|
|
218
|
-
* @param level - The log level to set, e.g. 'debug', 'info', 'warn', 'error'.
|
|
219
|
-
*/
|
|
220
|
-
setSmartProviderLogLevel(level) {
|
|
221
|
-
if ('setLogLevel' in this.provider) {
|
|
222
|
-
//@ts-ignore
|
|
223
|
-
this.provider.setLogLevel(level);
|
|
224
|
-
}
|
|
226
|
+
assertHookType(hookType, expectedType) {
|
|
227
|
+
assert(hookType === expectedType, `expected hook type to be ${expectedType}, got ${hookType}`);
|
|
225
228
|
}
|
|
226
229
|
}
|
|
227
230
|
//# sourceMappingURL=EvmHookReader.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EvmHookReader.js","sourceRoot":"","sources":["../../src/hook/EvmHookReader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"EvmHookReader.js","sourceRoot":"","sources":["../../src/hook/EvmHookReader.ts"],"names":[],"mappings":"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"}
|
|
@@ -139,7 +139,7 @@ describe('EvmHookReader', () => {
|
|
|
139
139
|
const config = await evmHookReader.deriveOpStackConfig(mockAddress);
|
|
140
140
|
expect(config).to.deep.equal(hookConfig);
|
|
141
141
|
});
|
|
142
|
-
it('should
|
|
142
|
+
it('should throw if derivation fails', async () => {
|
|
143
143
|
const mockAddress = generateRandomAddress();
|
|
144
144
|
const mockOwner = generateRandomAddress();
|
|
145
145
|
// Mocking the connect method + returned what we need from contract object
|
|
@@ -154,8 +154,12 @@ describe('EvmHookReader', () => {
|
|
|
154
154
|
.stub(IPostDispatchHook__factory, 'connect')
|
|
155
155
|
.returns(mockContract);
|
|
156
156
|
// top-level method infers hook type
|
|
157
|
-
|
|
158
|
-
|
|
157
|
+
try {
|
|
158
|
+
await evmHookReader.deriveHookConfig(mockAddress);
|
|
159
|
+
}
|
|
160
|
+
catch (e) {
|
|
161
|
+
expect(e.toString()).to.contain(`Failed to derive undefined hook (${mockAddress}):`);
|
|
162
|
+
}
|
|
159
163
|
});
|
|
160
164
|
/*
|
|
161
165
|
Testing for more nested hook types can be done manually by reading from existing contracts onchain.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EvmHookReader.test.js","sourceRoot":"","sources":["../../src/hook/EvmHookReader.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAEL,0BAA0B,EAE1B,uBAAuB,EAEvB,oBAAoB,EAEpB,qBAAqB,EAErB,oBAAoB,GACrB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAE9D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EACL,QAAQ,EAER,eAAe,GAIhB,MAAM,YAAY,CAAC;AAEpB,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,IAAI,aAA4B,CAAC;IACjC,IAAI,aAA4B,CAAC;IACjC,IAAI,OAA2B,CAAC;IAEhC,MAAM,qBAAqB,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,OAAO,CAAC;IAEzE,UAAU,CAAC,GAAG,EAAE;QACd,OAAO,GAAG,KAAK,CAAC,aAAa,EAAE,CAAC;QAChC,aAAa,GAAG,aAAa,CAAC,uBAAuB,EAAE,CAAC;QACxD,aAAa,GAAG,IAAI,aAAa,CAAC,aAAa,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC;IACxE,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,OAAO,CAAC,OAAO,EAAE,CAAC;IACpB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;QAC1D,MAAM,WAAW,GAAG,qBAAqB,EAAE,CAAC;QAC5C,MAAM,SAAS,GAAG,qBAAqB,EAAE,CAAC;QAE1C,0EAA0E;QAC1E,MAAM,YAAY,GAAG;YACnB,QAAQ,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,eAAe,CAAC,WAAW,CAAC;YAC9D,KAAK,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC;SAC1C,CAAC;QACF,OAAO;aACJ,IAAI,CAAC,uBAAuB,EAAE,SAAS,CAAC;aACxC,OAAO,CAAC,YAAyC,CAAC,CAAC;QACtD,OAAO;aACJ,IAAI,CAAC,0BAA0B,EAAE,SAAS,CAAC;aAC3C,OAAO,CAAC,YAA4C,CAAC,CAAC;QAEzD,MAAM,cAAc,GAAsC;YACxD,OAAO,EAAE,WAAW;YACpB,IAAI,EAAE,QAAQ,CAAC,WAAW;SAC3B,CAAC;QAEF,oCAAoC;QACpC,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QACrE,MAAM,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAEjD,0EAA0E;QAC1E,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAC;QACvE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2CAA2C,EAAE,KAAK,IAAI,EAAE;QACzD,MAAM,WAAW,GAAG,qBAAqB,EAAE,CAAC;QAC5C,MAAM,SAAS,GAAG,qBAAqB,EAAE,CAAC;QAC1C,MAAM,eAAe,GAAG,qBAAqB,EAAE,CAAC;QAEhD,0EAA0E;QAC1E,MAAM,YAAY,GAAG;YACnB,QAAQ,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,eAAe,CAAC,YAAY,CAAC;YAC/D,KAAK,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC;YACzC,gBAAgB,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACxE,WAAW,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACjE,WAAW,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,eAAe,CAAC;SACtD,CAAC;QACF,OAAO;aACJ,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC;aACrC,OAAO,CAAC,YAAsC,CAAC,CAAC;QACnD,OAAO;aACJ,IAAI,CAAC,0BAA0B,EAAE,SAAS,CAAC;aAC3C,OAAO,CAAC,YAA4C,CAAC,CAAC;QAEzD,MAAM,cAAc,GAAuC;YACzD,KAAK,EAAE,SAAS;YAChB,OAAO,EAAE,WAAW;YACpB,IAAI,EAAE,QAAQ,CAAC,YAAY;YAC3B,cAAc,EAAE,MAAM;YACtB,WAAW,EAAE,IAAI;YACjB,WAAW,EAAE,eAAe;SAC7B,CAAC;QAEF,oCAAoC;QACpC,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QACrE,MAAM,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAEjD,0EAA0E;QAC1E,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,uBAAuB,CAAC,WAAW,CAAC,CAAC;QACxE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;QACvD,MAAM,WAAW,GAAG,qBAAqB,EAAE,CAAC;QAC5C,MAAM,SAAS,GAAG,qBAAqB,EAAE,CAAC;QAC1C,MAAM,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAE/C,0EAA0E;QAC1E,MAAM,YAAY,GAAG;YACnB,QAAQ,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,eAAe,CAAC,QAAQ,CAAC;YAC3D,KAAK,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC;YACzC,MAAM,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC;SAC5C,CAAC;QACF,OAAO;aACJ,IAAI,CAAC,qBAAqB,EAAE,SAAS,CAAC;aACtC,OAAO,CAAC,YAAuC,CAAC,CAAC;QACpD,OAAO;aACJ,IAAI,CAAC,0BAA0B,EAAE,SAAS,CAAC;aAC3C,OAAO,CAAC,YAA4C,CAAC,CAAC;QAEzD,MAAM,cAAc,GAAoC;YACtD,KAAK,EAAE,SAAS;YAChB,MAAM,EAAE,UAAU;YAClB,OAAO,EAAE,WAAW;YACpB,IAAI,EAAE,QAAQ,CAAC,QAAQ;SACxB,CAAC;QAEF,oCAAoC;QACpC,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QACrE,MAAM,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAEjD,0EAA0E;QAC1E,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;QACrE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,gEAAgE;IAChE,EAAE,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;QACvD,MAAM,WAAW,GAAG,qBAAqB,EAAE,CAAC;QAC5C,MAAM,SAAS,GAAG,qBAAqB,EAAE,CAAC;QAC1C,MAAM,WAAW,GAAG,qBAAqB,EAAE,CAAC;QAE5C,0EAA0E;QAC1E,MAAM,YAAY,GAAG;YACnB,QAAQ,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,eAAe,CAAC,WAAW,CAAC;YAC9D,KAAK,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC;YACzC,WAAW,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC;YACjD,iBAAiB,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC;SAC3D,CAAC;QACF,OAAO;aACJ,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC;aACrC,OAAO,CAAC,YAAsC,CAAC,CAAC;QACnD,OAAO;aACJ,IAAI,CAAC,0BAA0B,EAAE,SAAS,CAAC;aAC3C,OAAO,CAAC,YAA4C,CAAC,CAAC;QAEzD,MAAM,cAAc,GAAmC;YACrD,KAAK,EAAE,SAAS;YAChB,OAAO,EAAE,WAAW;YACpB,IAAI,EAAE,QAAQ,CAAC,QAAQ;YACvB,YAAY,EAAE,WAAW;YACzB,gBAAgB,EAAE,aAAa,CAAC,KAAK;SACtC,CAAC;QAEF,oCAAoC;QACpC,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QACrE,MAAM,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAEjD,0EAA0E;QAC1E,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;QACpE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"EvmHookReader.test.js","sourceRoot":"","sources":["../../src/hook/EvmHookReader.test.ts"],"names":[],"mappings":"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"}
|
package/dist/hook/schemas.d.ts
CHANGED
|
@@ -10,16 +10,16 @@ export declare const ProtocolFeeSchema: z.ZodObject<{
|
|
|
10
10
|
}, "strip", z.ZodTypeAny, {
|
|
11
11
|
type: HookType.PROTOCOL_FEE;
|
|
12
12
|
owner: string;
|
|
13
|
-
protocolFee: string;
|
|
14
13
|
beneficiary: string;
|
|
15
14
|
maxProtocolFee: string;
|
|
15
|
+
protocolFee: string;
|
|
16
16
|
ownerOverrides?: Record<string, string> | undefined;
|
|
17
17
|
}, {
|
|
18
18
|
type: HookType.PROTOCOL_FEE;
|
|
19
19
|
owner: string;
|
|
20
|
-
protocolFee: string;
|
|
21
20
|
beneficiary: string;
|
|
22
21
|
maxProtocolFee: string;
|
|
22
|
+
protocolFee: string;
|
|
23
23
|
ownerOverrides?: Record<string, string> | undefined;
|
|
24
24
|
}>;
|
|
25
25
|
export declare const MerkleTreeSchema: z.ZodObject<{
|
|
@@ -117,16 +117,16 @@ export declare const HookConfigSchema: z.ZodUnion<[z.ZodString, z.ZodObject<{
|
|
|
117
117
|
}, "strip", z.ZodTypeAny, {
|
|
118
118
|
type: HookType.PROTOCOL_FEE;
|
|
119
119
|
owner: string;
|
|
120
|
-
protocolFee: string;
|
|
121
120
|
beneficiary: string;
|
|
122
121
|
maxProtocolFee: string;
|
|
122
|
+
protocolFee: string;
|
|
123
123
|
ownerOverrides?: Record<string, string> | undefined;
|
|
124
124
|
}, {
|
|
125
125
|
type: HookType.PROTOCOL_FEE;
|
|
126
126
|
owner: string;
|
|
127
|
-
protocolFee: string;
|
|
128
127
|
beneficiary: string;
|
|
129
128
|
maxProtocolFee: string;
|
|
129
|
+
protocolFee: string;
|
|
130
130
|
ownerOverrides?: Record<string, string> | undefined;
|
|
131
131
|
}>, z.ZodObject<{
|
|
132
132
|
owner: z.ZodString;
|
package/dist/hook/types.d.ts
CHANGED
package/dist/hook/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/hook/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,OAAO,EACL,gBAAgB,EAChB,SAAS,EACT,gBAAgB,EAChB,iBAAiB,EACjB,kBAAkB,EAClB,iBAAiB,EAClB,MAAM,cAAc,CAAC;AAGtB,oBAAY,eAAe;IACzB,MAAM,IAAA;IACN,OAAO,IAAA;IACP,WAAW,IAAA;IACX,WAAW,IAAA;IACX,wBAAwB,IAAA;IACxB,gBAAgB,IAAA;IAChB,WAAW,IAAA;IACX,QAAQ,IAAA;IACR,YAAY,IAAA;IACZ,aAAa,IAAA;CACd;AAED,oBAAY,QAAQ;IAClB,MAAM,WAAW;IACjB,WAAW,mBAAmB;IAC9B,wBAAwB,2BAA2B;IACnD,WAAW,oBAAoB;IAC/B,YAAY,gBAAgB;IAC5B,QAAQ,gBAAgB;IACxB,OAAO,sBAAsB;IAC7B,gBAAgB,wBAAwB;IACxC,QAAQ,iBAAiB;CAC1B;AAED,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC;AACpE,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,SAAS,CAAC,CAAC;AACtD,MAAM,MAAM,qBAAqB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AACtE,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AACpE,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAGlE,MAAM,MAAM,qBAAqB,GAAG;IAClC,IAAI,EAAE,QAAQ,CAAC,WAAW,CAAC;IAC3B,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;CAC1B,CAAC;AACF,MAAM,MAAM,iBAAiB,GAAG,aAAa,GAAG;IAC9C,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;CAC/B,CAAC;AACF,MAAM,MAAM,uBAAuB,GAAG,iBAAiB,GAAG;IACxD,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC;CACxB,CAAC;AACF,MAAM,MAAM,yBAAyB,GAAG,iBAAiB,GAAG;IAC1D,IAAI,EAAE,QAAQ,CAAC,gBAAgB,CAAC;IAChC,QAAQ,EAAE,UAAU,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/hook/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,OAAO,EACL,gBAAgB,EAChB,SAAS,EACT,gBAAgB,EAChB,iBAAiB,EACjB,kBAAkB,EAClB,iBAAiB,EAClB,MAAM,cAAc,CAAC;AAGtB,oBAAY,eAAe;IACzB,MAAM,IAAA;IACN,OAAO,IAAA;IACP,WAAW,IAAA;IACX,WAAW,IAAA;IACX,wBAAwB,IAAA;IACxB,gBAAgB,IAAA;IAChB,WAAW,IAAA;IACX,QAAQ,IAAA;IACR,YAAY,IAAA;IACZ,aAAa,IAAA;CACd;AAED,oBAAY,QAAQ;IAClB,MAAM,WAAW;IACjB,WAAW,mBAAmB;IAC9B,wBAAwB,2BAA2B;IACnD,WAAW,oBAAoB;IAC/B,YAAY,gBAAgB;IAC5B,QAAQ,gBAAgB;IACxB,OAAO,sBAAsB;IAC7B,gBAAgB,wBAAwB;IACxC,QAAQ,iBAAiB;CAC1B;AAED,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC;AACpE,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,SAAS,CAAC,CAAC;AACtD,MAAM,MAAM,qBAAqB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AACtE,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AACpE,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAGlE,MAAM,MAAM,qBAAqB,GAAG;IAClC,IAAI,EAAE,QAAQ,CAAC,WAAW,CAAC;IAC3B,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;CAC1B,CAAC;AACF,MAAM,MAAM,iBAAiB,GAAG,aAAa,GAAG;IAC9C,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;CAC/B,CAAC;AACF,MAAM,MAAM,uBAAuB,GAAG,iBAAiB,GAAG;IACxD,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC;CACxB,CAAC;AACF,MAAM,MAAM,yBAAyB,GAAG,iBAAiB,GAAG;IAC1D,IAAI,EAAE,QAAQ,CAAC,gBAAgB,CAAC;IAChC,QAAQ,EAAE,UAAU,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAG1D,eAAO,MAAM,iBAAiB,YAM7B,CAAC"}
|
package/dist/hook/types.js
CHANGED
|
@@ -24,4 +24,12 @@ export var HookType;
|
|
|
24
24
|
HookType["FALLBACK_ROUTING"] = "fallbackRoutingHook";
|
|
25
25
|
HookType["PAUSABLE"] = "pausableHook";
|
|
26
26
|
})(HookType || (HookType = {}));
|
|
27
|
+
// Hook types that can be updated in-place
|
|
28
|
+
export const MUTABLE_HOOK_TYPE = [
|
|
29
|
+
HookType.INTERCHAIN_GAS_PAYMASTER,
|
|
30
|
+
HookType.PROTOCOL_FEE,
|
|
31
|
+
HookType.ROUTING,
|
|
32
|
+
HookType.FALLBACK_ROUTING,
|
|
33
|
+
HookType.PAUSABLE,
|
|
34
|
+
];
|
|
27
35
|
//# sourceMappingURL=types.js.map
|
package/dist/hook/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/hook/types.ts"],"names":[],"mappings":"AAcA,oCAAoC;AACpC,MAAM,CAAN,IAAY,eAWX;AAXD,WAAY,eAAe;IACzB,yDAAM,CAAA;IACN,2DAAO,CAAA;IACP,mEAAW,CAAA;IACX,mEAAW,CAAA;IACX,6FAAwB,CAAA;IACxB,6EAAgB,CAAA;IAChB,mEAAW,CAAA;IACX,6DAAQ,CAAA;IACR,qEAAY,CAAA;IACZ,uEAAa,CAAA;AACf,CAAC,EAXW,eAAe,KAAf,eAAe,QAW1B;AAED,MAAM,CAAN,IAAY,QAUX;AAVD,WAAY,QAAQ;IAClB,6BAAiB,CAAA;IACjB,0CAA8B,CAAA;IAC9B,+DAAmD,CAAA;IACnD,2CAA+B,CAAA;IAC/B,wCAA4B,CAAA;IAC5B,oCAAwB,CAAA;IACxB,yCAA6B,CAAA;IAC7B,oDAAwC,CAAA;IACxC,qCAAyB,CAAA;AAC3B,CAAC,EAVW,QAAQ,KAAR,QAAQ,QAUnB"}
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/hook/types.ts"],"names":[],"mappings":"AAcA,oCAAoC;AACpC,MAAM,CAAN,IAAY,eAWX;AAXD,WAAY,eAAe;IACzB,yDAAM,CAAA;IACN,2DAAO,CAAA;IACP,mEAAW,CAAA;IACX,mEAAW,CAAA;IACX,6FAAwB,CAAA;IACxB,6EAAgB,CAAA;IAChB,mEAAW,CAAA;IACX,6DAAQ,CAAA;IACR,qEAAY,CAAA;IACZ,uEAAa,CAAA;AACf,CAAC,EAXW,eAAe,KAAf,eAAe,QAW1B;AAED,MAAM,CAAN,IAAY,QAUX;AAVD,WAAY,QAAQ;IAClB,6BAAiB,CAAA;IACjB,0CAA8B,CAAA;IAC9B,+DAAmD,CAAA;IACnD,2CAA+B,CAAA;IAC/B,wCAA4B,CAAA;IAC5B,oCAAwB,CAAA;IACxB,yCAA6B,CAAA;IAC7B,oDAAwC,CAAA;IACxC,qCAAyB,CAAA;AAC3B,CAAC,EAVW,QAAQ,KAAR,QAAQ,QAUnB;AA0BD,0CAA0C;AAC1C,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,QAAQ,CAAC,wBAAwB;IACjC,QAAQ,CAAC,YAAY;IACrB,QAAQ,CAAC,OAAO;IAChB,QAAQ,CAAC,gBAAgB;IACzB,QAAQ,CAAC,QAAQ;CAClB,CAAC"}
|