Merge branch 'issue/3244' of github.com:ethereum/web3.js into issue/3244

web3 · Nov 29, 2019 · ddf979f · ddf979f
2 parents db1f3c4 + ecde911
commit ddf979f
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 120 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -108,6 +108,11 @@ 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
 
 - ``defaultBlock`` property handling fixed (#3247)
+- ``clearSubscriptions`` does no longer throw an error if no running subscriptions do exist (#3246) 
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/web3-core-requestmanager/src/index.js b/packages/web3-core-requestmanager/src/index.js
@@ -228,11 +228,13 @@ RequestManager.prototype.clearSubscriptions = function (keepIsSyncing) {
     var _this = this;
 
 
-    // uninstall all subscriptions
-    Object.keys(this.subscriptions).forEach(function(id){
-        if(!keepIsSyncing || _this.subscriptions[id].name !== 'syncing')
-            _this.removeSubscription(id);
-    });
+    if (this.subscriptions) {
+        // uninstall all subscriptions
+        Object.keys(this.subscriptions).forEach(function(id){
+            if(!keepIsSyncing || _this.subscriptions[id].name !== 'syncing')
+                _this.removeSubscription(id);
+        });
+    }
 
 
     //  reset notification callbacks etc.

diff --git a/packages/web3-eth-accounts/package-lock.json b/packages/web3-eth-accounts/package-lock.json
diff --git a/packages/web3-eth-accounts/package.json b/packages/web3-eth-accounts/package.json
@@ -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",