remove builder name, make registration cancellable

README.md

@@ -42,14 +42,13 @@ COMMANDS:
    help, h  Shows a list of commands or help for one command
 
 GLOBAL OPTIONS:
-   --local-listen-address value                address to listen on for orderflow proxy API for external users and local operator (default: "127.0.0.1:443")
+   --local-listen-addr value                   address to listen on for orderflow proxy API for external users and local operator (default: "127.0.0.1:443")
    --public-listen-addr value                  address to listen on for orderflow proxy API for other network participants (default: "127.0.0.1:5544")
    --cert-listen-addr value                    address to listen on for orderflow proxy serving its SSL certificate on /cert (default: "127.0.0.1:14727")
    --builder-endpoint value                    address to send local ordeflow to (default: "http://127.0.0.1:8645")
    --rpc-endpoint value                        address of the node RPC that supports eth_blockNumber (default: "http://127.0.0.1:8545")
    --builder-confighub-endpoint value          address of the builder config hub enpoint (directly or throught the cvm-proxy) (default: "http://127.0.0.1:14892")
    --orderflow-archive-endpoint value          address of the ordreflow archive endpoint (block-processor) (default: "http://127.0.0.1:14893")
-   --builder-name value                        name of this builder (same as in confighub) (default: "test-builder")
    --flashbots-orderflow-signer-address value  ordreflow from Flashbots will be signed with this address (default: "0x5015Fa72E34f75A9eC64f44a4Fcf0837919D1bB7")
    --max-request-body-size-bytes value         Maximum size of the request body, if 0 default will be used (default: 0)
    --cert-duration value                       generated certificate duration (default: 8760h0m0s)

cmd/receiver-proxy/main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"context"
 	"log"
 	"net/http"
 	"net/http/pprof"
