Integrate cadence metering changes

Author: janezpodhostnik

cmd/util/ledger/migrations/migrator_runtime.go

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

fvm/environment/meter.go

@@ -4,8 +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"
 	"github.com/onflow/flow-go/fvm/storage/state"
@@ -71,7 +69,11 @@ var MainnetExecutionEffortWeights = meter.ExecutionEffortWeights{
 }
 
 type Meter interface {
-	runtime.MeterInterface
+	common.Gauge
+
+	ComputationUsed() (uint64, error)
+	MemoryUsed() (uint64, error)
+	InteractionUsed() (uint64, error)
 
 	ComputationIntensities() meter.MeteredComputationIntensities
 	ComputationAvailable(common.ComputationUsage) bool