Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions pkg/loop/internal/relayerset/evm.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package relayerset

import (
"context"
"errors"
"fmt"

"google.golang.org/grpc"
Expand Down Expand Up @@ -100,6 +101,9 @@ func (s *Server) GetTransactionFee(ctx context.Context, request *evmpb.GetTransa
if err != nil {
return nil, err
}
if reply == nil {
return nil, errors.New("reply is nil")
}

return &evmpb.GetTransactionFeeReply{TransactionFee: valuespb.NewBigIntFromInt(reply.TransactionFee)}, nil
}
Expand Down Expand Up @@ -401,19 +405,22 @@ func (s *Server) SubmitTransaction(ctx context.Context, request *evmpb.SubmitTra
return nil, err
}

txResult, err := evmService.SubmitTransaction(ctx, evm.SubmitTransactionRequest{
reply, err := evmService.SubmitTransaction(ctx, evm.SubmitTransactionRequest{
To: evm.Address(request.To),
Data: evm.ABIPayload(request.Data),
GasConfig: evmpb.ConvertGasConfigFromProto(request.GetGasConfig()),
})
if err != nil {
return nil, err
}
if reply == nil {
return nil, fmt.Errorf("txResult is nil")
}

return &evmpb.SubmitTransactionReply{
TxHash: txResult.TxHash[:],
TxStatus: evmpb.ConvertTxStatusToProto(txResult.TxStatus),
TxIdempotencyKey: txResult.TxIdempotencyKey,
TxHash: reply.TxHash[:],
TxStatus: evmpb.ConvertTxStatusToProto(reply.TxStatus),
TxIdempotencyKey: reply.TxIdempotencyKey,
}, nil
}

Expand All @@ -423,16 +430,19 @@ func (s *Server) CalculateTransactionFee(ctx context.Context, request *evmpb.Cal
return nil, err
}

fee, err := evmService.CalculateTransactionFee(ctx, evm.ReceiptGasInfo{
reply, err := evmService.CalculateTransactionFee(ctx, evm.ReceiptGasInfo{
GasUsed: request.GasInfo.GasUsed,
EffectiveGasPrice: valuespb.NewIntFromBigInt(request.GasInfo.EffectiveGasPrice),
})
if err != nil {
return nil, err
}
if reply == nil {
return nil, fmt.Errorf("reply is nil")
}

return &evmpb.CalculateTransactionFeeReply{
TransactionFee: valuespb.NewBigIntFromInt(fee.TransactionFee),
TransactionFee: valuespb.NewBigIntFromInt(reply.TransactionFee),
}, nil
}

Expand Down
Loading