Return empty report when merkleroots not generated

Signed-off-by: asoliman <[email protected]>

commit/merkleroot/outcome.go

@@ -44,18 +44,22 @@ func (w *Processor) getOutcome(
 		return Outcome{}, nextState
 	}
 
+	var outcome Outcome
 	switch nextState {
 	case SelectingRangesForReport:
-		return reportRangesOutcome(query, consensusObservation), nextState
+		outcome = reportRangesOutcome(query, consensusObservation)
 	case BuildingReport:
-		return buildReport(query, consensusObservation, previousOutcome), nextState
+		outcome = buildReport(query, consensusObservation, previousOutcome)
 	case WaitingForReportTransmission:
-		return checkForReportTransmission(
-			w.lggr, w.cfg.MaxReportTransmissionCheckAttempts, previousOutcome, consensusObservation), nextState
+		outcome = checkForReportTransmission(
+			w.lggr, w.cfg.MaxReportTransmissionCheckAttempts, previousOutcome, consensusObservation)
 	default:
 		w.lggr.Warnw("Unexpected next state in Outcome", "state", nextState)
 		return Outcome{}, nextState
 	}
+
+	outcome.Sort()
+	return outcome, nextState
 }
 
 // reportRangesOutcome determines the sequence number ranges for each chain to build a report from in the next round

commit/report.go

@@ -21,9 +21,9 @@ func (p *Plugin) Reports(seqNr uint64, outcomeBytes ocr3types.Outcome) ([]ocr3ty
 	}
 
 	// Until we start adding tokens and gas to the report, we don't need to report anything
-	//if outcome.MerkleOutcome.OutcomeType != merkleroot.ReportGenerated {
-	//	return []ocr3types.ReportWithInfo[[]byte]{}, nil
-	//}
+	if outcome.MerkleOutcome.OutcomeType != merkleroot.ReportGenerated {
+		return []ocr3types.ReportWithInfo[[]byte]{}, nil
+	}
 
 	rep := cciptypes.NewCommitPluginReport(
 		outcome.MerkleOutcome.RootsToReport,

commit/types.go

@@ -58,11 +58,6 @@ type Outcome struct {
 
 // Encode encodes an Outcome deterministically
 func (o Outcome) Encode() ([]byte, error) {
-
-	// Sort all outcomes to ensure deterministic serialization
-	o.MerkleOutcome.Sort()
-	o.TokensOutcome.Sort()
-
 	encodedOutcome, err := json.Marshal(o)
 	if err != nil {
 		return nil, fmt.Errorf("failed to encode Outcome: %w", err)