Merge branch '1.x' into issue/3209

Author: nivida

CHANGELOG.md

@@ -90,12 +90,16 @@ Released with 1.0.0-beta.37 code base.
 - Fix TS types for eth.subscribe syncing, newBlockHeaders, pendingTransactions (#3159)
 - Improve web3-eth-abi decodeParameters error message (#3134)
 
+## [1.2.4]
+
+### Fixed
+
+- Fix npm installation error for scrypt-shim and websocket (#3210)
+
 ## [Unreleased]
 
 ## [1.2.4]
 
 ### Added
 
 ### Fixed
-
-- Fix npm installation error for scrypt-shim and websocket (#3210)

bower.json

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

dist/web3.min.js

@@ -1,5 +1,5 @@
 {
-  "version": "1.2.3",
+  "version": "1.2.4",
   "lerna": "2.0.0",
   "command": {
     "init": {

lerna.json

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

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

package.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-bzz",
-    "version": "1.2.3",
+    "version": "1.2.4",
     "description": "Web3 module to interact with the Swarm network.",
     "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-bzz",
     "license": "LGPL-3.0",

packages/web3-bzz/package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-core-helpers",
-    "version": "1.2.3",
+    "version": "1.2.4",
     "description": "Web3 core tools helper for sub packages. This is an internal package.",
     "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-core-helpers",
     "license": "LGPL-3.0",
@@ -14,8 +14,8 @@
     "main": "src/index.js",
     "dependencies": {
         "underscore": "1.9.1",
-        "web3-eth-iban": "1.2.3",
-        "web3-utils": "1.2.3"
+        "web3-eth-iban": "1.2.4",
+        "web3-utils": "1.2.4"
     },
     "devDependencies": {
         "@types/node": "^12.12.5",