Skip to content
This repository was archived by the owner on Mar 5, 2025. It is now read-only.

Commit d196800

Browse files
authored
Merge branch '1.x' into safe-dev/create-nvmrc
2 parents 5d7811d + 06610f2 commit d196800

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+27475
-14336
lines changed

.github/workflows/build.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,3 +110,29 @@ jobs:
110110
node-version: 12
111111
- uses: actions/checkout@v2
112112
- run: bash ./scripts/ci.sh
113+
eth2:
114+
runs-on: ubuntu-latest
115+
strategy:
116+
matrix:
117+
node: [10, 11, 12, 13]
118+
env:
119+
TEST: "eth2"
120+
steps:
121+
- uses: actions/setup-node@v1
122+
with:
123+
node-version: ${{ matrix.node }}
124+
125+
- uses: actions/checkout@v2
126+
127+
- uses: actions/cache@v2
128+
id: cache-deps
129+
with:
130+
path: |
131+
node_modules
132+
*/*/node_modules
133+
key: ${{ runner.os }}-node${{ matrix.node }}-${{ hashFiles('**/package-lock.json') }}
134+
135+
- run: npm ci
136+
if: steps.cache-deps.outputs.cache-hit != 'true'
137+
138+
- run: bash ./scripts/ci.sh

CHANGELOG.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,8 +321,6 @@ Released with 1.0.0-beta.37 code base.
321321

