embarklabs · michaelsbradleyjr · Dec 20, 2019 · Dec 17, 2019
diff --git a/package.json b/package.json
@@ -1,6 +1,7 @@
 {
   "devDependencies": {
     "babel-eslint": "10.0.3",
+    "bignumber.js": "5.0.0",
     "chalk": "2.4.2",
     "coveralls": "3.0.9",
     "eslint": "6.2.2",
@@ -82,6 +83,7 @@
       "embark-dapp-template-demo/bootstrap",
       "embark-dapp-test-app/embark-dapp-test-service",
       "embark-dapp-test-app/zeppelin-solidity",
+      "embark-ui/bignumber.js",
       "embark-ui/react-scripts",
       "embark-ui/react-scripts/**",
       "embark/embark-test-contract-0",

diff --git a/packages/cockpit/ui/package.json b/packages/cockpit/ui/package.json
@@ -101,7 +101,7 @@
     "typescript": "3.7.2",
     "uuid": "3.3.2",
     "velocity-react": "1.4.1",
-    "web3": "1.2.1",
+    "web3": "1.2.4",
     "webpack": "4.41.2"
   },
   "eslintConfig": {

diff --git a/packages/core/code-runner/package.json b/packages/core/code-runner/package.json
@@ -58,7 +58,7 @@
     "fs-extra": "8.1.0",
     "parse-json": "4.0.0",
     "vm2": "3.6.4",
-    "web3": "1.2.1"
+    "web3": "1.2.4"
   },
   "devDependencies": {
     "embark-solo": "^5.0.0-alpha.5",

diff --git a/packages/core/core/package.json b/packages/core/core/package.json
@@ -50,7 +50,6 @@
   "dependencies": {
     "@babel/runtime-corejs3": "7.7.4",
     "@types/deep-equal": "1.0.1",
-    "@types/web3": "1.0.12",
     "colors": "1.3.2",
     "core-js": "3.4.3",
     "decompress": "4.2.0",
@@ -67,6 +66,8 @@
     "parse-json": "4.0.0",
     "shelljs": "0.8.3",
     "uuid": "3.3.2",
+    "web3": "1.2.4",
+    "web3-utils": "1.2.4",
     "window-size": "1.1.1"
   },
   "devDependencies": {

diff --git a/packages/core/core/src/index.ts b/packages/core/core/src/index.ts
@@ -2,10 +2,10 @@ export type Callback<Tv> = (err?: Error | null, val?: Tv) => void;
 
 export type Maybe<T> = false | 0 | undefined | null | T;
 
-import { ABIDefinition } from 'web3/eth/abi';
+import { AbiItem } from "web3-utils";
 
 export interface Contract {
-  abiDefinition: ABIDefinition[];
+  abiDefinition: AbiItem[];
   deployedAddress: string;
   className: string;
   silent?: boolean;

diff --git a/packages/core/utils/package.json b/packages/core/utils/package.json
@@ -69,9 +69,9 @@
     "ora": "4.0.3",
     "pretty-ms": "5.0.0",
     "shelljs": "0.8.3",
-    "web3": "1.2.1",
-    "web3-eth": "1.2.1",
-    "web3-eth-abi": "1.2.1",
+    "web3": "1.2.4",
+    "web3-eth": "1.2.4",
+    "web3-eth-abi": "1.2.4",
     "ws": "7.1.2"
   },
   "devDependencies": {

diff --git a/packages/embark/package.json b/packages/embark/package.json
@@ -91,6 +91,7 @@
     "find-up": "2.1.0",
     "flatted": "0.2.3",
     "fs-extra": "8.1.0",
+    "ganache-cli": "6.7.0",
     "glob": "7.1.4",
     "globule": "1.2.1",
     "hosted-git-info": "2.7.1",
@@ -119,25 +120,25 @@
     "term.js": "0.0.7",
     "viz.js": "1.8.2",
     "vm2": "3.6.4",
-    "web3": "1.2.1",
-    "web3-bzz": "1.2.1",
-    "web3-core": "1.2.1",
-    "web3-core-helpers": "1.2.1",
-    "web3-core-method": "1.2.1",
-    "web3-core-promievent": "1.2.1",
-    "web3-core-subscriptions": "1.2.1",
-    "web3-eth": "1.2.1",
-    "web3-eth-abi": "1.2.1",
-    "web3-eth-accounts": "1.2.1",
-    "web3-eth-contract": "1.2.1",
-    "web3-eth-iban": "1.2.1",
-    "web3-eth-personal": "1.2.1",
-    "web3-net": "1.2.1",
-    "web3-providers-http": "1.2.1",
-    "web3-providers-ipc": "1.2.1",
-    "web3-providers-ws": "1.2.1",
-    "web3-shh": "1.2.1",
-    "web3-utils": "1.2.1",
+    "web3": "1.2.4",
+    "web3-bzz": "1.2.4",
+    "web3-core": "1.2.4",
+    "web3-core-helpers": "1.2.4",
+    "web3-core-method": "1.2.4",
+    "web3-core-promievent": "1.2.4",
+    "web3-core-subscriptions": "1.2.4",
+    "web3-eth": "1.2.4",
+    "web3-eth-abi": "1.2.4",
+    "web3-eth-accounts": "1.2.4",
+    "web3-eth-contract": "1.2.4",
+    "web3-eth-iban": "1.2.4",
+    "web3-eth-personal": "1.2.4",
+    "web3-net": "1.2.4",
+    "web3-providers-http": "1.2.4",
+    "web3-providers-ipc": "1.2.4",
+    "web3-providers-ws": "1.2.4",
+    "web3-shh": "1.2.4",
+    "web3-utils": "1.2.4",
     "window-size": "1.1.1"
   },
   "devDependencies": {

diff --git a/packages/embarkjs/embarkjs/package.json b/packages/embarkjs/embarkjs/package.json
@@ -79,7 +79,7 @@
     "nyc": "13.1.0",
     "rimraf": "3.0.0",
     "source-map-support": "0.5.13",
-    "web3": "1.2.1"
+    "web3": "1.2.4"
   },
   "engines": {
     "node": ">=10.17.0 <12.0.0",

diff --git a/packages/embarkjs/embarkjs/src/lib/index.js b/packages/embarkjs/embarkjs/src/lib/index.js
@@ -28,7 +28,7 @@ EmbarkJS.Contract = function() {
   throw new Error('EmbarkJS.Contract is deprecated: please use EmbarkJS.Blockchain.Contract instead');
 };
 EmbarkJS.isNewWeb3 = function() {
-  throw new Error('EmbarkJS.isNewWeb3 is deprecated: only Web3 >=1.2.1 is supported now');
+  throw new Error('EmbarkJS.isNewWeb3 is deprecated: only Web3 >=1.2.4 is supported now');
 };
 
 export default EmbarkJS;
diff --git a/packages/embarkjs/ens/package.json b/packages/embarkjs/ens/package.json
@@ -51,7 +51,7 @@
     "core-js": "3.4.3",
     "embarkjs": "^5.0.0-alpha.5",
     "eth-ens-namehash": "2.0.8",
-    "web3": "1.2.1"
+    "web3": "1.2.4"
   },
   "devDependencies": {
     "ajv": "6.10.2",

diff --git a/packages/embarkjs/swarm/package.json b/packages/embarkjs/swarm/package.json
@@ -50,7 +50,7 @@
     "@babel/runtime-corejs3": "7.7.4",
     "core-js": "3.4.3",
     "swarm-api": "0.1.2",
-    "web3": "1.2.1"
+    "web3": "1.2.4"
   },
   "devDependencies": {
     "ajv": "6.10.2",

diff --git a/packages/embarkjs/web3/package.json b/packages/embarkjs/web3/package.json
@@ -49,7 +49,7 @@
   "dependencies": {
     "@babel/runtime-corejs3": "7.7.4",
     "core-js": "3.4.3",
-    "web3": "1.2.1"
+    "web3": "1.2.4"
   },
   "devDependencies": {
     "ajv": "6.10.2",

diff --git a/packages/embarkjs/whisper/package.json b/packages/embarkjs/whisper/package.json
@@ -50,7 +50,7 @@
     "@babel/runtime-corejs3": "7.7.4",
     "core-js": "3.4.3",
     "rxjs": "6.4.0",
-    "web3": "1.2.1"
+    "web3": "1.2.4"
   },
   "devDependencies": {
     "ajv": "6.10.2",

diff --git a/packages/plugins/accounts-manager/package.json b/packages/plugins/accounts-manager/package.json
@@ -52,7 +52,7 @@
     "embark-i18n": "^5.0.0-alpha.5",
     "embark-logger": "^5.0.0-alpha.5",
     "embark-utils": "^5.0.0-alpha.8",
-    "web3": "1.2.1"
+    "web3": "1.2.4"
   },
   "devDependencies": {
     "embark-solo": "^5.0.0-alpha.5",

diff --git a/packages/plugins/accounts-manager/src/fundAccount.ts b/packages/plugins/accounts-manager/src/fundAccount.ts
@@ -9,8 +9,7 @@ export default async function fundAccount(web3: Web3, accountAddress: string, co
   const targetBalance = web3.utils.toBN(hexBalance);
 
   // check if account is already funded
-  let accountBalance = await web3.eth.getBalance(accountAddress);
-  accountBalance = web3.utils.toBN(accountBalance);
+  const accountBalance = web3.utils.toBN(await web3.eth.getBalance(accountAddress));
   if (accountBalance.gte(targetBalance)) {
     return;
   }

diff --git a/packages/plugins/coverage/package.json b/packages/plugins/coverage/package.json
@@ -49,7 +49,6 @@
     "@types/mocha": "5.2.7",
     "@types/prettier": "1.16.4",
     "@types/semver": "5.5.0",
-    "@types/web3": "1.0.12",
     "core-js": "3.4.3",
     "embark-core": "^5.0.0-alpha.8",
     "embark-utils": "^5.0.0-alpha.8",
@@ -58,7 +57,8 @@
     "prettier-plugin-solidity": "1.0.0-alpha.25",
     "semver": "5.6.0",
     "solidity-parser-antlr": "0.4.5",
-    "web3-eth-contract": "1.2.1"
+    "web3-core": "1.2.4",
+    "web3-eth-contract": "1.2.4"
   },
   "devDependencies": {
     "@babel/cli": "7.7.4",

diff --git a/packages/plugins/coverage/src/lib/contractEnhanced.ts b/packages/plugins/coverage/src/lib/contractEnhanced.ts
@@ -2,7 +2,7 @@ import {File} from "embark-utils";
 import * as fs from "fs-extra";
 import * as path from "path";
 import parser, {LineColumn, Location, SourceUnit} from "solidity-parser-antlr";
-import {EventLog} from "web3/types";
+import {EventLog} from "web3-core";
 
 import {decrypt} from "./eventId";
 import {Injector} from "./injector";

diff --git a/packages/plugins/coverage/src/lib/index.ts b/packages/plugins/coverage/src/lib/index.ts
@@ -2,7 +2,7 @@ import { Contract, Embark } from "embark-core";
 import { dappPath, File } from "embark-utils";
 import * as globule from "globule";
 import * as path from "path";
-import Web3Contract from "web3/eth/contract";
+import { Contract as Web3Contract } from "web3-eth-contract";
 
 import { ContractEnhanced } from "./contractEnhanced";
 import { coverageContractsPath } from "./path";

diff --git a/packages/plugins/deploy-tracker/package.json b/packages/plugins/deploy-tracker/package.json
@@ -49,7 +49,7 @@
     "embark-logger": "^5.0.0-alpha.5",
     "embark-utils": "^5.0.0-alpha.8",
     "fs-extra": "8.1.0",
-    "web3": "1.2.1"
+    "web3": "1.2.4"
   },
   "devDependencies": {
     "embark-solo": "^5.0.0-alpha.5",

diff --git a/packages/plugins/ens/package.json b/packages/plugins/ens/package.json
@@ -53,7 +53,7 @@
     "embarkjs-ens": "^5.0.0-alpha.6",
     "eth-ens-namehash": "2.0.8",
     "lodash.clonedeep": "4.5.0",
-    "web3": "1.2.1"
+    "web3": "1.2.4"
   },
   "devDependencies": {
     "@babel/core": "7.7.4",

diff --git a/packages/plugins/ethereum-blockchain-client/package.json b/packages/plugins/ethereum-blockchain-client/package.json
@@ -52,8 +52,8 @@
     "embark-utils": "^5.0.0-alpha.8",
     "embarkjs": "^5.0.0-alpha.5",
     "ethereumjs-util": "6.0.0",
-    "web3": "1.2.1",
-    "web3-core-requestmanager": "1.2.1"
+    "web3": "1.2.4",
+    "web3-core-requestmanager": "1.2.4"
   },
   "devDependencies": {
     "embark-solo": "^5.0.0-alpha.5",

diff --git a/packages/plugins/ganache/package.json b/packages/plugins/ganache/package.json
@@ -46,7 +46,7 @@
   "dependencies": {
     "@babel/runtime-corejs3": "7.7.4",
     "core-js": "3.4.3",
-    "ganache-cli": "6.4.3"
+    "ganache-cli": "6.7.0"
   },
   "devDependencies": {
     "embark-solo": "^5.0.0-alpha.5",

diff --git a/packages/plugins/geth/package.json b/packages/plugins/geth/package.json
@@ -56,7 +56,7 @@
     "fs-extra": "8.1.0",
     "netcat": "1.3.5",
     "semver": "5.6.0",
-    "web3": "1.2.1",
+    "web3": "1.2.4",
     "ws": "7.1.2"
   },
   "devDependencies": {

diff --git a/packages/plugins/geth/src/devtxs.ts b/packages/plugins/geth/src/devtxs.ts
@@ -75,7 +75,9 @@ export default class DevTxs {
     if (!this.web3) {
       return;
     }
-    return this.web3.eth.sendTransaction({ value: "0", to: this.web3.eth.defaultAccount, from: this.web3.eth.defaultAccount });
+    const to = this.web3.eth.defaultAccount || undefined;
+    const from = this.web3.eth.defaultAccount || undefined;
+    return this.web3.eth.sendTransaction({ value: "0", to, from });
   }
 
   public async startRegularTxs() {

diff --git a/packages/plugins/mocha-tests/package.json b/packages/plugins/mocha-tests/package.json
@@ -55,7 +55,7 @@
     "embark-utils": "^5.0.0-alpha.8",
     "embarkjs": "^5.0.0-alpha.5",
     "mocha": "6.2.2",
-    "web3": "1.2.1"
+    "web3": "1.2.4"
   },
   "devDependencies": {
     "embark-solo": "^5.0.0-alpha.5",

diff --git a/packages/plugins/parity/src/parityClient.js b/packages/plugins/parity/src/parityClient.js
@@ -9,7 +9,7 @@ const constants = require('embark-core/constants');
 
 const DEFAULTS = {
   "BIN": "parity",
-  "VERSIONS_SUPPORTED": ">=2.0.0",
+  "VERSIONS_SUPPORTED": ">=2.2.1",
   "NETWORK_TYPE": "dev",
   "NETWORK_ID": 17,
   "RPC_API": ["web3", "eth", "pubsub", "net", "parity", "private", "parity_pubsub", "traces", "rpc", "shh", "shh_pubsub"],

diff --git a/packages/plugins/profiler/package.json b/packages/plugins/profiler/package.json
@@ -48,8 +48,8 @@
     "ascii-table": "0.0.9",
     "async": "2.6.1",
     "core-js": "3.4.3",
-    "web3": "1.2.1",
-    "web3-utils": "1.2.1"
+    "web3": "1.2.4",
+    "web3-utils": "1.2.4"
   },
   "devDependencies": {
     "embark-solo": "^5.0.0-alpha.5",

diff --git a/packages/plugins/rpc-manager/package.json b/packages/plugins/rpc-manager/package.json
@@ -53,7 +53,7 @@
     "embark-i18n": "^5.0.0-alpha.5",
     "embark-logger": "^5.0.0-alpha.5",
     "embark-utils": "^5.0.0-alpha.8",
-    "web3": "1.2.1"
+    "web3": "1.2.4"
   },
   "devDependencies": {
     "cross-env": "5.2.0",

diff --git a/packages/plugins/rpc-manager/src/lib/eth_sendTransaction.ts b/packages/plugins/rpc-manager/src/lib/eth_sendTransaction.ts
@@ -24,19 +24,19 @@ export default class EthSendTransaction extends RpcModifier {
         }
         payload.nonce = newNonce;
         const web3 = await this.web3;
-        web3.eth.accounts.signTransaction(payload, account.privateKey, (signingError: any, result: any) => {
-          if (signingError) {
-            return callback(signingError, null);
-          }
+        try {
+          const result = await web3.eth.accounts.signTransaction(payload, account.privateKey);
           callback(null, result.rawTransaction);
-        });
+        } catch (err) {
+          callback(err);
+        }
       });
     }, 1);
   }
 
   private async getNonce(address: string, callback: Callback<any>) {
     const web3 = await this.web3;
-    web3.eth.getTransactionCount(address, undefined, (error: any, transactionCount: number) => {
+    web3.eth.getTransactionCount(address, (error: any, transactionCount: number) => {
       if (error) {
         return callback(error, null);
       }

diff --git a/packages/plugins/scaffolding/package.json b/packages/plugins/scaffolding/package.json
@@ -49,7 +49,8 @@
     "embark-i18n": "^5.0.0-alpha.5",
     "embark-logger": "^5.0.0-alpha.5",
     "embark-utils": "^5.0.0-alpha.8",
-    "handlebars": "4.2.0"
+    "handlebars": "4.2.0",
+    "web3-utils": "1.2.4"
   },
   "devDependencies": {
     "embark-solo": "^5.0.0-alpha.5",

diff --git a/packages/plugins/scaffolding/src/framework/reactBuilder/index.ts b/packages/plugins/scaffolding/src/framework/reactBuilder/index.ts
@@ -2,15 +2,15 @@ import { Contract, Embark } from "embark-core";
 import { __ } from "embark-i18n";
 import Handlebars from "handlebars";
 import * as path from "path";
-import { ABIDefinition } from "web3/eth/abi";
+import { AbiItem } from "web3-utils";
 import { Builder } from "../../builder";
 import { CommandOptions } from "../../commandOptions";
 import { SmartContractsRecipe } from "../../smartContractsRecipe";
 
 const utils = require("embark-utils");
 require("../../handlebarHelpers");
 
-interface ABIDefinitionDecorated extends ABIDefinition {
+interface AbiItemDecorated extends AbiItem {
   isIpfsText?: boolean;
   isIpfsFile?: boolean;
   isStandard?: boolean;
@@ -82,7 +82,7 @@ export class ReactBuilder implements Builder {
     const ipfsAttributes = this.description.ipfsAttributes(contract.className);
 
     return contract.abiDefinition.filter((entry) => entry.type === "function").map((entry) => {
-      const decorated: ABIDefinitionDecorated = entry;
+      const decorated: AbiItemDecorated = entry;
       const inputName = entry.inputs && entry.inputs.length > 1 ? entry.inputs[1].name.substring(1, entry.inputs[1].name.length) : "";
       const functionName = entry.name || "";