Merge branch 'master' into gregor/callbacks/metrics

Author: devbugging

cmd/util/cmd/verify_execution_result/cmd.go

@@ -9,6 +9,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/onflow/flow-go/engine/verification/verifier"
+	"github.com/onflow/flow-go/fvm"
 	"github.com/onflow/flow-go/model/flow"
 	"github.com/onflow/flow-go/storage"
 )
@@ -60,7 +61,7 @@ func init() {
 
 	Cmd.Flags().BoolVar(&flagtransactionFeesDisabled, "fees_disabled", false, "disable transaction fees")
 
-	Cmd.Flags().BoolVar(&flagScheduledCallbacksEnabled, "scheduled_callbacks_enabled", false, "enable scheduled callbacks")
+	Cmd.Flags().BoolVar(&flagScheduledCallbacksEnabled, "scheduled_callbacks_enabled", fvm.DefaultScheduledCallbacksEnabled, "enable scheduled callbacks")
 }
 
 func run(*cobra.Command, []string) {

fvm/context.go

@@ -25,7 +25,7 @@ const (
 
 	// DefaultScheduledCallbacksEnabled is the default value for the scheduled callbacks enabled flag
 	// used by Execution, Verification, and Access nodes.
-	DefaultScheduledCallbacksEnabled = false
+	DefaultScheduledCallbacksEnabled = true
 )
 
 // A Context defines a set of execution parameters used by the virtual machine.

integration/localnet/builder/bootstrap.go

@@ -472,6 +472,7 @@ func prepareAccessService(container testnet.ContainerConfig, i int, n int) Servi
 		"--script-execution-mode=execution-nodes-only",
 		"--event-query-mode=execution-nodes-only",
 		"--tx-result-query-mode=execution-nodes-only",
+		"--scheduled-callbacks-enabled=true",
 	)
 
 	service.AddExposedPorts(