temp

Author: ilija42

pkg/chains/evm/evm.pb.go

@@ -328,9 +328,10 @@ message CalculateTransactionFeeReply {
 }
 
 message SubmitTransactionRequest {
-  bytes to  = 1;
-  bytes data = 2;
-  optional GasConfig gas_config = 3;
+  bytes from  = 1;
+  bytes to  = 2;
+  bytes data = 3;
+  optional GasConfig gas_config = 4;
 }
 
 message SubmitTransactionReply {

pkg/chains/evm/evm.proto

@@ -758,6 +758,7 @@ func ConvertSubmitTransactionRequestFromProto(txRequest *SubmitTransactionReques
 	}
 
 	return evmtypes.SubmitTransactionRequest{
+		From:      evmtypes.Address(txRequest.From),
 		To:        evmtypes.Address(txRequest.To),
 		Data:      txRequest.Data,
 		GasConfig: ConvertGasConfigFromProto(txRequest.GasConfig),

pkg/chains/evm/proto_helpers.go

@@ -38,6 +38,7 @@ func (e *EVMClient) CalculateTransactionFee(ctx context.Context, receiptGasInfo
 // SubmitTransaction implements types.EVMService.
 func (e *EVMClient) SubmitTransaction(ctx context.Context, txRequest evmtypes.SubmitTransactionRequest) (*evmtypes.TransactionResult, error) {
 	pbTxRequest := &evmpb.SubmitTransactionRequest{
+		From: txRequest.From[:],
 		To:   txRequest.To[:],
 		Data: txRequest.Data,
 	}

pkg/loop/internal/relayer/evm.go

@@ -421,13 +421,19 @@ func (es *evmServer) SubmitTransaction(ctx context.Context, request *evmpb.Submi
 		return nil, err
 	}
 
-	address, err := evmpb.ConvertOptionalAddressFromProto(request.To)
+	from, err := evmpb.ConvertOptionalAddressFromProto(request.From)
+	if err != nil {
+		return nil, err
+	}
+
+	to, err := evmpb.ConvertOptionalAddressFromProto(request.To)
 	if err != nil {
 		return nil, err
 	}
 
 	reply, err := evmService.SubmitTransaction(ctx, evm.SubmitTransactionRequest{
-		To:        address,
+		From:      from,
+		To:        to,
 		Data:      request.Data,
 		GasConfig: evmpb.ConvertGasConfigFromProto(request.GetGasConfig()),
 	})

pkg/loop/internal/relayerset/evm.go

@@ -497,6 +497,7 @@ func Test_RelayerSet_EVMService(t *testing.T) {
 			name: "SubmitTransaction",
 			run: func(t *testing.T, evm types.EVMService, mockEVM *mocks2.EVMService) {
 				txRequest := evmtypes.SubmitTransactionRequest{
+					From: address,
 					To:   address1,
 					Data: []byte("data"),
 				}

pkg/loop/internal/relayerset/relayerset_test.go

@@ -170,6 +170,7 @@ type GasConfig struct {
 }
 
 type SubmitTransactionRequest struct {
+	From Address
 	To   Address
 	Data ABIPayload
 	// Default to nil. If not specified the configured gas estimator config will be used