Merge branch 'master' into remove-buidler-stuff

Author: cgewecke

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+0.8.4 / 2023-07-04
+==================
+  * Update solidity-parser to 0.16.0 (https://github.com/sc-forks/solidity-coverage/issues/802)
+
+0.8.3 / 2023-06-22
+==================
+  * Updates for Hardhat v2.15.0  (https://github.com/sc-forks/solidity-coverage/pull/796)
+
 0.8.1 / 2022-09-06
 ===================
   * Restore web3-utils (https://github.com/sc-forks/solidity-coverage/issues/743)

lib/api.js

@@ -279,10 +279,17 @@ class API {
   }
 
   // Hardhat
-  attachToHardhatVM(provider){
+  async attachToHardhatVM(provider){
     const self = this;
     this.collector = new DataCollector(this.instrumenter.instrumentationData);
 
+    if ('init' in provider) {
+      // Newer versions of Hardhat initialize the provider lazily, so we need to
+      // call provider.init() explicitly. This is a no-op if the provider is
+      // already initialized.
+      await provider.init();
+    }
+
     let cur = provider;
 
     // Go down to core HardhatNetworkProvider

package.json

@@ -1,6 +1,6 @@
 {
   "name": "solidity-coverage",
-  "version": "0.8.1",
+  "version": "0.8.4",
   "description": "",
   "main": "plugins/nomiclabs.plugin.js",
   "bin": {
@@ -25,7 +25,7 @@
   "license": "ISC",
   "dependencies": {
     "@ethersproject/abi": "^5.0.9",
-    "@solidity-parser/parser": "^0.14.1",
+    "@solidity-parser/parser": "^0.16.0",
     "chalk": "^2.4.2",
     "death": "^1.1.0",
     "detect-port": "^1.3.0",
@@ -36,7 +36,7 @@
     "globby": "^10.0.1",
     "jsonschema": "^1.2.4",
     "lodash": "^4.17.15",
-    "mocha": "7.1.2",
+    "mocha": "10.2.0",
     "node-emoji": "^1.10.0",
     "pify": "^4.0.1",
     "recursive-readdir": "^2.2.2",
@@ -56,7 +56,7 @@
     "ethereum-waffle": "^3.4.0",
     "ethers": "^5.5.3",
     "ganache-cli": "6.12.2",
-    "hardhat": "^2.11.0",
+    "hardhat": "^2.17.3",
     "hardhat-gas-reporter": "^1.0.1",
     "nyc": "^14.1.1",
     "solc": "^0.7.5"

plugins/hardhat.plugin.js

@@ -198,19 +198,19 @@ task("coverage", "Generates a code coverage report for tests")
     // ==============
     // Server launch
     // ==============
-    let network = nomiclabsUtils.setupHardhatNetwork(env, api, ui);
+    let network = await nomiclabsUtils.setupHardhatNetwork(env, api, ui);
 
     if (network.isHardhatEVM){
       accounts = await utils.getAccountsHardhat(network.provider);
       nodeInfo = await utils.getNodeInfoHardhat(network.provider);
 
       // Note: this only works if the reset block number is before any transactions have fired on the fork.
       // e.g you cannot fork at block 1, send some txs (blocks 2,3,4) and reset to block 2
-      env.network.provider.on(HARDHAT_NETWORK_RESET_EVENT, () => {
-        api.attachToHardhatVM(env.network.provider);
+      env.network.provider.on(HARDHAT_NETWORK_RESET_EVENT, async () => {
+        await api.attachToHardhatVM(env.network.provider);
       });
 
-      api.attachToHardhatVM(network.provider);
+      await api.attachToHardhatVM(network.provider);
 
       ui.report('hardhat-network', [
         nodeInfo.split('/')[1],

plugins/resources/nomiclabs.utils.js

@@ -49,10 +49,14 @@ function normalizeConfig(config, args={}){
   return config;
 }
 
-function setupHardhatNetwork(env, api, ui){
+async function setupHardhatNetwork(env, api, ui){
+  const hardhatPackage = require('hardhat/package.json');
   const { createProvider } = require("hardhat/internal/core/providers/construction");
   const { HARDHAT_NETWORK_NAME } = require("hardhat/plugins")
 
+  // after 2.15.0, the internal createProvider function has a different signature
+  const newCreateProviderSignature = semver.satisfies(hardhatPackage.version, "^2.15.0");
+
   let provider, networkName, networkConfig;
   let isHardhatEVM = false;
 
@@ -65,12 +69,20 @@ function setupHardhatNetwork(env, api, ui){
     networkConfig = env.network.config;
     configureHardhatEVMGas(networkConfig, api);
 
-    provider = createProvider(
-      networkName,
-      networkConfig,
-      env.config.paths,
-      env.artifacts,
-    )
+    if (newCreateProviderSignature) {
+      provider = await createProvider(
+        env.config,
+        networkName,
+        env.artifacts,
+      )
+    } else {
+      provider = createProvider(
+        networkName,
+        networkConfig,
+        env.config.paths,
+        env.artifacts,
+      )
+    }
 
   // HttpProvider
   } else {
@@ -80,7 +92,12 @@ function setupHardhatNetwork(env, api, ui){
     networkConfig = env.config.networks[networkName]
     configureNetworkGas(networkConfig, api);
     configureHttpProvider(networkConfig, api, ui)
-    provider = createProvider(networkName, networkConfig);
+
+    if (newCreateProviderSignature) {
+      provider = await createProvider(env.config, networkName);
+    } else {
+      provider = createProvider(networkName, networkConfig);
+    }
   }
 
   return configureNetworkEnv(

scripts/run-zeppelin.sh

@@ -28,8 +28,8 @@ cd openzeppelin-contracts
 echo ">>>>> npm install"
 npm install
 
-# Use HH Merge version
-npm install hardhat@2.11.0 --save-dev
+# Use HH latest
+npm install hardhat@latest --save-dev
 
 echo ">>>>> npm uninstall solidity-coverage --save-dev"
 npm uninstall solidity-coverage --save-dev