Skip to content

Improve address conversion handling in evm relayerset #1592

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ilija42 merged 2 commits into from
Oct 8, 2025
Merged

Improve address conversion handling in evm relayerset #1592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9245b2c
Improve address conversion handling in evm relayerset
ilija42 Oct 8, 2025
b8bd6d4
lint
ilija42 Oct 8, 2025
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
28 changes: 24 additions & 4 deletions pkg/loop/internal/relayerset/evm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,13 @@ func (s *Server) BalanceAt(ctx context.Context, request *evmpb.BalanceAtRequest)
return nil, err
}

address, err := evmpb.ConvertOptionalAddressFromProto(request.GetAccount())
if err != nil {
return nil, err
}

reply, err := evmService.BalanceAt(ctx, evm.BalanceAtRequest{
Address: evm.Address(request.GetAccount()),
Address: address,
BlockNumber: valuespb.NewIntFromBigInt(request.BlockNumber),
ConfidenceLevel: conf,
})
Expand Down Expand Up @@ -405,9 +410,14 @@ func (s *Server) SubmitTransaction(ctx context.Context, request *evmpb.SubmitTra
return nil, err
}

address, err := evmpb.ConvertOptionalAddressFromProto(request.To)
if err != nil {
return nil, err
}

reply, err := evmService.SubmitTransaction(ctx, evm.SubmitTransactionRequest{
To: evm.Address(request.To),
Data: evm.ABIPayload(request.Data),
To: address,
Data: request.Data,
GasConfig: evmpb.ConvertGasConfigFromProto(request.GetGasConfig()),
})
if err != nil {
Expand Down Expand Up @@ -452,7 +462,17 @@ func (s *Server) GetForwarderForEOA(ctx context.Context, request *evmpb.GetForwa
return nil, err
}

forwarder, err := evmService.GetForwarderForEOA(ctx, evm.Address(request.GetAddr()), evm.Address(request.GetAggr()), request.PluginType)
eoa, err := evmpb.ConvertAddressFromProto(request.GetAddr())
if err != nil {
return nil, fmt.Errorf("invalid EOA address: %w", err)
}

ocr2AggregatorID, err := evmpb.ConvertAddressFromProto(request.GetAggr())
if err != nil {
return nil, fmt.Errorf("invalid OCR2 Aggregator address: %w", err)
}

forwarder, err := evmService.GetForwarderForEOA(ctx, eoa, ocr2AggregatorID, request.PluginType)
if err != nil {
return nil, err
}
Expand Down
56 changes: 56 additions & 0 deletions pkg/loop/internal/relayerset/relayerset_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,7 @@ func Test_RelayerSet_EVMService(t *testing.T) {
retrievedRelayer, err := rc.Get(ctx, types.RelayID{Network: "N1", ChainID: "C1"})
require.NoError(t, err)

zero := evmtypes.Address{}
tests := []struct {
name string
run func(t *testing.T, evm types.EVMService, mockEVM *mocks2.EVMService)
Expand Down Expand Up @@ -338,6 +339,25 @@ func Test_RelayerSet_EVMService(t *testing.T) {
require.Equal(t, big.NewInt(999), reply.Balance)
},
},
{
name: "BalanceAt_ZeroAddress_NoError",
run: func(t *testing.T, evm types.EVMService, mockEVM *mocks2.EVMService) {
conf := primitives.Finalized
mockEVM.EXPECT().BalanceAt(mock.Anything, evmtypes.BalanceAtRequest{
Address: zero,
BlockNumber: big.NewInt(0),
ConfidenceLevel: conf,
}).Return(&evmtypes.BalanceAtReply{Balance: big.NewInt(0)}, nil)

reply, err := evm.BalanceAt(ctx, evmtypes.BalanceAtRequest{
Address: zero,
BlockNumber: big.NewInt(0),
ConfidenceLevel: conf,
})
require.NoError(t, err)
require.Equal(t, big.NewInt(0), reply.Balance)
},
},
{
name: "EstimateGas",
run: func(t *testing.T, evm types.EVMService, mockEVM *mocks2.EVMService) {
Expand Down Expand Up @@ -488,6 +508,24 @@ func Test_RelayerSet_EVMService(t *testing.T) {
require.Equal(t, &expectedTxResult, txResult)
},
},
{
name: "SubmitTransaction_ZeroTo_NoError",
run: func(t *testing.T, evm types.EVMService, mockEVM *mocks2.EVMService) {
txRequest := evmtypes.SubmitTransactionRequest{
To: zero,
Data: []byte("data"),
}
expectedTxResult := evmtypes.TransactionResult{
TxStatus: evmtypes.TxSuccess,
TxHash: evmtypes.Hash{9, 9, 9},
}
// Should not error even when To is zero address.
mockEVM.EXPECT().SubmitTransaction(mock.Anything, txRequest).Return(&expectedTxResult, nil)
txResult, err := evm.SubmitTransaction(ctx, txRequest)
require.NoError(t, err)
require.Equal(t, &expectedTxResult, txResult)
},
},
{
name: "CalculateTransactionFee",
run: func(t *testing.T, evm types.EVMService, mockEVM *mocks2.EVMService) {
Expand All @@ -504,6 +542,24 @@ func Test_RelayerSet_EVMService(t *testing.T) {
require.Equal(t, expectedFee, fee)
},
},
{
name: "GetForwarderForEOA_ErrorsOnZeroEoa",
run: func(t *testing.T, evm types.EVMService, mockEVM *mocks2.EVMService) {
mockEVM.EXPECT().GetForwarderForEOA(mock.Anything, zero, address, "str").Return(address1, nil)
res, err := evm.GetForwarderForEOA(ctx, zero, address, "str")
require.NoError(t, err)
require.Equal(t, address1, res)
},
},
{
name: "GetForwarderForEOA_ErrorsOnZeroOCRID",
run: func(t *testing.T, evm types.EVMService, mockEVM *mocks2.EVMService) {
mockEVM.EXPECT().GetForwarderForEOA(mock.Anything, address, zero, "str").Return(address1, nil)
res, err := evm.GetForwarderForEOA(ctx, address, zero, "str")
require.NoError(t, err)
require.Equal(t, address1, res)
},
},
}

for _, tc := range tests {
Expand Down
Loading