Merge branch 'master' into ramtin/evm-refactor-precompiled-call-tracker

fvm/environment/env.go

@@ -18,6 +18,8 @@ type Environment interface {
 
 	Meter
 
+	MetricsReporter
+
 	// Runtime
 	BorrowCadenceRuntime() *reusableRuntime.ReusableCadenceRuntime
 	ReturnCadenceRuntime(*reusableRuntime.ReusableCadenceRuntime)

fvm/environment/program_logger.go

@@ -12,9 +12,16 @@ import (
 	"github.com/onflow/flow-go/module/trace"
 )
 
-// MetricsReporter captures and reports metrics to back to the execution
+// MetricsReporter captures and reports EVM metrics to back to the execution
+type EVMMetricsReporter interface {
+	SetNumberOfDeployedCOAs(count uint64)
+	EVMTransactionExecuted(gasUsed uint64, isDirectCall bool, failed bool)
+	EVMBlockExecuted(txCount int, totalGasUsed uint64, totalSupplyInFlow float64)
+}
+
+// RuntimeMetricsReporter captures and reports runtime metrics to back to the execution
 // environment it is a setup passed to the context.
-type MetricsReporter interface {
+type RuntimeMetricsReporter interface {
 	RuntimeTransactionParsed(time.Duration)
 	RuntimeTransactionChecked(time.Duration)
 	RuntimeTransactionInterpreted(time.Duration)
@@ -23,9 +30,18 @@ type MetricsReporter interface {
 	RuntimeTransactionProgramsCacheHit()
 }
 
+// MetricsReporter captures and reports metrics to back to the execution
+// environment it is a setup passed to the context.
+type MetricsReporter interface {
+	EVMMetricsReporter
+	RuntimeMetricsReporter
+}
+
 // NoopMetricsReporter is a MetricReporter that does nothing.
 type NoopMetricsReporter struct{}
 
+var _ MetricsReporter = &NoopMetricsReporter{}
+
 // RuntimeTransactionParsed is a noop
 func (NoopMetricsReporter) RuntimeTransactionParsed(time.Duration) {}
 
@@ -44,6 +60,15 @@ func (NoopMetricsReporter) RuntimeTransactionProgramsCacheMiss() {}
 // RuntimeTransactionProgramsCacheHit is a noop
 func (NoopMetricsReporter) RuntimeTransactionProgramsCacheHit() {}
 
+// SetNumberOfDeployedCOAs is a noop
+func (NoopMetricsReporter) SetNumberOfDeployedCOAs(_ uint64) {}
+
+// EVMTransactionExecuted is a noop
+func (NoopMetricsReporter) EVMTransactionExecuted(_ uint64, _ bool, _ bool) {}
+
+// EVMBlockExecuted is a noop
+func (NoopMetricsReporter) EVMBlockExecuted(_ int, _ uint64, _ float64) {}
+
 type ProgramLoggerParams struct {
 	zerolog.Logger
 

fvm/environment/programs_test.go

@@ -893,6 +893,12 @@ func (m *metricsReporter) RuntimeTransactionInterpreted(duration time.Duration)
 
 func (m *metricsReporter) RuntimeSetNumberOfAccounts(count uint64) {}
 
+func (m *metricsReporter) SetNumberOfDeployedCOAs(count uint64) {}
+
+func (m *metricsReporter) EVMTransactionExecuted(_ uint64, _ bool, _ bool) {}
+
+func (m *metricsReporter) EVMBlockExecuted(_ int, _ uint64, _ float64) {}
+
 func (m *metricsReporter) RuntimeTransactionProgramsCacheMiss() {
 	m.CacheMisses++
 }

fvm/evm/backends/wrappedEnv.go

@@ -154,6 +154,26 @@ func (we *WrappedEnvironment) StartChildSpan(
 	return we.env.StartChildSpan(name, options...)
 }
 
+func (we *WrappedEnvironment) SetNumberOfDeployedCOAs(count uint64) {
+	we.env.SetNumberOfDeployedCOAs(count)
+}
+
+func (we *WrappedEnvironment) EVMTransactionExecuted(
+	gasUsed uint64,
+	isDirectCall bool,
+	failed bool,
+) {
+	we.env.EVMTransactionExecuted(gasUsed, isDirectCall, failed)
+}
+
+func (we *WrappedEnvironment) EVMBlockExecuted(
+	txCount int,
+	totalGasUsed uint64,
+	totalSupplyInFlow float64,
+) {
+	we.env.EVMBlockExecuted(txCount, totalGasUsed, totalSupplyInFlow)
+}
+
 func handleEnvironmentError(err error) error {
 	if err == nil {
 		return nil