322322
- Update `dist` to latest release (`1.3.2`) (#3875)
323323

324-
## [Unreleased]
325-
326324
## [1.3.4]
327325

328326
### Changed
@@ -350,3 +348,15 @@ Released with 1.0.0-beta.37 code base.
350348
- Add `ETH2Core` class export to `index.d.ts` for `web3-eth2-core` (#3878)
351349
- Deprecation of bzz warning (#3872)
352350
- Deprecation of shh warning (#3888)
351+
352+
## [Unreleased]
353+
354+
## [1.3.5]
355+
356+
### Added
357+
358+
- Github action for running tests for `web3-eth2-core` and `web3-eth2-beaconchain` packages (#3892)
359+
360+
### Changed
361+
362+
- Unified babel compiler for `web3-eth2-core` and `web3-eth2-beaconchain` (#3892)

dist/web3.min.js

Lines changed: 9 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/web3.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.3.1",
2+
"version": "1.3.4",
33
"lerna": "2.0.0",
44
"command": {
55
"init": {

package-lock.json

Lines changed: 11574 additions & 8011 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/web3-bzz/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/web3-bzz/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "web3-bzz",
3-
"version": "1.3.1",
3+
"version": "1.3.4",
44
"description": "Web3 module to interact with the Swarm network.",
55
"repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-bzz",
66
"license": "LGPL-3.0",

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

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/web3-core-helpers/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "web3-core-helpers",
3-
"version": "1.3.1",
3+
"version": "1.3.4",
44
"description": "Web3 core tools helper for sub packages. This is an internal package.",
55
"repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-core-helpers",
66
"license": "LGPL-3.0",
@@ -15,8 +15,8 @@
1515
"main": "lib/index.js",
1616
"dependencies": {
1717
"underscore": "1.9.1",
18-
"web3-eth-iban": "1.3.1",
19-
"web3-utils": "1.3.1"
18+
"web3-eth-iban": "1.3.4",
19+
"web3-utils": "1.3.4"
2020
},
2121
"devDependencies": {
2222
"@types/node": "^12.12.6",

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

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/web3-core-method/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "web3-core-method",
3-
"version": "1.3.1",
3+
"version": "1.3.4",
44
"description": "Creates the methods on the web3 modules. This is an internal package.",
55
"repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-core-method",
66
"license": "LGPL-3.0",
@@ -16,10 +16,10 @@
1616
"dependencies": {
1717
"@ethersproject/transactions": "^5.0.0-beta.135",
1818
"underscore": "1.9.1",
19-
"web3-core-helpers": "1.3.1",
20-
"web3-core-promievent": "1.3.1",
21-
"web3-core-subscriptions": "1.3.1",
22-
"web3-utils": "1.3.1"
19+
"web3-core-helpers": "1.3.4",
20+
"web3-core-promievent": "1.3.4",
21+
"web3-core-subscriptions": "1.3.4",
22+
"web3-utils": "1.3.4"
2323
},
2424
"devDependencies": {
2525
"dtslint": "^3.4.1",

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

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/web3-core-promievent/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "web3-core-promievent",
3-
"version": "1.3.1",
3+
"version": "1.3.4",
44
"description": "This package extends the EventEmitter with the Promise class to allow chaining as well as multiple final states of a function.",
55
"repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-core-promievent",
66
"license": "LGPL-3.0",

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

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/web3-core-requestmanager/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "web3-core-requestmanager",
3-
"version": "1.3.1",
3+
"version": "1.3.4",
44
"description": "Web3 module to handle requests to external providers.",
55
"repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-core-requestmanager",
66
"license": "LGPL-3.0",
@@ -14,9 +14,9 @@
1414
"dependencies": {
1515
"underscore": "1.9.1",
1616
"util": "^0.12.0",
17-
"web3-core-helpers": "1.3.1",
18-
"web3-providers-http": "1.3.1",
19-
"web3-providers-ipc": "1.3.1",
20-
"web3-providers-ws": "1.3.1"
17+
"web3-core-helpers": "1.3.4",
18+
"web3-providers-http": "1.3.4",
19+
"web3-providers-ipc": "1.3.4",
20+
"web3-providers-ws": "1.3.4"
2121
}
2222
}

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

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/web3-core-subscriptions/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "web3-core-subscriptions",
3-
"version": "1.3.1",
3+
"version": "1.3.4",
44
"description": "Manages web3 subscriptions. This is an internal package.",
55
"repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-core-subscriptions",
66
"license": "LGPL-3.0",
@@ -16,7 +16,7 @@
1616
"dependencies": {
1717
"eventemitter3": "4.0.4",
1818
"underscore": "1.9.1",
19-
"web3-core-helpers": "1.3.1"
19+
"web3-core-helpers": "1.3.4"
2020
},
2121
"devDependencies": {
2222
"dtslint": "^3.4.1",

packages/web3-core/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/web3-core/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "web3-core",
3-
"version": "1.3.1",
3+
"version": "1.3.4",
44
"description": "Web3 core tools for sub-packages. This is an internal package.",
55
"repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-core",
66
"license": "LGPL-3.0",
@@ -17,10 +17,10 @@
1717
"@types/bn.js": "^4.11.5",
1818
"@types/node": "^12.12.6",
1919
"bignumber.js": "^9.0.0",
20-
"web3-core-helpers": "1.3.1",
21-
"web3-core-method": "1.3.1",
22-
"web3-core-requestmanager": "1.3.1",
23-
"web3-utils": "1.3.1"
20+
"web3-core-helpers": "1.3.4",
21+
"web3-core-method": "1.3.4",
22+
"web3-core-requestmanager": "1.3.4",
23+
"web3-utils": "1.3.4"
2424
},
2525
"devDependencies": {
2626
"dtslint": "^3.4.1",

packages/web3-eth-abi/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/web3-eth-abi/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "web3-eth-abi",
3-
"version": "1.3.1",
3+
"version": "1.3.4",
44
"description": "Web3 module encode and decode EVM in/output.",
55
"repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-eth-abi",
66
"license": "LGPL-3.0",
@@ -16,7 +16,7 @@
1616
"dependencies": {
1717
"@ethersproject/abi": "5.0.7",
1818
"underscore": "1.9.1",
19-
"web3-utils": "1.3.1"
19+
"web3-utils": "1.3.4"
2020
},
2121
"devDependencies": {
2222
"dtslint": "^3.4.1",

packages/web3-eth-accounts/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/web3-eth-accounts/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "web3-eth-accounts",
3-
"version": "1.3.1",
3+
"version": "1.3.4",
44
"description": "Web3 module to generate Ethereum accounts and sign data and transactions.",
55
"repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-eth-accounts",
66
"license": "LGPL-3.0",
@@ -21,10 +21,10 @@
2121
"scrypt-js": "^3.0.1",
2222
"underscore": "1.9.1",
2323
"uuid": "3.3.2",
24-
"web3-core": "1.3.1",
25-
"web3-core-helpers": "1.3.1",
26-
"web3-core-method": "1.3.1",
27-
"web3-utils": "1.3.1"
24+
"web3-core": "1.3.4",
25+
"web3-core-helpers": "1.3.4",
26+
"web3-core-method": "1.3.4",
27+
"web3-utils": "1.3.4"
2828
},
2929
"devDependencies": {
3030
"dtslint": "^3.4.1",

packages/web3-eth-contract/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/web3-eth-contract/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "web3-eth-contract",
3-
"version": "1.3.1",
3+
"version": "1.3.4",
44
"description": "Web3 module to interact with Ethereum smart contracts.",
55
"repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-eth-contract",
66
"license": "LGPL-3.0",
@@ -16,13 +16,13 @@
1616
"dependencies": {
1717
"@types/bn.js": "^4.11.5",
1818
"underscore": "1.9.1",
19-
"web3-core": "1.3.1",
20-
"web3-core-helpers": "1.3.1",
21-
"web3-core-method": "1.3.1",
22-
"web3-core-promievent": "1.3.1",
23-
"web3-core-subscriptions": "1.3.1",
24-
"web3-eth-abi": "1.3.1",
25-
"web3-utils": "1.3.1"
19+
"web3-core": "1.3.4",
20+
"web3-core-helpers": "1.3.4",
21+
"web3-core-method": "1.3.4",
22+
"web3-core-promievent": "1.3.4",
23+
"web3-core-subscriptions": "1.3.4",
24+
"web3-eth-abi": "1.3.4",
25+
"web3-utils": "1.3.4"
2626
},
2727
"devDependencies": {
2828
"dtslint": "^3.4.1",

packages/web3-eth-ens/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/web3-eth-ens/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "web3-eth-ens",
3-
"version": "1.3.1",
3+
"version": "1.3.4",
44
"description": "ENS support for web3.",
55
"repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-eth-ens",
66
"license": "LGPL-3.0",
@@ -17,12 +17,12 @@
1717
"content-hash": "^2.5.2",
1818
"eth-ens-namehash": "2.0.8",
1919
"underscore": "1.9.1",
20-
"web3-core": "1.3.1",
21-
"web3-core-helpers": "1.3.1",
22-
"web3-core-promievent": "1.3.1",
23-
"web3-eth-abi": "1.3.1",
24-
"web3-eth-contract": "1.3.1",
25-
"web3-utils": "1.3.1"
20+
"web3-core": "1.3.4",
21+
"web3-core-helpers": "1.3.4",
22+
"web3-core-promievent": "1.3.4",
23+
"web3-eth-abi": "1.3.4",
24+
"web3-eth-contract": "1.3.4",
25+
"web3-utils": "1.3.4"
2626
},
2727
"devDependencies": {
2828
"dtslint": "^3.4.1",

packages/web3-eth-iban/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/web3-eth-iban/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "web3-eth-iban",
3-
"version": "1.3.1",
3+
"version": "1.3.4",
44
"description": "This package converts Ethereum addresses to IBAN addresses a vice versa.",
55
"repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-eth-iban",
66
"license": "LGPL-3.0",
@@ -15,7 +15,7 @@
1515
"main": "lib/index.js",
1616
"dependencies": {
1717
"bn.js": "^4.11.9",
18-
"web3-utils": "1.3.1"
18+
"web3-utils": "1.3.4"
1919
},
2020
"devDependencies": {
2121
"dtslint": "^3.4.1",

packages/web3-eth-personal/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)