@hyperlane-xyz/sdk 3.20.0-beta0 → 4.0.0-alpha
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/README.md +0 -15
- package/dist/aws/s3.d.ts +22 -0
- package/dist/aws/s3.d.ts.map +1 -0
- package/dist/aws/s3.js +61 -0
- package/dist/aws/s3.js.map +1 -0
- package/dist/aws/validator.d.ts +17 -0
- package/dist/aws/validator.d.ts.map +1 -0
- package/dist/aws/validator.js +76 -0
- package/dist/aws/validator.js.map +1 -0
- package/dist/consts/{crud.d.ts → concurrency.d.ts} +1 -1
- package/dist/consts/concurrency.d.ts.map +1 -0
- package/dist/consts/{crud.js → concurrency.js} +1 -1
- package/dist/consts/concurrency.js.map +1 -0
- package/dist/consts/multisigIsm.d.ts.map +1 -1
- package/dist/consts/multisigIsm.js +15 -0
- package/dist/consts/multisigIsm.js.map +1 -1
- package/dist/consts/testChains.d.ts +3 -1
- package/dist/consts/testChains.d.ts.map +1 -1
- package/dist/consts/testChains.js +14 -0
- package/dist/consts/testChains.js.map +1 -1
- package/dist/contracts/contracts.d.ts +1 -0
- package/dist/contracts/contracts.d.ts.map +1 -1
- package/dist/contracts/contracts.js +4 -0
- package/dist/contracts/contracts.js.map +1 -1
- package/dist/core/AbstractHyperlaneModule.d.ts +18 -0
- package/dist/core/AbstractHyperlaneModule.d.ts.map +1 -0
- package/dist/{crud/AbstractCrudModule.js → core/AbstractHyperlaneModule.js} +2 -2
- package/dist/core/AbstractHyperlaneModule.js.map +1 -0
- package/dist/core/CoreDeployer.hardhat-test.js +8 -11
- package/dist/core/CoreDeployer.hardhat-test.js.map +1 -1
- package/dist/core/EvmCoreModule.d.ts +71 -0
- package/dist/core/EvmCoreModule.d.ts.map +1 -0
- package/dist/core/EvmCoreModule.hardhat-test.d.ts +2 -0
- package/dist/core/EvmCoreModule.hardhat-test.d.ts.map +1 -0
- package/dist/core/EvmCoreModule.hardhat-test.js +101 -0
- package/dist/core/EvmCoreModule.hardhat-test.js.map +1 -0
- package/dist/core/EvmCoreModule.js +147 -0
- package/dist/core/EvmCoreModule.js.map +1 -0
- package/dist/core/{read.d.ts → EvmCoreReader.d.ts} +3 -3
- package/dist/core/EvmCoreReader.d.ts.map +1 -0
- package/dist/core/{read.js → EvmCoreReader.js} +4 -4
- package/dist/core/EvmCoreReader.js.map +1 -0
- package/dist/core/EvmIcaModule.d.ts +30 -0
- package/dist/core/EvmIcaModule.d.ts.map +1 -0
- package/dist/core/EvmIcaModule.hardhat-test.d.ts +2 -0
- package/dist/core/EvmIcaModule.hardhat-test.d.ts.map +1 -0
- package/dist/core/EvmIcaModule.hardhat-test.js +35 -0
- package/dist/core/EvmIcaModule.hardhat-test.js.map +1 -0
- package/dist/core/EvmIcaModule.js +36 -0
- package/dist/core/EvmIcaModule.js.map +1 -0
- package/dist/core/HyperlaneCore.d.ts +8 -3
- package/dist/core/HyperlaneCore.d.ts.map +1 -1
- package/dist/core/HyperlaneCore.js +24 -15
- package/dist/core/HyperlaneCore.js.map +1 -1
- package/dist/core/HyperlaneCoreDeployer.d.ts +1 -1
- package/dist/core/HyperlaneCoreDeployer.d.ts.map +1 -1
- package/dist/core/HyperlaneCoreDeployer.js +12 -8
- package/dist/core/HyperlaneCoreDeployer.js.map +1 -1
- package/dist/core/schemas.d.ts +2222 -0
- package/dist/core/schemas.d.ts.map +1 -0
- package/dist/core/schemas.js +9 -0
- package/dist/core/schemas.js.map +1 -0
- package/dist/core/types.d.ts +4 -7
- package/dist/core/types.d.ts.map +1 -1
- package/dist/core/types.js.map +1 -1
- package/dist/deploy/HyperlaneAppChecker.d.ts +2 -2
- package/dist/deploy/HyperlaneAppChecker.d.ts.map +1 -1
- package/dist/deploy/HyperlaneAppChecker.js +2 -5
- package/dist/deploy/HyperlaneAppChecker.js.map +1 -1
- package/dist/deploy/HyperlaneDeployer.d.ts +8 -6
- package/dist/deploy/HyperlaneDeployer.d.ts.map +1 -1
- package/dist/deploy/HyperlaneDeployer.js +35 -32
- package/dist/deploy/HyperlaneDeployer.js.map +1 -1
- package/dist/deploy/schemas.d.ts +2 -62
- package/dist/deploy/schemas.d.ts.map +1 -1
- package/dist/deploy/schemas.js +1 -2
- package/dist/deploy/schemas.js.map +1 -1
- package/dist/deploy/types.d.ts +2 -13
- package/dist/deploy/types.d.ts.map +1 -1
- package/dist/deploy/types.js +0 -16
- package/dist/deploy/types.js.map +1 -1
- package/dist/deploy/verify/ContractVerifier.js +2 -2
- package/dist/deploy/verify/ContractVerifier.js.map +1 -1
- package/dist/gas/HyperlaneIgpChecker.d.ts.map +1 -1
- package/dist/gas/HyperlaneIgpChecker.js +12 -2
- package/dist/gas/HyperlaneIgpChecker.js.map +1 -1
- package/dist/gas/HyperlaneIgpDeployer.d.ts.map +1 -1
- package/dist/gas/HyperlaneIgpDeployer.js +20 -8
- package/dist/gas/HyperlaneIgpDeployer.js.map +1 -1
- package/dist/gas/oracle/configure-gas-oracles.hardhat-test.js +5 -4
- package/dist/gas/oracle/configure-gas-oracles.hardhat-test.js.map +1 -1
- package/dist/gas/oracle/types.d.ts +20 -7
- package/dist/gas/oracle/types.d.ts.map +1 -1
- package/dist/gas/oracle/types.js +10 -4
- package/dist/gas/oracle/types.js.map +1 -1
- package/dist/gas/types.d.ts +4 -10
- package/dist/gas/types.d.ts.map +1 -1
- package/dist/gas/types.js.map +1 -1
- package/dist/hook/EvmHookModule.d.ts +24 -0
- package/dist/hook/EvmHookModule.d.ts.map +1 -0
- package/dist/{crud → hook}/EvmHookModule.js +9 -10
- package/dist/hook/EvmHookModule.js.map +1 -0
- package/dist/hook/{read.d.ts → EvmHookReader.d.ts} +3 -2
- package/dist/hook/EvmHookReader.d.ts.map +1 -0
- package/dist/hook/{read.js → EvmHookReader.js} +10 -5
- package/dist/hook/EvmHookReader.js.map +1 -0
- package/dist/hook/EvmHookReader.test.d.ts +2 -0
- package/dist/hook/EvmHookReader.test.d.ts.map +1 -0
- package/dist/hook/{read.test.js → EvmHookReader.test.js} +6 -2
- package/dist/hook/EvmHookReader.test.js.map +1 -0
- package/dist/hook/HyperlaneHookDeployer.d.ts.map +1 -1
- package/dist/hook/HyperlaneHookDeployer.js +29 -6
- package/dist/hook/HyperlaneHookDeployer.js.map +1 -1
- package/dist/hook/schemas.d.ts +210 -0
- package/dist/hook/schemas.d.ts.map +1 -0
- package/dist/hook/schemas.js +54 -0
- package/dist/hook/schemas.js.map +1 -0
- package/dist/hook/types.d.ts +9 -28
- package/dist/hook/types.d.ts.map +1 -1
- package/dist/hook/types.js.map +1 -1
- package/dist/index.d.ts +52 -20
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +39 -16
- package/dist/index.js.map +1 -1
- package/dist/ism/EvmIsmModule.d.ts +74 -0
- package/dist/ism/EvmIsmModule.d.ts.map +1 -0
- package/dist/ism/EvmIsmModule.hardhat-test.d.ts +2 -0
- package/dist/ism/EvmIsmModule.hardhat-test.d.ts.map +1 -0
- package/dist/ism/EvmIsmModule.hardhat-test.js +308 -0
- package/dist/ism/EvmIsmModule.hardhat-test.js.map +1 -0
- package/dist/ism/EvmIsmModule.js +359 -0
- package/dist/ism/EvmIsmModule.js.map +1 -0
- package/dist/ism/{read.d.ts → EvmIsmReader.d.ts} +5 -7
- package/dist/ism/EvmIsmReader.d.ts.map +1 -0
- package/dist/ism/{read.js → EvmIsmReader.js} +9 -4
- package/dist/ism/EvmIsmReader.js.map +1 -0
- package/dist/ism/EvmIsmReader.test.d.ts +2 -0
- package/dist/ism/EvmIsmReader.test.d.ts.map +1 -0
- package/dist/ism/{read.test.js → EvmIsmReader.test.js} +2 -2
- package/dist/ism/EvmIsmReader.test.js.map +1 -0
- package/dist/ism/HyperlaneIsmFactory.d.ts.map +1 -1
- package/dist/ism/HyperlaneIsmFactory.hardhat-test.d.ts +3 -1
- package/dist/ism/HyperlaneIsmFactory.hardhat-test.d.ts.map +1 -1
- package/dist/ism/HyperlaneIsmFactory.hardhat-test.js +22 -16
- package/dist/ism/HyperlaneIsmFactory.hardhat-test.js.map +1 -1
- package/dist/ism/HyperlaneIsmFactory.js +3 -8
- package/dist/ism/HyperlaneIsmFactory.js.map +1 -1
- package/dist/ism/metadata/aggregation.d.ts +22 -0
- package/dist/ism/metadata/aggregation.d.ts.map +1 -0
- package/dist/ism/metadata/aggregation.js +82 -0
- package/dist/ism/metadata/aggregation.js.map +1 -0
- package/dist/ism/metadata/aggregation.test.d.ts +2 -0
- package/dist/ism/metadata/aggregation.test.d.ts.map +1 -0
- package/dist/ism/metadata/aggregation.test.js +37 -0
- package/dist/ism/metadata/aggregation.test.js.map +1 -0
- package/dist/ism/metadata/builder.d.ts +32 -0
- package/dist/ism/metadata/builder.d.ts.map +1 -0
- package/dist/ism/metadata/builder.hardhat-test.d.ts +2 -0
- package/dist/ism/metadata/builder.hardhat-test.d.ts.map +1 -0
- package/dist/ism/metadata/builder.hardhat-test.js +120 -0
- package/dist/ism/metadata/builder.hardhat-test.js.map +1 -0
- package/dist/ism/metadata/builder.js +74 -0
- package/dist/ism/metadata/builder.js.map +1 -0
- package/dist/ism/metadata/multisig.d.ts +57 -0
- package/dist/ism/metadata/multisig.d.ts.map +1 -0
- package/dist/ism/metadata/multisig.js +188 -0
- package/dist/ism/metadata/multisig.js.map +1 -0
- package/dist/ism/metadata/multisig.test.d.ts +2 -0
- package/dist/ism/metadata/multisig.test.d.ts.map +1 -0
- package/dist/ism/metadata/multisig.test.js +55 -0
- package/dist/ism/metadata/multisig.test.js.map +1 -0
- package/dist/ism/metadata/null.d.ts +15 -0
- package/dist/ism/metadata/null.d.ts.map +1 -0
- package/dist/ism/metadata/null.js +20 -0
- package/dist/ism/metadata/null.js.map +1 -0
- package/dist/ism/metadata/routing.d.ts +16 -0
- package/dist/ism/metadata/routing.d.ts.map +1 -0
- package/dist/ism/metadata/routing.js +34 -0
- package/dist/ism/metadata/routing.js.map +1 -0
- package/dist/ism/metadata/types.test.d.ts +5 -0
- package/dist/ism/metadata/types.test.d.ts.map +1 -0
- package/dist/ism/metadata/types.test.js +2 -0
- package/dist/ism/metadata/types.test.js.map +1 -0
- package/dist/ism/schemas.d.ts +68 -104
- package/dist/ism/schemas.d.ts.map +1 -1
- package/dist/ism/schemas.js +14 -17
- package/dist/ism/schemas.js.map +1 -1
- package/dist/ism/schemas.test.js +1 -1
- package/dist/ism/schemas.test.js.map +1 -1
- package/dist/ism/types.d.ts +10 -20
- package/dist/ism/types.d.ts.map +1 -1
- package/dist/ism/types.js +6 -0
- package/dist/ism/types.js.map +1 -1
- package/dist/ism/utils.d.ts +4 -0
- package/dist/ism/utils.d.ts.map +1 -1
- package/dist/ism/utils.js +33 -5
- package/dist/ism/utils.js.map +1 -1
- package/dist/metadata/agentConfig.d.ts +87 -87
- package/dist/metadata/agentConfig.js +1 -1
- package/dist/metadata/agentConfig.js.map +1 -1
- package/dist/metadata/deploymentArtifacts.d.ts +4 -4
- package/dist/middleware/account/InterchainAccount.d.ts +6 -5
- package/dist/middleware/account/InterchainAccount.d.ts.map +1 -1
- package/dist/middleware/account/InterchainAccount.js +15 -6
- package/dist/middleware/account/InterchainAccount.js.map +1 -1
- package/dist/middleware/account/InterchainAccountDeployer.d.ts.map +1 -1
- package/dist/middleware/account/InterchainAccountDeployer.js +5 -1
- package/dist/middleware/account/InterchainAccountDeployer.js.map +1 -1
- package/dist/middleware/account/accounts.hardhat-test.js +8 -3
- package/dist/middleware/account/accounts.hardhat-test.js.map +1 -1
- package/dist/middleware/account/schemas.d.ts +69 -0
- package/dist/middleware/account/schemas.d.ts.map +1 -1
- package/dist/middleware/account/schemas.js +10 -2
- package/dist/middleware/account/schemas.js.map +1 -1
- package/dist/middleware/account/types.d.ts +4 -9
- package/dist/middleware/account/types.d.ts.map +1 -1
- package/dist/providers/MultiProvider.d.ts +2 -1
- package/dist/providers/MultiProvider.d.ts.map +1 -1
- package/dist/providers/MultiProvider.js +7 -3
- package/dist/providers/MultiProvider.js.map +1 -1
- package/dist/providers/ProviderType.d.ts +3 -0
- package/dist/providers/ProviderType.d.ts.map +1 -1
- package/dist/providers/ProviderType.js +0 -1
- package/dist/providers/ProviderType.js.map +1 -1
- package/dist/providers/transactions/schemas.d.ts +29 -0
- package/dist/providers/transactions/schemas.d.ts.map +1 -0
- package/dist/providers/transactions/schemas.js +14 -0
- package/dist/providers/transactions/schemas.js.map +1 -0
- package/dist/providers/transactions/schemas.test.d.ts +2 -0
- package/dist/providers/transactions/schemas.test.d.ts.map +1 -0
- package/dist/providers/transactions/schemas.test.js +58 -0
- package/dist/providers/transactions/schemas.test.js.map +1 -0
- package/dist/providers/transactions/submitter/TxSubmitterInterface.d.ts +19 -0
- package/dist/providers/transactions/submitter/TxSubmitterInterface.d.ts.map +1 -0
- package/dist/providers/transactions/submitter/TxSubmitterInterface.js +2 -0
- package/dist/providers/transactions/submitter/TxSubmitterInterface.js.map +1 -0
- package/dist/providers/transactions/submitter/TxSubmitterTypes.d.ts +6 -0
- package/dist/providers/transactions/submitter/TxSubmitterTypes.d.ts.map +1 -0
- package/dist/providers/transactions/submitter/TxSubmitterTypes.js +7 -0
- package/dist/providers/transactions/submitter/TxSubmitterTypes.js.map +1 -0
- package/dist/providers/transactions/submitter/builder/TxSubmitterBuilder.d.ts +48 -0
- package/dist/providers/transactions/submitter/builder/TxSubmitterBuilder.d.ts.map +1 -0
- package/dist/providers/transactions/submitter/builder/TxSubmitterBuilder.js +65 -0
- package/dist/providers/transactions/submitter/builder/TxSubmitterBuilder.js.map +1 -0
- package/dist/providers/transactions/submitter/builder/schemas.d.ts +206 -0
- package/dist/providers/transactions/submitter/builder/schemas.d.ts.map +1 -0
- package/dist/providers/transactions/submitter/builder/schemas.js +10 -0
- package/dist/providers/transactions/submitter/builder/schemas.js.map +1 -0
- package/dist/providers/transactions/submitter/builder/types.d.ts +4 -0
- package/dist/providers/transactions/submitter/builder/types.d.ts.map +1 -0
- package/dist/providers/transactions/submitter/builder/types.js +2 -0
- package/dist/providers/transactions/submitter/builder/types.js.map +1 -0
- package/dist/providers/transactions/submitter/ethersV5/EV5GnosisSafeTxSubmitter.d.ts +15 -0
- package/dist/providers/transactions/submitter/ethersV5/EV5GnosisSafeTxSubmitter.d.ts.map +1 -0
- package/dist/providers/transactions/submitter/ethersV5/EV5GnosisSafeTxSubmitter.js +44 -0
- package/dist/providers/transactions/submitter/ethersV5/EV5GnosisSafeTxSubmitter.js.map +1 -0
- package/dist/providers/transactions/submitter/ethersV5/EV5ImpersonatedAccountTxSubmitter.d.ts +15 -0
- package/dist/providers/transactions/submitter/ethersV5/EV5ImpersonatedAccountTxSubmitter.d.ts.map +1 -0
- package/dist/providers/transactions/submitter/ethersV5/EV5ImpersonatedAccountTxSubmitter.js +23 -0
- package/dist/providers/transactions/submitter/ethersV5/EV5ImpersonatedAccountTxSubmitter.js.map +1 -0
- package/dist/providers/transactions/submitter/ethersV5/EV5JsonRpcTxSubmitter.d.ts +14 -0
- package/dist/providers/transactions/submitter/ethersV5/EV5JsonRpcTxSubmitter.d.ts.map +1 -0
- package/dist/providers/transactions/submitter/ethersV5/EV5JsonRpcTxSubmitter.js +24 -0
- package/dist/providers/transactions/submitter/ethersV5/EV5JsonRpcTxSubmitter.js.map +1 -0
- package/dist/providers/transactions/submitter/ethersV5/EV5TxSubmitterInterface.d.ts +10 -0
- package/dist/providers/transactions/submitter/ethersV5/EV5TxSubmitterInterface.d.ts.map +1 -0
- package/dist/providers/transactions/submitter/ethersV5/EV5TxSubmitterInterface.js +2 -0
- package/dist/providers/transactions/submitter/ethersV5/EV5TxSubmitterInterface.js.map +1 -0
- package/dist/providers/transactions/submitter/ethersV5/schemas.d.ts +19 -0
- package/dist/providers/transactions/submitter/ethersV5/schemas.d.ts.map +1 -0
- package/dist/providers/transactions/submitter/ethersV5/schemas.js +10 -0
- package/dist/providers/transactions/submitter/ethersV5/schemas.js.map +1 -0
- package/dist/providers/transactions/submitter/ethersV5/schemas.test.d.ts +2 -0
- package/dist/providers/transactions/submitter/ethersV5/schemas.test.d.ts.map +1 -0
- package/dist/providers/transactions/submitter/ethersV5/schemas.test.js +41 -0
- package/dist/providers/transactions/submitter/ethersV5/schemas.test.js.map +1 -0
- package/dist/providers/transactions/submitter/ethersV5/types.d.ts +5 -0
- package/dist/providers/transactions/submitter/ethersV5/types.d.ts.map +1 -0
- package/dist/providers/transactions/submitter/ethersV5/types.js +2 -0
- package/dist/providers/transactions/submitter/ethersV5/types.js.map +1 -0
- package/dist/providers/transactions/submitter/schemas.d.ts +56 -0
- package/dist/providers/transactions/submitter/schemas.d.ts.map +1 -0
- package/dist/providers/transactions/submitter/schemas.js +18 -0
- package/dist/providers/transactions/submitter/schemas.js.map +1 -0
- package/dist/providers/transactions/submitter/types.d.ts +4 -0
- package/dist/providers/transactions/submitter/types.d.ts.map +1 -0
- package/dist/providers/transactions/submitter/types.js +2 -0
- package/dist/providers/transactions/submitter/types.js.map +1 -0
- package/dist/providers/transactions/transformer/TxTransformerInterface.d.ts +15 -0
- package/dist/providers/transactions/transformer/TxTransformerInterface.d.ts.map +1 -0
- package/dist/providers/transactions/transformer/TxTransformerInterface.js +2 -0
- package/dist/providers/transactions/transformer/TxTransformerInterface.js.map +1 -0
- package/dist/providers/transactions/transformer/TxTransformerTypes.d.ts +4 -0
- package/dist/providers/transactions/transformer/TxTransformerTypes.d.ts.map +1 -0
- package/dist/providers/transactions/transformer/TxTransformerTypes.js +5 -0
- package/dist/providers/transactions/transformer/TxTransformerTypes.js.map +1 -0
- package/dist/providers/transactions/transformer/ethersV5/EV5InterchainAccountTxTransformer.d.ts +16 -0
- package/dist/providers/transactions/transformer/ethersV5/EV5InterchainAccountTxTransformer.d.ts.map +1 -0
- package/dist/providers/transactions/transformer/ethersV5/EV5InterchainAccountTxTransformer.js +37 -0
- package/dist/providers/transactions/transformer/ethersV5/EV5InterchainAccountTxTransformer.js.map +1 -0
- package/dist/providers/transactions/transformer/ethersV5/EV5TxTransformerInterface.d.ts +5 -0
- package/dist/providers/transactions/transformer/ethersV5/EV5TxTransformerInterface.d.ts.map +1 -0
- package/dist/providers/transactions/transformer/ethersV5/EV5TxTransformerInterface.js +2 -0
- package/dist/providers/transactions/transformer/ethersV5/EV5TxTransformerInterface.js.map +1 -0
- package/dist/providers/transactions/transformer/ethersV5/schemas.d.ts +58 -0
- package/dist/providers/transactions/transformer/ethersV5/schemas.d.ts.map +1 -0
- package/dist/providers/transactions/transformer/ethersV5/schemas.js +7 -0
- package/dist/providers/transactions/transformer/ethersV5/schemas.js.map +1 -0
- package/dist/providers/transactions/transformer/ethersV5/schemas.test.d.ts +2 -0
- package/dist/providers/transactions/transformer/ethersV5/schemas.test.d.ts.map +1 -0
- package/dist/providers/transactions/transformer/ethersV5/schemas.test.js +44 -0
- package/dist/providers/transactions/transformer/ethersV5/schemas.test.js.map +1 -0
- package/dist/providers/transactions/transformer/ethersV5/types.d.ts +4 -0
- package/dist/providers/transactions/transformer/ethersV5/types.d.ts.map +1 -0
- package/dist/providers/transactions/transformer/ethersV5/types.js +2 -0
- package/dist/providers/transactions/transformer/ethersV5/types.js.map +1 -0
- package/dist/providers/transactions/transformer/schemas.d.ts +89 -0
- package/dist/providers/transactions/transformer/schemas.d.ts.map +1 -0
- package/dist/providers/transactions/transformer/schemas.js +10 -0
- package/dist/providers/transactions/transformer/schemas.js.map +1 -0
- package/dist/providers/transactions/transformer/types.d.ts +4 -0
- package/dist/providers/transactions/transformer/types.d.ts.map +1 -0
- package/dist/providers/transactions/transformer/types.js +2 -0
- package/dist/providers/transactions/transformer/types.js.map +1 -0
- package/dist/providers/transactions/types.d.ts +6 -0
- package/dist/providers/transactions/types.d.ts.map +1 -0
- package/dist/providers/transactions/types.js +2 -0
- package/dist/providers/transactions/types.js.map +1 -0
- package/dist/router/GasRouterDeployer.d.ts +3 -3
- package/dist/router/GasRouterDeployer.d.ts.map +1 -1
- package/dist/router/GasRouterDeployer.js +2 -1
- package/dist/router/GasRouterDeployer.js.map +1 -1
- package/dist/router/HyperlaneRouterChecker.d.ts.map +1 -1
- package/dist/router/HyperlaneRouterChecker.js +36 -53
- package/dist/router/HyperlaneRouterChecker.js.map +1 -1
- package/dist/router/ProxiedRouterDeployer.d.ts +7 -4
- package/dist/router/ProxiedRouterDeployer.d.ts.map +1 -1
- package/dist/router/ProxiedRouterDeployer.js +8 -2
- package/dist/router/ProxiedRouterDeployer.js.map +1 -1
- package/dist/router/schemas.d.ts +828 -41
- package/dist/router/schemas.d.ts.map +1 -1
- package/dist/router/schemas.js +11 -9
- package/dist/router/schemas.js.map +1 -1
- package/dist/router/types.d.ts +6 -10
- package/dist/router/types.d.ts.map +1 -1
- package/dist/router/types.js.map +1 -1
- package/dist/schemas.d.ts +25 -0
- package/dist/schemas.d.ts.map +1 -0
- package/dist/schemas.js +10 -0
- package/dist/schemas.js.map +1 -0
- package/dist/test/multiProviderStubs.d.ts +9 -0
- package/dist/test/multiProviderStubs.d.ts.map +1 -0
- package/dist/test/multiProviderStubs.js +27 -0
- package/dist/test/multiProviderStubs.js.map +1 -0
- package/dist/test/testUtils.d.ts +0 -8
- package/dist/test/testUtils.d.ts.map +1 -1
- package/dist/test/testUtils.js +3 -28
- package/dist/test/testUtils.js.map +1 -1
- package/dist/token/{read.d.ts → EvmERC20WarpRouteReader.d.ts} +10 -10
- package/dist/token/EvmERC20WarpRouteReader.d.ts.map +1 -0
- package/dist/token/{read.js → EvmERC20WarpRouteReader.js} +38 -30
- package/dist/token/EvmERC20WarpRouteReader.js.map +1 -0
- package/dist/token/Token.test.js +1 -10
- package/dist/token/Token.test.js.map +1 -1
- package/dist/token/TokenStandard.d.ts +0 -1
- package/dist/token/TokenStandard.d.ts.map +1 -1
- package/dist/token/TokenStandard.js +4 -3
- package/dist/token/TokenStandard.js.map +1 -1
- package/dist/token/adapters/CosmWasmTokenAdapter.d.ts +2 -2
- package/dist/token/adapters/CosmWasmTokenAdapter.d.ts.map +1 -1
- package/dist/token/adapters/CosmosTokenAdapter.d.ts +2 -2
- package/dist/token/adapters/CosmosTokenAdapter.d.ts.map +1 -1
- package/dist/token/adapters/EvmTokenAdapter.d.ts +4 -4
- package/dist/token/adapters/EvmTokenAdapter.d.ts.map +1 -1
- package/dist/token/adapters/EvmTokenAdapter.js +3 -2
- package/dist/token/adapters/EvmTokenAdapter.js.map +1 -1
- package/dist/token/adapters/ITokenAdapter.d.ts +2 -2
- package/dist/token/adapters/ITokenAdapter.d.ts.map +1 -1
- package/dist/token/adapters/SealevelTokenAdapter.d.ts +5 -5
- package/dist/token/adapters/SealevelTokenAdapter.d.ts.map +1 -1
- package/dist/token/adapters/SealevelTokenAdapter.js +2 -1
- package/dist/token/adapters/SealevelTokenAdapter.js.map +1 -1
- package/dist/token/app.d.ts.map +1 -1
- package/dist/token/app.js +2 -2
- package/dist/token/app.js.map +1 -1
- package/dist/token/checker.d.ts +2 -2
- package/dist/token/checker.d.ts.map +1 -1
- package/dist/token/checker.js +1 -1
- package/dist/token/checker.js.map +1 -1
- package/dist/token/config.d.ts +4 -44
- package/dist/token/config.d.ts.map +1 -1
- package/dist/token/config.js +14 -15
- package/dist/token/config.js.map +1 -1
- package/dist/token/contracts.d.ts +7 -14
- package/dist/token/contracts.d.ts.map +1 -1
- package/dist/token/contracts.js +8 -8
- package/dist/token/contracts.js.map +1 -1
- package/dist/token/deploy.d.ts +21 -45
- package/dist/token/deploy.d.ts.map +1 -1
- package/dist/token/deploy.hardhat-test.js +33 -48
- package/dist/token/deploy.hardhat-test.js.map +1 -1
- package/dist/token/deploy.js +74 -251
- package/dist/token/deploy.js.map +1 -1
- package/dist/token/schemas.d.ts +874 -136
- package/dist/token/schemas.d.ts.map +1 -1
- package/dist/token/schemas.js +29 -19
- package/dist/token/schemas.js.map +1 -1
- package/dist/token/schemas.test.js +26 -39
- package/dist/token/schemas.test.js.map +1 -1
- package/dist/token/types.d.ts +2 -1
- package/dist/token/types.d.ts.map +1 -1
- package/dist/utils/fork.d.ts.map +1 -1
- package/dist/utils/fork.js +10 -11
- package/dist/utils/fork.js.map +1 -1
- package/dist/utils/gnosisSafe.js +46 -0
- package/dist/utils/logUtils.d.ts +4 -0
- package/dist/utils/logUtils.d.ts.map +1 -0
- package/dist/utils/logUtils.js +13 -0
- package/dist/utils/logUtils.js.map +1 -0
- package/dist/utils/schemas.d.ts +3 -0
- package/dist/utils/schemas.d.ts.map +1 -0
- package/dist/utils/schemas.js +4 -0
- package/dist/utils/schemas.js.map +1 -0
- package/package.json +8 -4
- package/dist/consts/crud.d.ts.map +0 -1
- package/dist/consts/crud.js.map +0 -1
- package/dist/core/read.d.ts.map +0 -1
- package/dist/core/read.js.map +0 -1
- package/dist/crud/AbstractCrudModule.d.ts +0 -21
- package/dist/crud/AbstractCrudModule.d.ts.map +0 -1
- package/dist/crud/AbstractCrudModule.js.map +0 -1
- package/dist/crud/EvmHookModule.d.ts +0 -18
- package/dist/crud/EvmHookModule.d.ts.map +0 -1
- package/dist/crud/EvmHookModule.js.map +0 -1
- package/dist/crud/EvmIsmModule.d.ts +0 -18
- package/dist/crud/EvmIsmModule.d.ts.map +0 -1
- package/dist/crud/EvmIsmModule.js +0 -28
- package/dist/crud/EvmIsmModule.js.map +0 -1
- package/dist/hook/read.d.ts.map +0 -1
- package/dist/hook/read.js.map +0 -1
- package/dist/hook/read.test.d.ts +0 -2
- package/dist/hook/read.test.d.ts.map +0 -1
- package/dist/hook/read.test.js.map +0 -1
- package/dist/ism/read.d.ts.map +0 -1
- package/dist/ism/read.js.map +0 -1
- package/dist/ism/read.test.d.ts +0 -2
- package/dist/ism/read.test.d.ts.map +0 -1
- package/dist/ism/read.test.js.map +0 -1
- package/dist/token/read.d.ts.map +0 -1
- package/dist/token/read.js.map +0 -1
|
@@ -97,7 +97,7 @@ export class ContractVerifier {
|
|
|
97
97
|
'Compiled bytecode does not match deployed bytecode, check constructor arguments?';
|
|
98
98
|
break;
|
|
99
99
|
default:
|
|
100
|
-
errorMessage = `Verification failed. ${result.result ?? response.statusText}`;
|
|
100
|
+
errorMessage = `Verification failed. ${JSON.stringify(result.result) ?? response.statusText}`;
|
|
101
101
|
break;
|
|
102
102
|
}
|
|
103
103
|
if (errorMessage) {
|
|
@@ -110,7 +110,7 @@ export class ContractVerifier {
|
|
|
110
110
|
return this.submitForm(chain, action, verificationLogger, options);
|
|
111
111
|
}
|
|
112
112
|
if (result.result === ExplorerApiErrors.UNABLE_TO_VERIFY) {
|
|
113
|
-
const errorMessage = `Verification failed. ${result.result ?? response.statusText}`;
|
|
113
|
+
const errorMessage = `Verification failed. ${JSON.stringify(result.result) ?? response.statusText}`;
|
|
114
114
|
verificationLogger.debug(errorMessage);
|
|
115
115
|
throw new Error(`[${chain}] ${errorMessage}`);
|
|
116
116
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ContractVerifier.js","sourceRoot":"","sources":["../../../src/deploy/verify/ContractVerifier.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ContractVerifier.js","sourceRoot":"","sources":["../../../src/deploy/verify/ContractVerifier.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HyperlaneIgpChecker.d.ts","sourceRoot":"","sources":["../../src/gas/HyperlaneIgpChecker.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAEvE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAEL,SAAS,EAIV,MAAM,YAAY,CAAC;AAEpB,qBAAa,mBAAoB,SAAQ,mBAAmB,CAC1D,YAAY,EACZ,SAAS,CACV;IACO,UAAU,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ3C,oBAAoB,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAKrD,cAAc,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IA6B/C,mCAAmC,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"HyperlaneIgpChecker.d.ts","sourceRoot":"","sources":["../../src/gas/HyperlaneIgpChecker.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAEvE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAEL,SAAS,EAIV,MAAM,YAAY,CAAC;AAEpB,qBAAa,mBAAoB,SAAQ,mBAAmB,CAC1D,YAAY,EACZ,SAAS,CACV;IACO,UAAU,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ3C,oBAAoB,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAKrD,cAAc,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IA6B/C,mCAAmC,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAmDpE,2BAA2B,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CA0DnE"}
|
|
@@ -48,7 +48,12 @@ export class HyperlaneIgpChecker extends HyperlaneAppChecker {
|
|
|
48
48
|
this.app.logger.debug(`No overhead configured for ${local} -> ${remote}, defaulting to 0`);
|
|
49
49
|
expectedOverhead = 0;
|
|
50
50
|
}
|
|
51
|
-
|
|
51
|
+
// TODO: add back support for non-EVM remotes.
|
|
52
|
+
const remoteId = this.multiProvider.tryGetDomainId(remote);
|
|
53
|
+
if (remoteId === null) {
|
|
54
|
+
this.app.logger.warn(`Skipping checking IGP ${local} -> ${remote}. Expected if the remote is a non-EVM chain.`);
|
|
55
|
+
continue;
|
|
56
|
+
}
|
|
52
57
|
const existingOverhead = await defaultIsmIgp.destinationGasLimit(remoteId, 0);
|
|
53
58
|
if (!existingOverhead.eq(expectedOverhead)) {
|
|
54
59
|
const remoteChain = remote;
|
|
@@ -78,7 +83,12 @@ export class HyperlaneIgpChecker extends HyperlaneAppChecker {
|
|
|
78
83
|
};
|
|
79
84
|
const remotes = new Set(Object.keys(this.configMap[local].oracleConfig ?? {}));
|
|
80
85
|
for (const remote of remotes) {
|
|
81
|
-
|
|
86
|
+
// TODO: add back support for non-EVM remotes.
|
|
87
|
+
const remoteId = this.multiProvider.tryGetDomainId(remote);
|
|
88
|
+
if (remoteId === null) {
|
|
89
|
+
this.app.logger.warn(`Skipping checking IGP ${local} -> ${remote}. Expected if the remote is a non-EVM chain.`);
|
|
90
|
+
continue;
|
|
91
|
+
}
|
|
82
92
|
const destinationGasConfigs = await igp.destinationGasConfigs(remoteId);
|
|
83
93
|
const actualGasOracle = destinationGasConfigs.gasOracle;
|
|
84
94
|
const expectedGasOracle = coreContracts.storageGasOracle.address;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HyperlaneIgpChecker.js","sourceRoot":"","sources":["../../src/gas/HyperlaneIgpChecker.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"HyperlaneIgpChecker.js","sourceRoot":"","sources":["../../src/gas/HyperlaneIgpChecker.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HyperlaneIgpDeployer.d.ts","sourceRoot":"","sources":["../../src/gas/HyperlaneIgpDeployer.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,sBAAsB,EACtB,UAAU,EACV,gBAAgB,EACjB,MAAM,qBAAqB,CAAC;AAI7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,YAAY,EAAgB,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"HyperlaneIgpDeployer.d.ts","sourceRoot":"","sources":["../../src/gas/HyperlaneIgpDeployer.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,sBAAsB,EACtB,UAAU,EACV,gBAAgB,EACjB,MAAM,qBAAqB,CAAC;AAI7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,YAAY,EAAgB,MAAM,gBAAgB,CAAC;AAK5D,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,qBAAa,oBAAqB,SAAQ,iBAAiB,CACzD,SAAS,EACT,YAAY,CACb;gBAEG,aAAa,EAAE,aAAa,EAC5B,gBAAgB,CAAC,EAAE,gBAAgB;IAQ/B,4BAA4B,CAChC,KAAK,EAAE,SAAS,EAChB,UAAU,EAAE,UAAU,EACtB,gBAAgB,EAAE,gBAAgB,EAClC,MAAM,EAAE,SAAS,GAChB,OAAO,CAAC,sBAAsB,CAAC;IAuD5B,sBAAsB,CAC1B,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,SAAS,GAChB,OAAO,CAAC,gBAAgB,CAAC;IAmEtB,eAAe,CACnB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,SAAS,GAChB,OAAO,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;CA+B7C"}
|
|
@@ -3,7 +3,7 @@ import { eqAddress, rootLogger } from '@hyperlane-xyz/utils';
|
|
|
3
3
|
import { TOKEN_EXCHANGE_RATE_SCALE } from '../consts/igp.js';
|
|
4
4
|
import { HyperlaneDeployer } from '../deploy/HyperlaneDeployer.js';
|
|
5
5
|
import { igpFactories } from './contracts.js';
|
|
6
|
-
import { serializeDifference } from './oracle/types.js';
|
|
6
|
+
import { oracleConfigToOracleData, serializeDifference, } from './oracle/types.js';
|
|
7
7
|
export class HyperlaneIgpDeployer extends HyperlaneDeployer {
|
|
8
8
|
constructor(multiProvider, contractVerifier) {
|
|
9
9
|
super(multiProvider, igpFactories, {
|
|
@@ -15,7 +15,13 @@ export class HyperlaneIgpDeployer extends HyperlaneDeployer {
|
|
|
15
15
|
const igp = await this.deployProxiedContract(chain, 'interchainGasPaymaster', 'interchainGasPaymaster', proxyAdmin.address, [], [await this.multiProvider.getSignerAddress(chain), config.beneficiary]);
|
|
16
16
|
const gasParamsToSet = [];
|
|
17
17
|
for (const [remote, newGasOverhead] of Object.entries(config.overhead)) {
|
|
18
|
-
|
|
18
|
+
// TODO: add back support for non-EVM remotes.
|
|
19
|
+
// Previously would check core metadata for non EVMs and fallback to multiprovider for custom EVMs
|
|
20
|
+
const remoteId = this.multiProvider.tryGetDomainId(remote);
|
|
21
|
+
if (remoteId === null) {
|
|
22
|
+
this.logger.warn(`Skipping overhead ${chain} -> ${remote}. Expected if the remote is a non-EVM chain.`);
|
|
23
|
+
continue;
|
|
24
|
+
}
|
|
19
25
|
const currentGasConfig = await igp.destinationGasConfigs(remoteId);
|
|
20
26
|
if (!eqAddress(currentGasConfig.gasOracle, storageGasOracle.address) ||
|
|
21
27
|
!currentGasConfig.gasOverhead.eq(newGasOverhead)) {
|
|
@@ -44,20 +50,26 @@ export class HyperlaneIgpDeployer extends HyperlaneDeployer {
|
|
|
44
50
|
const configsToSet = [];
|
|
45
51
|
// For each remote, check if the gas oracle has the correct data
|
|
46
52
|
for (const [remote, desired] of Object.entries(config.oracleConfig)) {
|
|
47
|
-
//
|
|
48
|
-
|
|
53
|
+
// TODO: add back support for non-EVM remotes.
|
|
54
|
+
// Previously would check core metadata for non EVMs and fallback to multiprovider for custom EVMs
|
|
55
|
+
const remoteDomain = this.multiProvider.tryGetDomainId(remote);
|
|
56
|
+
if (remoteDomain === null) {
|
|
57
|
+
this.logger.warn(`Skipping gas oracle ${chain} -> ${remote}. Expected if the remote is a non-EVM chain.`);
|
|
58
|
+
continue;
|
|
59
|
+
}
|
|
49
60
|
const actual = await gasOracle.remoteGasData(remoteDomain);
|
|
61
|
+
const desiredData = oracleConfigToOracleData(desired);
|
|
50
62
|
if (!actual.gasPrice.eq(desired.gasPrice) ||
|
|
51
63
|
!actual.tokenExchangeRate.eq(desired.tokenExchangeRate)) {
|
|
52
|
-
this.logger.info(`${chain} -> ${remote}: ${serializeDifference(actual,
|
|
64
|
+
this.logger.info(`${chain} -> ${remote}: ${serializeDifference(actual, desiredData)}`);
|
|
53
65
|
configsToSet.push({
|
|
54
66
|
remoteDomain,
|
|
55
|
-
...
|
|
67
|
+
...desiredData,
|
|
56
68
|
});
|
|
57
69
|
}
|
|
58
70
|
const exampleRemoteGas = (config.overhead[remote] ?? 200000) + 50000;
|
|
59
|
-
const exampleRemoteGasCost =
|
|
60
|
-
.mul(
|
|
71
|
+
const exampleRemoteGasCost = desiredData.tokenExchangeRate
|
|
72
|
+
.mul(desiredData.gasPrice)
|
|
61
73
|
.mul(exampleRemoteGas)
|
|
62
74
|
.div(TOKEN_EXCHANGE_RATE_SCALE);
|
|
63
75
|
this.logger.info(`${chain} -> ${remote}: ${exampleRemoteGas} remote gas cost: ${ethers.utils.formatEther(exampleRemoteGasCost)}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HyperlaneIgpDeployer.js","sourceRoot":"","sources":["../../src/gas/HyperlaneIgpDeployer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAOhC,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAE7D,OAAO,EAAE,yBAAyB,EAAE,MAAM,kBAAkB,CAAC;AAE7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAKnE,OAAO,EAAgB,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,
|
|
1
|
+
{"version":3,"file":"HyperlaneIgpDeployer.js","sourceRoot":"","sources":["../../src/gas/HyperlaneIgpDeployer.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ import { TestChainName } from '../../consts/testChains.js';
|
|
|
5
5
|
import { MultiProvider } from '../../providers/MultiProvider.js';
|
|
6
6
|
import { testIgpConfig } from '../../test/testUtils.js';
|
|
7
7
|
import { HyperlaneIgpDeployer } from '../HyperlaneIgpDeployer.js';
|
|
8
|
+
import { oracleConfigToOracleData } from './types.js';
|
|
8
9
|
describe('HyperlaneIgpDeployer', () => {
|
|
9
10
|
const local = TestChainName.test1;
|
|
10
11
|
const remote = TestChainName.test2;
|
|
@@ -28,12 +29,12 @@ describe('HyperlaneIgpDeployer', () => {
|
|
|
28
29
|
expect({
|
|
29
30
|
gasPrice: deployedConfig.gasPrice,
|
|
30
31
|
tokenExchangeRate: deployedConfig.tokenExchangeRate,
|
|
31
|
-
}).to.deep.equal(testConfig[local].oracleConfig[remote]);
|
|
32
|
+
}).to.deep.equal(oracleConfigToOracleData(testConfig[local].oracleConfig[remote]));
|
|
32
33
|
});
|
|
33
34
|
it('should configure new oracle config', async () => {
|
|
34
35
|
testConfig[local].oracleConfig[remote] = {
|
|
35
|
-
tokenExchangeRate: utils.parseUnits('2', 'gwei'),
|
|
36
|
-
gasPrice: utils.parseUnits('3', 'gwei'),
|
|
36
|
+
tokenExchangeRate: utils.parseUnits('2', 'gwei').toString(),
|
|
37
|
+
gasPrice: utils.parseUnits('3', 'gwei').toString(),
|
|
37
38
|
};
|
|
38
39
|
const localContracts = await deployer.deployContracts(local, testConfig[local]);
|
|
39
40
|
igp = localContracts.interchainGasPaymaster;
|
|
@@ -41,7 +42,7 @@ describe('HyperlaneIgpDeployer', () => {
|
|
|
41
42
|
expect({
|
|
42
43
|
gasPrice: modifiedConfig.gasPrice,
|
|
43
44
|
tokenExchangeRate: modifiedConfig.tokenExchangeRate,
|
|
44
|
-
}).to.deep.equal(testConfig[local].oracleConfig[remote]);
|
|
45
|
+
}).to.deep.equal(oracleConfigToOracleData(testConfig[local].oracleConfig[remote]));
|
|
45
46
|
});
|
|
46
47
|
});
|
|
47
48
|
//# sourceMappingURL=configure-gas-oracles.hardhat-test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configure-gas-oracles.hardhat-test.js","sourceRoot":"","sources":["../../../src/gas/oracle/configure-gas-oracles.hardhat-test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC9B,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC/B,OAAO,GAAG,MAAM,SAAS,CAAC;AAI1B,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAGlE,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;IACpC,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC;IAClC,MAAM,MAAM,GAAG,aAAa,CAAC,KAAK,CAAC;IACnC,IAAI,QAAgB,CAAC;IACrB,IAAI,QAA8B,CAAC;IACnC,IAAI,GAA2B,CAAC;IAChC,IAAI,aAA4B,CAAC;IACjC,IAAI,UAA+B,CAAC;IAEpC,MAAM,CAAC,KAAK,IAAI,EAAE;QAChB,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;QAC/C,aAAa,GAAG,aAAa,CAAC,uBAAuB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;QAClE,QAAQ,GAAG,aAAa,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAC7C,QAAQ,GAAG,IAAI,oBAAoB,CAAC,aAAa,CAAC,CAAC;QACnD,UAAU,GAAG,aAAa,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QAC5D,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACpD,GAAG,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,sBAAsB,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;QAClE,SAAS;QACT,MAAM,cAAc,GAAG,MAAM,GAAG,CAAC,0BAA0B,CAAC,QAAQ,CAAC,CAAC;QACtE,MAAM,CAAC;YACL,QAAQ,EAAE,cAAc,CAAC,QAAQ;YACjC,iBAAiB,EAAE,cAAc,CAAC,iBAAiB;SACpD,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,YAAa,CAAC,MAAM,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"configure-gas-oracles.hardhat-test.js","sourceRoot":"","sources":["../../../src/gas/oracle/configure-gas-oracles.hardhat-test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,24 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
1
|
+
import { ethers } from 'ethers';
|
|
2
|
+
import { z } from 'zod';
|
|
3
|
+
export declare const StorageGasOracleConfigSchema: z.ZodObject<{
|
|
4
|
+
gasPrice: z.ZodString;
|
|
5
|
+
tokenExchangeRate: z.ZodString;
|
|
6
|
+
}, "strip", z.ZodTypeAny, {
|
|
7
|
+
gasPrice: string;
|
|
8
|
+
tokenExchangeRate: string;
|
|
9
|
+
}, {
|
|
10
|
+
gasPrice: string;
|
|
11
|
+
tokenExchangeRate: string;
|
|
12
|
+
}>;
|
|
13
|
+
export type StorageGasOracleConfig = z.output<typeof StorageGasOracleConfigSchema>;
|
|
14
|
+
export type OracleData = {
|
|
15
|
+
tokenExchangeRate: ethers.BigNumber;
|
|
16
|
+
gasPrice: ethers.BigNumber;
|
|
17
|
+
};
|
|
18
|
+
export declare const formatGasOracleConfig: (config: OracleData) => {
|
|
7
19
|
tokenExchangeRate: string;
|
|
8
20
|
gasPrice: string;
|
|
9
21
|
};
|
|
10
|
-
export declare const
|
|
22
|
+
export declare const oracleConfigToOracleData: (config: StorageGasOracleConfig) => OracleData;
|
|
23
|
+
export declare const serializeDifference: (actual: OracleData, expected: OracleData) => string;
|
|
11
24
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/gas/oracle/types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/gas/oracle/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,eAAO,MAAM,4BAA4B;;;;;;;;;EAGvC,CAAC;AAGH,MAAM,MAAM,sBAAsB,GAAG,CAAC,CAAC,MAAM,CAC3C,OAAO,4BAA4B,CACpC,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,iBAAiB,EAAE,MAAM,CAAC,SAAS,CAAC;IACpC,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC;CAC5B,CAAC;AAEF,eAAO,MAAM,qBAAqB,WACxB,UAAU,KACjB;IACD,iBAAiB,EAAE,MAAM,CAAC;IAC1B,QAAQ,EAAE,MAAM,CAAC;CAOjB,CAAC;AAmBH,eAAO,MAAM,wBAAwB,WAC3B,sBAAsB,KAC7B,UAGD,CAAC;AAEH,eAAO,MAAM,mBAAmB,WACtB,UAAU,YACR,UAAU,KACnB,MAiBF,CAAC"}
|
package/dist/gas/oracle/types.js
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { ethers } from 'ethers';
|
|
2
|
+
import { z } from 'zod';
|
|
2
3
|
import { TOKEN_EXCHANGE_RATE_DECIMALS } from '../../consts/igp.js';
|
|
3
|
-
export
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
})
|
|
4
|
+
export const StorageGasOracleConfigSchema = z.object({
|
|
5
|
+
gasPrice: z.string(),
|
|
6
|
+
tokenExchangeRate: z.string(),
|
|
7
|
+
});
|
|
7
8
|
export const formatGasOracleConfig = (config) => ({
|
|
8
9
|
tokenExchangeRate: ethers.utils.formatUnits(config.tokenExchangeRate, TOKEN_EXCHANGE_RATE_DECIMALS),
|
|
9
10
|
gasPrice: ethers.utils.formatUnits(config.gasPrice, 'gwei'),
|
|
@@ -16,6 +17,11 @@ const serializePercentDifference = (actual, expected) => {
|
|
|
16
17
|
const diff = percentDifference(actual, expected);
|
|
17
18
|
return diff.isNegative() ? `${diff.toString()}%` : `+${diff.toString()}%`;
|
|
18
19
|
};
|
|
20
|
+
// TODO: replace once #3771 is fixed
|
|
21
|
+
export const oracleConfigToOracleData = (config) => ({
|
|
22
|
+
gasPrice: ethers.BigNumber.from(config.gasPrice),
|
|
23
|
+
tokenExchangeRate: ethers.BigNumber.from(config.tokenExchangeRate),
|
|
24
|
+
});
|
|
19
25
|
export const serializeDifference = (actual, expected) => {
|
|
20
26
|
const gasPriceDiff = serializePercentDifference(actual.gasPrice, expected.gasPrice);
|
|
21
27
|
const tokenExchangeRateDiff = serializePercentDifference(actual.tokenExchangeRate, expected.tokenExchangeRate);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/gas/oracle/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/gas/oracle/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AAEnE,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC,CAAC,MAAM,CAAC;IACnD,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;IACpB,iBAAiB,EAAE,CAAC,CAAC,MAAM,EAAE;CAC9B,CAAC,CAAC;AAYH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,MAAkB,EAIlB,EAAE,CAAC,CAAC;IACJ,iBAAiB,EAAE,MAAM,CAAC,KAAK,CAAC,WAAW,CACzC,MAAM,CAAC,iBAAiB,EACxB,4BAA4B,CAC7B;IACD,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC5D,CAAC,CAAC;AAEH,MAAM,iBAAiB,GAAG,CACxB,MAAwB,EACxB,QAA0B,EACR,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AAEjE,MAAM,0BAA0B,GAAG,CACjC,MAAwB,EACxB,QAA0B,EAClB,EAAE;IACV,IAAI,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;QACpB,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,IAAI,GAAG,iBAAiB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACjD,OAAO,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC;AAC5E,CAAC,CAAC;AAEF,oCAAoC;AACpC,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,MAA8B,EAClB,EAAE,CAAC,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;IAChD,iBAAiB,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC;CACnE,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,MAAkB,EAClB,QAAoB,EACZ,EAAE;IACV,MAAM,YAAY,GAAG,0BAA0B,CAC7C,MAAM,CAAC,QAAQ,EACf,QAAQ,CAAC,QAAQ,CAClB,CAAC;IACF,MAAM,qBAAqB,GAAG,0BAA0B,CACtD,MAAM,CAAC,iBAAiB,EACxB,QAAQ,CAAC,iBAAiB,CAC3B,CAAC;IAEF,MAAM,WAAW,GAAG,0BAA0B,CAC5C,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,EAC7C,QAAQ,CAAC,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAClD,CAAC;IAEF,MAAM,SAAS,GAAG,qBAAqB,CAAC,QAAQ,CAAC,CAAC;IAClD,OAAO,kBAAkB,SAAS,CAAC,iBAAiB,KAAK,qBAAqB,iBAAiB,SAAS,CAAC,QAAQ,UAAU,YAAY,oBAAoB,WAAW,EAAE,CAAC;AAC3K,CAAC,CAAC"}
|
package/dist/gas/types.d.ts
CHANGED
|
@@ -1,17 +1,11 @@
|
|
|
1
1
|
import { BigNumber } from 'ethers';
|
|
2
|
+
import { z } from 'zod';
|
|
2
3
|
import { InterchainGasPaymaster } from '@hyperlane-xyz/core';
|
|
3
4
|
import type { Address } from '@hyperlane-xyz/utils';
|
|
4
|
-
import type { CheckerViolation
|
|
5
|
+
import type { CheckerViolation } from '../deploy/types.js';
|
|
6
|
+
import { IgpSchema } from '../hook/schemas.js';
|
|
5
7
|
import { ChainMap } from '../types.js';
|
|
6
|
-
|
|
7
|
-
import { GasOracleContractType, StorageGasOracleConfig } from './oracle/types.js';
|
|
8
|
-
export type IgpConfig = OwnableConfig<keyof IgpFactories> & {
|
|
9
|
-
beneficiary: Address;
|
|
10
|
-
oracleKey: Address;
|
|
11
|
-
overhead: ChainMap<number>;
|
|
12
|
-
oracleConfig?: ChainMap<StorageGasOracleConfig>;
|
|
13
|
-
gasOracleType?: ChainMap<GasOracleContractType>;
|
|
14
|
-
};
|
|
8
|
+
export type IgpConfig = z.infer<typeof IgpSchema>;
|
|
15
9
|
export declare enum IgpViolationType {
|
|
16
10
|
Beneficiary = "Beneficiary",
|
|
17
11
|
GasOracles = "GasOracles",
|
package/dist/gas/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/gas/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/gas/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,SAAS,CAAC,CAAC;AAElD,oBAAY,gBAAgB;IAC1B,WAAW,gBAAgB;IAC3B,UAAU,eAAe;IACzB,QAAQ,aAAa;CACtB;AAED,MAAM,WAAW,YAAa,SAAQ,gBAAgB;IACpD,IAAI,EAAE,wBAAwB,CAAC;IAC/B,OAAO,EAAE,gBAAgB,CAAC;CAC3B;AAED,MAAM,WAAW,uBAAwB,SAAQ,YAAY;IAC3D,OAAO,EAAE,gBAAgB,CAAC,WAAW,CAAC;IACtC,QAAQ,EAAE,sBAAsB,CAAC;IACjC,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,sBAAuB,SAAQ,YAAY;IAC1D,OAAO,EAAE,gBAAgB,CAAC,UAAU,CAAC;IACrC,QAAQ,EAAE,sBAAsB,CAAC;IACjC,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC1B,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;CAC7B;AAED,MAAM,WAAW,oBAAqB,SAAQ,YAAY;IACxD,OAAO,EAAE,gBAAgB,CAAC,QAAQ,CAAC;IACnC,QAAQ,EAAE,sBAAsB,CAAC;IACjC,MAAM,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;IAC5B,QAAQ,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;CAC/B"}
|
package/dist/gas/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/gas/types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/gas/types.ts"],"names":[],"mappings":"AAYA,MAAM,CAAN,IAAY,gBAIX;AAJD,WAAY,gBAAgB;IAC1B,+CAA2B,CAAA;IAC3B,6CAAyB,CAAA;IACzB,yCAAqB,CAAA;AACvB,CAAC,EAJW,gBAAgB,KAAhB,gBAAgB,QAI3B"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { Address, ProtocolType } from '@hyperlane-xyz/utils';
|
|
2
|
+
import { HyperlaneAddresses } from '../contracts/types.js';
|
|
3
|
+
import { HyperlaneModule, HyperlaneModuleParams } from '../core/AbstractHyperlaneModule.js';
|
|
4
|
+
import { HyperlaneDeployer } from '../deploy/HyperlaneDeployer.js';
|
|
5
|
+
import { MultiProvider } from '../providers/MultiProvider.js';
|
|
6
|
+
import { AnnotatedEV5Transaction } from '../providers/ProviderType.js';
|
|
7
|
+
import { EvmHookReader } from './EvmHookReader.js';
|
|
8
|
+
import { HookFactories } from './contracts.js';
|
|
9
|
+
import { HookConfig } from './types.js';
|
|
10
|
+
export declare class EvmHookModule extends HyperlaneModule<ProtocolType.Ethereum, HookConfig, HyperlaneAddresses<HookFactories> & {
|
|
11
|
+
deployedHook: Address;
|
|
12
|
+
}> {
|
|
13
|
+
protected readonly multiProvider: MultiProvider;
|
|
14
|
+
protected readonly deployer: HyperlaneDeployer<any, any>;
|
|
15
|
+
protected logger: import("pino").default.Logger<never>;
|
|
16
|
+
protected reader: EvmHookReader;
|
|
17
|
+
protected constructor(multiProvider: MultiProvider, deployer: HyperlaneDeployer<any, any>, args: HyperlaneModuleParams<HookConfig, HyperlaneAddresses<HookFactories> & {
|
|
18
|
+
deployedHook: Address;
|
|
19
|
+
}>);
|
|
20
|
+
read(): Promise<HookConfig>;
|
|
21
|
+
update(_config: HookConfig): Promise<AnnotatedEV5Transaction[]>;
|
|
22
|
+
static create(_config: HookConfig): Promise<EvmHookModule>;
|
|
23
|
+
}
|
|
24
|
+
//# sourceMappingURL=EvmHookModule.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"EvmHookModule.d.ts","sourceRoot":"","sources":["../../src/hook/EvmHookModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,YAAY,EAAc,MAAM,sBAAsB,CAAC;AAEzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EACL,eAAe,EACf,qBAAqB,EACtB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAEvE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAGxC,qBAAa,aAAc,SAAQ,eAAe,CAChD,YAAY,CAAC,QAAQ,EACrB,UAAU,EACV,kBAAkB,CAAC,aAAa,CAAC,GAAG;IAClC,YAAY,EAAE,OAAO,CAAC;CACvB,CACF;IAKG,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa;IAC/C,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC;IAL1D,SAAS,CAAC,MAAM,uCAAiD;IACjE,SAAS,CAAC,MAAM,EAAE,aAAa,CAAC;IAEhC,SAAS,aACY,aAAa,EAAE,aAAa,EAC5B,QAAQ,EAAE,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,EACxD,IAAI,EAAE,qBAAqB,CACzB,UAAU,EACV,kBAAkB,CAAC,aAAa,CAAC,GAAG;QAClC,YAAY,EAAE,OAAO,CAAC;KACvB,CACF;IAMU,IAAI,IAAI,OAAO,CAAC,UAAU,CAAC;IAI3B,MAAM,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC;WAK9D,MAAM,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC;CAGlE"}
|
|
@@ -1,21 +1,20 @@
|
|
|
1
1
|
import { rootLogger } from '@hyperlane-xyz/utils';
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
2
|
+
import { HyperlaneModule, } from '../core/AbstractHyperlaneModule.js';
|
|
3
|
+
import { EvmHookReader } from './EvmHookReader.js';
|
|
4
4
|
// WIP example implementation of EvmHookModule
|
|
5
|
-
export class EvmHookModule extends
|
|
5
|
+
export class EvmHookModule extends HyperlaneModule {
|
|
6
6
|
multiProvider;
|
|
7
|
+
deployer;
|
|
7
8
|
logger = rootLogger.child({ module: 'EvmHookModule' });
|
|
8
9
|
reader;
|
|
9
|
-
constructor(multiProvider, args) {
|
|
10
|
-
super(
|
|
11
|
-
...args,
|
|
12
|
-
provider: multiProvider.getProvider(args.chain),
|
|
13
|
-
});
|
|
10
|
+
constructor(multiProvider, deployer, args) {
|
|
11
|
+
super(args);
|
|
14
12
|
this.multiProvider = multiProvider;
|
|
13
|
+
this.deployer = deployer;
|
|
15
14
|
this.reader = new EvmHookReader(multiProvider, args.chain);
|
|
16
15
|
}
|
|
17
|
-
async read(
|
|
18
|
-
return
|
|
16
|
+
async read() {
|
|
17
|
+
return this.reader.deriveHookConfig(this.args.addresses.deployedHook);
|
|
19
18
|
}
|
|
20
19
|
async update(_config) {
|
|
21
20
|
throw new Error('Method not implemented.');
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"EvmHookModule.js","sourceRoot":"","sources":["../../src/hook/EvmHookModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAGzE,OAAO,EACL,eAAe,GAEhB,MAAM,oCAAoC,CAAC;AAK5C,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAInD,8CAA8C;AAC9C,MAAM,OAAO,aAAc,SAAQ,eAMlC;IAKsB;IACA;IALX,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,eAAe,EAAE,CAAC,CAAC;IACvD,MAAM,CAAgB;IAEhC,YACqB,aAA4B,EAC5B,QAAqC,EACxD,IAKC;QAED,KAAK,CAAC,IAAI,CAAC,CAAC;QATO,kBAAa,GAAb,aAAa,CAAe;QAC5B,aAAQ,GAAR,QAAQ,CAA6B;QASxD,IAAI,CAAC,MAAM,GAAG,IAAI,aAAa,CAAC,aAAa,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IAC7D,CAAC;IAEM,KAAK,CAAC,IAAI;QACf,OAAO,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;IACxE,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,OAAmB;QACrC,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,wCAAwC;IACjC,MAAM,CAAC,MAAM,CAAC,OAAmB;QACtC,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACrC,CAAC;CACF"}
|
|
@@ -3,6 +3,7 @@ import { Address, WithAddress } from '@hyperlane-xyz/utils';
|
|
|
3
3
|
import { MultiProvider } from '../providers/MultiProvider.js';
|
|
4
4
|
import { ChainNameOrId } from '../types.js';
|
|
5
5
|
import { AggregationHookConfig, DomainRoutingHookConfig, FallbackRoutingHookConfig, HookConfig, IgpHookConfig, MerkleTreeHookConfig, OpStackHookConfig, PausableHookConfig, ProtocolFeeHookConfig } from './types.js';
|
|
6
|
+
export type DerivedHookConfig = WithAddress<Exclude<HookConfig, Address>>;
|
|
6
7
|
export interface HookReader {
|
|
7
8
|
deriveHookConfig(address: Address): Promise<WithAddress<HookConfig>>;
|
|
8
9
|
deriveMerkleTreeConfig(address: Address): Promise<WithAddress<MerkleTreeHookConfig>>;
|
|
@@ -21,7 +22,7 @@ export declare class EvmHookReader implements HookReader {
|
|
|
21
22
|
protected readonly provider: providers.Provider;
|
|
22
23
|
protected readonly logger: import("pino").default.Logger<never>;
|
|
23
24
|
constructor(multiProvider: MultiProvider, chain: ChainNameOrId, concurrency?: number);
|
|
24
|
-
deriveHookConfig(address: Address): Promise<
|
|
25
|
+
deriveHookConfig(address: Address): Promise<DerivedHookConfig>;
|
|
25
26
|
deriveMerkleTreeConfig(address: Address): Promise<WithAddress<MerkleTreeHookConfig>>;
|
|
26
27
|
deriveAggregationConfig(address: Address): Promise<WithAddress<AggregationHookConfig>>;
|
|
27
28
|
deriveIgpConfig(address: Address): Promise<WithAddress<IgpHookConfig>>;
|
|
@@ -32,4 +33,4 @@ export declare class EvmHookReader implements HookReader {
|
|
|
32
33
|
private fetchDomainHooks;
|
|
33
34
|
derivePausableConfig(address: Address): Promise<WithAddress<PausableHookConfig>>;
|
|
34
35
|
}
|
|
35
|
-
//# sourceMappingURL=
|
|
36
|
+
//# sourceMappingURL=EvmHookReader.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"EvmHookReader.d.ts","sourceRoot":"","sources":["../../src/hook/EvmHookReader.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
import { assert } from 'console';
|
|
2
1
|
import { ethers } from 'ethers';
|
|
3
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';
|
|
4
|
-
import { concurrentMap, eqAddress, rootLogger, } from '@hyperlane-xyz/utils';
|
|
5
|
-
import { DEFAULT_CONTRACT_READ_CONCURRENCY } from '../consts/
|
|
3
|
+
import { assert, concurrentMap, eqAddress, rootLogger, } from '@hyperlane-xyz/utils';
|
|
4
|
+
import { DEFAULT_CONTRACT_READ_CONCURRENCY } from '../consts/concurrency.js';
|
|
6
5
|
import { HookType, OnchainHookType, } from './types.js';
|
|
7
6
|
export class EvmHookReader {
|
|
8
7
|
multiProvider;
|
|
@@ -19,6 +18,7 @@ export class EvmHookReader {
|
|
|
19
18
|
async deriveHookConfig(address) {
|
|
20
19
|
const hook = IPostDispatchHook__factory.connect(address, this.provider);
|
|
21
20
|
const onchainHookType = await hook.hookType();
|
|
21
|
+
this.logger.debug('Deriving HookConfig', { address, onchainHookType });
|
|
22
22
|
switch (onchainHookType) {
|
|
23
23
|
case OnchainHookType.ROUTING:
|
|
24
24
|
return this.deriveDomainRoutingConfig(address);
|
|
@@ -76,7 +76,10 @@ export class EvmHookReader {
|
|
|
76
76
|
const { tokenExchangeRate, gasPrice } = await hook.getExchangeRateAndGasPrice(domainId);
|
|
77
77
|
const domainGasOverhead = await hook.destinationGasLimit(domainId, 0);
|
|
78
78
|
overhead[chainName] = domainGasOverhead.toNumber();
|
|
79
|
-
oracleConfig[chainName] = {
|
|
79
|
+
oracleConfig[chainName] = {
|
|
80
|
+
tokenExchangeRate: tokenExchangeRate.toString(),
|
|
81
|
+
gasPrice: gasPrice.toString(),
|
|
82
|
+
};
|
|
80
83
|
const { gasOracle } = await hook.destinationGasConfigs(domainId);
|
|
81
84
|
const oracle = StorageGasOracle__factory.connect(gasOracle, this.provider);
|
|
82
85
|
return oracle.owner();
|
|
@@ -181,11 +184,13 @@ export class EvmHookReader {
|
|
|
181
184
|
const hook = PausableHook__factory.connect(address, this.provider);
|
|
182
185
|
assert((await hook.hookType()) === OnchainHookType.PAUSABLE);
|
|
183
186
|
const owner = await hook.owner();
|
|
187
|
+
const paused = await hook.paused();
|
|
184
188
|
return {
|
|
185
189
|
owner,
|
|
186
190
|
address,
|
|
191
|
+
paused,
|
|
187
192
|
type: HookType.PAUSABLE,
|
|
188
193
|
};
|
|
189
194
|
}
|
|
190
195
|
}
|
|
191
|
-
//# sourceMappingURL=
|
|
196
|
+
//# sourceMappingURL=EvmHookReader.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"EvmHookReader.js","sourceRoot":"","sources":["../../src/hook/EvmHookReader.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"EvmHookReader.test.d.ts","sourceRoot":"","sources":["../../src/hook/EvmHookReader.test.ts"],"names":[],"mappings":""}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { expect } from 'chai';
|
|
2
2
|
import { ethers } from 'ethers';
|
|
3
|
+
import { randomBytes } from 'ethers/lib/utils.js';
|
|
3
4
|
import sinon from 'sinon';
|
|
4
5
|
import { IPostDispatchHook__factory, MerkleTreeHook__factory, OPStackHook__factory, PausableHook__factory, ProtocolFee__factory, } from '@hyperlane-xyz/core';
|
|
5
6
|
import { TestChainName, test1 } from '../consts/testChains.js';
|
|
6
7
|
import { MultiProvider } from '../providers/MultiProvider.js';
|
|
7
|
-
import { EvmHookReader } from './
|
|
8
|
+
import { EvmHookReader } from './EvmHookReader.js';
|
|
8
9
|
import { HookType, OnchainHookType, } from './types.js';
|
|
9
10
|
describe('EvmHookReader', () => {
|
|
10
11
|
let evmHookReader;
|
|
@@ -80,10 +81,12 @@ describe('EvmHookReader', () => {
|
|
|
80
81
|
it('should derive pausable config correctly', async () => {
|
|
81
82
|
const mockAddress = generateRandomAddress();
|
|
82
83
|
const mockOwner = generateRandomAddress();
|
|
84
|
+
const mockPaused = randomBytes(1)[0] % 2 === 0;
|
|
83
85
|
// Mocking the connect method + returned what we need from contract object
|
|
84
86
|
const mockContract = {
|
|
85
87
|
hookType: sandbox.stub().resolves(OnchainHookType.PAUSABLE),
|
|
86
88
|
owner: sandbox.stub().resolves(mockOwner),
|
|
89
|
+
paused: sandbox.stub().resolves(mockPaused),
|
|
87
90
|
};
|
|
88
91
|
sandbox
|
|
89
92
|
.stub(PausableHook__factory, 'connect')
|
|
@@ -93,6 +96,7 @@ describe('EvmHookReader', () => {
|
|
|
93
96
|
.returns(mockContract);
|
|
94
97
|
const expectedConfig = {
|
|
95
98
|
owner: mockOwner,
|
|
99
|
+
paused: mockPaused,
|
|
96
100
|
address: mockAddress,
|
|
97
101
|
type: HookType.PAUSABLE,
|
|
98
102
|
};
|
|
@@ -144,4 +148,4 @@ describe('EvmHookReader', () => {
|
|
|
144
148
|
- Interchain Gas Paymaster
|
|
145
149
|
*/
|
|
146
150
|
});
|
|
147
|
-
//# sourceMappingURL=
|
|
151
|
+
//# sourceMappingURL=EvmHookReader.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"EvmHookReader.test.js","sourceRoot":"","sources":["../../src/hook/EvmHookReader.test.ts"],"names":[],"mappings":"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"}
|