aboutsummaryrefslogtreecommitdiffstats
path: root/package.json
diff options
context:
space:
mode:
authorKevin Serrano <kevin.serrano@consensys.net>2017-05-24 01:43:59 +0800
committerKevin Serrano <kevin.serrano@consensys.net>2017-05-24 01:43:59 +0800
commit97d19f0f7970feb6fb3170fd85211d0c765cabea (patch)
tree3e25945bd50397cdb218b1b60a3290bdfb5fdacb /package.json
parent959038132a6780f1dd7a4db3696d3fdbaad83b88 (diff)
parent1491e6fe0728b0c82cdf5b8dcaa18ef0adbcd55d (diff)
downloadtangerine-wallet-browser-97d19f0f7970feb6fb3170fd85211d0c765cabea.tar
tangerine-wallet-browser-97d19f0f7970feb6fb3170fd85211d0c765cabea.tar.gz
tangerine-wallet-browser-97d19f0f7970feb6fb3170fd85211d0c765cabea.tar.bz2
tangerine-wallet-browser-97d19f0f7970feb6fb3170fd85211d0c765cabea.tar.lz
tangerine-wallet-browser-97d19f0f7970feb6fb3170fd85211d0c765cabea.tar.xz
tangerine-wallet-browser-97d19f0f7970feb6fb3170fd85211d0c765cabea.tar.zst
tangerine-wallet-browser-97d19f0f7970feb6fb3170fd85211d0c765cabea.zip
Merge branch 'master' into i1412-decimalizethegas
Diffstat (limited to 'package.json')
-rw-r--r--package.json5
1 files changed, 3 insertions, 2 deletions
diff --git a/package.json b/package.json
index 14ddd2886..6b6996d9d 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,7 @@
"ethereumjs-tx": "^1.3.0",
"ethereumjs-util": "ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9",
"ethereumjs-wallet": "^0.6.0",
- "ethjs-ens": "^1.0.2",
+ "ethjs-ens": "^2.0.0",
"express": "^4.14.0",
"extension-link-enabler": "^1.0.0",
"extensionizer": "^1.0.0",
@@ -87,6 +87,7 @@
"mississippi": "^1.2.0",
"mkdirp": "^0.5.1",
"multiplex": "^6.7.0",
+ "number-to-bn": "^1.7.0",
"obs-store": "^2.3.1",
"once": "^1.3.3",
"ping-pong-stream": "^1.0.0",
@@ -121,7 +122,7 @@
"valid-url": "^1.0.9",
"vreme": "^3.0.2",
"web3": "0.18.2",
- "web3-provider-engine": "^12.0.6",
+ "web3-provider-engine": "^12.1.0",
"web3-stream-provider": "^2.0.6",
"xtend": "^4.0.1"
},