Merge pull request #3458 from trufflesuite/update-web3-take-2

Dependency update: Bump web3 to 1.2.9

packages/artifactor/package.json

@@ -35,7 +35,7 @@
     "tmp": "^0.2.1",
     "ts-node": "8.10.2",
     "typescript": "3.9.6",
-    "web3": "1.2.1"
+    "web3": "1.2.9"
   },
   "publishConfig": {
     "access": "public"

packages/contract-tests/package.json

@@ -1,24 +1,24 @@
 {
+  "private": true,
   "name": "@truffle/contract-tests",
-  "version": "0.1.8",
   "description": "Test suite for @truffle/contract smart contract abstraction (unpublished)",
+  "license": "MIT",
   "author": "g. nicholas d'andrea <gnidan@trufflesuite.com>",
   "homepage": "https://github.com/trufflesuite/truffle#readme",
-  "license": "MIT",
-  "private": true,
   "repository": {
     "type": "git",
     "url": "git+https://github.com/trufflesuite/truffle.git"
   },
+  "bugs": {
+    "url": "https://github.com/trufflesuite/truffle/issues"
+  },
+  "version": "0.1.8",
   "scripts": {
     "prepare": "exit 0",
     "test": "./scripts/test.sh",
     "test:debug": "$(yarn bin)/mocha --inspect-brk",
     "test:trace": "$(yarn bin)/mocha --trace-warnings"
   },
-  "bugs": {
-    "url": "https://github.com/trufflesuite/truffle/issues"
-  },
   "devDependencies": {
     "@truffle/blockchain-utils": "^0.0.25",
     "@truffle/compile-solidity": "^5.0.4",
@@ -29,7 +29,7 @@
     "ganache-core": "2.13.0",
     "mocha": "8.0.1",
     "sinon": "9.0.2",
-    "web3": "1.2.1",
+    "web3": "1.2.9",
     "web3-core-promievent": "1.2.1"
   }
 }

packages/contract-tests/test/errors.js

@@ -310,19 +310,19 @@ describe("Client appends errors (vmErrorsOnRPCResponse)", function () {
         assert.fail();
       } catch (e) {
         assert(
-          e.stack.includes("Error: invalid number value ("),
+          e.stack.includes("Error: invalid BigNumber string"),
           "Should keep hijacked error description"
         );
         assert(
           e.stack.includes("/test/errors.js:"),
           "Should include original stack details"
         );
         assert(
-          e.hijackedStack.includes("Error: invalid number value ("),
+          e.hijackedStack.includes("Error: invalid BigNumber string"),
           "Should preserve hijacked error message"
         );
         assert(
-          e.hijackedStack.includes("/utils/abi-coder.js:"),
+          e.hijackedStack.includes("/lib/abi-coder.js:"),
           "Should preserve hijacked stack details"
         );
       }

packages/contract/package.json

@@ -26,7 +26,7 @@
     "ethereum-ens": "^0.8.0",
     "ethers": "^4.0.0-beta.1",
     "source-map-support": "^0.5.19",
-    "web3": "1.2.1",
+    "web3": "1.2.9",
     "web3-core-helpers": "1.2.1",
     "web3-core-promievent": "1.2.1",
     "web3-eth-abi": "1.2.1",

packages/core/package.json

@@ -68,7 +68,7 @@
     "spawn-args": "^0.1.0",
     "tmp": "^0.2.1",
     "universal-analytics": "^0.4.17",
-    "web3": "1.2.1",
+    "web3": "1.2.9",
     "web3-utils": "1.2.1",
     "xregexp": "^4.2.4",
     "yargs": "^8.0.2"

packages/db/package.json

@@ -1,41 +1,57 @@
 {
   "name": "@truffle/db",
-  "version": "0.1.0-3",
   "description": "Smart contract data aggregation",
-  "keywords": [
-    "truffle",
-    "smart-contracts",
-    "ethereum",
-    "database"
-  ],
+  "license": "MIT",
   "author": "g. nicholas d'andrea <gnidan@users.noreply.github.com>",
   "homepage": "https://github.com/trufflesuite/truffle#readme",
-  "license": "MIT",
-  "main": "dist/src/index.js",
-  "directories": {
-    "dist": "dist"
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/trufflesuite/truffle.git"
+  },
+  "bugs": {
+    "url": "https://github.com/trufflesuite/truffle/issues"
   },
+  "version": "0.1.0-3",
+  "main": "dist/src/index.js",
   "files": [
     "dist",
     "types/schema.d.ts"
   ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/trufflesuite/truffle.git"
+  "directories": {
+    "dist": "dist"
   },
   "scripts": {
+    "build": "./bin/build",
     "clean": "rm -rf ./dist ./types/schema.d.ts",
     "prepare": "yarn build",
-    "build": "./bin/build",
     "start": "ts-node-dev -r tsconfig-paths/register ./bin/server",
     "start:debug": "DEBUG=pouchdb:api ts-node-dev -r tsconfig-paths/register ./bin/server",
     "start:drizzle": "ts-node-dev -r tsconfig-paths/register ./bin/server ./test/truffle-projects/drizzle-box",
     "start:drizzle:debug": "DEBUG=pouchdb:api ts-node-dev -r tsconfig-paths/register ./bin/server ./test/truffle-projects/drizzle-box",
     "madge": "madge ./src/db.ts",
     "test": "jest --verbose --detectOpenHandles"
   },
-  "bugs": {
-    "url": "https://github.com/trufflesuite/truffle/issues"
+  "dependencies": {
+    "@truffle/compile-common": "^0.4.1",
+    "@truffle/workflow-compile": "^3.0.4",
+    "apollo-server": "^2.18.2",
+    "fse": "^4.0.1",
+    "graphql": "^15.3.0",
+    "graphql-tag": "^2.11.0",
+    "graphql-tools": "^6.2.4",
+    "jsondown": "^1.0.0",
+    "leveldown": "^5.2.0",
+    "module-alias": "^2.1.0",
+    "pascal-case": "^2.0.1",
+    "pluralize": "^8.0.0",
+    "pouchdb": "7.1.1",
+    "pouchdb-adapter-memory": "^7.1.1",
+    "pouchdb-adapter-node-websql": "^7.0.0",
+    "pouchdb-debug": "^7.1.1",
+    "pouchdb-find": "^7.0.0",
+    "source-map-support": "^0.5.9",
+    "web3": "1.2.9",
+    "web3-utils": "1.2.2"
   },
   "devDependencies": {
     "@gql2ts/from-schema": "^2.0.0-4",
@@ -58,28 +74,19 @@
     "ttypescript": "^1.5.7",
     "typescript": "^3.6.3"
   },
-  "dependencies": {
-    "@truffle/compile-common": "^0.4.1",
-    "@truffle/workflow-compile": "^3.0.4",
-    "apollo-server": "^2.18.2",
-    "fse": "^4.0.1",
-    "graphql": "^15.3.0",
-    "graphql-tag": "^2.11.0",
-    "graphql-tools": "^6.2.4",
-    "jsondown": "^1.0.0",
-    "leveldown": "^5.2.0",
-    "module-alias": "^2.1.0",
-    "pascal-case": "^2.0.1",
-    "pluralize": "^8.0.0",
-    "pouchdb": "7.1.1",
-    "pouchdb-adapter-memory": "^7.1.1",
-    "pouchdb-adapter-node-websql": "^7.0.0",
-    "pouchdb-debug": "^7.1.1",
-    "pouchdb-find": "^7.0.0",
-    "source-map-support": "^0.5.9",
-    "web3": "1.2.2",
-    "web3-utils": "1.2.2"
+  "keywords": [
+    "database",
+    "ethereum",
+    "smart-contracts",
+    "truffle"
+  ],
+  "publishConfig": {
+    "access": "public"
   },
+  "_moduleAliases": {
+    "@truffle/db": "db/dist/src"
+  },
+  "gitHead": "4c327e21da2e7abebcc1d78879a8d6f0eb7d802c",
   "jest": {
     "moduleFileExtensions": [
       "ts",
@@ -108,12 +115,5 @@
       "<rootDir>/src/**/test/*\\.(spec|test)\\.(ts|js)",
       "<rootDir>/test/**/test/*\\.(spec|test)\\.(ts|js)"
     ]
-  },
-  "_moduleAliases": {
-    "@truffle/db": "db/dist/src"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "gitHead": "4c327e21da2e7abebcc1d78879a8d6f0eb7d802c"
+  }
 }

packages/debugger/package.json

@@ -39,7 +39,7 @@
     "reselect-tree": "^1.3.4",
     "semver": "^6.3.0",
     "source-map-support": "^0.5.19",
-    "web3": "1.2.1",
+    "web3": "1.2.9",
     "web3-eth-abi": "1.2.1"
   },
   "devDependencies": {

packages/decoder/package.json

@@ -28,7 +28,7 @@
     "bn.js": "^4.11.8",
     "debug": "^4.1.0",
     "source-map-support": "^0.5.19",
-    "web3": "1.2.1"
+    "web3": "1.2.9"
   },
   "peerDependencies": {
     "truffle": "^5.0.14"

packages/deployer/package.json

@@ -30,7 +30,7 @@
     "ganache-core": "2.13.0",
     "mocha": "8.1.2",
     "sinon": "9.0.2",
-    "web3": "1.2.1"
+    "web3": "1.2.9"
   },
   "keywords": [
     "contracts",

packages/environment/package.json

@@ -23,7 +23,7 @@
     "ganache-core": "2.13.0",
     "node-ipc": "^9.1.1",
     "source-map-support": "^0.5.19",
-    "web3": "1.2.1"
+    "web3": "1.2.9"
   },
   "devDependencies": {
     "debug": "^4.1.0"

packages/interface-adapter/lib/adapter/types.ts

@@ -3,14 +3,14 @@ import {
   BlockType as EvmBlockType,
   Tx as EvmTransaction
 } from "web3/eth/types";
-import { TransactionReceipt as EvmTransactionReceipt } from "web3/types";
+import { TransactionReceipt as EvmTransactionReceipt } from "web3-eth/types";
 
 export {
   Block as EvmBlock,
   BlockType as EvmBlockType,
   Tx as EvmTransaction
 } from "web3/eth/types";
-export { TransactionReceipt as EvmTransactionReceipt } from "web3/types";
+export { TransactionReceipt as EvmTransactionReceipt } from "web3-eth/types";
 export { Provider } from "web3/providers";
 export type NetworkId = Number | String;
 export type Block = EvmBlock | any;

packages/interface-adapter/package.json

@@ -23,7 +23,7 @@
     "bn.js": "^4.11.8",
     "ethers": "^4.0.32",
     "source-map-support": "^0.5.19",
-    "web3": "1.2.1"
+    "web3": "1.2.9"
   },
   "devDependencies": {
     "@types/bn.js": "^4.11.4",

packages/migrate/package.json

@@ -23,7 +23,7 @@
     "@truffle/require": "^2.0.54",
     "emittery": "^0.4.0",
     "glob": "^7.1.6",
-    "web3": "1.2.1"
+    "web3": "1.2.9"
   },
   "devDependencies": {
     "mocha": "8.1.2",

packages/provider/package.json

@@ -18,7 +18,7 @@
   "dependencies": {
     "@truffle/error": "^0.0.11",
     "@truffle/interface-adapter": "^0.4.17",
-    "web3": "1.2.1"
+    "web3": "1.2.9"
   },
   "devDependencies": {
     "ganache-core": "2.13.0",

packages/require/package.json

@@ -19,7 +19,7 @@
     "@truffle/expect": "^0.0.15",
     "@truffle/interface-adapter": "^0.4.17",
     "original-require": "1.0.1",
-    "web3": "1.2.1"
+    "web3": "1.2.9"
   },
   "devDependencies": {
     "mocha": "8.1.2"

packages/truffle/package.json

@@ -51,7 +51,7 @@
     "shebang-loader": "0.0.1",
     "stream-buffers": "^3.0.1",
     "tmp": "0.2.1",
-    "web3": "1.2.1",
+    "web3": "1.2.9",
     "webpack": "^4.43.0",
     "webpack-bundle-analyzer": "^3.0.3",
     "webpack-cli": "^3.3.11",
@@ -67,6 +67,6 @@
       "url": "https://github.com/tcoulter"
     }
   ],
-  "namespace": "consensys",
-  "gitHead": "ad57ef2ef13380c7923d5c6682540540755a0435"
+  "gitHead": "ad57ef2ef13380c7923d5c6682540540755a0435",
+  "namespace": "consensys"
 }