hardhat 2.11.0-dev.0 → 2.11.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/clean.js +2 -1
- package/builtin-tasks/clean.js.map +1 -1
- package/builtin-tasks/compile.js +52 -95
- package/builtin-tasks/compile.js.map +1 -1
- package/builtin-tasks/flatten.js +2 -21
- package/builtin-tasks/flatten.js.map +1 -1
- package/builtin-tasks/node.js +1 -1
- package/builtin-tasks/node.js.map +1 -1
- package/builtin-tasks/test.js +3 -3
- package/builtin-tasks/test.js.map +1 -1
- package/builtin-tasks/utils/solidity-files-cache.d.ts.map +1 -1
- package/builtin-tasks/utils/solidity-files-cache.js +5 -6
- package/builtin-tasks/utils/solidity-files-cache.js.map +1 -1
- package/internal/artifacts.d.ts +3 -11
- package/internal/artifacts.d.ts.map +1 -1
- package/internal/artifacts.js +266 -133
- package/internal/artifacts.js.map +1 -1
- package/internal/cli/cli.js +26 -12
- package/internal/cli/cli.js.map +1 -1
- package/internal/core/config/config-loading.js +2 -2
- 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 +11 -31
- package/internal/core/config/config-resolution.js.map +1 -1
- package/internal/core/config/default-config.js +1 -1
- package/internal/core/config/default-config.js.map +1 -1
- package/internal/core/errors-list.d.ts +7 -0
- package/internal/core/errors-list.d.ts.map +1 -1
- package/internal/core/errors-list.js +28 -11
- package/internal/core/errors-list.js.map +1 -1
- package/internal/core/errors.d.ts +2 -1
- package/internal/core/errors.d.ts.map +1 -1
- package/internal/core/errors.js +5 -1
- package/internal/core/errors.js.map +1 -1
- package/internal/core/execution-mode.d.ts.map +1 -1
- package/internal/core/execution-mode.js +2 -21
- package/internal/core/execution-mode.js.map +1 -1
- package/internal/core/flamegraph.d.ts +4 -0
- package/internal/core/flamegraph.d.ts.map +1 -1
- package/internal/core/flamegraph.js +13 -3
- package/internal/core/flamegraph.js.map +1 -1
- package/internal/core/jsonrpc/types/base-types.d.ts.map +1 -1
- package/internal/core/jsonrpc/types/base-types.js +12 -12
- package/internal/core/jsonrpc/types/base-types.js.map +1 -1
- package/internal/core/params/hardhat-params.d.ts.map +1 -1
- package/internal/core/params/hardhat-params.js +18 -0
- package/internal/core/params/hardhat-params.js.map +1 -1
- package/internal/core/providers/accounts.js +9 -9
- package/internal/core/providers/accounts.js.map +1 -1
- package/internal/core/providers/construction.d.ts.map +1 -1
- package/internal/core/providers/construction.js +5 -6
- package/internal/core/providers/construction.js.map +1 -1
- package/internal/core/providers/gas-providers.d.ts +2 -2
- package/internal/core/providers/util.js +1 -1
- package/internal/core/providers/util.js.map +1 -1
- package/internal/core/runtime-environment.d.ts +6 -0
- package/internal/core/runtime-environment.d.ts.map +1 -1
- package/internal/core/runtime-environment.js +72 -6
- 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 +6 -2
- package/internal/core/typescript-support.js.map +1 -1
- package/internal/hardhat-network/jsonrpc/client.d.ts +1 -1
- package/internal/hardhat-network/jsonrpc/client.d.ts.map +1 -1
- package/internal/hardhat-network/jsonrpc/client.js +10 -10
- package/internal/hardhat-network/jsonrpc/client.js.map +1 -1
- package/internal/hardhat-network/provider/BlockchainBase.d.ts +4 -4
- package/internal/hardhat-network/provider/BlockchainBase.d.ts.map +1 -1
- package/internal/hardhat-network/provider/BlockchainBase.js +31 -12
- package/internal/hardhat-network/provider/BlockchainBase.js.map +1 -1
- package/internal/hardhat-network/provider/BlockchainData.d.ts +3 -3
- package/internal/hardhat-network/provider/BlockchainData.d.ts.map +1 -1
- package/internal/hardhat-network/provider/BlockchainData.js +15 -15
- package/internal/hardhat-network/provider/BlockchainData.js.map +1 -1
- package/internal/hardhat-network/provider/HardhatBlockchain.d.ts +3 -3
- package/internal/hardhat-network/provider/HardhatBlockchain.d.ts.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/PoolState.d.ts +1 -1
- package/internal/hardhat-network/provider/PoolState.d.ts.map +1 -1
- package/internal/hardhat-network/provider/PoolState.js +21 -2
- package/internal/hardhat-network/provider/PoolState.js.map +1 -1
- package/internal/hardhat-network/provider/TransactionQueue.d.ts +1 -1
- package/internal/hardhat-network/provider/TransactionQueue.d.ts.map +1 -1
- package/internal/hardhat-network/provider/TransactionQueue.js +22 -3
- package/internal/hardhat-network/provider/TransactionQueue.js.map +1 -1
- package/internal/hardhat-network/provider/TxPool.d.ts +4 -4
- package/internal/hardhat-network/provider/TxPool.d.ts.map +1 -1
- package/internal/hardhat-network/provider/TxPool.js +35 -16
- package/internal/hardhat-network/provider/TxPool.js.map +1 -1
- package/internal/hardhat-network/provider/ethereumjs-workarounds.js +4 -4
- package/internal/hardhat-network/provider/ethereumjs-workarounds.js.map +1 -1
- package/internal/hardhat-network/provider/filter.d.ts +1 -1
- package/internal/hardhat-network/provider/filter.d.ts.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/ForkBlockchain.d.ts +3 -3
- package/internal/hardhat-network/provider/fork/ForkBlockchain.d.ts.map +1 -1
- package/internal/hardhat-network/provider/fork/ForkBlockchain.js +13 -12
- package/internal/hardhat-network/provider/fork/ForkBlockchain.js.map +1 -1
- package/internal/hardhat-network/provider/fork/ForkStateManager.d.ts +3 -5
- package/internal/hardhat-network/provider/fork/ForkStateManager.d.ts.map +1 -1
- package/internal/hardhat-network/provider/fork/ForkStateManager.js +36 -40
- 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/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.map +1 -1
- package/internal/hardhat-network/provider/modules/eth.d.ts +1 -1
- package/internal/hardhat-network/provider/modules/eth.d.ts.map +1 -1
- package/internal/hardhat-network/provider/modules/eth.js +22 -22
- package/internal/hardhat-network/provider/modules/eth.js.map +1 -1
- package/internal/hardhat-network/provider/modules/hardhat.d.ts +2 -0
- package/internal/hardhat-network/provider/modules/hardhat.d.ts.map +1 -1
- package/internal/hardhat-network/provider/modules/hardhat.js +20 -6
- package/internal/hardhat-network/provider/modules/hardhat.js.map +1 -1
- package/internal/hardhat-network/provider/modules/logger.d.ts +2 -2
- package/internal/hardhat-network/provider/modules/logger.d.ts.map +1 -1
- package/internal/hardhat-network/provider/modules/logger.js +14 -14
- 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.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 +4 -5
- package/internal/hardhat-network/provider/modules/web3.js.map +1 -1
- package/internal/hardhat-network/provider/node-types.d.ts +4 -4
- package/internal/hardhat-network/provider/node-types.d.ts.map +1 -1
- package/internal/hardhat-network/provider/node.d.ts +5 -4
- package/internal/hardhat-network/provider/node.d.ts.map +1 -1
- package/internal/hardhat-network/provider/node.js +71 -49
- package/internal/hardhat-network/provider/node.js.map +1 -1
- package/internal/hardhat-network/provider/output.d.ts +4 -4
- package/internal/hardhat-network/provider/output.d.ts.map +1 -1
- package/internal/hardhat-network/provider/output.js +24 -5
- package/internal/hardhat-network/provider/output.js.map +1 -1
- package/internal/hardhat-network/provider/provider.d.ts +2 -2
- package/internal/hardhat-network/provider/provider.d.ts.map +1 -1
- package/internal/hardhat-network/provider/provider.js +3 -3
- package/internal/hardhat-network/provider/provider.js.map +1 -1
- package/internal/hardhat-network/provider/return-data.d.ts +1 -1
- package/internal/hardhat-network/provider/return-data.d.ts.map +1 -1
- package/internal/hardhat-network/provider/return-data.js +5 -4
- package/internal/hardhat-network/provider/return-data.js.map +1 -1
- package/internal/hardhat-network/provider/transactions/FakeSenderAccessListEIP2930Transaction.d.ts +4 -4
- package/internal/hardhat-network/provider/transactions/FakeSenderAccessListEIP2930Transaction.d.ts.map +1 -1
- package/internal/hardhat-network/provider/transactions/FakeSenderAccessListEIP2930Transaction.js +8 -8
- package/internal/hardhat-network/provider/transactions/FakeSenderAccessListEIP2930Transaction.js.map +1 -1
- package/internal/hardhat-network/provider/transactions/FakeSenderEIP1559Transaction.d.ts +3 -3
- package/internal/hardhat-network/provider/transactions/FakeSenderEIP1559Transaction.d.ts.map +1 -1
- package/internal/hardhat-network/provider/transactions/FakeSenderEIP1559Transaction.js +8 -8
- 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 +5 -5
- 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 +25 -6
- 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 +25 -6
- 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 +2 -2
- package/internal/hardhat-network/provider/transactions/ReadOnlyValidTransaction.js.map +1 -1
- package/internal/hardhat-network/provider/types/HardhatBlockchainInterface.d.ts +2 -2
- package/internal/hardhat-network/provider/types/HardhatBlockchainInterface.d.ts.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 +4 -4
- package/internal/hardhat-network/provider/utils/makeAccount.js.map +1 -1
- package/internal/hardhat-network/provider/utils/makeCommon.d.ts +1 -1
- package/internal/hardhat-network/provider/utils/makeCommon.d.ts.map +1 -1
- package/internal/hardhat-network/provider/utils/makeCommon.js +2 -2
- package/internal/hardhat-network/provider/utils/makeCommon.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 +3 -3
- package/internal/hardhat-network/provider/utils/putGenesisBlock.d.ts.map +1 -1
- package/internal/hardhat-network/provider/utils/putGenesisBlock.js +4 -4
- package/internal/hardhat-network/provider/utils/putGenesisBlock.js.map +1 -1
- package/internal/hardhat-network/provider/utils/random.d.ts +2 -1
- package/internal/hardhat-network/provider/utils/random.d.ts.map +1 -1
- package/internal/hardhat-network/provider/utils/random.js +10 -9
- package/internal/hardhat-network/provider/utils/random.js.map +1 -1
- package/internal/hardhat-network/provider/utils/reorganizeTransactionsLists.js +21 -2
- package/internal/hardhat-network/provider/utils/reorganizeTransactionsLists.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/consoleLogger.js +45 -45
- package/internal/hardhat-network/stack-traces/consoleLogger.js.map +1 -1
- package/internal/hardhat-network/stack-traces/constants.d.ts +1 -1
- package/internal/hardhat-network/stack-traces/constants.d.ts.map +1 -1
- package/internal/hardhat-network/stack-traces/constants.js +1 -1
- package/internal/hardhat-network/stack-traces/constants.js.map +1 -1
- 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 +13 -13
- package/internal/hardhat-network/stack-traces/debug.js.map +1 -1
- package/internal/hardhat-network/stack-traces/error-inferrer.js +2 -2
- package/internal/hardhat-network/stack-traces/error-inferrer.js.map +1 -1
- package/internal/hardhat-network/stack-traces/message-trace.d.ts +1 -1
- package/internal/hardhat-network/stack-traces/message-trace.d.ts.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 -1
- package/internal/hardhat-network/stack-traces/panic-errors.js +9 -9
- package/internal/hardhat-network/stack-traces/panic-errors.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/solidity-stack-trace.d.ts +1 -1
- package/internal/hardhat-network/stack-traces/solidityTracer.d.ts +0 -2
- package/internal/hardhat-network/stack-traces/solidityTracer.d.ts.map +1 -1
- package/internal/hardhat-network/stack-traces/solidityTracer.js +2 -4
- package/internal/hardhat-network/stack-traces/solidityTracer.js.map +1 -1
- package/internal/hardhat-network/stack-traces/vm-debug-tracer.d.ts +1 -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 +27 -25
- package/internal/hardhat-network/stack-traces/vm-debug-tracer.js.map +1 -1
- package/internal/hardhat-network/stack-traces/vm-tracer.d.ts +2 -2
- package/internal/hardhat-network/stack-traces/vm-tracer.d.ts.map +1 -1
- package/internal/hardhat-network/stack-traces/vm-tracer.js +15 -12
- package/internal/hardhat-network/stack-traces/vm-tracer.js.map +1 -1
- package/internal/lib/hardhat-lib.d.ts.map +1 -1
- package/internal/lib/hardhat-lib.js +0 -2
- package/internal/lib/hardhat-lib.js.map +1 -1
- package/internal/solidity/compilation-job.d.ts.map +1 -1
- package/internal/solidity/compilation-job.js +6 -7
- package/internal/solidity/compilation-job.js.map +1 -1
- package/internal/solidity/compiler/downloader.d.ts +66 -40
- package/internal/solidity/compiler/downloader.d.ts.map +1 -1
- package/internal/solidity/compiler/downloader.js +180 -154
- package/internal/solidity/compiler/downloader.js.map +1 -1
- package/internal/solidity/compiler/index.d.ts +8 -4
- package/internal/solidity/compiler/index.d.ts.map +1 -1
- package/internal/solidity/compiler/index.js +1 -1
- package/internal/solidity/compiler/index.js.map +1 -1
- package/internal/solidity/dependencyGraph.d.ts.map +1 -1
- package/internal/solidity/dependencyGraph.js +3 -5
- package/internal/solidity/dependencyGraph.js.map +1 -1
- package/internal/solidity/parse.d.ts.map +1 -1
- package/internal/solidity/parse.js +2 -58
- package/internal/solidity/parse.js.map +1 -1
- package/internal/solidity/resolver.d.ts +1 -0
- package/internal/solidity/resolver.d.ts.map +1 -1
- package/internal/solidity/resolver.js +33 -8
- package/internal/solidity/resolver.js.map +1 -1
- package/internal/util/bigint.d.ts +13 -24
- package/internal/util/bigint.d.ts.map +1 -1
- package/internal/util/bigint.js +22 -29
- package/internal/util/bigint.js.map +1 -1
- package/internal/util/download.d.ts.map +1 -1
- package/internal/util/download.js +1 -1
- package/internal/util/download.js.map +1 -1
- package/internal/util/fs-utils.d.ts +26 -9
- package/internal/util/fs-utils.d.ts.map +1 -1
- package/internal/util/fs-utils.js +111 -68
- package/internal/util/fs-utils.js.map +1 -1
- package/internal/util/glob.d.ts +13 -0
- package/internal/util/glob.d.ts.map +1 -1
- package/internal/util/glob.js +13 -0
- package/internal/util/glob.js.map +1 -1
- package/internal/util/keccak.d.ts +3 -0
- package/internal/util/keccak.d.ts.map +1 -0
- package/internal/util/keccak.js +12 -0
- package/internal/util/keccak.js.map +1 -0
- package/internal/util/scripts-runner.d.ts.map +1 -1
- package/internal/util/scripts-runner.js +7 -4
- package/internal/util/scripts-runner.js.map +1 -1
- package/package.json +15 -15
- package/register.js +1 -3
- package/register.js.map +1 -1
- package/sample-projects/javascript/contracts/Lock.sol +3 -3
- package/sample-projects/typescript/contracts/Lock.sol +3 -3
- package/src/builtin-tasks/clean.ts +9 -6
- package/src/builtin-tasks/compile.ts +96 -128
- package/src/builtin-tasks/flatten.ts +2 -3
- package/src/builtin-tasks/node.ts +2 -2
- package/src/builtin-tasks/test.ts +7 -3
- package/src/builtin-tasks/utils/solidity-files-cache.ts +9 -8
- package/src/internal/artifacts.ts +392 -182
- package/src/internal/cli/cli.ts +43 -17
- package/src/internal/core/config/config-loading.ts +1 -1
- package/src/internal/core/config/config-resolution.ts +12 -24
- package/src/internal/core/config/default-config.ts +1 -1
- package/src/internal/core/errors-list.ts +29 -13
- package/src/internal/core/errors.ts +10 -2
- package/src/internal/core/execution-mode.ts +2 -3
- package/src/internal/core/flamegraph.ts +270 -0
- package/src/internal/core/jsonrpc/types/base-types.ts +7 -3
- package/src/internal/core/params/hardhat-params.ts +18 -0
- package/src/internal/core/providers/accounts.ts +8 -8
- package/src/internal/core/providers/construction.ts +10 -8
- package/src/internal/core/providers/gas-providers.ts +2 -2
- package/src/internal/core/providers/util.ts +1 -1
- package/src/internal/core/runtime-environment.ts +103 -10
- package/src/internal/core/task-profiling.ts +56 -0
- package/src/internal/core/typescript-support.ts +11 -2
- package/src/internal/hardhat-network/jsonrpc/client.ts +1 -1
- package/src/internal/hardhat-network/provider/BlockchainBase.ts +6 -6
- package/src/internal/hardhat-network/provider/BlockchainData.ts +5 -5
- package/src/internal/hardhat-network/provider/HardhatBlockchain.ts +4 -4
- package/src/internal/hardhat-network/provider/PoolState.ts +2 -2
- package/src/internal/hardhat-network/provider/TransactionQueue.ts +2 -2
- package/src/internal/hardhat-network/provider/TxPool.ts +12 -5
- package/src/internal/hardhat-network/provider/ethereumjs-workarounds.ts +3 -3
- package/src/internal/hardhat-network/provider/filter.ts +2 -2
- package/src/internal/hardhat-network/provider/fork/ForkBlockchain.ts +10 -10
- package/src/internal/hardhat-network/provider/fork/ForkStateManager.ts +12 -18
- package/src/internal/hardhat-network/provider/fork/rpcToBlockData.ts +1 -1
- package/src/internal/hardhat-network/provider/fork/rpcToTxData.ts +5 -2
- package/src/internal/hardhat-network/provider/modules/eth.ts +10 -6
- package/src/internal/hardhat-network/provider/modules/hardhat.ts +25 -1
- package/src/internal/hardhat-network/provider/modules/logger.ts +3 -3
- package/src/internal/hardhat-network/provider/modules/net.ts +1 -1
- package/src/internal/hardhat-network/provider/modules/personal.ts +1 -1
- package/src/internal/hardhat-network/provider/modules/web3.ts +4 -6
- package/src/internal/hardhat-network/provider/node-types.ts +6 -6
- package/src/internal/hardhat-network/provider/node.ts +25 -12
- package/src/internal/hardhat-network/provider/output.ts +6 -6
- package/src/internal/hardhat-network/provider/provider.ts +7 -6
- package/src/internal/hardhat-network/provider/return-data.ts +9 -5
- package/src/internal/hardhat-network/provider/transactions/FakeSenderAccessListEIP2930Transaction.ts +9 -5
- package/src/internal/hardhat-network/provider/transactions/FakeSenderEIP1559Transaction.ts +8 -4
- package/src/internal/hardhat-network/provider/transactions/FakeSenderTransaction.ts +4 -4
- package/src/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP1559Transaction.ts +8 -5
- package/src/internal/hardhat-network/provider/transactions/ReadOnlyValidEIP2930Transaction.ts +4 -4
- package/src/internal/hardhat-network/provider/transactions/ReadOnlyValidTransaction.ts +3 -3
- package/src/internal/hardhat-network/provider/types/HardhatBlockchainInterface.ts +2 -2
- package/src/internal/hardhat-network/provider/utils/makeAccount.ts +6 -1
- package/src/internal/hardhat-network/provider/utils/makeCommon.ts +1 -1
- package/src/internal/hardhat-network/provider/utils/makeStateTrie.ts +7 -3
- package/src/internal/hardhat-network/provider/utils/putGenesisBlock.ts +6 -6
- package/src/internal/hardhat-network/provider/utils/random.ts +17 -14
- package/src/internal/hardhat-network/provider/utils/reorganizeTransactionsLists.ts +1 -1
- package/src/internal/hardhat-network/stack-traces/consoleLogger.ts +1 -1
- package/src/internal/hardhat-network/stack-traces/constants.ts +2 -0
- 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 +3 -3
- package/src/internal/hardhat-network/stack-traces/message-trace.ts +1 -1
- package/src/internal/hardhat-network/stack-traces/model.ts +1 -1
- package/src/internal/hardhat-network/stack-traces/panic-errors.ts +11 -11
- package/src/internal/hardhat-network/stack-traces/solidity-errors.ts +1 -1
- package/src/internal/hardhat-network/stack-traces/solidity-stack-trace.ts +1 -1
- package/src/internal/hardhat-network/stack-traces/solidityTracer.ts +1 -4
- package/src/internal/hardhat-network/stack-traces/vm-debug-tracer.ts +31 -17
- package/src/internal/hardhat-network/stack-traces/vm-tracer.ts +29 -14
- package/src/internal/lib/hardhat-lib.ts +0 -3
- package/src/internal/solidity/compilation-job.ts +11 -11
- package/src/internal/solidity/compiler/downloader.ts +271 -243
- package/src/internal/solidity/compiler/index.ts +13 -7
- package/src/internal/solidity/dependencyGraph.ts +12 -8
- package/src/internal/solidity/parse.ts +4 -70
- package/src/internal/solidity/resolver.ts +36 -8
- package/src/internal/util/bigint.ts +25 -43
- package/src/internal/util/download.ts +2 -2
- package/src/internal/util/fs-utils.ts +223 -0
- package/src/internal/util/glob.ts +13 -0
- package/src/internal/util/keccak.ts +5 -0
- package/src/internal/util/scripts-runner.ts +13 -4
- package/src/internal/util/wei-values.ts +1 -1
- package/src/internal/{hardhat-network/vendor → vendor}/await-semaphore/index.ts +0 -0
- package/src/profiling.ts +37 -0
- package/src/register.ts +1 -4
- package/src/types/artifacts.ts +21 -0
- package/src/types/config.ts +7 -7
- package/src/types/runtime.ts +2 -0
- package/src/utils/source-names.ts +36 -26
- package/types/artifacts.d.ts +19 -0
- package/types/artifacts.d.ts.map +1 -1
- package/types/config.d.ts +7 -7
- package/types/runtime.d.ts +2 -0
- package/types/runtime.d.ts.map +1 -1
- package/utils/source-names.d.ts.map +1 -1
- package/utils/source-names.js +25 -36
- package/utils/source-names.js.map +1 -1
- package/internal/hardhat-network/provider/fork/random.d.ts +0 -7
- package/internal/hardhat-network/provider/fork/random.d.ts.map +0 -1
- package/internal/hardhat-network/provider/fork/random.js +0 -32
- package/internal/hardhat-network/provider/fork/random.js.map +0 -1
- package/internal/hardhat-network/provider/utils/bnToHex.d.ts +0 -3
- package/internal/hardhat-network/provider/utils/bnToHex.d.ts.map +0 -1
- package/internal/hardhat-network/provider/utils/bnToHex.js +0 -9
- package/internal/hardhat-network/provider/utils/bnToHex.js.map +0 -1
- package/internal/hardhat-network/provider/utils/makeForkCommon.d.ts +0 -4
- package/internal/hardhat-network/provider/utils/makeForkCommon.d.ts.map +0 -1
- package/internal/hardhat-network/provider/utils/makeForkCommon.js +0 -16
- package/internal/hardhat-network/provider/utils/makeForkCommon.js.map +0 -1
- package/internal/hardhat-network/vendor/await-semaphore/index.d.ts +0 -12
- package/internal/hardhat-network/vendor/await-semaphore/index.d.ts.map +0 -1
- package/internal/hardhat-network/vendor/await-semaphore/index.js +0 -64
- package/internal/hardhat-network/vendor/await-semaphore/index.js.map +0 -1
- package/internal/util/antlr-prototype-pollution-workaround.d.ts +0 -16
- package/internal/util/antlr-prototype-pollution-workaround.d.ts.map +0 -1
- package/internal/util/antlr-prototype-pollution-workaround.js +0 -22
- package/internal/util/antlr-prototype-pollution-workaround.js.map +0 -1
- package/src/internal/util/antlr-prototype-pollution-workaround.ts +0 -17
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"TransactionQueue.d.ts","sourceRoot":"","sources":["../../../src/internal/hardhat-network/provider/TransactionQueue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAKlE,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAmEjD;;;;;;;;;;;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,MAAM;IAkBX,kBAAkB,IAAI,gBAAgB,GAAG,SAAS;IAclD,4BAA4B;IAYnC,OAAO,CAAC,mCAAmC;CAU5C"}
|
|
@@ -1,4 +1,23 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
5
|
+
}) : (function(o, m, k, k2) {
|
|
6
|
+
if (k2 === undefined) k2 = k;
|
|
7
|
+
o[k2] = m[k];
|
|
8
|
+
}));
|
|
9
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
10
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
11
|
+
}) : function(o, v) {
|
|
12
|
+
o["default"] = v;
|
|
13
|
+
});
|
|
14
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
15
|
+
if (mod && mod.__esModule) return mod;
|
|
16
|
+
var result = {};
|
|
17
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
18
|
+
__setModuleDefault(result, mod);
|
|
19
|
+
return result;
|
|
20
|
+
};
|
|
2
21
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
22
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
23
|
};
|
|
@@ -6,7 +25,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
25
|
exports.TransactionQueue = void 0;
|
|
7
26
|
const heap_1 = __importDefault(require("mnemonist/heap"));
|
|
8
27
|
const errors_1 = require("../../core/providers/errors");
|
|
9
|
-
const
|
|
28
|
+
const BigIntUtils = __importStar(require("../../util/bigint"));
|
|
10
29
|
function getEffectiveMinerFee(tx, baseFee) {
|
|
11
30
|
// This mimics the EIP-1559 normalize_transaction function
|
|
12
31
|
const maxFeePerGas = "gasPrice" in tx.data ? tx.data.gasPrice : tx.data.maxFeePerGas;
|
|
@@ -14,12 +33,12 @@ function getEffectiveMinerFee(tx, baseFee) {
|
|
|
14
33
|
if (baseFee === undefined) {
|
|
15
34
|
return maxFeePerGas;
|
|
16
35
|
}
|
|
17
|
-
return
|
|
36
|
+
return BigIntUtils.min(maxPriorityFeePerGas, maxFeePerGas - baseFee);
|
|
18
37
|
}
|
|
19
38
|
function decreasingOrderEffectiveMinerFeeComparator(left, right, baseFee) {
|
|
20
39
|
const leftEffectiveMinerFee = getEffectiveMinerFee(left, baseFee);
|
|
21
40
|
const rightEffectiveMinerFee = getEffectiveMinerFee(right, baseFee);
|
|
22
|
-
const cmp =
|
|
41
|
+
const cmp = BigIntUtils.cmp(rightEffectiveMinerFee, leftEffectiveMinerFee);
|
|
23
42
|
if (cmp !== 0) {
|
|
24
43
|
return cmp;
|
|
25
44
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TransactionQueue.js","sourceRoot":"","sources":["../../../src/internal/hardhat-network/provider/TransactionQueue.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"TransactionQueue.js","sourceRoot":"","sources":["../../../src/internal/hardhat-network/provider/TransactionQueue.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import { Common } from "@
|
|
3
|
-
import { TypedTransaction } from "@
|
|
4
|
-
import { StateManager } from "@
|
|
5
|
-
import { Address } from "@
|
|
2
|
+
import { Common } from "@nomicfoundation/ethereumjs-common";
|
|
3
|
+
import { TypedTransaction } from "@nomicfoundation/ethereumjs-tx";
|
|
4
|
+
import { StateManager } from "@nomicfoundation/ethereumjs-statemanager";
|
|
5
|
+
import { Address } from "@nomicfoundation/ethereumjs-util";
|
|
6
6
|
import { OrderedTransaction, SerializedTransaction } from "./PoolState";
|
|
7
7
|
export declare function serializeTransaction(tx: OrderedTransaction): SerializedTransaction;
|
|
8
8
|
export declare function deserializeTransaction(tx: SerializedTransaction, common: Common): OrderedTransaction;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TxPool.d.ts","sourceRoot":"","sources":["../../../src/internal/hardhat-network/provider/TxPool.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"TxPool.d.ts","sourceRoot":"","sources":["../../../src/internal/hardhat-network/provider/TxPool.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oCAAoC,CAAC;AAC5D,OAAO,EAEL,gBAAgB,EACjB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AACxE,OAAO,EACL,OAAO,EAGR,MAAM,kCAAkC,CAAC;AAM1C,OAAO,EAIL,kBAAkB,EAGlB,qBAAqB,EACtB,MAAM,aAAa,CAAC;AAQrB,wBAAgB,oBAAoB,CAClC,EAAE,EAAE,kBAAkB,GACrB,qBAAqB,CAYvB;AAED,wBAAgB,sBAAsB,CACpC,EAAE,EAAE,qBAAqB,EACzB,MAAM,EAAE,MAAM,GACb,kBAAkB,CAuCpB;AAED,qBAAa,MAAM;IAWf,OAAO,CAAC,QAAQ,CAAC,aAAa;IAVhC,OAAO,CAAC,MAAM,CAA6B;IAC3C,OAAO,CAAC,kBAAkB,CAAiD;IAC3E,OAAO,CAAC,eAAe,CAAK;IAC5B,OAAO,CAAC,YAAY,CAAK;IAEzB,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAEhB;gBAGL,aAAa,EAAE,YAAY,EAC5C,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,MAAM;IAQH,cAAc,CAAC,EAAE,EAAE,gBAAgB;IAgBhD;;;OAGG;IACI,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAiD1C,QAAQ,IAAI,MAAM;IAMlB,MAAM,CAAC,UAAU,EAAE,MAAM;IAUzB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS;IASlE,sBAAsB,IAAI,OAAO;IAKjC,qBAAqB,IAAI,OAAO;IAKhC,OAAO,IAAI,OAAO;IAIlB,sBAAsB,IAAI,GAAG,CAAC,MAAM,EAAE,kBAAkB,EAAE,CAAC;IAW3D,qBAAqB,IAAI,GAAG,CAAC,MAAM,EAAE,kBAAkB,EAAE,CAAC;IAWjE;;;OAGG;IACU,mBAAmB,CAAC,cAAc,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAanE,gBAAgB,IAAI,MAAM;IAI1B,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAQjD;;OAEG;IACU,sBAAsB;IA+DnC,OAAO,CAAC,iBAAiB;IAYzB,OAAO,CAAC,qBAAqB;IAU7B,OAAO,CAAC,SAAS;IAkBjB,OAAO,CAAC,sBAAsB;IA0B9B,OAAO,CAAC,qBAAqB;YAsBf,oBAAoB;IAyDlC,OAAO,CAAC,iBAAiB;IAQzB,OAAO,CAAC,kBAAkB;IAU1B,OAAO,CAAC,sBAAsB;IAI9B,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,oBAAoB;IAI5B,OAAO,CAAC,qBAAqB;IAU7B,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,qBAAqB;IAU7B,OAAO,CAAC,oBAAoB;IAU5B,OAAO,CAAC,iBAAiB;IAIzB,OAAO,CAAC,wBAAwB;IAOhC,OAAO,CAAC,UAAU;IAelB;;;OAGG;YACW,sBAAsB;IAOpC;;;;OAIG;IACH,OAAO,CAAC,iBAAiB;IAezB;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IAexB,OAAO,CAAC,UAAU;IA+DlB,OAAO,CAAC,kBAAkB;CAW3B"}
|
|
@@ -1,11 +1,30 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
5
|
+
}) : (function(o, m, k, k2) {
|
|
6
|
+
if (k2 === undefined) k2 = k;
|
|
7
|
+
o[k2] = m[k];
|
|
8
|
+
}));
|
|
9
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
10
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
11
|
+
}) : function(o, v) {
|
|
12
|
+
o["default"] = v;
|
|
13
|
+
});
|
|
14
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
15
|
+
if (mod && mod.__esModule) return mod;
|
|
16
|
+
var result = {};
|
|
17
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
18
|
+
__setModuleDefault(result, mod);
|
|
19
|
+
return result;
|
|
20
|
+
};
|
|
2
21
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
22
|
exports.TxPool = exports.deserializeTransaction = exports.serializeTransaction = void 0;
|
|
4
|
-
const
|
|
5
|
-
const
|
|
23
|
+
const ethereumjs_tx_1 = require("@nomicfoundation/ethereumjs-tx");
|
|
24
|
+
const ethereumjs_util_1 = require("@nomicfoundation/ethereumjs-util");
|
|
6
25
|
const immutable_1 = require("immutable");
|
|
7
26
|
const errors_1 = require("../../core/providers/errors");
|
|
8
|
-
const
|
|
27
|
+
const BigIntUtils = __importStar(require("../../util/bigint"));
|
|
9
28
|
const PoolState_1 = require("./PoolState");
|
|
10
29
|
const FakeSenderAccessListEIP2930Transaction_1 = require("./transactions/FakeSenderAccessListEIP2930Transaction");
|
|
11
30
|
const FakeSenderTransaction_1 = require("./transactions/FakeSenderTransaction");
|
|
@@ -13,7 +32,7 @@ const reorganizeTransactionsLists_1 = require("./utils/reorganizeTransactionsLis
|
|
|
13
32
|
const FakeSenderEIP1559Transaction_1 = require("./transactions/FakeSenderEIP1559Transaction");
|
|
14
33
|
/* eslint-disable @nomiclabs/hardhat-internal-rules/only-hardhat-error */
|
|
15
34
|
function serializeTransaction(tx) {
|
|
16
|
-
const rlpSerialization = (0,
|
|
35
|
+
const rlpSerialization = (0, ethereumjs_util_1.bufferToHex)(tx.data.serialize());
|
|
17
36
|
const isFake = tx.data instanceof FakeSenderTransaction_1.FakeSenderTransaction ||
|
|
18
37
|
tx.data instanceof FakeSenderAccessListEIP2930Transaction_1.FakeSenderAccessListEIP2930Transaction ||
|
|
19
38
|
tx.data instanceof FakeSenderEIP1559Transaction_1.FakeSenderEIP1559Transaction;
|
|
@@ -30,8 +49,8 @@ function deserializeTransaction(tx, common) {
|
|
|
30
49
|
const fakeFrom = tx.get("fakeFrom");
|
|
31
50
|
let data;
|
|
32
51
|
if (fakeFrom !== undefined) {
|
|
33
|
-
const sender =
|
|
34
|
-
const serialization = (0,
|
|
52
|
+
const sender = ethereumjs_util_1.Address.fromString(fakeFrom);
|
|
53
|
+
const serialization = (0, ethereumjs_util_1.toBuffer)(rlpSerialization);
|
|
35
54
|
if (tx.get("txType") === 1) {
|
|
36
55
|
data =
|
|
37
56
|
FakeSenderAccessListEIP2930Transaction_1.FakeSenderAccessListEIP2930Transaction.fromSenderAndRlpSerializedTx(sender, serialization, { common });
|
|
@@ -44,7 +63,7 @@ function deserializeTransaction(tx, common) {
|
|
|
44
63
|
}
|
|
45
64
|
}
|
|
46
65
|
else {
|
|
47
|
-
data =
|
|
66
|
+
data = ethereumjs_tx_1.TransactionFactory.fromSerializedData((0, ethereumjs_util_1.toBuffer)(rlpSerialization), {
|
|
48
67
|
common,
|
|
49
68
|
});
|
|
50
69
|
}
|
|
@@ -61,7 +80,7 @@ class TxPool {
|
|
|
61
80
|
this._nextSnapshotId = 0;
|
|
62
81
|
this._nextOrderId = 0;
|
|
63
82
|
this._state = (0, PoolState_1.makePoolState)({
|
|
64
|
-
blockGasLimit:
|
|
83
|
+
blockGasLimit: BigIntUtils.toHex(blockGasLimit),
|
|
65
84
|
});
|
|
66
85
|
this._deserializeTransaction = (tx) => deserializeTransaction(tx, common);
|
|
67
86
|
}
|
|
@@ -128,7 +147,7 @@ class TxPool {
|
|
|
128
147
|
this._removeSnapshotsAfter(snapshotId);
|
|
129
148
|
}
|
|
130
149
|
getTransactionByHash(hash) {
|
|
131
|
-
const tx = this._getTransactionsByHash().get((0,
|
|
150
|
+
const tx = this._getTransactionsByHash().get((0, ethereumjs_util_1.bufferToHex)(hash));
|
|
132
151
|
if (tx !== undefined) {
|
|
133
152
|
return this._deserializeTransaction(tx);
|
|
134
153
|
}
|
|
@@ -186,7 +205,7 @@ class TxPool {
|
|
|
186
205
|
let newPending = this._getPending();
|
|
187
206
|
// update pending transactions
|
|
188
207
|
for (const [address, txs] of newPending) {
|
|
189
|
-
const senderAccount = await this._stateManager.getAccount(
|
|
208
|
+
const senderAccount = await this._stateManager.getAccount(ethereumjs_util_1.Address.fromString(address));
|
|
190
209
|
const senderNonce = senderAccount.nonce;
|
|
191
210
|
const senderBalance = senderAccount.balance;
|
|
192
211
|
let moveToQueued = false;
|
|
@@ -213,7 +232,7 @@ class TxPool {
|
|
|
213
232
|
// update queued addresses
|
|
214
233
|
let newQueued = this._getQueued();
|
|
215
234
|
for (const [address, txs] of newQueued) {
|
|
216
|
-
const senderAccount = await this._stateManager.getAccount(
|
|
235
|
+
const senderAccount = await this._stateManager.getAccount(ethereumjs_util_1.Address.fromString(address));
|
|
217
236
|
const senderNonce = senderAccount.nonce;
|
|
218
237
|
const senderBalance = senderAccount.balance;
|
|
219
238
|
for (const tx of txs) {
|
|
@@ -266,7 +285,7 @@ class TxPool {
|
|
|
266
285
|
this._setPendingForAddress(hexSenderAddress, newPending);
|
|
267
286
|
this._setQueuedForAddress(hexSenderAddress, newQueued);
|
|
268
287
|
}
|
|
269
|
-
this._setTransactionByHash((0,
|
|
288
|
+
this._setTransactionByHash((0, ethereumjs_util_1.bufferToHex)(tx.hash()), serializedTx);
|
|
270
289
|
}
|
|
271
290
|
_addQueuedTransaction(tx) {
|
|
272
291
|
const orderedTx = {
|
|
@@ -280,11 +299,11 @@ class TxPool {
|
|
|
280
299
|
if (!replaced) {
|
|
281
300
|
this._setQueuedForAddress(hexSenderAddress, accountTransactions.push(serializedTx));
|
|
282
301
|
}
|
|
283
|
-
this._setTransactionByHash((0,
|
|
302
|
+
this._setTransactionByHash((0, ethereumjs_util_1.bufferToHex)(tx.hash()), serializedTx);
|
|
284
303
|
}
|
|
285
304
|
async _validateTransaction(tx, senderAddress, senderNonce) {
|
|
286
305
|
if (this._knownTransaction(tx)) {
|
|
287
|
-
throw new errors_1.InvalidInputError(`Known transaction: ${(0,
|
|
306
|
+
throw new errors_1.InvalidInputError(`Known transaction: ${(0, ethereumjs_util_1.bufferToHex)(tx.hash())}`);
|
|
288
307
|
}
|
|
289
308
|
const txNonce = tx.nonce;
|
|
290
309
|
// Geth returns this error if trying to create a contract and no data is provided
|
|
@@ -352,10 +371,10 @@ class TxPool {
|
|
|
352
371
|
this._state = this._state.set("queuedTransactions", this._getQueued().set(address, transactions));
|
|
353
372
|
}
|
|
354
373
|
_setBlockGasLimit(newLimit) {
|
|
355
|
-
this._state = this._state.set("blockGasLimit",
|
|
374
|
+
this._state = this._state.set("blockGasLimit", BigIntUtils.toHex(newLimit));
|
|
356
375
|
}
|
|
357
376
|
_deleteTransactionByHash(hash) {
|
|
358
|
-
this._state = this._state.set("hashToTransaction", this._getTransactionsByHash().delete((0,
|
|
377
|
+
this._state = this._state.set("hashToTransaction", this._getTransactionsByHash().delete((0, ethereumjs_util_1.bufferToHex)(hash)));
|
|
359
378
|
}
|
|
360
379
|
_isTxValid(tx, txNonce, senderNonce, senderBalance) {
|
|
361
380
|
const txGasLimit = tx.data.gasLimit;
|
|
@@ -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,12 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const
|
|
4
|
-
const baseTransaction_1 = require("@
|
|
3
|
+
const ethereumjs_tx_1 = require("@nomicfoundation/ethereumjs-tx");
|
|
4
|
+
const baseTransaction_1 = require("@nomicfoundation/ethereumjs-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.
|
|
8
|
-
const previousFromTxData =
|
|
9
|
-
|
|
8
|
+
const previousFromTxData = ethereumjs_tx_1.TransactionFactory.fromTxData;
|
|
9
|
+
ethereumjs_tx_1.TransactionFactory.fromTxData = function (txData, txOptions) {
|
|
10
10
|
if (txData instanceof baseTransaction_1.BaseTransaction) {
|
|
11
11
|
return txData;
|
|
12
12
|
}
|
|
@@ -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,kEAAoE;AACpE,yFAAsF;AAOtF,oEAAoE;AACpE,oEAAoE;AACpE,qDAAqD;AACrD,MAAM,kBAAkB,GAAG,kCAAkB,CAAC,UAAU,CAAC;AACxD,kCAA0B,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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter.d.ts","sourceRoot":"","sources":["../../../src/internal/hardhat-network/provider/filter.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,KAAK,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"filter.d.ts","sourceRoot":"","sources":["../../../src/internal/hardhat-network/provider/filter.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;AAEvD,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,7 +1,7 @@
|
|
|
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
|
|
4
|
+
const ethereumjs_util_1 = require("@nomicfoundation/ethereumjs-util");
|
|
5
5
|
exports.LATEST_BLOCK = -1n;
|
|
6
6
|
var Type;
|
|
7
7
|
(function (Type) {
|
|
@@ -51,7 +51,7 @@ function filterLogs(logs, criteria) {
|
|
|
51
51
|
continue;
|
|
52
52
|
}
|
|
53
53
|
if (criteria.addresses.length !== 0 &&
|
|
54
|
-
!includes(criteria.addresses, (0,
|
|
54
|
+
!includes(criteria.addresses, (0, ethereumjs_util_1.toBuffer)(log.address))) {
|
|
55
55
|
continue;
|
|
56
56
|
}
|
|
57
57
|
if (!topicMatched(criteria.normalizedTopics, log.topics)) {
|
|
@@ -82,7 +82,7 @@ function topicMatched(normalizedTopics, logTopics) {
|
|
|
82
82
|
}
|
|
83
83
|
let match = false;
|
|
84
84
|
for (const topic of sub) {
|
|
85
|
-
if (topic === null || logTopics[i] === (0,
|
|
85
|
+
if (topic === null || logTopics[i] === (0, ethereumjs_util_1.bufferToHex)(topic)) {
|
|
86
86
|
match = true;
|
|
87
87
|
break;
|
|
88
88
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter.js","sourceRoot":"","sources":["../../../src/internal/hardhat-network/provider/filter.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"filter.js","sourceRoot":"","sources":["../../../src/internal/hardhat-network/provider/filter.ts"],"names":[],"mappings":";;;AAAA,sEAAyE;AAK5D,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,0BAAQ,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,6BAAW,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,7 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import { Block } from "@
|
|
3
|
-
import { Common } from "@
|
|
4
|
-
import { TypedTransaction } from "@
|
|
2
|
+
import { Block } from "@nomicfoundation/ethereumjs-block";
|
|
3
|
+
import { Common } from "@nomicfoundation/ethereumjs-common";
|
|
4
|
+
import { TypedTransaction } from "@nomicfoundation/ethereumjs-tx";
|
|
5
5
|
import { JsonRpcClient } from "../../jsonrpc/client";
|
|
6
6
|
import { BlockchainBase } from "../BlockchainBase";
|
|
7
7
|
import { FilterParams } from "../node-types";
|
|
@@ -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,mCAAmC,CAAC;AAC1D,OAAO,EAAE,MAAM,EAAE,MAAM,oCAAoC,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAQlE,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"}
|
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ForkBlockchain = void 0;
|
|
4
|
-
const
|
|
5
|
-
const
|
|
6
|
-
const util_1 = require("@ignored/util");
|
|
4
|
+
const ethereumjs_block_1 = require("@nomicfoundation/ethereumjs-block");
|
|
5
|
+
const ethereumjs_util_1 = require("@nomicfoundation/ethereumjs-util");
|
|
7
6
|
const errors_1 = require("../../../core/providers/errors");
|
|
8
7
|
const BlockchainBase_1 = require("../BlockchainBase");
|
|
9
8
|
const output_1 = require("../output");
|
|
@@ -170,12 +169,14 @@ class ForkBlockchain extends BlockchainBase_1.BlockchainBase {
|
|
|
170
169
|
rpcBlock.number > this._forkBlockNumber) {
|
|
171
170
|
return undefined;
|
|
172
171
|
}
|
|
173
|
-
const
|
|
174
|
-
const common = new common_1.Common({ chain: forkNetworkId });
|
|
172
|
+
const common = this._common.copy();
|
|
175
173
|
// We set the common's hardfork to Berlin if the remote block doesn't have
|
|
176
174
|
// EIP-1559 activated. The reason for this is that ethereumjs throws if we
|
|
177
175
|
// have a base fee for an older hardfork, and set a default one for London.
|
|
178
|
-
if (rpcBlock.baseFeePerGas
|
|
176
|
+
if (rpcBlock.baseFeePerGas !== undefined) {
|
|
177
|
+
common.setHardfork("london"); // TODO: consider changing this to "latest hardfork"
|
|
178
|
+
}
|
|
179
|
+
else {
|
|
179
180
|
common.setHardfork("berlin");
|
|
180
181
|
}
|
|
181
182
|
// we don't include the transactions to add our own custom tx objects,
|
|
@@ -184,23 +185,23 @@ class ForkBlockchain extends BlockchainBase_1.BlockchainBase {
|
|
|
184
185
|
...rpcBlock,
|
|
185
186
|
transactions: [],
|
|
186
187
|
});
|
|
187
|
-
const block =
|
|
188
|
+
const block = ethereumjs_block_1.Block.fromBlockData(blockData, {
|
|
188
189
|
common,
|
|
189
190
|
// We use freeze false here because we add the transactions manually
|
|
190
191
|
freeze: false,
|
|
191
192
|
// don't validate things like the size of `extraData` in the header
|
|
192
|
-
|
|
193
|
+
skipConsensusFormatValidation: true,
|
|
193
194
|
});
|
|
194
195
|
for (const transaction of rpcBlock.transactions) {
|
|
195
196
|
let tx;
|
|
196
197
|
if (transaction.type === undefined || transaction.type === 0n) {
|
|
197
|
-
tx = new ReadOnlyValidTransaction_1.ReadOnlyValidTransaction(new
|
|
198
|
+
tx = new ReadOnlyValidTransaction_1.ReadOnlyValidTransaction(new ethereumjs_util_1.Address(transaction.from), (0, rpcToTxData_1.rpcToTxData)(transaction));
|
|
198
199
|
}
|
|
199
200
|
else if (transaction.type === 1n) {
|
|
200
|
-
tx = new ReadOnlyValidEIP2930Transaction_1.ReadOnlyValidEIP2930Transaction(new
|
|
201
|
+
tx = new ReadOnlyValidEIP2930Transaction_1.ReadOnlyValidEIP2930Transaction(new ethereumjs_util_1.Address(transaction.from), (0, rpcToTxData_1.rpcToTxData)(transaction));
|
|
201
202
|
}
|
|
202
203
|
else if (transaction.type === 2n) {
|
|
203
|
-
tx = new ReadOnlyValidEIP1559Transaction_1.ReadOnlyValidEIP1559Transaction(new
|
|
204
|
+
tx = new ReadOnlyValidEIP1559Transaction_1.ReadOnlyValidEIP1559Transaction(new ethereumjs_util_1.Address(transaction.from), (0, rpcToTxData_1.rpcToTxData)(transaction));
|
|
204
205
|
}
|
|
205
206
|
else {
|
|
206
207
|
throw new errors_1.InternalError(`Unknown transaction type ${transaction.type.toString()}`);
|
|
@@ -223,7 +224,7 @@ class ForkBlockchain extends BlockchainBase_1.BlockchainBase {
|
|
|
223
224
|
rpcTransaction.blockNumber > this._forkBlockNumber) {
|
|
224
225
|
return undefined;
|
|
225
226
|
}
|
|
226
|
-
const transaction = new ReadOnlyValidTransaction_1.ReadOnlyValidTransaction(new
|
|
227
|
+
const transaction = new ReadOnlyValidTransaction_1.ReadOnlyValidTransaction(new ethereumjs_util_1.Address(rpcTransaction.from), (0, rpcToTxData_1.rpcToTxData)(rpcTransaction));
|
|
227
228
|
this._data.addTransaction(transaction);
|
|
228
229
|
return transaction;
|
|
229
230
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ForkBlockchain.js","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/fork/ForkBlockchain.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"ForkBlockchain.js","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/fork/ForkBlockchain.ts"],"names":[],"mappings":";;;AAAA,wEAA0D;AAG1D,sEAA2D;AAM3D,2DAA+D;AAE/D,sDAAmD;AAEnD,sCAOmB;AACnB,qGAAkG;AAClG,uFAAoF;AAGpF,qGAAkG;AAClG,qDAAkD;AAClD,+CAA4C;AAE5C,yEAAyE;AAEzE,MAAa,cACX,SAAQ,+BAAc;IAKtB,YACU,cAA6B,EAC7B,gBAAwB,EAChC,MAAc;QAEd,KAAK,CAAC,MAAM,CAAC,CAAC;QAJN,mBAAc,GAAd,cAAc,CAAe;QAC7B,qBAAgB,GAAhB,gBAAgB,CAAQ;QAJ1B,uBAAkB,GAAG,IAAI,CAAC,gBAAgB,CAAC;IAQnD,CAAC;IAEM,oBAAoB;QACzB,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACjC,CAAC;IAEM,KAAK,CAAC,QAAQ,CACnB,iBAAkC;QAElC,IACE,OAAO,iBAAiB,KAAK,QAAQ;YACrC,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,iBAAiB,CAAC,EAC7C;YACA,IAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,iBAAiB,CAAC,CAAC;SACvD;QAED,IAAI,KAA+B,CAAC;QACpC,IAAI,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE;YACtC,KAAK,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,CAAC;YACtD,OAAO,KAAK,IAAI,IAAI,CAAC;SACtB;QAED,KAAK,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC;QAChE,OAAO,KAAK,IAAI,IAAI,CAAC;IACvB,CAAC;IAEM,KAAK,CAAC,QAAQ,CAAC,KAAY;QAChC,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAChD,IAAI,WAAW,KAAK,IAAI,CAAC,kBAAkB,GAAG,EAAE,EAAE;YAChD,MAAM,IAAI,KAAK,CACb,wBAAwB,WAAW,cACjC,IAAI,CAAC,kBAAkB,GAAG,EAC5B,EAAE,CACH,CAAC;SACH;QAED,iEAAiE;QACjE,yCAAyC;QACzC,gEAAgE;QAChE,IAAI,WAAW,GAAG,IAAI,CAAC,gBAAgB,GAAG,EAAE,EAAE;YAC5C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;YAC3C,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,EAAE;gBAClD,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;aACxC;SACF;QAED,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC1B,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC;QAClE,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;QAC5C,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,aAAa,CAClB,KAAa,EACb,QAAgB,EAChB,sBAA8B,EAC9B,4BAAoC,EACpC,0BAA8C;QAE9C,KAAK,CAAC,aAAa,CACjB,KAAK,EACL,QAAQ,EACR,sBAAsB,EACtB,4BAA4B,EAC5B,0BAA0B,CAC3B,CAAC;QACF,IAAI,CAAC,kBAAkB,IAAI,KAAK,CAAC;IACnC,CAAC;IAEM,iBAAiB,CAAC,KAAY;QACnC,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC;QACxC,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAC5D,IAAI,UAAU,KAAK,SAAS,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,EAAE;YACvE,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;SAClC;QAED,MAAM,eAAe,GAAG,WAAW,GAAG,EAAE,CAAC;QACzC,IAAI,IAAI,CAAC,gBAAgB,IAAI,eAAe,EAAE;YAC5C,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;SAC/C;QAED,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;IAClC,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAAC,SAAiB;QAC/C,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QAClD,IAAI,EAAE,KAAK,SAAS,EAAE;YACpB,OAAO,EAAE,CAAC;SACX;QACD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC7C,IAAI,KAAK,KAAK,IAAI,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;SACpC;QACD,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QAC9C,IAAI,EAAE,KAAK,SAAS,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;SAC7C;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IAEM,KAAK,CAAC,cAAc,CACzB,eAAuB;QAEvB,MAAM,EAAE,GAAG,IAAI,CAAC,mBAAmB,CAAC,eAAe,CAAC,CAAC;QACrD,IAAI,EAAE,KAAK,SAAS,EAAE;YACpB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,oBAAoB,CAC3D,eAAe,CAChB,CAAC;YACF,OAAO,IAAI,CAAC,yBAAyB,CAAC,MAAM,CAAC,CAAC;SAC/C;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IAEM,KAAK,CAAC,yBAAyB,CACpC,eAAuB;QAEvB,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,yBAAyB,CAAC,eAAe,CAAC,CAAC;QAClE,IAAI,KAAK,KAAK,SAAS,EAAE;YACvB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,oBAAoB,CAC3D,eAAe,CAChB,CAAC;YACF,IAAI,CAAC,yBAAyB,CAAC,MAAM,CAAC,CAAC;YACvC,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,CAAC,SAAS,KAAK,IAAI,EAAE;gBAChD,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;gBACtC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,yBAAyB,CAAC,eAAe,CAAC,CAAC;aAC/D;SACF;QACD,OAAO,KAAK,IAAI,IAAI,CAAC;IACvB,CAAC;IAEM,KAAK,CAAC,qBAAqB,CAChC,eAAuB;QAEvB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,eAAe,CAAC,CAAC;QAChE,IAAI,KAAK,KAAK,SAAS,EAAE;YACvB,OAAO,KAAK,CAAC;SACd;QACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,qBAAqB,CAC5D,eAAe,CAChB,CAAC;QACF,IAAI,MAAM,KAAK,IAAI,EAAE;YACnB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;YACzD,OAAO,OAAO,IAAI,IAAI,CAAC;SACxB;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,kBAAkB;QACvB,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,YAA0B;QAC7C,IAAI,YAAY,CAAC,SAAS,IAAI,IAAI,CAAC,gBAAgB,EAAE;YACnD,IAAI,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC;YACnC,IAAI,SAAS,GAAmB,EAAE,CAAC;YACnC,IAAI,OAAO,GAAG,IAAI,CAAC,gBAAgB,EAAE;gBACnC,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC;gBAChC,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC;oBAC7B,GAAG,YAAY;oBACf,SAAS,EAAE,IAAI,CAAC,gBAAgB,GAAG,EAAE;iBACtC,CAAC,CAAC;aACJ;YACD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;gBACnD,SAAS,EAAE,YAAY,CAAC,SAAS;gBACjC,OAAO;gBACP,OAAO,EACL,YAAY,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC;oBACjC,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC;oBAC3B,CAAC,CAAC,YAAY,CAAC,SAAS;gBAC5B,MAAM,EAAE,YAAY,CAAC,gBAAgB;aACtC,CAAC,CAAC;YACH,OAAO,UAAU,CAAC,GAAG,CAAC,uBAAc,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;SACzD;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAC1C,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,SAAiB;QAC7C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QACnD,IAAI,KAAK,KAAK,SAAS,EAAE;YACvB,OAAO,KAAK,CAAC;SACd;QACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAC3E,OAAO,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IAC5C,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAAC,WAAmB;QACjD,IAAI,WAAW,GAAG,IAAI,CAAC,kBAAkB,EAAE;YACzC,OAAO,SAAS,CAAC;SAClB;QACD,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAChD,IAAI,KAAK,KAAK,IAAI,EAAE;YAClB,OAAO,KAAK,CAAC;SACd;QACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,gBAAgB,CACzD,WAAW,EACX,IAAI,CACL,CAAC;QACF,OAAO,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IAC5C,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAAC,QAAyC;QACzE,IACE,QAAQ,KAAK,IAAI;YACjB,QAAQ,CAAC,IAAI,KAAK,IAAI;YACtB,QAAQ,CAAC,MAAM,KAAK,IAAI;YACxB,QAAQ,CAAC,MAAM,GAAG,IAAI,CAAC,gBAAgB,EACvC;YACA,OAAO,SAAS,CAAC;SAClB;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QACnC,0EAA0E;QAC1E,0EAA0E;QAC1E,2EAA2E;QAC3E,IAAI,QAAQ,CAAC,aAAa,KAAK,SAAS,EAAE;YACxC,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,oDAAoD;SACnF;aAAM;YACL,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;SAC9B;QAED,sEAAsE;QACtE,qDAAqD;QACrD,MAAM,SAAS,GAAG,IAAA,+BAAc,EAAC;YAC/B,GAAG,QAAQ;YACX,YAAY,EAAE,EAAE;SACjB,CAAC,CAAC;QAEH,MAAM,KAAK,GAAG,wBAAK,CAAC,aAAa,CAAC,SAAS,EAAE;YAC3C,MAAM;YAEN,oEAAoE;YACpE,MAAM,EAAE,KAAK;YAEb,mEAAmE;YACnE,6BAA6B,EAAE,IAAI;SACpC,CAAC,CAAC;QAEH,KAAK,MAAM,WAAW,IAAI,QAAQ,CAAC,YAAY,EAAE;YAC/C,IAAI,EAAE,CAAC;YACP,IAAI,WAAW,CAAC,IAAI,KAAK,SAAS,IAAI,WAAW,CAAC,IAAI,KAAK,EAAE,EAAE;gBAC7D,EAAE,GAAG,IAAI,mDAAwB,CAC/B,IAAI,yBAAO,CAAC,WAAW,CAAC,IAAI,CAAC,EAC7B,IAAA,yBAAW,EAAC,WAAW,CAAC,CACzB,CAAC;aACH;iBAAM,IAAI,WAAW,CAAC,IAAI,KAAK,EAAE,EAAE;gBAClC,EAAE,GAAG,IAAI,iEAA+B,CACtC,IAAI,yBAAO,CAAC,WAAW,CAAC,IAAI,CAAC,EAC7B,IAAA,yBAAW,EAAC,WAAW,CAAC,CACzB,CAAC;aACH;iBAAM,IAAI,WAAW,CAAC,IAAI,KAAK,EAAE,EAAE;gBAClC,EAAE,GAAG,IAAI,iEAA+B,CACtC,IAAI,yBAAO,CAAC,WAAW,CAAC,IAAI,CAAC,EAC7B,IAAA,yBAAW,EAAC,WAAW,CAA2B,CACnD,CAAC;aACH;iBAAM;gBACL,MAAM,IAAI,sBAAa,CACrB,4BAA4B,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAC1D,CAAC;aACH;YAED,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SAC7B;QAED,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAC;QACrD,OAAO,KAAK,CAAC;IACf,CAAC;IAES,SAAS,CAAC,WAAmB;QACrC,IAAI,WAAW,IAAI,IAAI,CAAC,gBAAgB,EAAE;YACxC,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;SAC/C;QACD,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QAC7B,IAAI,CAAC,kBAAkB,GAAG,WAAW,GAAG,EAAE,CAAC;IAC7C,CAAC;IAEO,yBAAyB,CAAC,cAAqC;QACrE,IACE,cAAc,KAAK,IAAI;YACvB,cAAc,CAAC,WAAW,KAAK,IAAI;YACnC,cAAc,CAAC,WAAW,GAAG,IAAI,CAAC,gBAAgB,EAClD;YACA,OAAO,SAAS,CAAC;SAClB;QAED,MAAM,WAAW,GAAG,IAAI,mDAAwB,CAC9C,IAAI,yBAAO,CAAC,cAAc,CAAC,IAAI,CAAC,EAChC,IAAA,yBAAW,EAAC,cAAc,CAAC,CAC5B,CAAC;QAEF,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;QAEvC,OAAO,WAAW,CAAC;IACrB,CAAC;IAEO,KAAK,CAAC,qBAAqB,CACjC,SAAuC;QAEvC,IAAI,SAAS,KAAK,IAAI,IAAI,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC,gBAAgB,EAAE;YACvE,OAAO,SAAS,CAAC;SAClB;QAED,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;QAEhE,MAAM,OAAO,GAAG,IAAA,wCAA+B,EAC7C,SAAS,EACT,EAAG,EACH,IAAA,6CAAoC,EAAC,IAAI,CAAC,OAAO,CAAC,EAClD,IAAA,+CAAsC,EAAC,IAAI,CAAC,OAAO,CAAC,CACrD,CAAC;QAEF,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;QAC1C,OAAO,OAAO,CAAC;IACjB,CAAC;CACF;AAtUD,wCAsUC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import { StateManager } from "@
|
|
3
|
-
import { Account, Address } from "@
|
|
2
|
+
import { StateManager } from "@nomicfoundation/ethereumjs-statemanager";
|
|
3
|
+
import { Account, Address } from "@nomicfoundation/ethereumjs-util";
|
|
4
4
|
import { JsonRpcClient } from "../../jsonrpc/client";
|
|
5
5
|
import { GenesisAccount } from "../node-types";
|
|
6
6
|
export declare class ForkStateManager implements StateManager {
|
|
@@ -14,8 +14,6 @@ export declare class ForkStateManager implements StateManager {
|
|
|
14
14
|
private _stateCheckpoints;
|
|
15
15
|
private _contextBlockNumber;
|
|
16
16
|
private _contextChanged;
|
|
17
|
-
private _accessedStorage;
|
|
18
|
-
private _accessedStorageReverted;
|
|
19
17
|
constructor(_jsonRpcClient: JsonRpcClient, _forkBlockNumber: bigint);
|
|
20
18
|
initializeGenesisAccounts(genesisAccounts: GenesisAccount[]): Promise<void>;
|
|
21
19
|
copy(): ForkStateManager;
|
|
@@ -48,6 +46,6 @@ export declare class ForkStateManager implements StateManager {
|
|
|
48
46
|
private _setStateRoot;
|
|
49
47
|
hasStateRoot(root: Buffer): Promise<boolean>;
|
|
50
48
|
flush(): Promise<void>;
|
|
51
|
-
modifyAccountFields(
|
|
49
|
+
modifyAccountFields(address: Address, accountFields: any): Promise<void>;
|
|
52
50
|
}
|
|
53
51
|
//# sourceMappingURL=ForkStateManager.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ForkStateManager.d.ts","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/fork/ForkStateManager.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"ForkStateManager.d.ts","sourceRoot":"","sources":["../../../../src/internal/hardhat-network/provider/fork/ForkStateManager.ts"],"names":[],"mappings":"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"}
|