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

Commit ddf979f

Browse files
committed
Merge branch 'issue/3244' of github.com:ethereum/web3.js into issue/3244
2 parents db1f3c4 + ecde911 commit ddf979f

File tree

5 files changed

+25
-120
lines changed

5 files changed

+25
-120
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,11 @@ Released with 1.0.0-beta.37 code base.
108108
- ``BN`` and ``BigNumber`` objects are now supported by the ``abi.encodeParameter(s)`` method (#3238)
109109
- ``getPendingTransactions`` added to web3-eth package (#3239)
110110

111+
### Changed
112+
113+
- ``eth-lib`` dependency updated (0.2.7 => ^0.2.8) (#3242)
114+
111115
### Fixed
112116

113117
- ``defaultBlock`` property handling fixed (#3247)
118+
- ``clearSubscriptions`` does no longer throw an error if no running subscriptions do exist (#3246)

package-lock.json

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

packages/web3-core-requestmanager/src/index.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -228,11 +228,13 @@ RequestManager.prototype.clearSubscriptions = function (keepIsSyncing) {
228228
var _this = this;
229229

230230

231-
// uninstall all subscriptions
232-
Object.keys(this.subscriptions).forEach(function(id){
233-
if(!keepIsSyncing || _this.subscriptions[id].name !== 'syncing')
234-
_this.removeSubscription(id);
235-
});
231+
if (this.subscriptions) {
232+
// uninstall all subscriptions
233+
Object.keys(this.subscriptions).forEach(function(id){
234+
if(!keepIsSyncing || _this.subscriptions[id].name !== 'syncing')
235+
_this.removeSubscription(id);
236+
});
237+
}
236238

237239

238240
// reset notification callbacks etc.

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

Lines changed: 9 additions & 111 deletions
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"@web3-js/scrypt-shim": "^0.1.0",
1717
"any-promise": "1.3.0",
1818
"crypto-browserify": "3.12.0",
19-
"eth-lib": "0.2.7",
19+
"eth-lib": "^0.2.8",
2020
"ethereumjs-common": "^1.3.2",
2121
"ethereumjs-tx": "^2.1.1",
2222
"underscore": "1.9.1",

0 commit comments

Comments
 (0)