Fix bundle 0 (#18)

## 📝 Summary

* update to the latest go-utils (allows blockNumber = 0 and blockNumber
= null)
* fixes bug when handling bundle with replacementUuid that was sent to
the local endpoint

## ⛱ Motivation and Context

<!--- Why is this change required? What problem does it solve? -->

## 📚 References

<!-- Any interesting external links to documentation, articles, tweets
which add value to the PR -->

---

## ✅ I have run these commands

* [ ] `make lint`
* [ ] `make test`
* [ ] `go mod tidy`

Author: dvush

cmd/test-tx-sender/main.go

@@ -10,7 +10,6 @@ import (
 	"os"
 
 	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/rpc"
 	"github.com/flashbots/go-utils/rpctypes"
 	"github.com/flashbots/go-utils/signature"
 	"github.com/flashbots/tdx-orderflow-proxy/proxy"
@@ -102,10 +101,11 @@ func main() {
 			replacementUUIDTyped := uuid.New()
 			repacementUUID := replacementUUIDTyped.String()
 			slog.Info("Using the following replacement UUID", "value", repacementUUID)
+			blockNumber := hexutil.Uint64(block)
 			bundleArgs := rpctypes.EthSendBundleArgs{
 				Txs:             []hexutil.Bytes{testTx},
 				ReplacementUUID: &repacementUUID,
-				BlockNumber:     rpc.BlockNumber(block), //nolint:gosec
+				BlockNumber:     &blockNumber,
 			}
 
 			bundleHash, bundleUUID, err := bundleArgs.Validate()

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/VictoriaMetrics/metrics v1.35.1
 	github.com/cenkalti/backoff v2.2.1+incompatible
 	github.com/ethereum/go-ethereum v1.15.2
-	github.com/flashbots/go-utils v0.8.2
+	github.com/flashbots/go-utils v0.8.4-0.20250314133512-c61cce7f9d3f
 	github.com/google/uuid v1.6.0
 	github.com/hashicorp/golang-lru/v2 v2.0.7
 	github.com/stretchr/testify v1.9.0

go.sum

@@ -38,6 +38,10 @@ github.com/ethereum/go-verkle v0.2.2 h1:I2W0WjnrFUIzzVPwm8ykY+7pL2d4VhlsePn4j7cn
 github.com/ethereum/go-verkle v0.2.2/go.mod h1:M3b90YRnzqKyyzBEWJGqj8Qff4IDeXnzFw0P9bFw3uk=
 github.com/flashbots/go-utils v0.8.2 h1:8JUKd9Cv1CTcp63V03ya+47nflTwBEqZq357iwW4fxQ=
 github.com/flashbots/go-utils v0.8.2/go.mod h1:Lo/nrlC+q8ANgT3e6MKALIJCU+V9qTSgNtoLk/q1uIw=
+github.com/flashbots/go-utils v0.8.3 h1:SRRer7bcQuPyVvKg+CaZtXu9VllYg3q9I9fRN+HilEg=
+github.com/flashbots/go-utils v0.8.3/go.mod h1:Lo/nrlC+q8ANgT3e6MKALIJCU+V9qTSgNtoLk/q1uIw=
+github.com/flashbots/go-utils v0.8.4-0.20250314133512-c61cce7f9d3f h1:wQVYAr5LVFu9bKa3zzRRSOjZUF27/4D6FWxvhoVcQGE=
+github.com/flashbots/go-utils v0.8.4-0.20250314133512-c61cce7f9d3f/go.mod h1:Lo/nrlC+q8ANgT3e6MKALIJCU+V9qTSgNtoLk/q1uIw=
 github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
 github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=

proxy/receiver_api.go

@@ -126,6 +126,18 @@ func (prx *ReceiverProxy) EthSendBundle(ctx context.Context, ethSendBundle rpcty
 
 	if !publicEndpoint {
 		ethSendBundle.SigningAddress = &parsedRequest.signer
+
+		if ethSendBundle.ReplacementUUID != nil {
+			timestampInt := apiNow().UnixMicro()
+			var timestamp uint64
+			if timestampInt < 0 {
+				timestamp = 0
+			} else {
+				timestamp = uint64(timestampInt)
+			}
+
+			ethSendBundle.ReplacementNonce = &timestamp
+		}
 	}
 
 	uniqueKey := ethSendBundle.UniqueKey()

proxy/receiver_proxy_test.go

@@ -269,6 +269,12 @@ func TestProxyBundleRequestWithPeerUpdate(t *testing.T) {
 			}
 		}
 	}()
+	apiNow = func() time.Time {
+		return time.Unix(1730000000, 0)
+	}
+	defer func() {
+		apiNow = time.Now
+	}()
 
 	signer, err := signature.NewSignerFromHexPrivateKey("0xd63b3c447fdea415a05e4c0b859474d14105a88178efdf350bc9f7b05be3cc58")
 	require.NoError(t, err)
@@ -283,8 +289,9 @@ func TestProxyBundleRequestWithPeerUpdate(t *testing.T) {
 	require.NoError(t, err)
 	proxiesUpdatePeers(t)
 
+	blockNumber := hexutil.Uint64(1000)
 	resp, err := client.Call(context.Background(), EthSendBundleMethod, &rpctypes.EthSendBundleArgs{
-		BlockNumber: 1000,
+		BlockNumber: &blockNumber,
 	})
 	require.NoError(t, err)
 	require.Nil(t, resp.Error)
@@ -301,8 +308,9 @@ func TestProxyBundleRequestWithPeerUpdate(t *testing.T) {
 	require.NoError(t, err)
 	proxiesUpdatePeers(t)
 
+	blockNumber = hexutil.Uint64(1001)
 	_, err = client.Call(context.Background(), EthSendBundleMethod, &rpctypes.EthSendBundleArgs{
-		BlockNumber: 1001,
+		BlockNumber: &blockNumber,
 	})
 	require.NoError(t, err)
 
@@ -320,12 +328,15 @@ func TestProxyBundleRequestWithPeerUpdate(t *testing.T) {
 	require.NoError(t, err)
 	proxiesUpdatePeers(t)
 
+	blockNumber = hexutil.Uint64(1002)
+	replacementUUID := "550e8400-e29b-41d4-a716-446655440000"
 	_, err = client.Call(context.Background(), EthSendBundleMethod, &rpctypes.EthSendBundleArgs{
-		BlockNumber: 1002,
+		BlockNumber:     &blockNumber,
+		ReplacementUUID: &replacementUUID,
 	})
 	require.NoError(t, err)
 
-	expectedRequest = `{"method":"eth_sendBundle","params":[{"txs":null,"blockNumber":"0x3ea","signingAddress":"0x9349365494be4f6205e5d44bdc7ec7dcd134becf"}],"id":0,"jsonrpc":"2.0"}`
+	expectedRequest = `{"method":"eth_sendBundle","params":[{"txs":null,"blockNumber":"0x3ea","replacementUuid":"550e8400-e29b-41d4-a716-446655440000","replacementNonce":1730000000000000,"signingAddress":"0x9349365494be4f6205e5d44bdc7ec7dcd134becf"}],"id":0,"jsonrpc":"2.0"}`
 	builderRequest = expectRequest(t, proxies[0].localBuilderRequests)
 	require.Equal(t, expectedRequest, builderRequest.body)
 	builderRequest = expectRequest(t, proxies[1].localBuilderRequests)
@@ -353,15 +364,17 @@ func TestProxySendToArchive(t *testing.T) {
 		apiNow = time.Now
 	}()
 
+	blockNumber := hexutil.Uint64(123)
 	resp, err := client.Call(context.Background(), EthSendBundleMethod, &rpctypes.EthSendBundleArgs{
-		BlockNumber: 123,
+		BlockNumber: &blockNumber,
 	})
 	require.NoError(t, err)
 	require.Nil(t, resp.Error)
 	_ = expectRequest(t, proxies[0].localBuilderRequests)
 
+	blockNumber = hexutil.Uint64(456)
 	resp, err = client.Call(context.Background(), EthSendBundleMethod, &rpctypes.EthSendBundleArgs{
-		BlockNumber: 456,
+		BlockNumber: &blockNumber,
 	})
 	require.NoError(t, err)
 	require.Nil(t, resp.Error)

proxy/sharing.go

@@ -157,12 +157,17 @@ func (sq *ShareQueue) proxyRequests(peer *shareQueuePeer, worker int) {
 		resp, err := peer.client.Call(ctx, method, data)
 		cancel()
 		timeShareQueuePeerRPCDuration(peer.name, time.Since(start).Milliseconds())
+
+		logSendErrorLevel := slog.LevelDebug
+		if peer.name == "local-builder" {
+			logSendErrorLevel = slog.LevelWarn
+		}
 		if err != nil {
-			logger.Debug("Error while proxying request", slog.Any("error", err))
+			logger.Log(context.Background(), logSendErrorLevel, "Error while proxying request", slog.Any("error", err))
 			incShareQueuePeerRPCErrors(peer.name)
 		}
 		if resp != nil && resp.Error != nil {
-			logger.Debug("Error returned from target while proxying", slog.Any("error", resp.Error))
+			logger.Log(context.Background(), logSendErrorLevel, "Error returned from target while proxying", slog.Any("error", resp.Error))
 			incShareQueuePeerRPCErrors(peer.name)
 		}
 		proxiedRequestCount += 1