Merge branch 'rapidsnark' of https://github.com/ethstorage/es-node in…

…to rapidsnark-test
ethstorage · May 9, 2024 · 722b0d8 · 722b0d8
2 parents 798e957 + 3be5002
commit 722b0d8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/cmd/es-node/main.go b/cmd/es-node/main.go
@@ -30,7 +30,7 @@ import (
 var (
 	GitCommit     = ""
 	GitDate       = ""
-	Version       = "v0.1.14"
+	Version       = "v0.1.15"
 	Meta          = "dev"
 	BuildTime     = ""
 	systemVersion = fmt.Sprintf("%s/%s", runtime.GOARCH, runtime.GOOS)

diff --git a/ethstorage/metrics/network_metrics.go b/ethstorage/metrics/network_metrics.go
@@ -143,7 +143,7 @@ func (m *NetworkMetrics) SetStaticMetrics(peersTotal int, minerOfShards map[uint
 
 func (m *NetworkMetrics) DeletePeerInfo(id, version, address string, shardId uint64, miner common.Address) {
 	types := []string{"UpdateTime", "PeerCount", "SyncProgress", "SyncedSeconds", "FillEmptyProgress", "FillEmptySeconds",
-		"MiningPower", "SamplingTime", "Succeeded", "Failed", "Dropped", "LastSucceededTime"}
+		"MiningPower", "SamplingTime", "Succeeded", "Failed", "Dropped", "LastSucceededTime", "ProvidedBlobs"}
 	for _, t := range types {
 		m.PeerState.DeleteLabelValues(fmt.Sprintf(format, id, version, address, shardId, miner.Hex()), t)
 	}

diff --git a/ethstorage/p2p/protocol/syncclient.go b/ethstorage/p2p/protocol/syncclient.go
@@ -272,6 +272,7 @@ func (s *SyncClient) loadSyncStatus() {
 			if t.Contract == s.storageManager.ContractAddress() && t.ShardId == sid {
 				if states != nil {
 					if state, ok := states[t.ShardId]; ok {
+						state.PeerCount = 0
 						t.state = state
 					}
 				}