@@ -20,7 +21,7 @@ import (
 var flags []cli.Flag = []cli.Flag{
 	// input and output
 	&cli.StringFlag{
-		Name:  "local-listen-address",
+		Name:  "local-listen-addr",
 		Value: "127.0.0.1:443",
 		Usage: "address to listen on for orderflow proxy API for external users and local operator",
 	},
@@ -54,11 +55,6 @@ var flags []cli.Flag = []cli.Flag{
 		Value: "http://127.0.0.1:14893",
 		Usage: "address of the ordreflow archive endpoint (block-processor)",
 	},
-	&cli.StringFlag{
-		Name:  "builder-name",
-		Value: "test-builder",
-		Usage: "name of this builder (same as in confighub)",
-	},
 	&cli.StringFlag{
 		Name:  "flashbots-orderflow-signer-address",
 		Value: "0x5015Fa72E34f75A9eC64f44a4Fcf0837919D1bB7",
@@ -175,13 +171,12 @@ func main() {
 			certHosts := cCtx.StringSlice("cert-hosts")
 			builderConfigHubEndpoint := cCtx.String("builder-confighub-endpoint")
 			archiveEndpoint := cCtx.String("orderflow-archive-endpoint")
-			name := cCtx.String("builder-name")
 			flashbotsSignerStr := cCtx.String("flashbots-orderflow-signer-address")
 			flashbotsSignerAddress := eth.HexToAddress(flashbotsSignerStr)
 			maxRequestBodySizeBytes := cCtx.Int64("max-request-body-size-bytes")
 
 			proxyConfig := &proxy.ReceiverProxyConfig{
-				ReceiverProxyConstantConfig: proxy.ReceiverProxyConstantConfig{Log: log, Name: name, FlashbotsSignerAddress: flashbotsSignerAddress},
+				ReceiverProxyConstantConfig: proxy.ReceiverProxyConstantConfig{Log: log, FlashbotsSignerAddress: flashbotsSignerAddress},
 				CertValidDuration:           certDuration,
 				CertHosts:                   certHosts,
 				BuilderConfigHubEndpoint:    builderConfigHubEndpoint,
@@ -196,13 +191,23 @@ func main() {
 				log.Error("Failed to create proxy server", "err", err)
 				return err
 			}
-			err = instance.RegisterSecrets()
+
+			registerContext, registerCancel := context.WithCancel(context.Background())
+			go func() {
+				select {
+				case <-exit:
+					registerCancel()
+				case <-registerContext.Done():
+				}
+			}()
+			err = instance.RegisterSecrets(registerContext)
+			registerCancel()
 			if err != nil {
 				log.Error("Failed to generate and publish secrets", "err", err)
 				return err
 			}
 
-			localListenAddr := cCtx.String("local-listen-address")
+			localListenAddr := cCtx.String("local-listen-addr")
 			publicListenAddr := cCtx.String("public-listen-addr")
 			certListenAddr := cCtx.String("cert-listen-addr")
 

proxy/confighub.go

@@ -3,6 +3,7 @@ package proxy
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -35,12 +36,18 @@ func NewBuilderConfigHub(log *slog.Logger, endpoint string) *BuilderConfigHub {
 	}
 }
 
-func (b *BuilderConfigHub) RegisterCredentials(info ConfighubOrderflowProxyCredentials) error {
+func (b *BuilderConfigHub) RegisterCredentials(ctx context.Context, info ConfighubOrderflowProxyCredentials) error {
 	body, err := json.Marshal(info)
 	if err != nil {
 		return err
 	}
-	resp, err := http.Post(b.endpoint+"/api/l1-builder/v1/register_credentials/orderflow-proxy", "application/json", bytes.NewReader(body))
+	req, err := http.NewRequest(http.MethodPost, b.endpoint+"/api/l1-builder/v1/register_credentials/orderflow-proxy", bytes.NewReader(body))
+	if err != nil {
+		return err
+	}
+	req = req.WithContext(ctx)
+	req.Header.Set("Content-Type", "application/json")
+	resp, err := http.DefaultClient.Do(req)
 	if err != nil {
 		return err
 	}

proxy/proxy.go

@@ -1,6 +1,7 @@
 package proxy
 
 import (
+	"context"
 	"crypto/tls"
 	"log/slog"
 	"net/http"
@@ -51,7 +52,8 @@ type ReceiverProxy struct {
 }
 
 type ReceiverProxyConstantConfig struct {
-	Log                    *slog.Logger
+	Log *slog.Logger
+	// Name is optional field and it used to distringuish multiple proxies when running in the same process in tests
 	Name                   string
 	FlashbotsSignerAddress common.Address
 }
@@ -187,13 +189,16 @@ func (prx *ReceiverProxy) TLSConfig() *tls.Config {
 	}
 }
 
-func (prx *ReceiverProxy) RegisterSecrets() error {
+func (prx *ReceiverProxy) RegisterSecrets(ctx context.Context) error {
 	const maxRetries = 10
 	const timeBetweenRetries = time.Second * 10
 
 	retry := 0
 	for {
-		err := prx.ConfigHub.RegisterCredentials(ConfighubOrderflowProxyCredentials{
+		if ctx.Err() != nil {
+			return ctx.Err()
+		}
+		err := prx.ConfigHub.RegisterCredentials(ctx, ConfighubOrderflowProxyCredentials{
 			TLSCert:            string(prx.PublicCertPEM),
 			EcdsaPubkeyAddress: prx.OrderflowSigner.Address(),
 		})
@@ -207,7 +212,11 @@ func (prx *ReceiverProxy) RegisterSecrets() error {
 			return err
 		}
 		prx.Log.Error("Fail to register credentials", slog.Any("error", err))
-		time.Sleep(timeBetweenRetries)
+		select {
+		case <-ctx.Done():
+			return ctx.Err()
+		case <-time.After(timeBetweenRetries):
+		}
 	}
 }
 

proxy/proxy_test.go

@@ -191,7 +191,7 @@ func createProxy(localBuilder, name string) *ReceiverProxy {
 }
 
 func TestPublishSecrets(t *testing.T) {
-	err := proxies[0].proxy.RegisterSecrets()
+	err := proxies[0].proxy.RegisterSecrets(context.Background())
 	require.NoError(t, err)
 }
 
@@ -262,7 +262,7 @@ func TestProxyBundleRequestWithPeerUpdate(t *testing.T) {
 
 	// we start with no peers
 	builderHubPeers = nil
-	err = proxies[0].proxy.RegisterSecrets()
+	err = proxies[0].proxy.RegisterSecrets(context.Background())
 	require.NoError(t, err)
 	proxiesUpdatePeers(t)
 
@@ -280,7 +280,7 @@ func TestProxyBundleRequestWithPeerUpdate(t *testing.T) {
 	slog.Info("Adding first peer")
 
 	// add one more peer
-	err = proxies[1].proxy.RegisterSecrets()
+	err = proxies[1].proxy.RegisterSecrets(context.Background())
 	require.NoError(t, err)
 	proxiesUpdatePeers(t)
 
@@ -299,7 +299,7 @@ func TestProxyBundleRequestWithPeerUpdate(t *testing.T) {
 	// add another peer
 	slog.Info("Adding second peer")
 
-	err = proxies[2].proxy.RegisterSecrets()
+	err = proxies[2].proxy.RegisterSecrets(context.Background())
 	require.NoError(t, err)
 	proxiesUpdatePeers(t)
 
@@ -325,7 +325,7 @@ func TestProxySendToArchive(t *testing.T) {
 
 	// we start with no peers
 	builderHubPeers = nil
-	err = proxies[0].proxy.RegisterSecrets()
+	err = proxies[0].proxy.RegisterSecrets(context.Background())
 	require.NoError(t, err)
 	proxiesUpdatePeers(t)
 

proxy/sharing.go

@@ -88,7 +88,7 @@ func (sq *ShareQueue) Run() {
 			peers = nil
 			for _, info := range newPeers {
 				// don't send to yourself
-				if info.Name == sq.name {
+				if info.OrderflowProxy.EcdsaPubkeyAddress == sq.signer.Address() {
 					continue
 				}
 				client, err := RPCClientWithCertAndSigner(OrderflowProxyURLFromIP(info.IP), []byte(info.OrderflowProxy.TLSCert), sq.signer)