enable Cadence VM by default behind build tag, remove command-line flags in tools and tests

Author: turbolent

Makefile

@@ -70,20 +70,9 @@ update-cadence-version:
 
 .PHONY: unittest-main
 unittest-main:
-	# test all packages
-	# TODO: CGO_CFLAGS=$(CRYPTO_FLAG) go test $(if $(VERBOSE),-v,) -coverprofile=$(COVER_PROFILE) -covermode=atomic $(if $(RACE_DETECTOR),-race,) $(if $(JSON_OUTPUT),-json,) $(if $(NUM_RUNS),-count $(NUM_RUNS),) $(GO_TEST_PACKAGES)
-ifneq ($(filter github.com/onflow/flow-go/fvm,$(GO_TEST_PACKAGES)),)
-	CGO_CFLAGS=$(CRYPTO_FLAG) go test $(if $(VERBOSE),-v,) -coverprofile=$(COVER_PROFILE) -covermode=atomic $(if $(RACE_DETECTOR),-race,) $(if $(JSON_OUTPUT),-json,) $(if $(NUM_RUNS),-count $(NUM_RUNS),) \
-		github.com/onflow/flow-go/fvm github.com/onflow/flow-go/fvm/evm github.com/onflow/flow-go/fvm/evm/stdlib -testWithVMTransactionExecution=true -testWithVMScriptExecution=true
-endif
-ifneq ($(filter github.com/onflow/flow-go/engine/execution/state/bootstrap,$(GO_TEST_PACKAGES)),)
-	CGO_CFLAGS=$(CRYPTO_FLAG) go test $(if $(VERBOSE),-v,) -coverprofile=$(COVER_PROFILE) -covermode=atomic $(if $(RACE_DETECTOR),-race,) $(if $(JSON_OUTPUT),-json,) $(if $(NUM_RUNS),-count $(NUM_RUNS),) \
-		github.com/onflow/flow-go/engine/execution/state/bootstrap -testWithVMTransactionExecution=true -testWithVMScriptExecution=true
-endif
-ifneq ($(filter github.com/onflow/flow-go/engine/access/rpc/backend,$(GO_TEST_PACKAGES)),)
-	CGO_CFLAGS=$(CRYPTO_FLAG) go test $(if $(VERBOSE),-v,) -coverprofile=$(COVER_PROFILE) -covermode=atomic $(if $(RACE_DETECTOR),-race,) $(if $(JSON_OUTPUT),-json,) $(if $(NUM_RUNS),-count $(NUM_RUNS),) \
-		github.com/onflow/flow-go/engine/access/rpc/backend -testWithVMScriptExecution=true
-endif
+	CGO_CFLAGS=$(CRYPTO_FLAG) go test $(if $(VERBOSE),-v,) -coverprofile=$(COVER_PROFILE) -covermode=atomic $(if $(RACE_DETECTOR),-race,) $(if $(JSON_OUTPUT),-json,) $(if $(NUM_RUNS),-count $(NUM_RUNS),) $(GO_TEST_PACKAGES)
+	# Re-run tests with Cadence VM enabled
+	CGO_CFLAGS=$(CRYPTO_FLAG) go test -tags cadence_vm $(if $(VERBOSE),-v,) -coverprofile=$(COVER_PROFILE) -covermode=atomic $(if $(RACE_DETECTOR),-race,) $(if $(JSON_OUTPUT),-json,) $(if $(NUM_RUNS),-count $(NUM_RUNS),) $(GO_TEST_PACKAGES)
 
 .PHONY: install-mock-generators
 install-mock-generators:

cmd/node_builder.go

@@ -187,14 +187,6 @@ type BaseConfig struct {
 	BitswapReprovideEnabled bool
 
 	TransactionFeesDisabled bool
-
-	// VMTransactionExecutionEnabled configures whether transactions are executed with the Cadence compiler/VM
-	// instead of the Cadence interpreter.
-	VMTransactionExecutionEnabled bool
-
-	// VMScriptExecutionEnabled configures whether transactions are executed with the Cadence compiler/VM
-	// instead of the Cadence interpreter.
-	VMScriptExecutionEnabled bool
 }
 
 // NodeConfig contains all the derived parameters such the NodeID, private keys etc. and initialized instances of

cmd/scaffold.go

@@ -284,17 +284,6 @@ func (fnb *FlowNodeBuilder) BaseFlags() {
 		false,
 		"Disables calling the transaction fee deduction. This is only for testing purposes. To disable fees on a network it is better to set the fee price to 0.0 .")
 
