Add endpoint for send voting tx data to contract

docs/spec/components/schemas/SendTx.yaml

@@ -0,0 +1,23 @@
+allOf:
+  - $ref: '#/components/schemas/SendTxKey'
+  - type: object
+    x-go-is-request: true
+    required:
+      - attributes
+    properties:
+      attributes:
+        type: object
+        required:
+          - tx_data
+          - destination
+        properties:
+          tx_data:
+            type: string
+            pattern: "^0x[0-9a-fA-F]+$"
+            example: "0xdeadbeafdeadbeafdeadbeaf"
+            description: Serialized transaction data
+          destination:
+            type: string
+            pattern: "^0x[0-9a-fA-F]{40}"
+            example: "0xdead...beaf"
+            description: Address of the contract to which the transaction data should be sent

docs/spec/components/schemas/SendTxKey.yaml

@@ -0,0 +1,8 @@
+type: object
+required:
+  - type
+properties:
+  type:
+    type: string
+    enum:
+      - send_transaction

docs/spec/components/schemas/TxKey.yaml

@@ -5,7 +5,9 @@ required:
 properties:
   id:
     type: string
+    example: "0xdead...beaf"
+    description: Transaction hash
   type:
     type: string
     enum:
-      - txs
+      - transaction

docs/spec/paths/integrations@registration-relayer@v1@register.yaml → docs/spec/paths/integrations@registration-relayer@v1@vote.yaml

@@ -1,25 +1,20 @@
 post:
   tags:
-    - Registration
-  summary: Registration
-  operationId: register
+    - Voting
+  summary: Voting
+  operationId: vote
   requestBody:
     content:
-      application/json:
+      application/vnd.api+json:
         schema:
           type: object
           required:
             - data
           properties:
             data:
-              type: object
-              required:
-                - tx_data
-              properties:
-                tx_data:
-                  type: string
+              $ref: '#/components/schemas/SendTx'
   responses:
-    '200':
+    200:
       description: Success
       content:
         application/json:
@@ -28,14 +23,14 @@ post:
             properties:
               data:
                 type: object
-                $ref: '#/components/schemas/Tx'
-    '400':
+                $ref: '#/components/schemas/TxKey'
+    400:
       description: Bad Request Error
       content:
         application/json:
           schema:
             $ref: '#/components/schemas/Errors'
-    '500':
+    500:
       description: Internal Error
       content:
         application/json:

internal/config/network.go

