Merge 64929a2 into e955c60

web3 · Jul 31, 2018 · 894e980 · 894e980
2 parents e955c60 + 64929a2
commit 894e980
Show file tree

Hide file tree

Showing 39 changed files with 23,986 additions and 12,510 deletions.
diff --git a/dist/web3.js b/dist/web3.js
diff --git a/dist/web3.min.js b/dist/web3.min.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/web3-bzz/package-lock.json b/packages/web3-bzz/package-lock.json
diff --git a/packages/web3-core-promievent/package-lock.json b/packages/web3-core-promievent/package-lock.json
diff --git a/packages/web3-eth-abi/package-lock.json b/packages/web3-eth-abi/package-lock.json
diff --git a/packages/web3-eth-abi/package.json b/packages/web3-eth-abi/package.json
@@ -1,15 +1,14 @@
 {
-    "name": "web3-eth-abi",
-    "namespace": "ethereum",
-    "version": "1.0.0-beta.34",
-    "description": "Web3 module encode and decode EVM in/output.",
-    "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-eth-abi",
-    "license": "LGPL-3.0",
-    "main": "src/index.js",
-    "dependencies": {
-        "bn.js": "4.11.6",
-        "underscore": "1.8.3",
-        "web3-core-helpers": "1.0.0-beta.34",
-        "web3-utils": "1.0.0-beta.34"
-    }
+  "name": "web3-eth-abi",
+  "namespace": "ethereum",
+  "version": "1.0.0-beta.34",
+  "description": "Web3 module encode and decode EVM in/output.",
+  "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-eth-abi",
+  "license": "LGPL-3.0",
+  "main": "src/index.js",
+  "dependencies": {
+    "ethers": "4.0.0-beta.1",
+    "underscore": "1.8.3",
+    "web3-utils": "1.0.0-beta.34"
+  }
 }