Add L1Fee to evm service Receipt (#2002)

* Add L1Fee to evm service Receipt

* Wire l1 fee through CalculateTransactionFee and getTransactionReceipt

* Add tests

* Lint

Author: ilija42

pkg/chains/evm/evm.pb.go

@@ -83,6 +83,7 @@ message Receipt {
   values.v1.BigInt effective_gas_price = 8; // actual gas price paid in wei (include after EIP-1559)
   values.v1.BigInt block_number = 9; // block number containing the transaction
   bytes contract_address = 10; // address of the contract if this transaction created one in evm address [20]byte fix-sized array format
+  values.v1.BigInt l1_Fee = 11; // layer 1 fee paid by L2 chains
 }
 
 
@@ -320,6 +321,7 @@ message CalculateTransactionFeeRequest {
 message ReceiptGasInfo {
   uint64 gas_used = 1; // gas used by this transaction (in gas units)
   values.v1.BigInt effective_gas_price = 2; // actual gas price paid in wei (include after EIP-1559)
+  values.v1.BigInt l1_Fee = 3; // layer 1 fee paid by L2 chains
 }
 
 

pkg/chains/evm/evm.proto

@@ -147,6 +147,7 @@ func ConvertReceiptToProto(receipt *evmtypes.Receipt) (*Receipt, error) {
 		BlockNumber:       valuespb.NewBigIntFromInt(receipt.BlockNumber),
 		TxIndex:           receipt.TransactionIndex,
 		EffectiveGasPrice: valuespb.NewBigIntFromInt(receipt.EffectiveGasPrice),
+		L1_Fee:            valuespb.NewBigIntFromInt(receipt.L1Fee),
 	}, nil
 }
 
@@ -186,6 +187,7 @@ func ConvertReceiptFromProto(protoReceipt *Receipt) (*evmtypes.Receipt, error) {
 		BlockNumber:       valuespb.NewIntFromBigInt(protoReceipt.GetBlockNumber()),
 		TransactionIndex:  protoReceipt.GetTxIndex(),
 		EffectiveGasPrice: valuespb.NewIntFromBigInt(protoReceipt.GetEffectiveGasPrice()),
+		L1Fee:             valuespb.NewIntFromBigInt(protoReceipt.GetL1_Fee()),
 	}, nil
 }
 

pkg/chains/evm/proto_helpers.go

@@ -3,6 +3,7 @@ package evm_test
 import (
 	"bytes"
 	"errors"
+	"math/big"
 	"strings"
 	"testing"
 
@@ -270,6 +271,32 @@ func TestHashConverters(t *testing.T) {
 	})
 }
 