@@ -4,11 +4,8 @@ import (
 	"context"
 	"crypto/ecdsa"
 	"math/big"
-	"slices"
-	"strings"
 	"sync"
 
-	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/ethclient"
 	vaultapi "github.com/hashicorp/vault/api"
@@ -34,16 +31,11 @@ type ethereum struct {
 	getter kv.Getter
 }
 
-type whitelist []string
-
 type RelayerConfig struct {
-	RPC                     *ethclient.Client
-	RegistrationAddress     common.Address
-	LightweightStateAddress *common.Address
-	ChainID                 *big.Int
-	PrivateKey              *ecdsa.PrivateKey
-	WhiteList               whitelist
-	nonce                   uint64
+	RPC        *ethclient.Client
+	ChainID    *big.Int
+	PrivateKey *ecdsa.PrivateKey
+	nonce      uint64
 
 	mut *sync.Mutex
 }
@@ -53,13 +45,10 @@ func (e *ethereum) RelayerConfig() *RelayerConfig {
 		var result RelayerConfig
 
 		networkConfig := struct {
-			RPC                     *ethclient.Client `fig:"rpc,required"`
-			RegistrationAddress     common.Address    `fig:"registration,required"`
-			LightweightStateAddress *common.Address   `fig:"lightweight_state"`
-			PrivateKey              *ecdsa.PrivateKey `fig:"private_key"`
-			VaultAddress            string            `fig:"vault_address"`
-			VaultMountPath          string            `fig:"vault_mount_path"`
-			WhiteList               []string          `fig:"whitelist"`
+			RPC            *ethclient.Client `fig:"rpc,required"`
+			PrivateKey     *ecdsa.PrivateKey `fig:"private_key"`
+			VaultAddress   string            `fig:"vault_address"`
+			VaultMountPath string            `fig:"vault_mount_path"`
 		}{}
 		err := figure.
 			Out(&networkConfig).
@@ -71,8 +60,6 @@ func (e *ethereum) RelayerConfig() *RelayerConfig {
 		}
 
 		result.RPC = networkConfig.RPC
-		result.RegistrationAddress = networkConfig.RegistrationAddress
-		result.LightweightStateAddress = networkConfig.LightweightStateAddress
 
 		result.ChainID, err = result.RPC.ChainID(context.Background())
 		if err != nil {
@@ -89,16 +76,6 @@ func (e *ethereum) RelayerConfig() *RelayerConfig {
 			panic(errors.Wrap(err, "failed to get nonce"))
 		}
 
-		result.WhiteList = make(whitelist, 0, len(networkConfig.WhiteList))
-		for _, address := range networkConfig.WhiteList {
-			address = strings.ToLower(address)
-			if result.WhiteList.IsPresent(address) {
-				continue
-			}
-
-			result.WhiteList = append(result.WhiteList, address)
-		}
-
 		result.mut = &sync.Mutex{}
 		return &result
 	}).(*RelayerConfig)
@@ -169,7 +146,3 @@ func extractPrivateKey(vaultAddress, vaultMountPath string) *ecdsa.PrivateKey {
 
 	return vaultRelayerConf.PrivateKey
 }
-
-func (w whitelist) IsPresent(address string) bool {
-	return slices.Contains(w, address)
-}

internal/service/handlers/registration.go → internal/service/handlers/voting.go

@@ -27,37 +27,31 @@ type txData struct {
 	gas       uint64
 }
 
-func Registration(w http.ResponseWriter, r *http.Request) {
-	req, err := requests.NewRegistrationRequest(r)
+func Voting(w http.ResponseWriter, r *http.Request) {
+	req, err := requests.NewVotingRequest(r)
 	if err != nil {
 		Log(r).WithError(err).Error("failed to get request")
 		ape.RenderErr(w, problems.BadRequest(err)...)
 		return
 	}
 
+	var (
+		destination = req.Data.Attributes.Destination
+		calldata    = req.Data.Attributes.TxData
+	)
+
 	log := Log(r).WithFields(logan.F{
-		"user-agent": r.Header.Get("User-Agent"),
-		"calldata":   req.Data.TxData,
+		"user-agent":  r.Header.Get("User-Agent"),
+		"calldata":    calldata,
+		"destination": destination,
 	})
-	log.Debug("registration request")
-
-	// `RelayerConfig(r).RegistrationAddress` is default value for target contract
-	// if destination not specified this value will be used
-	// this value is required in config
-	registrationAddress := RelayerConfig(r).RegistrationAddress
-	if req.Data.Destination != nil {
-		if !RelayerConfig(r).WhiteList.IsPresent(*req.Data.Destination) {
-			ape.RenderErr(w, problems.BadRequest(validation.Errors{
-				"data/destination": fmt.Errorf("specified contract address not allowed"),
-			})...)
-		}
+	log.Debug("voting request")
 
-		// destination is valid hex address because of request validation
-		registrationAddress = common.HexToAddress(*req.Data.Destination)
-	}
+	// destination is valid hex address because of request validation
+	votingAddress := common.HexToAddress(destination)
 
 	var txd txData
-	txd.dataBytes, err = hexutil.Decode(req.Data.TxData)
+	txd.dataBytes, err = hexutil.Decode(calldata)
 	if err != nil {
 		Log(r).WithError(err).Error("failed to decode data")
 		ape.RenderErr(w, problems.BadRequest(err)...)
@@ -67,7 +61,7 @@ func Registration(w http.ResponseWriter, r *http.Request) {
 	RelayerConfig(r).LockNonce()
 	defer RelayerConfig(r).UnlockNonce()
 
-	err = confGas(r, &txd, &registrationAddress)
+	err = confGas(r, &txd, &votingAddress)
 	if err != nil {
 		Log(r).WithError(err).Error("failed to configure gas and gasPrice")
 		// `errors.Is` is not working for rpc errors, they passed as a string without additional wrapping
@@ -83,7 +77,7 @@ func Registration(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	tx, err := sendTx(r, &txd, &registrationAddress)
+	tx, err := sendTx(r, &txd, &votingAddress)
 	if err != nil {
 		Log(r).WithError(err).Error("failed to send tx")
 		ape.RenderErr(w, problems.InternalError())
@@ -92,22 +86,12 @@ func Registration(w http.ResponseWriter, r *http.Request) {
 
 	RelayerConfig(r).IncrementNonce()
 
-	ape.Render(w, newTxResponse(tx))
-}
-
-func newTxResponse(tx *types.Transaction) resources.TxResponse {
-	return resources.TxResponse{
-		Data: resources.Tx{
-
-			Key: resources.Key{
-				ID:   tx.Hash().String(),
-				Type: resources.TXS,
-			},
-			Attributes: resources.TxAttributes{
-				TxHash: tx.Hash().String(),
-			},
+	ape.Render(w, resources.Relation{
+		Data: &resources.Key{
+			ID:   tx.Hash().String(),
+			Type: resources.TRANSACTION,
 		},
-	}
+	})
 }
 
 func confGas(r *http.Request, txd *txData, receiver *common.Address) (err error) {