add review comments

Author: zhangchiqing

cmd/scaffold.go

@@ -33,8 +33,7 @@ import (
 	"github.com/onflow/flow-go/cmd/build"
 	"github.com/onflow/flow-go/config"
 	"github.com/onflow/flow-go/consensus/hotstuff/persister"
-	"github.com/onflow/flow-go/fvm"
-	"github.com/onflow/flow-go/fvm/environment"
+	"github.com/onflow/flow-go/fvm/initialize"
 	"github.com/onflow/flow-go/model/flow"
 	"github.com/onflow/flow-go/model/flow/filter"
 	"github.com/onflow/flow-go/module"
@@ -1522,32 +1521,9 @@ func (fnb *FlowNodeBuilder) initLocal() error {
 }
 
 func (fnb *FlowNodeBuilder) initFvmOptions() {
-	blockFinder := environment.NewBlockFinder(fnb.Storage.Headers)
-	vmOpts := []fvm.Option{
-		fvm.WithChain(fnb.RootChainID.Chain()),
-		fvm.WithBlocks(blockFinder),
-		fvm.WithAccountStorageLimit(true),
-	}
-	switch fnb.RootChainID {
-	case flow.Testnet,
-		flow.Sandboxnet,
-		flow.Previewnet,
-		flow.Mainnet:
-		vmOpts = append(vmOpts,
-			fvm.WithTransactionFeesEnabled(true),
-		)
-	}
-	switch fnb.RootChainID {
-	case flow.Testnet,
-		flow.Sandboxnet,
-		flow.Previewnet,
-		flow.Localnet,
-		flow.Benchnet:
-		vmOpts = append(vmOpts,
-			fvm.WithContractDeploymentRestricted(false),
-		)
-	}
-	fnb.FvmOptions = vmOpts
+	fnb.FvmOptions = initialize.InitFvmOptions(
+		fnb.RootChainID, fnb.Storage.Headers,
+	)
 }
 
 // handleModules initializes the given module.

cmd/util/cmd/verify_execution_result/cmd.go

@@ -44,7 +44,7 @@ func init() {
 		"last k sealed blocks to verify")
 
 	Cmd.Flags().StringVar(&flagFromTo, "from_to", "",
-		"the height range to verify blocks, i.e, 1-1000, 1000-2000, 2000-3000, etc.")
+		"the height range to verify blocks (inclusive), i.e, 1-1000, 1000-2000, 2000-3000, etc.")
 }
 
 func run(*cobra.Command, []string) {

engine/verification/verifier/verifiers.go

@@ -10,7 +10,7 @@ import (
 	"github.com/onflow/flow-go/cmd/util/cmd/common"
 	"github.com/onflow/flow-go/engine/execution/computation"
 	"github.com/onflow/flow-go/fvm"
-	"github.com/onflow/flow-go/fvm/environment"
+	"github.com/onflow/flow-go/fvm/initialize"
 	"github.com/onflow/flow-go/model/flow"
 	"github.com/onflow/flow-go/model/verification/convert"
 	"github.com/onflow/flow-go/module"
@@ -124,10 +124,6 @@ func verifyHeight(
 
 	blockID := header.ID()
 
-	if err != nil {
-		return fmt.Errorf("could not get block ID by height %d: %w", height, err)
-	}
-
 	result, err := results.ByBlockID(blockID)
 	if err != nil {
 		return fmt.Errorf("could not get execution result by block ID %s: %w", blockID, err)
@@ -160,7 +156,7 @@ func makeVerifier(
 ) module.ChunkVerifier {
 
 	vm := fvm.NewVirtualMachine()
-	fvmOptions := initFvmOptions(chainID, headers)
+	fvmOptions := initialize.InitFvmOptions(chainID, headers)
 	fvmOptions = append(
 		[]fvm.Option{fvm.WithLogger(logger)},
 		fvmOptions...,
@@ -173,32 +169,3 @@ func makeVerifier(
 	chunkVerifier := chunks.NewChunkVerifier(vm, vmCtx, logger)
 	return chunkVerifier
 }
-
-func initFvmOptions(chainID flow.ChainID, headers storage.Headers) []fvm.Option {
-	blockFinder := environment.NewBlockFinder(headers)
-	vmOpts := []fvm.Option{
-		fvm.WithChain(chainID.Chain()),
-		fvm.WithBlocks(blockFinder),
-		fvm.WithAccountStorageLimit(true),
-	}
-	switch chainID {
-	case flow.Testnet,
-		flow.Sandboxnet,
-		flow.Previewnet,
-		flow.Mainnet:
-		vmOpts = append(vmOpts,
-			fvm.WithTransactionFeesEnabled(true),
-		)
-	}
-	switch chainID {
-	case flow.Testnet,
-		flow.Sandboxnet,
-		flow.Previewnet,
-		flow.Localnet,
-		flow.Benchnet:
-		vmOpts = append(vmOpts,
-			fvm.WithContractDeploymentRestricted(false),
-		)
-	}
-	return vmOpts
-}

fvm/initialize/options.go

@@ -0,0 +1,40 @@
+package initialize
+
+import (
+	"github.com/onflow/flow-go/fvm"
+	"github.com/onflow/flow-go/fvm/environment"
+	"github.com/onflow/flow-go/model/flow"
+	"github.com/onflow/flow-go/storage"
+)
+
+// InitFvmOptions initializes the FVM options based on the chain ID and headers.
+// This function is extracted so that it can be reused in multiple places,
+// and ensure that the FVM options are consistent across different components.
+func InitFvmOptions(chainID flow.ChainID, headers storage.Headers) []fvm.Option {
+	blockFinder := environment.NewBlockFinder(headers)
+	vmOpts := []fvm.Option{
+		fvm.WithChain(chainID.Chain()),
+		fvm.WithBlocks(blockFinder),
+		fvm.WithAccountStorageLimit(true),
+	}
+	switch chainID {
+	case flow.Testnet,
+		flow.Sandboxnet,
+		flow.Previewnet,
+		flow.Mainnet:
+		vmOpts = append(vmOpts,
+			fvm.WithTransactionFeesEnabled(true),
+		)
+	}
+	switch chainID {
+	case flow.Testnet,
+		flow.Sandboxnet,
+		flow.Previewnet,
+		flow.Localnet,
+		flow.Benchnet:
+		vmOpts = append(vmOpts,
+			fvm.WithContractDeploymentRestricted(false),
+		)
+	}
+	return vmOpts
+}