Skip to content

Fix rpc endpoint info #222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 27, 2024
Merged

Fix rpc endpoint info #222

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 24 additions & 8 deletions node/rpc/rpc_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"context"
"math/big"
"net/http"

"source.quilibrium.com/quilibrium/monorepo/node/config"

"github.com/libp2p/go-libp2p/core/peer"
Expand Down Expand Up @@ -156,7 +157,12 @@ func (r *RPCServer) GetNodeInfo(
}
peerScore := r.pubSub.GetPeerScore(r.pubSub.GetPeerID())

return &protobufs.NodeInfoResponse{PeerId: peerID.String(), MaxFrame: r.masterClock.GetFrame().GetFrameNumber(), PeerScore: uint64(peerScore), Version: config.GetVersion()}, nil
return &protobufs.NodeInfoResponse{
PeerId: peerID.String(),
MaxFrame: r.masterClock.GetFrame().GetFrameNumber(),
PeerScore: uint64(peerScore),
Version: config.GetVersion(),
}, nil
}

// GetPeerInfo implements protobufs.NodeServiceServer.
Expand All @@ -165,13 +171,23 @@ func (r *RPCServer) GetPeerInfo(
req *protobufs.GetPeerInfoRequest,
) (*protobufs.PeerInfoResponse, error) {
resp := &protobufs.PeerInfoResponse{}
for _, e := range r.executionEngines {
r := e.GetPeerInfo()
resp.PeerInfo = append(resp.PeerInfo, r.PeerInfo...)
resp.UncooperativePeerInfo = append(
resp.UncooperativePeerInfo,
r.UncooperativePeerInfo...,
)
manifests := r.masterClock.GetPeerManifests()
for _, m := range manifests.PeerManifests {
multiaddr := r.pubSub.GetMultiaddrOfPeer(m.PeerId)
addrs := []string{}
if multiaddr != "" {
addrs = append(addrs, multiaddr)
}

resp.PeerInfo = append(resp.PeerInfo, &protobufs.PeerInfo{
PeerId: m.PeerId,
Multiaddrs: addrs,
MaxFrame: m.MasterHeadFrame,
Timestamp: m.LastSeen,
// We can get away with this for this release only, we will want to add
// version info in manifests.
Version: config.GetVersion(),
})
}
return resp, nil
}
Expand Down