Revert "Merge pull request #2558 from trufflesuite/update-web3-types"

This reverts commit c3c6c03, reversing changes made to 60babc3.
trufflesuite · Dec 10, 2019 · 1dcfb41 · 1dcfb41
1 parent b16fba0
commit 1dcfb41
Show file tree

Hide file tree

Showing 38 changed files with 127 additions and 362 deletions.
diff --git a/packages/artifactor/package.json b/packages/artifactor/package.json
@@ -30,7 +30,7 @@
     "temp": "^0.8.3",
     "ts-node": "^8.3.0",
     "typescript": "^3.6.3",
-    "web3": "1.2.2"
+    "web3": "1.2.1"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/artifactor/tsconfig.json b/packages/artifactor/tsconfig.json
@@ -9,7 +9,12 @@
     "outDir": "dist",
     "baseUrl": ".",
     "lib": ["es2017"],
-    "paths": {},
+    "paths": {
+      "web3": [
+        "../../node_modules/@types/web3/index",
+        "node_modules/web3/index"
+      ]
+    },
     "rootDir": ".",
     "typeRoots": [
       "./typings",

diff --git a/packages/blockchain-utils/index.ts b/packages/blockchain-utils/index.ts
@@ -1,11 +1,11 @@
+import { Provider, Callback, JsonRPCResponse } from "web3/providers";
 import { parsedUriObject } from "typings";
-import { Callback, JsonRpcResponse, Provider } from "@truffle/provider";
 
 const Blockchain = {
   getBlockByNumber(
     blockNumber: string,
     provider: Provider,
-    callback: Callback<JsonRpcResponse>
+    callback: Callback<JsonRPCResponse>
   ) {
     const params = [blockNumber, true];
     provider.send(
@@ -22,7 +22,7 @@ const Blockchain = {
   getBlockByHash(
     blockHash: string,
     provider: Provider,
-    callback: Callback<JsonRpcResponse>
+    callback: Callback<JsonRPCResponse>
   ) {
     const params = [blockHash, true];
     provider.send(
@@ -56,14 +56,14 @@ const Blockchain = {
     this.getBlockByNumber(
       "0x0",
       provider,
-      (err: Error, { result }: JsonRpcResponse) => {
+      (err: Error, { result }: JsonRPCResponse) => {
         if (err) return callback(err);
         genesis = result;
 
         this.getBlockByNumber(
           "latest",
           provider,
-          (err: Error, { result }: JsonRpcResponse) => {
+          (err: Error, { result }: JsonRPCResponse) => {
             if (err) return callback(err);
             latest = result;
             const url = `blockchain://${genesis.hash.replace(
@@ -86,15 +86,15 @@ const Blockchain = {
     this.getBlockByNumber(
       "0x0",
       provider,
-      (err: Error, { result }: JsonRpcResponse) => {
+      (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) => {
+          (err: Error, { result }: JsonRPCResponse) => {
             // Treat an error as if the block didn't exist. This is because
             // some clients respond differently.
             const block = result;

diff --git a/packages/blockchain-utils/package.json b/packages/blockchain-utils/package.json
@@ -20,6 +20,7 @@
     "@types/assert": "^1.4.2",
     "@types/mocha": "^5.2.7",
     "@types/node": "^12.12.5",
+    "@types/web3": "1.0.19",
     "mocha": "5.2.0",
     "ts-node": "^8.3.0",
     "typescript": "^3.6.3"
@@ -31,8 +32,5 @@
   ],
   "publishConfig": {
     "access": "public"
-  },
-  "dependencies": {
-    "@truffle/provider": "^0.2.3"
   }
 }
diff --git a/packages/blockchain-utils/tsconfig.json b/packages/blockchain-utils/tsconfig.json
@@ -10,16 +10,17 @@
     "baseUrl": ".",
     "lib": ["es2017"],
     "paths": {
-      "net": [
-        "../../node_modules/@types/node",
-        "node_modules/@types/node"
+      "web3": [
+        "../../node_modules/@types/web3/index",
+        "node_modules/web3/index"
       ]
     },
     "rootDir": ".",
     "typeRoots": [
       "./typings",
-      "../../**/node_modules/@types/mocha",
-      "../../**/node_modules/@types/assert"
+      "../../node_modules/@types/mocha",
+      "../../node_modules/@types/web3",
+      "../../node_modules/@types/assert"
     ]
   },
   "include": [

diff --git a/packages/box/tsconfig.json b/packages/box/tsconfig.json
@@ -9,7 +9,12 @@
     "outDir": "dist",
     "baseUrl": ".",
     "lib": ["es2017"],
-    "paths": {},
+    "paths": {
+      "web3": [
+        "../../node_modules/@types/web3/index",
+        "node_modules/web3/index"
+      ]
+    },
     "rootDir": ".",
     "typeRoots": [
       "./typings",

diff --git a/packages/code-utils/tsconfig.json b/packages/code-utils/tsconfig.json
@@ -9,7 +9,12 @@
     "outDir": "dist",
     "baseUrl": ".",
     "lib": ["es2017"],
-    "paths": {},
+    "paths": {
+      "web3": [
+        "../../node_modules/@types/web3/index",
+        "node_modules/web3/index"
+      ]
+    },
     "rootDir": ".",
     "typeRoots": [
       "./typings",

diff --git a/packages/contract/package.json b/packages/contract/package.json
@@ -27,10 +27,10 @@
     "bignumber.js": "^7.2.1",
     "ethereum-ens": "^0.7.7",
     "ethers": "^4.0.0-beta.1",
-    "web3": "1.2.2",
-    "web3-core-promievent": "1.2.2",
-    "web3-eth-abi": "1.2.2",
-    "web3-utils": "1.2.2"
+    "web3": "1.2.1",
+    "web3-core-promievent": "1.2.1",
+    "web3-eth-abi": "1.2.1",
+    "web3-utils": "1.2.1"
   },
   "devDependencies": {
     "@truffle/compile-solidity": "^4.2.13",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -64,8 +64,8 @@
     "spawn-args": "^0.1.0",
     "temp": "^0.8.3",
     "universal-analytics": "^0.4.17",
-    "web3": "1.2.2",
-    "web3-utils": "1.2.2",
+    "web3": "1.2.1",
+    "web3-utils": "1.2.1",
     "xregexp": "^4.2.4",
     "yargs": "^8.0.2"
   },

diff --git a/packages/debugger/package.json b/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.2",
-    "web3-eth-abi": "1.2.2"
+    "web3": "1.2.1",
+    "web3-eth-abi": "1.2.1"
   },
   "devDependencies": {
     "@truffle/artifactor": "^4.0.40",

diff --git a/packages/decoder/lib/decoders.ts b/packages/decoder/lib/decoders.ts
@@ -21,7 +21,7 @@ import * as DecoderTypes from "./types";
 import Web3 from "web3";
 import { ContractObject as Artifact } from "@truffle/contract-schema/spec";
 import BN from "bn.js";
-import { Provider } from "@truffle/provider";
+import { Provider } from "web3/providers";
 import {
   ContractBeingDecodedHasNoNodeError,
   ContractAllocationFailedError,

diff --git a/packages/decoder/lib/index.ts b/packages/decoder/lib/index.ts
@@ -152,7 +152,7 @@ export {
   BlockSpecifier
 } from "./types";
 
-import { Provider } from "@truffle/provider";
+import { Provider } from "web3/providers";
 import { ContractObject as Artifact } from "@truffle/contract-schema/spec";
 import { ContractConstructorObject, ContractInstanceObject } from "./types";
 

diff --git a/packages/decoder/package.json b/packages/decoder/package.json
@@ -13,6 +13,12 @@
     "start": "node_modules/.bin/tsc --watch",
     "test": "cd test && npx truffle test"
   },
+  "dependencies": {
+    "@truffle/codec": "^0.2.0",
+    "bn.js": "^4.11.8",
+    "debug": "^4.1.0",
+    "web3": "1.2.1"
+  },
   "repository": "https://github.com/trufflesuite/truffle/tree/master/packages/codec",
   "keywords": [
     "ethereum",
@@ -42,14 +48,9 @@
     "@types/lodash.isequal": "^4.5.4",
     "@types/lodash.merge": "^4.6.4",
     "@types/utf8": "^2.1.6",
+    "@types/web3": "1.0.19",
     "typescript": "^3.6.3"
   },
-  "dependencies": {
-    "@truffle/codec": "^0.2.0",
-    "bn.js": "^4.11.8",
-    "debug": "^4.1.0",
-    "web3": "1.2.2"
-  },
   "peerDependencies": {
     "truffle": "^5.0.14"
   },

diff --git a/packages/decoder/tsconfig.json b/packages/decoder/tsconfig.json
@@ -10,6 +10,11 @@
     "outDir": "dist",
     "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"]
+    },
     "rootDir": "lib",
     "typeRoots": [
       "./typings",

diff --git a/packages/deployer/package.json b/packages/deployer/package.json
@@ -29,7 +29,7 @@
     "ganache-core": "2.8.0",
     "mocha": "5.2.0",
     "sinon": "^7.3.2",
-    "web3": "1.2.2"
+    "web3": "1.2.1"
   },
   "keywords": [
     "contracts",

diff --git a/packages/environment/package.json b/packages/environment/package.json
@@ -19,7 +19,7 @@
     "@truffle/resolver": "^5.0.22",
     "ganache-core": "2.8.0",
     "node-ipc": "^9.1.1",
-    "web3": "1.2.2"
+    "web3": "1.2.1"
   },
   "devDependencies": {
     "debug": "^4.1.0"

diff --git a/packages/external-compile/package.json b/packages/external-compile/package.json
@@ -18,7 +18,7 @@
     "@truffle/expect": "^0.0.13",
     "debug": "^4.1.0",
     "glob": "^7.1.2",
-    "web3-utils": "1.2.2"
+    "web3-utils": "1.2.1"
   },
   "devDependencies": {
     "chai": "4.2.0",

diff --git a/packages/hdwallet-provider/package.json b/packages/hdwallet-provider/package.json
@@ -17,15 +17,14 @@
   },
   "types": "dist/index.d.ts",
   "dependencies": {
-    "@truffle/provider": "^0.2.3",
     "any-promise": "^1.3.0",
     "bindings": "^1.5.0",
     "bip39": "^2.4.2",
     "ethereum-protocol": "^1.0.1",
     "ethereumjs-tx": "^1.0.0",
     "ethereumjs-util": "^6.1.0",
     "ethereumjs-wallet": "^0.6.3",
-    "web3": "1.2.2",
+    "web3": "1.2.1",
     "web3-provider-engine": "https://github.com/trufflesuite/provider-engine#web3-one"
   },
   "devDependencies": {

diff --git a/packages/hdwallet-provider/src/index.ts b/packages/hdwallet-provider/src/index.ts
@@ -11,7 +11,7 @@ import ProviderSubprovider from "web3-provider-engine/subproviders/provider";
 import Url from "url";
 import Web3 from "web3";
 import { JSONRPCRequestPayload, JSONRPCErrorCallback } from "ethereum-protocol";
-import { Callback, JsonRpcResponse } from "@truffle/provider";
+import { Callback, JsonRPCResponse } from "web3/providers";
 
 // Important: do not use debug module. Reason: https://github.com/trufflesuite/truffle/issues/2374#issuecomment-536109086
 
@@ -175,14 +175,14 @@ class HDWalletProvider {
 
   public send(
     payload: JSONRPCRequestPayload,
-    callback: JSONRPCErrorCallback | Callback<JsonRpcResponse>
+    callback: JSONRPCErrorCallback | Callback<JsonRPCResponse>
   ): void {
     return this.engine.send.call(this.engine, payload, callback);
   }
 
   public sendAsync(
     payload: JSONRPCRequestPayload,
-    callback: JSONRPCErrorCallback | Callback<JsonRpcResponse>
+    callback: JSONRPCErrorCallback | Callback<JsonRPCResponse>
   ): void {
     this.engine.sendAsync.call(this.engine, payload, callback);
   }

diff --git a/packages/hdwallet-provider/test/provider.test.ts b/packages/hdwallet-provider/test/provider.test.ts
@@ -6,7 +6,6 @@ import WalletProvider from "../dist";
 import { describe, it } from "mocha";
 
 describe("HD Wallet Provider", function() {
-  // @ts-ignore
   const web3 = new Web3();
   const port = 8545;
   let server: any;
@@ -47,7 +46,7 @@ describe("HD Wallet Provider", function() {
     assert.deepEqual(provider.getAddresses(), truffleDevAccounts);
     web3.setProvider(provider);
 
-    web3.eth.getBlockNumber((err: Error, number: number) => {
+    web3.eth.getBlockNumber((err, number) => {
       assert(number === 0);
       done();
     });
@@ -78,7 +77,7 @@ describe("HD Wallet Provider", function() {
       assert(EthUtil.isValidAddress(address), "invalid address");
     });
 
-    web3.eth.getBlockNumber((err: Error, number: number) => {
+    web3.eth.getBlockNumber((err, number) => {
       assert(number === 0);
       done();
     });
@@ -119,7 +118,7 @@ describe("HD Wallet Provider", function() {
       );
     });
 
-    web3.eth.getBlockNumber((err: Error, number: number) => {
+    web3.eth.getBlockNumber((err, number) => {
       assert(number === 0);
       done();
     });

diff --git a/packages/hdwallet-provider/tsconfig.json b/packages/hdwallet-provider/tsconfig.json
@@ -18,8 +18,8 @@
       ]
     },
     "typeRoots": [
-      "../../node_modules/@types/mocha",
-      "../../node_modules/@truffle/provider/typings"
+      "./typings",
+      "../../node_modules/@types/mocha"
     ]
   },
   "include": [

diff --git a/packages/hdwallet-provider/typings/web3-provider-engine/index.d.ts b/packages/hdwallet-provider/typings/web3-provider-engine/index.d.ts
@@ -3,7 +3,7 @@ import {
   JSONRPCRequestPayload,
   JSONRPCErrorCallback
 } from "ethereum-protocol";
-import { Callback, JsonRpcResponse } from "@truffle/provider";
+import { Callback, JsonRPCResponse } from "web3/providers";
 
 interface Web3ProviderEngineOptions {
   pollingInterval?: number;
@@ -15,11 +15,11 @@ declare class Web3ProviderEngine implements Provider {
   on(event: string, handler: () => void): void;
   send(
     payload: JSONRPCRequestPayload,
-    callback?: JSONRPCErrorCallback | Callback<JsonRpcResponse>
+    callback?: JSONRPCErrorCallback | Callback<JsonRPCResponse>
   ): void;
   sendAsync(
     payload: JSONRPCRequestPayload,
-    callback: JSONRPCErrorCallback | Callback<JsonRpcResponse>
+    callback: JSONRPCErrorCallback | Callback<JsonRPCResponse>
   ): void;
   addProvider(provider: any): void;
   // start block polling

diff --git a/packages/interface-adapter/lib/adapter/index.ts b/packages/interface-adapter/lib/adapter/index.ts
@@ -2,7 +2,6 @@ import { Web3InterfaceAdapter, Web3InterfaceAdapterOptions } from "./web3";
 
 import { InterfaceAdapter } from "./types";
 
-// type union of supported network types
 export type InterfaceAdapterOptions = Web3InterfaceAdapterOptions;
 
 const getNetworkTypeClass = (networkType = "ethereum") => {