+func TestReceiptRoundtrip(t *testing.T) {
+	blockHash := evmtypes.Hash(mkBytes(evmtypes.HashLength, 0xAA))
+	txHash := evmtypes.Hash(mkBytes(evmtypes.HashLength, 0xBB))
+	contractAddr := evmtypes.Address(mkBytes(evmtypes.AddressLength, 0xCC))
+
+	in := &evmtypes.Receipt{
+		Status:            1,
+		Logs:              make([]*evmtypes.Log, 0),
+		TxHash:            txHash,
+		ContractAddress:   contractAddr,
+		GasUsed:           21000,
+		BlockHash:         blockHash,
+		BlockNumber:       big.NewInt(100),
+		TransactionIndex:  3,
+		EffectiveGasPrice: big.NewInt(1e9),
+		L1Fee:             big.NewInt(5000),
+	}
+
+	proto, err := evm.ConvertReceiptToProto(in)
+	require.NoError(t, err)
+
+	got, err := evm.ConvertReceiptFromProto(proto)
+	require.NoError(t, err)
+	require.Equal(t, in, got)
+}
+
 func TestConvertExpressionsFromProto(t *testing.T) {
 	testCases := []struct {
 		Name           string

pkg/chains/evm/proto_helpers_test.go

@@ -27,6 +27,7 @@ func (e *EVMClient) CalculateTransactionFee(ctx context.Context, receiptGasInfo
 	reply, err := e.grpcClient.CalculateTransactionFee(ctx, &evmpb.CalculateTransactionFeeRequest{GasInfo: &evmpb.ReceiptGasInfo{
 		GasUsed:           receiptGasInfo.GasUsed,
 		EffectiveGasPrice: valuespb.NewBigIntFromInt(receiptGasInfo.EffectiveGasPrice),
+		L1_Fee:            valuespb.NewBigIntFromInt(receiptGasInfo.L1Fee),
 	}})
 	if err != nil {
 		return nil, net.WrapRPCErr(err)
@@ -574,6 +575,7 @@ func (e *evmServer) CalculateTransactionFee(ctx context.Context, request *evmpb.
 	txFee, err := e.impl.CalculateTransactionFee(ctx, evmtypes.ReceiptGasInfo{
 		GasUsed:           request.GasInfo.GasUsed,
 		EffectiveGasPrice: valuespb.NewIntFromBigInt(request.GasInfo.EffectiveGasPrice),
+		L1Fee:             valuespb.NewIntFromBigInt(request.GasInfo.L1_Fee),
 	})
 	if err != nil {
 		return nil, err

pkg/loop/internal/relayer/evm.go

@@ -43,6 +43,7 @@ var (
 	topic2           = evm.Hash{33, 1, 33}
 	topic3           = evm.Hash{20, 19, 17}
 	gas              = uint64(10)
+	l1Fee            = big.NewInt(9876)
 	txHash           = evm.Hash{5, 3, 44}
 	eventSigHash     = evm.Hash{14, 16, 29}
 	filterName       = "f name 1"
@@ -246,6 +247,7 @@ func Test_EVMDomainRoundTripThroughGRPC(t *testing.T) {
 			GasUsed:           gas,
 			BlockNumber:       blockNum,
 			TransactionIndex:  uint64(txIndex),
+			L1Fee:             l1Fee,
 		}
 		evmService.EXPECT().GetTransactionReceipt(mock.Anything, evm.GeTransactionReceiptRequest{Hash: txHash}).Return(expReceipt, nil).Once()
 
@@ -340,6 +342,19 @@ func Test_EVMDomainRoundTripThroughGRPC(t *testing.T) {
 		require.NoError(t, err)
 		require.Equal(t, expectedNames, actualNames)
 	})
+
+	t.Run("CalculateTransactionFee", func(t *testing.T) {
+		gasInfo := evm.ReceiptGasInfo{
+			GasUsed:           gas,
+			EffectiveGasPrice: gasPrice,
+			L1Fee:             l1Fee,
+		}
+		evmService.EXPECT().CalculateTransactionFee(mock.Anything, gasInfo).Return(&evm.TransactionFee{TransactionFee: txFee}, nil).Once()
+
+		got, err := client.CalculateTransactionFee(ctx, gasInfo)
+		require.NoError(t, err)
+		require.Equal(t, txFee, got.TransactionFee)
+	})
 }
 
 func generateFixtureQuery() []query.Expression {

pkg/loop/internal/relayer/evm_test.go

@@ -100,6 +100,7 @@ type Transaction struct {
 type ReceiptGasInfo struct {
 	GasUsed           uint64   // actual gas used during execution in gas units
 	EffectiveGasPrice *big.Int // actual price in wei paid per gas unit
+	L1Fee             *big.Int // layer 1 fee paid by L2 chains
 }
 
 // matches evm-style receipt
@@ -113,6 +114,7 @@ type Receipt struct {
 	BlockNumber       *big.Int // number of the block containing this receipt
 	TransactionIndex  uint64   // index of the transaction inside of the block
 	EffectiveGasPrice *big.Int // actual price in wei paid per gas unit
+	L1Fee             *big.Int // For L2 chains only
 }
 
 // matches simplified evm-style head