Update dependencies for deneb beta 5.

services/chaintime/standard/parameters.go

@@ -20,9 +20,9 @@ import (
 )
 
 type parameters struct {
-	logLevel            zerolog.Level
-	genesisTimeProvider eth2client.GenesisTimeProvider
-	specProvider        eth2client.SpecProvider
+	logLevel        zerolog.Level
+	genesisProvider eth2client.GenesisProvider
+	specProvider    eth2client.SpecProvider
 }
 
 // Parameter is the interface for service parameters.
@@ -43,10 +43,10 @@ func WithLogLevel(logLevel zerolog.Level) Parameter {
 	})
 }
 
-// WithGenesisTimeProvider sets the genesis time provider.
-func WithGenesisTimeProvider(provider eth2client.GenesisTimeProvider) Parameter {
+// WithGenesisProvider sets the genesis time provider.
+func WithGenesisProvider(provider eth2client.GenesisProvider) Parameter {
 	return parameterFunc(func(p *parameters) {
-		p.genesisTimeProvider = provider
+		p.genesisProvider = provider
 	})
 }
 
@@ -71,8 +71,8 @@ func parseAndCheckParameters(params ...Parameter) (*parameters, error) {
 	if parameters.specProvider == nil {
 		return nil, errors.New("no spec provider specified")
 	}
-	if parameters.genesisTimeProvider == nil {
-		return nil, errors.New("no genesis time provider specified")
+	if parameters.genesisProvider == nil {
+		return nil, errors.New("no genesis provider specified")
 	}
 
 	return &parameters, nil

services/chaintime/standard/service.go

@@ -18,6 +18,7 @@ import (
 	"time"
 
 	eth2client "github.com/attestantio/go-eth2-client"
+	"github.com/attestantio/go-eth2-client/api"
 	"github.com/attestantio/go-eth2-client/spec/phase0"
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
@@ -49,13 +50,13 @@ func New(ctx context.Context, params ...Parameter) (*Service, error) {
 	// Set logging.
 	log = zerologger.With().Str("service", "chaintime").Str("impl", "standard").Logger().Level(parameters.logLevel)
 
-	genesisTime, err := parameters.genesisTimeProvider.GenesisTime(ctx)
+	genesisResponse, err := parameters.genesisProvider.Genesis(ctx, &api.GenesisOpts{})
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to obtain genesis time")
 	}
-	log.Trace().Time("genesis_time", genesisTime).Msg("Obtained genesis time")
+	log.Trace().Time("genesis_time", genesisResponse.Data.GenesisTime).Msg("Obtained genesis time")
 
-	specResponse, err := parameters.specProvider.Spec(ctx)
+	specResponse, err := parameters.specProvider.Spec(ctx, &api.SpecOpts{})
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to obtain spec")
 	}
@@ -116,7 +117,7 @@ func New(ctx context.Context, params ...Parameter) (*Service, error) {
 	log.Trace().Uint64("epoch", uint64(denebForkEpoch)).Msg("Obtained Deneb fork epoch")
 
 	s := &Service{
-		genesisTime:                  genesisTime,
+		genesisTime:                  genesisResponse.Data.GenesisTime,
 		slotDuration:                 slotDuration,
 		slotsPerEpoch:                slotsPerEpoch,
 		epochsPerSyncCommitteePeriod: epochsPerSyncCommitteePeriod,
@@ -237,7 +238,7 @@ func fetchAltairForkEpoch(ctx context.Context,
 	error,
 ) {
 	// Fetch the fork version.
-	specResponse, err := specProvider.Spec(ctx)
+	specResponse, err := specProvider.Spec(ctx, &api.SpecOpts{})
 	if err != nil {
 		return 0, errors.Wrap(err, "failed to obtain spec")
 	}
@@ -266,7 +267,7 @@ func fetchBellatrixForkEpoch(ctx context.Context,
 	error,
 ) {
 	// Fetch the fork version.
-	specResponse, err := specProvider.Spec(ctx)
+	specResponse, err := specProvider.Spec(ctx, &api.SpecOpts{})
 	if err != nil {
 		return 0, errors.Wrap(err, "failed to obtain spec")
 	}
@@ -295,7 +296,7 @@ func fetchCapellaForkEpoch(ctx context.Context,
 	error,
 ) {
 	// Fetch the fork version.
-	specResponse, err := specProvider.Spec(ctx)
+	specResponse, err := specProvider.Spec(ctx, &api.SpecOpts{})
 	if err != nil {
 		return 0, errors.Wrap(err, "failed to obtain spec")
 	}
@@ -324,7 +325,7 @@ func fetchDenebForkEpoch(ctx context.Context,
 	error,
 ) {
 	// Fetch the fork version.
-	specResponse, err := specProvider.Spec(ctx)
+	specResponse, err := specProvider.Spec(ctx, &api.SpecOpts{})
 	if err != nil {
 		return 0, errors.Wrap(err, "failed to obtain spec")
 	}

services/chaintime/standard/service_test.go

@@ -32,7 +32,7 @@ func TestService(t *testing.T) {
 	slotsPerEpoch := uint64(32)
 	epochsPerSyncCommitteePeriod := uint64(256)
 
-	mockGenesisTimeProvider := mock.NewGenesisTimeProvider(genesisTime)
+	mockGenesisProvider := mock.NewGenesisProvider(genesisTime)
 	mockSpecProvider := mock.NewSpecProvider(slotDuration, slotsPerEpoch, epochsPerSyncCommitteePeriod)
 
 	tests := []struct {
@@ -41,18 +41,18 @@ func TestService(t *testing.T) {
 		err    string
 	}{
 		{
-			name: "GenesisTimeProviderMissing",
+			name: "GenesisProviderMissing",
 			params: []standard.Parameter{
 				standard.WithLogLevel(zerolog.Disabled),
 				standard.WithSpecProvider(mockSpecProvider),
 			},
-			err: "problem with parameters: no genesis time provider specified",
+			err: "problem with parameters: no genesis provider specified",
 		},
 		{
 			name: "SpecProviderMissing",
 			params: []standard.Parameter{
 				standard.WithLogLevel(zerolog.Disabled),
-				standard.WithGenesisTimeProvider(mockGenesisTimeProvider),
+				standard.WithGenesisProvider(mockGenesisProvider),
 			},
 			err: "problem with parameters: no spec provider specified",
 		},
@@ -60,7 +60,7 @@ func TestService(t *testing.T) {
 			name: "Good",
 			params: []standard.Parameter{
 				standard.WithLogLevel(zerolog.Disabled),
-				standard.WithGenesisTimeProvider(mockGenesisTimeProvider),
+				standard.WithGenesisProvider(mockGenesisProvider),
 				standard.WithSpecProvider(mockSpecProvider),
 			},
 		},
@@ -96,10 +96,10 @@ func createService(genesisTime time.Time) (chaintime.Service, time.Duration, uin
 		},
 	}
 
-	mockGenesisTimeProvider := mock.NewGenesisTimeProvider(genesisTime)
+	mockGenesisProvider := mock.NewGenesisProvider(genesisTime)
 	mockSpecProvider := mock.NewSpecProvider(slotDuration, slotsPerEpoch, epochsPerSyncCommitteePeriod)
 	s, err := standard.New(context.Background(),
-		standard.WithGenesisTimeProvider(mockGenesisTimeProvider),
+		standard.WithGenesisProvider(mockGenesisProvider),
 		standard.WithSpecProvider(mockSpecProvider),
 	)
 	return s, slotDuration, slotsPerEpoch, epochsPerSyncCommitteePeriod, forkSchedule, err