Merge branch '1.x' into 1.x

README.md

@@ -1,17 +1,16 @@
-
+<p align="center">
 <img src="https://github.com/ethereum/web3.js/raw/1.x/web3js.jpg" width=200 />
+</p>
 
 # web3.js - Ethereum JavaScript API
 
-[![Join the chat at https://gitter.im/ethereum/web3.js](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ethereum/web3.js?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-
-[![npm](https://img.shields.io/npm/dm/web3.svg)](https://www.npmjs.com/package/web3) [![Build Status][travis-image]][travis-url] [![dependency status][dep-image]][dep-url] [![dev dependency status][dep-dev-image]][dep-dev-url] [![Coverage Status][coveralls-image]][coveralls-url] [![Stories in Ready][waffle-image]][waffle-url]
+[![Join the chat at https://gitter.im/ethereum/web3.js](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ethereum/web3.js?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)[![npm](https://img.shields.io/npm/dm/web3.svg)](https://www.npmjs.com/package/web3) [![Build Status][travis-image]][travis-url] [![dependency status][dep-image]][dep-url] [![dev dependency status][dep-dev-image]][dep-dev-url] [![Coverage Status][coveralls-image]][coveralls-url]
 
 This is the Ethereum [JavaScript API][docs]
 which connects to the [Generic JSON RPC](https://github.com/ethereum/wiki/wiki/JSON-RPC) spec.
 
 
-You need to run a local or remote Ethereum node to use this library.
+You need to run a local or remote [Ethereum](https://www.ethereum.org/) node to use this library.
 
 Please read the [documentation][docs] for more.
 
@@ -65,7 +64,7 @@ console.log(web3);
 }
 ```
 
-Additionally you can set a provider using `web3.setProvider()` (e.g. WebsocketProvider)
+Additionally you can set a provider using `web3.setProvider()` (e.g. WebsocketProvider):
 
 ```js
 web3.setProvider('ws://localhost:8546');
@@ -82,7 +81,7 @@ web3.eth.getAccounts()
 
 ### Usage with TypeScript
 
-Type definitions are maintained at [DefinitelyTyped](https://github.com/DefinitelyTyped/DefinitelyTyped) by others. You can install them with
+Type definitions are maintained at [DefinitelyTyped](https://github.com/DefinitelyTyped/DefinitelyTyped) by others. You can install them with:
 
 ```bash
 npm install --dev @types/web3.js
@@ -101,15 +100,15 @@ const web3 = new Web3("ws://localhost:8546");
 
 ## Documentation
 
-Documentation can be found at [read the docs][docs]
+Documentation can be found at [read the docs][docs].
 
 
 ## Building
 
 ### Requirements
 
 * [Node.js](https://nodejs.org)
-* npm
+* [npm](https://www.npmjs.com/)
 
 ```bash
 sudo apt-get update
@@ -125,7 +124,7 @@ Build only the web3.js package
 npm run-script build
 ```
 
-Or build all sub packages as well
+Or build all sub packages as well:
 
 ```bash
 npm run-script build-all
@@ -151,12 +150,12 @@ npm test
 
 
 ### Similar libraries in other languages
- - Python [Web3.py](https://github.com/pipermerriam/web3.py)
- - Haskell [hs-web3](https://github.com/airalab/hs-web3)		   
- - Java [web3j](https://github.com/web3j/web3j)		   
- - Scala [web3j-scala](https://github.com/mslinn/web3j-scala)
- - Purescript [purescript-web3](https://github.com/f-o-a-m/purescript-web3)
- - PHP [web3.php](https://github.com/sc0Vu/web3.php)
+ - Python - [Web3.py](https://github.com/pipermerriam/web3.py)
+ - Haskell - [hs-web3](https://github.com/airalab/hs-web3)		   
+ - Java - [web3j](https://github.com/web3j/web3j)		   
+ - Scala - [web3j-scala](https://github.com/mslinn/web3j-scala)
+ - Purescript - [purescript-web3](https://github.com/f-o-a-m/purescript-web3)
+ - PHP - [web3.php](https://github.com/sc0Vu/web3.php)
 
 
 [repo]: https://github.com/ethereum/web3.js

bower.json

@@ -1,7 +1,7 @@
 {
   "namespace": "ethereum",
   "name": "web3",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Ethereum JavaScript API",
   "license": "LGPL-3.0",
   "main": [

docs/getting-started.rst

@@ -34,6 +34,6 @@ If this property is ``null`` you should connect to a remote/local node.
 
     // in node.js use: var Web3 = require('web3');
 
-    var web3 = new Web3(Web3.givenProvider || "ws://localhost:8546");
+    var web3 = new Web3(Web3.givenProvider || "ws://localhost:8545");
 
 That's it! now you can use the ``web3`` object.

package.js

@@ -1,7 +1,7 @@
 /* jshint ignore:start */
 Package.describe({
     name: 'ethereum:web3',
-    version: '1.2.0',
+    version: '1.2.1',
     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.json

@@ -1,7 +1,7 @@
 {
     "name": "web3",
     "private": true,
-    "version": "1.2.0",
+    "version": "1.2.1",
     "description": "Ethereum JavaScript API wrapper repository",
     "license": "LGPL-3.0",
     "engines": {

packages/web3-eth-accounts/package.json

@@ -12,8 +12,7 @@
         "any-promise": "1.3.0",
         "crypto-browserify": "3.12.0",
         "eth-lib": "0.2.7",
-        "scryptsy": "2.1.0",
-        "semver": "6.2.0",
+        "scrypt-shim": "github:web3-js/scrypt-shim",
         "underscore": "1.9.1",
         "uuid": "3.3.2",
         "web3-core": "1.2.1",

packages/web3-eth-accounts/src/index.js

@@ -32,7 +32,7 @@ var RLP = require("eth-lib/lib/rlp");
 var Nat = require("eth-lib/lib/nat");
 var Bytes = require("eth-lib/lib/bytes");
 var cryp = (typeof global === 'undefined') ? require('crypto-browserify') : require('crypto');
-var scrypt = require('./scrypt');
+var scrypt = require('scrypt-shim');
 var uuid = require('uuid');
 var utils = require('web3-utils');
 var helpers = require('web3-core-helpers');