Restore the ETH display in the status bar

beacon_chain/conf.nim

@@ -208,7 +208,8 @@ type
                       "finalized: $finalized_root:$finalized_epoch;" &
                       "head: $head_root:$head_epoch:$head_epoch_slot;" &
                       "time: $epoch:$epoch_slot ($slot);" &
-                      "sync: $sync_status|"
+                      "sync: $sync_status|" &
+                      "ETH: $attached_validators_balance"
         desc: "Textual template for the contents of the status bar"
         name: "status-bar-contents" }: string
 

beacon_chain/eth2_network.nim

@@ -259,22 +259,22 @@ declareCounter nbc_gossip_messages_sent,
 declareCounter nbc_gossip_messages_received,
   "Number of gossip messages received by this peer"
 
-declarePublicCounter nbc_successful_dials,
+declareCounter nbc_successful_dials,
   "Number of successfully dialed peers"
 
-declarePublicCounter nbc_failed_dials,
+declareCounter nbc_failed_dials,
   "Number of dialing attempts that failed"
 
-declarePublicCounter nbc_timeout_dials,
+declareCounter nbc_timeout_dials,
   "Number of dialing attempts that exceeded timeout"
 
-declarePublicGauge nbc_peers,
+declareGauge nbc_peers,
   "Number of active libp2p peers"
 
-declarePublicCounter nbc_successful_discoveries,
+declareCounter nbc_successful_discoveries,
   "Number of successfull discoveries"
 
-declarePublicCounter nbc_failed_discoveries,
+declareCounter nbc_failed_discoveries,
   "Number of failed discoveries"
 
 const delayBuckets = [1.0, 5.0, 10.0, 20.0, 40.0, 60.0]

beacon_chain/nimbus_beacon_node.nim

@@ -982,13 +982,7 @@ when hasPrompt:
           slotStr
 
         of "attached_validators_balance":
-          var balance = uint64(0)
-          # TODO slow linear scan!
-          for idx, b in node.chainDag.headState.data.data.balances:
-            if node.getAttachedValidator(
-                node.chainDag.headState.data.data, ValidatorIndex(idx)) != nil:
-              balance += b
-          formatGwei(balance)
+          formatGwei(attached_validator_balance_total.value.uint64)
 
         of "sync_status":
           if isNil(node.syncManager):

beacon_chain/validator_duties.nim

@@ -42,7 +42,7 @@ declareCounter beacon_blocks_proposed,
 declareGauge(attached_validator_balance,
   "Validator balance at slot end of the first 64 validators, in Gwei",
   labels = ["pubkey"])
-declareGauge(attached_validator_balance_total,
+declarePublicGauge(attached_validator_balance_total,
   "Validator balance of all attached validators, in Gwei")
 
 logScope: topics = "beacval"