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

Commit f6ec472

Browse files
authored
Merge branch '1.x' into patch-3
2 parents 6c77965 + 49b0130 commit f6ec472

Some content is hidden

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

55 files changed

+17641
-121146
lines changed

CHANGELOG.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,6 +371,18 @@ Released with 1.0.0-beta.37 code base.
371371
- Bump `elliptic` from `6.5.3` to `6.5.4` for `web3-core-requestmanager` (#3945)
372372
- Rewrite `web3-eth-iban` in ES6 (#3955)
373373

374+
## [1.3.6]
375+
376+
### Changes
377+
378+
- Bump `underscore` package from `1.9.1` to `1.12.1` (#4051)
379+
- Bump `@ensdomains/ens` package from `^0.4.5` to `^0.6.0` (#4059)
380+
- Bump `ethers` package from `^5.0.18` to `^5.1.4` (#4059)
381+
382+
### Removes
383+
384+
- Accidental commit (yarn-error.log) (#4062)
385+
374386
## [Unreleased]
375387

376-
## [1.3.6]
388+
## [1.3.7]

dist/web3.min.js

Lines changed: 13 additions & 9 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.5",
2+
"version": "1.3.6",
33
"lerna": "2.0.0",
44
"command": {
55
"init": {

package-lock.json

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

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@
9595
"@babel/preset-env": "^7.12.1",
9696
"@babel/preset-typescript": "^7.12.1",
9797
"@babel/runtime": "^7.12.1",
98-
"@chainsafe/geth-dev-assistant": "^0.1.9",
99-
"@ensdomains/ens": "^0.4.5",
98+
"@chainsafe/geth-dev-assistant": "^0.1.10",
99+
"@ensdomains/ens": "^0.6.0",
100100
"@ensdomains/resolver": "^0.2.4",
101101
"@types/bignumber.js": "^4.0.2",
102102
"@types/bn.js": "^4.11.6",
@@ -116,7 +116,7 @@
116116
"dependency-check": "^4.1.0",
117117
"ethereumjs-common": "^1.3.2",
118118
"ethereumjs-tx": "^2.1.2",
119-
"ethers": "^5.0.18",
119+
"ethers": "^5.1.4",
120120
"ganache-cli": "^6.12.0",
121121
"jshint": "^2.12.0",
122122
"karma": "^5.2.3",
@@ -132,7 +132,7 @@
132132
"sandboxed-module": "^2.0.4",
133133
"ts-node": "^9.0.0",
134134
"typescript": "^3.9.7",
135-
"underscore": "1.9.1",
135+
"underscore": "1.12.1",
136136
"wait-port": "^0.2.9",
137137
"webpack": "^4.44.2",
138138
"webpack-cli": "^3.3.12"

0 commit comments

Comments
 (0)