Multiple BN HTTP resolver

validator/accounts/cli_manager.go

@@ -87,7 +87,10 @@ func (acm *CLIManager) prepareBeaconClients(ctx context.Context) (*iface.Validat
  acm.beaconApiTimeout,
  )
 
- restHandler := beaconApi.NewBeaconApiJsonRestHandler(http.Client{Timeout: acm.beaconApiTimeout}, acm.beaconApiEndpoint)
+ restHandler := beaconApi.NewBeaconApiJsonRestHandler(
+ http.Client{Timeout: acm.beaconApiTimeout},
+ acm.beaconApiEndpoint,
+ )
  validatorClient := validatorClientFactory.NewValidatorClient(conn, restHandler)
  nodeClient := nodeClientFactory.NewNodeClient(conn, restHandler)
 

validator/accounts/testing/mock.go

@@ -249,3 +249,11 @@ func (*Validator) EventStreamIsRunning() bool {
 func (*Validator) HealthTracker() *beacon.NodeHealthTracker {
  panic("implement me")
 }
+
+func (*Validator) RetrieveHost() string {
+ panic("implement me")
+}
+
+func (*Validator) UpdateHost(_ string) {
+ panic("implement me")
+}

validator/client/beacon-api/beacon_api_validator_client.go

@@ -230,3 +230,11 @@ func wrapInMetrics[Resp any](action string, f func() (Resp, error)) (Resp, error
  }
  return resp, err
 }
+
+func (c *beaconApiValidatorClient) RetrieveHost() string {
+ return c.jsonRestHandler.Host()
+}
+
+func (c *beaconApiValidatorClient) UpdateHost(host string) {
+ c.jsonRestHandler.ChangeHost(host)
+}

validator/client/beacon-api/beacon_api_validator_client_test.go

@@ -202,3 +202,32 @@ func TestBeaconApiValidatorClient_ProposeBeaconBlockError(t *testing.T) {
  assert.ErrorContains(t, expectedErr.Error(), err)
  assert.DeepEqual(t, expectedResp, resp)
 }
+
+func TestBeaconApiValidatorClient_Host(t *testing.T) {
+ ctrl := gomock.NewController(t)
+ defer ctrl.Finish()
+
+ hosts := []string{"http://localhost:8080", "http://localhost:8081"}
+ jsonRestHandler := mock.NewMockJsonRestHandler(ctrl)
+ jsonRestHandler.EXPECT().ChangeHost(
+ hosts[0],
+ ).Times(1)
+ jsonRestHandler.EXPECT().Host().Return(
+ hosts[0],
+ ).Times(1)
+
+ validatorClient := beaconApiValidatorClient{jsonRestHandler: jsonRestHandler}
+ validatorClient.UpdateHost(hosts[0])
+ host := validatorClient.RetrieveHost()
+ require.Equal(t, hosts[0], host)
+
+ jsonRestHandler.EXPECT().ChangeHost(
+ hosts[1],
+ ).Times(1)
+ jsonRestHandler.EXPECT().Host().Return(
+ hosts[1],
+ ).Times(1)
+ validatorClient.UpdateHost(hosts[1])
+ host = validatorClient.RetrieveHost()
+ require.Equal(t, hosts[1], host)
+}

validator/client/beacon-api/json_rest_handler.go

@@ -18,6 +18,7 @@ type JsonRestHandler interface {
  Post(ctx context.Context, endpoint string, headers map[string]string, data *bytes.Buffer, resp interface{}) error
  HttpClient() *http.Client
  Host() string
+ ChangeHost(newHost string)
 }
 
 type BeaconApiJsonRestHandler struct {
@@ -33,19 +34,19 @@ func NewBeaconApiJsonRestHandler(client http.Client, host string) JsonRestHandle
  }
 }
 
