Merge upstream master into patched/master

.eslintrc

 {
   "extends" : [
-    "standard",
-    "plugin:promise/recommended",
+    "standard"
   ],
   "plugins": [
-    "mocha-no-only",
-    "promise",
+    "mocha"
   ],
   "env": {
     "browser" : true,
@@ -53,7 +51,7 @@
     "semi": ["error", "always"],
     "space-before-function-paren": ["error", "always"],
 
-    "mocha-no-only/mocha-no-only": ["error"],
+    "mocha/no-exclusive-tests": ["error"],
 
     "promise/always-return": "off",
     "promise/avoid-new": "off",

package.json

@@ -56,19 +56,16 @@
     "@nomiclabs/hardhat-web3": "^2.0.0",
     "@openzeppelin/docs-utils": "^0.1.0",
     "@openzeppelin/test-helpers": "^0.5.13",
-    "@truffle/abi-utils": "^0.2.3",
     "chai": "^4.2.0",
-    "eslint": "^6.5.1",
-    "eslint-config-standard": "^14.1.1",
-    "eslint-plugin-import": "^2.20.0",
-    "eslint-plugin-mocha-no-only": "^1.1.0",
-    "eslint-plugin-node": "^10.0.0",
-    "eslint-plugin-promise": "^4.2.1",
-    "eslint-plugin-standard": "^4.0.1",
+    "eslint": "^7.32.0",
+    "eslint-config-standard": "^16.0.3",
+    "eslint-plugin-import": "^2.25.4",
+    "eslint-plugin-mocha": "^10.0.3",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-promise": "^5.2.0",
     "eth-sig-util": "^3.0.0",
     "ethereumjs-util": "^7.0.7",
     "ethereumjs-wallet": "^1.0.1",
-    "glob": "^7.2.0",
     "graphlib": "^2.1.8",
     "hardhat": "^2.0.6",
     "hardhat-gas-reporter": "^1.0.4",

scripts/inheritanceOrdering.js

@@ -26,7 +26,7 @@ for (const artifact of artifacts) {
   graph.nodes().forEach((x, i, nodes) => nodes
     .slice(i + 1)
     .filter(y => graph.hasEdge(x, y) && graph.hasEdge(y, x))
-    .map(y => {
+    .forEach(y => {
       console.log(`Conflict between ${names[x]} and ${names[y]} detected in the following dependency chains:`);
       linearized
         .filter(chain => chain.includes(parseInt(x)) && chain.includes(parseInt(y)))