Merge pull request #5688 from oasisprotocol/peternose/trivial/fix-han…

…doff-interval

go/keymanager/churp: Fix handoff interval

go/consensus/cometbft/apps/keymanager/churp/epoch.go

@@ -23,7 +23,7 @@ func (ext *churpExt) onEpochChange(ctx *tmapi.Context, epoch beacon.EpochTime) e
 		}
 
 		for _, status := range statuses {
-			if status.NextHandoff == churp.HandoffsDisabled {
+			if status.HandoffsDisabled() {
 				continue
 			}
 

go/consensus/cometbft/apps/keymanager/churp/txs.go

@@ -247,20 +247,19 @@ func (ext *churpExt) apply(ctx *tmapi.Context, req *churp.SignedApplicationReque
 		return fmt.Errorf("keymanager: churp: non-existing ID: %d", req.Application.ID)
 	}
 
+	// Check if handoffs are enabled.
+	if status.HandoffsDisabled() {
+		return fmt.Errorf("keymanager: churp: handoffs disabled")
+	}
+
 	// Allow applications one epoch before the next handoff.
 	now, err := ext.state.GetCurrentEpoch(ctx)
 	if err != nil {
 		return err
 	}
-
-	switch status.NextHandoff {
-	case churp.HandoffsDisabled:
-		return fmt.Errorf("keymanager: churp: handoffs disabled")
-	case now + 1:
-	default:
+	if status.NextHandoff != now+1 {
 		return fmt.Errorf("keymanager: churp: submissions closed")
 	}
-
 	if status.NextHandoff != req.Application.Epoch {
 		return fmt.Errorf("keymanager: churp: invalid handoff: got %d, expected %d", req.Application.Epoch, status.NextHandoff)
 	}
@@ -339,20 +338,19 @@ func (ext *churpExt) confirm(ctx *tmapi.Context, req *churp.SignedConfirmationRe
 		return fmt.Errorf("keymanager: churp: non-existing ID: %d", req.Confirmation.ID)
 	}
 
+	// Check if handoffs are enabled.
+	if status.HandoffsDisabled() {
+		return fmt.Errorf("keymanager: churp: handoffs disabled")
+	}
+
 	// Allow confirmations only during the next handoff.
 	now, err := ext.state.GetCurrentEpoch(ctx)
 	if err != nil {
 		return err
 	}
-
-	switch status.NextHandoff {
-	case churp.HandoffsDisabled:
-		return fmt.Errorf("keymanager: churp: handoffs disabled")
-	case now:
-	default:
+	if status.NextHandoff != now {
 		return fmt.Errorf("keymanager: churp: confirmations closed")
 	}
-
 	if status.NextHandoff != req.Confirmation.Epoch {
 		return fmt.Errorf("keymanager: churp: invalid handoff: got %d, expected %d", req.Confirmation.Epoch, status.NextHandoff)
 	}
@@ -441,10 +439,6 @@ func addStakeClaim(ctx *tmapi.Context, entityID signature.PublicKey, runtimeID c
 	}
 
 	entityAddr := staking.NewAddress(entityID)
-	if err != nil {
-		return err
-	}
-
 	claim := churp.StakeClaim(runtimeID, churpID)
 	thresholds := churp.StakeThresholds()
 
@@ -519,19 +513,30 @@ func tryFinalizeHandoff(status *churp.Status, epochChange bool) bool {
 		return false
 	})
 
+	// Compute the next handoff epoch.
+	nextHandoff := churp.HandoffsDisabled
+	if status.Handoff < churp.HandoffsDisabled-status.HandoffInterval {
+		nextHandoff = status.NextHandoff + status.HandoffInterval
+	}
+
+	// Give nodes an extra epoch for application submission.
+	if epochChange && status.HandoffInterval == 1 && nextHandoff < churp.HandoffsDisabled {
+		nextHandoff++
+	}
+
+	// Disable handoffs when overflow happens.
+	if nextHandoff == churp.HandoffsDisabled {
+		status.HandoffInterval = 0
+	}
+
 	// Update fields.
 	status.Handoff = status.NextHandoff
 	status.Checksum = status.NextChecksum
 	status.Committee = committee
-	status.NextHandoff = status.Handoff + status.HandoffInterval
+	status.NextHandoff = nextHandoff
 	status.NextChecksum = nil
 	status.Applications = nil
 
-	// Give nodes an extra epoch for application submission.
-	if epochChange && status.HandoffInterval == 1 {
-		status.NextHandoff++
-	}
-
 	return true
 }