Merge branch 'master' into fxamacker/support-evm-registers-in-check-storage

Author: fxamacker

access/validator.go

@@ -320,11 +320,20 @@ func (v *TransactionValidator) checkExpiry(tx *flow.TransactionBody) error {
 	return nil
 }
 
-func (v *TransactionValidator) checkCanBeParsed(tx *flow.TransactionBody) error {
+func (v *TransactionValidator) checkCanBeParsed(tx *flow.TransactionBody) (err error) {
+	defer func() {
+		if r := recover(); r != nil {
+			if panicErr, ok := r.(error); ok {
+				err = InvalidScriptError{ParserErr: panicErr}
+			} else {
+				err = InvalidScriptError{ParserErr: fmt.Errorf("non-error-typed panic: %v", r)}
+			}
+		}
+	}()
 	if v.options.CheckScriptsParse {
-		_, err := parser.ParseProgram(nil, tx.Script, parser.Config{})
-		if err != nil {
-			return InvalidScriptError{ParserErr: err}
+		_, parseErr := parser.ParseProgram(nil, tx.Script, parser.Config{})
+		if parseErr != nil {
+			return InvalidScriptError{ParserErr: parseErr}
 		}
 	}
 

engine/collection/ingest/engine_test.go

@@ -172,6 +172,25 @@ func (suite *Suite) TestInvalidTransaction() {
 		suite.Assert().True(errors.As(err, &access.InvalidScriptError{}))
 	})
 
+	// In some cases the Cadence parser will panic rather than return an error.
+	// If this happens, we should recover from the panic and return an InvalidScriptError.
+	// See: https://github.com/onflow/cadence/issues/3428, https://github.com/dapperlabs/flow-go/issues/6964
+	suite.Run("transaction script exceeds parse token limit (Cadence parser panic should be caught)", func() {
+		const tokenLimit = 1 << 19
+		script := "{};"
+		for len(script) < tokenLimit {
+			script += script
+		}
+
+		tx := unittest.TransactionBodyFixture()
+		tx.ReferenceBlockID = suite.root.ID()
+		tx.Script = []byte("transaction { execute {" + script + "}}")
+
+		err := suite.engine.ProcessTransaction(&tx)
+		suite.Assert().Error(err)
+		suite.Assert().True(errors.As(err, &access.InvalidScriptError{}))
+	})
+
 	suite.Run("invalid signature format", func() {
 		signer := flow.Testnet.Chain().ServiceAddress()
 		keyIndex := uint32(0)

engine/verification/verifier/engine.go

@@ -163,27 +163,28 @@ func (e *Engine) process(originID flow.Identifier, event interface{}) error {
 func (e *Engine) verify(ctx context.Context, originID flow.Identifier,
 	vc *verification.VerifiableChunkData) error {
 	// log it first
-	log := e.log.With().Timestamp().
-		Hex("origin", logging.ID(originID)).
+	log := e.log.With().
 		Uint64("chunk_index", vc.Chunk.Index).
 		Hex("result_id", logging.Entity(vc.Result)).
+		Uint64("block_height", vc.Header.Height).
+		Hex("block_id", vc.Chunk.ChunkBody.BlockID[:]).
 		Logger()
 
 	log.Info().Msg("verifiable chunk received by verifier engine")
 
 	// only accept internal calls
 	if originID != e.me.NodeID() {
-		return fmt.Errorf("invalid remote origin for verify")
+		return fmt.Errorf("invalid remote origin for verify: %v", originID)
 	}
 
-	var err error
-
 	// extracts chunk ID
 	ch, ok := vc.Result.Chunks.ByIndex(vc.Chunk.Index)
 	if !ok {
 		return engine.NewInvalidInputErrorf("chunk out of range requested: %v", vc.Chunk.Index)
 	}
-	log.With().Hex("chunk_id", logging.Entity(ch)).Logger()
+	log = log.With().
+		Hex("chunk_id", logging.Entity(ch)).
+		Logger()
 
 	// execute the assigned chunk
 	span, _ := e.tracer.StartSpanFromContext(ctx, trace.VERVerChunkVerify)
@@ -200,58 +201,58 @@ func (e *Engine) verify(ctx context.Context, originID flow.Identifier,
 		// if any fault found with the chunk
 		switch chFault := err.(type) {
 		case *chmodels.CFMissingRegisterTouch:
-			e.log.Warn().
+			log.Warn().
 				Str("chunk_fault_type", "missing_register_touch").
 				Str("chunk_fault", chFault.Error()).
 				Msg("chunk fault found, could not verify chunk")
 			// still create approvals for this case
 		case *chmodels.CFNonMatchingFinalState:
 			// TODO raise challenge
-			e.log.Warn().
+			log.Warn().
 				Str("chunk_fault_type", "final_state_mismatch").
 				Str("chunk_fault", chFault.Error()).
 				Msg("chunk fault found, could not verify chunk")
 			return nil
 		case *chmodels.CFInvalidVerifiableChunk:
 			// TODO raise challenge
-			e.log.Error().
+			log.Error().
 				Str("chunk_fault_type", "invalid_verifiable_chunk").
 				Str("chunk_fault", chFault.Error()).
 				Msg("chunk fault found, could not verify chunk")
 			return nil
 		case *chmodels.CFInvalidEventsCollection:
 			// TODO raise challenge
-			e.log.Error().
+			log.Error().
 				Str("chunk_fault_type", "invalid_event_collection").
 				Str("chunk_fault", chFault.Error()).
 				Msg("chunk fault found, could not verify chunk")
 			return nil
 		case *chmodels.CFSystemChunkIncludedCollection:
-			e.log.Error().
+			log.Error().
 				Str("chunk_fault_type", "system_chunk_includes_collection").
 				Str("chunk_fault", chFault.Error()).
 				Msg("chunk fault found, could not verify chunk")
 			return nil
 		case *chmodels.CFExecutionDataBlockIDMismatch:
-			e.log.Error().
+			log.Error().
 				Str("chunk_fault_type", "execution_data_block_id_mismatch").
 				Str("chunk_fault", chFault.Error()).
 				Msg("chunk fault found, could not verify chunk")
 			return nil
 		case *chmodels.CFExecutionDataChunksLengthMismatch:
-			e.log.Error().
+			log.Error().
 				Str("chunk_fault_type", "execution_data_chunks_count_mismatch").
 				Str("chunk_fault", chFault.Error()).
 				Msg("chunk fault found, could not verify chunk")
 			return nil
 		case *chmodels.CFExecutionDataInvalidChunkCID:
-			e.log.Error().
+			log.Error().
 				Str("chunk_fault_type", "execution_data_chunk_cid_mismatch").
 				Str("chunk_fault", chFault.Error()).
 				Msg("chunk fault found, could not verify chunk")
 			return nil
 		case *chmodels.CFInvalidExecutionDataID:
-			e.log.Error().
+			log.Error().
 				Str("chunk_fault_type", "execution_data_root_cid_mismatch").
 				Str("chunk_fault", chFault.Error()).
 				Msg("chunk fault found, could not verify chunk")

integration/benchmark/cmd/ci/main.go

@@ -65,7 +65,7 @@ func main() {
 	bigQueryUpload := flag.Bool("bigquery-upload", true, "whether to upload results to BigQuery (true / false)")
 	pushgateway := flag.String("pushgateway", "disabled", "host:port for pushgateway")
 	bigQueryProjectFlag := flag.String("bigquery-project", "ff-data-platform", "project name for the bigquery uploader")
-	bigQueryDatasetFlag := flag.String("bigquery-dataset", "dev_src_flow_tps_metrics", "dataset name for the bigquery uploader")
+	bigQueryDatasetFlag := flag.String("bigquery-dataset", "dev_src_flow_performance_metrics", "dataset name for the bigquery uploader")
 	bigQueryRawTableFlag := flag.String("bigquery-raw-table", "rawResults", "table name for the bigquery raw results")
 	flag.Parse()
 

network/p2p/inspector/validation/control_message_validation_inspector.go

@@ -941,7 +941,7 @@ func (c *ControlMsgValidationInspector) truncateIWantMessageIds(from peer.ID, rp
 	sampleSize := int(10 * lastHighest)
 	if sampleSize == 0 || sampleSize > c.config.IWant.MessageIdCountThreshold {
 		// invalid or 0 sample size is suspicious
-		lg.Warn().Str(logging.KeySuspicious, "true").Msg("zero or invalid sample size, using default max sample size")
+		lg.Debug().Str(logging.KeySuspicious, "true").Msg("zero or invalid sample size, using default max sample size")
 		sampleSize = c.config.IWant.MessageIdCountThreshold
 	}
 	for _, iWant := range rpc.GetControl().GetIwant() {