trufflesuite · nazarhussain · Mar 2, 2023 · Mar 6, 2023 · Mar 7, 2023 · Mar 7, 2023
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
@@ -33,7 +33,7 @@ jobs:
       matrix:
         platform: [ubuntu-latest]
         # TODO: unpin to 20.x once 20.7 has ben released
-        node-version: [16.x, 18.x, 20.5]
+        node-version: [16.20.2, 18.16, 20.5]
         env: [GETH=true, PACKAGES=true, INTEGRATION=true]
     runs-on: ${{ matrix.platform }}
 

diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
     "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 .",
+    "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 .",
     "dependency-graph": "lerna-dependency-graph -f pdf -o dependency-graph.pdf",
     "docs": "lerna run docs --stream --concurrency=1",
     "geth": "./scripts/geth.sh",

diff --git a/packages/abi-utils/package.json b/packages/abi-utils/package.json
@@ -26,7 +26,7 @@
   "dependencies": {
     "change-case": "3.0.2",
     "fast-check": "3.1.1",
-    "web3-utils": "1.10.0"
+    "web3-utils": "dev"
   },
   "devDependencies": {
     "@fast-check/jest": "^1.0.1",

diff --git a/packages/artifactor/package.json b/packages/artifactor/package.json
@@ -40,7 +40,7 @@
     "tmp": "^0.2.1",
     "ts-node": "10.7.0",
     "typescript": "^4.9.5",
-    "web3": "1.10.0"
+    "web3": "dev"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/artifactor/test/contracts.js b/packages/artifactor/test/contracts.js
@@ -8,7 +8,7 @@ const Config = require("@truffle/config");
 const requireNoCache = require("require-nocache")(module);
 const { Compile } = require("@truffle/compile-solidity");
 const Ganache = require("ganache");
-const Web3 = require("web3");
+const { Web3 } = require("web3");
 const { Shims } = require("@truffle/compile-common");
 const tmp = require("tmp");
 tmp.setGracefulCleanup();
@@ -20,8 +20,8 @@ describe("artifactor + require", () => {
       instamine: "strict"
     }
   });
-  const web3 = new Web3();
-  web3.setProvider(provider);
+
+  const web3 = new Web3(provider);
 
   before(() => web3.eth.net.getId().then(id => (networkID = id)));
 
@@ -138,7 +138,7 @@ describe("artifactor + require", () => {
       })
       .then(done)
       .catch(done);
-  });
+  }).timeout(3000);
 
   it("shouldn't synchronize constant functions", done => {
     let example;
@@ -186,7 +186,7 @@ describe("artifactor + require", () => {
       })
       .then(done)
       .catch(done);
-  });
+  }).timeout(3000);
 
   it("should return transaction hash, logs and receipt when using synchronised transactions", done => {
     let example = null;
@@ -221,7 +221,7 @@ describe("artifactor + require", () => {
       })
       .then(done)
       .catch(done);
-  });
+  }).timeout(3000);
 
   it("should trigger the fallback function when calling sendTransaction()", () => {
     let example = null;
@@ -239,19 +239,14 @@ describe("artifactor + require", () => {
           value: web3.utils.toWei("1", "ether")
         });
       })
-      .then(
-        () =>
-          new Promise((accept, reject) =>
-            web3.eth.getBalance(example.address, (err, balance) => {
-              if (err) return reject(err);
-              accept(balance);
-            })
-          )
-      )
+      .then(() => web3.eth.getBalance(example.address))
       .then(balance => {
-        assert(balance === web3.utils.toWei("1", "ether"));
+        assert(
+          balance.toString() === web3.utils.toWei("1", "ether"),
+          "1 ether has been sent but the balance does not match that"
+        );
       });
