Merge pull request #846 from lochjin/dev2.0

feat:optimize networkinfo for snapsync
Qitmeer · Dec 12, 2024 · c0f428b · c0f428b
2 parents 353a76e + fab609f
commit c0f428b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/core/json/node.go b/core/json/node.go
@@ -105,6 +105,8 @@ type NetworkStat struct {
 	TotalConnected int            `json:"totalconnected"`
 	TotalRelays    int            `json:"totalrelays"`
 	Infos          []*NetworkInfo `json:"infos"`
+	Services       string         `json:"services"`
+	Snap           bool           `json:"snap"`
 	SnapSync       *SnapSyncInfo  `json:"snapsync,omitempty"`
 }
 

diff --git a/p2p/api.go b/p2p/api.go
@@ -161,6 +161,8 @@ func (api *PublicP2PAPI) GetNetworkInfo() (interface{}, error) {
 		MaxConnected: ps.Config().MaxPeers,
 		MaxInbound:   ps.Config().MaxInbound,
 		Infos:        []*json.NetworkInfo{},
+		Services:     ps.Config().Services.String(),
+		Snap:         ps.IsSnap(),
 	}
 	ss := ps.PeerSync().GetSnapSyncInfo()
 	if ss != nil {

diff --git a/p2p/service.go b/p2p/service.go
@@ -618,6 +618,10 @@ func (s *Service) Consensus() model.Consensus {
 	return s.consensus
 }
 
+func (s *Service) IsSnap() bool {
+	return pv.HasServices(s.cfg.Services, pv.Snap)
+}
+
 func (s *Service) IsSnapSync() bool {
 	return s.PeerSync().IsSnapSync()
 }