hardhat 2.6.6 → 2.7.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/builtin-tasks/check.js +1 -1
- package/builtin-tasks/check.js.map +1 -1
- package/builtin-tasks/clean.js +3 -3
- package/builtin-tasks/clean.js.map +1 -1
- package/builtin-tasks/compile.js +57 -48
- package/builtin-tasks/compile.js.map +1 -1
- package/builtin-tasks/console.js +3 -3
- package/builtin-tasks/console.js.map +1 -1
- package/builtin-tasks/flatten.js +8 -6
- package/builtin-tasks/flatten.js.map +1 -1
- package/builtin-tasks/help.js +2 -2
- package/builtin-tasks/help.js.map +1 -1
- package/builtin-tasks/node.js +45 -22
- package/builtin-tasks/node.js.map +1 -1
- package/builtin-tasks/run.js +11 -7
- package/builtin-tasks/run.js.map +1 -1
- package/builtin-tasks/test.js +11 -11
- package/builtin-tasks/test.js.map +1 -1
- package/builtin-tasks/utils/solidity-files-cache.js +1 -1
- package/builtin-tasks/utils/solidity-files-cache.js.map +1 -1
- package/builtin-tasks/utils/watch.d.ts.map +1 -1
- package/builtin-tasks/utils/watch.js +4 -2
- package/builtin-tasks/utils/watch.js.map +1 -1
- package/internal/artifacts.d.ts +49 -0
- package/internal/artifacts.d.ts.map +1 -1
- package/internal/artifacts.js +204 -68
- package/internal/artifacts.js.map +1 -1
- package/internal/cli/analytics.js +11 -10
- package/internal/cli/analytics.js.map +1 -1
- package/internal/cli/autocomplete.js +7 -7
- package/internal/cli/autocomplete.js.map +1 -1
- package/internal/cli/bootstrap.js +2 -2
- package/internal/cli/bootstrap.js.map +1 -1
- package/internal/cli/cli.js +16 -16
- package/internal/cli/cli.js.map +1 -1
- package/internal/cli/project-creation.js +13 -13
- package/internal/cli/project-creation.js.map +1 -1
- package/internal/constants.d.ts +2 -0
- package/internal/constants.d.ts.map +1 -1
- package/internal/constants.js +4 -1
- package/internal/constants.js.map +1 -1
- package/internal/context.d.ts +1 -2
- package/internal/context.d.ts.map +1 -1
- package/internal/context.js +3 -3
- package/internal/context.js.map +1 -1
- package/internal/core/config/config-loading.d.ts.map +1 -1
- package/internal/core/config/config-loading.js +22 -8
- package/internal/core/config/config-loading.js.map +1 -1
- package/internal/core/config/config-resolution.d.ts.map +1 -1
- package/internal/core/config/config-resolution.js +29 -8
- package/internal/core/config/config-resolution.js.map +1 -1
- package/internal/core/config/config-validation.d.ts +1 -0
- package/internal/core/config/config-validation.d.ts.map +1 -1
- package/internal/core/config/config-validation.js +113 -38
- package/internal/core/config/config-validation.js.map +1 -1
- package/internal/core/config/default-config.d.ts +1 -0
- package/internal/core/config/default-config.d.ts.map +1 -1
- package/internal/core/config/default-config.js +12 -5
- package/internal/core/config/default-config.js.map +1 -1
- package/internal/core/errors-list.d.ts +14 -0
- package/internal/core/errors-list.d.ts.map +1 -1
- package/internal/core/errors-list.js +21 -2
- package/internal/core/errors-list.js.map +1 -1
- package/internal/core/errors.js +3 -3
- package/internal/core/errors.js.map +1 -1
- package/internal/core/execution-mode.js +2 -2
- package/internal/core/execution-mode.js.map +1 -1
- package/internal/core/jsonrpc/types/access-list.d.ts +0 -1
- package/internal/core/jsonrpc/types/access-list.d.ts.map +1 -1
- package/internal/core/jsonrpc/types/access-list.js +1 -1
- package/internal/core/jsonrpc/types/access-list.js.map +1 -1
- package/internal/core/jsonrpc/types/base-types.js +9 -9
- package/internal/core/jsonrpc/types/base-types.js.map +1 -1
- package/internal/core/jsonrpc/types/input/blockTag.d.ts +3 -4
- package/internal/core/jsonrpc/types/input/blockTag.d.ts.map +1 -1
- package/internal/core/jsonrpc/types/input/blockTag.js +3 -3
- package/internal/core/jsonrpc/types/input/blockTag.js.map +1 -1
- package/internal/core/jsonrpc/types/input/callRequest.d.ts +0 -1
- package/internal/core/jsonrpc/types/input/callRequest.d.ts.map +1 -1
- package/internal/core/jsonrpc/types/input/callRequest.js +9 -9
- package/internal/core/jsonrpc/types/input/callRequest.js.map +1 -1
- package/internal/core/jsonrpc/types/input/debugTraceTransaction.js +4 -4
- package/internal/core/jsonrpc/types/input/debugTraceTransaction.js.map +1 -1
- package/internal/core/jsonrpc/types/input/filterRequest.d.ts +0 -1
- package/internal/core/jsonrpc/types/input/filterRequest.d.ts.map +1 -1
- package/internal/core/jsonrpc/types/input/filterRequest.js +2 -2
- package/internal/core/jsonrpc/types/input/filterRequest.js.map +1 -1
- package/internal/core/jsonrpc/types/input/hardhat-network.js +4 -4
- package/internal/core/jsonrpc/types/input/hardhat-network.js.map +1 -1
- package/internal/core/jsonrpc/types/input/logAddress.js +1 -1
- package/internal/core/jsonrpc/types/input/logAddress.js.map +1 -1
- package/internal/core/jsonrpc/types/input/logTopics.js +1 -1
- package/internal/core/jsonrpc/types/input/logTopics.js.map +1 -1
- package/internal/core/jsonrpc/types/input/transactionRequest.d.ts +0 -1
- package/internal/core/jsonrpc/types/input/transactionRequest.d.ts.map +1 -1
- package/internal/core/jsonrpc/types/input/transactionRequest.js +10 -10
- package/internal/core/jsonrpc/types/input/transactionRequest.js.map +1 -1
- package/internal/core/jsonrpc/types/output/block.d.ts +0 -1
- package/internal/core/jsonrpc/types/output/block.d.ts.map +1 -1
- package/internal/core/jsonrpc/types/output/block.js +5 -5
- package/internal/core/jsonrpc/types/output/block.js.map +1 -1
- package/internal/core/jsonrpc/types/output/log.d.ts +1 -1
- package/internal/core/jsonrpc/types/output/log.d.ts.map +1 -1
- package/internal/core/jsonrpc/types/output/log.js +5 -4
- package/internal/core/jsonrpc/types/output/log.js.map +1 -1
- package/internal/core/jsonrpc/types/output/receipt.d.ts +1 -1
- package/internal/core/jsonrpc/types/output/receipt.d.ts.map +1 -1
- package/internal/core/jsonrpc/types/output/receipt.js +6 -6
- package/internal/core/jsonrpc/types/output/receipt.js.map +1 -1
- package/internal/core/jsonrpc/types/output/transaction.d.ts +0 -1
- package/internal/core/jsonrpc/types/output/transaction.d.ts.map +1 -1
- package/internal/core/jsonrpc/types/output/transaction.js +9 -9
- package/internal/core/jsonrpc/types/output/transaction.js.map +1 -1
- package/internal/core/params/argumentTypes.d.ts.map +1 -1
- package/internal/core/params/argumentTypes.js +25 -13
- package/internal/core/params/argumentTypes.js.map +1 -1
- package/internal/core/params/env-variables.d.ts.map +1 -1
- package/internal/core/params/env-variables.js +9 -5
- package/internal/core/params/env-variables.js.map +1 -1
- package/internal/core/params/hardhat-params.js +2 -2
- package/internal/core/params/hardhat-params.js.map +1 -1
- package/internal/core/project-structure.js +1 -1
- package/internal/core/project-structure.js.map +1 -1
- package/internal/core/providers/accounts.d.ts.map +1 -1
- package/internal/core/providers/accounts.js +22 -7
- package/internal/core/providers/accounts.js.map +1 -1
- package/internal/core/providers/backwards-compatibility.js.map +1 -1
- package/internal/core/providers/chainId.js +3 -3
- package/internal/core/providers/chainId.js.map +1 -1
- package/internal/core/providers/construction.d.ts.map +1 -1
- package/internal/core/providers/construction.js +6 -4
- package/internal/core/providers/construction.js.map +1 -1
- package/internal/core/providers/gas-providers.d.ts.map +1 -1
- package/internal/core/providers/gas-providers.js +20 -18
- package/internal/core/providers/gas-providers.js.map +1 -1
- package/internal/core/providers/http.js +1 -1
- package/internal/core/providers/http.js.map +1 -1
- package/internal/core/providers/util.js +1 -1
- package/internal/core/providers/util.js.map +1 -1
- package/internal/core/providers/wrapper.d.ts.map +1 -1
- package/internal/core/runtime-environment.d.ts.map +1 -1
- package/internal/core/runtime-environment.js +7 -5
- package/internal/core/runtime-environment.js.map +1 -1
- package/internal/core/typescript-support.d.ts +1 -1
- package/internal/core/typescript-support.d.ts.map +1 -1
- package/internal/core/typescript-support.js +8 -5
- package/internal/core/typescript-support.js.map +1 -1
- package/internal/hardhat-network/jsonrpc/client.d.ts +2 -0
- package/internal/hardhat-network/jsonrpc/client.d.ts.map +1 -1
- package/internal/hardhat-network/jsonrpc/client.js +23 -23
- package/internal/hardhat-network/jsonrpc/client.js.map +1 -1
- package/internal/hardhat-network/jsonrpc/handler.js +16 -8
- package/internal/hardhat-network/jsonrpc/handler.js.map +1 -1
- package/internal/hardhat-network/jsonrpc/server.js +1 -1
- package/internal/hardhat-network/jsonrpc/server.js.map +1 -1
- package/internal/hardhat-network/provider/BlockchainData.d.ts +1 -1
- package/internal/hardhat-network/provider/BlockchainData.js +12 -12
- package/internal/hardhat-network/provider/BlockchainData.js.map +1 -1
- package/internal/hardhat-network/provider/HardhatBlockchain.js +2 -2
- package/internal/hardhat-network/provider/HardhatBlockchain.js.map +1 -1
- package/internal/hardhat-network/provider/HardhatStateManager.js +29 -29
- package/internal/hardhat-network/provider/HardhatStateManager.js.map +1 -1
- package/internal/hardhat-network/provider/PoolState.js +6 -6
- package/internal/hardhat-network/provider/PoolState.js.map +1 -1
- package/internal/hardhat-network/provider/TransactionQueue.d.ts +2 -1
- package/internal/hardhat-network/provider/TransactionQueue.d.ts.map +1 -1
- package/internal/hardhat-network/provider/TransactionQueue.js +16 -2
- package/internal/hardhat-network/provider/TransactionQueue.js.map +1 -1
- package/internal/hardhat-network/provider/TxPool.js +19 -19
- package/internal/hardhat-network/provider/TxPool.js.map +1 -1
- package/internal/hardhat-network/provider/filter.js +3 -3
- package/internal/hardhat-network/provider/filter.js.map +1 -1
- package/internal/hardhat-network/provider/fork/AccountState.js +4 -4
- package/internal/hardhat-network/provider/fork/AccountState.js.map +1 -1
- package/internal/hardhat-network/provider/fork/ForkBlockchain.d.ts.map +1 -1
- package/internal/hardhat-network/provider/fork/ForkBlockchain.js +8 -10
- package/internal/hardhat-network/provider/fork/ForkBlockchain.js.map +1 -1
- package/internal/hardhat-network/provider/fork/ForkStateManager.js +34 -34
- package/internal/hardhat-network/provider/fork/ForkStateManager.js.map +1 -1
- package/internal/hardhat-network/provider/fork/random.d.ts +0 -1
- package/internal/hardhat-network/provider/fork/random.d.ts.map +1 -1
- package/internal/hardhat-network/provider/fork/random.js +13 -8
- package/internal/hardhat-network/provider/fork/random.js.map +1 -1
- package/internal/hardhat-network/provider/fork/rpcToBlockData.js +1 -0
- package/internal/hardhat-network/provider/fork/rpcToBlockData.js.map +1 -1
- package/internal/hardhat-network/provider/fork/rpcToTxData.js.map +1 -1
- package/internal/hardhat-network/provider/modules/debug.js +1 -1
- package/internal/hardhat-network/provider/modules/debug.js.map +1 -1
- package/internal/hardhat-network/provider/modules/eth.d.ts.map +1 -1
- package/internal/hardhat-network/provider/modules/eth.js +86 -84
- package/internal/hardhat-network/provider/modules/eth.js.map +1 -1
- package/internal/hardhat-network/provider/modules/evm.js +9 -9
- package/internal/hardhat-network/provider/modules/evm.js.map +1 -1
- package/internal/hardhat-network/provider/modules/hardhat.d.ts +3 -0
- package/internal/hardhat-network/provider/modules/hardhat.d.ts.map +1 -1
- package/internal/hardhat-network/provider/modules/hardhat.js +31 -15
- package/internal/hardhat-network/provider/modules/hardhat.js.map +1 -1
- package/internal/hardhat-network/provider/modules/logger.js +17 -17
- package/internal/hardhat-network/provider/modules/logger.js.map +1 -1
- package/internal/hardhat-network/provider/modules/net.js +2 -2
- package/internal/hardhat-network/provider/modules/net.js.map +1 -1
- package/internal/hardhat-network/provider/modules/personal.d.ts +9 -0
- package/internal/hardhat-network/provider/modules/personal.d.ts.map +1 -0
- package/internal/hardhat-network/provider/modules/personal.js +31 -0
- package/internal/hardhat-network/provider/modules/personal.js.map +1 -0
- package/internal/hardhat-network/provider/modules/web3.js +4 -4
- package/internal/hardhat-network/provider/modules/web3.js.map +1 -1
- package/internal/hardhat-network/provider/node-types.d.ts +5 -0
- package/internal/hardhat-network/provider/node-types.d.ts.map +1 -1
- package/internal/hardhat-network/provider/node-types.js.map +1 -1
- package/internal/hardhat-network/provider/node.d.ts +4 -1
- package/internal/hardhat-network/provider/node.d.ts.map +1 -1
- package/internal/hardhat-network/provider/node.js +107 -71
- package/internal/hardhat-network/provider/node.js.map +1 -1
- package/internal/hardhat-network/provider/output.d.ts +1 -1
- package/internal/hardhat-network/provider/output.d.ts.map +1 -1
- package/internal/hardhat-network/provider/output.js +94 -91
- package/internal/hardhat-network/provider/output.js.map +1 -1
- package/internal/hardhat-network/provider/provider.d.ts +6 -2
- package/internal/hardhat-network/provider/provider.d.ts.map +1 -1
- package/internal/hardhat-network/provider/provider.js +14 -4
- package/internal/hardhat-network/provider/provider.js.map +1 -1
- package/internal/hardhat-network/provider/return-data.js +4 -4
- package/internal/hardhat-network/provider/return-data.js.map +1 -1
- package/internal/hardhat-network/provider/transactions/FakeSenderAccessListEIP2930Transaction.js.map +1 -1
- package/internal/hardhat-network/provider/transactions/FakeSenderEIP1559Transaction.js.map +1 -1
- package/internal/hardhat-network/provider/transactions/FakeSenderTransaction.js.map +1 -1
- package/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP1559Transaction.js +1 -1
- package/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP1559Transaction.js.map +1 -1
- package/internal/hardhat-network/provider/utils/bnToHex.js +1 -1
- package/internal/hardhat-network/provider/utils/bnToHex.js.map +1 -1
- package/internal/hardhat-network/provider/utils/fork-recomendations-banner.js.map +1 -1
- package/internal/hardhat-network/provider/utils/makeAccount.js +4 -4
- package/internal/hardhat-network/provider/utils/makeAccount.js.map +1 -1
- package/internal/hardhat-network/provider/utils/makeCommon.js +3 -3
- package/internal/hardhat-network/provider/utils/makeCommon.js.map +1 -1
- package/internal/hardhat-network/provider/utils/makeForkClient.js +4 -4
- package/internal/hardhat-network/provider/utils/makeForkClient.js.map +1 -1
- package/internal/hardhat-network/provider/utils/makeStateTrie.js +1 -1
- package/internal/hardhat-network/provider/utils/makeStateTrie.js.map +1 -1
- package/internal/hardhat-network/provider/utils/txMapToArray.js +1 -1
- package/internal/hardhat-network/provider/utils/txMapToArray.js.map +1 -1
- package/internal/hardhat-network/stack-traces/compiler-to-model.js +4 -4
- package/internal/hardhat-network/stack-traces/compiler-to-model.js.map +1 -1
- package/internal/hardhat-network/stack-traces/consoleLogger.js +44 -44
- package/internal/hardhat-network/stack-traces/consoleLogger.js.map +1 -1
- package/internal/hardhat-network/stack-traces/contracts-identifier.js +6 -6
- package/internal/hardhat-network/stack-traces/contracts-identifier.js.map +1 -1
- package/internal/hardhat-network/stack-traces/debug.js +17 -17
- package/internal/hardhat-network/stack-traces/debug.js.map +1 -1
- package/internal/hardhat-network/stack-traces/error-inferrer.d.ts.map +1 -1
- package/internal/hardhat-network/stack-traces/error-inferrer.js +42 -28
- package/internal/hardhat-network/stack-traces/error-inferrer.js.map +1 -1
- package/internal/hardhat-network/stack-traces/mapped-inlined-internal-functions-heuristics.js +3 -3
- package/internal/hardhat-network/stack-traces/mapped-inlined-internal-functions-heuristics.js.map +1 -1
- package/internal/hardhat-network/stack-traces/model.js +5 -5
- package/internal/hardhat-network/stack-traces/model.js.map +1 -1
- package/internal/hardhat-network/stack-traces/solidity-errors.js +3 -3
- package/internal/hardhat-network/stack-traces/solidity-errors.js.map +1 -1
- package/internal/hardhat-network/stack-traces/solidityTracer.d.ts +1 -1
- package/internal/hardhat-network/stack-traces/solidityTracer.js +11 -11
- package/internal/hardhat-network/stack-traces/solidityTracer.js.map +1 -1
- package/internal/hardhat-network/stack-traces/source-maps.js +7 -7
- package/internal/hardhat-network/stack-traces/source-maps.js.map +1 -1
- package/internal/hardhat-network/stack-traces/vm-debug-tracer.js +5 -5
- package/internal/hardhat-network/stack-traces/vm-debug-tracer.js.map +1 -1
- package/internal/hardhat-network/stack-traces/vm-trace-decoder.js +2 -2
- package/internal/hardhat-network/stack-traces/vm-trace-decoder.js.map +1 -1
- package/internal/hardhat-network/stack-traces/vm-tracer.js +3 -3
- package/internal/hardhat-network/stack-traces/vm-tracer.js.map +1 -1
- package/internal/lib/hardhat-lib.js +3 -3
- package/internal/lib/hardhat-lib.js.map +1 -1
- package/internal/reset.js +1 -1
- package/internal/reset.js.map +1 -1
- package/internal/sentry/anonymizer.js.map +1 -1
- package/internal/sentry/reporter.js +5 -5
- package/internal/sentry/reporter.js.map +1 -1
- package/internal/sentry/subprocess.js +2 -2
- package/internal/sentry/subprocess.js.map +1 -1
- package/internal/sentry/transport.js +1 -1
- package/internal/sentry/transport.js.map +1 -1
- package/internal/solidity/compilation-job.js +4 -4
- package/internal/solidity/compilation-job.js.map +1 -1
- package/internal/solidity/compiler/downloader.d.ts +1 -1
- package/internal/solidity/compiler/downloader.d.ts.map +1 -1
- package/internal/solidity/compiler/downloader.js +21 -7
- package/internal/solidity/compiler/downloader.js.map +1 -1
- package/internal/solidity/compiler/index.js +1 -1
- package/internal/solidity/compiler/index.js.map +1 -1
- package/internal/solidity/dependencyGraph.js +2 -1
- package/internal/solidity/dependencyGraph.js.map +1 -1
- package/internal/solidity/parse.js +3 -2
- package/internal/solidity/parse.js.map +1 -1
- package/internal/solidity/resolver.js +10 -10
- package/internal/solidity/resolver.js.map +1 -1
- package/internal/util/abi-helpers.js +1 -1
- package/internal/util/abi-helpers.js.map +1 -1
- package/internal/util/download.d.ts.map +1 -1
- package/internal/util/download.js +12 -1
- package/internal/util/download.js.map +1 -1
- package/internal/util/global-dir.js +1 -1
- package/internal/util/global-dir.js.map +1 -1
- package/internal/util/hardforks.d.ts +2 -1
- package/internal/util/hardforks.d.ts.map +1 -1
- package/internal/util/hardforks.js +3 -1
- package/internal/util/hardforks.js.map +1 -1
- package/internal/util/jsonrpc.js +1 -1
- package/internal/util/jsonrpc.js.map +1 -1
- package/internal/util/packageInfo.js +1 -1
- package/internal/util/packageInfo.js.map +1 -1
- package/internal/util/scripts-runner.js +3 -3
- package/internal/util/scripts-runner.js.map +1 -1
- package/package.json +14 -14
- package/register.js +7 -7
- package/register.js.map +1 -1
- package/src/builtin-tasks/compile.ts +14 -0
- package/src/builtin-tasks/flatten.ts +4 -2
- package/src/builtin-tasks/node.ts +56 -17
- package/src/builtin-tasks/run.ts +13 -8
- package/src/builtin-tasks/utils/watch.ts +3 -1
- package/src/internal/artifacts.ts +269 -72
- package/src/internal/cli/analytics.ts +1 -1
- package/src/internal/cli/autocomplete.ts +3 -3
- package/src/internal/cli/bootstrap.ts +1 -1
- package/src/internal/cli/cli.ts +2 -2
- package/src/internal/cli/project-creation.ts +2 -2
- package/src/internal/constants.ts +4 -0
- package/src/internal/context.ts +1 -1
- package/src/internal/core/config/config-loading.ts +25 -3
- package/src/internal/core/config/config-resolution.ts +28 -0
- package/src/internal/core/config/config-validation.ts +147 -15
- package/src/internal/core/config/default-config.ts +10 -3
- package/src/internal/core/errors-list.ts +21 -2
- package/src/internal/core/execution-mode.ts +1 -1
- package/src/internal/core/jsonrpc/types/output/log.ts +1 -0
- package/src/internal/core/params/argumentTypes.ts +40 -25
- package/src/internal/core/params/env-variables.ts +13 -8
- package/src/internal/core/params/hardhat-params.ts +2 -2
- package/src/internal/core/providers/accounts.ts +23 -3
- package/src/internal/core/providers/backwards-compatibility.ts +1 -1
- package/src/internal/core/providers/chainId.ts +1 -1
- package/src/internal/core/providers/construction.ts +8 -2
- package/src/internal/core/providers/gas-providers.ts +7 -5
- package/src/internal/core/providers/http.ts +1 -1
- package/src/internal/core/providers/wrapper.ts +1 -1
- package/src/internal/core/runtime-environment.ts +3 -1
- package/src/internal/core/typescript-support.ts +7 -3
- package/src/internal/hardhat-network/jsonrpc/client.ts +2 -2
- package/src/internal/hardhat-network/jsonrpc/handler.ts +12 -2
- package/src/internal/hardhat-network/jsonrpc/server.ts +2 -2
- package/src/internal/hardhat-network/provider/TransactionQueue.ts +31 -4
- package/src/internal/hardhat-network/provider/TxPool.ts +1 -1
- package/src/internal/hardhat-network/provider/fork/ForkBlockchain.ts +2 -4
- package/src/internal/hardhat-network/provider/modules/eth.ts +23 -21
- package/src/internal/hardhat-network/provider/modules/hardhat.ts +24 -1
- package/src/internal/hardhat-network/provider/modules/personal.ts +39 -0
- package/src/internal/hardhat-network/provider/node-types.ts +6 -0
- package/src/internal/hardhat-network/provider/node.ts +68 -26
- package/src/internal/hardhat-network/provider/output.ts +9 -9
- package/src/internal/hardhat-network/provider/provider.ts +16 -2
- package/src/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP1559Transaction.ts +1 -1
- package/src/internal/hardhat-network/stack-traces/error-inferrer.ts +19 -0
- package/src/internal/hardhat-network/stack-traces/solidity-errors.ts +1 -1
- package/src/internal/hardhat-network/stack-traces/solidityTracer.ts +1 -1
- package/src/internal/hardhat-network/stack-traces/vm-tracer.ts +3 -3
- package/src/internal/reset.ts +1 -1
- package/src/internal/sentry/subprocess.ts +2 -2
- package/src/internal/solidity/compiler/downloader.ts +27 -12
- package/src/internal/solidity/resolver.ts +1 -1
- package/src/internal/util/abi-helpers.ts +1 -1
- package/src/internal/util/download.ts +17 -1
- package/src/internal/util/hardforks.ts +2 -0
- package/src/internal/util/jsonrpc.ts +1 -1
- package/src/internal/util/packageInfo.ts +1 -1
- package/src/internal/util/scripts-runner.ts +1 -1
- package/src/register.ts +1 -1
- package/src/types/config.ts +14 -0
- package/src/utils/contract-names.ts +112 -0
- package/src/utils/source-names.ts +14 -12
- package/types/config.d.ts +10 -0
- package/types/config.d.ts.map +1 -1
- package/utils/contract-names.d.ts +10 -0
- package/utils/contract-names.d.ts.map +1 -1
- package/utils/contract-names.js +92 -1
- package/utils/contract-names.js.map +1 -1
- package/utils/source-names.d.ts +1 -1
- package/utils/source-names.js +8 -6
- package/utils/source-names.js.map +1 -1
- package/CHANGELOG.md +0 -32
|
@@ -59,14 +59,14 @@ class JsonRpcHandler {
|
|
|
59
59
|
let rpcResp;
|
|
60
60
|
try {
|
|
61
61
|
rpcReq = _readWsRequest(msg);
|
|
62
|
-
if (!jsonrpc_1.isValidJsonRequest(rpcReq)) {
|
|
62
|
+
if (!(0, jsonrpc_1.isValidJsonRequest)(rpcReq)) {
|
|
63
63
|
throw new errors_1.InvalidRequestError("Invalid request");
|
|
64
64
|
}
|
|
65
65
|
rpcResp = await this._handleRequest(rpcReq);
|
|
66
66
|
// If eth_subscribe was successful, keep track of the subscription id,
|
|
67
67
|
// so we can cleanup on websocket close.
|
|
68
68
|
if (rpcReq.method === "eth_subscribe" &&
|
|
69
|
-
jsonrpc_1.isSuccessfulJsonResponse(rpcResp)) {
|
|
69
|
+
(0, jsonrpc_1.isSuccessfulJsonResponse)(rpcResp)) {
|
|
70
70
|
subscriptions.push(rpcResp.result);
|
|
71
71
|
}
|
|
72
72
|
}
|
|
@@ -74,7 +74,7 @@ class JsonRpcHandler {
|
|
|
74
74
|
rpcResp = _handleError(error);
|
|
75
75
|
}
|
|
76
76
|
// Validate the RPC response.
|
|
77
|
-
if (!jsonrpc_1.isValidJsonResponse(rpcResp)) {
|
|
77
|
+
if (!(0, jsonrpc_1.isValidJsonResponse)(rpcResp)) {
|
|
78
78
|
// Malformed response coming from the provider, report to user as an internal error.
|
|
79
79
|
rpcResp = _handleError(new errors_1.InternalError("Internal error"));
|
|
80
80
|
}
|
|
@@ -124,7 +124,7 @@ class JsonRpcHandler {
|
|
|
124
124
|
res.end(JSON.stringify(rpcResp));
|
|
125
125
|
}
|
|
126
126
|
async _handleSingleRequest(req) {
|
|
127
|
-
if (!jsonrpc_1.isValidJsonRequest(req)) {
|
|
127
|
+
if (!(0, jsonrpc_1.isValidJsonRequest)(req)) {
|
|
128
128
|
return _handleError(new errors_1.InvalidRequestError("Invalid request"));
|
|
129
129
|
}
|
|
130
130
|
const rpcReq = req;
|
|
@@ -136,7 +136,7 @@ class JsonRpcHandler {
|
|
|
136
136
|
rpcResp = _handleError(error);
|
|
137
137
|
}
|
|
138
138
|
// Validate the RPC response.
|
|
139
|
-
if (!jsonrpc_1.isValidJsonResponse(rpcResp)) {
|
|
139
|
+
if (!(0, jsonrpc_1.isValidJsonResponse)(rpcResp)) {
|
|
140
140
|
// Malformed response coming from the provider, report to user as an internal error.
|
|
141
141
|
rpcResp = _handleError(new errors_1.InternalError("Internal error"));
|
|
142
142
|
}
|
|
@@ -150,12 +150,16 @@ exports.default = JsonRpcHandler;
|
|
|
150
150
|
const _readJsonHttpRequest = async (req) => {
|
|
151
151
|
let json;
|
|
152
152
|
try {
|
|
153
|
-
const buf = await raw_body_1.default(req);
|
|
153
|
+
const buf = await (0, raw_body_1.default)(req);
|
|
154
154
|
const text = buf.toString();
|
|
155
155
|
json = JSON.parse(text);
|
|
156
156
|
}
|
|
157
157
|
catch (error) {
|
|
158
|
-
|
|
158
|
+
if (error instanceof Error) {
|
|
159
|
+
throw new errors_1.InvalidJsonInputError(`Parse error: ${error.message}`);
|
|
160
|
+
}
|
|
161
|
+
// eslint-disable-next-line @nomiclabs/hardhat-internal-rules/only-hardhat-error
|
|
162
|
+
throw error;
|
|
159
163
|
}
|
|
160
164
|
return json;
|
|
161
165
|
};
|
|
@@ -165,7 +169,11 @@ const _readWsRequest = (msg) => {
|
|
|
165
169
|
json = JSON.parse(msg);
|
|
166
170
|
}
|
|
167
171
|
catch (error) {
|
|
168
|
-
|
|
172
|
+
if (error instanceof Error) {
|
|
173
|
+
throw new errors_1.InvalidJsonInputError(`Parse error: ${error.message}`);
|
|
174
|
+
}
|
|
175
|
+
// eslint-disable-next-line @nomiclabs/hardhat-internal-rules/only-hardhat-error
|
|
176
|
+
throw error;
|
|
169
177
|
}
|
|
170
178
|
return json;
|
|
171
179
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../src/internal/hardhat-network/jsonrpc/handler.ts"],"names":[],"mappings":";;;;;AACA,wDAAkC;AAIlC,wDAKqC;AACrC,gDAO4B;AAE5B,yEAAyE;AAEzE,MAAqB,cAAc;IACjC,YAA6B,SAA0B;QAA1B,cAAS,GAAT,SAAS,CAAiB;QAEhD,eAAU,GAAG,KAAK,EAAE,GAAoB,EAAE,GAAmB,EAAE,EAAE;YACtE,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;YAC1B,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE;gBAC5B,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;gBAC7B,OAAO;aACR;YAED,IAAI,eAAoB,CAAC;YACzB,IAAI;gBACF,eAAe,GAAG,MAAM,oBAAoB,CAAC,GAAG,CAAC,CAAC;aACnD;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;gBAC7C,OAAO;aACR;YAED,IAAI,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE;gBAClC,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,GAAG,CACjC,eAAe,CAAC,GAAG,CAAC,CAAC,SAAc,EAAE,EAAE,CACrC,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,CACrC,CACF,CAAC;gBAEF,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;gBACnC,OAAO;aACR;YAED,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC;YAEjE,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACnC,CAAC,CAAC;QAEK,aAAQ,GAAG,KAAK,EAAE,EAAa,EAAE,EAAE;YACxC,MAAM,aAAa,GAAa,EAAE,CAAC;YACnC,IAAI,QAAQ,GAAG,KAAK,CAAC;YAErB,MAAM,QAAQ,GAAG,CAAC,OAA8C,EAAE,EAAE;gBAClE,oFAAoF;gBACpF,uFAAuF;gBACvF,IAAI,QAAQ,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;oBAC7D,OAAO;iBACR;gBAED,IAAI;oBACF,EAAE,CAAC,IAAI,CACL,IAAI,CAAC,SAAS,CAAC;wBACb,OAAO,EAAE,KAAK;wBACd,MAAM,EAAE,kBAAkB;wBAC1B,MAAM,EAAE,OAAO;qBAChB,CAAC,CACH,CAAC;iBACH;gBAAC,OAAO,KAAK,EAAE;oBACd,YAAY,CAAC,KAAK,CAAC,CAAC;iBACrB;YACH,CAAC,CAAC;YAEF,sCAAsC;YACtC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;YAErD,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;gBAC7B,IAAI,MAAkC,CAAC;gBACvC,IAAI,OAAoC,CAAC;gBAEzC,IAAI;oBACF,MAAM,GAAG,cAAc,CAAC,GAAa,CAAC,CAAC;oBAEvC,IAAI,CAAC,4BAAkB,
|
|
1
|
+
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../src/internal/hardhat-network/jsonrpc/handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ const debug_1 = __importDefault(require("debug"));
|
|
|
8
8
|
const http_1 = __importDefault(require("http"));
|
|
9
9
|
const http_2 = require("../../core/providers/http");
|
|
10
10
|
const handler_1 = __importDefault(require("./handler"));
|
|
11
|
-
const log = debug_1.default("hardhat:core:hardhat-network:jsonrpc");
|
|
11
|
+
const log = (0, debug_1.default)("hardhat:core:hardhat-network:jsonrpc");
|
|
12
12
|
class JsonRpcServer {
|
|
13
13
|
constructor(config) {
|
|
14
14
|
this.getProvider = (name = "json-rpc") => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/internal/hardhat-network/jsonrpc/server.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,gDAAoC;AAQpC,oDAAyD;AAEzD,wDAAuC;AAEvC,MAAM,GAAG,GAAG,eAAK,
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/internal/hardhat-network/jsonrpc/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@ export declare class BlockchainData {
|
|
|
14
14
|
getBlockByNumber(blockNumber: BN): Block | undefined;
|
|
15
15
|
getBlockByHash(blockHash: Buffer): Block | undefined;
|
|
16
16
|
getBlockByTransactionHash(transactionHash: Buffer): Block | undefined;
|
|
17
|
-
getTransaction(transactionHash: Buffer):
|
|
17
|
+
getTransaction(transactionHash: Buffer): TypedTransaction | undefined;
|
|
18
18
|
getTransactionReceipt(transactionHash: Buffer): RpcReceiptOutput | undefined;
|
|
19
19
|
getTotalDifficulty(blockHash: Buffer): BN | undefined;
|
|
20
20
|
getLogs(filterParams: FilterParams): RpcLogOutput[];
|
|
@@ -20,32 +20,32 @@ class BlockchainData {
|
|
|
20
20
|
return this._blocksByNumber.get(blockNumber.toNumber());
|
|
21
21
|
}
|
|
22
22
|
getBlockByHash(blockHash) {
|
|
23
|
-
return this._blocksByHash.get(ethereumjs_util_1.bufferToHex(blockHash));
|
|
23
|
+
return this._blocksByHash.get((0, ethereumjs_util_1.bufferToHex)(blockHash));
|
|
24
24
|
}
|
|
25
25
|
getBlockByTransactionHash(transactionHash) {
|
|
26
|
-
return this._blocksByTransactions.get(ethereumjs_util_1.bufferToHex(transactionHash));
|
|
26
|
+
return this._blocksByTransactions.get((0, ethereumjs_util_1.bufferToHex)(transactionHash));
|
|
27
27
|
}
|
|
28
28
|
getTransaction(transactionHash) {
|
|
29
|
-
return this._transactions.get(ethereumjs_util_1.bufferToHex(transactionHash));
|
|
29
|
+
return this._transactions.get((0, ethereumjs_util_1.bufferToHex)(transactionHash));
|
|
30
30
|
}
|
|
31
31
|
getTransactionReceipt(transactionHash) {
|
|
32
|
-
return this._transactionReceipts.get(ethereumjs_util_1.bufferToHex(transactionHash));
|
|
32
|
+
return this._transactionReceipts.get((0, ethereumjs_util_1.bufferToHex)(transactionHash));
|
|
33
33
|
}
|
|
34
34
|
getTotalDifficulty(blockHash) {
|
|
35
|
-
return this._totalDifficulty.get(ethereumjs_util_1.bufferToHex(blockHash));
|
|
35
|
+
return this._totalDifficulty.get((0, ethereumjs_util_1.bufferToHex)(blockHash));
|
|
36
36
|
}
|
|
37
37
|
getLogs(filterParams) {
|
|
38
38
|
const logs = [];
|
|
39
39
|
for (let i = filterParams.fromBlock; i.lte(filterParams.toBlock); i = i.addn(1)) {
|
|
40
40
|
const block = this.getBlockByNumber(i);
|
|
41
41
|
if (block === undefined ||
|
|
42
|
-
!filter_1.bloomFilter(new bloom_1.default(block.header.bloom), filterParams.addresses, filterParams.normalizedTopics)) {
|
|
42
|
+
!(0, filter_1.bloomFilter)(new bloom_1.default(block.header.bloom), filterParams.addresses, filterParams.normalizedTopics)) {
|
|
43
43
|
continue;
|
|
44
44
|
}
|
|
45
45
|
for (const transaction of block.transactions) {
|
|
46
46
|
const receipt = this.getTransactionReceipt(transaction.hash());
|
|
47
47
|
if (receipt !== undefined) {
|
|
48
|
-
logs.push(...filter_1.filterLogs(receipt.logs, {
|
|
48
|
+
logs.push(...(0, filter_1.filterLogs)(receipt.logs, {
|
|
49
49
|
fromBlock: filterParams.fromBlock,
|
|
50
50
|
toBlock: filterParams.toBlock,
|
|
51
51
|
addresses: filterParams.addresses,
|
|
@@ -57,32 +57,32 @@ class BlockchainData {
|
|
|
57
57
|
return logs;
|
|
58
58
|
}
|
|
59
59
|
addBlock(block, totalDifficulty) {
|
|
60
|
-
const blockHash = ethereumjs_util_1.bufferToHex(block.hash());
|
|
60
|
+
const blockHash = (0, ethereumjs_util_1.bufferToHex)(block.hash());
|
|
61
61
|
const blockNumber = new ethereumjs_util_1.BN(block.header.number).toNumber();
|
|
62
62
|
this._blocksByNumber.set(blockNumber, block);
|
|
63
63
|
this._blocksByHash.set(blockHash, block);
|
|
64
64
|
this._totalDifficulty.set(blockHash, totalDifficulty);
|
|
65
65
|
for (const transaction of block.transactions) {
|
|
66
|
-
const transactionHash = ethereumjs_util_1.bufferToHex(transaction.hash());
|
|
66
|
+
const transactionHash = (0, ethereumjs_util_1.bufferToHex)(transaction.hash());
|
|
67
67
|
this._transactions.set(transactionHash, transaction);
|
|
68
68
|
this._blocksByTransactions.set(transactionHash, block);
|
|
69
69
|
}
|
|
70
70
|
}
|
|
71
71
|
removeBlock(block) {
|
|
72
|
-
const blockHash = ethereumjs_util_1.bufferToHex(block.hash());
|
|
72
|
+
const blockHash = (0, ethereumjs_util_1.bufferToHex)(block.hash());
|
|
73
73
|
const blockNumber = new ethereumjs_util_1.BN(block.header.number).toNumber();
|
|
74
74
|
this._blocksByNumber.delete(blockNumber);
|
|
75
75
|
this._blocksByHash.delete(blockHash);
|
|
76
76
|
this._totalDifficulty.delete(blockHash);
|
|
77
77
|
for (const transaction of block.transactions) {
|
|
78
|
-
const transactionHash = ethereumjs_util_1.bufferToHex(transaction.hash());
|
|
78
|
+
const transactionHash = (0, ethereumjs_util_1.bufferToHex)(transaction.hash());
|
|
79
79
|
this._transactions.delete(transactionHash);
|
|
80
80
|
this._transactionReceipts.delete(transactionHash);
|
|
81
81
|
this._blocksByTransactions.delete(transactionHash);
|
|
82
82
|
}
|
|
83
83
|
}
|
|
84
84
|
addTransaction(transaction) {
|
|
85
|
-
this._transactions.set(ethereumjs_util_1.bufferToHex(transaction.hash()), transaction);
|
|
85
|
+
this._transactions.set((0, ethereumjs_util_1.bufferToHex)(transaction.hash()), transaction);
|
|
86
86
|
}
|
|
87
87
|
addTransactionReceipt(receipt) {
|
|
88
88
|
this._transactionReceipts.set(receipt.transactionHash, receipt);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BlockchainData.js","sourceRoot":"","sources":["../../../src/internal/hardhat-network/provider/BlockchainData.ts"],"names":[],"mappings":";;;;;;AAEA,sEAA8C;AAC9C,qDAAkD;AAElD,qCAAmD;AAInD,MAAa,cAAc;IAA3B;QACU,oBAAe,GAAuB,IAAI,GAAG,EAAE,CAAC;QAChD,kBAAa,GAAuB,IAAI,GAAG,EAAE,CAAC;QAC9C,0BAAqB,GAAuB,IAAI,GAAG,EAAE,CAAC;QACtD,kBAAa,GAAkC,IAAI,GAAG,EAAE,CAAC;QACzD,yBAAoB,GAAkC,IAAI,GAAG,EAAE,CAAC;QAChE,qBAAgB,GAAoB,IAAI,GAAG,EAAE,CAAC;IAiGxD,CAAC;IA/FQ,gBAAgB,CAAC,WAAe;QACrC,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC1D,CAAC;IAEM,cAAc,CAAC,SAAiB;QACrC,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,6BAAW,
|
|
1
|
+
{"version":3,"file":"BlockchainData.js","sourceRoot":"","sources":["../../../src/internal/hardhat-network/provider/BlockchainData.ts"],"names":[],"mappings":"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"}
|
|
@@ -99,7 +99,7 @@ class HardhatBlockchain {
|
|
|
99
99
|
if (this._length !== blockNumber) {
|
|
100
100
|
throw new Error("Invalid block number");
|
|
101
101
|
}
|
|
102
|
-
if ((blockNumber === 0 && !parentHash.equals(ethereumjs_util_1.zeros(32))) ||
|
|
102
|
+
if ((blockNumber === 0 && !parentHash.equals((0, ethereumjs_util_1.zeros)(32))) ||
|
|
103
103
|
(blockNumber > 0 &&
|
|
104
104
|
parent !== undefined &&
|
|
105
105
|
!parentHash.equals(parent.hash()))) {
|
|
@@ -108,7 +108,7 @@ class HardhatBlockchain {
|
|
|
108
108
|
}
|
|
109
109
|
_computeTotalDifficulty(block) {
|
|
110
110
|
const difficulty = new ethereumjs_util_1.BN(block.header.difficulty);
|
|
111
|
-
if (block.header.parentHash.equals(ethereumjs_util_1.zeros(32))) {
|
|
111
|
+
if (block.header.parentHash.equals((0, ethereumjs_util_1.zeros)(32))) {
|
|
112
112
|
return difficulty;
|
|
113
113
|
}
|
|
114
114
|
const parentTD = this._data.getTotalDifficulty(block.header.parentHash);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HardhatBlockchain.js","sourceRoot":"","sources":["../../../src/internal/hardhat-network/provider/HardhatBlockchain.ts"],"names":[],"mappings":";;;AAEA,qDAA4C;AAE5C,qDAAkD;AAKlD,yEAAyE;AAEzE,MAAa,iBAAiB;IAA9B;QACmB,UAAK,GAAG,IAAI,+BAAc,EAAE,CAAC;QACtC,YAAO,GAAG,CAAC,CAAC;IAwJtB,CAAC;IAtJQ,KAAK,CAAC,cAAc;QACzB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,IAAI,oBAAE,CAAC,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC;QACpE,IAAI,KAAK,KAAK,SAAS,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;SACvC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,KAAK,CAAC,QAAQ,CACnB,iBAAuC;;QAEvC,IAAI,OAAO,iBAAiB,KAAK,QAAQ,EAAE;YACzC,
|
|
1
|
+
{"version":3,"file":"HardhatBlockchain.js","sourceRoot":"","sources":["../../../src/internal/hardhat-network/provider/HardhatBlockchain.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,15 +9,15 @@ const AccountState_1 = require("./fork/AccountState");
|
|
|
9
9
|
const random_1 = require("./fork/random");
|
|
10
10
|
const makeAccount_1 = require("./utils/makeAccount");
|
|
11
11
|
const encodeStorageKey = (address, position) => {
|
|
12
|
-
return `${address.toString("hex")}${ethereumjs_util_1.unpadBuffer(position).toString("hex")}`;
|
|
12
|
+
return `${address.toString("hex")}${(0, ethereumjs_util_1.unpadBuffer)(position).toString("hex")}`;
|
|
13
13
|
};
|
|
14
14
|
const checkpointedError = (method) => new Error(`${method} called when checkpointed`);
|
|
15
15
|
const notCheckpointedError = (method) => new Error(`${method} called when not checkpointed`);
|
|
16
16
|
const notSupportedError = (method) => new Error(`${method} is not supported when forking from remote network`);
|
|
17
17
|
class HardhatStateManager {
|
|
18
18
|
constructor() {
|
|
19
|
-
this._state = immutable_1.Map();
|
|
20
|
-
this._initialStateRoot = random_1.randomHash();
|
|
19
|
+
this._state = (0, immutable_1.Map)();
|
|
20
|
+
this._initialStateRoot = (0, random_1.randomHash)();
|
|
21
21
|
this._stateRoot = this._initialStateRoot;
|
|
22
22
|
this._stateRootToState = new Map();
|
|
23
23
|
this._originalStorageCache = new Map();
|
|
@@ -28,12 +28,12 @@ class HardhatStateManager {
|
|
|
28
28
|
this._accessedStorageReverted = [
|
|
29
29
|
new Map(),
|
|
30
30
|
];
|
|
31
|
-
this._state = immutable_1.Map();
|
|
31
|
+
this._state = (0, immutable_1.Map)();
|
|
32
32
|
this._stateRootToState.set(this._initialStateRoot, this._state);
|
|
33
33
|
}
|
|
34
34
|
async initializeGenesisAccounts(genesisAccounts) {
|
|
35
35
|
for (const ga of genesisAccounts) {
|
|
36
|
-
const { address, account } = makeAccount_1.makeAccount(ga);
|
|
36
|
+
const { address, account } = (0, makeAccount_1.makeAccount)(ga);
|
|
37
37
|
this._putAccount(address, account);
|
|
38
38
|
}
|
|
39
39
|
this._stateRootToState.set(this._initialStateRoot, this._state);
|
|
@@ -51,10 +51,10 @@ class HardhatStateManager {
|
|
|
51
51
|
const localNonce = localAccount === null || localAccount === void 0 ? void 0 : localAccount.get("nonce");
|
|
52
52
|
const localBalance = localAccount === null || localAccount === void 0 ? void 0 : localAccount.get("balance");
|
|
53
53
|
const localCode = localAccount === null || localAccount === void 0 ? void 0 : localAccount.get("code");
|
|
54
|
-
const nonce = localNonce !== undefined ? ethereumjs_util_1.toBuffer(localNonce) : new ethereumjs_util_1.BN(0);
|
|
55
|
-
const balance = localBalance !== undefined ? ethereumjs_util_1.toBuffer(localBalance) : new ethereumjs_util_1.BN(0);
|
|
56
|
-
const code = localCode !== undefined ? ethereumjs_util_1.toBuffer(localCode) : ethereumjs_util_1.toBuffer([]);
|
|
57
|
-
const codeHash = ethereumjs_util_1.keccak256(code);
|
|
54
|
+
const nonce = localNonce !== undefined ? (0, ethereumjs_util_1.toBuffer)(localNonce) : new ethereumjs_util_1.BN(0);
|
|
55
|
+
const balance = localBalance !== undefined ? (0, ethereumjs_util_1.toBuffer)(localBalance) : new ethereumjs_util_1.BN(0);
|
|
56
|
+
const code = localCode !== undefined ? (0, ethereumjs_util_1.toBuffer)(localCode) : (0, ethereumjs_util_1.toBuffer)([]);
|
|
57
|
+
const codeHash = (0, ethereumjs_util_1.keccak256)(code);
|
|
58
58
|
// We ignore stateRoot since we found that it is not used anywhere of interest to us
|
|
59
59
|
return ethereumjs_util_1.Account.fromAccountData({ nonce, balance, codeHash });
|
|
60
60
|
}
|
|
@@ -67,27 +67,27 @@ class HardhatStateManager {
|
|
|
67
67
|
async putContractCode(address, value) {
|
|
68
68
|
var _a;
|
|
69
69
|
const hexAddress = address.toString();
|
|
70
|
-
const account = ((_a = this._state.get(hexAddress)) !== null && _a !== void 0 ? _a : AccountState_1.makeAccountState()).set("code", ethereumjs_util_1.bufferToHex(value));
|
|
70
|
+
const account = ((_a = this._state.get(hexAddress)) !== null && _a !== void 0 ? _a : (0, AccountState_1.makeAccountState)()).set("code", (0, ethereumjs_util_1.bufferToHex)(value));
|
|
71
71
|
this._state = this._state.set(hexAddress, account);
|
|
72
72
|
}
|
|
73
73
|
async getContractCode(address) {
|
|
74
74
|
var _a;
|
|
75
75
|
const localCode = (_a = this._state.get(address.toString())) === null || _a === void 0 ? void 0 : _a.get("code");
|
|
76
76
|
if (localCode !== undefined) {
|
|
77
|
-
return ethereumjs_util_1.toBuffer(localCode);
|
|
77
|
+
return (0, ethereumjs_util_1.toBuffer)(localCode);
|
|
78
78
|
}
|
|
79
|
-
return ethereumjs_util_1.toBuffer([]);
|
|
79
|
+
return (0, ethereumjs_util_1.toBuffer)([]);
|
|
80
80
|
}
|
|
81
81
|
async getContractStorage(address, key) {
|
|
82
82
|
if (key.length !== 32) {
|
|
83
83
|
throw new Error("Storage key must be 32 bytes long");
|
|
84
84
|
}
|
|
85
85
|
const account = this._state.get(address.toString());
|
|
86
|
-
const localValue = account === null || account === void 0 ? void 0 : account.get("storage").get(ethereumjs_util_1.bufferToHex(key));
|
|
86
|
+
const localValue = account === null || account === void 0 ? void 0 : account.get("storage").get((0, ethereumjs_util_1.bufferToHex)(key));
|
|
87
87
|
if (localValue !== undefined) {
|
|
88
|
-
return ethereumjs_util_1.toBuffer(localValue);
|
|
88
|
+
return (0, ethereumjs_util_1.toBuffer)(localValue);
|
|
89
89
|
}
|
|
90
|
-
return ethereumjs_util_1.toBuffer([]);
|
|
90
|
+
return (0, ethereumjs_util_1.toBuffer)([]);
|
|
91
91
|
}
|
|
92
92
|
async putContractStorage(address, key, value) {
|
|
93
93
|
var _a;
|
|
@@ -97,9 +97,9 @@ class HardhatStateManager {
|
|
|
97
97
|
if (value.length > 32) {
|
|
98
98
|
throw new Error("Storage value cannot be longer than 32 bytes");
|
|
99
99
|
}
|
|
100
|
-
const unpaddedValue = ethereumjs_util_1.unpadBuffer(value);
|
|
100
|
+
const unpaddedValue = (0, ethereumjs_util_1.unpadBuffer)(value);
|
|
101
101
|
const hexAddress = address.toString();
|
|
102
|
-
let account = (_a = this._state.get(hexAddress)) !== null && _a !== void 0 ? _a : AccountState_1.makeAccountState();
|
|
102
|
+
let account = (_a = this._state.get(hexAddress)) !== null && _a !== void 0 ? _a : (0, AccountState_1.makeAccountState)();
|
|
103
103
|
const currentStorage = account.get("storage");
|
|
104
104
|
let newValue;
|
|
105
105
|
if (unpaddedValue.length === 0) {
|
|
@@ -107,24 +107,24 @@ class HardhatStateManager {
|
|
|
107
107
|
newValue = null;
|
|
108
108
|
}
|
|
109
109
|
else {
|
|
110
|
-
newValue = ethereumjs_util_1.bufferToHex(unpaddedValue);
|
|
110
|
+
newValue = (0, ethereumjs_util_1.bufferToHex)(unpaddedValue);
|
|
111
111
|
}
|
|
112
|
-
const newStorage = currentStorage.set(ethereumjs_util_1.bufferToHex(key), newValue);
|
|
112
|
+
const newStorage = currentStorage.set((0, ethereumjs_util_1.bufferToHex)(key), newValue);
|
|
113
113
|
account = account.set("storage", newStorage);
|
|
114
114
|
this._state = this._state.set(hexAddress, account);
|
|
115
115
|
}
|
|
116
116
|
async clearContractStorage(address) {
|
|
117
117
|
var _a;
|
|
118
118
|
const hexAddress = address.toString();
|
|
119
|
-
let account = (_a = this._state.get(hexAddress)) !== null && _a !== void 0 ? _a : AccountState_1.makeAccountState();
|
|
119
|
+
let account = (_a = this._state.get(hexAddress)) !== null && _a !== void 0 ? _a : (0, AccountState_1.makeAccountState)();
|
|
120
120
|
account = account
|
|
121
121
|
.set("storageCleared", true)
|
|
122
|
-
.set("storage", immutable_1.Map());
|
|
122
|
+
.set("storage", (0, immutable_1.Map)());
|
|
123
123
|
this._state = this._state.set(hexAddress, account);
|
|
124
124
|
}
|
|
125
125
|
async checkpoint() {
|
|
126
126
|
const stateRoot = await this.getStateRoot();
|
|
127
|
-
this._stateCheckpoints.push(ethereumjs_util_1.bufferToHex(stateRoot));
|
|
127
|
+
this._stateCheckpoints.push((0, ethereumjs_util_1.bufferToHex)(stateRoot));
|
|
128
128
|
}
|
|
129
129
|
async commit() {
|
|
130
130
|
if (this._stateCheckpoints.length === 0) {
|
|
@@ -137,14 +137,14 @@ class HardhatStateManager {
|
|
|
137
137
|
if (checkpointedRoot === undefined) {
|
|
138
138
|
throw notCheckpointedError("revert");
|
|
139
139
|
}
|
|
140
|
-
await this.setStateRoot(ethereumjs_util_1.toBuffer(checkpointedRoot));
|
|
140
|
+
await this.setStateRoot((0, ethereumjs_util_1.toBuffer)(checkpointedRoot));
|
|
141
141
|
}
|
|
142
142
|
async getStateRoot() {
|
|
143
143
|
if (this._stateRootToState.get(this._stateRoot) !== this._state) {
|
|
144
|
-
this._stateRoot = random_1.randomHash();
|
|
144
|
+
this._stateRoot = (0, random_1.randomHash)();
|
|
145
145
|
this._stateRootToState.set(this._stateRoot, this._state);
|
|
146
146
|
}
|
|
147
|
-
return ethereumjs_util_1.toBuffer(this._stateRoot);
|
|
147
|
+
return (0, ethereumjs_util_1.toBuffer)(this._stateRoot);
|
|
148
148
|
}
|
|
149
149
|
async setStateRoot(stateRoot) {
|
|
150
150
|
this._setStateRoot(stateRoot);
|
|
@@ -224,10 +224,10 @@ class HardhatStateManager {
|
|
|
224
224
|
// Because the vm only ever modifies the nonce, balance and codeHash using this
|
|
225
225
|
// method we ignore the stateRoot property
|
|
226
226
|
const hexAddress = address.toString();
|
|
227
|
-
let localAccount = (_a = this._state.get(hexAddress)) !== null && _a !== void 0 ? _a : AccountState_1.makeAccountState();
|
|
227
|
+
let localAccount = (_a = this._state.get(hexAddress)) !== null && _a !== void 0 ? _a : (0, AccountState_1.makeAccountState)();
|
|
228
228
|
localAccount = localAccount
|
|
229
|
-
.set("nonce", ethereumjs_util_1.bufferToHex(account.nonce.toBuffer()))
|
|
230
|
-
.set("balance", ethereumjs_util_1.bufferToHex(account.balance.toBuffer()));
|
|
229
|
+
.set("nonce", (0, ethereumjs_util_1.bufferToHex)(account.nonce.toBuffer()))
|
|
230
|
+
.set("balance", (0, ethereumjs_util_1.bufferToHex)(account.balance.toBuffer()));
|
|
231
231
|
// Code is set to empty string here to prevent unnecessary
|
|
232
232
|
// JsonRpcClient.getCode calls in getAccount method
|
|
233
233
|
if (account.codeHash.equals(ethereumjs_util_1.KECCAK256_NULL)) {
|
|
@@ -236,7 +236,7 @@ class HardhatStateManager {
|
|
|
236
236
|
this._state = this._state.set(hexAddress, localAccount);
|
|
237
237
|
}
|
|
238
238
|
_setStateRoot(stateRoot) {
|
|
239
|
-
const newRoot = ethereumjs_util_1.bufferToHex(stateRoot);
|
|
239
|
+
const newRoot = (0, ethereumjs_util_1.bufferToHex)(stateRoot);
|
|
240
240
|
const state = this._stateRootToState.get(newRoot);
|
|
241
241
|
if (state === undefined) {
|
|
242
242
|
throw new Error("Unknown state root");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HardhatStateManager.js","sourceRoot":"","sources":["../../../src/internal/hardhat-network/provider/HardhatStateManager.ts"],"names":[],"mappings":";;;AAAA,qDAAgE;AAEhE,qDASyB;AACzB,yCAA2E;AAE3E,wDAA4D;AAE5D,sDAAqE;AACrE,0CAA2C;AAE3C,qDAAkD;AAElD,MAAM,gBAAgB,GAAG,CAAC,OAAe,EAAE,QAAgB,EAAU,EAAE;IACrE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,6BAAW,
|
|
1
|
+
{"version":3,"file":"HardhatStateManager.js","sourceRoot":"","sources":["../../../src/internal/hardhat-network/provider/HardhatStateManager.ts"],"names":[],"mappings":";;;AAAA,qDAAgE;AAEhE,qDASyB;AACzB,yCAA2E;AAE3E,wDAA4D;AAE5D,sDAAqE;AACrE,0CAA2C;AAE3C,qDAAkD;AAElD,MAAM,gBAAgB,GAAG,CAAC,OAAe,EAAE,QAAgB,EAAU,EAAE;IACrE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,IAAA,6BAAW,EAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;AAC9E,CAAC,CAAC;AAMF,MAAM,iBAAiB,GAAG,CAAC,MAAc,EAAE,EAAE,CAC3C,IAAI,KAAK,CAAC,GAAG,MAAM,2BAA2B,CAAC,CAAC;AAElD,MAAM,oBAAoB,GAAG,CAAC,MAAc,EAAE,EAAE,CAC9C,IAAI,KAAK,CAAC,GAAG,MAAM,+BAA+B,CAAC,CAAC;AAEtD,MAAM,iBAAiB,GAAG,CAAC,MAAc,EAAE,EAAE,CAC3C,IAAI,KAAK,CAAC,GAAG,MAAM,oDAAoD,CAAC,CAAC;AAE3E,MAAa,mBAAmB;IAe9B;QAdQ,WAAM,GAAU,IAAA,eAAY,GAAyC,CAAC;QACtE,sBAAiB,GAAW,IAAA,mBAAU,GAAE,CAAC;QACzC,eAAU,GAAW,IAAI,CAAC,iBAAiB,CAAC;QAC5C,sBAAiB,GAAuB,IAAI,GAAG,EAAE,CAAC;QAClD,0BAAqB,GAAwB,IAAI,GAAG,EAAE,CAAC;QACvD,sBAAiB,GAAa,EAAE,CAAC;QACjC,oBAAe,GAAG,KAAK,CAAC;QAEhC,wCAAwC;QAChC,qBAAgB,GAAoC,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC;QAChE,6BAAwB,GAAoC;YAClE,IAAI,GAAG,EAAE;SACV,CAAC;QAGA,IAAI,CAAC,MAAM,GAAG,IAAA,eAAY,GAAyC,CAAC;QAEpE,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAClE,CAAC;IAEM,KAAK,CAAC,yBAAyB,CAAC,eAAiC;QACtE,KAAK,MAAM,EAAE,IAAI,eAAe,EAAE;YAChC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,IAAA,yBAAW,EAAC,EAAE,CAAC,CAAC;YAC7C,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;SACpC;QAED,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAClE,CAAC;IAEM,IAAI;QACT,MAAM,GAAG,GAAG,IAAI,mBAAmB,EAAE,CAAC;QACtC,GAAG,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QACzB,GAAG,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QAEjC,2DAA2D;QAC3D,GAAG,CAAC,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,CAAC;QAC/C,OAAO,GAAG,CAAC;IACb,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,OAAgB;QACtC,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QAEzD,MAAM,UAAU,GAAG,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,GAAG,CAAC,OAAO,CAAC,CAAC;QAC9C,MAAM,YAAY,GAAG,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,GAAG,CAAC,SAAS,CAAC,CAAC;QAClD,MAAM,SAAS,GAAG,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,GAAG,CAAC,MAAM,CAAC,CAAC;QAE5C,MAAM,KAAK,GACT,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,IAAA,0BAAQ,EAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,oBAAE,CAAC,CAAC,CAAC,CAAC;QAE9D,MAAM,OAAO,GACX,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,IAAA,0BAAQ,EAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,oBAAE,CAAC,CAAC,CAAC,CAAC;QAElE,MAAM,IAAI,GACR,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,IAAA,0BAAQ,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAA,0BAAQ,EAAC,EAAE,CAAC,CAAC;QAE/D,MAAM,QAAQ,GAAG,IAAA,2BAAS,EAAC,IAAI,CAAC,CAAC;QACjC,oFAAoF;QACpF,OAAO,yBAAO,CAAC,eAAe,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC/D,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,OAAgB,EAAE,OAAgB;QACxD,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACrC,CAAC;IAEM,YAAY,CAAC,QAAiB;QACnC,wEAAwE;IAC1E,CAAC;IAEM,KAAK,CAAC,eAAe,CAAC,OAAgB,EAAE,KAAa;;QAC1D,MAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;QACtC,MAAM,OAAO,GAAG,CAAC,MAAA,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,mCAAI,IAAA,+BAAgB,GAAE,CAAC,CAAC,GAAG,CACrE,MAAM,EACN,IAAA,6BAAW,EAAC,KAAK,CAAC,CACnB,CAAC;QACF,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACrD,CAAC;IAEM,KAAK,CAAC,eAAe,CAAC,OAAgB;;QAC3C,MAAM,SAAS,GAAG,MAAA,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,0CAAE,GAAG,CAAC,MAAM,CAAC,CAAC;QACnE,IAAI,SAAS,KAAK,SAAS,EAAE;YAC3B,OAAO,IAAA,0BAAQ,EAAC,SAAS,CAAC,CAAC;SAC5B;QAED,OAAO,IAAA,0BAAQ,EAAC,EAAE,CAAC,CAAC;IACtB,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAC7B,OAAgB,EAChB,GAAW;QAEX,IAAI,GAAG,CAAC,MAAM,KAAK,EAAE,EAAE;YACrB,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;SACtD;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QACpD,MAAM,UAAU,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,IAAA,6BAAW,EAAC,GAAG,CAAC,CAAC,CAAC;QAEjE,IAAI,UAAU,KAAK,SAAS,EAAE;YAC5B,OAAO,IAAA,0BAAQ,EAAC,UAAU,CAAC,CAAC;SAC7B;QAED,OAAO,IAAA,0BAAQ,EAAC,EAAE,CAAC,CAAC;IACtB,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAC7B,OAAgB,EAChB,GAAW,EACX,KAAa;;QAEb,IAAI,GAAG,CAAC,MAAM,KAAK,EAAE,EAAE;YACrB,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;SACtD;QAED,IAAI,KAAK,CAAC,MAAM,GAAG,EAAE,EAAE;YACrB,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;SACjE;QAED,MAAM,aAAa,GAAG,IAAA,6BAAW,EAAC,KAAK,CAAC,CAAC;QAEzC,MAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;QACtC,IAAI,OAAO,GAAG,MAAA,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,mCAAI,IAAA,+BAAgB,GAAE,CAAC;QAChE,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAE9C,IAAI,QAAuB,CAAC;QAC5B,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;YAC9B,uEAAuE;YACvE,QAAQ,GAAG,IAAI,CAAC;SACjB;aAAM;YACL,QAAQ,GAAG,IAAA,6BAAW,EAAC,aAAa,CAAC,CAAC;SACvC;QAED,MAAM,UAAU,GAAG,cAAc,CAAC,GAAG,CAAC,IAAA,6BAAW,EAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,CAAC;QAElE,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QAE7C,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACrD,CAAC;IAEM,KAAK,CAAC,oBAAoB,CAAC,OAAgB;;QAChD,MAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;QACtC,IAAI,OAAO,GAAG,MAAA,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,mCAAI,IAAA,+BAAgB,GAAE,CAAC;QAChE,OAAO,GAAG,OAAO;aACd,GAAG,CAAC,gBAAgB,EAAE,IAAI,CAAC;aAC3B,GAAG,CAAC,SAAS,EAAE,IAAA,eAAY,GAAyB,CAAC,CAAC;QACzD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACrD,CAAC;IAEM,KAAK,CAAC,UAAU;QACrB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAC5C,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAA,6BAAW,EAAC,SAAS,CAAC,CAAC,CAAC;IACtD,CAAC;IAEM,KAAK,CAAC,MAAM;QACjB,IAAI,IAAI,CAAC,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE;YACvC,MAAM,oBAAoB,CAAC,QAAQ,CAAC,CAAC;SACtC;QACD,IAAI,CAAC,iBAAiB,CAAC,GAAG,EAAE,CAAC;IAC/B,CAAC;IAEM,KAAK,CAAC,MAAM;QACjB,MAAM,gBAAgB,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,EAAE,CAAC;QACtD,IAAI,gBAAgB,KAAK,SAAS,EAAE;YAClC,MAAM,oBAAoB,CAAC,QAAQ,CAAC,CAAC;SACtC;QACD,MAAM,IAAI,CAAC,YAAY,CAAC,IAAA,0BAAQ,EAAC,gBAAgB,CAAC,CAAC,CAAC;IACtD,CAAC;IAEM,KAAK,CAAC,YAAY;QACvB,IAAI,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC,MAAM,EAAE;YAC/D,IAAI,CAAC,UAAU,GAAG,IAAA,mBAAU,GAAE,CAAC;YAC/B,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;SAC1D;QACD,OAAO,IAAA,0BAAQ,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACnC,CAAC;IAEM,KAAK,CAAC,YAAY,CAAC,SAAiB;QACzC,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAChC,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,QAAiB;QACxC,MAAM,iBAAiB,CAAC,aAAa,CAAC,CAAC;IACzC,CAAC;IAEM,KAAK,CAAC,eAAe;QAC1B,MAAM,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IAC7C,CAAC;IAEM,KAAK,CAAC,wBAAwB;QACnC,MAAM,iBAAiB,CAAC,0BAA0B,CAAC,CAAC;IACtD,CAAC;IAEM,KAAK,CAAC,eAAe,CAAC,UAAe;QAC1C,MAAM,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IAC7C,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,OAAgB;QAC1C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAC/C,8CAA8C;QAC9C,sFAAsF;QACtF,OAAO,CACL,IAAI,oBAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAC5B,IAAI,oBAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,gCAAc,CAAC,CACxC,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,sBAAsB;QACjC,yEAAyE;QACzE,oEAAoE;QACpE,0BAA0B;IAC5B,CAAC;IAEM,uBAAuB,CAAC,SAAiB;QAC9C,IAAI,IAAI,CAAC,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE;YACvC,MAAM,iBAAiB,CAAC,yBAAyB,CAAC,CAAC;SACpD;QACD,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QAC9B,IAAI,IAAI,CAAC,eAAe,EAAE;YACxB,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC;SAC9B;IACH,CAAC;IAEM,aAAa,CAAC,QAAiB;QACpC,MAAM,IAAI,sBAAa,CACrB,wFAAwF,CACzF,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,OAAgB;QACzC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;IACvD,CAAC;IAEM,yBAAyB;QAC9B,IAAI,CAAC,qBAAqB,GAAG,IAAI,GAAG,EAAE,CAAC;IACzC,CAAC;IAEM,KAAK,CAAC,0BAA0B,CACrC,OAAgB,EAChB,GAAW;QAEX,MAAM,UAAU,GAAG,gBAAgB,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,GAAG,CAAC,CAAC;QAC7D,MAAM,WAAW,GAAG,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC/D,IAAI,WAAW,KAAK,SAAS,EAAE;YAC7B,OAAO,WAAW,CAAC;SACpB;QAED,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QAC1D,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAElD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,iDAAiD;IACjD,sBAAsB;IAEf,eAAe,CAAC,OAAe;QACpC,OAAO,2BAAmB,CAAC,SAAS,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC3E,CAAC;IAEM,gBAAgB,CAAC,OAAe;QACrC,OAAO,2BAAmB,CAAC,SAAS,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC5E,CAAC;IAEM,eAAe,CAAC,OAAe,EAAE,IAAY;QAClD,OAAO,2BAAmB,CAAC,SAAS,CAAC,eAAe,CAAC,IAAI,CACvD,IAAI,EACJ,OAAO,EACP,IAAI,CACL,CAAC;IACJ,CAAC;IAEM,gBAAgB,CAAC,OAAe,EAAE,IAAY;QACnD,OAAO,2BAAmB,CAAC,SAAS,CAAC,gBAAgB,CAAC,IAAI,CACxD,IAAI,EACJ,OAAO,EACP,IAAI,CACL,CAAC;IACJ,CAAC;IAEM,mBAAmB;QACxB,OAAO,2BAAmB,CAAC,SAAS,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACtE,CAAC;IAEO,WAAW,CAAC,OAAgB,EAAE,OAAgB;;QACpD,+EAA+E;QAC/E,0CAA0C;QAC1C,MAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;QACtC,IAAI,YAAY,GAAG,MAAA,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,mCAAI,IAAA,+BAAgB,GAAE,CAAC;QACrE,YAAY,GAAG,YAAY;aACxB,GAAG,CAAC,OAAO,EAAE,IAAA,6BAAW,EAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;aACnD,GAAG,CAAC,SAAS,EAAE,IAAA,6BAAW,EAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QAE3D,0DAA0D;QAC1D,mDAAmD;QACnD,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,gCAAc,CAAC,EAAE;YAC3C,YAAY,GAAG,YAAY,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;SAC/C;QACD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IAC1D,CAAC;IAEO,aAAa,CAAC,SAAiB;QACrC,MAAM,OAAO,GAAG,IAAA,6BAAW,EAAC,SAAS,CAAC,CAAC;QACvC,MAAM,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAClD,IAAI,KAAK,KAAK,SAAS,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;SACvC;QACD,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC;QAC1B,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACtB,CAAC;CACF;AAtTD,kDAsTC"}
|
|
@@ -4,16 +4,16 @@ exports.makePoolState = exports.makeSerializedTransaction = void 0;
|
|
|
4
4
|
const ethereumjs_util_1 = require("ethereumjs-util");
|
|
5
5
|
const immutable_1 = require("immutable");
|
|
6
6
|
const bnToHex_1 = require("./utils/bnToHex");
|
|
7
|
-
exports.makeSerializedTransaction = immutable_1.Record({
|
|
7
|
+
exports.makeSerializedTransaction = (0, immutable_1.Record)({
|
|
8
8
|
orderId: 0,
|
|
9
9
|
fakeFrom: undefined,
|
|
10
10
|
data: "",
|
|
11
11
|
txType: 0,
|
|
12
12
|
});
|
|
13
|
-
exports.makePoolState = immutable_1.Record({
|
|
14
|
-
pendingTransactions: immutable_1.Map(),
|
|
15
|
-
queuedTransactions: immutable_1.Map(),
|
|
16
|
-
hashToTransaction: immutable_1.Map(),
|
|
17
|
-
blockGasLimit: bnToHex_1.bnToHex(new ethereumjs_util_1.BN(9500000)),
|
|
13
|
+
exports.makePoolState = (0, immutable_1.Record)({
|
|
14
|
+
pendingTransactions: (0, immutable_1.Map)(),
|
|
15
|
+
queuedTransactions: (0, immutable_1.Map)(),
|
|
16
|
+
hashToTransaction: (0, immutable_1.Map)(),
|
|
17
|
+
blockGasLimit: (0, bnToHex_1.bnToHex)(new ethereumjs_util_1.BN(9500000)),
|
|
18
18
|
});
|
|
19
19
|
//# sourceMappingURL=PoolState.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PoolState.js","sourceRoot":"","sources":["../../../src/internal/hardhat-network/provider/PoolState.ts"],"names":[],"mappings":";;;AACA,qDAAqC;AACrC,yCAImB;AAEnB,6CAA0C;AAc7B,QAAA,yBAAyB,GACpC,kBAAe,
|
|
1
|
+
{"version":3,"file":"PoolState.js","sourceRoot":"","sources":["../../../src/internal/hardhat-network/provider/PoolState.ts"],"names":[],"mappings":";;;AACA,qDAAqC;AACrC,yCAImB;AAEnB,6CAA0C;AAc7B,QAAA,yBAAyB,GACpC,IAAA,kBAAe,EAA8B;IAC3C,OAAO,EAAE,CAAC;IACV,QAAQ,EAAE,SAAS;IACnB,IAAI,EAAE,EAAE;IACR,MAAM,EAAE,CAAC;CACV,CAAC,CAAC;AAeQ,QAAA,aAAa,GAAG,IAAA,kBAAe,EAAY;IACtD,mBAAmB,EAAE,IAAA,eAAY,GAA8B;IAC/D,kBAAkB,EAAE,IAAA,eAAY,GAA8B;IAC9D,iBAAiB,EAAE,IAAA,eAAY,GAAiC;IAChE,aAAa,EAAE,IAAA,iBAAO,EAAC,IAAI,oBAAE,CAAC,OAAO,CAAC,CAAC;CACxC,CAAC,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { TypedTransaction } from "@ethereumjs/tx";
|
|
2
2
|
import { BN } from "ethereumjs-util";
|
|
3
|
+
import { MempoolOrder } from "./node-types";
|
|
3
4
|
import { OrderedTransaction } from "./PoolState";
|
|
4
5
|
/**
|
|
5
6
|
* A queue of transactions in the order that they could be mined in the next
|
|
@@ -24,7 +25,7 @@ export declare class TransactionQueue {
|
|
|
24
25
|
* sorted by nonce and without nonce gaps.
|
|
25
26
|
* @param baseFee The base fee of the next block, if it's going to use EIP-1559
|
|
26
27
|
*/
|
|
27
|
-
constructor(pendingTransactions: Map<string, OrderedTransaction[]>, baseFee?: BN);
|
|
28
|
+
constructor(pendingTransactions: Map<string, OrderedTransaction[]>, mempoolOrder: MempoolOrder, baseFee?: BN);
|
|
28
29
|
getNextTransaction(): TypedTransaction | undefined;
|
|
29
30
|
removeLastSenderTransactions(): void;
|
|
30
31
|
private _moveFirstEnqueuedTransactionToHeap;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TransactionQueue.d.ts","sourceRoot":"","sources":["../../../src/internal/hardhat-network/provider/TransactionQueue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,EAAE,EAAE,MAAM,iBAAiB,CAAC;AAIrC,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"TransactionQueue.d.ts","sourceRoot":"","sources":["../../../src/internal/hardhat-network/provider/TransactionQueue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,EAAE,EAAE,MAAM,iBAAiB,CAAC;AAIrC,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AA8DjD;;;;;;;;;;;IAWI;AACJ,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CACxB;IAEZ,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA2B;IAEjD,OAAO,CAAC,sBAAsB,CAAC,CAAS;IAExC;;;;;;OAMG;gBAED,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,EAAE,CAAC,EACtD,YAAY,EAAE,YAAY,EAC1B,OAAO,CAAC,EAAE,EAAE;IAkBP,kBAAkB,IAAI,gBAAgB,GAAG,SAAS;IAclD,4BAA4B;IAYnC,OAAO,CAAC,mCAAmC;CAU5C"}
|
|
@@ -27,6 +27,20 @@ function decreasingOrderEffectiveMinerFeeComparator(left, right, baseFee) {
|
|
|
27
27
|
// in increasing order by orderId.
|
|
28
28
|
return left.orderId - right.orderId;
|
|
29
29
|
}
|
|
30
|
+
function decreasingOrderComparator(left, right) {
|
|
31
|
+
return left.orderId - right.orderId;
|
|
32
|
+
}
|
|
33
|
+
function getOrderedTransactionHeap(mempoolOrder, baseFee) {
|
|
34
|
+
switch (mempoolOrder) {
|
|
35
|
+
case "priority":
|
|
36
|
+
return new heap_1.default((a, b) => decreasingOrderEffectiveMinerFeeComparator(a, b, baseFee));
|
|
37
|
+
case "fifo":
|
|
38
|
+
return new heap_1.default((a, b) => decreasingOrderComparator(a, b));
|
|
39
|
+
default:
|
|
40
|
+
// eslint-disable-next-line @nomiclabs/hardhat-internal-rules/only-hardhat-error
|
|
41
|
+
throw new errors_1.InvalidInputError(`Invalid mempool order: ${mempoolOrder}`);
|
|
42
|
+
}
|
|
43
|
+
}
|
|
30
44
|
/**
|
|
31
45
|
* A queue of transactions in the order that they could be mined in the next
|
|
32
46
|
* block.
|
|
@@ -47,9 +61,9 @@ class TransactionQueue {
|
|
|
47
61
|
* sorted by nonce and without nonce gaps.
|
|
48
62
|
* @param baseFee The base fee of the next block, if it's going to use EIP-1559
|
|
49
63
|
*/
|
|
50
|
-
constructor(pendingTransactions, baseFee) {
|
|
64
|
+
constructor(pendingTransactions, mempoolOrder, baseFee) {
|
|
51
65
|
this._queuedTransactions = new Map();
|
|
52
|
-
this._heap =
|
|
66
|
+
this._heap = getOrderedTransactionHeap(mempoolOrder, baseFee);
|
|
53
67
|
for (const [address, txList] of pendingTransactions) {
|
|
54
68
|
if (baseFee === undefined && txList.some((tx) => tx.data.type === 2)) {
|
|
55
69
|
// eslint-disable-next-line @nomiclabs/hardhat-internal-rules/only-hardhat-error
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TransactionQueue.js","sourceRoot":"","sources":["../../../src/internal/hardhat-network/provider/TransactionQueue.ts"],"names":[],"mappings":";;;;;;AACA,qDAAqC;AACrC,0DAAkC;AAElC,
|
|
1
|
+
{"version":3,"file":"TransactionQueue.js","sourceRoot":"","sources":["../../../src/internal/hardhat-network/provider/TransactionQueue.ts"],"names":[],"mappings":"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"}
|