- Currency: left data (and BC time) not updated when new block - fix #258

- Network: do not load full BMA node object for network scanning

ionic.project

@@ -24,4 +24,4 @@
       "version": "12.41.296.5"
     }
   ]
-}
+}
\ No newline at end of file

www/js/controllers/currency-controllers.js

@@ -100,7 +100,7 @@ function CurrencyLookupController($scope, $state, UIUtils, csCurrency) {
   };
 }
 
-function CurrencyViewController($scope, $q, BMA, UIUtils, csSettings, csCurrency) {
+function CurrencyViewController($scope, $q, $timeout, BMA, UIUtils, csSettings, csCurrency, csNetwork) {
   $scope.formData = {
     useRelative: csSettings.data.useRelative,
     currency: '',
@@ -120,49 +120,59 @@ function CurrencyViewController($scope, $q, BMA, UIUtils, csSettings, csCurrency
     stepMax: 0,
     xpercent: 0,
     durationFromLastUD: 0,
+    blockUid: null
   };
   $scope.node = null;
   $scope.loading = true;
   $scope.screen = UIUtils.screen;
 
   $scope.$on('$ionicView.enter', function(e, state) {
-    if (state.stateParams && state.stateParams.name) { // Load by name
-      csCurrency.searchByName(state.stateParams.name)
-      .then(function(currency){
-        $scope.load(currency);
-      });
-    }
-    else {
-      csCurrency.all()
-      .then(function (currencies) {
-        if (currencies && currencies.length > 0) {
-          $scope.load(currencies[0]);
+    if ($scope.loading) { // run only once (first enter)
+      if (state.stateParams && state.stateParams.name) { // Load by name
+        csCurrency.searchByName(state.stateParams.name)
+        .then(function(currency){
+          $scope.init(currency);
+        });
+      }
+      else {
+        csCurrency.default()
+        .then(function (currency) {
+          $scope.init(currency);
+        })
+        .catch(UIUtils.onError('ERROR.GET_CURRENCY_FAILED'));
+      }
+
+      csNetwork.api.data.on.mainBlockChanged($scope, function(data) {
+        if ($scope.loading) return;
+        if ($scope.formData.blockUid !== data.mainBuid) {
+          console.debug("[currency] Updating parameters UI (new main block detected)");
+          $timeout($scope.load, 1000 /*waiting propagation to requested node*/);
         }
-      })
-      .catch(UIUtils.onError('ERROR.GET_CURRENCY_FAILED'));
+      });
     }
   });
 
-  $scope.load = function(currency) {
+  $scope.init = function(currency) {
     $scope.formData.currency = currency.name;
     $scope.node = !BMA.node.same(currency.peer.host, currency.peer.port) ?
       BMA.instance(currency.peer.host, currency.peer.port) : BMA;
+
     UIUtils.loading.show();
 
-    // Load currency parameters
-    $scope.loadParameter();
+    // Load data
+    $scope.load()
 
-    // Show help tip
-    $scope.showHelpTip();
+      // Show help tip
+      .then($scope.showHelpTip);
   };
 
-  $scope.loadParameter = function() {
+  $scope.load = function() {
     if (!$scope.node) {
       return;
     }
+
     // Load data from node
-    var data = {};
-    var M, lastUDTime;
+    var data = {}, M, lastUDTime, now = new Date().getTime();
     return $q.all([
 
       // Get the currency parameters
@@ -186,6 +196,7 @@ function CurrencyViewController($scope, $q, BMA, UIUtils, csSettings, csCurrency
           data.N = block.membersCount;
           data.medianTime  = block.medianTime;
           data.difficulty  = block.powMin;
+          data.blockUid = [block.number, block.hash].join('-');
         })
         .catch(function(err){
           // Special case for currency init (root block not exists): use fixed values
@@ -231,13 +242,15 @@ function CurrencyViewController($scope, $q, BMA, UIUtils, csSettings, csCurrency
       data.MoverN = (Mprev ? Mprev : M/*need at currency start only*/) / data.Nprev;
       data.UD = data.currentUD;
       data.durationFromLastUD = lastUDTime ? data.medianTime - lastUDTime : 0;
+      data.useRelative = $scope.formData.useRelative;
 
       // Apply to formData
       angular.copy(data, $scope.formData);
 
+      console.debug("[currency] Parameters loaded in " + (new Date().getTime() - now) + 'ms' );
       $scope.loading = false;
       $scope.$broadcast('$$rebind::' + 'rebind'); // force bind of currency name
-      UIUtils.loading.hide();
+      return UIUtils.loading.hide();
     })
     .catch(function(err) {
       $scope.loading = false;

www/js/controllers/network-controllers.js

@@ -76,7 +76,7 @@ function NetworkLookupController($scope, $timeout, $state, $ionicPopover, BMA, U
         if (!refreshing) {
           refreshing = true;
           $timeout(function() { // Timeout avoid to quick updates
-            console.debug("Updating UI Peers");
+            console.debug("[peers] Updating UI");
             $scope.search.results = data.peers;
             $scope.search.memberPeersCount = data.memberPeersCount;
             $scope.search.loading = csNetwork.isBusy();

www/js/services/network-services.js

 
-angular.module('cesium.network.services', ['ngResource', 'ngApi', 'cesium.bma.services'])
+angular.module('cesium.network.services', ['ngResource', 'ngApi', 'cesium.bma.services', 'cesium.http.services'])
 
-.factory('csNetwork', function($rootScope, $q, $interval, $timeout, BMA, Api, csSettings, UIUtils) {
+.factory('csNetwork', function($rootScope, $q, $interval, $timeout, BMA, csHttp, Api, csSettings, UIUtils) {
   'ngInject';
 
   factory = function(id) {
@@ -64,6 +64,20 @@ angular.module('cesium.network.services', ['ngResource', 'ngApi', 'cesium.bma.se
         return data.knownBlocks;
       },
 
+      newLightBMA = function(peer) {
+        return {
+          node: {
+            summary: csHttp.getWithCache(peer.getHost(), peer.getPort(), '/node/summary', csHttp.cache.LONG)
+          },
+          blockchain: {
+            current: csHttp.get(peer.getHost(), peer.getPort(), '/blockchain/current'),
+            stats: {
+              hardship: csHttp.get(peer.getHost(), peer.getPort(), '/blockchain/hardship/:pubkey')
+            }
+          }
+        };
+      },
+
       loadPeers = function() {
         data.knownPeers = {};
         data.peers = [];
@@ -157,7 +171,7 @@ angular.module('cesium.network.services', ['ngResource', 'ngApi', 'cesium.bma.se
         // Apply filter
         if (!applyPeerFilter(peer)) return $q.when();
 
-        var node = new BMA.instance(peer.getHost(), peer.getPort(), false);
+        var node = newLightBMA(peer);
 
         // Get current block
         return node.blockchain.current()
@@ -257,8 +271,9 @@ angular.module('cesium.network.services', ['ngResource', 'ngApi', 'cesium.bma.se
           score += (-1       * (peer.uid ? peer.uid.charCodeAt(0) : 999)); // alphabetical order
           return -score;
         });
-        if (updateMainBuid) {
+        if (updateMainBuid && mainBlock.buid) {
           data.mainBuid = mainBlock.buid;
+          console.log(data.mainBuid);
           api.data.raise.mainBlockChanged(data); // raise event
         }
         api.data.raise.changed(data); // raise event

www/templates/currency/items_parameters.html

@@ -44,7 +44,7 @@
 
         <div class="item item-toggle dark">
             <span translate>COMMON.BTN_RELATIVE_UNIT</span>
-            <label class="toggle toggle-royal" id="helptip-currency-change-unit" ng-if="!loading">
+            <label class="toggle toggle-royal" id="helptip-currency-change-unit">
                 <input type="checkbox" ng-model="formData.useRelative">
                 <div class="track">
                     <div class="handle"></div>