Skip to content

Commit

Permalink
Merge branch '1.x' into issue/3245
Browse files Browse the repository at this point in the history
  • Loading branch information
nivida committed Nov 28, 2019
2 parents 0b2ca31 + c9482d7 commit 401d6d6
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 115 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,10 @@ Released with 1.0.0-beta.37 code base.
- ``BN`` and ``BigNumber`` objects are now supported by the ``abi.encodeParameter(s)`` method (#3238)
- ``getPendingTransactions`` added to web3-eth package (#3239)

### Changed

- ``eth-lib`` dependency updated (0.2.7 => 0.2.8) (#3242)

### Fixed

- ``clearSubscriptions`` does no longer throw an error if no running subscriptions do exist (#3246)
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

120 changes: 9 additions & 111 deletions packages/web3-eth-accounts/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/web3-eth-accounts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@web3-js/scrypt-shim": "^0.1.0",
"any-promise": "1.3.0",
"crypto-browserify": "3.12.0",
"eth-lib": "0.2.7",
"eth-lib": "^0.2.8",
"ethereumjs-common": "^1.3.2",
"ethereumjs-tx": "^2.1.1",
"underscore": "1.9.1",
Expand Down

0 comments on commit 401d6d6

Please sign in to comment.