*: fix compatibility with latest go-eth2-client

app/app.go

@@ -809,10 +809,12 @@
 	}
 
 	// Check BN chain/network.
-	schedule, err := eth2Cl.ForkSchedule(ctx)
+	eth2Resp, err := eth2Cl.ForkSchedule(ctx)
 	if err != nil {
 		return nil, errors.Wrap(err, "fetch fork schedule")
 	}
+	schedule := eth2Resp.Data
+
 	var ok bool
 	for _, fork := range schedule {
 		if bytes.Equal(fork.CurrentVersion[:], forkVersion) {

app/eth2wrap/eth2wrap.go

@@ -10,6 +10,7 @@
 	"sync"
 	"time"
 
+	eth2api "github.com/attestantio/go-eth2-client/api"
 	eth2http "github.com/attestantio/go-eth2-client/http"
 	"github.com/attestantio/go-eth2-client/spec/bellatrix"
 	eth2p0 "github.com/attestantio/go-eth2-client/spec/phase0"
@@ -329,12 +330,12 @@
 // wrapError returns the error as a wrapped structured error.
 func wrapError(ctx context.Context, err error, label string, fields ...z.Field) error {
 	// Decompose go-eth2-client http errors
-	if e2err := new(eth2http.Error); errors.As(err, e2err) {
+	if apiErr := new(eth2api.Error); errors.As(err, apiErr) {
 		err = errors.New("nok http response",
-			z.Int("status_code", e2err.StatusCode),
-			z.Str("endpoint", e2err.Endpoint),
-			z.Str("method", e2err.Method),
-			z.Str("data", string(e2err.Data)),
+			z.Int("status_code", apiErr.StatusCode),
+			z.Str("endpoint", apiErr.Endpoint),
+			z.Str("method", apiErr.Method),
+			z.Str("data", string(apiErr.Data)),
 		)
 	}
 

app/eth2wrap/eth2wrap_test.go

@@ -160,7 +160,7 @@ func TestSyncState(t *testing.T) {
 
 	resp, err := eth2Cl.NodeSyncing(context.Background())
 	require.NoError(t, err)
-	require.False(t, resp.IsSyncing)
+	require.False(t, resp.Data.IsSyncing)
 }
 
 func TestErrors(t *testing.T) {
@@ -203,18 +203,6 @@ func TestErrors(t *testing.T) {
 		require.ErrorContains(t, err, "beacon api slots_per_epoch: context canceled")
 	})
 
-	t.Run("go-eth2-client http error", func(t *testing.T) {
-		bmock, err := beaconmock.New()
-		require.NoError(t, err)
-		eth2Cl, err := eth2wrap.NewMultiHTTP(time.Second, bmock.Address())
-		require.NoError(t, err)
-
-		_, err = eth2Cl.AggregateAttestation(ctx, 0, eth2p0.Root{})
-		log.Error(ctx, "See this error log for fields", err)
-		require.Error(t, err)
-		require.ErrorContains(t, err, "beacon api aggregate_attestation: nok http response")
-	})
-
 	t.Run("zero net op error", func(t *testing.T) {
 		bmock, err := beaconmock.New()
 		require.NoError(t, err)

app/eth2wrap/success.go

@@ -3,16 +3,17 @@
 package eth2wrap
 
 import (
+	"github.com/attestantio/go-eth2-client/api"
 	apiv1 "github.com/attestantio/go-eth2-client/api/v1"
 	"github.com/attestantio/go-eth2-client/spec/phase0"
 )
 
-// isSyncStateOk returns tue if the sync state is not syncing.
-func isSyncStateOk(s *apiv1.SyncState) bool {
-	return !s.IsSyncing
+// isSyncStateOk returns true if the sync state is not syncing.
+func isSyncStateOk(resp *api.Response[*apiv1.SyncState]) bool {
+	return !resp.Data.IsSyncing
 }
 
 // isAggregateAttestationOk returns true if the aggregate attestation is not nil (which can happen if the subscription wasn't successful).
-func isAggregateAttestationOk(att *phase0.Attestation) bool {
-	return att != nil
+func isAggregateAttestationOk(resp *api.Response[*phase0.Attestation]) bool {
+	return resp.Data != nil
 }