*: fix inclusion aggregation bits for Electra

app/eth2wrap/httpwrap.go

@@ -11,6 +11,7 @@
 	"io"
 	"net/http"
 	"net/url"
+	"strconv"
 	"sync"
 	"testing"
 	"time"
@@ -26,6 +27,7 @@
 	"github.com/obolnetwork/charon/app/z"
 	"github.com/obolnetwork/charon/eth2util"
 	"github.com/obolnetwork/charon/eth2util/eth2exp"
+	"github.com/obolnetwork/charon/eth2util/statecomm"
 )
 
 // BlockAttestationsProvider is the interface for providing attestations included in blocks.
@@ -37,6 +39,13 @@
 	BlockAttestationsV2(ctx context.Context, stateID string) ([]*spec.VersionedAttestation, error)
 }
 
+// BeaconStateCommitteesProvider is the interface for providing committees for given slot.
+// It is a standard beacon API endpoint not implemented by eth2client.
+// See https://ethereum.github.io/beacon-APIs/#/Beacon/getEpochCommittees.
+type BeaconStateCommitteesProvider interface {
+	BeaconStateCommittees(ctx context.Context, slot uint64) ([]*statecomm.StateCommittee, error)
+}
+
 // NodePeerCountProvider is the interface for providing node peer count.
 // It is a standard beacon API endpoint not implemented by eth2client.
 // See https://ethereum.github.io/beacon-APIs/#/Node/getPeerCount.
@@ -184,7 +193,7 @@
 // See https://ethereum.github.io/beacon-APIs/#/Beacon/getBlockAttestations.
 func (h *httpAdapter) BlockAttestations(ctx context.Context, stateID string) ([]*eth2p0.Attestation, error) {
 	path := fmt.Sprintf("/eth/v1/beacon/blocks/%s/attestations", stateID)
-	respBody, statusCode, err := httpGet(ctx, h.address, path, h.timeout)
+	respBody, statusCode, err := httpGet(ctx, h.address, path, nil, h.timeout)
 	if err != nil {
 		return nil, errors.Wrap(err, "request block attestations")
 	} else if statusCode == http.StatusNotFound {
@@ -205,21 +214,24 @@
 // See https://ethereum.github.io/beacon-APIs/#/Beacon/getBlockAttestationsV2.
 func (h *httpAdapter) BlockAttestationsV2(ctx context.Context, stateID string) ([]*spec.VersionedAttestation, error) {
 	path := fmt.Sprintf("/eth/v2/beacon/blocks/%s/attestations", stateID)
-	resp, err := httpGetRaw(ctx, h.address, path, h.timeout)
+	ctx, cancel := context.WithTimeout(ctx, h.timeout)
+	defer cancel()
+
+	resp, err := httpGetRaw(ctx, h.address, path, nil)
 	if err != nil {
 		return nil, errors.Wrap(err, "request block attestations")
 	}
 	defer resp.Body.Close()
 
-	respBody, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, errors.Wrap(err, "request block attestations body")
-	}
-
 	if resp.StatusCode == http.StatusNotFound {
 		return nil, nil // No block for slot, so no attestations.
 	} else if resp.StatusCode != http.StatusOK {
-		return nil, errors.New("request block attestations failed", z.Int("status", resp.StatusCode), z.Str("body", string(respBody)))
+		return nil, errors.New("request block attestations failed", z.Int("status", resp.StatusCode))
+	}
+
+	respBody, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return nil, errors.Wrap(err, "request block attestations body")
 	}
 
 	version, err := fetchConsensusVersion(resp)
@@ -284,9 +296,35 @@
 	return res, nil
 }
 
