Merge branch 'master' into leo/enable-view-index

Author: zhangchiqing

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ on:
       - master
 
 env:
-  GO_VERSION: "1.23"
+  GO_VERSION: "1.25"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}

.github/workflows/flaky-test-monitor.yml

@@ -13,7 +13,7 @@ permissions:
   contents: read
 
 env:
-  GO_VERSION: "1.23"
+  GO_VERSION: "1.25"
   BIGQUERY_DATASET: dev_src_flow_test_metrics
   BIGQUERY_TABLE: skipped_tests
   BIGQUERY_TABLE2: test_results

.github/workflows/image_builds.yml

@@ -16,7 +16,7 @@ on:
         type: string
 
 env:
-  GO_VERSION: "1.23"
+  GO_VERSION: "1.25"
   PRIVATE_REGISTRY_HOST: us-central1-docker.pkg.dev
 
 jobs:

.github/workflows/tools.yml

@@ -14,7 +14,7 @@ on:
         type: boolean
 
 env:
-  GO_VERSION: "1.23"
+  GO_VERSION: "1.25"
 
 jobs:
   build-publish:

README.md

@@ -54,7 +54,7 @@ The following table lists all work streams and links to their home directory and
 ## Installation
 
 - Clone this repository
-- Install [Go](https://golang.org/doc/install) (Flow requires Go 1.23 and later)
+- Install [Go](https://golang.org/doc/install) (Flow requires Go 1.25 and later)
 - Install [Docker](https://docs.docker.com/get-docker/), which is used for running a local network and integration tests
 - Make sure the [`GOPATH`](https://golang.org/cmd/go/#hdr-GOPATH_environment_variable) and `GOBIN` environment variables
   are set, and `GOBIN` is added to your path:

cmd/Dockerfile

@@ -3,7 +3,7 @@
 
 ####################################
 ## (1) Setup the build environment
-FROM golang:1.23-bullseye AS build-setup
+FROM golang:1.25-bookworm AS build-setup
 
 RUN apt-get update
 RUN apt-get -y install zip apt-utils gcc-aarch64-linux-gnu
@@ -85,7 +85,7 @@ RUN --mount=type=ssh \
 RUN chmod a+x /app/app
 
 ## (4) Add the statically linked debug binary to a distroless image configured for debugging
-FROM golang:1.23-bullseye as debug
+FROM golang:1.25-bookworm as debug
 
 RUN go install github.com/go-delve/delve/cmd/dlv@latest
 

cmd/execution_builder.go

@@ -572,11 +572,13 @@ func (exeNode *ExecutionNode) LoadProviderEngine(
 		node.FvmOptions...,
 	)
 
-	opts = append(opts, computation.DefaultFVMOptions(
-		node.RootChainID,
-		exeNode.exeConf.computationConfig.CadenceTracing,
-		exeNode.exeConf.computationConfig.ExtensiveTracing,
-		exeNode.exeConf.scheduleCallbacksEnabled)...)
+	opts = append(opts,
+		computation.DefaultFVMOptions(
+			node.RootChainID,
+			exeNode.exeConf.computationConfig.ExtensiveTracing,
+			exeNode.exeConf.scheduleCallbacksEnabled,
+		)...,
+	)
 
 	vmCtx := fvm.NewContext(opts...)
 

cmd/execution_config.go

@@ -96,7 +96,6 @@ func (exeConf *ExecutionConfig) SetupFlags(flags *pflag.FlagSet) {
 	flags.UintVar(&exeConf.computationConfig.DerivedDataCacheSize, "cadence-execution-cache", derived.DefaultDerivedDataCacheSize,
 		"cache size for Cadence execution")
 	flags.BoolVar(&exeConf.computationConfig.ExtensiveTracing, "extensive-tracing", false, "adds high-overhead tracing to execution")
-	flags.BoolVar(&exeConf.computationConfig.CadenceTracing, "cadence-tracing", false, "enables cadence runtime level tracing")
 	flags.IntVar(&exeConf.computationConfig.MaxConcurrency, "computer-max-concurrency", 1, "set to greater than 1 to enable concurrent transaction execution")
 	flags.StringVar(&exeConf.chunkDataPackDir, "chunk-data-pack-dir", filepath.Join(datadir, "chunk_data_packs"), "directory to use for storing chunk data packs")
 	flags.StringVar(&exeConf.chunkDataPackCheckpointsDir, "chunk-data-pack-checkpoints-dir", filepath.Join(datadir, "chunk_data_packs_checkpoints_dir"), "directory to use storing chunk data packs pebble database checkpoints for querying while the node is running")

cmd/util/cmd/debug-tx/cmd.go

@@ -13,15 +13,18 @@ import (
 	"github.com/onflow/flow/protobuf/go/flow/executiondata"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
+	"go.opentelemetry.io/otel/exporters/stdout/stdouttrace"
 	"golang.org/x/exp/slices"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 
 	sdk "github.com/onflow/flow-go-sdk"
 
+	"github.com/onflow/flow-go/fvm"
 	"github.com/onflow/flow-go/fvm/storage/snapshot"
 	"github.com/onflow/flow-go/model/flow"
 	"github.com/onflow/flow-go/module/grpcclient"
+	"github.com/onflow/flow-go/module/trace"
 	"github.com/onflow/flow-go/utils/debug"
 )
 
@@ -36,6 +39,7 @@ var (
 	flagProposalKeySeq      uint64
 	flagUseExecutionDataAPI bool
 	flagDumpRegisters       bool
+	flagTracePath           string
 )
 
 var Cmd = &cobra.Command{
@@ -67,6 +71,8 @@ func init() {
 	Cmd.Flags().BoolVar(&flagUseExecutionDataAPI, "use-execution-data-api", false, "use the execution data API")
 
 	Cmd.Flags().BoolVar(&flagDumpRegisters, "dump-registers", false, "dump registers")
+
+	Cmd.Flags().StringVar(&flagTracePath, "trace", "", "enable tracing to given path")
 }
 
 func run(_ *cobra.Command, args []string) {
@@ -178,7 +184,54 @@ func runTransactionID(txID flow.Identifier, flowClient *client.Client, chain flo
 
 	blockSnapshot := newBlockSnapshot(remoteSnapshot)
 
-	debugger := debug.NewRemoteDebugger(chain, log.Logger)
+	var fvmOptions []fvm.Option
+
+	if flagTracePath != "" {
+
+		var traceFile *os.File
+		if flagTracePath == "-" {
+			traceFile = os.Stdout
+		} else {
+			traceFile, err = os.Create(flagTracePath)
+			if err != nil {
+				log.Fatal().Err(err).Msg("failed to create trace file")
+			}
+			defer traceFile.Close()
+		}
+
+		exporter, err := stdouttrace.New(
+			stdouttrace.WithWriter(traceFile),
+		)
+		if err != nil {
+			log.Fatal().Err(err).Msg("failed to create trace exporter")
+		}
+
+		tracer, err := trace.NewTracerWithExporter(
+			log.Logger,
+			"debug-tx",
+			flagChain,
+			trace.SensitivityCaptureAll,
+			exporter,
+		)
+		if err != nil {
+			log.Fatal().Err(err).Msg("failed to create tracer")
+		}
+
+		span, _ := tracer.StartTransactionSpan(context.TODO(), txID, "")
+		defer span.End()
+
+		fvmOptions = append(
+			fvmOptions,
+			fvm.WithTracer(tracer),
+			fvm.WithSpan(span),
+		)
+	}
+
+	debugger := debug.NewRemoteDebugger(
+		chain,
+		log.Logger,
+		fvmOptions...,
+	)
 
 	for _, blockTx := range txsResult {
 		blockTxID := flow.Identifier(blockTx.ID())

cmd/util/cmd/rollback-executed-height/cmd/rollback_executed_height_test.go

@@ -55,6 +55,7 @@ func TestReExecuteBlock(t *testing.T) {
 
 			unittest.WithLock(t, lockManager, storage.LockInsertBlock, func(lctx lockctx.Context) error {
 				return db.WithReaderBatchWriter(func(rw storage.ReaderBatchWriter) error {
+					// By convention, root block has no proposer signature - implementation has to handle this edge case
 					return blocks.BatchStore(lctx, rw, &flow.Proposal{Block: *genesis, ProposerSigData: nil})
 				})
 			})
@@ -209,6 +210,7 @@ func TestReExecuteBlockWithDifferentResult(t *testing.T) {
 
 		unittest.WithLock(t, lockManager, storage.LockInsertBlock, func(lctx lockctx.Context) error {
 			return db.WithReaderBatchWriter(func(rw storage.ReaderBatchWriter) error {
+				// By convention, root block has no proposer signature - implementation has to handle this edge case
 				return blocks.BatchStore(lctx, rw, &flow.Proposal{Block: *genesis, ProposerSigData: nil})
 			})
 		})