Merge branch 'master' into bastian/add-all-contracts-endpoint

Author: turbolent

emulator/blockchain.go

@@ -446,6 +446,13 @@ func (conf config) GetServiceKey() ServiceKey {
 	return serviceKey
 }
 
+func (conf config) EffectiveExecutionEffortWeights() meter.ExecutionEffortWeights {
+	if conf.ExecutionEffortWeights != nil {
+		return conf.ExecutionEffortWeights
+	}
+	return environment.MainnetExecutionEffortWeights
+}
+
 const defaultGenesisTokenSupply = "1000000000.0"
 
 const defaultScriptGasLimit = 100000
@@ -641,11 +648,9 @@ func configureFVM(blockchain *Blockchain, conf config, blocks *blocks) (*fvm.Vir
 		}).
 		Level(zerolog.DebugLevel)
 
-	if conf.ExecutionEffortWeights != nil &&
-		conf.ComputationProfile != nil {
-
-		conf.ComputationProfile.
-			WithComputationWeights(conf.ExecutionEffortWeights)
+	if conf.ComputationProfile != nil {
+		executionEffortWeights := conf.EffectiveExecutionEffortWeights()
+		conf.ComputationProfile.WithComputationWeights(executionEffortWeights)
 	}
 
 	runtimeConfig := runtime.Config{
@@ -849,16 +854,11 @@ func configureBootstrapProcedure(
 		fvm.WithTransactionFee(fvm.DefaultTransactionFees),
 		fvm.WithExecutionMemoryLimit(math.MaxUint32),
 		fvm.WithExecutionMemoryWeights(meter.DefaultMemoryWeights),
-		fvm.WithExecutionEffortWeights(environment.MainnetExecutionEffortWeights),
+		fvm.WithExecutionEffortWeights(conf.EffectiveExecutionEffortWeights()),
 		fvm.WithSetupVMBridgeEnabled(cadence.NewBool(conf.SetupVMBridgeEnabled)),
 		fvm.WithSetupEVMEnabled(cadence.NewBool(conf.SetupEVMEnabled)),
 	)
 
-	if conf.ExecutionEffortWeights != nil {
-		options = append(options,
-			fvm.WithExecutionEffortWeights(conf.ExecutionEffortWeights),
-		)
-	}
 	if conf.StorageLimitEnabled {
 		options = append(options,
 			fvm.WithAccountCreationFee(conf.MinimumStorageReservation),

server/utils/emulator.go

@@ -24,6 +24,7 @@ import (
 	"net/http"
 	"slices"
 	"strconv"
+	"strings"
 
 	"github.com/gorilla/mux"
 	"github.com/onflow/cadence/common"
@@ -265,17 +266,30 @@ func (m EmulatorAPIServer) ComputationReport(w http.ResponseWriter, _ *http.Requ
 	}
 }
 
+const cadenceFileSuffix = ".cdc"
+
 func (m EmulatorAPIServer) ComputationProfile(w http.ResponseWriter, _ *http.Request) {
+	w.Header().Set("Content-Disposition", "attachment; filename=profile.pprof")
 	w.Header().Set("Content-Type", "application/gzip")
 
 	computationProfile := m.emulator.ComputationProfile()
+	if computationProfile == nil {
+		w.WriteHeader(http.StatusNotFound)
+		return
+	}
 
 	pprofProfile, err := runtime.NewPProfExporter(computationProfile).Export()
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
 
+	for _, function := range pprofProfile.Function {
+		if !strings.HasSuffix(function.Filename, cadenceFileSuffix) {
+			function.Filename += cadenceFileSuffix
+		}
+	}
+
 	err = pprofProfile.Write(w)
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)