Apply suggestions from PR review.

Author: durkmurder

state/protocol/badger/mutator.go

@@ -870,9 +870,18 @@ func (m *FollowerState) epochPhaseMetricsAndEventsOnBlockFinalized(block *flow.B
 	events []func(),
 	err error,
 ) {
-	// track service event driven metrics and protocol events that should be emitted
-	for _, seal := range block.Payload.Seals {
 
+	// block payload may not specify seals in order, so order them by block height before processing
+	orderedSeals, err := protocol.OrderedSeals(block.Payload, m.headers)
+	if err != nil {
+		if errors.Is(err, storage.ErrNotFound) {
+			return nil, nil, fmt.Errorf("ordering seals: parent payload contains seals for unknown block: %s", err.Error())
+		}
+		return nil, nil, fmt.Errorf("unexpected error ordering seals: %w", err)
+	}
+
+	// track service event driven metrics and protocol events that should be emitted
+	for _, seal := range orderedSeals {
 		result, err := m.results.ByID(seal.ResultID)
 		if err != nil {
 			return nil, nil, fmt.Errorf("could not retrieve result (id=%x) for seal (id=%x): %w", seal.ResultID, seal.ID(), err)
@@ -976,7 +985,7 @@ func (m *FollowerState) epochStatus(block *flow.Header, epochFallbackTriggered b
 // correctness of the service event before processing it.
 // Consequently, any change to the protocol state introduced by a service event
 // emitted during execution of block A would only become visible when querying
-// C or its descendants. 
+// C or its descendants.
 //
 // This method will only apply service-event-induced state changes when the
 // input block has the form of block C (ie. contains a seal for a block in

state/protocol/badger/mutator_test.go

@@ -574,7 +574,7 @@ func TestExtendReceiptsValid(t *testing.T) {
 // Also tests that appropriate epoch transition events are fired.
 //
 // Epoch information becomes available in the protocol state in the block containing the seal
-// for the block in which the relevant service event was emitted.
+// for the block whose execution emitted the service event.
 //
 // ROOT <- B1 <- B2(R1) <- B3(S1) <- B4 <- B5(R2) <- B6(S2) <- B7 <-|- B8
 //

state/protocol/badger/snapshot_test.go

@@ -318,7 +318,7 @@ func TestSealingSegment(t *testing.T) {
 				next := unittest.BlockWithParentFixture(parent.Header)
 				if i == 0 {
 					// Repetitions of the same receipt in one fork would be a protocol violation.
-					// Hence, we include the result only once in the direct child of B1. 
+					// Hence, we include the result only once in the direct child of B1.
 					next.SetPayload(unittest.PayloadFixture(unittest.WithReceipts(receipt1)))
 				}
 				buildFinalizedBlock(t, state, next)