Merge branch '1.x' into 1.x

web3 · Aug 2, 2019 · 81e5acd · 81e5acd
2 parents b925c4e + dabf89e
commit 81e5acd
Show file tree

Hide file tree

Showing 9 changed files with 3,078 additions and 42 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -42,3 +42,8 @@ Released with 1.0.0-beta.37 code base.
 
 ## [1.2.1]
 
+### Fixed
+
+- ``websocket`` dependency fixed (#2971, #2976)
+- ``requestOptions`` added to ``WebsocketProvider`` (#2979) 
+- Node >= v8.0.0 support (#2938)
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 
-<img src="https://github.com/ethereum/web3.js/raw/1.0/web3js.jpg" width=200 />
+<img src="https://github.com/ethereum/web3.js/raw/1.x/web3js.jpg" width=200 />
 
 # web3.js - Ethereum JavaScript API
 
@@ -152,15 +152,15 @@ 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)		   - Haskell [hs-web3](https://github.com/airalab/hs-web3)
- - Java [web3j](https://github.com/web3j/web3j)		   - Java [web3j](https://github.com/web3j/web3j)
+ - 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
-[docs]: http://web3js.readthedocs.io/en/1.0/
+[docs]: http://web3js.readthedocs.io/
 [npm-image]: https://badge.fury.io/js/web3.png
 [npm-url]: https://npmjs.org/package/web3
 [travis-image]: https://travis-ci.org/ethereum/web3.js.svg
@@ -170,6 +170,6 @@ npm test
 [dep-dev-image]: https://david-dm.org/ethereum/web3.js/dev-status.svg
 [dep-dev-url]: https://david-dm.org/ethereum/web3.js#info=devDependencies
 [coveralls-image]: https://coveralls.io/repos/ethereum/web3.js/badge.svg?branch=master
-[coveralls-url]: https://coveralls.io/r/ethereum/web3.js?branch=master
+[coveralls-url]: https://coveralls.io/r/ethereum/web3.js?branch=1.x
 [waffle-image]: https://badge.waffle.io/ethereum/web3.js.svg?label=ready&title=Ready
 [waffle-url]: https://waffle.io/ethereum/web3.js
diff --git a/dist/web3.min.js b/dist/web3.min.js
diff --git a/gulpfile.js b/gulpfile.js
@@ -25,7 +25,7 @@ var packages = [{
     fileName: 'web3',
     expose: 'Web3',
     src: './packages/web3/src/index.js',
-    ignore: ['xmlhttprequest', 'websocket']
+    ignore: ['xmlhttprequest']
 }, {
     fileName: 'web3-utils',
     expose: 'Web3Utils',
@@ -83,7 +83,6 @@ var packages = [{
     fileName: 'web3-providers-ws',
     expose: 'Web3WsProvider',
     src: './packages/web3-providers-ws/src/index.js',
-    ignore: ['websocket']
 }, {
     fileName: 'web3-core-subscriptions',
     expose: 'Web3Subscriptions',

diff --git a/packages/web3-eth-accounts/src/scrypt.js b/packages/web3-eth-accounts/src/scrypt.js
@@ -12,7 +12,7 @@ if (isNode) {
     var tryScryptPkg = (function() {
         var scryptPkg;
         return function() {
-            if (scryptPkg !== undefined) { return scryptPkg; };
+            if (scryptPkg !== undefined) { return scryptPkg; }
             try {
                 scryptPkg = (function(m) { return require(m); })('scrypt');
             } catch (e) {