ssvlabs
diff --git a/‎beacon/goclient/aggregator.go
Lines changed: 9 additions & 7 deletions b/‎beacon/goclient/aggregator.go
Lines changed: 9 additions & 7 deletions
diff --git a/‎beacon/goclient/attest_test.go
Lines changed: 17 additions & 28 deletions b/‎beacon/goclient/attest_test.go
Lines changed: 17 additions & 28 deletions
diff --git a/‎beacon/goclient/current_fork.go
Lines changed: 0 additions & 46 deletions b/‎beacon/goclient/current_fork.go
Lines changed: 0 additions & 46 deletions
diff --git a/‎beacon/goclient/current_fork_test.go
Lines changed: 0 additions & 139 deletions b/‎beacon/goclient/current_fork_test.go
Lines changed: 0 additions & 139 deletions
@@ -30,7 +30,7 @@ func (gc *GoClient) SubmitAggregateSelectionProof(
 	gc.waitToSlotTwoThirds(slot)
 
 	// differ from spec because we need to subscribe to subnet
-	isAggregator := isAggregator(committeeLength, slotSig)
+	isAggregator := gc.isAggregator(committeeLength, slotSig)
 	if !isAggregator {
 		return nil, DataVersionNil, fmt.Errorf("validator is not an aggregator")
 	}
@@ -39,7 +39,9 @@ func (gc *GoClient) SubmitAggregateSelectionProof(
 	if err != nil {
 		return nil, DataVersionNil, fmt.Errorf("failed to get attestation data: %w", err)
 	}
-	if gc.DataVersion(gc.network.EstimatedEpochAtSlot(attData.Slot)) < spec.DataVersionElectra {
+
+	dataVersion, _ := gc.beaconConfig.ForkAtEpoch(gc.getBeaconConfig().EstimatedEpochAtSlot(attData.Slot))
+	if dataVersion < spec.DataVersionElectra {
 		attData.Index = committeeIndex
 	}
 
@@ -188,8 +190,8 @@ func (gc *GoClient) SubmitSignedAggregateSelectionProof(
 //	 committee = get_beacon_committee(state, slot, index)
 //	 modulo = max(1, len(committee) // TARGET_AGGREGATORS_PER_COMMITTEE)
 //	 return bytes_to_uint64(hash(slot_signature)[0:8]) % modulo == 0
-func isAggregator(committeeCount uint64, slotSig []byte) bool {
-	modulo := committeeCount / TargetAggregatorsPerCommittee
+func (gc *GoClient) isAggregator(committeeCount uint64, slotSig []byte) bool {
+	modulo := committeeCount / gc.beaconConfig.TargetAggregatorsPerCommittee
 	if modulo == 0 {
 		// Modulo must be at least 1.
 		modulo = 1
@@ -201,9 +203,9 @@ func isAggregator(committeeCount uint64, slotSig []byte) bool {
 
 // waitToSlotTwoThirds waits until two-third of the slot has transpired (SECONDS_PER_SLOT * 2 / 3 seconds after slot start time)
 func (gc *GoClient) waitToSlotTwoThirds(slot phase0.Slot) {
-	oneThird := gc.network.SlotDurationSec() / 3 /* one third of slot duration */
-
-	finalTime := gc.slotStartTime(slot).Add(2 * oneThird)
+	config := gc.getBeaconConfig()
+	oneInterval := config.IntervalDuration()
+	finalTime := config.GetSlotStartTime(slot).Add(2 * oneInterval)
 	wait := time.Until(finalTime)
 	if wait <= 0 {
 		return
 
@@ -15,12 +15,9 @@ import (
 	"github.com/attestantio/go-eth2-client/spec"
 	"github.com/attestantio/go-eth2-client/spec/phase0"
 	"github.com/sourcegraph/conc/pool"
-	"github.com/ssvlabs/ssv-spec/types"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"
 
-	"github.com/ssvlabs/ssv/operator/slotticker"
-	"github.com/ssvlabs/ssv/protocol/v2/blockchain/beacon"
 	"github.com/ssvlabs/ssv/utils/hashmap"
 )
 
@@ -61,30 +58,36 @@ var (
 		}`),
 		"/eth/v1/beacon/genesis": []byte(`{
 			"data": {
-				"genesis_time": "1695902400",
-				"genesis_validators_root": "0x9143aa7c615a7f7115e2b6aac319c03529df8242ae705fba9df39b79c59fa8b1",
+				"genesis_time": "1606824023",
+				"genesis_validators_root": "0x4b363db94e28612020049ce3795b0252c16c4241df2bc9ef221abde47527c0d0",
 				"genesis_fork_version": "0x00000000"
 			}
 		}`),
 		"/eth/v1/config/spec": []byte(`{
 			"data": {
-				"CONFIG_NAME": "holesky",
+				"CONFIG_NAME": "mainnet",
 				"GENESIS_FORK_VERSION": "0x00000000",
-				"CAPELLA_FORK_VERSION": "0x04017000", 
-				"MIN_GENESIS_TIME": "1695902100",
+				"ALTAIR_FORK_VERSION": "0x01000000",
+				"ALTAIR_FORK_EPOCH": "74240",
+				"BELLATRIX_FORK_VERSION": "0x02000000",
+				"BELLATRIX_FORK_EPOCH": "144896",
+				"CAPELLA_FORK_VERSION": "0x03000000",
+				"CAPELLA_FORK_EPOCH": "194048",
+				"DENEB_FORK_VERSION": "0x04000000",
+				"DENEB_FORK_EPOCH": "269568",
+				"ELECTRA_FORK_VERSION": "0x05000000",
+				"ELECTRA_FORK_EPOCH": "364032",
+				"FULU_FORK_VERSION": "0x06000000",
+				"FULU_FORK_EPOCH": "18446744073709551615",
+				"MIN_GENESIS_TIME": "1606824000",
 				"SECONDS_PER_SLOT": "12",
 				"SLOTS_PER_EPOCH": "32",
 				"EPOCHS_PER_SYNC_COMMITTEE_PERIOD": "256",
 				"SYNC_COMMITTEE_SIZE": "512",
 				"SYNC_COMMITTEE_SUBNET_COUNT": "4",
 				"TARGET_AGGREGATORS_PER_COMMITTEE": "16",
 				"TARGET_AGGREGATORS_PER_SYNC_SUBCOMMITTEE": "16",
-				"INTERVALS_PER_SLOT": "3",
-				"ALTAIR_FORK_EPOCH": "74240",
-				"BELLATRIX_FORK_EPOCH": "144896",
-				"CAPELLA_FORK_EPOCH": "194048",
-				"DENEB_FORK_EPOCH": "269568",
-				"ELECTRA_FORK_EPOCH": "18446744073709551615"
+				"INTERVALS_PER_SLOT": "3"
 			}
 		}`),
 	}
@@ -205,17 +208,10 @@ func TestGoClient_GetAttestationData_Simple(t *testing.T) {
 			t.Context(),
 			zap.NewNop(),
 			Options{
-				Network:        beacon.NewNetwork(types.MainNetwork),
 				BeaconNodeAddr: server.URL,
 				CommonTimeout:  1 * time.Second,
 				LongTimeout:    1 * time.Second,
 			},
-			func() slotticker.SlotTicker {
-				return slotticker.New(zap.NewNop(), slotticker.Config{
-					SlotDuration: 12 * time.Second,
-					GenesisTime:  time.Now(),
-				})
-			},
 		)
 		require.NoError(t, err)
 
@@ -501,18 +497,11 @@ func createClient(
 		ctx,
 		zap.NewNop(),
 		Options{
-			Network:                     beacon.NewNetwork(types.MainNetwork),
 			BeaconNodeAddr:              beaconServerURL,
 			CommonTimeout:               defaultHardTimeout,
 			LongTimeout:                 time.Second,
 			WithWeightedAttestationData: withWeightedAttestationData,
 		},
-		func() slotticker.SlotTicker {
-			return slotticker.New(zap.NewNop(), slotticker.Config{
-				SlotDuration: 12 * time.Second,
-				GenesisTime:  time.Now(),
-			})
-		},
 	)
 	return client, err
 }