support for non-updated historical access nodes

Author: jordanschalm

state/convert.go

@@ -23,15 +23,15 @@ import (
 	"github.com/onflow/rosetta/log"
 )
 
-func convertExecutionResult(hash []byte, height uint64, result *entities.ExecutionResult) (flowExecutionResult, bool) {
+func convertExecutionResult(sporkVersion int, hash []byte, height uint64, result *entities.ExecutionResult) (flowExecutionResult, bool) {
 	// todo: add V6 version branching here directly after mainnet23 spork
 	exec := flowExecutionResult{
 		BlockID:          toFlowIdentifier(result.BlockId),
 		ExecutionDataID:  toFlowIdentifier(result.ExecutionDataId),
 		PreviousResultID: toFlowIdentifier(result.PreviousResultId),
 	}
 	for _, chunk := range result.Chunks {
-		convertedChunk, err := convert.MessageToChunk(chunk)
+		convertedChunk, err := convertChunk(sporkVersion, chunk)
 		if err != nil {
 			log.Errorf("Failed to convert chunk in block %x at height %d:  %v", hash, height, err)
 			return flowExecutionResult{}, false
@@ -53,6 +53,25 @@ func convertExecutionResult(hash []byte, height uint64, result *entities.Executi
 	return exec, true
 }
 
+func convertChunk(sporkVersion int, protobufChunk *entities.Chunk) (*flow.Chunk, error) {
+	if sporkVersion < 7 {
+		chunk, err := convert.MessageToChunk(protobufChunk)
+		if err != nil {
+			return nil, err
+		}
+		// Protocol State v1: ServiceEventCount field not yet added.
+		// Access Nodes running up-to-date software encode nil ServiceEventCount fields in a detectable way,
+		// but we assume that we are querying historical Access Nodes that are running prior software versions.
+		// In this case, the new Protobuf field is automatically set to 0.
+		// See https://github.com/onflow/flow-go/pull/6744 for additional context
+		chunk.ServiceEventCount = nil
+		return chunk, nil
+	}
+
+	// Protocol State v2+
+	return convert.MessageToChunk(protobufChunk)
+}
+
 func decodeEvent(typ string, evt *entities.Event, hash []byte, height uint64) (cadence.Event, error) {
 	val, err := decodePayload(evt.Payload)
 	if err != nil {
@@ -426,7 +445,7 @@ func verifyBlockHash(spork *config.Spork, hash []byte, height uint64, hdr *entit
 
 	var resultIDs []flow.Identifier
 	for _, src := range block.ExecutionResultList {
-		exec, ok := convertExecutionResult(hash, height, src)
+		exec, ok := convertExecutionResult(spork.Version, hash, height, src)
 		if ok {
 			resultIDs = append(resultIDs, deriveExecutionResult(spork, exec))
 		}

state/convert_test.go

@@ -63,7 +63,7 @@ func TestVerifyExecutionResultHash(t *testing.T) {
 			sealedResults[string(seal.BlockId)] = string(seal.ResultId)
 		}
 		var resultID flow.Identifier
-		exec, ok := convertExecutionResult(block.Id, blockHeight, execResult)
+		exec, ok := convertExecutionResult(spork.Version, block.Id, blockHeight, execResult)
 		if ok {
 			resultID = deriveExecutionResult(spork, exec)
 		}
@@ -156,7 +156,7 @@ func TestExecutionResultConsistency_ChunkServiceEventCountField(t *testing.T) {
 
 		psv1ProtobufResult, err := convert.ExecutionResultToMessage(psv1Result)
 		require.NoError(t, err)
-		psv1RosettaResult, ok := convertExecutionResult(nil, 0, psv1ProtobufResult)
+		psv1RosettaResult, ok := convertExecutionResult(7, nil, 0, psv1ProtobufResult)
 		require.True(t, ok)
 		rosettaResultID := deriveExecutionResultV2(psv1RosettaResult)
 		assert.Equal(t, psv1Result.ID(), rosettaResultID)
@@ -168,7 +168,7 @@ func TestExecutionResultConsistency_ChunkServiceEventCountField(t *testing.T) {
 
 		psv2ProtobufResult, err := convert.ExecutionResultToMessage(psv2Result)
 		require.NoError(t, err)
-		psv2RosettaResult, ok := convertExecutionResult(nil, 0, psv2ProtobufResult)
+		psv2RosettaResult, ok := convertExecutionResult(7, nil, 0, psv2ProtobufResult)
 		require.True(t, ok)
 		rosettaResultID := deriveExecutionResultV2(psv2RosettaResult)
 		assert.Equal(t, psv2Result.ID(), rosettaResultID)

state/process.go

@@ -12,15 +12,16 @@ import (
 	"github.com/onflow/flow-go/model/flow"
 	flowaccess "github.com/onflow/flow/protobuf/go/flow/access"
 	"github.com/onflow/flow/protobuf/go/flow/entities"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+
 	"github.com/onflow/rosetta/access"
 	"github.com/onflow/rosetta/cache"
 	"github.com/onflow/rosetta/config"
 	"github.com/onflow/rosetta/crypto"
 	"github.com/onflow/rosetta/log"
 	"github.com/onflow/rosetta/model"
 	"github.com/onflow/rosetta/trace"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
 )
 
 var (
@@ -326,7 +327,7 @@ outer:
 				}
 			}
 			var resultID flow.Identifier
-			exec, convOk := convertExecutionResult(hash, height, execResult)
+			exec, convOk := convertExecutionResult(spork.Version, hash, height, execResult)
 			if convOk {
 				resultID = deriveExecutionResult(spork, exec)
 			}