Merge branch '1.x' into safe-dev/create-nvmrc

Author: frankiebee

.github/workflows/build.yml

@@ -110,3 +110,29 @@ jobs:
                   node-version: 12
             - uses: actions/checkout@v2
             - run: bash ./scripts/ci.sh
+    eth2:
+        runs-on: ubuntu-latest
+        strategy:
+            matrix:
+                node: [10, 11, 12, 13]
+        env:
+            TEST: "eth2"
+        steps:
+            - uses: actions/setup-node@v1
+              with:
+                  node-version: ${{ matrix.node }}
+
+            - uses: actions/checkout@v2
+
+            - uses: actions/cache@v2
+              id: cache-deps
+              with:
+                  path: |
+                      node_modules
+                      */*/node_modules
+                  key: ${{ runner.os }}-node${{ matrix.node }}-${{ hashFiles('**/package-lock.json') }}
+
+            - run: npm ci
+              if: steps.cache-deps.outputs.cache-hit != 'true'
+
+            - run: bash ./scripts/ci.sh

CHANGELOG.md

@@ -321,8 +321,6 @@ Released with 1.0.0-beta.37 code base.
 
 - Update `dist` to latest release (`1.3.2`) (#3875)
 
-## [Unreleased]
-
 ## [1.3.4]
 
 ### Changed
@@ -350,3 +348,15 @@ Released with 1.0.0-beta.37 code base.
 - Add `ETH2Core` class export to `index.d.ts` for `web3-eth2-core` (#3878)
 - Deprecation of bzz warning (#3872)
 - Deprecation of shh warning (#3888)
+
+## [Unreleased]
+
+## [1.3.5]
+
+### Added
+
+- Github action for running tests for `web3-eth2-core` and `web3-eth2-beaconchain` packages (#3892)
+
+### Changed
+
+- Unified babel compiler for `web3-eth2-core` and `web3-eth2-beaconchain` (#3892)

dist/web3.min.js

@@ -1,5 +1,5 @@
 {
-  "version": "1.3.1",
+  "version": "1.3.4",
   "lerna": "2.0.0",
   "command": {
     "init": {

dist/web3.min.js.map

@@ -1,6 +1,6 @@
 {
     "name": "web3-bzz",
-    "version": "1.3.1",
+    "version": "1.3.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",

lerna.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-core-helpers",
-    "version": "1.3.1",
+    "version": "1.3.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",
@@ -15,8 +15,8 @@
     "main": "lib/index.js",
     "dependencies": {
         "underscore": "1.9.1",
-        "web3-eth-iban": "1.3.1",
-        "web3-utils": "1.3.1"
+        "web3-eth-iban": "1.3.4",
+        "web3-utils": "1.3.4"
     },
     "devDependencies": {
         "@types/node": "^12.12.6",

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-core-method",
-    "version": "1.3.1",
+    "version": "1.3.4",
     "description": "Creates the methods on the web3 modules. This is an internal package.",
     "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-core-method",
     "license": "LGPL-3.0",
@@ -16,10 +16,10 @@
     "dependencies": {
         "@ethersproject/transactions": "^5.0.0-beta.135",
         "underscore": "1.9.1",
-        "web3-core-helpers": "1.3.1",
-        "web3-core-promievent": "1.3.1",
-        "web3-core-subscriptions": "1.3.1",
-        "web3-utils": "1.3.1"
+        "web3-core-helpers": "1.3.4",
+        "web3-core-promievent": "1.3.4",
+        "web3-core-subscriptions": "1.3.4",
+        "web3-utils": "1.3.4"
     },
     "devDependencies": {
         "dtslint": "^3.4.1",

packages/web3-bzz/package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-core-promievent",
-    "version": "1.3.1",
+    "version": "1.3.4",
     "description": "This package extends the EventEmitter with the Promise class to allow chaining as well as multiple final states of a function.",
     "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-core-promievent",
     "license": "LGPL-3.0",

packages/web3-bzz/package.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-core-requestmanager",
-    "version": "1.3.1",
+    "version": "1.3.4",
     "description": "Web3 module to handle requests to external providers.",
     "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-core-requestmanager",
     "license": "LGPL-3.0",
@@ -14,9 +14,9 @@
     "dependencies": {
         "underscore": "1.9.1",
         "util": "^0.12.0",
-        "web3-core-helpers": "1.3.1",
-        "web3-providers-http": "1.3.1",
-        "web3-providers-ipc": "1.3.1",
-        "web3-providers-ws": "1.3.1"
+        "web3-core-helpers": "1.3.4",
+        "web3-providers-http": "1.3.4",
+        "web3-providers-ipc": "1.3.4",
+        "web3-providers-ws": "1.3.4"
     }
 }

packages/web3-core-helpers/package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-core-subscriptions",
-    "version": "1.3.1",
+    "version": "1.3.4",
     "description": "Manages web3 subscriptions. This is an internal package.",
     "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-core-subscriptions",
     "license": "LGPL-3.0",
@@ -16,7 +16,7 @@
     "dependencies": {
         "eventemitter3": "4.0.4",
         "underscore": "1.9.1",
-        "web3-core-helpers": "1.3.1"
+        "web3-core-helpers": "1.3.4"
     },
     "devDependencies": {
         "dtslint": "^3.4.1",

packages/web3-core-helpers/package.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-core",
-    "version": "1.3.1",
+    "version": "1.3.4",
     "description": "Web3 core tools for sub-packages. This is an internal package.",
     "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-core",
     "license": "LGPL-3.0",
@@ -17,10 +17,10 @@
         "@types/bn.js": "^4.11.5",
         "@types/node": "^12.12.6",
         "bignumber.js": "^9.0.0",
-        "web3-core-helpers": "1.3.1",
-        "web3-core-method": "1.3.1",
-        "web3-core-requestmanager": "1.3.1",
-        "web3-utils": "1.3.1"
+        "web3-core-helpers": "1.3.4",
+        "web3-core-method": "1.3.4",
+        "web3-core-requestmanager": "1.3.4",
+        "web3-utils": "1.3.4"
     },
     "devDependencies": {
         "dtslint": "^3.4.1",

packages/web3-core-method/package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-eth-abi",
-    "version": "1.3.1",
+    "version": "1.3.4",
     "description": "Web3 module encode and decode EVM in/output.",
     "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-eth-abi",
     "license": "LGPL-3.0",
@@ -16,7 +16,7 @@
     "dependencies": {
         "@ethersproject/abi": "5.0.7",
         "underscore": "1.9.1",
-        "web3-utils": "1.3.1"
+        "web3-utils": "1.3.4"
     },
     "devDependencies": {
         "dtslint": "^3.4.1",

packages/web3-core-method/package.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-eth-accounts",
-    "version": "1.3.1",
+    "version": "1.3.4",
     "description": "Web3 module to generate Ethereum accounts and sign data and transactions.",
     "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-eth-accounts",
     "license": "LGPL-3.0",
@@ -21,10 +21,10 @@
         "scrypt-js": "^3.0.1",
         "underscore": "1.9.1",
         "uuid": "3.3.2",
-        "web3-core": "1.3.1",
-        "web3-core-helpers": "1.3.1",
-        "web3-core-method": "1.3.1",
-        "web3-utils": "1.3.1"
+        "web3-core": "1.3.4",
+        "web3-core-helpers": "1.3.4",
+        "web3-core-method": "1.3.4",
+        "web3-utils": "1.3.4"
     },
     "devDependencies": {
         "dtslint": "^3.4.1",

packages/web3-core-promievent/package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-eth-contract",
-    "version": "1.3.1",
+    "version": "1.3.4",
     "description": "Web3 module to interact with Ethereum smart contracts.",
     "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-eth-contract",
     "license": "LGPL-3.0",
@@ -16,13 +16,13 @@
     "dependencies": {
         "@types/bn.js": "^4.11.5",
         "underscore": "1.9.1",
-        "web3-core": "1.3.1",
-        "web3-core-helpers": "1.3.1",
-        "web3-core-method": "1.3.1",
-        "web3-core-promievent": "1.3.1",
-        "web3-core-subscriptions": "1.3.1",
-        "web3-eth-abi": "1.3.1",
-        "web3-utils": "1.3.1"
+        "web3-core": "1.3.4",
+        "web3-core-helpers": "1.3.4",
+        "web3-core-method": "1.3.4",
+        "web3-core-promievent": "1.3.4",
+        "web3-core-subscriptions": "1.3.4",
+        "web3-eth-abi": "1.3.4",
+        "web3-utils": "1.3.4"
     },
     "devDependencies": {
         "dtslint": "^3.4.1",

packages/web3-core-promievent/package.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-eth-ens",
-    "version": "1.3.1",
+    "version": "1.3.4",
     "description": "ENS support for web3.",
     "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-eth-ens",
     "license": "LGPL-3.0",
@@ -17,12 +17,12 @@
         "content-hash": "^2.5.2",
         "eth-ens-namehash": "2.0.8",
         "underscore": "1.9.1",
-        "web3-core": "1.3.1",
-        "web3-core-helpers": "1.3.1",
-        "web3-core-promievent": "1.3.1",
-        "web3-eth-abi": "1.3.1",
-        "web3-eth-contract": "1.3.1",
-        "web3-utils": "1.3.1"
+        "web3-core": "1.3.4",
+        "web3-core-helpers": "1.3.4",
+        "web3-core-promievent": "1.3.4",
+        "web3-eth-abi": "1.3.4",
+        "web3-eth-contract": "1.3.4",
+        "web3-utils": "1.3.4"
     },
     "devDependencies": {
         "dtslint": "^3.4.1",

packages/web3-core-requestmanager/package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "web3-eth-iban",
-    "version": "1.3.1",
+    "version": "1.3.4",
     "description": "This package converts Ethereum addresses to IBAN addresses a vice versa.",
     "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-eth-iban",
     "license": "LGPL-3.0",
@@ -15,7 +15,7 @@
     "main": "lib/index.js",
     "dependencies": {
         "bn.js": "^4.11.9",
-        "web3-utils": "1.3.1"
+        "web3-utils": "1.3.4"
     },
     "devDependencies": {
         "dtslint": "^3.4.1",