Skip to content
This repository has been archived by the owner on Dec 4, 2023. It is now read-only.

Commit

Permalink
rebase upstream hardhat to 2.16.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@xmzheng
xmzheng committed Jun 30, 2023
1 parent 46b5cf6 commit d3e9fa7
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 144 deletions.
2 changes: 1 addition & 1 deletion packages/hardhat-core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
"@nomicfoundation/ethereumjs-tx": "5.0.1",
"@nomicfoundation/ethereumjs-util": "9.0.1",
"@nomicfoundation/solidity-analyzer": "^0.1.0",
"@oasislabs/ethereumjs-vm": "^6.0.0",
"@oasislabs/ethereumjs-vm": "^7.0.1",
"@oasisprotocol/sapphire-paratime": "^1.0.13",
"@sentry/node": "^5.18.1",
"@types/bn.js": "^5.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/hardhat-core/src/internal/hardhat-network/provider/fork/rpcToTxData.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export function rpcToTxData(
chainId: rpcTransaction.chainId ?? undefined,
maxFeePerGas: rpcTransaction.maxFeePerGas,
maxPriorityFeePerGas: rpcTransaction.maxPriorityFeePerGas,
accessList: rpcTransaction.accessList?.map((item) => [
accessList: []rpcTransaction.accessList?.map((item) => [
item.address,
item.storageKeys ?? [],
]),
Expand Down
171 changes: 29 additions & 142 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1159,18 +1159,6 @@
"@nodelib/fs.scandir" "2.1.5"
"fastq" "^1.6.0"

"@nomicfoundation/[email protected]":
"integrity" "sha512-atjpt4gc6ZGZUPHBAQaUJsm1l/VCo7FmyQ780tMGO8QStjLdhz09dXynmhwVTy5YbRr0FOh/uX3QaEM0yIB2Zg=="
"resolved" "https://registry.npmjs.org/@nomicfoundation/ethereumjs-block/-/ethereumjs-block-4.2.2.tgz"
"version" "4.2.2"
dependencies:
"@nomicfoundation/ethereumjs-common" "3.1.2"
"@nomicfoundation/ethereumjs-rlp" "4.0.3"
"@nomicfoundation/ethereumjs-trie" "5.0.5"
"@nomicfoundation/ethereumjs-tx" "4.1.2"
"@nomicfoundation/ethereumjs-util" "8.0.6"
"ethereum-cryptography" "0.1.3"

"@nomicfoundation/[email protected]":
"integrity" "sha512-u1Yioemi6Ckj3xspygu/SfFvm8vZEO8/Yx5a1QLzi6nVU0jz3Pg2OmHKJ5w+D9Ogk1vhwRiqEBAqcb0GVhCyHw=="
"resolved" "https://registry.npmjs.org/@nomicfoundation/ethereumjs-block/-/ethereumjs-block-5.0.1.tgz"
Expand All @@ -1184,24 +1172,6 @@
"ethereum-cryptography" "0.1.3"
"ethers" "^5.7.1"

"@nomicfoundation/[email protected]":
"integrity" "sha512-6AIB2MoTEPZJLl6IRKcbd8mUmaBAQ/NMe3O7OsAOIiDjMNPPH5KaUQiLfbVlegT4wKIg/GOsFH7XlH2KDVoJNg=="
"resolved" "https://registry.npmjs.org/@nomicfoundation/ethereumjs-blockchain/-/ethereumjs-blockchain-6.2.2.tgz"
"version" "6.2.2"
dependencies:
"@nomicfoundation/ethereumjs-block" "4.2.2"
"@nomicfoundation/ethereumjs-common" "3.1.2"
"@nomicfoundation/ethereumjs-ethash" "2.0.5"
"@nomicfoundation/ethereumjs-rlp" "4.0.3"
"@nomicfoundation/ethereumjs-trie" "5.0.5"
"@nomicfoundation/ethereumjs-util" "8.0.6"
"abstract-level" "^1.0.3"
"debug" "^4.3.3"
"ethereum-cryptography" "0.1.3"
"level" "^8.0.0"
"lru-cache" "^5.1.1"
"memory-level" "^1.0.0"

"@nomicfoundation/[email protected]":
"integrity" "sha512-NhzndlGg829XXbqJEYrF1VeZhAwSPgsK/OB7TVrdzft3y918hW5KNd7gIZ85sn6peDZOdjBsAXIpXZ38oBYE5A=="
"resolved" "https://registry.npmjs.org/@nomicfoundation/ethereumjs-blockchain/-/ethereumjs-blockchain-7.0.1.tgz"
Expand All @@ -1221,14 +1191,6 @@
"lru-cache" "^5.1.1"
"memory-level" "^1.0.0"

"@nomicfoundation/[email protected]":
"integrity" "sha512-JAEBpIua62dyObHM9KI2b4wHZcRQYYge9gxiygTWa3lNCr2zo+K0TbypDpgiNij5MCGNWP1eboNfNfx1a3vkvA=="
"resolved" "https://registry.npmjs.org/@nomicfoundation/ethereumjs-common/-/ethereumjs-common-3.1.2.tgz"
"version" "3.1.2"
dependencies:
"@nomicfoundation/ethereumjs-util" "8.0.6"
"crc-32" "^1.2.0"

"@nomicfoundation/[email protected]":
"integrity" "sha512-OBErlkfp54GpeiE06brBW/TTbtbuBJV5YI5Nz/aB2evTDo+KawyEzPjBlSr84z/8MFfj8wS2wxzQX1o32cev5g=="
"resolved" "https://registry.npmjs.org/@nomicfoundation/ethereumjs-common/-/ethereumjs-common-4.0.1.tgz"
Expand All @@ -1237,18 +1199,6 @@
"@nomicfoundation/ethereumjs-util" "9.0.1"
"crc-32" "^1.2.0"

"@nomicfoundation/[email protected]":
"integrity" "sha512-xlLdcICGgAYyYmnI3r1t0R5fKGBJNDQSOQxXNjVO99JmxJIdXR5MgPo5CSJO1RpyzKOgzi3uIFn8agv564dZEQ=="
"resolved" "https://registry.npmjs.org/@nomicfoundation/ethereumjs-ethash/-/ethereumjs-ethash-2.0.5.tgz"
"version" "2.0.5"
dependencies:
"@nomicfoundation/ethereumjs-block" "4.2.2"
"@nomicfoundation/ethereumjs-rlp" "4.0.3"
"@nomicfoundation/ethereumjs-util" "8.0.6"
"abstract-level" "^1.0.3"
"bigint-crypto-utils" "^3.0.23"
"ethereum-cryptography" "0.1.3"

"@nomicfoundation/[email protected]":
"integrity" "sha512-KDjGIB5igzWOp8Ik5I6QiRH5DH+XgILlplsHR7TEuWANZA759G6krQ6o8bvj+tRUz08YygMQu/sGd9mJ1DYT8w=="
"resolved" "https://registry.npmjs.org/@nomicfoundation/ethereumjs-ethash/-/ethereumjs-ethash-3.0.1.tgz"
Expand All @@ -1261,20 +1211,6 @@
"bigint-crypto-utils" "^3.0.23"
"ethereum-cryptography" "0.1.3"

"@nomicfoundation/[email protected]":
"integrity" "sha512-I00d4MwXuobyoqdPe/12dxUQxTYzX8OckSaWsMcWAfQhgVDvBx6ffPyP/w1aL0NW7MjyerySPcSVfDJAMHjilw=="
"resolved" "https://registry.npmjs.org/@nomicfoundation/ethereumjs-evm/-/ethereumjs-evm-1.3.2.tgz"
"version" "1.3.2"
dependencies:
"@nomicfoundation/ethereumjs-common" "3.1.2"
"@nomicfoundation/ethereumjs-util" "8.0.6"
"@types/async-eventemitter" "^0.2.1"
"async-eventemitter" "^0.2.4"
"debug" "^4.3.3"
"ethereum-cryptography" "0.1.3"
"mcl-wasm" "^0.7.1"
"rustbn.js" "~0.2.0"

"@nomicfoundation/[email protected]":
"integrity" "sha512-oL8vJcnk0Bx/onl+TgQOQ1t/534GKFaEG17fZmwtPFeH8S5soiBYPCLUrvANOl4sCp9elYxIMzIiTtMtNNN8EQ=="
"resolved" "https://registry.npmjs.org/@nomicfoundation/ethereumjs-evm/-/ethereumjs-evm-2.0.1.tgz"
Expand All @@ -1289,29 +1225,11 @@
"mcl-wasm" "^0.7.1"
"rustbn.js" "~0.2.0"

"@nomicfoundation/[email protected]":
"integrity" "sha512-DZMzB/lqPK78T6MluyXqtlRmOMcsZbTTbbEyAjo0ncaff2mqu/k8a79PBcyvpgAhWD/R59Fjq/x3ro5Lof0AtA=="
"resolved" "https://registry.npmjs.org/@nomicfoundation/ethereumjs-rlp/-/ethereumjs-rlp-4.0.3.tgz"
"version" "4.0.3"

"@nomicfoundation/[email protected]":
"integrity" "sha512-xtxrMGa8kP4zF5ApBQBtjlSbN5E2HI8m8FYgVSYAnO6ssUoY5pVPGy2H8+xdf/bmMa22Ce8nWMH3aEW8CcqMeQ=="
"resolved" "https://registry.npmjs.org/@nomicfoundation/ethereumjs-rlp/-/ethereumjs-rlp-5.0.1.tgz"
"version" "5.0.1"

"@nomicfoundation/[email protected]":
"integrity" "sha512-CAhzpzTR5toh/qOJIZUUOnWekUXuRqkkzaGAQrVcF457VhtCmr+ddZjjK50KNZ524c1XP8cISguEVNqJ6ij1sA=="
"resolved" "https://registry.npmjs.org/@nomicfoundation/ethereumjs-statemanager/-/ethereumjs-statemanager-1.0.5.tgz"
"version" "1.0.5"
dependencies:
"@nomicfoundation/ethereumjs-common" "3.1.2"
"@nomicfoundation/ethereumjs-rlp" "4.0.3"
"@nomicfoundation/ethereumjs-trie" "5.0.5"
"@nomicfoundation/ethereumjs-util" "8.0.6"
"debug" "^4.3.3"
"ethereum-cryptography" "0.1.3"
"functional-red-black-tree" "^1.0.1"

"@nomicfoundation/[email protected]":
"integrity" "sha512-B5ApMOnlruVOR7gisBaYwFX+L/AP7i/2oAahatssjPIBVDF6wTX1K7Qpa39E/nzsH8iYuL3krkYeUFIdO3EMUQ=="
"resolved" "https://registry.npmjs.org/@nomicfoundation/ethereumjs-statemanager/-/ethereumjs-statemanager-2.0.1.tgz"
Expand All @@ -1324,16 +1242,6 @@
"ethers" "^5.7.1"
"js-sdsl" "^4.1.4"

"@nomicfoundation/[email protected]":
"integrity" "sha512-+8sNZrXkzvA1NH5F4kz5RSYl1I6iaRz7mAZRsyxOm0IVY4UaP43Ofvfp/TwOalFunurQrYB5pRO40+8FBcxFMA=="
"resolved" "https://registry.npmjs.org/@nomicfoundation/ethereumjs-trie/-/ethereumjs-trie-5.0.5.tgz"
"version" "5.0.5"
dependencies:
"@nomicfoundation/ethereumjs-rlp" "4.0.3"
"@nomicfoundation/ethereumjs-util" "8.0.6"
"ethereum-cryptography" "0.1.3"
"readable-stream" "^3.6.0"

"@nomicfoundation/[email protected]":
"integrity" "sha512-A64It/IMpDVODzCgxDgAAla8jNjNtsoQZIzZUfIV5AY6Coi4nvn7+VReBn5itlxMiL2yaTlQr9TRWp3CSI6VoA=="
"resolved" "https://registry.npmjs.org/@nomicfoundation/ethereumjs-trie/-/ethereumjs-trie-6.0.1.tgz"
Expand All @@ -1345,16 +1253,6 @@
"ethereum-cryptography" "0.1.3"
"readable-stream" "^3.6.0"

"@nomicfoundation/[email protected]":
"integrity" "sha512-emJBJZpmTdUa09cqxQqHaysbBI9Od353ZazeH7WgPb35miMgNY6mb7/3vBA98N5lUW/rgkiItjX0KZfIzihSoQ=="
"resolved" "https://registry.npmjs.org/@nomicfoundation/ethereumjs-tx/-/ethereumjs-tx-4.1.2.tgz"
"version" "4.1.2"
dependencies:
"@nomicfoundation/ethereumjs-common" "3.1.2"
"@nomicfoundation/ethereumjs-rlp" "4.0.3"
"@nomicfoundation/ethereumjs-util" "8.0.6"
"ethereum-cryptography" "0.1.3"

"@nomicfoundation/[email protected]":
"integrity" "sha512-0HwxUF2u2hrsIM1fsasjXvlbDOq1ZHFV2dd1yGq8CA+MEYhaxZr8OTScpVkkxqMwBcc5y83FyPl0J9MZn3kY0w=="
"resolved" "https://registry.npmjs.org/@nomicfoundation/ethereumjs-tx/-/ethereumjs-tx-5.0.1.tgz"
Expand All @@ -1367,14 +1265,6 @@
"@nomicfoundation/ethereumjs-util" "9.0.1"
"ethereum-cryptography" "0.1.3"

"@nomicfoundation/[email protected]":
"integrity" "sha512-jOQfF44laa7xRfbfLXojdlcpkvxeHrE2Xu7tSeITsWFgoII163MzjOwFEzSNozHYieFysyoEMhCdP+NY5ikstw=="
"resolved" "https://registry.npmjs.org/@nomicfoundation/ethereumjs-util/-/ethereumjs-util-8.0.6.tgz"
"version" "8.0.6"
dependencies:
"@nomicfoundation/ethereumjs-rlp" "4.0.3"
"ethereum-cryptography" "0.1.3"

"@nomicfoundation/[email protected]":
"integrity" "sha512-TwbhOWQ8QoSCFhV/DDfSmyfFIHjPjFBj957219+V3jTZYZ2rf9PmDtNOeZWAE3p3vlp8xb02XGpd0v6nTUPbsA=="
"resolved" "https://registry.npmjs.org/@nomicfoundation/ethereumjs-util/-/ethereumjs-util-9.0.1.tgz"
Expand All @@ -1388,7 +1278,6 @@
"resolved" "file:packages/hardhat-chai-matchers"
"version" "2.0.1"
dependencies:
"@ethersproject/abi" "^5.1.2"
"@types/chai-as-promised" "^7.1.3"
"chai-as-promised" "^7.1.1"
"deep-eql" "^4.0.1"
Expand All @@ -1397,6 +1286,9 @@
"@nomicfoundation/hardhat-ethers@^3.0.0", "@nomicfoundation/hardhat-ethers@file:/Users/jameszheng/Documents/Oasis/NomicFoundation-hardhat/packages/hardhat-ethers":
"resolved" "file:packages/hardhat-ethers"
"version" "3.0.3"
dependencies:
"debug" "^4.1.1"
"lodash.isequal" "^4.5.0"

"@nomicfoundation/hardhat-foundry@file:/Users/jameszheng/Documents/Oasis/NomicFoundation-hardhat/packages/hardhat-foundry":
"resolved" "file:packages/hardhat-foundry"
Expand Down Expand Up @@ -1543,27 +1435,26 @@
"ethers" "^4.0.0-beta.1"
"source-map-support" "^0.5.19"

"@oasislabs/ethereumjs-vm@^6.0.0":
"integrity" "sha512-4Rjka7GSu8b8Q4Dlc5/ClAC9YYRM3b2R+C79D0FZWZ89L0PAyjpMGAjZEwOCGyg7llV0QJ6lm5WNP785Yenogw=="
"resolved" "https://registry.npmjs.org/@oasislabs/ethereumjs-vm/-/ethereumjs-vm-6.4.2.tgz"
"version" "6.4.2"
dependencies:
"@nomicfoundation/ethereumjs-block" "4.2.2"
"@nomicfoundation/ethereumjs-blockchain" "6.2.2"
"@nomicfoundation/ethereumjs-common" "3.1.2"
"@nomicfoundation/ethereumjs-evm" "1.3.2"
"@nomicfoundation/ethereumjs-rlp" "4.0.3"
"@nomicfoundation/ethereumjs-statemanager" "1.0.5"
"@nomicfoundation/ethereumjs-trie" "5.0.5"
"@nomicfoundation/ethereumjs-tx" "4.1.2"
"@nomicfoundation/ethereumjs-util" "8.0.6"
"@oasislabs/ethereumjs-vm@^7.0.1":
"integrity" "sha512-ki1vaaXjOAqMOW6nyb7KgT3tShR+TERMQAae9MljGEvNpFyLzDdOxyRdjoDbTxjysa6651pl+KhZ8LUjKNuqiQ=="
"resolved" "https://registry.npmjs.org/@oasislabs/ethereumjs-vm/-/ethereumjs-vm-7.0.1.tgz"
"version" "7.0.1"
dependencies:
"@nomicfoundation/ethereumjs-block" "5.0.1"
"@nomicfoundation/ethereumjs-blockchain" "7.0.1"
"@nomicfoundation/ethereumjs-common" "4.0.1"
"@nomicfoundation/ethereumjs-evm" "2.0.1"
"@nomicfoundation/ethereumjs-rlp" "5.0.1"
"@nomicfoundation/ethereumjs-statemanager" "2.0.1"
"@nomicfoundation/ethereumjs-trie" "6.0.1"
"@nomicfoundation/ethereumjs-tx" "5.0.1"
"@nomicfoundation/ethereumjs-util" "9.0.1"
"@oasisprotocol/sapphire-paratime" "^1.0.13"
"@types/async-eventemitter" "^0.2.1"
"async-eventemitter" "^0.2.4"
"cborg" "^1.9.5"
"debug" "^4.3.3"
"ethereum-cryptography" "0.1.3"
"functional-red-black-tree" "^1.0.1"
"mcl-wasm" "^0.7.1"
"rustbn.js" "~0.2.0"
"tweetnacl" "^1.0.3"
Expand All @@ -1586,8 +1477,7 @@
"@nomicfoundation/ethereumjs-tx" "5.0.1"
"@nomicfoundation/ethereumjs-util" "9.0.1"
"@nomicfoundation/solidity-analyzer" "^0.1.0"
"@oasislabs/ethereumjs-vm" "7.0.1"
"@oasisprotocol/deoxysii" "^0.0.5"
"@oasislabs/ethereumjs-vm" "^6.0.0"
"@oasisprotocol/sapphire-paratime" "^1.0.13"
"@sentry/node" "^5.18.1"
"@types/bn.js" "^5.1.0"
Expand All @@ -1612,21 +1502,18 @@
"glob" "7.2.0"
"immutable" "^4.0.0-rc.12"
"io-ts" "1.10.4"
"js-sha512" "^0.8.0"
"keccak" "^3.0.2"
"lodash" "^4.17.11"
"mnemonist" "^0.38.0"
"mocha" "^10.0.0"
"p-map" "^4.0.0"
"qs" "^6.7.0"
"raw-body" "^2.4.1"
"resolve" "1.17.0"
"semver" "^6.3.0"
"solc" "0.7.3"
"source-map-support" "^0.5.13"
"stacktrace-parser" "^0.1.10"
"tsort" "0.0.1"
"tweetnacl" "^1.0.3"
"undici" "^5.14.0"
"uuid" "^8.3.2"
"ws" "^7.4.6"
Expand Down Expand Up @@ -2422,9 +2309,9 @@
"version" "7.4.1"

"acorn@^8.4.1":
"integrity" "sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ=="
"resolved" "https://registry.npmjs.org/acorn/-/acorn-8.9.0.tgz"
"version" "8.9.0"
"integrity" "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw=="
"resolved" "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz"
"version" "8.8.2"

"address@^1.0.1":
"integrity" "sha512-tNEZYz5G/zYunxFm7sfhAxkXEuLj3K6BKwv6ZURlsF6yiUQ65z0Q2wZW9L5cPUl9ocofGvXOdFYbFHp0+6MOig=="
Expand Down Expand Up @@ -4953,11 +4840,11 @@
"@ethersproject/wordlists" "5.7.0"

"ethers@^6.1.0":
"integrity" "sha512-vyWfVAj2g7xeZIivOqlbpt7PbS2MzvJkKgsncgn4A/1xZr8Q3BznBmEBRQyPXKCgHmX4PzRQLpnYG7jl/yutMg=="
"resolved" "https://registry.npmjs.org/ethers/-/ethers-6.6.2.tgz"
"version" "6.6.2"
"integrity" "sha512-dBY7rBmoqI7ndCOsaafWEk1Snh2ilSRrLcRghb1FwY51Jze0NKGgn4ZjYAqDcji1lvUzFPEG0/u6w/nH6xJ6pw=="
"resolved" "https://registry.npmjs.org/ethers/-/ethers-6.4.1.tgz"
"version" "6.4.1"
dependencies:
"@adraffy/ens-normalize" "1.9.2"
"@adraffy/ens-normalize" "git+https://github.com/ricmoo/ens-normalize.js.git"
"@noble/hashes" "1.1.2"
"@noble/secp256k1" "1.7.1"
"@types/node" "18.15.13"
Expand Down Expand Up @@ -5814,7 +5701,7 @@
"@nomicfoundation/ethereumjs-tx" "5.0.1"
"@nomicfoundation/ethereumjs-util" "9.0.1"
"@nomicfoundation/solidity-analyzer" "^0.1.0"
"@oasislabs/ethereumjs-vm" "^6.0.0"
"@oasislabs/ethereumjs-vm" "^7.0.1"
"@oasisprotocol/sapphire-paratime" "^1.0.13"
"@sentry/node" "^5.18.1"
"@types/bn.js" "^5.1.0"
Expand Down Expand Up @@ -8940,9 +8827,9 @@
"lru-cache" "^6.0.0"

"semver@^7.3.7":
"integrity" "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ=="
"resolved" "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz"
"version" "7.5.3"
"integrity" "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw=="
"resolved" "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz"
"version" "7.5.1"
dependencies:
"lru-cache" "^6.0.0"

Expand Down

0 comments on commit d3e9fa7

Please sign in to comment.