feat: send bundle v2

Author: vaigay

pkg/mev/blxr_bundle_sender.go

@@ -90,6 +90,28 @@ func (s *BloxrouteClient) SendBundle(
 	return s.sendBundle(ctx, p)
 }
 
+func (s *BloxrouteClient) SendBundleV2(
+	ctx context.Context,
+	req SendBundleV2Request,
+	txs ...*types.Transaction,
+) (SendBundleResponse, error) {
+	p := new(BLXRSubmitBundleParams).
+		SetTransactions(txs...)
+
+	if req.BlockNumber != nil {
+		p.SetBlockNumber(*req.BlockNumber)
+	}
+	if req.UUID != nil {
+		p.SetUUID(*req.UUID)
+	}
+
+	if err := p.Err(); err != nil {
+		return SendBundleResponse{}, err
+	}
+
+	return s.sendBundle(ctx, p)
+}
+
 func (s *BloxrouteClient) SendBundleHex(
 	ctx context.Context,
 	uuid *string,

pkg/mev/bundle_sender.go

@@ -59,6 +59,40 @@ func (s *Client) SendBundle(
 	return s.sendBundle(ctx, ETHSendBundleMethod, uuid, blockNumber, txs, nil)
 }
 
+func (s *Client) SendBundleV2(
+	ctx context.Context,
+	req SendBundleV2Request,
+	txs ...*types.Transaction,
+) (SendBundleResponse, error) {
+	p := new(SendBundleParams).
+		SetTransactions(txs...)
+
+	if req.UUID != nil {
+		p.SetUUID(*req.UUID, s.senderType)
+	}
+	if req.BlockNumber != nil {
+		p.SetBlockNumber(*req.BlockNumber)
+	}
+	if req.MinTimestamp != nil {
+		p.MinTimestamp = req.MinTimestamp
+	}
+	if req.MaxTimestamp != nil {
+		p.MaxTimestamp = req.MaxTimestamp
+	}
+	if req.RevertingTxs != nil {
+		p.RevertingTxs = req.RevertingTxs
+	}
+	if s.senderType == BundleSenderTypeFlashbot {
+		p = p.SetStateBlockNumber("latest")
+	}
+
+	if err := p.Err(); err != nil {
+		return SendBundleResponse{}, err
+	}
+
+	return s.sendRawBundle(ctx, ETHSendBundleMethod, p)
+}
+
 func (s *Client) SendBundleHex(
 	ctx context.Context,
 	uuid *string,
@@ -201,11 +235,6 @@ func (s *Client) sendBundle(
 	txs []*types.Transaction,
 	hexEncodedTxs []string,
 ) (SendBundleResponse, error) {
-	req := SendRequest{
-		ID:      SendBundleID,
-		JSONRPC: JSONRPC2,
-		Method:  method,
-	}
 	p := new(SendBundleParams).
 		SetBlockNumber(blockNumber).
 		SetTransactions(txs...).
@@ -221,6 +250,16 @@ func (s *Client) sendBundle(
 		p.SetUUID(*uuid, s.senderType)
 	}
 
+	return s.sendRawBundle(ctx, method, p)
+}
+
+func (s *Client) sendRawBundle(ctx context.Context, method string, p *SendBundleParams) (SendBundleResponse, error) {
+	req := SendRequest{
+		ID:      SendBundleID,
+		JSONRPC: JSONRPC2,
+		Method:  method,
+	}
+
 	req.Params = append(req.Params, p)
 
 	reqBody, err := json.Marshal(req)

pkg/mev/bundle_sender_test.go

@@ -89,6 +89,72 @@ func TestSendBundle(t *testing.T) {
 	require.NoError(t, sender.CancelBundle(ctx, uuid))
 }
 
+func Ptr[T any](v T) *T {
+	return &v
+}
+
+func TestSendBundleV2(t *testing.T) {
+	t.Skip()
+
+	// Generate a new private key
+	privateKey, err := ecdsa.GenerateKey(crypto.S256(), rand.Reader)
+	if err != nil {
+		t.Error("Failed to generate private key:", err)
+		return
+	}
+	var (
+		endpoint   = "https://bsc.blinklabs.xyz/v1/<API_KEY>"
+		ctx        = context.Background()
+		client     = http.DefaultClient
+		bscChainID = 56
+	)
+	require.NoError(t, err)
+	address := crypto.PubkeyToAddress(privateKey.PublicKey)
+
+	ethClient, err := ethclient.Dial("wss://bsc.kyberengineering.io")
+	require.NoError(t, err)
+
+	head, err := ethClient.HeaderByNumber(ctx, nil)
+	require.NoError(t, err)
+	t.Log("blockNumber", head.Number)
+
+	nonce, err := ethClient.PendingNonceAt(ctx, address)
+	require.NoError(t, err)
+
+	tip, err := convert.FloatToWei(0.3, 18)
+	require.NoError(t, err)
+	fee, err := convert.FloatToWei(1, 18)
+	require.NoError(t, err)
+
+	tx := types.NewTx(&types.DynamicFeeTx{
+		ChainID:   big.NewInt(int64(bscChainID)),
+		Nonce:     nonce,
+		To:        &address,
+		GasTipCap: tip,
+		GasFeeCap: fee,
+		Value:     big.NewInt(1),
+	})
+	signedTx, err := types.SignTx(tx, types.NewLondonSigner(big.NewInt(int64(bscChainID))), privateKey)
+	require.NoError(t, err)
+
+	t.Log("new tx", signedTx.Hash().String())
+
+	uuid := uuid.NewString()
+	require.NoError(t, err)
+	sender, err := mev.NewClient(client, endpoint, privateKey, mev.BundleSenderTypeBlink, false, false)
+	require.NoError(t, err)
+
+	resp, err := sender.SendBundleV2(ctx, mev.SendBundleV2Request{
+		MinTimestamp: Ptr(head.Time + 1),
+		MaxTimestamp: Ptr(head.Time + 5),
+		UUID:         Ptr(uuid),
+	})
+	require.NoError(t, err) // sepolia: code: [-32000], message: [internal server error]
+	t.Log("send bundle response", resp)
+
+	// require.NoError(t, sender.CancelBundle(ctx, uuid))
+}
+
 func TestUnmarshal(t *testing.T) {
 	var (
 		data = "{\"id\":\"1\",\"result\":{\"bundleHash\":\"0xe0e0592348830d57fac820a6bec9fdbf0ac20a2b503351c63217cf8c274b70a8\"},\"jsonrpc\":\"2.0\"}\n" // nolint:lll

pkg/mev/pkg.go

@@ -104,6 +104,11 @@ type IBundleSender interface {
 		blockNumber uint64,
 		tx ...*types.Transaction,
 	) (SendBundleResponse, error)
+	SendBundleV2(
+		ctx context.Context,
+		req SendBundleV2Request,
+		txs ...*types.Transaction,
+	) (SendBundleResponse, error)
 	SendBundleHex(
 		ctx context.Context,
 		uuid *string,
@@ -357,3 +362,19 @@ func CleanBundleHash(hash string) string {
 
 	return hash
 }
+
+type SendBundleV2Request struct {
+	BlockNumber    *uint64 `json:"blockNumber,omitempty"`
+	MaxBlockNumber *uint64 `json:"maxBlockNumber,omitempty"`
+
+	// (Optional) Number, the minimum timestamp for which this bundle is valid, in seconds since the unix epoch
+	MinTimestamp *uint64 `json:"minTimestamp,omitempty"`
+	// (Optional) Number, the maximum timestamp for which this bundle is valid, in seconds since the unix epoch
+	MaxTimestamp *uint64 `json:"maxTimestamp,omitempty"`
+	// (Optional) Array[String], A list of tx hashes that are allowed to revert
+	RevertingTxs *[]string `json:"revertingTxHashes,omitempty"`
+	// (Optional) String, UUID that can be used to cancel/replace this bundle
+	ReplacementUUID *string `json:"ReplacementUuid,omitempty"`
+	// (Optional) String, UUID that can be used to cancel/replace this bundle (For beaverbuild)
+	UUID *string `json:"uuid,omitempty"`
+}