fix info.peers intermittent exception on benched peers

Author: vidbregar-flare

.gitignore

@@ -19,4 +19,5 @@ rosetta-data
 data
 .vscode*
 __debug_bin*
-build_docker.sh
+build_docker.sh
+.idea

server/Makefile

@@ -120,5 +120,6 @@ check-mainnet-construction:
 	rosetta-cli check:construction --configuration-file=rosetta-cli-conf/mainnet/config.json
 
 mocks:
+	# go install github.com/vektra/mockery/[email protected]
 	rm -rf mocks;
 	mockery --dir client --all --case underscore --outpkg client --output mocks/client;

server/client/client.go

@@ -2,6 +2,9 @@ package client
 
 import (
 	"context"
+	"github.com/ava-labs/avalanchego/ids"
+	"github.com/ava-labs/avalanchego/network/peer"
+	"github.com/ava-labs/avalanchego/utils/json"
 	"math/big"
 	"strings"
 
@@ -34,12 +37,50 @@ type Client interface {
 	TxPoolContent(context.Context) (*TxPoolContent, error)
 	GetNetworkName(context.Context, ...rpc.Option) (string, error)
 	Peers(context.Context, ...rpc.Option) ([]info.Peer, error)
+	// Peers_v1_11 enables info.peers RPC call compatible with v1.11.
+	// Once the dependencies are upgraded, this should be replaced with Peers.
+	Peers_v1_11(context.Context, []ids.NodeID, ...rpc.Option) ([]Peer_v1_11, error)
 	GetContractInfo(ethcommon.Address, bool) (string, uint8, error)
 	CallContract(context.Context, interfaces.CallMsg, *big.Int) ([]byte, error)
 }
 
+type clientFix struct {
+	requester rpc.EndpointRequester
+}
+
+func newClientFix(uri string) *clientFix {
+	return &clientFix{
+		requester: rpc.NewEndpointRequester(
+			uri+"/ext/info",
+			"info",
+		),
+	}
+}
+
+type Peer_v1_11 struct {
+	peer.Info
+
+	Benched []string `json:"benched"`
+}
+
+type PeersReply_v1_11 struct {
+	// Number of elements in [Peers]
+	NumPeers json.Uint64 `json:"numPeers"`
+	// Each element is a peer
+	Peers []Peer_v1_11 `json:"peers"`
+}
+
+func (cf *clientFix) Peers_v1_11(ctx context.Context, nodeIDs []ids.NodeID, options ...rpc.Option) ([]Peer_v1_11, error) {
+	res := &PeersReply_v1_11{}
+	err := cf.requester.SendRequest(ctx, "peers", &info.PeersArgs{
+		NodeIDs: nodeIDs,
+	}, res, options...)
+	return res.Peers, err
+}
+
 type client struct {
 	info.Client
+	*clientFix
 	*EthClient
 	*ContractClient
 }
@@ -55,6 +96,7 @@ func NewClient(ctx context.Context, endpoint string) (Client, error) {
 
 	return client{
 		Client:         info.NewClient(endpoint),
+		clientFix:      newClientFix(endpoint),
 		EthClient:      eth,
 		ContractClient: NewContractClient(eth.Client),
 	}, nil

server/mapper/peers.go

@@ -1,6 +1,7 @@
 package mapper
 
 import (
+	"github.com/ava-labs/avalanche-rosetta/client"
 	"github.com/coinbase/rosetta-sdk-go/types"
 
 	"github.com/ava-labs/avalanchego/api/info"
@@ -27,3 +28,25 @@ func Peers(peers []info.Peer) []*types.Peer {
 
 	return result
 }
+
+func Peers_v1_11(peers []client.Peer_v1_11) []*types.Peer {
+	result := make([]*types.Peer, len(peers))
+
+	for idx, peer := range peers {
+		result[idx] = &types.Peer{
+			PeerID: peer.ID.String(),
+			Metadata: map[string]interface{}{
+				"ip":              peer.IP,
+				"public_ip":       peer.PublicIP,
+				"version":         peer.Version,
+				"last_sent":       peer.LastSent,
+				"last_received":   peer.LastReceived,
+				"benched":         peer.Benched,
+				"observed_uptime": peer.ObservedUptime,
+				"tracked_subnets": peer.TrackedSubnets,
+			},
+		}
+	}
+
+	return result
+}