Merge pull request #7780 from onflow/janez/integrate-cadence-metering-changes

Update to Cadence v1.7.0-preview.2

Author: janezpodhostnik

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/run-script/cmd.go

@@ -139,7 +139,7 @@ func run(*cobra.Command, []string) {
 		registersByAccount.AccountCount(),
 	)
 
-	options := computation.DefaultFVMOptions(chainID, false, false, false)
+	options := computation.DefaultFVMOptions(chainID, false, false)
 	options = append(
 		options,
 		fvm.WithContractDeploymentRestricted(false),

cmd/util/ledger/migrations/migrator_runtime.go

@@ -182,6 +182,8 @@ func NewInterpreterMigrationRuntime(
 		runtime.NewCodesAndPrograms(),
 		basicMigrationRuntime.Storage,
 		nil,
+		nil,
+		nil,
 	)
 
 	inter, err := interpreter.NewInterpreter(

cmd/util/ledger/migrations/transaction_migration.go

@@ -19,7 +19,7 @@ func NewTransactionBasedMigration(
 ) RegistersMigration {
 	return func(registersByAccount *registers.ByAccount) error {
 
-		options := computation.DefaultFVMOptions(chainID, false, false, false)
+		options := computation.DefaultFVMOptions(chainID, false, false)
 		options = append(options,
 			fvm.WithContractDeploymentRestricted(false),
 			fvm.WithContractRemovalRestricted(false),

cmd/verification_builder.go

@@ -213,7 +213,14 @@ func (v *VerificationNodeBuilder) LoadComponentsAndModules() {
 			)
 
 			// TODO(JanezP): cleanup creation of fvm context github.com/onflow/flow-go/issues/5249
-			fvmOptions = append(fvmOptions, computation.DefaultFVMOptions(node.RootChainID, false, false, v.verConf.scheduleCallbacksEnabled)...)
+			fvmOptions = append(
+				fvmOptions,
+				computation.DefaultFVMOptions(
+					node.RootChainID,
+					false,
+					v.verConf.scheduleCallbacksEnabled,
+				)...,
+			)
 			vmCtx := fvm.NewContext(fvmOptions...)
 
 			chunkVerifier := chunks.NewChunkVerifier(vm, vmCtx, node.Logger)

engine/execution/computation/manager.go

@@ -62,7 +62,6 @@ type ComputationManager interface {
 
 type ComputationConfig struct {
 	query.QueryConfig
-	CadenceTracing       bool
 	ExtensiveTracing     bool
 	DerivedDataCacheSize uint
 	MaxConcurrency       int
@@ -107,7 +106,7 @@ func New(
 	}
 
 	chainID := vmCtx.Chain.ChainID()
-	options := DefaultFVMOptions(chainID, params.CadenceTracing, params.ExtensiveTracing, vmCtx.ScheduleCallbacksEnabled)
+	options := DefaultFVMOptions(chainID, params.ExtensiveTracing, vmCtx.ScheduleCallbacksEnabled)
 	vmCtx = fvm.NewContextFromParent(vmCtx, options...)
 
 	blockComputer, err := computer.NewBlockComputer(
@@ -224,16 +223,15 @@ func (e *Manager) QueryExecutor() query.Executor {
 	return e.queryExecutor
 }
 
-func DefaultFVMOptions(chainID flow.ChainID, cadenceTracing bool, extensiveTracing bool, scheduleCallbacksEnabled bool) []fvm.Option {
+func DefaultFVMOptions(chainID flow.ChainID, extensiveTracing bool, scheduleCallbacksEnabled bool) []fvm.Option {
 	options := []fvm.Option{
 		fvm.WithChain(chainID.Chain()),
 		fvm.WithReusableCadenceRuntimePool(
 			reusableRuntime.NewReusableCadenceRuntimePool(
 				ReusableCadenceRuntimePoolSize,
-				runtime.Config{
-					TracingEnabled: cadenceTracing,
-				},
-			)),
+				runtime.Config{},
+			),
+		),
 		fvm.WithEVMEnabled(true),
 		fvm.WithScheduleCallbacksEnabled(scheduleCallbacksEnabled),
 	}

engine/verification/verifier/verifiers.go

@@ -333,7 +333,14 @@ func makeVerifier(
 	)
 
 	// TODO(JanezP): cleanup creation of fvm context github.com/onflow/flow-go/issues/5249
-	fvmOptions = append(fvmOptions, computation.DefaultFVMOptions(chainID, false, false, true)...)
+	fvmOptions = append(
+		fvmOptions,
+		computation.DefaultFVMOptions(
+			chainID,
+			false,
+			true,
+		)...,
+	)
 	vmCtx := fvm.NewContext(fvmOptions...)
 
 	chunkVerifier := chunks.NewChunkVerifier(vm, vmCtx, logger)

fvm/environment/meter.go

@@ -4,7 +4,6 @@ import (
 	"context"
 
 	"github.com/onflow/cadence/common"
-	"github.com/onflow/cadence/runtime"
 
 	"github.com/onflow/flow-go/fvm/errors"
 	"github.com/onflow/flow-go/fvm/meter"
@@ -71,7 +70,10 @@ var MainnetExecutionEffortWeights = meter.ExecutionEffortWeights{
 }
 
 type Meter interface {
-	runtime.MeterInterface
+	common.Gauge
+
+	ComputationUsed() (uint64, error)
+	MemoryUsed() (uint64, error)
 
 	ComputationIntensities() meter.MeteredComputationIntensities
 	ComputationAvailable(common.ComputationUsage) bool