web3 1.2.1 upgrade

joincivil · Aug 20, 2019 · 9a587cc · 9a587cc
1 parent 5cb3432
commit 9a587cc
Show file tree

Hide file tree

Showing 210 changed files with 5,942 additions and 4,852 deletions.
diff --git a/.gitignore b/.gitignore
@@ -56,6 +56,7 @@ typings/
 
 # dotenv environment variables file
 .env
+packages/dapp/.env.local
 
 
 build/

diff --git a/package.json b/package.json
@@ -28,10 +28,14 @@
   "config": {
     "mnemonic": "notice tobacco baby curious trade other capable invite cable thunder file equal"
   },
+  "resolutions": {
+    "ethers": "4.0.27",
+    "**/ethers": "4.0.27"
+  },
   "license": "(Apache-2.0 OR LGPL-2.1-only)",
   "devDependencies": {
     "coveralls": "^3.0.0",
-    "ganache-cli": "^6.1.6",
+    "ganache-cli": "^6.5.1",
     "lcov-result-merger": "^3.1.0",
     "lerna": "^3.15.0",
     "ncp": "^2.0.0",

diff --git a/packages/components/package.json b/packages/components/package.json
@@ -62,6 +62,10 @@
     "react": "^16.8",
     "react-dom": "^16.8"
   },
+  "resolutions": {
+    "ethers": "4.0.27",
+    "**/ethers": "4.0.27"
+  },
   "dependencies": {
     "@joincivil/core": "^4.8.11",
     "@joincivil/ethapi": "^0.4.9",

diff --git a/packages/components/src/Account/Auth/__snapshots__/EthAuth.stories.storyshot b/packages/components/src/Account/Auth/__snapshots__/EthAuth.stories.storyshot
diff --git a/packages/components/src/DetailTransactionButton.tsx b/packages/components/src/DetailTransactionButton.tsx
@@ -114,7 +114,7 @@ export class DetailTransactionButton extends React.Component<
         const gasPrice = await this.props.civil!.getGasPrice();
         this.setState({
           price: gasPrice
-            .times(gas)
+            .mul(this.props.civil!.toBigNumber(gas))
             .div(this.props.civil!.toBigNumber(10).pow(18))
             .toNumber(),
           priceFailed: false,

diff --git a/packages/components/src/GasEstimate.tsx b/packages/components/src/GasEstimate.tsx
@@ -46,7 +46,7 @@ export class GasEstimate extends React.Component<GasEstimateProps, GasEstimateSt
         const gasPrice = await this.props.civil!.getGasPrice();
         this.setState({
           price: gasPrice
-            .times(gas)
+            .mul(this.props.civil!.toBigNumber(gas))
             .div(this.props.civil!.toBigNumber(10).pow(18))
             .toNumber(),
           priceFailed: false,
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,6 +56,7 @@ typings/ @@
     # dotenv environment variables file
     .env
+    packages/dapp/.env.local
     build/
@@ Expand Down @@