refactor: ♻️ bunder-sender: use marshal binary for set tx (#152)

Signed-off-by: thanhpp <[email protected]>

Author: thanhpp

pkg/mev/backrun_public_sender.go

@@ -57,6 +57,10 @@ func (b BackrunPublicClient) SendBackrunBundle(
 	if uuid != nil {
 		p.SetUUID(*uuid, b.senderType)
 	}
+	if err := p.Err(); err != nil {
+		return SendBundleResponse{}, err
+	}
+
 	req.Params = append(req.Params, p)
 
 	reqBody, err := json.Marshal(req)

pkg/mev/blxr_bundle_sender.go

@@ -5,12 +5,14 @@ import (
 	"context"
 	"crypto/ecdsa"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"net/http"
 	"strconv"
 
 	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/ethclient/gethclient"
 )
@@ -81,6 +83,9 @@ func (s *BloxrouteClient) SendBundle(
 	if uuid != nil {
 		p.SetUUID(*uuid)
 	}
+	if err := p.Err(); err != nil {
+		return SendBundleResponse{}, err
+	}
 
 	mevBuilders := make(map[BlxrBuilder]string)
 	for _, b := range s.enabledBuilders {
@@ -155,6 +160,8 @@ type BLXRSubmitBundleParams struct {
 	RevertingHashes *[]string              `json:"reverting_hashes,omitempty"`
 	UUID            string                 `json:"uuid,omitempty"`
 	MEVBuilders     map[BlxrBuilder]string `json:"mev_builders,omitempty"`
+
+	Errors []error `json:"-"`
 }
 
 func (p *BLXRSubmitBundleParams) SetTransactions(txs ...*types.Transaction) *BLXRSubmitBundleParams {
@@ -164,7 +171,12 @@ func (p *BLXRSubmitBundleParams) SetTransactions(txs ...*types.Transaction) *BLX
 
 	transactions := make([]string, 0, len(txs))
 	for _, tx := range txs {
-		transactions = append(transactions, "0x"+txToRlp(tx))
+		txBin, err := tx.MarshalBinary()
+		if err != nil {
+			p.Errors = append(p.Errors, err)
+		} else {
+			transactions = append(transactions, hexutil.Encode(txBin))
+		}
 	}
 
 	p.Transaction = transactions
@@ -188,6 +200,14 @@ func (p *BLXRSubmitBundleParams) SetUUID(uuid string) *BLXRSubmitBundleParams {
 	return p
 }
 
+func (p *BLXRSubmitBundleParams) Err() error {
+	if len(p.Errors) == 0 {
+		return nil
+	}
+
+	return errors.Join(p.Errors...)
+}
+
 type BLXRSubmitBundleResponse struct {
 	Jsonrpc string           `json:"jsonrpc,omitempty"`
 	ID      int              `json:"id,string,omitempty"`

pkg/mev/bundle_sender.go

@@ -5,6 +5,7 @@ import (
 	"context"
 	"crypto/ecdsa"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"net/http"
 
@@ -202,6 +203,7 @@ func (s *Client) sendBundle(
 	if uuid != nil {
 		p.SetUUID(*uuid, s.senderType)
 	}
+
 	req.Params = append(req.Params, p)
 
 	reqBody, err := json.Marshal(req)
@@ -258,11 +260,16 @@ func (s *Client) SendPrivateRawTransaction(
 		return SendPrivateRawTransactionResponse{}, nil
 	}
 
+	txBin, err := tx.MarshalBinary()
+	if err != nil {
+		return SendPrivateRawTransactionResponse{}, fmt.Errorf("marshal tx binary: %w", err)
+	}
+
 	req := SendRequest{
 		ID:      SendBundleID,
 		JSONRPC: JSONRPC2,
 		Method:  ETHSendPrivateRawTransaction,
-		Params:  []any{"0x" + txToRlp(tx)},
+		Params:  []any{hexutil.Encode(txBin)},
 	}
 
 	reqBody, err := json.Marshal(req)
@@ -352,6 +359,8 @@ type SendBundleParams struct {
 	// (Optional) String, UUID that can be used to cancel/replace this bundle (For beaverbuild)
 	UUID             string `json:"uuid,omitempty"`
 	StateBlockNumber string `json:"stateBlockNumber,omitempty"`
+
+	Errors []error `json:"-"` // check when building bundle
 }
 
 func (p *SendBundleParams) SetStateBlockNumber(stateBlockNumber string) *SendBundleParams {
@@ -383,14 +392,20 @@ func (p *SendBundleParams) SetPendingTxHashes(txHashes ...common.Hash) *SendBund
 	return p
 }
 
+// tested at: https://team-kyber.slack.com/archives/C03P04E6UAW/p1754280128232029?thread_ts=1754063210.955249&cid=C03P04E6UAW
 func (p *SendBundleParams) SetTransactions(txs ...*types.Transaction) *SendBundleParams {
 	if len(txs) == 0 {
 		return p
 	}
 
 	transactions := make([]string, 0, len(txs))
 	for _, tx := range txs {
-		transactions = append(transactions, "0x"+txToRlp(tx))
+		txBin, err := tx.MarshalBinary()
+		if err != nil {
+			p.Errors = append(p.Errors, fmt.Errorf("marshal tx: %w", err))
+		} else {
+			transactions = append(transactions, hexutil.Encode(txBin))
+		}
 	}
 
 	p.Txs = transactions
@@ -420,6 +435,14 @@ func (p *SendBundleParams) SetUUID(uuid string, senderType BundleSenderType) *Se
 	return p
 }
 
+func (p *SendBundleParams) Err() error {
+	if len(p.Errors) == 0 {
+		return nil
+	}
+
+	return errors.Join(p.Errors...)
+}
+
 type CancelBundleParams struct {
 	ReplacementUUID string `json:"replacementUuid"`
 }

pkg/mev/bundle_sender_test.go

@@ -34,15 +34,15 @@ func TestSendBundle(t *testing.T) {
 		return
 	}
 	var (
-		endpoint       = "https://relay-sepolia.flashbots.net"
+		endpoint       = "https://rpc.titanbuilder.xyz"
 		ctx            = context.Background()
 		client         = http.DefaultClient
-		sepoliaChainID = 11155111
+		sepoliaChainID = 1
 	)
 	require.NoError(t, err)
 	address := crypto.PubkeyToAddress(privateKey.PublicKey)
 
-	ethClient, err := ethclient.Dial("https://ethereum-sepolia.blockpi.network/v1/rpc/public")
+	ethClient, err := ethclient.Dial("wss://ethereum.kyberengineering.io")
 	require.NoError(t, err)
 
 	blockNumber, err := ethClient.BlockNumber(ctx)

pkg/mev/pkg.go

@@ -1,9 +1,7 @@
 package mev
 
 import (
-	"bytes"
 	"context"
-	"encoding/hex"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -122,23 +120,23 @@ var defaultHeaders = [][2]string{ // nolint: gochecknoglobals
 	{"Accept", "application/json"},
 }
 
-func txToRlp(tx *types.Transaction) string {
-	var buff bytes.Buffer
-	_ = tx.EncodeRLP(&buff)
+// func txToRlp(tx *types.Transaction) string {
+// 	var buff bytes.Buffer
+// 	_ = tx.EncodeRLP(&buff)
 
-	rlp := hex.EncodeToString(buff.Bytes())
+// 	rlp := hex.EncodeToString(buff.Bytes())
 
-	switch rlp[:2] {
-	case "b9":
-		rlp = rlp[6:]
-	case "b8":
-	}
-	if rlp[:2] == "b9" {
-		rlp = rlp[4:]
-	}
+// 	switch rlp[:2] {
+// 	case "b9":
+// 		rlp = rlp[6:]
+// 	case "b8":
+// 	}
+// 	if rlp[:2] == "b9" {
+// 		rlp = rlp[4:]
+// 	}
 
-	return rlp
-}
+// 	return rlp
+// }
 
 func doRequest[T any](c *http.Client, req *http.Request, headers ...[2]string) (T, error) {
 	var t T