-	fnb.flags.BoolVar(&fnb.VMScriptExecutionEnabled,
-		"vm-script-execution-enabled",
-		false,
-		"Enables execution of scripts with the Cadence compiler/VM instead of the Cadence interpreter",
-	)
-
-	fnb.flags.BoolVar(&fnb.VMTransactionExecutionEnabled,
-		"vm-transaction-execution-enabled",
-		false,
-		"Enables execution of transactions with the Cadence compiler/VM instead of the Cadence interpreter",
-	)
 }
 
 // TODO: remove after mainnet27 spork
@@ -1557,8 +1546,6 @@ func (fnb *FlowNodeBuilder) initFvmOptions() {
 		fnb.RootChainID,
 		fnb.Storage.Headers,
 		fnb.BaseConfig.TransactionFeesDisabled,
-		fnb.BaseConfig.VMScriptExecutionEnabled,
-		fnb.BaseConfig.VMTransactionExecutionEnabled,
 	)
 }
 

cmd/util/cmd/debug-script/cmd.go

@@ -10,6 +10,7 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 
+	"github.com/onflow/flow-go/fvm"
 	"github.com/onflow/flow-go/model/flow"
 	"github.com/onflow/flow-go/utils/debug"
 )
@@ -119,7 +120,11 @@ func run(*cobra.Command, []string) {
 
 	blockSnapshot := debug.NewCachingStorageSnapshot(remoteSnapshot)
 
-	debugger := debug.NewRemoteDebugger(chain, log.Logger, flagUseVM, flagUseVM)
+	debugger := debug.NewRemoteDebugger(
+		chain,
+		log.Logger,
+		fvm.WithCadenceVMEnabled(flagUseVM),
+	)
 
 	// TODO: add support for arguments
 	var arguments [][]byte

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

@@ -425,7 +425,9 @@ func RunTransaction(
 		Str("tx", tx.ID().String()).
 		Logger()
 
-	var fvmOptions []fvm.Option
+	fvmOptions := []fvm.Option{
+		fvm.WithCadenceVMEnabled(useVM),
+	}
 
 	if spanExporter != nil {
 
@@ -455,8 +457,6 @@ func RunTransaction(
 	debugger := debug.NewRemoteDebugger(
 		chain,
 		log,
-		useVM,
-		useVM,
 		fvmOptions...,
 	)
 

cmd/util/cmd/verify_execution_result/cmd.go

@@ -16,17 +16,15 @@ import (
 )
 
 var (
-	flagLastK                         uint64
-	flagDatadir                       string
-	flagChunkDataPackDir              string
-	flagChain                         string
-	flagFromTo                        string
-	flagWorkerCount                   uint // number of workers to verify the blocks concurrently
-	flagStopOnMismatch                bool
-	flagTransactionFeesDisabled       bool
-	flagScheduledCallbacksEnabled     bool
-	flagVMScriptExecutionEnabled      bool
-	flagVMTransactionExecutionEnabled bool
+	flagLastK                     uint64
+	flagDatadir                   string
+	flagChunkDataPackDir          string
+	flagChain                     string
+	flagFromTo                    string
+	flagWorkerCount               uint // number of workers to verify the blocks concurrently
+	flagStopOnMismatch            bool
+	flagTransactionFeesDisabled   bool
+	flagScheduledCallbacksEnabled bool
 )
 
 // # verify the last 100 sealed blocks
@@ -63,20 +61,6 @@ func init() {
 	Cmd.Flags().BoolVar(&flagTransactionFeesDisabled, "fees_disabled", false, "disable transaction fees")
 
 	Cmd.Flags().BoolVar(&flagScheduledCallbacksEnabled, "scheduled_callbacks_enabled", fvm.DefaultScheduledCallbacksEnabled, "enable scheduled callbacks")
-
-	Cmd.Flags().BoolVar(
-		&flagVMScriptExecutionEnabled,
-		"vm_script_execution_enabled",
-		false,
-		"enable script execution with VM",
-	)
-
-	Cmd.Flags().BoolVar(
-		&flagVMTransactionExecutionEnabled,
-		"vm_transaction_execution_enabled",
-		false,
-		"enable transaction execution with VM",
-	)
 }
 
 func run(*cobra.Command, []string) {
@@ -123,8 +107,6 @@ func run(*cobra.Command, []string) {
 			flagStopOnMismatch,
 			flagTransactionFeesDisabled,
 			flagScheduledCallbacksEnabled,
-			flagVMScriptExecutionEnabled,
-			flagVMTransactionExecutionEnabled,
 		)
 		if err != nil {
 			lg.Fatal().Err(err).Msgf("could not verify range from %d to %d", from, to)
@@ -142,8 +124,6 @@ func run(*cobra.Command, []string) {
 			flagStopOnMismatch,
 			flagTransactionFeesDisabled,
 			flagScheduledCallbacksEnabled,
-			flagVMScriptExecutionEnabled,
-			flagVMTransactionExecutionEnabled,
 		)
 		if err != nil {
 			lg.Fatal().Err(err).Msg("could not verify last k height")

engine/access/rpc/backend/script_executor_test.go

@@ -2,7 +2,6 @@ package backend
 
 import (
 	"context"
-	"flag"
 	"math"
 	"testing"
 	"time"
@@ -35,12 +34,6 @@ import (
 	"github.com/onflow/flow-go/utils/unittest/mocks"
 )
 
-var testWithVMScriptExecution = flag.Bool(
-	"testWithVMScriptExecution",
-	false,
-	"Run scripts in tests using the Cadence compiler/VM",
-)
-
 // ScriptExecutorSuite is a test suite for testing the ScriptExecutor.
 // It sets up the necessary components and dependencies for executing scripts.
 type ScriptExecutorSuite struct {
@@ -125,7 +118,6 @@ func (s *ScriptExecutorSuite) SetupTest() {
 		fvm.WithChain(s.chain),
 		fvm.WithAuthorizationChecksEnabled(false),
 		fvm.WithSequenceNumberCheckAndIncrementEnabled(false),
-		fvm.WithVMScriptExecutionEnabled(*testWithVMScriptExecution),
 	)
 
 	s.dbDir = unittest.TempDir(s.T())

engine/execution/state/bootstrap/bootstrap_test.go

@@ -2,7 +2,6 @@ package bootstrap
 
 import (
 	"encoding/hex"
-	"flag"
 	"fmt"
 	"testing"
 
@@ -13,6 +12,7 @@ import (
 	"github.com/onflow/flow-go/engine/execution/state"
 	"github.com/onflow/flow-go/engine/execution/storehouse"
 	"github.com/onflow/flow-go/fvm"
+	"github.com/onflow/flow-go/fvm/cadence_vm"
 	"github.com/onflow/flow-go/fvm/systemcontracts"
 	completeLedger "github.com/onflow/flow-go/ledger/complete"
 	"github.com/onflow/flow-go/ledger/complete/wal/fixtures"
@@ -21,18 +21,6 @@ import (
 	"github.com/onflow/flow-go/utils/unittest"
 )
 
-var testWithVMTransactionExecution = flag.Bool(
-	"testWithVMTransactionExecution",
-	false,
-	"Run transactions in tests using the Cadence compiler/VM",
-)
-
-var testWithVMScriptExecution = flag.Bool(
-	"testWithVMScriptExecution",
-	false,
-	"Run scripts in tests using the Cadence compiler/VM",
-)
-
 func TestBootstrapLedger(t *testing.T) {
 	unittest.RunWithTempDir(t, func(dbDir string) {
 
@@ -70,7 +58,10 @@ func TestBootstrapLedger(t *testing.T) {
 }
 
 func TestBootstrapLedger_ZeroTokenSupply(t *testing.T) {
-	expectedStateCommitmentBytes, _ := hex.DecodeString("bec4478e1b3aa1fd822c796411e69bd85ef9529b9ef93e231d4b02470d49b4f0")
+	expectedStateCommitmentBytes, _ := hex.DecodeString(ifCompile(
+		"3ee915c0ecaf1399d00cc6a768517aa074139ca07045d4e63a1745fc81e1bdf0",
+		"bec4478e1b3aa1fd822c796411e69bd85ef9529b9ef93e231d4b02470d49b4f0",
+	))
 	expectedStateCommitment, err := flow.ToStateCommitment(expectedStateCommitmentBytes)
 	require.NoError(t, err)
 
@@ -106,6 +97,13 @@ func TestBootstrapLedger_ZeroTokenSupply(t *testing.T) {
 	})
 }
 
+func ifCompile[T any](a, b T) T {
+	if cadence_vm.DefaultEnabled {
+		return a
+	}
+	return b
+}
+
 // TestBootstrapLedger_EmptyTransaction bootstraps a ledger with:
 // - transaction fees
 // - storage fees
@@ -117,7 +115,12 @@ func TestBootstrapLedger_ZeroTokenSupply(t *testing.T) {
 // - transaction fee deduction
 // This tests that the state commitment has not changed for the bookkeeping parts of the transaction.
 func TestBootstrapLedger_EmptyTransaction(t *testing.T) {
-	expectedStateCommitmentBytes, _ := hex.DecodeString("b21c4cea6518d92c34d2eeff1a02f7e1b7b75f9c0e0e52069905bb728361d039")
+	expectedStateCommitmentBytes, _ := hex.DecodeString(
+		ifCompile(
+			"505aa62b494f262df6830b4ace90ee35d5e4574155db4361eff5e97ae4377d31",
+			"b21c4cea6518d92c34d2eeff1a02f7e1b7b75f9c0e0e52069905bb728361d039",
+		),
+	)
 	expectedStateCommitment, err := flow.ToStateCommitment(expectedStateCommitmentBytes)
 	require.NoError(t, err)
 
@@ -157,8 +160,6 @@ func TestBootstrapLedger_EmptyTransaction(t *testing.T) {
 			fvm.WithAccountStorageLimit(true),
 			fvm.WithSequenceNumberCheckAndIncrementEnabled(false),
 			fvm.WithAuthorizationChecksEnabled(false),
-			fvm.WithVMTransactionExecutionEnabled(*testWithVMTransactionExecution),
-			fvm.WithVMScriptExecutionEnabled(*testWithVMScriptExecution),
 		)
 
 		sc := systemcontracts.SystemContractsForChain(chain.ChainID())

engine/verification/verifier/verifiers.go

@@ -41,8 +41,6 @@ func VerifyLastKHeight(
 	stopOnMismatch bool,
 	transactionFeesDisabled bool,
 	scheduledCallbacksEnabled bool,
-	vmScriptExecutionEnabled bool,
-	vmTransactionExecutionEnabled bool,
 ) (err error) {
 	closer, storages, chunkDataPacks, state, verifier, err := initStorages(
 		lockManager,
@@ -51,8 +49,6 @@ func VerifyLastKHeight(
 		chunkDataPackDir,
 		transactionFeesDisabled,
 		scheduledCallbacksEnabled,
-		vmScriptExecutionEnabled,
-		vmTransactionExecutionEnabled,
 	)
 	if err != nil {
 		return fmt.Errorf("could not init storages: %w", err)
@@ -109,8 +105,6 @@ func VerifyRange(
 	stopOnMismatch bool,
 	transactionFeesDisabled bool,
 	scheduledCallbacksEnabled bool,
-	vmScriptExecutionEnabled bool,
-	vmTransactionExecutionEnabled bool,
 ) (err error) {
 	closer, storages, chunkDataPacks, state, verifier, err := initStorages(
 		lockManager,
@@ -119,8 +113,6 @@ func VerifyRange(
 		chunkDataPackDir,
 		transactionFeesDisabled,
 		scheduledCallbacksEnabled,
-		vmScriptExecutionEnabled,
-		vmTransactionExecutionEnabled,
 	)
 	if err != nil {
 		return fmt.Errorf("could not init storages: %w", err)
@@ -251,8 +243,6 @@ func initStorages(
 	chunkDataPackDir string,
 	transactionFeesDisabled bool,
 	scheduledCallbacksEnabled bool,
-	vmScriptExecutionEnabled bool,
-	vmTransactionExecutionEnabled bool,
 ) (
 	func() error,
 	*store.All,
@@ -288,8 +278,6 @@ func initStorages(
 		storages.Headers,
 		transactionFeesDisabled,
 		scheduledCallbacksEnabled,
-		vmScriptExecutionEnabled,
-		vmTransactionExecutionEnabled,
 	)
 
 	closer := func() error {
@@ -370,17 +358,13 @@ func makeVerifier(
 	headers storage.Headers,
 	transactionFeesDisabled bool,
 	scheduledCallbacksEnabled bool,
-	vmScriptExecutionEnabled bool,
-	vmTransactionExecutionEnabled bool,
 ) module.ChunkVerifier {
 
 	vm := fvm.NewVirtualMachine()
 	fvmOptions := initialize.InitFvmOptions(
 		chainID,
 		headers,
 		transactionFeesDisabled,
-		vmScriptExecutionEnabled,
-		vmTransactionExecutionEnabled,
 	)
 	fvmOptions = append(
 		[]fvm.Option{fvm.WithLogger(logger)},

fvm/blueprints/contracts.go

@@ -51,7 +51,7 @@ func setContractAuthorizersTransaction(
 	for _, address := range authorized {
 		addressValues = append(
 			addressValues,
-			cadence.BytesToAddress(address.Bytes()))
+			cadence.Address(address))
 	}
 
 	addressesArg, err := jsoncdc.Encode(cadence.NewArray(addressValues))