+// BeaconStateCommittees returns the attestations included in the requested block.
+// See https://ethereum.github.io/beacon-APIs/#/Beacon/getStateValidators.
+func (h *httpAdapter) BeaconStateCommittees(ctx context.Context, slot uint64) ([]*statecomm.StateCommittee, error) {
+	r := strconv.FormatUint(slot, 10)
+	path := fmt.Sprintf("/eth/v1/beacon/states/%v/committees", r)
+	queryParams := map[string]string{
+		"slot": strconv.FormatUint(slot, 10),
+	}
+	respBody, statusCode, err := httpGet(ctx, h.address, path, queryParams, h.timeout)
+	if err != nil {
+		return nil, errors.Wrap(err, "request state committees for slot", z.Int("status", statusCode), z.U64("slot", slot))
+	}
+
+	if statusCode != http.StatusOK {
+		return nil, errors.New("request state committees for slot failed", z.Int("status", statusCode), z.U64("slot", slot))
+	}
+
+	var res statecomm.StateCommitteesResponse
+	err = json.Unmarshal(respBody, &res)
+	if err != nil {
+		return nil, errors.Wrap(err, "unmarshal state committees", z.Int("status", statusCode), z.U64("slot", slot))
+	}
+
+	return res.Data, nil
+}
+
 // ProposerConfig implements eth2exp.ProposerConfigProvider.
 func (h *httpAdapter) ProposerConfig(ctx context.Context) (*eth2exp.ProposerConfigResponse, error) {
-	respBody, statusCode, err := httpGet(ctx, h.address, "/proposer_config", h.timeout)
+	respBody, statusCode, err := httpGet(ctx, h.address, "/proposer_config", nil, h.timeout)
 	if err != nil {
 		return nil, errors.Wrap(err, "submit sync committee selections")
 	} else if statusCode != http.StatusOK {
@@ -305,7 +343,7 @@
 // See https://ethereum.github.io/beacon-APIs/#/Node/getPeerCount.
 func (h *httpAdapter) NodePeerCount(ctx context.Context) (int, error) {
 	const path = "/eth/v1/node/peer_count"
-	respBody, statusCode, err := httpGet(ctx, h.address, path, h.timeout)
+	respBody, statusCode, err := httpGet(ctx, h.address, path, nil, h.timeout)
 	if err != nil {
 		return 0, errors.Wrap(err, "request beacon node peer count")
 	} else if statusCode != http.StatusOK {
@@ -400,10 +438,7 @@
 }
 
 // httpGetRaw performs a GET request and returns the raw http response or an error.
-func httpGetRaw(ctx context.Context, base string, endpoint string, timeout time.Duration) (*http.Response, error) {
-	ctx, cancel := context.WithTimeout(ctx, timeout)
-	defer cancel()
-
+func httpGetRaw(ctx context.Context, base string, endpoint string, queryParams map[string]string) (*http.Response, error) {
 	addr, err := url.JoinPath(base, endpoint)
 	if err != nil {
 		return nil, errors.Wrap(err, "invalid address")
@@ -419,6 +454,12 @@
 		return nil, errors.Wrap(err, "new GET request with ctx")
 	}
 
+	q := req.URL.Query()
+	for key, val := range queryParams {
+		q.Add(key, val)
+	}
+	req.URL.RawQuery = q.Encode()
+
 	res, err := new(http.Client).Do(req)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to call GET endpoint")
@@ -428,16 +469,19 @@
 }
 
 // httpGet performs a GET request and returns the body and status code or an error.
-func httpGet(ctx context.Context, base string, endpoint string, timeout time.Duration) ([]byte, int, error) {
-	res, err := httpGetRaw(ctx, base, endpoint, timeout)
+func httpGet(ctx context.Context, base string, endpoint string, queryParams map[string]string, timeout time.Duration) ([]byte, int, error) {
+	ctx, cancel := context.WithTimeout(ctx, timeout)
+	defer cancel()
+
+	res, err := httpGetRaw(ctx, base, endpoint, queryParams)
 	if err != nil {
 		return nil, 0, errors.Wrap(err, "failed to read GET response")
 	}
 	defer res.Body.Close()
 
 	data, err := io.ReadAll(res.Body)
 	if err != nil {
-		return nil, 0, errors.Wrap(err, "failed to read GET response body")
+		return nil, res.StatusCode, errors.Wrap(err, "failed to read GET response body")
 	}
 
 	return data, res.StatusCode, nil

app/eth2wrap/lazy.go

@@ -11,6 +11,7 @@
 	eth2p0 "github.com/attestantio/go-eth2-client/spec/phase0"
 
 	"github.com/obolnetwork/charon/eth2util/eth2exp"
+	"github.com/obolnetwork/charon/eth2util/statecomm"
 )
 
 //go:generate mockery --name=Client --output=mocks --outpkg=mocks --case=underscore
@@ -212,6 +213,15 @@
 	return cl.BlockAttestationsV2(ctx, stateID)
 }
 
+func (l *lazy) BeaconStateCommittees(ctx context.Context, slot uint64) ([]*statecomm.StateCommittee, error) {
+	cl, err := l.getOrCreateClient(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	return cl.BeaconStateCommittees(ctx, slot)
+}
+
 func (l *lazy) NodePeerCount(ctx context.Context) (int, error) {
 	cl, err := l.getOrCreateClient(ctx)
 	if err != nil {

app/eth2wrap/multi.go

@@ -9,6 +9,7 @@
 	eth2p0 "github.com/attestantio/go-eth2-client/spec/phase0"
 
 	"github.com/obolnetwork/charon/eth2util/eth2exp"
+	"github.com/obolnetwork/charon/eth2util/statecomm"
 )
 
 // NewMultiForT creates a new mutil client for testing.
@@ -213,6 +214,24 @@
 	return res, err
 }
 
+func (m multi) BeaconStateCommittees(ctx context.Context, slot uint64) ([]*statecomm.StateCommittee, error) {
+	const label = "beacon_state_committees"
+	defer latency(ctx, label, false)()
+
+	res, err := provide(ctx, m.clients, m.fallbacks,
+		func(ctx context.Context, args provideArgs) ([]*statecomm.StateCommittee, error) {
+			return args.client.BeaconStateCommittees(ctx, slot)
+		},
+		nil, m.selector,
+	)
+	if err != nil {
+		incError(label)
+		err = wrapError(ctx, err, label)
+	}
+
+	return res, err
+}
+
 func (m multi) NodePeerCount(ctx context.Context) (int, error) {
 	const label = "node_peer_count"
 	defer latency(ctx, label, false)()

core/signeddata_test.go

@@ -272,7 +272,7 @@ func TestSignedDataSetSignature(t *testing.T) {
 					Version: eth2spec.DataVersionPhase0,
 					Phase0: &eth2p0.Attestation{
 						AggregationBits: testutil.RandomBitList(1),
-						Data:            testutil.RandomAttestationData(),
+						Data:            testutil.RandomAttestationDataPhase0(),
 						Signature:       testutil.RandomEth2Signature(),
 					},
 				},
@@ -285,7 +285,7 @@ func TestSignedDataSetSignature(t *testing.T) {
 					Version: eth2spec.DataVersionAltair,
 					Altair: &eth2p0.Attestation{
 						AggregationBits: testutil.RandomBitList(1),
-						Data:            testutil.RandomAttestationData(),
+						Data:            testutil.RandomAttestationDataPhase0(),
 						Signature:       testutil.RandomEth2Signature(),
 					},
 				},
@@ -298,7 +298,7 @@ func TestSignedDataSetSignature(t *testing.T) {
 					Version: eth2spec.DataVersionBellatrix,
 					Bellatrix: &eth2p0.Attestation{
 						AggregationBits: testutil.RandomBitList(1),
-						Data:            testutil.RandomAttestationData(),
+						Data:            testutil.RandomAttestationDataPhase0(),
 						Signature:       testutil.RandomEth2Signature(),
 					},
 				},
@@ -311,7 +311,7 @@ func TestSignedDataSetSignature(t *testing.T) {
 					Version: eth2spec.DataVersionCapella,
 					Capella: &eth2p0.Attestation{
 						AggregationBits: testutil.RandomBitList(1),
-						Data:            testutil.RandomAttestationData(),
+						Data:            testutil.RandomAttestationDataPhase0(),
 						Signature:       testutil.RandomEth2Signature(),
 					},
 				},
@@ -324,7 +324,7 @@ func TestSignedDataSetSignature(t *testing.T) {
 					Version: eth2spec.DataVersionDeneb,
 					Deneb: &eth2p0.Attestation{
 						AggregationBits: testutil.RandomBitList(1),
-						Data:            testutil.RandomAttestationData(),
+						Data:            testutil.RandomAttestationDataPhase0(),
 						Signature:       testutil.RandomEth2Signature(),
 					},
 				},
@@ -337,7 +337,7 @@ func TestSignedDataSetSignature(t *testing.T) {
 					Version: eth2spec.DataVersionElectra,
 					Electra: &electra.Attestation{
 						AggregationBits: testutil.RandomBitList(1),
-						Data:            testutil.RandomAttestationData(),
+						Data:            testutil.RandomAttestationDataPhase0(),
 						Signature:       testutil.RandomEth2Signature(),
 						CommitteeBits:   testutil.RandomBitVec64(),
 					},
@@ -747,7 +747,7 @@ func TestVersionedSignedProposal(t *testing.T) {
 }
 
 func TestVersionedSignedAggregateAndProofUtilFunctions(t *testing.T) {
-	data := testutil.RandomAttestationData()
+	data := testutil.RandomAttestationDataPhase0()
 	aggregationBits := testutil.RandomBitList(64)
 	type testCase struct {
 		name              string