Merge branch '1.0' into issue/1466

Author: nivida

bower.json

@@ -1,7 +1,7 @@
 {
   "namespace": "ethereum",
   "name": "web3",
-  "version": "1.0.0-beta.35",
+  "version": "1.0.0-beta.36",
   "description": "Ethereum JavaScript API",
   "license": "LGPL-3.0",
   "main": [

dist/web3.min.js

@@ -34,6 +34,7 @@ Contents:
     web3-eth-contract
     web3-eth-accounts
     web3-eth-personal
+    web3-eth-ens
     web3-eth-iban
     web3-eth-abi
     web3-net

docs/index.rst

@@ -89,12 +89,21 @@ accounts
 For ``web3.eth.accounts`` see the :ref:`accounts reference documentation <eth-accounts>`
 
 
+------------------------------------------------------------------------------
+
+ens
+=====================
+
+For ``web3.eth.ens`` see the :ref:`ENS reference documentation <eth-ens>`
+
+
+
 ------------------------------------------------------------------------------
 
 abi
 =====================
 
-For ``web3.eth.abi`` see the :ref:`abi reference documentation <eth-abi>`
+For ``web3.eth.abi`` see the :ref:`ABI reference documentation <eth-abi>`
 
 
 ------------------------------------------------------------------------------

docs/web3-eth.rst

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-beta.35",
+  "version": "1.0.0-beta.36",
   "lerna": "2.0.0",
   "command": {
     "init": {

lerna.json

@@ -1,7 +1,7 @@
 /* jshint ignore:start */
 Package.describe({
     name: 'ethereum:web3',
-    version: '1.0.0-beta.35',
+    version: '1.0.0-beta.36',
     summary: 'Ethereum JavaScript API, middleware to talk to a ethreum node over RPC',
     git: 'https://github.com/ethereum/ethereum.js',
     // By default, Meteor will default to using README.md for documentation.

package-lock.json

@@ -1,7 +1,8 @@
 {
   "name": "web3",
+  "private": true,
   "namespace": "ethereum",
-  "version": "1.0.0-beta.35",
+  "version": "1.0.0-beta.36",
   "description": "Ethereum JavaScript API wrapper repository",
   "license": "LGPL-3.0",
   "main": "./packages/web3/src/index.js",
@@ -73,7 +74,7 @@
     "coveralls": "^3.0.2",
     "crypto-js": "^3.1.4",
     "del": ">=2.0.2",
-    "ethereumjs-wallet": "^0.6.0",
+    "ethereumjs-wallet": "^0.6.2",
     "ethjs-signer": "^0.1.1",
     "exorcist": "^0.4.0",
     "gulp": "^4.0.0",

package.js

@@ -1,7 +1,7 @@
 {
     "name": "web3-bzz",
     "namespace": "ethereum",
-    "version": "1.0.0-beta.35",
+    "version": "1.0.0-beta.36",
     "description": "Web3 module to interact with the Swarm network.",
     "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-bzz",
     "license": "LGPL-3.0",

package.json

@@ -1,14 +1,14 @@
 {
     "name": "web3-core-helpers",
     "namespace": "ethereum",
-    "version": "1.0.0-beta.35",
+    "version": "1.0.0-beta.36",
     "description": "Web3 core tools helper for sub packages. This is an internal package.",
     "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-core-helpers",
     "license": "LGPL-3.0",
     "main": "src/index.js",
     "dependencies": {
         "underscore": "1.8.3",
-        "web3-eth-iban": "1.0.0-beta.35",
-        "web3-utils": "1.0.0-beta.35"
+        "web3-eth-iban": "1.0.0-beta.36",
+        "web3-utils": "1.0.0-beta.36"
     }
 }

packages/web3-bzz/package-lock.json

@@ -1,16 +1,16 @@
 {
     "name": "web3-core-method",
     "namespace": "ethereum",
-    "version": "1.0.0-beta.35",
+    "version": "1.0.0-beta.36",
     "description": "Creates the methods on the web3 modules. This is an internal package.",
     "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-core-method",
     "license": "LGPL-3.0",
     "main": "src/index.js",
     "dependencies": {
         "underscore": "1.8.3",
-        "web3-core-helpers": "1.0.0-beta.35",
-        "web3-core-promievent": "1.0.0-beta.35",
-        "web3-core-subscriptions": "1.0.0-beta.35",
-        "web3-utils": "1.0.0-beta.35"
+        "web3-core-helpers": "1.0.0-beta.36",
+        "web3-core-promievent": "1.0.0-beta.36",
+        "web3-core-subscriptions": "1.0.0-beta.36",
+        "web3-utils": "1.0.0-beta.36"
     }
 }

packages/web3-bzz/package.json

@@ -1,7 +1,7 @@
 {
     "name": "web3-core-promievent",
     "namespace": "ethereum",
-    "version": "1.0.0-beta.35",
+    "version": "1.0.0-beta.36",
     "description": "This package extends eventEmitters with promises to allow chaining as well as multiple final states of a function.",
     "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-core-promievent",
     "license": "LGPL-3.0",