hardhat 2.10.2 → 2.11.0-dev.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/builtin-tasks/compile.js +6 -8
- package/builtin-tasks/compile.js.map +1 -1
- package/builtin-tasks/node.js +9 -12
- package/builtin-tasks/node.js.map +1 -1
- package/builtin-tasks/test.js +2 -3
- package/builtin-tasks/test.js.map +1 -1
- package/internal/artifacts.js +1 -1
- package/internal/artifacts.js.map +1 -1
- package/internal/cli/ArgumentsParser.js +5 -2
- package/internal/cli/ArgumentsParser.js.map +1 -1
- package/internal/cli/analytics.js +2 -2
- package/internal/cli/analytics.js.map +1 -1
- package/internal/cli/autocomplete.js +20 -32
- package/internal/cli/autocomplete.js.map +1 -1
- package/internal/cli/cli.js +1 -1
- package/internal/cli/cli.js.map +1 -1
- package/internal/cli/project-creation.js +14 -4
- package/internal/cli/project-creation.js.map +1 -1
- package/internal/constants.d.ts.map +1 -1
- package/internal/constants.js +2 -0
- package/internal/constants.js.map +1 -1
- package/internal/core/config/config-loading.js +2 -3
- 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 +84 -35
- package/internal/core/config/config-resolution.js.map +1 -1
- package/internal/core/config/config-validation.js +38 -20
- package/internal/core/config/config-validation.js.map +1 -1
- package/internal/core/config/default-config.d.ts.map +1 -1
- package/internal/core/config/default-config.js +7 -4
- package/internal/core/config/default-config.js.map +1 -1
- package/internal/core/errors.js +4 -2
- 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/flamegraph.d.ts +10 -0
- package/internal/core/flamegraph.d.ts.map +1 -0
- package/internal/core/flamegraph.js +245 -0
- package/internal/core/flamegraph.js.map +1 -0
- package/internal/core/jsonrpc/types/base-types.d.ts +7 -8
- package/internal/core/jsonrpc/types/base-types.d.ts.map +1 -1
- package/internal/core/jsonrpc/types/base-types.js +24 -24
- package/internal/core/jsonrpc/types/base-types.js.map +1 -1
- package/internal/core/jsonrpc/types/input/blockTag.d.ts +15 -10
- package/internal/core/jsonrpc/types/input/blockTag.d.ts.map +1 -1
- package/internal/core/jsonrpc/types/input/blockTag.js +2 -0
- package/internal/core/jsonrpc/types/input/blockTag.js.map +1 -1
- package/internal/core/jsonrpc/types/input/callRequest.d.ts +5 -6
- package/internal/core/jsonrpc/types/input/callRequest.d.ts.map +1 -1
- package/internal/core/jsonrpc/types/input/callRequest.js.map +1 -1
- package/internal/core/jsonrpc/types/input/filterRequest.d.ts +6 -7
- package/internal/core/jsonrpc/types/input/filterRequest.d.ts.map +1 -1
- package/internal/core/jsonrpc/types/input/filterRequest.js.map +1 -1
- package/internal/core/jsonrpc/types/input/transactionRequest.d.ts +7 -8
- package/internal/core/jsonrpc/types/input/transactionRequest.d.ts.map +1 -1
- package/internal/core/jsonrpc/types/input/transactionRequest.js.map +1 -1
- package/internal/core/jsonrpc/types/output/block.d.ts +29 -30
- package/internal/core/jsonrpc/types/output/block.d.ts.map +1 -1
- package/internal/core/jsonrpc/types/output/block.js +8 -2
- package/internal/core/jsonrpc/types/output/block.js.map +1 -1
- package/internal/core/jsonrpc/types/output/log.d.ts +3 -4
- package/internal/core/jsonrpc/types/output/log.d.ts.map +1 -1
- package/internal/core/jsonrpc/types/output/log.js.map +1 -1
- package/internal/core/jsonrpc/types/output/receipt.d.ts +10 -11
- package/internal/core/jsonrpc/types/output/receipt.d.ts.map +1 -1
- package/internal/core/jsonrpc/types/output/receipt.js.map +1 -1
- package/internal/core/jsonrpc/types/output/transaction.d.ts +13 -14
- package/internal/core/jsonrpc/types/output/transaction.d.ts.map +1 -1
- package/internal/core/jsonrpc/types/output/transaction.js.map +1 -1
- package/internal/core/providers/accounts.d.ts.map +1 -1
- package/internal/core/providers/accounts.js +30 -24
- package/internal/core/providers/accounts.js.map +1 -1
- package/internal/core/providers/chainId.js +1 -1
- 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 +5 -5
- package/internal/core/providers/construction.js.map +1 -1
- package/internal/core/providers/gas-providers.d.ts +4 -4
- package/internal/core/providers/gas-providers.d.ts.map +1 -1
- package/internal/core/providers/gas-providers.js +16 -15
- package/internal/core/providers/gas-providers.js.map +1 -1
- package/internal/core/providers/http.js +7 -2
- package/internal/core/providers/http.js.map +1 -1
- package/internal/core/providers/util.js +5 -8
- package/internal/core/providers/util.js.map +1 -1
- package/internal/core/runtime-environment.js +1 -1
- package/internal/core/runtime-environment.js.map +1 -1
- package/internal/core/task-profiling.d.ts +18 -0
- package/internal/core/task-profiling.d.ts.map +1 -0
- package/internal/core/task-profiling.js +50 -0
- package/internal/core/task-profiling.js.map +1 -0
- package/internal/core/typescript-support.js +3 -3
- package/internal/core/typescript-support.js.map +1 -1
- package/internal/hardhat-network/jsonrpc/client.d.ts +39 -39
- package/internal/hardhat-network/jsonrpc/client.d.ts.map +1 -1
- package/internal/hardhat-network/jsonrpc/client.js +14 -14
- package/internal/hardhat-network/jsonrpc/client.js.map +1 -1
- package/internal/hardhat-network/provider/BlockchainBase.d.ts +13 -10
- package/internal/hardhat-network/provider/BlockchainBase.d.ts.map +1 -1
- package/internal/hardhat-network/provider/BlockchainBase.js +38 -16
- package/internal/hardhat-network/provider/BlockchainBase.js.map +1 -1
- package/internal/hardhat-network/provider/BlockchainData.d.ts +15 -16
- package/internal/hardhat-network/provider/BlockchainData.d.ts.map +1 -1
- package/internal/hardhat-network/provider/BlockchainData.js +33 -29
- package/internal/hardhat-network/provider/BlockchainData.js.map +1 -1
- package/internal/hardhat-network/provider/HardhatBlockchain.d.ts +7 -8
- package/internal/hardhat-network/provider/HardhatBlockchain.d.ts.map +1 -1
- package/internal/hardhat-network/provider/HardhatBlockchain.js +13 -14
- package/internal/hardhat-network/provider/HardhatBlockchain.js.map +1 -1
- package/internal/hardhat-network/provider/PoolState.d.ts +1 -1
- package/internal/hardhat-network/provider/PoolState.d.ts.map +1 -1
- package/internal/hardhat-network/provider/PoolState.js +2 -3
- package/internal/hardhat-network/provider/PoolState.js.map +1 -1
- package/internal/hardhat-network/provider/TransactionQueue.d.ts +2 -3
- package/internal/hardhat-network/provider/TransactionQueue.d.ts.map +1 -1
- package/internal/hardhat-network/provider/TransactionQueue.js +3 -3
- package/internal/hardhat-network/provider/TransactionQueue.js.map +1 -1
- package/internal/hardhat-network/provider/TxPool.d.ts +8 -8
- package/internal/hardhat-network/provider/TxPool.d.ts.map +1 -1
- package/internal/hardhat-network/provider/TxPool.js +66 -68
- package/internal/hardhat-network/provider/TxPool.js.map +1 -1
- package/internal/hardhat-network/provider/ethereumjs-workarounds.js +2 -2
- package/internal/hardhat-network/provider/ethereumjs-workarounds.js.map +1 -1
- package/internal/hardhat-network/provider/filter.d.ts +5 -6
- package/internal/hardhat-network/provider/filter.d.ts.map +1 -1
- package/internal/hardhat-network/provider/filter.js +7 -8
- package/internal/hardhat-network/provider/filter.js.map +1 -1
- package/internal/hardhat-network/provider/fork/ForkBlockchain.d.ts +10 -11
- package/internal/hardhat-network/provider/fork/ForkBlockchain.d.ts.map +1 -1
- package/internal/hardhat-network/provider/fork/ForkBlockchain.js +51 -47
- package/internal/hardhat-network/provider/fork/ForkBlockchain.js.map +1 -1
- package/internal/hardhat-network/provider/fork/ForkStateManager.d.ts +8 -10
- package/internal/hardhat-network/provider/fork/ForkStateManager.d.ts.map +1 -1
- package/internal/hardhat-network/provider/fork/ForkStateManager.js +51 -69
- package/internal/hardhat-network/provider/fork/ForkStateManager.js.map +1 -1
- package/internal/hardhat-network/provider/fork/rpcToBlockData.d.ts +1 -1
- package/internal/hardhat-network/provider/fork/rpcToBlockData.d.ts.map +1 -1
- package/internal/hardhat-network/provider/fork/rpcToBlockData.js +2 -3
- package/internal/hardhat-network/provider/fork/rpcToBlockData.js.map +1 -1
- package/internal/hardhat-network/provider/fork/rpcToTxData.d.ts +2 -2
- package/internal/hardhat-network/provider/fork/rpcToTxData.d.ts.map +1 -1
- package/internal/hardhat-network/provider/fork/rpcToTxData.js +7 -11
- package/internal/hardhat-network/provider/fork/rpcToTxData.js.map +1 -1
- package/internal/hardhat-network/provider/modules/eth.d.ts +2 -1
- package/internal/hardhat-network/provider/modules/eth.d.ts.map +1 -1
- package/internal/hardhat-network/provider/modules/eth.js +92 -68
- package/internal/hardhat-network/provider/modules/eth.js.map +1 -1
- package/internal/hardhat-network/provider/modules/evm.d.ts.map +1 -1
- package/internal/hardhat-network/provider/modules/evm.js +14 -14
- package/internal/hardhat-network/provider/modules/evm.js.map +1 -1
- package/internal/hardhat-network/provider/modules/hardhat.d.ts.map +1 -1
- package/internal/hardhat-network/provider/modules/hardhat.js +13 -13
- package/internal/hardhat-network/provider/modules/hardhat.js.map +1 -1
- package/internal/hardhat-network/provider/modules/logger.d.ts +7 -8
- package/internal/hardhat-network/provider/modules/logger.d.ts.map +1 -1
- package/internal/hardhat-network/provider/modules/logger.js +29 -32
- package/internal/hardhat-network/provider/modules/logger.js.map +1 -1
- package/internal/hardhat-network/provider/modules/net.d.ts +1 -1
- package/internal/hardhat-network/provider/modules/net.d.ts.map +1 -1
- package/internal/hardhat-network/provider/modules/personal.d.ts.map +1 -1
- package/internal/hardhat-network/provider/modules/personal.js +3 -3
- package/internal/hardhat-network/provider/modules/personal.js.map +1 -1
- package/internal/hardhat-network/provider/modules/web3.d.ts.map +1 -1
- package/internal/hardhat-network/provider/modules/web3.js +5 -4
- package/internal/hardhat-network/provider/modules/web3.js.map +1 -1
- package/internal/hardhat-network/provider/node-types.d.ts +30 -29
- package/internal/hardhat-network/provider/node-types.d.ts.map +1 -1
- package/internal/hardhat-network/provider/node.d.ts +47 -42
- package/internal/hardhat-network/provider/node.d.ts.map +1 -1
- package/internal/hardhat-network/provider/node.js +262 -208
- package/internal/hardhat-network/provider/node.js.map +1 -1
- package/internal/hardhat-network/provider/output.d.ts +5 -6
- package/internal/hardhat-network/provider/output.d.ts.map +1 -1
- package/internal/hardhat-network/provider/output.js +39 -36
- package/internal/hardhat-network/provider/output.js.map +1 -1
- package/internal/hardhat-network/provider/provider.d.ts +1 -2
- package/internal/hardhat-network/provider/provider.d.ts.map +1 -1
- package/internal/hardhat-network/provider/provider.js.map +1 -1
- package/internal/hardhat-network/provider/return-data.d.ts +1 -2
- package/internal/hardhat-network/provider/return-data.d.ts.map +1 -1
- package/internal/hardhat-network/provider/return-data.js +1 -1
- package/internal/hardhat-network/provider/return-data.js.map +1 -1
- package/internal/hardhat-network/provider/transactions/FakeSenderAccessListEIP2930Transaction.d.ts +5 -5
- package/internal/hardhat-network/provider/transactions/FakeSenderAccessListEIP2930Transaction.d.ts.map +1 -1
- package/internal/hardhat-network/provider/transactions/FakeSenderAccessListEIP2930Transaction.js +60 -17
- package/internal/hardhat-network/provider/transactions/FakeSenderAccessListEIP2930Transaction.js.map +1 -1
- package/internal/hardhat-network/provider/transactions/FakeSenderEIP1559Transaction.d.ts +4 -4
- package/internal/hardhat-network/provider/transactions/FakeSenderEIP1559Transaction.d.ts.map +1 -1
- package/internal/hardhat-network/provider/transactions/FakeSenderEIP1559Transaction.js +59 -16
- package/internal/hardhat-network/provider/transactions/FakeSenderEIP1559Transaction.js.map +1 -1
- package/internal/hardhat-network/provider/transactions/FakeSenderTransaction.d.ts +3 -3
- package/internal/hardhat-network/provider/transactions/FakeSenderTransaction.d.ts.map +1 -1
- package/internal/hardhat-network/provider/transactions/FakeSenderTransaction.js +41 -9
- package/internal/hardhat-network/provider/transactions/FakeSenderTransaction.js.map +1 -1
- package/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP1559Transaction.d.ts +4 -4
- package/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP1559Transaction.d.ts.map +1 -1
- package/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP1559Transaction.js +7 -23
- package/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP1559Transaction.js.map +1 -1
- package/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP2930Transaction.d.ts +3 -3
- package/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP2930Transaction.d.ts.map +1 -1
- package/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP2930Transaction.js +7 -22
- package/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP2930Transaction.js.map +1 -1
- package/internal/hardhat-network/provider/transactions/ReadOnlyValidTransaction.d.ts +3 -3
- package/internal/hardhat-network/provider/transactions/ReadOnlyValidTransaction.d.ts.map +1 -1
- package/internal/hardhat-network/provider/transactions/ReadOnlyValidTransaction.js +1 -1
- package/internal/hardhat-network/provider/transactions/ReadOnlyValidTransaction.js.map +1 -1
- package/internal/hardhat-network/provider/types/HardhatBlockchainInterface.d.ts +5 -6
- package/internal/hardhat-network/provider/types/HardhatBlockchainInterface.d.ts.map +1 -1
- package/internal/hardhat-network/provider/utils/fork-recomendations-banner.js +2 -3
- package/internal/hardhat-network/provider/utils/fork-recomendations-banner.js.map +1 -1
- package/internal/hardhat-network/provider/utils/getCurrentTimestamp.d.ts +1 -0
- package/internal/hardhat-network/provider/utils/getCurrentTimestamp.d.ts.map +1 -1
- package/internal/hardhat-network/provider/utils/getCurrentTimestamp.js +5 -1
- package/internal/hardhat-network/provider/utils/getCurrentTimestamp.js.map +1 -1
- package/internal/hardhat-network/provider/utils/makeAccount.d.ts +1 -1
- package/internal/hardhat-network/provider/utils/makeAccount.d.ts.map +1 -1
- package/internal/hardhat-network/provider/utils/makeAccount.js +6 -6
- package/internal/hardhat-network/provider/utils/makeAccount.js.map +1 -1
- package/internal/hardhat-network/provider/utils/makeCommon.d.ts +2 -2
- package/internal/hardhat-network/provider/utils/makeCommon.d.ts.map +1 -1
- package/internal/hardhat-network/provider/utils/makeCommon.js +7 -23
- package/internal/hardhat-network/provider/utils/makeCommon.js.map +1 -1
- package/internal/hardhat-network/provider/utils/makeForkClient.d.ts +1 -2
- package/internal/hardhat-network/provider/utils/makeForkClient.d.ts.map +1 -1
- package/internal/hardhat-network/provider/utils/makeForkClient.js +7 -8
- package/internal/hardhat-network/provider/utils/makeForkClient.js.map +1 -1
- package/internal/hardhat-network/provider/utils/makeStateTrie.d.ts +1 -1
- package/internal/hardhat-network/provider/utils/makeStateTrie.d.ts.map +1 -1
- package/internal/hardhat-network/provider/utils/makeStateTrie.js +4 -4
- package/internal/hardhat-network/provider/utils/makeStateTrie.js.map +1 -1
- package/internal/hardhat-network/provider/utils/putGenesisBlock.d.ts +6 -3
- package/internal/hardhat-network/provider/utils/putGenesisBlock.d.ts.map +1 -1
- package/internal/hardhat-network/provider/utils/putGenesisBlock.js +22 -4
- package/internal/hardhat-network/provider/utils/putGenesisBlock.js.map +1 -1
- package/internal/hardhat-network/provider/utils/random.d.ts +15 -0
- package/internal/hardhat-network/provider/utils/random.d.ts.map +1 -0
- package/internal/hardhat-network/provider/utils/random.js +48 -0
- package/internal/hardhat-network/provider/utils/random.js.map +1 -0
- package/internal/hardhat-network/provider/utils/reorganizeTransactionsLists.d.ts +1 -2
- package/internal/hardhat-network/provider/utils/reorganizeTransactionsLists.d.ts.map +1 -1
- package/internal/hardhat-network/provider/utils/reorganizeTransactionsLists.js +5 -4
- package/internal/hardhat-network/provider/utils/reorganizeTransactionsLists.js.map +1 -1
- package/internal/hardhat-network/provider/utils/reorgs-protection.d.ts +2 -2
- package/internal/hardhat-network/provider/utils/reorgs-protection.d.ts.map +1 -1
- package/internal/hardhat-network/provider/utils/reorgs-protection.js +7 -7
- package/internal/hardhat-network/provider/utils/reorgs-protection.js.map +1 -1
- package/internal/hardhat-network/provider/utils/txMapToArray.d.ts +1 -1
- package/internal/hardhat-network/provider/utils/txMapToArray.d.ts.map +1 -1
- package/internal/hardhat-network/stack-traces/compiler-to-model.js +6 -8
- package/internal/hardhat-network/stack-traces/compiler-to-model.js.map +1 -1
- package/internal/hardhat-network/stack-traces/consoleLogger.d.ts.map +1 -1
- package/internal/hardhat-network/stack-traces/consoleLogger.js +45 -45
- package/internal/hardhat-network/stack-traces/consoleLogger.js.map +1 -1
- package/internal/hardhat-network/stack-traces/constants.d.ts +3 -0
- package/internal/hardhat-network/stack-traces/constants.d.ts.map +1 -0
- package/internal/hardhat-network/stack-traces/constants.js +6 -0
- package/internal/hardhat-network/stack-traces/constants.js.map +1 -0
- package/internal/hardhat-network/stack-traces/contracts-identifier.js +2 -2
- package/internal/hardhat-network/stack-traces/contracts-identifier.js.map +1 -1
- package/internal/hardhat-network/stack-traces/debug.js +29 -19
- 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 +44 -26
- package/internal/hardhat-network/stack-traces/error-inferrer.js.map +1 -1
- package/internal/hardhat-network/stack-traces/message-trace.d.ts +6 -7
- package/internal/hardhat-network/stack-traces/message-trace.d.ts.map +1 -1
- package/internal/hardhat-network/stack-traces/message-trace.js.map +1 -1
- package/internal/hardhat-network/stack-traces/model.js +6 -6
- package/internal/hardhat-network/stack-traces/model.js.map +1 -1
- package/internal/hardhat-network/stack-traces/panic-errors.d.ts +1 -2
- package/internal/hardhat-network/stack-traces/panic-errors.d.ts.map +1 -1
- package/internal/hardhat-network/stack-traces/panic-errors.js +1 -1
- package/internal/hardhat-network/stack-traces/panic-errors.js.map +1 -1
- package/internal/hardhat-network/stack-traces/solidity-errors.d.ts.map +1 -1
- package/internal/hardhat-network/stack-traces/solidity-errors.js +21 -12
- package/internal/hardhat-network/stack-traces/solidity-errors.js.map +1 -1
- package/internal/hardhat-network/stack-traces/solidity-stack-trace.d.ts +6 -5
- package/internal/hardhat-network/stack-traces/solidity-stack-trace.d.ts.map +1 -1
- package/internal/hardhat-network/stack-traces/solidity-stack-trace.js.map +1 -1
- package/internal/hardhat-network/stack-traces/solidityTracer.d.ts.map +1 -1
- package/internal/hardhat-network/stack-traces/solidityTracer.js +4 -0
- package/internal/hardhat-network/stack-traces/solidityTracer.js.map +1 -1
- package/internal/hardhat-network/stack-traces/vm-debug-tracer.d.ts +2 -1
- package/internal/hardhat-network/stack-traces/vm-debug-tracer.d.ts.map +1 -1
- package/internal/hardhat-network/stack-traces/vm-debug-tracer.js +79 -78
- package/internal/hardhat-network/stack-traces/vm-debug-tracer.js.map +1 -1
- package/internal/hardhat-network/stack-traces/vm-trace-decoder.js +5 -1
- package/internal/hardhat-network/stack-traces/vm-trace-decoder.js.map +1 -1
- package/internal/hardhat-network/stack-traces/vm-tracer.d.ts +3 -2
- package/internal/hardhat-network/stack-traces/vm-tracer.d.ts.map +1 -1
- package/internal/hardhat-network/stack-traces/vm-tracer.js +15 -16
- package/internal/hardhat-network/stack-traces/vm-tracer.js.map +1 -1
- package/internal/reset.js +1 -1
- package/internal/reset.js.map +1 -1
- package/internal/sentry/anonymizer.js +2 -3
- package/internal/sentry/anonymizer.js.map +1 -1
- package/internal/sentry/subprocess.js +1 -1
- package/internal/sentry/subprocess.js.map +1 -1
- package/internal/sentry/transport.js +3 -4
- package/internal/sentry/transport.js.map +1 -1
- package/internal/solidity/compilation-job.js +2 -4
- package/internal/solidity/compilation-job.js.map +1 -1
- package/internal/solidity/compiler/downloader.d.ts.map +1 -1
- package/internal/solidity/compiler/downloader.js +6 -6
- package/internal/solidity/compiler/downloader.js.map +1 -1
- package/internal/solidity/dependencyGraph.js +3 -5
- package/internal/solidity/dependencyGraph.js.map +1 -1
- package/internal/solidity/parse.js +1 -1
- package/internal/solidity/parse.js.map +1 -1
- package/internal/solidity/resolver.js +4 -1
- 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/bigint.d.ts +25 -0
- package/internal/util/bigint.d.ts.map +1 -0
- package/internal/util/bigint.js +67 -0
- package/internal/util/bigint.js.map +1 -0
- package/internal/util/download.js +1 -1
- package/internal/util/download.js.map +1 -1
- package/internal/util/fs-utils.d.ts +32 -0
- package/internal/util/fs-utils.d.ts.map +1 -0
- package/internal/util/fs-utils.js +151 -0
- package/internal/util/fs-utils.js.map +1 -0
- package/internal/util/hardforks.d.ts +3 -3
- package/internal/util/hardforks.d.ts.map +1 -1
- package/internal/util/hardforks.js +5 -28
- 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/lazy.js +2 -2
- package/internal/util/lazy.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 +5 -2
- package/internal/util/scripts-runner.js.map +1 -1
- package/internal/util/wei-values.d.ts +1 -2
- package/internal/util/wei-values.d.ts.map +1 -1
- package/internal/util/wei-values.js +9 -10
- package/internal/util/wei-values.js.map +1 -1
- package/internal/vendor/await-semaphore/index.d.ts +12 -0
- package/internal/vendor/await-semaphore/index.d.ts.map +1 -0
- package/internal/vendor/await-semaphore/index.js +64 -0
- package/internal/vendor/await-semaphore/index.js.map +1 -0
- package/package.json +13 -9
- package/profiling.d.ts +18 -0
- package/profiling.d.ts.map +1 -0
- package/profiling.js +32 -0
- package/profiling.js.map +1 -0
- package/src/builtin-tasks/node.ts +4 -6
- package/src/internal/constants.ts +3 -1
- package/src/internal/core/config/config-resolution.ts +30 -7
- package/src/internal/core/config/default-config.ts +2 -4
- package/src/internal/core/jsonrpc/types/base-types.ts +23 -24
- package/src/internal/core/jsonrpc/types/input/blockTag.ts +2 -4
- package/src/internal/core/jsonrpc/types/input/callRequest.ts +0 -4
- package/src/internal/core/jsonrpc/types/input/filterRequest.ts +0 -4
- package/src/internal/core/jsonrpc/types/input/transactionRequest.ts +0 -4
- package/src/internal/core/jsonrpc/types/output/block.ts +0 -4
- package/src/internal/core/jsonrpc/types/output/log.ts +0 -4
- package/src/internal/core/jsonrpc/types/output/receipt.ts +0 -4
- package/src/internal/core/jsonrpc/types/output/transaction.ts +0 -4
- package/src/internal/core/providers/accounts.ts +16 -26
- package/src/internal/core/providers/construction.ts +5 -3
- package/src/internal/core/providers/gas-providers.ts +25 -33
- package/src/internal/core/providers/util.ts +1 -1
- package/src/internal/hardhat-network/jsonrpc/client.ts +22 -22
- package/src/internal/hardhat-network/provider/BlockchainBase.ts +62 -25
- package/src/internal/hardhat-network/provider/BlockchainData.ts +39 -42
- package/src/internal/hardhat-network/provider/HardhatBlockchain.ts +21 -21
- package/src/internal/hardhat-network/provider/PoolState.ts +3 -4
- package/src/internal/hardhat-network/provider/TransactionQueue.ts +11 -8
- package/src/internal/hardhat-network/provider/TxPool.ts +62 -64
- package/src/internal/hardhat-network/provider/ethereumjs-workarounds.ts +3 -3
- package/src/internal/hardhat-network/provider/filter.ts +9 -12
- package/src/internal/hardhat-network/provider/fork/ForkBlockchain.ts +52 -50
- package/src/internal/hardhat-network/provider/fork/ForkStateManager.ts +35 -60
- package/src/internal/hardhat-network/provider/fork/rpcToBlockData.ts +2 -2
- package/src/internal/hardhat-network/provider/fork/rpcToTxData.ts +3 -3
- package/src/internal/hardhat-network/provider/modules/eth.ts +88 -63
- package/src/internal/hardhat-network/provider/modules/evm.ts +19 -22
- package/src/internal/hardhat-network/provider/modules/hardhat.ts +21 -19
- package/src/internal/hardhat-network/provider/modules/logger.ts +33 -40
- package/src/internal/hardhat-network/provider/modules/net.ts +1 -1
- package/src/internal/hardhat-network/provider/modules/personal.ts +2 -1
- package/src/internal/hardhat-network/provider/modules/web3.ts +5 -4
- package/src/internal/hardhat-network/provider/node-types.ts +32 -31
- package/src/internal/hardhat-network/provider/node.ts +379 -343
- package/src/internal/hardhat-network/provider/output.ts +32 -37
- package/src/internal/hardhat-network/provider/provider.ts +5 -6
- package/src/internal/hardhat-network/provider/return-data.ts +2 -3
- package/src/internal/hardhat-network/provider/transactions/FakeSenderAccessListEIP2930Transaction.ts +51 -24
- package/src/internal/hardhat-network/provider/transactions/FakeSenderEIP1559Transaction.ts +50 -23
- package/src/internal/hardhat-network/provider/transactions/FakeSenderTransaction.ts +29 -11
- package/src/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP1559Transaction.ts +12 -24
- package/src/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP2930Transaction.ts +11 -22
- package/src/internal/hardhat-network/provider/transactions/ReadOnlyValidTransaction.ts +3 -3
- package/src/internal/hardhat-network/provider/types/HardhatBlockchainInterface.ts +8 -9
- package/src/internal/hardhat-network/provider/utils/getCurrentTimestamp.ts +4 -0
- package/src/internal/hardhat-network/provider/utils/makeAccount.ts +4 -10
- package/src/internal/hardhat-network/provider/utils/makeCommon.ts +8 -34
- package/src/internal/hardhat-network/provider/utils/makeForkClient.ts +8 -9
- package/src/internal/hardhat-network/provider/utils/makeStateTrie.ts +3 -3
- package/src/internal/hardhat-network/provider/utils/putGenesisBlock.ts +34 -6
- package/src/internal/hardhat-network/provider/utils/random.ts +54 -0
- package/src/internal/hardhat-network/provider/utils/reorganizeTransactionsLists.ts +6 -7
- package/src/internal/hardhat-network/provider/utils/reorgs-protection.ts +8 -8
- package/src/internal/hardhat-network/stack-traces/consoleLogger.ts +7 -2
- package/src/internal/hardhat-network/stack-traces/contracts-identifier.ts +1 -1
- package/src/internal/hardhat-network/stack-traces/debug.ts +1 -1
- package/src/internal/hardhat-network/stack-traces/error-inferrer.ts +6 -7
- package/src/internal/hardhat-network/stack-traces/message-trace.ts +6 -7
- package/src/internal/hardhat-network/stack-traces/model.ts +1 -1
- package/src/internal/hardhat-network/stack-traces/panic-errors.ts +3 -5
- package/src/internal/hardhat-network/stack-traces/solidity-errors.ts +16 -1
- package/src/internal/hardhat-network/stack-traces/solidity-stack-trace.ts +6 -6
- package/src/internal/hardhat-network/stack-traces/solidityTracer.ts +5 -0
- package/src/internal/hardhat-network/stack-traces/vm-debug-tracer.ts +106 -103
- package/src/internal/hardhat-network/stack-traces/vm-tracer.ts +23 -18
- package/src/internal/solidity/compiler/downloader.ts +5 -2
- package/src/internal/util/bigint.ts +84 -0
- package/src/internal/util/hardforks.ts +4 -29
- package/src/internal/util/wei-values.ts +11 -13
- package/src/types/config.ts +8 -10
- package/types/config.d.ts +8 -9
- package/types/config.d.ts.map +1 -1
- package/src/internal/hardhat-network/provider/fork/random.ts +0 -33
- package/src/internal/hardhat-network/provider/utils/bnToHex.ts +0 -5
- package/src/internal/hardhat-network/provider/utils/makeForkCommon.ts +0 -15
|
@@ -1,19 +1,19 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.TxPool = exports.deserializeTransaction = exports.serializeTransaction = void 0;
|
|
4
|
-
const tx_1 = require("@
|
|
5
|
-
const
|
|
4
|
+
const tx_1 = require("@ignored/tx");
|
|
5
|
+
const util_1 = require("@ignored/util");
|
|
6
6
|
const immutable_1 = require("immutable");
|
|
7
7
|
const errors_1 = require("../../core/providers/errors");
|
|
8
|
+
const bigint_1 = require("../../util/bigint");
|
|
8
9
|
const PoolState_1 = require("./PoolState");
|
|
9
10
|
const FakeSenderAccessListEIP2930Transaction_1 = require("./transactions/FakeSenderAccessListEIP2930Transaction");
|
|
10
11
|
const FakeSenderTransaction_1 = require("./transactions/FakeSenderTransaction");
|
|
11
|
-
const bnToHex_1 = require("./utils/bnToHex");
|
|
12
12
|
const reorganizeTransactionsLists_1 = require("./utils/reorganizeTransactionsLists");
|
|
13
13
|
const FakeSenderEIP1559Transaction_1 = require("./transactions/FakeSenderEIP1559Transaction");
|
|
14
14
|
/* eslint-disable @nomiclabs/hardhat-internal-rules/only-hardhat-error */
|
|
15
15
|
function serializeTransaction(tx) {
|
|
16
|
-
const rlpSerialization = (0,
|
|
16
|
+
const rlpSerialization = (0, util_1.bufferToHex)(tx.data.serialize());
|
|
17
17
|
const isFake = tx.data instanceof FakeSenderTransaction_1.FakeSenderTransaction ||
|
|
18
18
|
tx.data instanceof FakeSenderAccessListEIP2930Transaction_1.FakeSenderAccessListEIP2930Transaction ||
|
|
19
19
|
tx.data instanceof FakeSenderEIP1559Transaction_1.FakeSenderEIP1559Transaction;
|
|
@@ -21,7 +21,7 @@ function serializeTransaction(tx) {
|
|
|
21
21
|
orderId: tx.orderId,
|
|
22
22
|
fakeFrom: isFake ? tx.data.getSenderAddress().toString() : undefined,
|
|
23
23
|
data: rlpSerialization,
|
|
24
|
-
txType: tx.data.
|
|
24
|
+
txType: tx.data.type,
|
|
25
25
|
});
|
|
26
26
|
}
|
|
27
27
|
exports.serializeTransaction = serializeTransaction;
|
|
@@ -30,8 +30,8 @@ function deserializeTransaction(tx, common) {
|
|
|
30
30
|
const fakeFrom = tx.get("fakeFrom");
|
|
31
31
|
let data;
|
|
32
32
|
if (fakeFrom !== undefined) {
|
|
33
|
-
const sender =
|
|
34
|
-
const serialization = (0,
|
|
33
|
+
const sender = util_1.Address.fromString(fakeFrom);
|
|
34
|
+
const serialization = (0, util_1.toBuffer)(rlpSerialization);
|
|
35
35
|
if (tx.get("txType") === 1) {
|
|
36
36
|
data =
|
|
37
37
|
FakeSenderAccessListEIP2930Transaction_1.FakeSenderAccessListEIP2930Transaction.fromSenderAndRlpSerializedTx(sender, serialization, { common });
|
|
@@ -44,7 +44,7 @@ function deserializeTransaction(tx, common) {
|
|
|
44
44
|
}
|
|
45
45
|
}
|
|
46
46
|
else {
|
|
47
|
-
data = tx_1.TransactionFactory.fromSerializedData((0,
|
|
47
|
+
data = tx_1.TransactionFactory.fromSerializedData((0, util_1.toBuffer)(rlpSerialization), {
|
|
48
48
|
common,
|
|
49
49
|
});
|
|
50
50
|
}
|
|
@@ -61,7 +61,7 @@ class TxPool {
|
|
|
61
61
|
this._nextSnapshotId = 0;
|
|
62
62
|
this._nextOrderId = 0;
|
|
63
63
|
this._state = (0, PoolState_1.makePoolState)({
|
|
64
|
-
blockGasLimit:
|
|
64
|
+
blockGasLimit: bigint_1.BigIntUtils.toHex(blockGasLimit),
|
|
65
65
|
});
|
|
66
66
|
this._deserializeTransaction = (tx) => deserializeTransaction(tx, common);
|
|
67
67
|
}
|
|
@@ -70,8 +70,8 @@ class TxPool {
|
|
|
70
70
|
const nextConfirmedNonce = await this._getNextConfirmedNonce(senderAddress);
|
|
71
71
|
const nextPendingNonce = await this.getNextPendingNonce(senderAddress);
|
|
72
72
|
await this._validateTransaction(tx, senderAddress, nextConfirmedNonce);
|
|
73
|
-
const txNonce =
|
|
74
|
-
if (txNonce
|
|
73
|
+
const txNonce = tx.nonce;
|
|
74
|
+
if (txNonce > nextPendingNonce) {
|
|
75
75
|
this._addQueuedTransaction(tx);
|
|
76
76
|
}
|
|
77
77
|
else {
|
|
@@ -83,7 +83,6 @@ class TxPool {
|
|
|
83
83
|
* if a transaction was removed, false otherwise.
|
|
84
84
|
*/
|
|
85
85
|
removeTransaction(txHash) {
|
|
86
|
-
var _a, _b;
|
|
87
86
|
const tx = this.getTransactionByHash(txHash);
|
|
88
87
|
if (tx === undefined) {
|
|
89
88
|
// transaction doesn't exist in the mempool
|
|
@@ -92,8 +91,10 @@ class TxPool {
|
|
|
92
91
|
this._deleteTransactionByHash(txHash);
|
|
93
92
|
const serializedTx = serializeTransaction(tx);
|
|
94
93
|
const senderAddress = this._getSenderAddress(tx.data).toString();
|
|
95
|
-
const pendingForAddress =
|
|
96
|
-
|
|
94
|
+
const pendingForAddress = this._getPendingForAddress(senderAddress) ??
|
|
95
|
+
(0, immutable_1.List)();
|
|
96
|
+
const queuedForAddress = this._getQueuedForAddress(senderAddress) ??
|
|
97
|
+
(0, immutable_1.List)();
|
|
97
98
|
// if the tx to remove is in the pending state, remove it
|
|
98
99
|
// and move the following transactions to the queued list
|
|
99
100
|
const indexOfPendingTx = pendingForAddress.indexOf(serializedTx);
|
|
@@ -127,7 +128,7 @@ class TxPool {
|
|
|
127
128
|
this._removeSnapshotsAfter(snapshotId);
|
|
128
129
|
}
|
|
129
130
|
getTransactionByHash(hash) {
|
|
130
|
-
const tx = this._getTransactionsByHash().get((0,
|
|
131
|
+
const tx = this._getTransactionsByHash().get((0, util_1.bufferToHex)(hash));
|
|
131
132
|
if (tx !== undefined) {
|
|
132
133
|
return this._deserializeTransaction(tx);
|
|
133
134
|
}
|
|
@@ -162,19 +163,19 @@ class TxPool {
|
|
|
162
163
|
*/
|
|
163
164
|
async getNextPendingNonce(accountAddress) {
|
|
164
165
|
const pendingTxs = this._getPendingForAddress(accountAddress.toString());
|
|
165
|
-
const lastPendingTx = pendingTxs
|
|
166
|
+
const lastPendingTx = pendingTxs?.last(undefined);
|
|
166
167
|
if (lastPendingTx === undefined) {
|
|
167
168
|
return this._getNextConfirmedNonce(accountAddress);
|
|
168
169
|
}
|
|
169
170
|
const lastPendingTxNonce = this._deserializeTransaction(lastPendingTx).data.nonce;
|
|
170
|
-
return lastPendingTxNonce
|
|
171
|
+
return lastPendingTxNonce + 1n;
|
|
171
172
|
}
|
|
172
173
|
getBlockGasLimit() {
|
|
173
|
-
return
|
|
174
|
+
return BigInt(this._state.get("blockGasLimit"));
|
|
174
175
|
}
|
|
175
176
|
setBlockGasLimit(newLimit) {
|
|
176
177
|
if (typeof newLimit === "number") {
|
|
177
|
-
newLimit =
|
|
178
|
+
newLimit = BigInt(newLimit);
|
|
178
179
|
}
|
|
179
180
|
this._setBlockGasLimit(newLimit);
|
|
180
181
|
}
|
|
@@ -182,28 +183,27 @@ class TxPool {
|
|
|
182
183
|
* Updates the pending and queued list of all addresses
|
|
183
184
|
*/
|
|
184
185
|
async updatePendingAndQueued() {
|
|
185
|
-
var _a;
|
|
186
186
|
let newPending = this._getPending();
|
|
187
187
|
// update pending transactions
|
|
188
188
|
for (const [address, txs] of newPending) {
|
|
189
|
-
const senderAccount = await this._stateManager.getAccount(
|
|
190
|
-
const senderNonce =
|
|
191
|
-
const senderBalance =
|
|
189
|
+
const senderAccount = await this._stateManager.getAccount(util_1.Address.fromString(address));
|
|
190
|
+
const senderNonce = senderAccount.nonce;
|
|
191
|
+
const senderBalance = senderAccount.balance;
|
|
192
192
|
let moveToQueued = false;
|
|
193
193
|
for (const tx of txs) {
|
|
194
194
|
const deserializedTx = this._deserializeTransaction(tx);
|
|
195
195
|
if (moveToQueued) {
|
|
196
196
|
newPending = this._removeTx(newPending, address, deserializedTx);
|
|
197
|
-
const queued =
|
|
197
|
+
const queued = this._getQueuedForAddress(address) ?? (0, immutable_1.List)();
|
|
198
198
|
this._setQueuedForAddress(address, queued.push(tx));
|
|
199
199
|
continue;
|
|
200
200
|
}
|
|
201
|
-
const txNonce =
|
|
201
|
+
const txNonce = deserializedTx.data.nonce;
|
|
202
202
|
if (!this._isTxValid(deserializedTx, txNonce, senderNonce, senderBalance)) {
|
|
203
203
|
newPending = this._removeTx(newPending, address, deserializedTx);
|
|
204
204
|
// if we are dropping a pending transaction with a valid nonce,
|
|
205
205
|
// then we move all the following txs to the queued list
|
|
206
|
-
if (txNonce
|
|
206
|
+
if (txNonce >= senderNonce) {
|
|
207
207
|
moveToQueued = true;
|
|
208
208
|
}
|
|
209
209
|
}
|
|
@@ -213,12 +213,12 @@ class TxPool {
|
|
|
213
213
|
// update queued addresses
|
|
214
214
|
let newQueued = this._getQueued();
|
|
215
215
|
for (const [address, txs] of newQueued) {
|
|
216
|
-
const senderAccount = await this._stateManager.getAccount(
|
|
217
|
-
const senderNonce =
|
|
218
|
-
const senderBalance =
|
|
216
|
+
const senderAccount = await this._stateManager.getAccount(util_1.Address.fromString(address));
|
|
217
|
+
const senderNonce = senderAccount.nonce;
|
|
218
|
+
const senderBalance = senderAccount.balance;
|
|
219
219
|
for (const tx of txs) {
|
|
220
220
|
const deserializedTx = this._deserializeTransaction(tx);
|
|
221
|
-
const txNonce =
|
|
221
|
+
const txNonce = deserializedTx.data.nonce;
|
|
222
222
|
if (!this._isTxValid(deserializedTx, txNonce, senderNonce, senderBalance)) {
|
|
223
223
|
newQueued = this._removeTx(newQueued, address, deserializedTx);
|
|
224
224
|
}
|
|
@@ -253,64 +253,62 @@ class TxPool {
|
|
|
253
253
|
return map.set(address, accountTxs.remove(indexOfTx));
|
|
254
254
|
}
|
|
255
255
|
_addPendingTransaction(tx) {
|
|
256
|
-
var _a, _b;
|
|
257
256
|
const orderedTx = {
|
|
258
257
|
orderId: this._nextOrderId++,
|
|
259
258
|
data: tx,
|
|
260
259
|
};
|
|
261
260
|
const serializedTx = serializeTransaction(orderedTx);
|
|
262
261
|
const hexSenderAddress = tx.getSenderAddress().toString();
|
|
263
|
-
const accountTransactions =
|
|
262
|
+
const accountTransactions = this._getPendingForAddress(hexSenderAddress) ?? (0, immutable_1.List)();
|
|
264
263
|
const replaced = this._replacePendingTx(hexSenderAddress, orderedTx);
|
|
265
264
|
if (!replaced) {
|
|
266
|
-
const { newPending, newQueued } = (0, reorganizeTransactionsLists_1.reorganizeTransactionsLists)(accountTransactions.push(serializedTx),
|
|
265
|
+
const { newPending, newQueued } = (0, reorganizeTransactionsLists_1.reorganizeTransactionsLists)(accountTransactions.push(serializedTx), this._getQueuedForAddress(hexSenderAddress) ?? (0, immutable_1.List)(), (stx) => this._deserializeTransaction(stx).data.nonce);
|
|
267
266
|
this._setPendingForAddress(hexSenderAddress, newPending);
|
|
268
267
|
this._setQueuedForAddress(hexSenderAddress, newQueued);
|
|
269
268
|
}
|
|
270
|
-
this._setTransactionByHash((0,
|
|
269
|
+
this._setTransactionByHash((0, util_1.bufferToHex)(tx.hash()), serializedTx);
|
|
271
270
|
}
|
|
272
271
|
_addQueuedTransaction(tx) {
|
|
273
|
-
var _a;
|
|
274
272
|
const orderedTx = {
|
|
275
273
|
orderId: this._nextOrderId++,
|
|
276
274
|
data: tx,
|
|
277
275
|
};
|
|
278
276
|
const serializedTx = serializeTransaction(orderedTx);
|
|
279
277
|
const hexSenderAddress = tx.getSenderAddress().toString();
|
|
280
|
-
const accountTransactions =
|
|
278
|
+
const accountTransactions = this._getQueuedForAddress(hexSenderAddress) ?? (0, immutable_1.List)();
|
|
281
279
|
const replaced = this._replaceQueuedTx(hexSenderAddress, orderedTx);
|
|
282
280
|
if (!replaced) {
|
|
283
281
|
this._setQueuedForAddress(hexSenderAddress, accountTransactions.push(serializedTx));
|
|
284
282
|
}
|
|
285
|
-
this._setTransactionByHash((0,
|
|
283
|
+
this._setTransactionByHash((0, util_1.bufferToHex)(tx.hash()), serializedTx);
|
|
286
284
|
}
|
|
287
285
|
async _validateTransaction(tx, senderAddress, senderNonce) {
|
|
288
286
|
if (this._knownTransaction(tx)) {
|
|
289
|
-
throw new errors_1.InvalidInputError(`Known transaction: ${(0,
|
|
287
|
+
throw new errors_1.InvalidInputError(`Known transaction: ${(0, util_1.bufferToHex)(tx.hash())}`);
|
|
290
288
|
}
|
|
291
|
-
const txNonce =
|
|
289
|
+
const txNonce = tx.nonce;
|
|
292
290
|
// Geth returns this error if trying to create a contract and no data is provided
|
|
293
291
|
if (tx.to === undefined && tx.data.length === 0) {
|
|
294
292
|
throw new errors_1.InvalidInputError("contract creation without any data provided");
|
|
295
293
|
}
|
|
296
294
|
const senderAccount = await this._stateManager.getAccount(senderAddress);
|
|
297
|
-
const senderBalance =
|
|
295
|
+
const senderBalance = senderAccount.balance;
|
|
298
296
|
const maxFee = "gasPrice" in tx ? tx.gasPrice : tx.maxFeePerGas;
|
|
299
|
-
const txMaxUpfrontCost = tx.gasLimit
|
|
300
|
-
if (txMaxUpfrontCost
|
|
297
|
+
const txMaxUpfrontCost = tx.gasLimit * maxFee + tx.value;
|
|
298
|
+
if (txMaxUpfrontCost > senderBalance) {
|
|
301
299
|
throw new errors_1.InvalidInputError(`sender doesn't have enough funds to send tx. The max upfront cost is: ${txMaxUpfrontCost.toString()}` +
|
|
302
300
|
` and the sender's account only has: ${senderBalance.toString()}`);
|
|
303
301
|
}
|
|
304
|
-
if (txNonce
|
|
302
|
+
if (txNonce < senderNonce) {
|
|
305
303
|
throw new errors_1.InvalidInputError(`Nonce too low. Expected nonce to be at least ${senderNonce.toString()} but got ${txNonce.toString()}.`);
|
|
306
304
|
}
|
|
307
|
-
const gasLimit =
|
|
305
|
+
const gasLimit = tx.gasLimit;
|
|
308
306
|
const baseFee = tx.getBaseFee();
|
|
309
|
-
if (gasLimit
|
|
307
|
+
if (gasLimit < baseFee) {
|
|
310
308
|
throw new errors_1.InvalidInputError(`Transaction requires at least ${baseFee.toString()} gas but got ${gasLimit.toString()}`);
|
|
311
309
|
}
|
|
312
310
|
const blockGasLimit = this.getBlockGasLimit();
|
|
313
|
-
if (gasLimit
|
|
311
|
+
if (gasLimit > blockGasLimit) {
|
|
314
312
|
throw new errors_1.InvalidInputError(`Transaction gas limit is ${gasLimit.toString()} and exceeds block gas limit of ${blockGasLimit.toString()}`);
|
|
315
313
|
}
|
|
316
314
|
}
|
|
@@ -320,7 +318,7 @@ class TxPool {
|
|
|
320
318
|
this._transactionExists(tx, this._getQueuedForAddress(senderAddress)));
|
|
321
319
|
}
|
|
322
320
|
_transactionExists(tx, txList) {
|
|
323
|
-
const existingTx = txList
|
|
321
|
+
const existingTx = txList?.find((etx) => this._deserializeTransaction(etx).data.hash().equals(tx.hash()));
|
|
324
322
|
return existingTx !== undefined;
|
|
325
323
|
}
|
|
326
324
|
_getTransactionsByHash() {
|
|
@@ -354,16 +352,16 @@ class TxPool {
|
|
|
354
352
|
this._state = this._state.set("queuedTransactions", this._getQueued().set(address, transactions));
|
|
355
353
|
}
|
|
356
354
|
_setBlockGasLimit(newLimit) {
|
|
357
|
-
this._state = this._state.set("blockGasLimit",
|
|
355
|
+
this._state = this._state.set("blockGasLimit", bigint_1.BigIntUtils.toHex(newLimit));
|
|
358
356
|
}
|
|
359
357
|
_deleteTransactionByHash(hash) {
|
|
360
|
-
this._state = this._state.set("hashToTransaction", this._getTransactionsByHash().delete((0,
|
|
358
|
+
this._state = this._state.set("hashToTransaction", this._getTransactionsByHash().delete((0, util_1.bufferToHex)(hash)));
|
|
361
359
|
}
|
|
362
360
|
_isTxValid(tx, txNonce, senderNonce, senderBalance) {
|
|
363
|
-
const txGasLimit =
|
|
364
|
-
return (txGasLimit
|
|
365
|
-
txNonce
|
|
366
|
-
tx.data.getUpfrontCost()
|
|
361
|
+
const txGasLimit = tx.data.gasLimit;
|
|
362
|
+
return (txGasLimit <= this.getBlockGasLimit() &&
|
|
363
|
+
txNonce >= senderNonce &&
|
|
364
|
+
tx.data.getUpfrontCost() <= senderBalance);
|
|
367
365
|
}
|
|
368
366
|
/**
|
|
369
367
|
* Returns the next available nonce for an address, ignoring its
|
|
@@ -371,7 +369,7 @@ class TxPool {
|
|
|
371
369
|
*/
|
|
372
370
|
async _getNextConfirmedNonce(accountAddress) {
|
|
373
371
|
const account = await this._stateManager.getAccount(accountAddress);
|
|
374
|
-
return
|
|
372
|
+
return account.nonce;
|
|
375
373
|
}
|
|
376
374
|
/**
|
|
377
375
|
* Checks if some pending tx with the same nonce as `newTx` exists.
|
|
@@ -405,28 +403,28 @@ class TxPool {
|
|
|
405
403
|
if (txs === undefined) {
|
|
406
404
|
return;
|
|
407
405
|
}
|
|
408
|
-
const existingTxEntry = txs.findEntry((tx) => this._deserializeTransaction(tx).data.nonce
|
|
406
|
+
const existingTxEntry = txs.findEntry((tx) => this._deserializeTransaction(tx).data.nonce === newTx.data.nonce);
|
|
409
407
|
if (existingTxEntry === undefined) {
|
|
410
408
|
return;
|
|
411
409
|
}
|
|
412
410
|
const [existingTxIndex, existingTx] = existingTxEntry;
|
|
413
411
|
const deserializedExistingTx = this._deserializeTransaction(existingTx);
|
|
414
|
-
const currentMaxFeePerGas =
|
|
412
|
+
const currentMaxFeePerGas = "gasPrice" in deserializedExistingTx.data
|
|
415
413
|
? deserializedExistingTx.data.gasPrice
|
|
416
|
-
: deserializedExistingTx.data.maxFeePerGas
|
|
417
|
-
const currentPriorityFeePerGas =
|
|
414
|
+
: deserializedExistingTx.data.maxFeePerGas;
|
|
415
|
+
const currentPriorityFeePerGas = "gasPrice" in deserializedExistingTx.data
|
|
418
416
|
? deserializedExistingTx.data.gasPrice
|
|
419
|
-
: deserializedExistingTx.data.maxPriorityFeePerGas
|
|
420
|
-
const newMaxFeePerGas =
|
|
421
|
-
const newPriorityFeePerGas =
|
|
417
|
+
: deserializedExistingTx.data.maxPriorityFeePerGas;
|
|
418
|
+
const newMaxFeePerGas = "gasPrice" in newTx.data ? newTx.data.gasPrice : newTx.data.maxFeePerGas;
|
|
419
|
+
const newPriorityFeePerGas = "gasPrice" in newTx.data
|
|
422
420
|
? newTx.data.gasPrice
|
|
423
|
-
: newTx.data.maxPriorityFeePerGas
|
|
421
|
+
: newTx.data.maxPriorityFeePerGas;
|
|
424
422
|
const minNewMaxFeePerGas = this._getMinNewFeePrice(currentMaxFeePerGas);
|
|
425
423
|
const minNewPriorityFeePerGas = this._getMinNewFeePrice(currentPriorityFeePerGas);
|
|
426
|
-
if (newMaxFeePerGas
|
|
424
|
+
if (newMaxFeePerGas < minNewMaxFeePerGas) {
|
|
427
425
|
throw new errors_1.InvalidInputError(`Replacement transaction underpriced. A gasPrice/maxFeePerGas of at least ${minNewMaxFeePerGas.toString()} is necessary to replace the existing transaction with nonce ${newTx.data.nonce.toString()}.`);
|
|
428
426
|
}
|
|
429
|
-
if (newPriorityFeePerGas
|
|
427
|
+
if (newPriorityFeePerGas < minNewPriorityFeePerGas) {
|
|
430
428
|
throw new errors_1.InvalidInputError(`Replacement transaction underpriced. A gasPrice/maxPriorityFeePerGas of at least ${minNewPriorityFeePerGas.toString()} is necessary to replace the existing transaction with nonce ${newTx.data.nonce.toString()}.`);
|
|
431
429
|
}
|
|
432
430
|
const newTxs = txs.set(existingTxIndex, serializeTransaction(newTx));
|
|
@@ -434,12 +432,12 @@ class TxPool {
|
|
|
434
432
|
return newTxs;
|
|
435
433
|
}
|
|
436
434
|
_getMinNewFeePrice(feePrice) {
|
|
437
|
-
let minNewPriorityFee = feePrice
|
|
438
|
-
if (minNewPriorityFee
|
|
439
|
-
minNewPriorityFee = minNewPriorityFee
|
|
435
|
+
let minNewPriorityFee = feePrice * 110n;
|
|
436
|
+
if (minNewPriorityFee % 100n === 0n) {
|
|
437
|
+
minNewPriorityFee = minNewPriorityFee / 100n;
|
|
440
438
|
}
|
|
441
439
|
else {
|
|
442
|
-
minNewPriorityFee = minNewPriorityFee
|
|
440
|
+
minNewPriorityFee = minNewPriorityFee / 100n + 1n;
|
|
443
441
|
}
|
|
444
442
|
return minNewPriorityFee;
|
|
445
443
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TxPool.js","sourceRoot":"","sources":["../../../src/internal/hardhat-network/provider/TxPool.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"TxPool.js","sourceRoot":"","sources":["../../../src/internal/hardhat-network/provider/TxPool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const tx_1 = require("@
|
|
4
|
-
const baseTransaction_1 = require("@
|
|
3
|
+
const tx_1 = require("@ignored/tx");
|
|
4
|
+
const baseTransaction_1 = require("@ignored/tx/dist/baseTransaction");
|
|
5
5
|
// This is a hack to prevent Block.fromBlockData from recreating our
|
|
6
6
|
// transactions and changing their types. Note fromBlockData is used
|
|
7
7
|
// by the BlockBuilder to update block it's building.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ethereumjs-workarounds.js","sourceRoot":"","sources":["../../../src/internal/hardhat-network/provider/ethereumjs-workarounds.ts"],"names":[],"mappings":";;AAAA,
|
|
1
|
+
{"version":3,"file":"ethereumjs-workarounds.js","sourceRoot":"","sources":["../../../src/internal/hardhat-network/provider/ethereumjs-workarounds.ts"],"names":[],"mappings":";;AAAA,oCAAiD;AACjD,sEAAmE;AAOnE,oEAAoE;AACpE,oEAAoE;AACpE,qDAAqD;AACrD,MAAM,kBAAkB,GAAG,uBAAkB,CAAC,UAAU,CAAC;AACxD,uBAA0B,CAAC,UAAU,GAAG,UACvC,MAAwC,EACxC,SAAqB;IAErB,IAAI,MAAM,YAAY,iCAAe,EAAE;QACrC,OAAO,MAAM,CAAC;KACf;IAED,OAAO,kBAAkB,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;AAC1D,CAAC,CAAC"}
|
|
@@ -1,21 +1,20 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import Bloom from "@
|
|
3
|
-
import { BN } from "ethereumjs-util";
|
|
2
|
+
import { Bloom } from "@ignored/vm";
|
|
4
3
|
import { RpcLogOutput } from "./output";
|
|
5
|
-
export declare const LATEST_BLOCK
|
|
4
|
+
export declare const LATEST_BLOCK = -1n;
|
|
6
5
|
export declare enum Type {
|
|
7
6
|
LOGS_SUBSCRIPTION = 0,
|
|
8
7
|
PENDING_TRANSACTION_SUBSCRIPTION = 1,
|
|
9
8
|
BLOCK_SUBSCRIPTION = 2
|
|
10
9
|
}
|
|
11
10
|
export interface FilterCriteria {
|
|
12
|
-
fromBlock:
|
|
13
|
-
toBlock:
|
|
11
|
+
fromBlock: bigint;
|
|
12
|
+
toBlock: bigint;
|
|
14
13
|
addresses: Buffer[];
|
|
15
14
|
normalizedTopics: Array<Array<Buffer | null> | null>;
|
|
16
15
|
}
|
|
17
16
|
export interface Filter {
|
|
18
|
-
id:
|
|
17
|
+
id: bigint;
|
|
19
18
|
type: Type;
|
|
20
19
|
criteria?: FilterCriteria;
|
|
21
20
|
deadline: Date;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter.d.ts","sourceRoot":"","sources":["../../../src/internal/hardhat-network/provider/filter.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"filter.d.ts","sourceRoot":"","sources":["../../../src/internal/hardhat-network/provider/filter.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAExC,eAAO,MAAM,YAAY,MAAM,CAAC;AAEhC,oBAAY,IAAI;IACd,iBAAiB,IAAI;IACrB,gCAAgC,IAAI;IACpC,kBAAkB,IAAI;CACvB;AAED,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,gBAAgB,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;CACtD;AAED,MAAM,WAAW,MAAM;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,IAAI,CAAC;IACX,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,QAAQ,EAAE,IAAI,CAAC;IACf,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,IAAI,EAAE,YAAY,EAAE,CAAC;IACrB,YAAY,EAAE,OAAO,CAAC;CACvB;AAED,wBAAgB,WAAW,CACzB,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE,MAAM,EAAE,EACnB,gBAAgB,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,GACnD,OAAO,CAiCT;AAED,wBAAgB,UAAU,CACxB,IAAI,EAAE,YAAY,EAAE,EACpB,QAAQ,EAAE,cAAc,GACvB,YAAY,EAAE,CA2BhB;AAED,wBAAgB,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAQhE;AAED,wBAAgB,YAAY,CAC1B,gBAAgB,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,EACpD,SAAS,EAAE,MAAM,EAAE,GAClB,OAAO,CAwBT"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.topicMatched = exports.includes = exports.filterLogs = exports.bloomFilter = exports.Type = exports.LATEST_BLOCK = void 0;
|
|
4
|
-
const
|
|
5
|
-
exports.LATEST_BLOCK =
|
|
4
|
+
const util_1 = require("@ignored/util");
|
|
5
|
+
exports.LATEST_BLOCK = -1n;
|
|
6
6
|
var Type;
|
|
7
7
|
(function (Type) {
|
|
8
8
|
Type[Type["LOGS_SUBSCRIPTION"] = 0] = "LOGS_SUBSCRIPTION";
|
|
@@ -43,16 +43,15 @@ exports.bloomFilter = bloomFilter;
|
|
|
43
43
|
function filterLogs(logs, criteria) {
|
|
44
44
|
const filteredLogs = [];
|
|
45
45
|
for (const log of logs) {
|
|
46
|
-
const blockNumber =
|
|
47
|
-
if (blockNumber
|
|
46
|
+
const blockNumber = BigInt(log.blockNumber);
|
|
47
|
+
if (blockNumber < criteria.fromBlock) {
|
|
48
48
|
continue;
|
|
49
49
|
}
|
|
50
|
-
if (
|
|
51
|
-
blockNumber.gt(criteria.toBlock)) {
|
|
50
|
+
if (criteria.toBlock !== exports.LATEST_BLOCK && blockNumber > criteria.toBlock) {
|
|
52
51
|
continue;
|
|
53
52
|
}
|
|
54
53
|
if (criteria.addresses.length !== 0 &&
|
|
55
|
-
!includes(criteria.addresses, (0,
|
|
54
|
+
!includes(criteria.addresses, (0, util_1.toBuffer)(log.address))) {
|
|
56
55
|
continue;
|
|
57
56
|
}
|
|
58
57
|
if (!topicMatched(criteria.normalizedTopics, log.topics)) {
|
|
@@ -83,7 +82,7 @@ function topicMatched(normalizedTopics, logTopics) {
|
|
|
83
82
|
}
|
|
84
83
|
let match = false;
|
|
85
84
|
for (const topic of sub) {
|
|
86
|
-
if (topic === null || logTopics[i] === (0,
|
|
85
|
+
if (topic === null || logTopics[i] === (0, util_1.bufferToHex)(topic)) {
|
|
87
86
|
match = true;
|
|
88
87
|
break;
|
|
89
88
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter.js","sourceRoot":"","sources":["../../../src/internal/hardhat-network/provider/filter.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"filter.js","sourceRoot":"","sources":["../../../src/internal/hardhat-network/provider/filter.ts"],"names":[],"mappings":";;;AAAA,wCAAsD;AAKzC,QAAA,YAAY,GAAG,CAAC,EAAE,CAAC;AAEhC,IAAY,IAIX;AAJD,WAAY,IAAI;IACd,yDAAqB,CAAA;IACrB,uFAAoC,CAAA;IACpC,2DAAsB,CAAA;AACxB,CAAC,EAJW,IAAI,GAAJ,YAAI,KAAJ,YAAI,QAIf;AAmBD,SAAgB,WAAW,CACzB,KAAY,EACZ,SAAmB,EACnB,gBAAoD;IAEpD,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;QACxB,IAAI,QAAQ,GAAG,KAAK,CAAC;QACrB,KAAK,MAAM,OAAO,IAAI,SAAS,EAAE;YAC/B,IAAI,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;gBACxB,QAAQ,GAAG,IAAI,CAAC;gBAChB,MAAM;aACP;SACF;QAED,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO,KAAK,CAAC;SACd;KACF;IAED,KAAK,MAAM,GAAG,IAAI,gBAAgB,EAAE;QAClC,IAAI,GAAG,KAAK,IAAI,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;YACpC,SAAS;SACV;QAED,IAAI,QAAQ,GAAG,KAAK,CAAC;QACrB,KAAK,MAAM,KAAK,IAAI,GAAG,EAAE;YACvB,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;gBACxC,QAAQ,GAAG,IAAI,CAAC;gBAChB,MAAM;aACP;SACF;QAED,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO,KAAK,CAAC;SACd;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AArCD,kCAqCC;AAED,SAAgB,UAAU,CACxB,IAAoB,EACpB,QAAwB;IAExB,MAAM,YAAY,GAAmB,EAAE,CAAC;IACxC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;QACtB,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,WAAY,CAAC,CAAC;QAC7C,IAAI,WAAW,GAAG,QAAQ,CAAC,SAAS,EAAE;YACpC,SAAS;SACV;QAED,IAAI,QAAQ,CAAC,OAAO,KAAK,oBAAY,IAAI,WAAW,GAAG,QAAQ,CAAC,OAAO,EAAE;YACvE,SAAS;SACV;QAED,IACE,QAAQ,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC;YAC/B,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,EAAE,IAAA,eAAQ,EAAC,GAAG,CAAC,OAAO,CAAC,CAAC,EACpD;YACA,SAAS;SACV;QAED,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE;YACxD,SAAS;SACV;QAED,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;KACxB;IAED,OAAO,YAAY,CAAC;AACtB,CAAC;AA9BD,gCA8BC;AAED,SAAgB,QAAQ,CAAC,SAAmB,EAAE,CAAS;IACrD,KAAK,MAAM,OAAO,IAAI,SAAS,EAAE;QAC/B,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE;YACpC,OAAO,IAAI,CAAC;SACb;KACF;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AARD,4BAQC;AAED,SAAgB,YAAY,CAC1B,gBAAoD,EACpD,SAAmB;IAEnB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,gBAAgB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAChD,IAAI,gBAAgB,CAAC,MAAM,GAAG,SAAS,CAAC,MAAM,EAAE;YAC9C,OAAO,KAAK,CAAC;SACd;QAED,MAAM,GAAG,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;QAChC,IAAI,GAAG,KAAK,IAAI,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;YACpC,SAAS;SACV;QAED,IAAI,KAAK,GAAY,KAAK,CAAC;QAC3B,KAAK,MAAM,KAAK,IAAI,GAAG,EAAE;YACvB,IAAI,KAAK,KAAK,IAAI,IAAI,SAAS,CAAC,CAAC,CAAC,KAAK,IAAA,kBAAW,EAAC,KAAK,CAAC,EAAE;gBACzD,KAAK,GAAG,IAAI,CAAC;gBACb,MAAM;aACP;SACF;QACD,IAAI,CAAC,KAAK,EAAE;YACV,OAAO,KAAK,CAAC;SACd;KACF;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AA3BD,oCA2BC"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import { Block } from "@
|
|
3
|
-
import Common from "@
|
|
4
|
-
import { TypedTransaction } from "@
|
|
5
|
-
import { BN } from "ethereumjs-util";
|
|
2
|
+
import { Block } from "@ignored/block";
|
|
3
|
+
import { Common } from "@ignored/common";
|
|
4
|
+
import { TypedTransaction } from "@ignored/tx";
|
|
6
5
|
import { JsonRpcClient } from "../../jsonrpc/client";
|
|
7
6
|
import { BlockchainBase } from "../BlockchainBase";
|
|
8
7
|
import { FilterParams } from "../node-types";
|
|
@@ -12,22 +11,22 @@ export declare class ForkBlockchain extends BlockchainBase implements HardhatBlo
|
|
|
12
11
|
private _jsonRpcClient;
|
|
13
12
|
private _forkBlockNumber;
|
|
14
13
|
private _latestBlockNumber;
|
|
15
|
-
constructor(_jsonRpcClient: JsonRpcClient, _forkBlockNumber:
|
|
16
|
-
getLatestBlockNumber():
|
|
17
|
-
getBlock(blockHashOrNumber: Buffer |
|
|
14
|
+
constructor(_jsonRpcClient: JsonRpcClient, _forkBlockNumber: bigint, common: Common);
|
|
15
|
+
getLatestBlockNumber(): bigint;
|
|
16
|
+
getBlock(blockHashOrNumber: Buffer | bigint): Promise<Block | null>;
|
|
18
17
|
addBlock(block: Block): Promise<Block>;
|
|
19
|
-
reserveBlocks(count:
|
|
18
|
+
reserveBlocks(count: bigint, interval: bigint, previousBlockStateRoot: Buffer, previousBlockTotalDifficulty: bigint, previousBlockBaseFeePerGas: bigint | undefined): void;
|
|
20
19
|
deleteLaterBlocks(block: Block): void;
|
|
21
|
-
getTotalDifficulty(blockHash: Buffer): Promise<
|
|
20
|
+
getTotalDifficulty(blockHash: Buffer): Promise<bigint>;
|
|
22
21
|
getTransaction(transactionHash: Buffer): Promise<TypedTransaction | undefined>;
|
|
23
22
|
getBlockByTransactionHash(transactionHash: Buffer): Promise<Block | null>;
|
|
24
23
|
getTransactionReceipt(transactionHash: Buffer): Promise<RpcReceiptOutput | null>;
|
|
25
|
-
getForkBlockNumber():
|
|
24
|
+
getForkBlockNumber(): bigint;
|
|
26
25
|
getLogs(filterParams: FilterParams): Promise<RpcLogOutput[]>;
|
|
27
26
|
private _getBlockByHash;
|
|
28
27
|
private _getBlockByNumber;
|
|
29
28
|
private _processRemoteBlock;
|
|
30
|
-
protected _delBlock(blockNumber:
|
|
29
|
+
protected _delBlock(blockNumber: bigint): void;
|
|
31
30
|
private _processRemoteTransaction;
|
|
32
31
|
private _processRemoteReceipt;
|
|
33
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ForkBlockchain.d.ts","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/fork/ForkBlockchain.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"ForkBlockchain.d.ts","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/fork/ForkBlockchain.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAQ/C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAEL,YAAY,EACZ,gBAAgB,EAIjB,MAAM,WAAW,CAAC;AAGnB,OAAO,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;AAQjF,qBAAa,cACX,SAAQ,cACR,YAAW,0BAA0B;IAKnC,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,gBAAgB;IAJ1B,OAAO,CAAC,kBAAkB,CAAyB;gBAGzC,cAAc,EAAE,aAAa,EAC7B,gBAAgB,EAAE,MAAM,EAChC,MAAM,EAAE,MAAM;IAKT,oBAAoB,IAAI,MAAM;IAIxB,QAAQ,CACnB,iBAAiB,EAAE,MAAM,GAAG,MAAM,GACjC,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;IAkBX,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IA0B5C,aAAa,CAClB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,sBAAsB,EAAE,MAAM,EAC9B,4BAA4B,EAAE,MAAM,EACpC,0BAA0B,EAAE,MAAM,GAAG,SAAS;IAYzC,iBAAiB,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAe/B,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAgBtD,cAAc,CACzB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAW3B,yBAAyB,CACpC,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;IAeX,qBAAqB,CAChC,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;IAgB5B,kBAAkB;IAIZ,OAAO,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;YAyB3D,eAAe;YASf,iBAAiB;YAejB,mBAAmB;IAmEjC,SAAS,CAAC,SAAS,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAQ9C,OAAO,CAAC,yBAAyB;YAmBnB,qBAAqB;CAmBpC"}
|