Merge pull request #145 from attestantio/per-call-ssz

Support SSZ on a per-call basis.
attestantio · Jun 11, 2024 · ec55dc8 · ec55dc8
2 parents 770ba2b + 2d6d5b4
commit ec55dc8
Show file tree

Hide file tree

Showing 30 changed files with 33 additions and 30 deletions.
diff --git a/http/aggregateattestation.go b/http/aggregateattestation.go
@@ -43,7 +43,7 @@ func (s *Service) AggregateAttestation(ctx context.Context,
 
 	endpoint := "/eth/v1/validator/aggregate_attestation"
 	query := fmt.Sprintf("slot=%d&attestation_data_root=%#x", opts.Slot, opts.AttestationDataRoot)
-	httpResponse, err := s.get(ctx, endpoint, query, &opts.Common)
+	httpResponse, err := s.get(ctx, endpoint, query, &opts.Common, false)
 	if err != nil {
 		return nil, err
 	}

diff --git a/http/attestationdata.go b/http/attestationdata.go
@@ -40,7 +40,7 @@ func (s *Service) AttestationData(ctx context.Context,
 
 	endpoint := "/eth/v1/validator/attestation_data"
 	query := fmt.Sprintf("slot=%d&committee_index=%d", opts.Slot, opts.CommitteeIndex)
-	httpResponse, err := s.get(ctx, endpoint, query, &opts.Common)
+	httpResponse, err := s.get(ctx, endpoint, query, &opts.Common, false)
 	if err != nil {
 		return nil, err
 	}

diff --git a/http/attestationpool.go b/http/attestationpool.go
@@ -40,7 +40,7 @@ func (s *Service) AttestationPool(ctx context.Context,
 
 	endpoint := "/eth/v1/beacon/pool/attestations"
 	query := fmt.Sprintf("slot=%d", opts.Slot)
-	httpResponse, err := s.get(ctx, endpoint, query, &opts.Common)
+	httpResponse, err := s.get(ctx, endpoint, query, &opts.Common, false)
 	if err != nil {
 		return nil, err
 	}

diff --git a/http/beaconblockheader.go b/http/beaconblockheader.go
@@ -38,7 +38,7 @@ func (s *Service) BeaconBlockHeader(ctx context.Context,
 	}
 
 	endpoint := fmt.Sprintf("/eth/v1/beacon/headers/%s", opts.Block)
-	httpResponse, err := s.get(ctx, endpoint, "", &opts.Common)
+	httpResponse, err := s.get(ctx, endpoint, "", &opts.Common, false)
 	if err != nil {
 		return nil, err
 	}

diff --git a/http/beaconblockroot.go b/http/beaconblockroot.go
@@ -46,7 +46,7 @@ func (s *Service) BeaconBlockRoot(ctx context.Context,
 	}
 
 	endpoint := fmt.Sprintf("/eth/v1/beacon/blocks/%s/root", opts.Block)
-	httpResponse, err := s.get(ctx, endpoint, "", &opts.Common)
+	httpResponse, err := s.get(ctx, endpoint, "", &opts.Common, false)
 	if err != nil {
 		return nil, err
 	}

diff --git a/http/beaconcommittees.go b/http/beaconcommittees.go
@@ -47,7 +47,7 @@ func (s *Service) BeaconCommittees(ctx context.Context,
 		query = fmt.Sprintf("epoch=%d", *opts.Epoch)
 	}
 
-	httpResponse, err := s.get(ctx, endpoint, query, &opts.Common)
+	httpResponse, err := s.get(ctx, endpoint, query, &opts.Common, false)
 	if err != nil {
 		return nil, err
 	}

diff --git a/http/beaconstate.go b/http/beaconstate.go
@@ -48,7 +48,7 @@ func (s *Service) BeaconState(ctx context.Context,
 	}
 
 	endpoint := fmt.Sprintf("/eth/v2/debug/beacon/states/%s", opts.State)
-	httpResponse, err := s.get(ctx, endpoint, "", &opts.Common)
+	httpResponse, err := s.get(ctx, endpoint, "", &opts.Common, true)
 	if err != nil {
 		return nil, err
 	}

diff --git a/http/beaconstaterandao.go b/http/beaconstaterandao.go
@@ -41,7 +41,7 @@ func (s *Service) BeaconStateRandao(ctx context.Context, opts *api.BeaconStateRa
 	}
 
 	endpoint := fmt.Sprintf("/eth/v1/beacon/states/%s/randao", opts.State)
-	httpResponse, err := s.get(ctx, endpoint, "", &opts.Common)
+	httpResponse, err := s.get(ctx, endpoint, "", &opts.Common, false)
 	if err != nil {
 		return nil, err
 	}

diff --git a/http/beaconstateroot.go b/http/beaconstateroot.go
@@ -41,7 +41,7 @@ func (s *Service) BeaconStateRoot(ctx context.Context, opts *api.BeaconStateRoot
 	}
 
 	endpoint := fmt.Sprintf("/eth/v1/beacon/states/%s/root", opts.State)
-	httpResponse, err := s.get(ctx, endpoint, "", &opts.Common)
+	httpResponse, err := s.get(ctx, endpoint, "", &opts.Common, false)
 	if err != nil {
 		return nil, err
 	}

diff --git a/http/blindedproposal.go b/http/blindedproposal.go
@@ -63,7 +63,7 @@ func (s *Service) BlindedProposal(ctx context.Context,
 		query = fmt.Sprintf("%s&skip_randao_verification", query)
 	}
 
-	res, err := s.get(ctx, endpoint, query, &opts.Common)
+	res, err := s.get(ctx, endpoint, query, &opts.Common, true)
 	if err != nil {
 		return nil, errors.Join(errors.New("failed to request blinded beacon block proposal"), err)
 	}

diff --git a/http/blobsidecars.go b/http/blobsidecars.go
@@ -42,7 +42,7 @@ func (s *Service) BlobSidecars(ctx context.Context,
 	}
 
 	endpoint := fmt.Sprintf("/eth/v1/beacon/blob_sidecars/%s", opts.Block)
-	httpResponse, err := s.get(ctx, endpoint, "", &opts.Common)
+	httpResponse, err := s.get(ctx, endpoint, "", &opts.Common, true)
 	if err != nil {
 		return nil, err
 	}

diff --git a/http/depositcontract.go b/http/depositcontract.go
@@ -59,7 +59,7 @@ func (s *Service) DepositContract(ctx context.Context,
 
 	// Up to us to fetch the information.
 	endpoint := "/eth/v1/config/deposit_contract"
-	httpResponse, err := s.get(ctx, endpoint, "", &opts.Common)
+	httpResponse, err := s.get(ctx, endpoint, "", &opts.Common, false)
 	if err != nil {
 		return nil, err
 	}

diff --git a/http/finality.go b/http/finality.go
@@ -38,7 +38,7 @@ func (s *Service) Finality(ctx context.Context,
 	}
 
 	endpoint := fmt.Sprintf("/eth/v1/beacon/states/%s/finality_checkpoints", opts.State)
-	httpResponse, err := s.get(ctx, endpoint, "", &opts.Common)
+	httpResponse, err := s.get(ctx, endpoint, "", &opts.Common, false)
 	if err != nil {
 		return nil, err
 	}

diff --git a/http/fork.go b/http/fork.go
@@ -42,7 +42,7 @@ func (s *Service) Fork(ctx context.Context,
 	}
 
 	endpoint := fmt.Sprintf("/eth/v1/beacon/states/%s/fork", opts.State)
-	httpResponse, err := s.get(ctx, endpoint, "", &opts.Common)
+	httpResponse, err := s.get(ctx, endpoint, "", &opts.Common, false)
 	if err != nil {
 		return nil, err
 	}

diff --git a/http/forkchoice.go b/http/forkchoice.go
@@ -39,7 +39,7 @@ func (s *Service) ForkChoice(ctx context.Context,
 	}
 
 	endpoint := "/eth/v1/debug/fork_choice"
-	httpResponse, err := s.get(ctx, endpoint, "", &opts.Common)
+	httpResponse, err := s.get(ctx, endpoint, "", &opts.Common, false)
 	if err != nil {
 		return nil, err
 	}

diff --git a/http/forkschedule.go b/http/forkschedule.go
@@ -59,7 +59,7 @@ func (s *Service) ForkSchedule(ctx context.Context,
 
 	// Up to us to fetch the information.
 	endpoint := "/eth/v1/config/fork_schedule"
-	httpResponse, err := s.get(ctx, endpoint, "", &opts.Common)
+	httpResponse, err := s.get(ctx, endpoint, "", &opts.Common, false)
 	if err != nil {
 		return nil, err
 	}

diff --git a/http/genesis.go b/http/genesis.go
@@ -65,7 +65,7 @@ func (s *Service) Genesis(ctx context.Context,
 
 	// Up to us to fetch the information.
 	endpoint := "/eth/v1/beacon/genesis"
-	httpResponse, err := s.get(ctx, endpoint, "", &opts.Common)
+	httpResponse, err := s.get(ctx, endpoint, "", &opts.Common, false)
 	if err != nil {
 		return nil, errors.Join(errors.New("failed to request genesis"), err)
 	}

diff --git a/http/http.go b/http/http.go
@@ -284,10 +284,13 @@ type httpResponse struct {
 }
 
 // get sends an HTTP get request and returns the response.
+//
+//nolint:revive
 func (s *Service) get(ctx context.Context,
 	endpoint string,
 	query string,
 	opts *api.CommonOpts,
+	supportsSSZ bool,
 ) (
 	*httpResponse,
 	error,
@@ -318,7 +321,7 @@ func (s *Service) get(ctx context.Context,
 	}
 
 	s.addExtraHeaders(req)
-	if s.enforceJSON {
+	if s.enforceJSON || !supportsSSZ {
 		// JSON only.
 		req.Header.Set("Accept", "application/json")
 	} else {

diff --git a/http/nodepeers.go b/http/nodepeers.go
@@ -46,7 +46,7 @@ func (s *Service) NodePeers(ctx context.Context, opts *api.NodePeersOpts) (*api.
 		query = strings.Join(additionalFields, "&")
 	}
 
-	httpResponse, err := s.get(ctx, endpoint, query, &opts.Common)
+	httpResponse, err := s.get(ctx, endpoint, query, &opts.Common, false)
 	if err != nil {
 		return nil, err
 	}

diff --git a/http/nodesyncing.go b/http/nodesyncing.go
@@ -31,7 +31,7 @@ func (s *Service) NodeSyncing(ctx context.Context, opts *api.NodeSyncingOpts) (*
 	}
 
 	endpoint := "/eth/v1/node/syncing"
-	httpResponse, err := s.get(ctx, endpoint, "", &opts.Common)
+	httpResponse, err := s.get(ctx, endpoint, "", &opts.Common, false)
 	if err != nil {
 		return nil, err
 	}

diff --git a/http/nodeversion.go b/http/nodeversion.go
@@ -60,7 +60,7 @@ func (s *Service) NodeVersion(ctx context.Context,
 
 	// Up to us to fetch the information.
 	endpoint := "/eth/v1/node/version"
-	httpResponse, err := s.get(ctx, endpoint, "", &opts.Common)
+	httpResponse, err := s.get(ctx, endpoint, "", &opts.Common, false)
 	if err != nil {
 		return nil, err
 	}

diff --git a/http/proposal.go b/http/proposal.go
@@ -74,7 +74,7 @@ func (s *Service) Proposal(ctx context.Context,
 		query = fmt.Sprintf("%s&builder_boost_factor=%d", query, *opts.BuilderBoostFactor)
 	}
 
-	httpResponse, err := s.get(ctx, endpoint, query, &opts.Common)
+	httpResponse, err := s.get(ctx, endpoint, query, &opts.Common, true)
 	if err != nil {
 		return nil, errors.Join(errors.New("failed to request beacon block proposal"), err)
 	}

diff --git a/http/proposerduties.go b/http/proposerduties.go
@@ -40,7 +40,7 @@ func (s *Service) ProposerDuties(ctx context.Context,
 	}
 
 	endpoint := fmt.Sprintf("/eth/v1/validator/duties/proposer/%d", opts.Epoch)
-	httpResponse, err := s.get(ctx, endpoint, "", &opts.Common)
+	httpResponse, err := s.get(ctx, endpoint, "", &opts.Common, false)
 	if err != nil {
 		return nil, err
 	}

diff --git a/http/signedbeaconblock.go b/http/signedbeaconblock.go
@@ -45,7 +45,7 @@ func (s *Service) SignedBeaconBlock(ctx context.Context,
 	}
 
 	endpoint := fmt.Sprintf("/eth/v2/beacon/blocks/%s", opts.Block)
-	httpResponse, err := s.get(ctx, endpoint, "", &opts.Common)
+	httpResponse, err := s.get(ctx, endpoint, "", &opts.Common, true)
 	if err != nil {
 		return nil, err
 	}

diff --git a/http/spec.go b/http/spec.go
@@ -63,7 +63,7 @@ func (s *Service) Spec(ctx context.Context,
 
 	// Up to us to fetch the information.
 	endpoint := "/eth/v1/config/spec"
-	httpResponse, err := s.get(ctx, endpoint, "", &opts.Common)
+	httpResponse, err := s.get(ctx, endpoint, "", &opts.Common, false)
 	if err != nil {
 		return nil, err
 	}

diff --git a/http/synccommittee.go b/http/synccommittee.go
@@ -47,7 +47,7 @@ func (s *Service) SyncCommittee(ctx context.Context,
 		query = fmt.Sprintf("epoch=%d", *opts.Epoch)
 	}
 
-	httpResponse, err := s.get(ctx, endpoint, query, &opts.Common)
+	httpResponse, err := s.get(ctx, endpoint, query, &opts.Common, false)
 	if err != nil {
 		return nil, err
 	}

diff --git a/http/synccommitteecontribution.go b/http/synccommitteecontribution.go
@@ -47,7 +47,7 @@ func (s *Service) SyncCommitteeContribution(ctx context.Context,
 		opts.SubcommitteeIndex,
 		opts.BeaconBlockRoot,
 	)
-	httpResponse, err := s.get(ctx, endpoint, query, &opts.Common)
+	httpResponse, err := s.get(ctx, endpoint, query, &opts.Common, false)
 	if err != nil {
 		return nil, err
 	}

diff --git a/http/validatorbalances.go b/http/validatorbalances.go
@@ -57,7 +57,7 @@ func (s *Service) ValidatorBalances(ctx context.Context,
 		query = "id=" + strings.Join(ids, ",")
 	}
 
-	httpResponse, err := s.get(ctx, endpoint, query, &opts.Common)
+	httpResponse, err := s.get(ctx, endpoint, query, &opts.Common, false)
 	if err != nil {
 		return nil, err
 	}

diff --git a/http/validators.go b/http/validators.go
@@ -163,7 +163,7 @@ func (s *Service) Validators(ctx context.Context,
 		}
 	}
 
-	httpResponse, err := s.get(ctx, endpoint, query, &opts.Common)
+	httpResponse, err := s.get(ctx, endpoint, query, &opts.Common, false)
 	if err != nil {
 		return nil, errors.Join(errors.New("failed to request validators"), err)
 	}

diff --git a/http/voluntaryexitpool.go b/http/voluntaryexitpool.go
@@ -43,7 +43,7 @@ func (s *Service) VoluntaryExitPool(ctx context.Context,
 	}
 
 	endpoint := "/eth/v1/beacon/pool/voluntary_exits"
-	httpResponse, err := s.get(ctx, endpoint, "", &opts.Common)
+	httpResponse, err := s.get(ctx, endpoint, "", &opts.Common, false)
 	if err != nil {
 		return nil, errors.Join(errors.New("failed to request voluntary exit pool"), err)
 	}