deps: bump AvalancheGo (#1825)

Signed-off-by: Jonathan Oppenheimer <[email protected]>
Co-authored-by: Stephen Buttolph <[email protected]>

Author: JonathanOppenheimer

.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@7d60acaddc22ff5341eca103cb50041ae7890dc3
+        uses: ava-labs/avalanchego/.github/actions/run-monitored-tmpnet-cmd@edff59906ed4d6334d9e591dcb9c85a144520600
         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@7d60acaddc22ff5341eca103cb50041ae7890dc3
+        uses: ava-labs/avalanchego/.github/actions/run-monitored-tmpnet-cmd@edff59906ed4d6334d9e591dcb9c85a144520600
         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-0.20251023135656-7d60acaddc22
+	github.com/ava-labs/avalanchego v1.13.6-0.20251028173723-edff59906ed4
 	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-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/avalanchego v1.13.6-0.20251028173723-edff59906ed4 h1:PwrLDSbAIrqW4xGERMAuqXEtMnVO7+yL3m+1TTDnJHM=
+github.com/ava-labs/avalanchego v1.13.6-0.20251028173723-edff59906ed4/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

@@ -43,13 +43,10 @@ func (api *ValidatorsAPI) GetCurrentValidators(httpReq *http.Request, req *clien
 			continue
 		}
 
-		upDuration, lastUpdated, found, err := api.vm.uptimeTracker.GetUptime(validationID)
+		upDuration, lastUpdated, err := api.vm.uptimeTracker.GetUptime(validationID)
 		if err != nil {
 			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
 

plugin/evm/vm_uptime_test.go

@@ -13,6 +13,7 @@ import (
 	"github.com/ava-labs/avalanchego/snow/engine/enginetest"
 	"github.com/ava-labs/avalanchego/snow/validators/validatorstest"
 	"github.com/ava-labs/avalanchego/upgrade/upgradetest"
+	"github.com/ava-labs/avalanchego/vms/evm/uptimetracker"
 	"github.com/stretchr/testify/require"
 
 	commonEng "github.com/ava-labs/avalanchego/snow/engine/common"
@@ -22,7 +23,8 @@ import (
 func TestUptimeTracker(t *testing.T) {
 	testNodeID := ids.GenerateTestNodeID()
 	testValidationID := ids.GenerateTestID()
-	startTime := uint64(time.Now().Unix())
+	baseTime := time.Unix(0, 0)
+	startTime := uint64(baseTime.Unix())
 
 	// TODO(JonathanOppenheimer): see func NewTestValidatorState() -- this should be examined
 	// when we address the issue of that function.
@@ -31,11 +33,13 @@ func TestUptimeTracker(t *testing.T) {
 			GetCurrentValidatorSetF: func(context.Context, ids.ID) (map[ids.ID]*avagovalidators.GetCurrentValidatorOutput, uint64, error) {
 				return map[ids.ID]*avagovalidators.GetCurrentValidatorOutput{
 					testValidationID: {
-						NodeID:    testNodeID,
-						PublicKey: nil,
-						Weight:    1,
-						StartTime: startTime,
-						IsActive:  true,
+						ValidationID:  testValidationID,
+						NodeID:        testNodeID,
+						PublicKey:     nil,
+						Weight:        1,
+						StartTime:     startTime,
+						IsActive:      true,
+						IsL1Validator: true,
 					},
 				}, 0, nil
 			},
@@ -60,18 +64,56 @@ func TestUptimeTracker(t *testing.T) {
 	))
 	defer vm.Shutdown(context.Background())
 
+	// Mock the clock to control time progression
+	clock := vm.clock
+	clock.Set(baseTime)
+
 	require.NoError(vm.SetState(context.Background(), snow.Bootstrapping))
 
 	// After bootstrapping but before NormalOp, uptimeTracker hasn't started syncing yet
-	_, _, found, err := vm.uptimeTracker.GetUptime(testValidationID)
-	require.NoError(err)
-	require.False(found, "uptime should not be tracked yet")
+	// so GetUptime should not be able to find the validation ID
+	_, _, err := vm.uptimeTracker.GetUptime(testValidationID)
+	require.ErrorIs(err, uptimetracker.ErrValidationIDNotFound)
 
 	require.NoError(vm.SetState(context.Background(), snow.NormalOp))
 
 	// After transitioning to NormalOp, Sync() is called automatically to populate uptime
-	// from validator state
-	_, _, found, err = vm.uptimeTracker.GetUptime(testValidationID)
+	// from validator state, so GetUptime should work now
+	// The validator starts with 0 uptime since it has not connected yet
+	initialUptime, initialLastUpdated, err := vm.uptimeTracker.GetUptime(testValidationID)
+	require.NoError(err)
+	require.Equal(time.Duration(0), initialUptime, "Initial uptime should be 0")
+	require.Equal(baseTime, initialLastUpdated, "Initial lastUpdated should be baseTime")
+
+	// connect, time passes
+	require.NoError(vm.uptimeTracker.Connect(testNodeID))
+	clock.Set(baseTime.Add(1 * time.Hour))
+
+	// get uptime after 1 hour of being connected - uptime should have increased by 1 hour
+	upDuration, lastUpdated, err := vm.uptimeTracker.GetUptime(testValidationID)
+	require.NoError(err)
+	require.Equal(1*time.Hour, upDuration, "Uptime should be 1 hour")
+	require.Equal(baseTime.Add(1*time.Hour), lastUpdated, "lastUpdated should reflect new clock time")
+
+	// disconnect, time passes another 2 hours
+	require.NoError(vm.uptimeTracker.Disconnect(testNodeID))
+	clock.Set(baseTime.Add(2 * time.Hour))
+
+	// get uptime - should not have increased since we were disconnected
+	upDuration, lastUpdated, err = vm.uptimeTracker.GetUptime(testValidationID)
+	require.NoError(err)
+	require.Equal(1*time.Hour, upDuration, "Uptime should not increase while disconnected")
+	require.Equal(baseTime.Add(2*time.Hour), lastUpdated, "lastUpdated should still advance")
+
+	// reconnect, time passes another 30 minutes
+	require.NoError(vm.uptimeTracker.Connect(testNodeID))
+	clock.Set(baseTime.Add(2*time.Hour + 30*time.Minute))
+
+	// get uptime - total uptime should be 1h30m
+	upDuration, lastUpdated, err = vm.uptimeTracker.GetUptime(testValidationID)
 	require.NoError(err)
-	require.True(found, "uptime should be tracked after transitioning to NormalOp")
+	require.Equal(1*time.Hour+30*time.Minute, upDuration,
+		"Uptime should be 1h30m (1h from first connection + 30m from second)")
+	require.Equal(baseTime.Add(2*time.Hour+30*time.Minute), lastUpdated,
+		"lastUpdated should reflect final clock time")
 }

warp/verifier_backend.go

@@ -111,17 +111,11 @@ func (b *backend) verifyOffchainAddressedCall(addressedCall *payload.AddressedCa
 }
 
 func (b *backend) verifyUptimeMessage(uptimeMsg *messages.ValidatorUptime) *common.AppError {
-	currentUptime, _, found, err := b.uptimeTracker.GetUptime(uptimeMsg.ValidationID)
+	currentUptime, _, err := b.uptimeTracker.GetUptime(uptimeMsg.ValidationID)
 	if err != nil {
 		return &common.AppError{
 			Code:    VerifyErrCode,
-			Message: fmt.Sprintf("failed to get uptime for validationID %s: %s", uptimeMsg.ValidationID, err.Error()),
-		}
-	}
-	if !found {
-		return &common.AppError{
-			Code:    VerifyErrCode,
-			Message: fmt.Sprintf("validator not found for validationID %s", uptimeMsg.ValidationID),
+			Message: "failed to get uptime: " + err.Error(),
 		}
 	}
 

warp/verifier_backend_test.go

@@ -354,7 +354,7 @@ func TestUptimeSignatures(t *testing.T) {
 		protoBytes, _ = getUptimeMessageBytes([]byte{}, vID)
 		_, appErr = handler.AppRequest(context.Background(), ids.GenerateTestNodeID(), time.Time{}, protoBytes)
 		require.ErrorIs(t, appErr, &common.AppError{Code: VerifyErrCode})
-		require.Equal(t, fmt.Sprintf("2: validator not found for validationID %s", vID), appErr.Error())
+		require.Equal(t, fmt.Sprintf("2: failed to get uptime: validationID not found: %s", vID), appErr.Error())
 
 		// uptime is less than requested (not connected)
 		protoBytes, _ = getUptimeMessageBytes([]byte{}, validationID)