Dependency update: Bump web3 to version 1.2.2 & implement typings

packages/artifactor/package.json

@@ -29,7 +29,7 @@
     "temp": "^0.8.3",
     "ts-node": "^8.3.0",
     "typescript": "^3.6.3",
-    "web3": "1.2.1"
+    "web3": "1.2.2"
   },
   "publishConfig": {
     "access": "public"

packages/artifactor/tsconfig.json

@@ -9,12 +9,7 @@
     "outDir": "dist",
     "baseUrl": ".",
     "lib": ["es2017"],
-    "paths": {
-      "web3": [
-        "../../node_modules/@types/web3/index",
-        "node_modules/web3/index"
-      ]
-    },
+    "paths": {},
     "rootDir": ".",
     "typeRoots": [
       "./typings",

packages/blockchain-utils/index.ts

@@ -1,8 +1,12 @@
-import { Provider, Callback, JsonRPCResponse } from "web3/providers"
-import { parsedUriObject } from "typings"
+import { parsedUriObject } from "typings";
+import { Callback, JsonRpcResponse, Provider } from "@truffle/provider";
 
 const Blockchain = {
-  getBlockByNumber(blockNumber: string, provider: Provider, callback: Callback<JsonRPCResponse>) {
+  getBlockByNumber(
+    blockNumber: string,
+    provider: Provider,
+    callback: Callback<JsonRpcResponse>
+  ) {
     const params = [blockNumber, true];
     provider.send(
       {
@@ -15,7 +19,11 @@ const Blockchain = {
     );
   },
 
-  getBlockByHash(blockHash: string, provider: Provider, callback: Callback<JsonRPCResponse>) {
+  getBlockByHash(
+    blockHash: string,
+    provider: Provider,
+    callback: Callback<JsonRpcResponse>
+  ) {
     const params = [blockHash, true];
     provider.send(
       {
@@ -45,20 +53,28 @@ const Blockchain = {
   asURI(provider: Provider, callback: Callback<any>) {
     let genesis: any, latest;
 
-    this.getBlockByNumber("0x0", provider, (err: Error, { result } : JsonRPCResponse) => {
-      if (err) return callback(err);
-      genesis = result;
-
-      this.getBlockByNumber("latest", provider, (err: Error, { result } : JsonRPCResponse) => {
+    this.getBlockByNumber(
+      "0x0",
+      provider,
+      (err: Error, { result }: JsonRpcResponse) => {
         if (err) return callback(err);
-        latest = result;
-        const url = `blockchain://${genesis.hash.replace(
-          "0x",
-          ""
-        )}/block/${latest.hash.replace("0x", "")}`;
-        callback(null, url);
-      });
-    });
+        genesis = result;
+
+        this.getBlockByNumber(
+          "latest",
+          provider,
+          (err: Error, { result }: JsonRpcResponse) => {
+            if (err) return callback(err);
+            latest = result;
+            const url = `blockchain://${genesis.hash.replace(
+              "0x",
+              ""
+            )}/block/${latest.hash.replace("0x", "")}`;
+            callback(null, url);
+          }
+        );
+      }
+    );
   },
 
   matches(uri: string, provider: Provider, callback: Callback<any>) {
@@ -67,22 +83,30 @@ const Blockchain = {
     const expected_genesis = parsedUri.genesis_hash;
     const expected_block = parsedUri.block_hash;
 
-    this.getBlockByNumber("0x0", provider, (err: Error, { result } : JsonRPCResponse) => {
-      if (err) return callback(err);
-      const block = result;
-      if (block.hash !== expected_genesis) return callback(null, false);
-
-      this.getBlockByHash(expected_block, provider, (err: Error, { result } : JsonRPCResponse) => {
-        // Treat an error as if the block didn't exist. This is because
-        // some clients respond differently.
+    this.getBlockByNumber(
+      "0x0",
+      provider,
+      (err: Error, { result }: JsonRpcResponse) => {
+        if (err) return callback(err);
         const block = result;
-        if (err || block == null) {
-          return callback(null, false);
-        }
-
-        callback(null, true);
-      });
-    });
+        if (block.hash !== expected_genesis) return callback(null, false);
+
+        this.getBlockByHash(
+          expected_block,
+          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 callback(null, false);
+            }
+
+            callback(null, true);
+          }
+        );
+      }
+    );
   }
 };
 

packages/blockchain-utils/package.json

@@ -18,7 +18,7 @@
   "types": "./typings/index.d.ts",
   "devDependencies": {
     "@types/assert": "^1.4.2",
-    "@types/web3": "^1.0.19",
+    "@types/node": "^12.12.5",
     "mocha": "5.2.0",
     "ts-node": "^8.3.0",
     "typescript": "^3.6.3"
@@ -30,5 +30,8 @@
   ],
   "publishConfig": {
     "access": "public"
+  },
+  "dependencies": {
+    "@truffle/provider": "^0.2.0"
   }
 }

packages/blockchain-utils/tsconfig.json

@@ -10,16 +10,15 @@
     "baseUrl": ".",
     "lib": ["es2017"],
     "paths": {
-      "web3": [
-        "../../node_modules/@types/web3/index",
-        "node_modules/web3/index"
+      "net": [
+        "../../node_modules/@types/node",
+        "node_modules/@types/node"
       ]
     },
     "rootDir": ".",
     "typeRoots": [
       "./typings",
       "../../**/node_modules/@types/mocha",
-      "../../**/node_modules/@types/web3",
       "../../**/node_modules/@types/assert"
     ]
   },

packages/box/tsconfig.json

@@ -9,12 +9,7 @@
     "outDir": "dist",
     "baseUrl": ".",
     "lib": ["es2017"],
-    "paths": {
-      "web3": [
-        "../../node_modules/@types/web3/index",
-        "node_modules/web3/index"
-      ]
-    },
+    "paths": {},
     "rootDir": ".",
     "typeRoots": [
       "./typings",

packages/code-utils/tsconfig.json

@@ -9,12 +9,7 @@
     "outDir": "dist",
     "baseUrl": ".",
     "lib": ["es2017"],
-    "paths": {
-      "web3": [
-        "../../node_modules/@types/web3/index",
-        "node_modules/web3/index"
-      ]
-    },
+    "paths": {},
     "rootDir": ".",
     "typeRoots": [
       "./typings",

packages/contract/package.json

@@ -26,10 +26,10 @@
     "@truffle/interface-adapter": "^0.3.1",
     "bignumber.js": "^7.2.1",
     "ethers": "^4.0.0-beta.1",
-    "web3": "1.2.1",
-    "web3-core-promievent": "1.2.1",
-    "web3-eth-abi": "1.2.1",
-    "web3-utils": "1.2.1"
+    "web3": "1.2.2",
+    "web3-core-promievent": "1.2.2",
+    "web3-eth-abi": "1.2.2",
+    "web3-utils": "1.2.2"
   },
   "devDependencies": {
     "@truffle/compile-solidity": "^4.2.10",

packages/core/package.json

@@ -62,7 +62,7 @@
     "spawn-args": "^0.1.0",
     "temp": "^0.8.3",
     "universal-analytics": "^0.4.17",
-    "web3": "1.2.1",
+    "web3": "1.2.2",
     "xregexp": "^4.2.4",
     "yargs": "^8.0.2"
   },

packages/debugger/package.json

@@ -34,8 +34,8 @@
     "redux-saga": "1.0.0",
     "remote-redux-devtools": "^0.5.12",
     "reselect-tree": "^1.3.1",
-    "web3": "1.2.1",
-    "web3-eth-abi": "1.2.1"
+    "web3": "1.2.2",
+    "web3-eth-abi": "1.2.2"
   },
   "devDependencies": {
     "@truffle/artifactor": "^4.0.37",

packages/decode-utils/package.json

@@ -21,14 +21,13 @@
     "bn.js": "^4.11.8",
     "lodash.clonedeep": "^4.5.0",
     "lodash.escaperegexp": "^4.1.2",
-    "web3": "1.2.1",
+    "web3": "1.2.2",
     "web3-eth-abi": "1.0.0-beta.52"
   },
   "devDependencies": {
     "@types/bn.js": "^4.11.2",
     "@types/lodash.clonedeep": "^4.5.4",
     "@types/lodash.escaperegexp": "^4.1.6",
-    "@types/web3": "^1.0.5",
     "typescript": "^3.1.3"
   },
   "publishConfig": {

packages/decode-utils/tsconfig.json

@@ -9,12 +9,7 @@
     "outDir": "dist",
     "baseUrl": ".",
     "lib": ["es2017"],
-    "paths": {
-      "web3": [
-        "../../node_modules/@types/web3/index",
-        "node_modules/web3/index"
-      ]
-    },
+    "paths": {},
     "rootDir": "src",
     "typeRoots": [
       "../../**/node_modules/@types/bn.js",

packages/decoder/lib/interface/contract-decoder.ts

@@ -29,12 +29,13 @@ import {
   AstDefinition,
   AstReferences
 } from "@truffle/decode-utils";
-import { BlockType, Transaction } from "web3/eth/types";
-import { EventLog, Log } from "web3/types";
-import { Provider } from "web3/providers";
+import { Transaction, EventLog, Log } from "web3-core";
+import { Provider } from "@truffle/provider";
 import abiDecoder from "abi-decoder";
 import isEqual from "lodash.isequal"; //util.isDeepStrictEqual doesn't exist in Node 8
 
+type BlockType = number | string;
+
 export interface EvmMapping {
   name: string;
   type: string;
@@ -373,6 +374,7 @@ export default class TruffleContractDecoder extends AsyncEventEmitter {
     }
     //otherwise, get it, cache it, and return it
     let word = DecodeUtils.Conversion.toBytes(
+      // @ts-ignore
       await this.web3.eth.getStorageAt(address, slot, block),
       DecodeUtils.EVM.WORD_SIZE
     );
@@ -502,6 +504,7 @@ export default class TruffleContractDecoder extends AsyncEventEmitter {
     block: BlockType = "latest"
   ): Promise<ContractEvent[]> {
     const web3Contract = new this.web3.eth.Contract(
+      // @ts-ignore
       this.contract.abi,
       this.contractAddress
     );

packages/decoder/lib/interface/index.ts

@@ -4,7 +4,7 @@ import { EvmInfo } from "../types/evm";
 import decode from "../decode";
 import TruffleDecoder from "./contract-decoder";
 import { ContractObject } from "@truffle/contract-schema/spec";
-import { Provider } from "web3/providers";
+import { Provider } from "@truffle/provider";
 import { DecoderRequest } from "../types/request";
 
 export { getStorageAllocations, storageSize } from "../allocate/storage";
@@ -13,10 +13,19 @@ export { getMemoryAllocations } from "../allocate/memory";
 export { readStack } from "../read/stack";
 export { slotAddress } from "../read/storage";
 
-export function forContract(contract: ContractObject, relevantContracts: ContractObject[], provider: Provider, address?: string): TruffleDecoder {
+export function forContract(
+  contract: ContractObject,
+  relevantContracts: ContractObject[],
+  provider: Provider,
+  address?: string
+): TruffleDecoder {
   return new TruffleDecoder(contract, relevantContracts, provider, address);
 }
 
-export function* forEvmState(definition: AstDefinition, pointer: DataPointer, info: EvmInfo): IterableIterator<any | DecoderRequest> {
+export function* forEvmState(
+  definition: AstDefinition,
+  pointer: DataPointer,
+  info: EvmInfo
+): IterableIterator<any | DecoderRequest> {
   return yield* decode(definition, pointer, info);
 }

packages/decoder/package.json

@@ -22,6 +22,7 @@
   "types": "lib/interface/index.ts",
   "dependencies": {
     "@truffle/decode-utils": "^1.0.18",
+    "@truffle/provider": "^0.2.0",
     "abi-decoder": "^1.2.0",
     "async-eventemitter": "^0.2.4",
     "bn.js": "^4.11.8",
@@ -30,7 +31,7 @@
     "lodash.isequal": "^4.5.0",
     "lodash.merge": "^4.6.1",
     "utf8": "^3.0.0",
-    "web3": "1.2.1"
+    "web3": "1.2.2"
   },
   "peerDependencies": {
     "truffle": "^5.0.14"
@@ -47,7 +48,6 @@
     "@types/lodash.isequal": "^4.5.4",
     "@types/lodash.merge": "^4.6.4",
     "@types/utf8": "^2.1.6",
-    "@types/web3": "^1.0.5",
     "json-schema-to-typescript": "^5.5.0",
     "typescript": "^3.6.3"
   },

packages/decoder/tsconfig.json

@@ -10,9 +10,10 @@
     "baseUrl": ".",
     "lib": ["es2017"],
     "paths": {
-      "web3": ["../../node_modules/@types/web3/index", "node_modules/web3/index"],
-      "web3/types": ["../../node_modules/@types/web3/types", "node_modules/web3/types"],
-      "web3/eth/types": ["../../node_modules/@types/web3/eth/types", "node_modules/web3/eth/types"]
+      "web3-core": [
+        "../../node_modules/web3/node_modules/web3-core/types",
+        "node_modules/web3/node_modules/web3-core/types"
+      ]
     },
     "rootDir": "lib",
     "typeRoots": [
@@ -22,7 +23,8 @@
       "../../**/node_modules/@types/lodash",
       "../../**/node_modules/@types/lodash.clonedeep",
       "../../**/node_modules/@types/lodash.isequal",
-      "../../**/node_modules/@types/lodash.merge"
+      "../../**/node_modules/@types/lodash.merge",
+      "../../node_modules/@truffle/provider/typings"
     ]
 
   },

packages/deployer/package.json

@@ -23,7 +23,7 @@
     "@truffle/workflow-compile": "^2.1.11",
     "ganache-core": "2.7.0",
     "mocha": "5.2.0",
-    "web3": "1.2.1"
+    "web3": "1.2.2"
   },
   "keywords": [
     "contracts",