Merge remote-tracking branch 'upstream/master' into nh/web3-4x-upgrade

trufflesuite · Sep 18, 2023 · e879fa6 · e879fa6
2 parents 08e1a59 + a26df1f
commit e879fa6
Show file tree

Hide file tree

Showing 68 changed files with 3,770 additions and 7,444 deletions.
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version-file: .nvmrc
       - run: npm install -g yarn
       - run: yarn install --ignore-scripts --ignore-engines
       - run: test -z "$(git diff)" || (echo 'Please run yarn and commit all changes to yarn.lock'; false)
@@ -32,7 +32,8 @@ jobs:
     strategy:
       matrix:
         platform: [ubuntu-latest]
-        node-version: [16.x, 18.x, 20.x]
+        # TODO: unpin to 20.x once 20.7 has ben released
+        node-version: [16.x, 18.x, 20.5]
         env: [GETH=true, PACKAGES=true, INTEGRATION=true]
     runs-on: ${{ matrix.platform }}
 
@@ -47,9 +48,9 @@ jobs:
 
     - run: yarn install
     - run: test -z "$(git diff)" || (echo 'Did you check in a generated file to source control?  Please remove it if so'; false)
-    
-    - run: yarn depcheck
-    
+
+    - run: yarn lint:dependencies
+
     - run: ${{ matrix.env }} yarn ci
       env:
         CI: true
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+lts/*
diff --git a/package.json b/package.json
@@ -2,20 +2,23 @@
   "private": true,
   "scripts": {
     "bootstrap": "yarn exec lerna bootstrap",
-    "build": "lerna run build --stream",
+    "check-truffle-namespace-dependency-versions": "node ./scripts/check-truffle-namespace-dependency-versions.js",
+    "ci": "./scripts/ci.sh",
+    "deduplicate": "yarn-deduplicate --strategy fewer; yarn install --ignore-scripts",
+    "deduplicate:check": "yarn deduplicate -l -f",
+    "depcheck": "lerna exec --stream --no-bail dependency-check --ignore @truffle/compile-solidity-tests --ignore @truffle/contract-tests --ignore @truffle/dashboard-message-bus-e2e-test --ignore @truffle/codec-components -- --missing .",
+    "dependency-graph": "lerna-dependency-graph -f pdf -o dependency-graph.pdf",
     "docs": "lerna run docs --stream --concurrency=1",
+    "geth": "./scripts/geth.sh",
+    "lint:dependencies": "yarn deduplicate:check && yarn depcheck",
+    "lint:dependencies:fix": "yarn deduplicate && yarn depcheck",
     "prepare": "lerna run prepare --stream --concurrency=1 && husky install && yarn docs",
     "publish-release": "./scripts/publish-release.sh",
     "publish-dist-tag": "./scripts/publish-dist-tag.sh",
     "prepare-release": "./scripts/prepare-release.sh",
-    "test": "lerna run test --stream --concurrency=1 -- --colors",
-    "ci": "./scripts/ci.sh",
-    "geth": "./scripts/geth.sh",
-    "dependency-graph": "lerna-dependency-graph -f pdf -o dependency-graph.pdf",
     "solc-bump": "node ./scripts/solc-bump.js",
-    "update": "lernaupdate",
-    "depcheck": "lerna exec --stream --no-bail dependency-check --ignore @truffle/compile-solidity-tests --ignore @truffle/contract-tests --ignore @truffle/dashboard-message-bus-e2e-test --ignore @truffle/codec-components -- --ignore-module node:* --missing .",
-    "check-truffle-namespace-dependency-versions": "node ./scripts/check-truffle-namespace-dependency-versions.js"
+    "test": "lerna run test --stream --concurrency=1 -- --colors",
+    "update": "lernaupdate"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^5.6.0",
@@ -32,7 +35,8 @@
     "nyc": "15.1.0",
     "prettier": "^2.8.8",
     "prs-merged-since": "^1.1.0",
-    "typescript": "^4.9.5"
+    "typescript": "^4.9.5",
+    "yarn-deduplicate": "^6.0.2"
   },
   "workspaces": {
     "packages": [

diff --git a/packages/abi-utils/package.json b/packages/abi-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@truffle/abi-utils",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Utilities for working with ABIs",
   "license": "MIT",
   "author": "g. nicholas d'andrea <[email protected]>",
@@ -30,7 +30,7 @@
   },
   "devDependencies": {
     "@fast-check/jest": "^1.0.1",
-    "@truffle/contract-schema": "^3.4.15",
+    "@truffle/contract-schema": "^3.4.16",
     "@types/jest": "27.4.1",
     "@types/jest-json-schema": "^2.1.2",
     "@types/node": "~12.12.0",
@@ -48,5 +48,8 @@
   ],
   "publishConfig": {
     "access": "public"
+  },
+  "engines": {
+    "node": "^16.20 || ^18.16 || >=20"
   }
 }
diff --git a/packages/artifactor/package.json b/packages/artifactor/package.json
@@ -13,7 +13,7 @@
   "bugs": {
     "url": "https://github.com/trufflesuite/truffle/issues"
   },
-  "version": "4.0.196",
+  "version": "4.0.199",
   "main": "dist/index.js",
   "scripts": {
     "build": "tsc",
@@ -22,12 +22,12 @@
   },
   "types": "dist/index.d.ts",
   "dependencies": {
-    "@truffle/contract-schema": "^3.4.15",
+    "@truffle/contract-schema": "^3.4.16",
     "fs-extra": "^9.1.0",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@truffle/contract": "^4.6.28",
+    "@truffle/contract": "^4.6.31",
     "@types/fs-extra": "^8.1.0",
     "@types/lodash": "^4.14.179",
     "@types/node": "~12.12.0",
@@ -44,5 +44,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "engines": {
+    "node": "^16.20 || ^18.16 || >=20"
   }
 }
diff --git a/packages/blockchain-utils/package.json b/packages/blockchain-utils/package.json
@@ -12,7 +12,7 @@
   "bugs": {
     "url": "https://github.com/trufflesuite/truffle/issues"
   },
-  "version": "0.1.8",
+  "version": "0.1.9",
   "main": "dist/index.js",
   "scripts": {
     "build": "tsc",
@@ -38,5 +38,8 @@
   ],
   "publishConfig": {
     "access": "public"
+  },
+  "engines": {
+    "node": "^16.20 || ^18.16 || >=20"
   }
 }
diff --git a/packages/box/package.json b/packages/box/package.json
@@ -12,7 +12,7 @@
   "bugs": {
     "url": "https://github.com/trufflesuite/truffle/issues"
   },
-  "version": "2.1.79",
+  "version": "2.1.81",
   "main": "dist/box.js",
   "scripts": {
     "build": "tsc",
@@ -21,8 +21,8 @@
   },
   "types": "./typings/index.d.ts",
   "dependencies": {
-    "@truffle/config": "^1.3.59",
-    "axios": "1.2.4",
+    "@truffle/config": "^1.3.61",
+    "axios": "1.5.0",
     "debug": "^4.3.1",
     "download-git-repo": "^3.0.2",
     "fs-extra": "^9.1.0",
@@ -48,5 +48,8 @@
   ],
   "publishConfig": {
     "access": "public"
+  },
+  "engines": {
+    "node": "^16.20 || ^18.16 || >=20"
   }
 }
diff --git a/packages/code-utils/package.json b/packages/code-utils/package.json
@@ -12,7 +12,7 @@
   "bugs": {
     "url": "https://github.com/trufflesuite/truffle/issues"
   },
-  "version": "3.0.3",
+  "version": "3.0.4",
   "main": "dist/src/index.js",
   "scripts": {
     "build": "tsc",
@@ -33,5 +33,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "engines": {
+    "node": "^16.20 || ^18.16 || >=20"
   }
 }
diff --git a/packages/codec-components/package.json b/packages/codec-components/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@truffle/codec-components",
   "description": "UI component library for @truffle/codec data",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "keywords": [
     "solidity",
     "ethereum",
@@ -42,10 +42,10 @@
     "prepare": "yarn build"
   },
   "dependencies": {
-    "@truffle/codec": "^0.17.2"
+    "@truffle/codec": "^0.17.3"
   },
   "devDependencies": {
-    "@microsoft/api-extractor": "^7.35.1",
+    "@microsoft/api-extractor": "^7.36.4",
     "@types/big.js": "^6.0.2",
     "@types/bn.js": "^5.1.0",
     "@types/react": ">=16.9.0",
@@ -93,5 +93,8 @@
         }
       ]
     }
+  },
+  "engines": {
+    "node": "^16.20 || ^18.16 || >=20"
   }
 }
diff --git a/packages/codec/package.json b/packages/codec/package.json
@@ -12,7 +12,7 @@
   "bugs": {
     "url": "https://github.com/trufflesuite/truffle/issues"
   },
-  "version": "0.17.2",
+  "version": "0.17.3",
   "main": "dist/lib/index.js",
   "files": [
     "dist"
@@ -25,26 +25,26 @@
   },
   "types": "dist/lib/index.d.ts",
   "dependencies": {
-    "@truffle/abi-utils": "^1.0.2",
-    "@truffle/compile-common": "^0.9.7",
+    "@truffle/abi-utils": "^1.0.3",
+    "@truffle/compile-common": "^0.9.8",
     "big.js": "^6.0.3",
     "bn.js": "^5.1.3",
     "cbor": "^5.2.0",
     "debug": "^4.3.1",
     "lodash": "^4.17.21",
-    "semver": "7.5.2",
+    "semver": "^7.5.4",
     "utf8": "^3.0.0",
     "web3-utils": "4.0.5",
     "web3-validator": "2.0.1"
   },
   "devDependencies": {
-    "@truffle/contract-schema": "^3.4.15",
+    "@truffle/contract-schema": "^3.4.16",
     "@types/big.js": "^6.0.2",
     "@types/bn.js": "^5.1.0",
     "@types/cbor": "^5.0.1",
     "@types/debug": "^4.1.5",
     "@types/lodash": "^4.14.179",
-    "@types/semver": "^6.0.0",
+    "@types/semver": "^7.5.1",
     "@types/utf8": "^2.1.6",
     "ts-node": "10.7.0",
     "ttypescript": "1.5.15",
@@ -63,5 +63,8 @@
   ],
   "publishConfig": {
     "access": "public"
+  },
+  "engines": {
+    "node": "^16.20 || ^18.16 || >=20"
   }
 }
diff --git a/packages/compile-common/package.json b/packages/compile-common/package.json
@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/trufflesuite/truffle/issues"
   },
-  "version": "0.9.7",
+  "version": "0.9.8",
   "main": "dist/src/index.js",
   "scripts": {
     "build": "tsc",
@@ -21,15 +21,18 @@
   },
   "types": "dist/src/index.d.ts",
   "dependencies": {
-    "@truffle/error": "^0.2.1",
+    "@truffle/error": "^0.2.2",
     "colors": "1.4.0"
   },
   "devDependencies": {
-    "@truffle/contract-schema": "^3.4.15",
+    "@truffle/contract-schema": "^3.4.16",
     "@types/mocha": "^5.2.7",
     "@types/node": "~12.12.0",
     "mocha": "10.1.0",
     "ts-node": "10.7.0",
     "typescript": "^4.9.5"
+  },
+  "engines": {
+    "node": "^16.20 || ^18.16 || >=20"
   }
 }
diff --git a/packages/compile-solidity-tests/package.json b/packages/compile-solidity-tests/package.json
@@ -13,18 +13,18 @@
     "url": "https://github.com/trufflesuite/truffle/issues"
   },
   "private": true,
-  "version": "0.1.36",
+  "version": "0.1.39",
   "main": "dist/index.js",
   "scripts": {
     "build": "ttsc",
     "prepare": "yarn build",
     "test": "./scripts/test.sh"
   },
   "devDependencies": {
-    "@truffle/artifactor": "^4.0.196",
-    "@truffle/compile-solidity": "^6.0.76",
-    "@truffle/config": "^1.3.59",
-    "@truffle/resolver": "^9.0.50",
+    "@truffle/artifactor": "^4.0.199",
+    "@truffle/compile-solidity": "^6.0.79",
+    "@truffle/config": "^1.3.61",
+    "@truffle/resolver": "^9.0.53",
     "@types/node": "12.12.21",
     "@types/sinon": "^9.0.10",
     "babel-core": "^6.26.0",
@@ -50,5 +50,8 @@
     "presets": [
       "env"
     ]
+  },
+  "engines": {
+    "node": "^16.20 || ^18.16 || >=20"
   }
 }
diff --git a/packages/compile-solidity/package.json b/packages/compile-solidity/package.json
@@ -12,33 +12,33 @@
   "bugs": {
     "url": "https://github.com/trufflesuite/truffle/issues"
   },
-  "version": "6.0.76",
+  "version": "6.0.79",
   "main": "dist/index.js",
   "scripts": {
     "build": "ttsc",
     "prepare": "yarn build"
   },
   "dependencies": {
-    "@truffle/compile-common": "^0.9.7",
-    "@truffle/config": "^1.3.59",
-    "@truffle/contract-sources": "^0.2.0",
-    "@truffle/expect": "^0.1.6",
-    "@truffle/profiler": "^0.1.51",
-    "axios": "1.2.4",
-    "axios-retry": "^3.1.9",
+    "@truffle/compile-common": "^0.9.8",
+    "@truffle/config": "^1.3.61",
+    "@truffle/contract-sources": "^0.2.1",
+    "@truffle/expect": "^0.1.7",
+    "@truffle/profiler": "^0.1.53",
+    "axios": "1.5.0",
+    "axios-retry": "^3.7.0",
     "debug": "^4.3.1",
     "fs-extra": "^9.1.0",
     "iter-tools": "^7.0.2",
     "lodash": "^4.17.21",
     "node-abort-controller": "^3.0.1",
     "original-require": "^1.0.1",
     "require-from-string": "^2.0.2",
-    "semver": "7.5.2",
+    "semver": "^7.5.4",
     "solc": "0.8.21"
   },
   "devDependencies": {
-    "@truffle/artifactor": "^4.0.196",
-    "@truffle/box": "^2.1.79",
+    "@truffle/artifactor": "^4.0.199",
+    "@truffle/box": "^2.1.81",
     "@types/node": "~12.12.0",
     "@types/sinon": "^9.0.10",
     "babel-core": "^6.26.0",
@@ -67,5 +67,8 @@
     "presets": [
       "env"
     ]
+  },
+  "engines": {
+    "node": "^16.20 || ^18.16 || >=20"
   }
 }