Remove validators package and use AvalancheGo uptimetracker

.github/workflows/ci.yml

@@ -94,7 +94,7 @@ jobs:
       - name: Setup Contracts
         run: ./scripts/run_task.sh setup-contracts
       - name: Run Warp E2E Tests
-        uses: ava-labs/avalanchego/.github/actions/run-monitored-tmpnet-cmd@8564a57d3ca61f976c90b4ad96e41640a2a3cdc4
+        uses: ava-labs/avalanchego/.github/actions/run-monitored-tmpnet-cmd@7d60acaddc22ff5341eca103cb50041ae7890dc3
         with:
           run: ./scripts/run_task.sh test-e2e-warp-ci
           artifact_prefix: warp
@@ -116,7 +116,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Run E2E Load Tests
-        uses: ava-labs/avalanchego/.github/actions/run-monitored-tmpnet-cmd@8564a57d3ca61f976c90b4ad96e41640a2a3cdc4
+        uses: ava-labs/avalanchego/.github/actions/run-monitored-tmpnet-cmd@7d60acaddc22ff5341eca103cb50041ae7890dc3
         with:
           run: ./scripts/run_task.sh test-e2e-load-ci
           artifact_prefix: load

go.mod

@@ -5,7 +5,7 @@ go 1.24.9
 require (
 	github.com/VictoriaMetrics/fastcache v1.12.1
 	github.com/antithesishq/antithesis-sdk-go v0.3.8
-	github.com/ava-labs/avalanchego v1.13.6-rc.1
+	github.com/ava-labs/avalanchego v1.13.6-0.20251023135656-7d60acaddc22
 	github.com/ava-labs/firewood-go-ethhash/ffi v0.0.13
 	github.com/ava-labs/libevm v1.13.15-0.20251016142715-1bccf4f2ddb2
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc

go.sum

@@ -28,8 +28,8 @@ github.com/antithesishq/antithesis-sdk-go v0.3.8/go.mod h1:IUpT2DPAKh6i/YhSbt6Gl
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
-github.com/ava-labs/avalanchego v1.13.6-rc.1 h1:O4qeGhxRVO5O8vfu2LMpwU5AdES/8bB2MeDPcrHmYIc=
-github.com/ava-labs/avalanchego v1.13.6-rc.1/go.mod h1:27SGpJ0L+3jVMfjY8X5nmgkZ3sFSc7vGeJj+SFjAKL0=
+github.com/ava-labs/avalanchego v1.13.6-0.20251023135656-7d60acaddc22 h1:XyM8irB7PK1lDDyuodQgg+OG8oudp+TgDkugv18PYow=
+github.com/ava-labs/avalanchego v1.13.6-0.20251023135656-7d60acaddc22/go.mod h1:wEiDa5Lc3oKm9l2AxJOXmLz00Wg7b3hUttgkfzgRoDA=
 github.com/ava-labs/coreth v0.15.4-rc.4 h1:ze7/IwDptWG1u2d32uUZz9Ix9ycVUtlB8JufuSKSSS4=
 github.com/ava-labs/coreth v0.15.4-rc.4/go.mod h1:yVwuMyPkZ48xzZ0y2OdIwaoUqvSsgPYoodyX9BZJ2uo=
 github.com/ava-labs/firewood-go-ethhash/ffi v0.0.13 h1:obPwnVCkF5+B2f8WbTepHj0ZgiW21vKUgFCtATuAYNY=

plugin/evm/service.go

@@ -18,61 +18,65 @@ type ValidatorsAPI struct {
 	vm *VM
 }
 
-func (api *ValidatorsAPI) GetCurrentValidators(_ *http.Request, req *client.GetCurrentValidatorsRequest, reply *client.GetCurrentValidatorsResponse) error {
+func (api *ValidatorsAPI) GetCurrentValidators(httpReq *http.Request, req *client.GetCurrentValidatorsRequest, reply *client.GetCurrentValidatorsResponse) error {
 	api.vm.vmLock.RLock()
 	defer api.vm.vmLock.RUnlock()
+	ctx := httpReq.Context()
 
-	var vIDs set.Set[ids.ID]
+	validatorSet, _, err := api.vm.ctx.ValidatorState.GetCurrentValidatorSet(ctx, api.vm.ctx.SubnetID)
+	if err != nil {
+		return fmt.Errorf("failed to get current validator set: %w", err)
+	}
+
+	// Filter by requested nodeIDs if specified
+	requestedNodeIDs := set.NewSet[ids.NodeID](len(req.NodeIDs))
 	if len(req.NodeIDs) > 0 {
-		vIDs = set.NewSet[ids.ID](len(req.NodeIDs))
 		for _, nodeID := range req.NodeIDs {
-			vID, err := api.vm.validatorsManager.GetValidationID(nodeID)
-			if err != nil {
-				return fmt.Errorf("couldn't find validator with node ID %s", nodeID)
-			}
-			vIDs.Add(vID)
+			requestedNodeIDs.Add(nodeID)
 		}
-	} else {
-		vIDs = api.vm.validatorsManager.GetValidationIDs()
 	}
 
-	reply.Validators = make([]client.CurrentValidator, 0, vIDs.Len())
-
-	for _, vID := range vIDs.List() {
-		validator, err := api.vm.validatorsManager.GetValidator(vID)
-		if err != nil {
-			return fmt.Errorf("couldn't find validator with validation ID %s", vID)
+	reply.Validators = make([]client.CurrentValidator, 0, len(validatorSet))
+	for validationID, validator := range validatorSet {
+		// Skip if specific nodeIDs were requested and this isn't one of them
+		if requestedNodeIDs.Len() > 0 && !requestedNodeIDs.Contains(validator.NodeID) {
+			continue
 		}
 
-		isConnected := api.vm.validatorsManager.IsConnected(validator.NodeID)
-
-		upDuration, lastUpdated, err := api.vm.validatorsManager.CalculateUptime(validator.NodeID)
+		upDuration, lastUpdated, found, err := api.vm.uptimeTracker.GetUptime(validationID)
 		if err != nil {
-			return err
+			return fmt.Errorf("failed to get uptime for validation ID %s: %w", validationID, err)
 		}
+		if !found {
+			return fmt.Errorf("validator not found for validation ID %s", validationID)
+		}
+
 		var uptimeFloat float64
-		startTime := time.Unix(int64(validator.StartTimestamp), 0)
+
+		startTime := time.Unix(int64(validator.StartTime), 0)
 		bestPossibleUpDuration := lastUpdated.Sub(startTime)
 		if bestPossibleUpDuration == 0 {
 			uptimeFloat = 1
 		} else {
 			uptimeFloat = float64(upDuration) / float64(bestPossibleUpDuration)
 		}
-
 		// Transform this to a percentage (0-100) to make it consistent
 		// with currentValidators in PlatformVM API
 		uptimePercentage := float32(uptimeFloat * 100)
+		uptimeSeconds := uint64(upDuration.Seconds())
+
+		isConnected := api.vm.P2PValidators().Has(ctx, validator.NodeID)
 
 		reply.Validators = append(reply.Validators, client.CurrentValidator{
-			ValidationID:     validator.ValidationID,
+			ValidationID:     validationID,
 			NodeID:           validator.NodeID,
-			StartTimestamp:   validator.StartTimestamp,
+			StartTimestamp:   validator.StartTime,
 			Weight:           validator.Weight,
 			IsActive:         validator.IsActive,
 			IsL1Validator:    validator.IsL1Validator,
 			IsConnected:      isConnected,
 			UptimePercentage: uptimePercentage,
-			UptimeSeconds:    uint64(upDuration.Seconds()),
+			UptimeSeconds:    uptimeSeconds,
 		})
 	}
 	return nil