Report computation for EVM.encodeABI & EVM.decodeABI methods

dapperlabs · Dec 13, 2023 · 5b16ed6 · 5b16ed6
1 parent c3585e6
commit 5b16ed6
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/fvm/environment/meter.go b/fvm/environment/meter.go
@@ -52,6 +52,9 @@ const (
 	ComputationKindRLPEncoding                = 2038
 	ComputationKindRLPDecoding                = 2039
 	ComputationKindEncodeEvent                = 2040
+	_                                         = 2041
+	ComputationKindEVMEncodeABI               = 2042
+	ComputationKindEVMDecodeABI               = 2042
 )
 
 type Meter interface {

diff --git a/fvm/evm/stdlib/contract.go b/fvm/evm/stdlib/contract.go
@@ -18,6 +18,7 @@ import (
 	"github.com/onflow/cadence/runtime/sema"
 	"github.com/onflow/cadence/runtime/stdlib"
 
+	"github.com/onflow/flow-go/fvm/environment"
 	"github.com/onflow/flow-go/fvm/evm/types"
 	"github.com/onflow/flow-go/model/flow"
 )
@@ -158,12 +159,19 @@ func newInternalEVMTypeEncodeABIFunction(
 				return true
 			})
 
-			encodedValues, err := arguments.Pack(values...)
+			hexData, err := arguments.Pack(values...)
 			if err != nil {
 				panic(abiEncodingError{})
 			}
 
-			return interpreter.ByteSliceToByteArrayValue(inter, encodedValues)
+			encodedValues := interpreter.ByteSliceToByteArrayValue(inter, hexData)
+
+			invocation.Interpreter.ReportComputation(
+				environment.ComputationKindEVMEncodeABI,
+				uint(encodedValues.Count()),
+			)
+
+			return encodedValues
 		},
 	)
 }
@@ -526,6 +534,11 @@ func newInternalEVMTypeDecodeABIFunction(
 				panic(errors.NewUnreachableError())
 			}
 
+			invocation.Interpreter.ReportComputation(
+				environment.ComputationKindEVMDecodeABI,
+				uint(dataValue.Count()),
+			)
+
 			data, err := interpreter.ByteArrayValueToByteSlice(inter, dataValue, locationRange)
 			if err != nil {
 				panic(err)