clearn up

Author: beer-1

signer/cosigner_nonce_cache.go

@@ -199,26 +199,31 @@ func (cnc *CosignerNonceCache) getUuids(n int) []uuid.UUID {
 }
 
 func (cnc *CosignerNonceCache) target(noncesPerMinute float64) int {
-	// Calculate for nonce expiration window
-	blocksPerExpirationWindow := int(cnc.nonceExpiration.Seconds() / 0.5) // 0.5 second blocks
-
 	// Nonces needed per block:
 	// - 1 for proposal
 	// - 1 for prevote
 	// - 1 for precommit
 	// - 1 for vote extension (if enabled)
-	noncesPerBlock := 4 // proposal + prevote + precommit + extension
+	const (
+		noncesPerBlock = 4   // proposal + prevote + precommit + extension
+		blockTime      = 0.5 // block time in seconds
+	)
 
-	// Total nonces needed for expiration window with overallocation
-	activeNoncesPerWindow := int(float64(blocksPerExpirationWindow) *
-		float64(noncesPerBlock) *
-		nonceOverallocation)
+	// Calculate nonces needed per second based on either:
+	// - Actual usage (noncesPerMinute converted to per second)
+	// - Theoretical usage (noncesPerBlock / blockTime)
+	noncesPerSecond := max(noncesPerMinute/60, float64(noncesPerBlock)/blockTime)
 
-	// Calculate based on current usage with buffer
-	currentUsageTarget := int((noncesPerMinute / 60) *
-		((cnc.getNoncesInterval.Seconds() * nonceOverallocation) + cnc.getNoncesTimeout.Seconds()))
+	// Calculate target number of nonces to maintain in cache:
+	// noncesPerSecond * (interval * overallocation + timeout)
+	t := int(noncesPerSecond * ((cnc.getNoncesInterval.Seconds() * nonceOverallocation) +
+		cnc.getNoncesTimeout.Seconds()))
 
-	return max(currentUsageTarget, activeNoncesPerWindow)
+	// Always maintain at least one nonce
+	if t <= 0 {
+		return 1
+	}
+	return t
 }
 
 func (cnc *CosignerNonceCache) reconcile(ctx context.Context) {