Merge pull request #101 from smartcontractkit/copy-4e96628d8d2688157c4578e6d7cdf20e6655f699

Improvements:

Author: kaleofduty

offchainreporting2plus/internal/ocr3/protocol/outcome_generation_follower.go

@@ -257,14 +257,6 @@ func (outgen *outcomeGenerationState[RI]) backgroundObservation(
 }
 
 func (outgen *outcomeGenerationState[RI]) eventComputedObservation(ev EventComputedObservation[RI]) {
-	if outgen.followerState.phase != outgenFollowerPhaseBackgroundObservation {
-		outgen.logger.Debug("discarding EventComputedObservation, wrong phase", commontypes.LogFields{
-			"seqNr": outgen.sharedState.seqNr,
-			"phase": outgen.followerState.phase,
-		})
-		return
-	}
-
 	if ev.Epoch != outgen.sharedState.e || ev.SeqNr != outgen.sharedState.seqNr {
 		outgen.logger.Debug("discarding EventComputedObservation from old round", commontypes.LogFields{
 			"seqNr":   outgen.sharedState.seqNr,
@@ -274,6 +266,14 @@ func (outgen *outcomeGenerationState[RI]) eventComputedObservation(ev EventCompu
 		return
 	}
 
+	if outgen.followerState.phase != outgenFollowerPhaseBackgroundObservation {
+		outgen.logger.Debug("discarding EventComputedObservation, wrong phase", commontypes.LogFields{
+			"seqNr": outgen.sharedState.seqNr,
+			"phase": outgen.followerState.phase,
+		})
+		return
+	}
+
 	so, err := MakeSignedObservation(outgen.ID(), outgen.sharedState.seqNr, ev.Query, ev.Observation, outgen.offchainKeyring.OffchainSign)
 	if err != nil {
 		outgen.logger.Error("MakeSignedObservation returned error", commontypes.LogFields{
@@ -529,14 +529,6 @@ func (outgen *outcomeGenerationState[RI]) backgroundProposalOutcome(
 }
 
 func (outgen *outcomeGenerationState[RI]) eventComputedProposalOutcome(ev EventComputedProposalOutcome[RI]) {
-	if outgen.followerState.phase != outgenFollowerPhaseBackgroundProposalOutcome {
-		outgen.logger.Debug("discarding EventComputedProposalOutcome, wrong phase", commontypes.LogFields{
-			"seqNr": outgen.sharedState.seqNr,
-			"phase": outgen.followerState.phase,
-		})
-		return
-	}
-
 	if ev.Epoch != outgen.sharedState.e || ev.SeqNr != outgen.sharedState.seqNr {
 		outgen.logger.Debug("discarding EventComputedProposalOutcome from old round", commontypes.LogFields{
 			"seqNr":   outgen.sharedState.seqNr,
@@ -546,6 +538,14 @@ func (outgen *outcomeGenerationState[RI]) eventComputedProposalOutcome(ev EventC
 		return
 	}
 
+	if outgen.followerState.phase != outgenFollowerPhaseBackgroundProposalOutcome {
+		outgen.logger.Debug("discarding EventComputedProposalOutcome, wrong phase", commontypes.LogFields{
+			"seqNr": outgen.sharedState.seqNr,
+			"phase": outgen.followerState.phase,
+		})
+		return
+	}
+
 	prepareSignature, err := MakePrepareSignature(
 		outgen.ID(),
 		outgen.sharedState.seqNr,

offchainreporting2plus/internal/ocr3/protocol/outcome_generation_leader.go

@@ -396,6 +396,14 @@ func (outgen *outcomeGenerationState[RI]) eventComputedValidateVerifyObservation
 		return
 	}
 
+	if outgen.leaderState.phase != outgenLeaderPhaseSentRoundStart && outgen.leaderState.phase != outgenLeaderPhaseGrace {
+		outgen.logger.Debug("discarding EventComputedValidateVerifyObservation, wrong phase", commontypes.LogFields{
+			"seqNr": outgen.sharedState.seqNr,
+			"phase": outgen.leaderState.phase,
+		})
+		return
+	}
+
 	outgen.logger.Debug("got valid MessageObservation", commontypes.LogFields{
 		"sender": ev.Sender,
 		"seqNr":  outgen.sharedState.seqNr,
@@ -471,14 +479,6 @@ func (outgen *outcomeGenerationState[RI]) backgroundObservationQuorum(
 }
 
 func (outgen *outcomeGenerationState[RI]) eventComputedObservationQuorumSuccess(ev EventComputedObservationQuorumSuccess[RI]) {
-	if outgen.leaderState.phase != outgenLeaderPhaseSentRoundStart {
-		outgen.logger.Debug("discarding EventComputedObservationQuorumSuccess, wrong phase", commontypes.LogFields{
-			"seqNr": outgen.sharedState.seqNr,
-			"phase": outgen.leaderState.phase,
-		})
-		return
-	}
-
 	if ev.Epoch != outgen.sharedState.e || ev.SeqNr != outgen.sharedState.seqNr {
 		outgen.logger.Debug("discarding EventComputedObservationQuorumSuccess from old round", commontypes.LogFields{
 			"seqNr":   outgen.sharedState.seqNr,
@@ -488,6 +488,14 @@ func (outgen *outcomeGenerationState[RI]) eventComputedObservationQuorumSuccess(
 		return
 	}
 
+	if outgen.leaderState.phase != outgenLeaderPhaseSentRoundStart {
+		outgen.logger.Debug("discarding EventComputedObservationQuorumSuccess, wrong phase", commontypes.LogFields{
+			"seqNr": outgen.sharedState.seqNr,
+			"phase": outgen.leaderState.phase,
+		})
+		return
+	}
+
 	outgen.logger.Debug("reached observation quorum, starting observation grace period", commontypes.LogFields{
 		"seqNr":      outgen.sharedState.seqNr,
 		"deltaGrace": outgen.config.DeltaGrace.String(),