-// GetHttpClient returns the underlying HTTP client of the handler
-func (c BeaconApiJsonRestHandler) HttpClient() *http.Client {
+// HttpClient returns the underlying HTTP client of the handler
+func (c *BeaconApiJsonRestHandler) HttpClient() *http.Client {
  return &c.client
 }
 
-// GetHost returns the underlying HTTP host
-func (c BeaconApiJsonRestHandler) Host() string {
+// Host returns the underlying HTTP host
+func (c *BeaconApiJsonRestHandler) Host() string {
  return c.host
 }
 
 // Get sends a GET request and decodes the response body as a JSON object into the passed in object.
 // If an HTTP error is returned, the body is decoded as a DefaultJsonError JSON object and returned as the first return value.
-func (c BeaconApiJsonRestHandler) Get(ctx context.Context, endpoint string, resp interface{}) error {
+func (c *BeaconApiJsonRestHandler) Get(ctx context.Context, endpoint string, resp interface{}) error {
  url := c.host + endpoint
  req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
  if err != nil {
@@ -67,7 +68,7 @@ func (c BeaconApiJsonRestHandler) Get(ctx context.Context, endpoint string, resp
 
 // Post sends a POST request and decodes the response body as a JSON object into the passed in object.
 // If an HTTP error is returned, the body is decoded as a DefaultJsonError JSON object and returned as the first return value.
-func (c BeaconApiJsonRestHandler) Post(
+func (c *BeaconApiJsonRestHandler) Post(
  ctx context.Context,
  apiEndpoint string,
  headers map[string]string,
@@ -134,3 +135,7 @@ func decodeResp(httpResp *http.Response, resp interface{}) error {
 
  return nil
 }
+
+func (c *BeaconApiJsonRestHandler) ChangeHost(newHost string) {
+ c.host = newHost
+}

validator/client/grpc-api/grpc_validator_client.go

@@ -142,11 +142,11 @@ func (c *grpcValidatorClient) AggregatedSigAndAggregationBits(
  return c.beaconNodeValidatorClient.AggregatedSigAndAggregationBits(ctx, in)
 }
 
-func (grpcValidatorClient) GetAggregatedSelections(context.Context, []iface.BeaconCommitteeSelection) ([]iface.BeaconCommitteeSelection, error) {
+func (*grpcValidatorClient) GetAggregatedSelections(context.Context, []iface.BeaconCommitteeSelection) ([]iface.BeaconCommitteeSelection, error) {
  return nil, iface.ErrNotSupported
 }
 
-func (grpcValidatorClient) GetAggregatedSyncSelections(context.Context, []iface.SyncCommitteeSelection) ([]iface.SyncCommitteeSelection, error) {
+func (*grpcValidatorClient) GetAggregatedSyncSelections(context.Context, []iface.SyncCommitteeSelection) ([]iface.SyncCommitteeSelection, error) {
  return nil, iface.ErrNotSupported
 }
 
@@ -245,3 +245,12 @@ func (c *grpcValidatorClient) StartEventStream(ctx context.Context, topics []str
 func (c *grpcValidatorClient) EventStreamIsRunning() bool {
  return c.isEventStreamRunning
 }
+
+func (*grpcValidatorClient) RetrieveHost() string {
+ log.Warn(iface.ErrNotSupported)
+ return ""
+}
+
+func (*grpcValidatorClient) UpdateHost(_ string) {
+ log.Warn(iface.ErrNotSupported)
+}

validator/client/iface/validator.go

@@ -68,6 +68,8 @@ type Validator interface {
  SetGraffiti(ctx context.Context, pubKey [fieldparams.BLSPubkeyLength]byte, graffiti []byte) error
  DeleteGraffiti(ctx context.Context, pubKey [fieldparams.BLSPubkeyLength]byte) error
  HealthTracker() *beacon.NodeHealthTracker
+ RetrieveHost() string
+ UpdateHost(host string)
 }
 
 // SigningFunc interface defines a type for the a function that signs a message

validator/client/iface/validator_client.go

@@ -150,4 +150,6 @@ type ValidatorClient interface {
  EventStreamIsRunning() bool
  GetAggregatedSelections(ctx context.Context, selections []BeaconCommitteeSelection) ([]BeaconCommitteeSelection, error)
  GetAggregatedSyncSelections(ctx context.Context, selections []SyncCommitteeSelection) ([]SyncCommitteeSelection, error)
+ RetrieveHost() string
+ UpdateHost(host string)
 }