Merge branch 'stage' into override-spec-beacon-config

# Conflicts: # beacon/goclient/attest_test.go # beacon/goclient/goclient.go # beacon/goclient/goclient_test.go # beacon/goclient/proposer.go # beacon/goclient/signing.go # cli/operator/node.go # operator/duties/scheduler.go # protocol/v2/blockchain/beacon/client.go
ssvlabs · Jan 21, 2025 · 01e255a · 01e255a
2 parents 2a2d7a7 + c55c696
commit 01e255a
Show file tree

Hide file tree

Showing 24 changed files with 2,690 additions and 154 deletions.
diff --git a/beacon/goclient/aggregator.go b/beacon/goclient/aggregator.go
@@ -41,11 +41,11 @@ func (gc *GoClient) SubmitAggregateSelectionProof(slot phase0.Slot, committeeInd
 	}
 
 	aggDataReqStart := time.Now()
-	aggDataResp, err := gc.client.AggregateAttestation(gc.ctx, &api.AggregateAttestationOpts{
+	aggDataResp, err := gc.multiClient.AggregateAttestation(gc.ctx, &api.AggregateAttestationOpts{
 		Slot:                slot,
 		AttestationDataRoot: root,
 	})
-	recordRequestDuration(gc.ctx, "AggregateAttestation", gc.client.Address(), http.MethodGet, time.Since(aggDataReqStart), err)
+	recordRequestDuration(gc.ctx, "AggregateAttestation", gc.multiClient.Address(), http.MethodGet, time.Since(aggDataReqStart), err)
 	if err != nil {
 		gc.log.Error(clResponseErrMsg,
 			zap.String("api", "AggregateAttestation"),
@@ -79,8 +79,8 @@ func (gc *GoClient) SubmitAggregateSelectionProof(slot phase0.Slot, committeeInd
 // SubmitSignedAggregateSelectionProof broadcasts a signed aggregator msg
 func (gc *GoClient) SubmitSignedAggregateSelectionProof(msg *phase0.SignedAggregateAndProof) error {
 	start := time.Now()
-	err := gc.client.SubmitAggregateAttestations(gc.ctx, []*phase0.SignedAggregateAndProof{msg})
-	recordRequestDuration(gc.ctx, "SubmitAggregateAttestations", gc.client.Address(), http.MethodPost, time.Since(start), err)
+	err := gc.multiClient.SubmitAggregateAttestations(gc.ctx, []*phase0.SignedAggregateAndProof{msg})
+	recordRequestDuration(gc.ctx, "SubmitAggregateAttestations", gc.multiClient.Address(), http.MethodPost, time.Since(start), err)
 	return err
 }
 

diff --git a/beacon/goclient/attest.go b/beacon/goclient/attest.go
@@ -17,11 +17,11 @@ import (
 // AttesterDuties returns attester duties for a given epoch.
 func (gc *GoClient) AttesterDuties(ctx context.Context, epoch phase0.Epoch, validatorIndices []phase0.ValidatorIndex) ([]*eth2apiv1.AttesterDuty, error) {
 	start := time.Now()
-	resp, err := gc.client.AttesterDuties(ctx, &api.AttesterDutiesOpts{
+	resp, err := gc.multiClient.AttesterDuties(ctx, &api.AttesterDutiesOpts{
 		Epoch:   epoch,
 		Indices: validatorIndices,
 	})
-	recordRequestDuration(gc.ctx, "AttesterDuties", gc.client.Address(), http.MethodPost, time.Since(start), err)
+	recordRequestDuration(gc.ctx, "AttesterDuties", gc.multiClient.Address(), http.MethodPost, time.Since(start), err)
 	if err != nil {
 		gc.log.Error(clResponseErrMsg,
 			zap.String("api", "AttesterDuties"),
@@ -61,11 +61,11 @@ func (gc *GoClient) GetAttestationData(slot phase0.Slot, committeeIndex phase0.C
 	// Have to make beacon node request and cache the result.
 	result, err, _ := gc.attestationReqInflight.Do(slot, func() (*phase0.AttestationData, error) {
 		attDataReqStart := time.Now()
-		resp, err := gc.client.AttestationData(gc.ctx, &api.AttestationDataOpts{
+		resp, err := gc.multiClient.AttestationData(gc.ctx, &api.AttestationDataOpts{
 			Slot: slot,
 		})
 
-		recordRequestDuration(gc.ctx, "AttestationData", gc.client.Address(), http.MethodGet, time.Since(attDataReqStart), err)
+		recordRequestDuration(gc.ctx, "AttestationData", gc.multiClient.Address(), http.MethodGet, time.Since(attDataReqStart), err)
 
 		if err != nil {
 			gc.log.Error(clResponseErrMsg,
@@ -123,8 +123,8 @@ func withCommitteeIndex(data *phase0.AttestationData, committeeIndex phase0.Comm
 // SubmitAttestations implements Beacon interface
 func (gc *GoClient) SubmitAttestations(attestations []*phase0.Attestation) error {
 	start := time.Now()
-	err := gc.client.SubmitAttestations(gc.ctx, attestations)
-	recordRequestDuration(gc.ctx, "SubmitAttestations", gc.client.Address(), http.MethodPost, time.Since(start), err)
+	err := gc.multiClient.SubmitAttestations(gc.ctx, attestations)
+	recordRequestDuration(gc.ctx, "SubmitAttestations", gc.multiClient.Address(), http.MethodPost, time.Since(start), err)
 	if err != nil {
 		gc.log.Error(clResponseErrMsg,
 			zap.String("api", "SubmitAttestations"),

diff --git a/beacon/goclient/attest_test.go b/beacon/goclient/attest_test.go
@@ -40,20 +40,6 @@ func TestGoClient_GetAttestationData(t *testing.T) {
 			t.Logf("mock server handling request: %s", r.URL.Path)
 
 			expInitRequests := map[string][]byte{
-				"/eth/v1/node/syncing": []byte(`{
-				  "data": {
-					"head_slot": "4239945",
-					"sync_distance": "1",
-					"is_syncing": false,
-					"is_optimistic": false,
-					"el_offline": false
-				  }
-				}`),
-				"/eth/v1/node/version": []byte(`{
-				  "data": {
-					"version": "Lighthouse/v4.5.0-441fc16/x86_64-linux"
-				  }
-				}`),
 				"/eth/v1/config/spec": []byte(`{
 				  "data": {
 					"CONFIG_NAME": "holesky",
@@ -77,6 +63,20 @@ func TestGoClient_GetAttestationData(t *testing.T) {
 					"genesis_fork_version": "0x01017000"
 				  }
 				}`),
+				"/eth/v1/node/syncing": []byte(`{
+				  "data": {
+					"head_slot": "4239945",
+					"sync_distance": "1",
+					"is_syncing": false,
+					"is_optimistic": false,
+					"el_offline": false
+				  }
+				}`),
+				"/eth/v1/node/version": []byte(`{
+				  "data": {
+					"version": "Lighthouse/v4.5.0-441fc16/x86_64-linux"
+				  }
+				}`),
 			}
 			for reqPath, respData := range expInitRequests {
 				if reqPath == r.URL.Path {

diff --git a/beacon/goclient/committee_subscribe.go b/beacon/goclient/committee_subscribe.go
@@ -12,8 +12,8 @@ import (
 // SubmitBeaconCommitteeSubscriptions is implementation for subscribing committee to subnet (p2p topic)
 func (gc *GoClient) SubmitBeaconCommitteeSubscriptions(ctx context.Context, subscription []*eth2apiv1.BeaconCommitteeSubscription) error {
 	start := time.Now()
-	err := gc.client.SubmitBeaconCommitteeSubscriptions(ctx, subscription)
-	recordRequestDuration(gc.ctx, "SubmitBeaconCommitteeSubscriptions", gc.client.Address(), http.MethodPost, time.Since(start), err)
+	err := gc.multiClient.SubmitBeaconCommitteeSubscriptions(ctx, subscription)
+	recordRequestDuration(gc.ctx, "SubmitBeaconCommitteeSubscriptions", gc.multiClient.Address(), http.MethodPost, time.Since(start), err)
 	if err != nil {
 		gc.log.Error(clResponseErrMsg,
 			zap.String("api", "SubmitBeaconCommitteeSubscriptions"),
@@ -26,8 +26,8 @@ func (gc *GoClient) SubmitBeaconCommitteeSubscriptions(ctx context.Context, subs
 // SubmitSyncCommitteeSubscriptions is implementation for subscribing sync committee to subnet (p2p topic)
 func (gc *GoClient) SubmitSyncCommitteeSubscriptions(ctx context.Context, subscription []*eth2apiv1.SyncCommitteeSubscription) error {
 	start := time.Now()
-	err := gc.client.SubmitSyncCommitteeSubscriptions(ctx, subscription)
-	recordRequestDuration(gc.ctx, "SubmitSyncCommitteeSubscriptions", gc.client.Address(), http.MethodPost, time.Since(start), err)
+	err := gc.multiClient.SubmitSyncCommitteeSubscriptions(ctx, subscription)
+	recordRequestDuration(gc.ctx, "SubmitSyncCommitteeSubscriptions", gc.multiClient.Address(), http.MethodPost, time.Since(start), err)
 	if err != nil {
 		gc.log.Error(clResponseErrMsg,
 			zap.String("api", "SubmitSyncCommitteeSubscriptions"),