-  });
+  }).timeout(3000);
 
   it("should trigger the fallback function when calling send() (shorthand notation)", () => {
     let example = null;
@@ -267,19 +262,14 @@ describe("artifactor + require", () => {
         );
         return example.send(web3.utils.toWei("1", "ether"));
       })
-      .then(
-        () =>
-          new Promise((accept, reject) =>
-            web3.eth.getBalance(example.address, (err, balance) => {
-              if (err) return reject(err);
-              accept(balance);
-            })
-          )
-      )
+      .then(() => web3.eth.getBalance(example.address))
       .then(balance => {
-        assert(balance === web3.utils.toWei("1", "ether"));
+        assert(
+          balance.toString() === web3.utils.toWei("1", "ether"),
+          "1 ether has been sent but the balance does not match that"
+        );
       });
-  });
+  }).timeout(3000);
 
   it("errors when setting an invalid provider", done => {
     try {

diff --git a/packages/artifactor/tsconfig.json b/packages/artifactor/tsconfig.json
@@ -12,12 +12,6 @@
     "lib": [
       "es2019"
     ],
-    "paths": {
-      "web3": [
-        "../../node_modules/@types/web3/index",
-        "node_modules/web3/index"
-      ]
-    },
     "rootDir": ".",
     "types": ["node", "mocha"]
   },

diff --git a/packages/blockchain-utils/index.ts b/packages/blockchain-utils/index.ts
@@ -1,13 +1,34 @@
-import type { Provider, Callback, JsonRPCResponse } from "web3/providers";
+import type {
+  Block,
+  HexString,
+  Web3BaseProvider as Provider,
+  Web3ProviderRequestCallback as Callback
+} from "web3-types";
 import type { parsedUriObject } from "typings";
 
-const Blockchain = {
+type BlockChainType = {
   getBlockByNumber(
     blockNumber: string,
     provider: Provider,
-    callback: Callback<JsonRPCResponse>
+    callback: Callback<Block>
+  ): void;
+  getBlockByHash(
+    blockHash: string,
+    provider: Provider,
+    callback: Callback<Block>
+  ): void;
+  parse(uri: string): parsedUriObject;
+  asURI(provider: Provider): Promise<unknown>;
+  matches(uri: string, provider: Provider): Promise<unknown>;
+};
+
+const Blockchain: BlockChainType = {
+  getBlockByNumber(
+    blockNumber: string,
+    provider: Provider,
+    callback: Callback<Block>
   ) {
-    const params = [blockNumber, true];
+    const params: [string, boolean] = [blockNumber, true];
     provider.send(
       {
         jsonrpc: "2.0",
@@ -22,9 +43,9 @@ const Blockchain = {
   getBlockByHash(
     blockHash: string,
     provider: Provider,
-    callback: Callback<JsonRPCResponse>
+    callback: Callback<Block>
   ) {
-    const params = [blockHash, true];
+    const params: [string, boolean] = [blockHash, true];
     provider.send(
       {
         jsonrpc: "2.0",
@@ -50,66 +71,53 @@ const Blockchain = {
     return parsed;
   },
 
-  asURI(provider: Provider) {
+  asURI(this: BlockChainType, provider: Provider) {
     return new Promise((resolve, reject) => {
       let genesis: any, latest;
 
-      this.getBlockByNumber(
-        "0x0",
-        provider,
-        (err: Error, { result }: JsonRPCResponse) => {
+      this.getBlockByNumber("0x0", provider, (err: Error, { result }) => {
+        if (err) return reject(err);
+        genesis = result;
+
+        this.getBlockByNumber("latest", provider, (err: Error, { result }) => {
           if (err) return reject(err);
-          genesis = result;
-
-          this.getBlockByNumber(
-            "latest",
-            provider,
-            (err: Error, { result }: JsonRPCResponse) => {
-              if (err) return reject(err);
-              latest = result;
-              const url = `blockchain://${genesis.hash.replace(
-                "0x",
-                ""
-              )}/block/${latest.hash.replace("0x", "")}`;
-              resolve(url);
-            }
-          );
-        }
-      );
+          latest = result;
+          const url = `blockchain://${genesis.hash.replace("0x", "")}/block/${(
+            latest.hash as HexString
+          ).replace("0x", "")}`;
+          resolve(url);
+        });
+      });
     });
   },
 
-  matches(uri: string, provider: Provider) {
+  matches(this: BlockChainType, uri: string, provider: Provider) {
     return new Promise((resolve, reject) => {
       const parsedUri = this.parse(uri);
 
       const expectedGenesis = parsedUri.genesis_hash;
       const expectedBlock = parsedUri.block_hash;
 
-      this.getBlockByNumber(
-        "0x0",
-        provider,
-        (err: Error, { result }: JsonRPCResponse) => {
-          if (err) return reject(err);
-          const block = result;
-          if (block.hash !== expectedGenesis) return resolve(false);
-
-          this.getBlockByHash(
-            expectedBlock,
-            provider,
-            (err: Error, { result }: JsonRPCResponse) => {
-              // Treat an error as if the block didn't exist. This is because
-              // some clients respond differently.
-              const block = result;
-              if (err || block == null) {
-                return resolve(false);
-              }
-
-              resolve(true);
+      this.getBlockByNumber("0x0", provider, (err: Error, { result }) => {
+        if (err) return reject(err);
+        const block = result;
+        if (block.hash !== expectedGenesis) return resolve(false);
+
+        this.getBlockByHash(
+          expectedBlock,
+          provider,
+          (err: Error, { result }) => {
+            // Treat an error as if the block didn't exist. This is because
+            // some clients respond differently.
+            const block = result;
+            if (err || block == null) {
+              return resolve(false);
             }
-          );
-        }
-      );
+
+            resolve(true);
+          }
+        );
+      });
     });
   }
 };

diff --git a/packages/blockchain-utils/package.json b/packages/blockchain-utils/package.json
@@ -20,11 +20,13 @@
     "test": "mocha --exit -r ts-node/register test/**/*.test.ts"
   },
   "types": "./typings/index.d.ts",
+  "dependencies": {
+    "web3-types": "dev"
+  },
   "devDependencies": {
     "@types/assert": "^1.4.2",
     "@types/mocha": "^5.2.7",
     "@types/node": "~12.12.0",
-    "@types/web3": "1.0.20",
     "mocha": "10.1.0",
     "ts-node": "10.7.0",
     "typescript": "^4.9.5"

diff --git a/packages/blockchain-utils/tsconfig.json b/packages/blockchain-utils/tsconfig.json
@@ -10,12 +10,6 @@
     "outDir": "dist",
     "baseUrl": ".",
     "lib": ["es2019"],
-    "paths": {
-      "web3": [
-        "../../node_modules/@types/web3/index",
-        "node_modules/web3/index"
-      ]
-    },
     "rootDir": ".",
     "types": ["node", "mocha"],
     "typeRoots": [

diff --git a/packages/box/tsconfig.json b/packages/box/tsconfig.json
@@ -11,12 +11,6 @@
     "outDir": "dist",
     "baseUrl": ".",
     "lib": ["es2019"],
-    "paths": {
-      "web3": [
-        "../../node_modules/@types/web3/index",
-        "node_modules/web3/index"
-      ]
-    },
     "rootDir": "."
   },
   "include": [

diff --git a/packages/code-utils/tsconfig.json b/packages/code-utils/tsconfig.json
@@ -9,18 +9,17 @@
     "sourceMap": true,
     "outDir": "dist",
     "baseUrl": ".",
-    "lib": ["es2019"],
-    "paths": {
-      "web3": [
-        "../../node_modules/@types/web3/index",
-        "node_modules/web3/index"
-      ]
-    },
+    "lib": [
+      "es2019"
+    ],
+    "types": [
+      "node"
+    ],
     "rootDir": ".",
     "types": ["node", "mocha"]
   },
   "include": [
     "./src/**/*.ts",
     "./typings/**/*.d.ts"
   ]
-}
+}
diff --git a/packages/codec/docs/tsconfig.json b/packages/codec/docs/tsconfig.json
@@ -8,24 +8,10 @@
     "sourceMap": true,
     "outDir": "dist",
     "baseUrl": "..",
-    "lib": [
-      "es2017"
-    ],
+    "lib": ["es2017", "dom"],
     "paths": {
-      "@truffle/codec": [
-        "../codec/lib"
-      ],
-      "@truffle/codec/*": [
-        "../codec/lib/*"
-      ],
-      "web3": [
-        "../../node_modules/@types/web3/index",
-        "node_modules/web3/index"
-      ],
-      "web3/types": [
-        "../../node_modules/@types/web3/types",
-        "node_modules/web3/types"
-      ],
+      "@truffle/codec": ["../codec/lib"],
+      "@truffle/codec/*": ["../codec/lib/*"],
       "web3/eth/types": [
         "../../node_modules/@types/web3/eth/types",
         "node_modules/web3/eth/types"