Uptime tracking api

plugin/evm/api.go

@@ -0,0 +1,38 @@
+// (c) 2019-2020, Ava Labs, Inc. All rights reserved.
+// See the file LICENSE for licensing terms.
+
+package evm
+
+import (
+	"context"
+	"math/big"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/log"
+)
+
+// SnowmanAPI introduces snowman specific functionality to the evm
+type SnowmanAPI struct{ vm *VM }
+
+// GetAcceptedFrontReply defines the reply that will be sent from the
+// GetAcceptedFront API call
+type GetAcceptedFrontReply struct {
+	Hash   common.Hash `json:"hash"`
+	Number *big.Int    `json:"number"`
+}
+
+// GetAcceptedFront returns the last accepted block's hash and height
+func (api *SnowmanAPI) GetAcceptedFront(ctx context.Context) (*GetAcceptedFrontReply, error) {
+	blk := api.vm.blockChain.LastConsensusAcceptedBlock()
+	return &GetAcceptedFrontReply{
+		Hash:   blk.Hash(),
+		Number: blk.Number(),
+	}, nil
+}
+
+// IssueBlock to the chain
+func (api *SnowmanAPI) IssueBlock(ctx context.Context) error {
+	log.Info("Issuing a new block")
+	api.vm.builder.signalTxsReady()
+	return nil
+}

plugin/evm/config.go

@@ -62,6 +62,7 @@ const (
 	defaultStateSyncMinBlocks   = 300_000
 	defaultStateSyncRequestSize = 1024 // the number of key/values to ask peers for per request
 	defaultDBType               = pebbledb.Name
+	defaultValidatorAPIEnabled  = true
 )
 
 type PBool bool
@@ -91,10 +92,11 @@ type Config struct {
 	AirdropFile string `json:"airdrop"`
 
 	// Subnet EVM APIs
-	SnowmanAPIEnabled bool   `json:"snowman-api-enabled"`
-	AdminAPIEnabled   bool   `json:"admin-api-enabled"`
-	AdminAPIDir       string `json:"admin-api-dir"`
-	WarpAPIEnabled    bool   `json:"warp-api-enabled"`
+	SnowmanAPIEnabled    bool   `json:"snowman-api-enabled"`
+	ValidatorsAPIEnabled bool   `json:"validators-api-enabled"`
+	AdminAPIEnabled      bool   `json:"admin-api-enabled"`
+	AdminAPIDir          string `json:"admin-api-dir"`
+	WarpAPIEnabled       bool   `json:"warp-api-enabled"`
 
 	// EnabledEthAPIs is a list of Ethereum services that should be enabled
 	// If none is specified, then we use the default list [defaultEnabledAPIs]
@@ -297,6 +299,7 @@ func (c *Config) SetDefaults() {
 	c.AllowUnprotectedTxHashes = defaultAllowUnprotectedTxHashes
 	c.AcceptedCacheSize = defaultAcceptedCacheSize
 	c.DatabaseType = defaultDBType
+	c.ValidatorsAPIEnabled = defaultValidatorAPIEnabled
 }
 
 func (d *Duration) UnmarshalJSON(data []byte) (err error) {

plugin/evm/service.go

@@ -4,35 +4,66 @@
 package evm
 
 import (
-	"context"
-	"math/big"
+	"net/http"
+	"time"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/log"
+	"github.com/ava-labs/avalanchego/ids"
 )
 
-// SnowmanAPI introduces snowman specific functionality to the evm
-type SnowmanAPI struct{ vm *VM }
+type ValidatorsAPI struct {
+	vm *VM
+}
+
+type GetCurrentValidatorsRequest struct {
+	NodeIDs []ids.NodeID `json:"nodeIDs"`
+}
 
-// GetAcceptedFrontReply defines the reply that will be sent from the
-// GetAcceptedFront API call
-type GetAcceptedFrontReply struct {
-	Hash   common.Hash `json:"hash"`
-	Number *big.Int    `json:"number"`
+type GetCurrentValidatorsResponse struct {
+	Validators []CurrentValidator `json:"validators"`
 }
 
-// GetAcceptedFront returns the last accepted block's hash and height
-func (api *SnowmanAPI) GetAcceptedFront(ctx context.Context) (*GetAcceptedFrontReply, error) {
-	blk := api.vm.blockChain.LastConsensusAcceptedBlock()
-	return &GetAcceptedFrontReply{
-		Hash:   blk.Hash(),
-		Number: blk.Number(),
-	}, nil
+type CurrentValidator struct {
+	ValidationID ids.ID        `json:"validationID"`
+	NodeID       ids.NodeID    `json:"nodeID"`
+	Weight       uint64        `json:"weight"`
+	StartTime    time.Time     `json:"startTime"`
+	IsActive     bool          `json:"isActive"`
+	IsSoV        bool          `json:"isSoV"`
+	IsConnected  bool          `json:"isConnected"`
+	Uptime       time.Duration `json:"uptime"`
 }
 
-// IssueBlock to the chain
-func (api *SnowmanAPI) IssueBlock(ctx context.Context) error {
-	log.Info("Issuing a new block")
-	api.vm.builder.signalTxsReady()
+func (api *ValidatorsAPI) GetCurrentValidators(_ *http.Request, _ *struct{}, reply *GetCurrentValidatorsResponse) error {
+	api.vm.ctx.Lock.RLock()
+	defer api.vm.ctx.Lock.RUnlock()
+
+	vIDs := api.vm.validatorState.GetValidationIDs()
+
+	reply.Validators = make([]CurrentValidator, 0, vIDs.Len())
+
+	for _, vID := range vIDs.List() {
+		validator, err := api.vm.validatorState.GetValidator(vID)
+		if err != nil {
+			return err
+		}
+
+		isConnected := api.vm.uptimeManager.IsConnected(validator.NodeID)
+
+		uptime, _, err := api.vm.uptimeManager.CalculateUptime(validator.NodeID)
+		if err != nil {
+			return err
+		}
+
+		reply.Validators = append(reply.Validators, CurrentValidator{
+			ValidationID: validator.ValidationID,
+			NodeID:       validator.NodeID,
+			StartTime:    validator.StartTime(),
+			Weight:       validator.Weight,
+			IsActive:     validator.IsActive,
+			IsSoV:        validator.IsSoV,
+			IsConnected:  isConnected,
+			Uptime:       time.Duration(uptime.Seconds()),
+		})
+	}
 	return nil
 }

plugin/evm/vm.go

@@ -145,6 +145,7 @@ const (
 	adminEndpoint        = "/admin"
 	ethRPCEndpoint       = "/rpc"
 	ethWSEndpoint        = "/ws"
+	validatorsEndpoint   = "/validators"
 	ethTxGossipNamespace = "eth_tx_gossip"
 )
 
@@ -1087,6 +1088,16 @@ func (vm *VM) CreateHandlers(context.Context) (map[string]http.Handler, error) {
 		enabledAPIs = append(enabledAPIs, "subnet-evm-admin")
 	}
 
+	if vm.config.ValidatorsAPIEnabled {
+		validatorsAPI, err := newHandler("validators", &ValidatorsAPI{vm})
+		if err != nil {
+			return nil, fmt.Errorf("failed to register service for validators API due to %w", err)
+		}
+		apis[validatorsEndpoint] = validatorsAPI
+		enabledAPIs = append(enabledAPIs, "validators")
+	}
+
+	// RPC APIs
 	if vm.config.SnowmanAPIEnabled {
 		if err := handler.RegisterName("snowman", &SnowmanAPI{vm}); err != nil {
 			return nil, err