hardcoded vroot in rpc p2p and slasher

prysmaticlabs · Aug 30, 2024 · 31359a5 · 31359a5
1 parent 93e6bd7
commit 31359a5
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 15 deletions.
diff --git a/beacon-chain/p2p/service.go b/beacon-chain/p2p/service.go
@@ -413,8 +413,7 @@ func (s *Service) awaitStateInitialized() {
 		log.WithError(err).Fatal("failed to receive initial genesis data")
 	}
 	s.genesisTime = clock.GenesisTime()
-	gvr := clock.GenesisValidatorsRoot()
-	s.genesisValidatorsRoot = gvr[:]
+	s.genesisValidatorsRoot = params.BeaconConfig().GenesisValidatorsRoot[:]
 	_, err = s.currentForkDigest() // initialize fork digest cache
 	if err != nil {
 		log.WithError(err).Error("Could not initialize fork digest")

diff --git a/beacon-chain/rpc/eth/rewards/handlers_test.go b/beacon-chain/rpc/eth/rewards/handlers_test.go
@@ -119,7 +119,7 @@ func BlockRewardTestSetup(t *testing.T, forkName string) (state.BeaconState, int
 
 	attData1 := util.HydrateAttestationData(&eth.AttestationData{BeaconBlockRoot: bytesutil.PadTo([]byte("root1"), 32)})
 	attData2 := util.HydrateAttestationData(&eth.AttestationData{BeaconBlockRoot: bytesutil.PadTo([]byte("root2"), 32)})
-	domain, err := signing.Domain(st.Fork(), 0, params.BeaconConfig().DomainBeaconAttester, st.GenesisValidatorsRoot())
+	domain, err := signing.Domain(st.Fork(), 0, params.BeaconConfig().DomainBeaconAttester, params.BeaconConfig().GenesisValidatorsRoot[:])
 	require.NoError(t, err)
 	sigRoot1, err := signing.ComputeSigningRoot(attData1, domain)
 	require.NoError(t, err)
@@ -153,7 +153,7 @@ func BlockRewardTestSetup(t *testing.T, forkName string) (state.BeaconState, int
 		StateRoot:     bytesutil.PadTo([]byte("root2"), 32),
 		BodyRoot:      bytesutil.PadTo([]byte("root2"), 32),
 	}
-	domain, err = signing.Domain(st.Fork(), 0, params.BeaconConfig().DomainBeaconProposer, st.GenesisValidatorsRoot())
+	domain, err = signing.Domain(st.Fork(), 0, params.BeaconConfig().DomainBeaconProposer, params.BeaconConfig().GenesisValidatorsRoot[:])
 	require.NoError(t, err)
 	sigRoot1, err = signing.ComputeSigningRoot(header1, domain)
 	require.NoError(t, err)
@@ -174,7 +174,7 @@ func BlockRewardTestSetup(t *testing.T, forkName string) (state.BeaconState, int
 	scBits := bitfield.NewBitvector512()
 	scBits.SetBitAt(10, true)
 	scBits.SetBitAt(100, true)
-	domain, err = signing.Domain(st.Fork(), 0, params.BeaconConfig().DomainSyncCommittee, st.GenesisValidatorsRoot())
+	domain, err = signing.Domain(st.Fork(), 0, params.BeaconConfig().DomainSyncCommittee, params.BeaconConfig().GenesisValidatorsRoot[:])
 	require.NoError(t, err)
 	sszBytes := primitives.SSZBytes(slot0bRoot)
 	r, err := signing.ComputeSigningRoot(&sszBytes, domain)
@@ -701,7 +701,7 @@ func TestSyncCommiteeRewards(t *testing.T) {
 	for i := uint64(0); i < fieldparams.SyncCommitteeLength-10; i++ {
 		scBits.SetBitAt(i, true)
 	}
-	domain, err := signing.Domain(st.Fork(), 0, params.BeaconConfig().DomainSyncCommittee, st.GenesisValidatorsRoot())
+	domain, err := signing.Domain(st.Fork(), 0, params.BeaconConfig().DomainSyncCommittee, params.BeaconConfig().GenesisValidatorsRoot[:])
 	require.NoError(t, err)
 	sszBytes := primitives.SSZBytes("")
 	r, err := signing.ComputeSigningRoot(&sszBytes, domain)

diff --git a/beacon-chain/rpc/prysm/v1alpha1/node/server.go b/beacon-chain/rpc/prysm/v1alpha1/node/server.go
@@ -20,6 +20,7 @@ import (
 	"github.com/prysmaticlabs/prysm/v5/beacon-chain/execution"
 	"github.com/prysmaticlabs/prysm/v5/beacon-chain/p2p"
 	"github.com/prysmaticlabs/prysm/v5/beacon-chain/sync"
+	"github.com/prysmaticlabs/prysm/v5/config/params"
 	"github.com/prysmaticlabs/prysm/v5/io/logs"
 	"github.com/prysmaticlabs/prysm/v5/monitoring/tracing/trace"
 	ethpb "github.com/prysmaticlabs/prysm/v5/proto/prysm/v1alpha1"
@@ -101,11 +102,11 @@ func (ns *Server) GetGenesis(ctx context.Context, _ *empty.Empty) (*ethpb.Genesi
 		gt = timestamppb.New(genesisTime)
 	}
 
-	genValRoot := ns.GenesisFetcher.GenesisValidatorsRoot()
+	genValRoot := params.BeaconConfig().GenesisValidatorsRoot[:]
 	return &ethpb.Genesis{
 		GenesisTime:            gt,
 		DepositContractAddress: contractAddr,
-		GenesisValidatorsRoot:  genValRoot[:],
+		GenesisValidatorsRoot:  genValRoot,
 	}, nil
 }
 

diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/server.go b/beacon-chain/rpc/prysm/v1alpha1/validator/server.go
@@ -188,7 +188,7 @@ func (vs *Server) WaitForChainStart(_ *emptypb.Empty, stream ethpb.BeaconNodeVal
 		res := &ethpb.ChainStartResponse{
 			Started:               true,
 			GenesisTime:           head.GenesisTime(),
-			GenesisValidatorsRoot: head.GenesisValidatorsRoot(),
+			GenesisValidatorsRoot: params.BeaconConfig().GenesisValidatorsRoot[:],
 		}
 		return stream.Send(res)
 	}
@@ -199,11 +199,10 @@ func (vs *Server) WaitForChainStart(_ *emptypb.Empty, stream ethpb.BeaconNodeVal
 	}
 	log.WithField("startTime", clock.GenesisTime()).Debug("Received chain started event")
 	log.Debug("Sending genesis time notification to connected validator clients")
-	gvr := clock.GenesisValidatorsRoot()
 	res := &ethpb.ChainStartResponse{
 		Started:               true,
 		GenesisTime:           uint64(clock.GenesisTime().Unix()),
-		GenesisValidatorsRoot: gvr[:],
+		GenesisValidatorsRoot: params.BeaconConfig().GenesisValidatorsRoot[:],
 	}
 	return stream.Send(res)
 }

diff --git a/beacon-chain/slasher/detect_attestations_test.go b/beacon-chain/slasher/detect_attestations_test.go
@@ -617,7 +617,7 @@ func Test_processAttestations(t *testing.T) {
 				beaconState.Fork(),
 				0,
 				params.BeaconConfig().DomainBeaconAttester,
-				beaconState.GenesisValidatorsRoot(),
+				params.BeaconConfig().GenesisValidatorsRoot[:],
 			)
 			require.NoError(t, err)
 

diff --git a/beacon-chain/slasher/detect_blocks_test.go b/beacon-chain/slasher/detect_blocks_test.go
@@ -95,7 +95,7 @@ func Test_processQueuedBlocks_DetectsDoubleProposals(t *testing.T) {
 				beaconState.Fork(),
 				0,
 				params.BeaconConfig().DomainBeaconProposer,
-				beaconState.GenesisValidatorsRoot(),
+				params.BeaconConfig().GenesisValidatorsRoot[:],
 			)
 			require.NoError(t, err)
 

diff --git a/beacon-chain/slasher/process_slashings_test.go b/beacon-chain/slasher/process_slashings_test.go
@@ -63,7 +63,7 @@ func TestService_processAttesterSlashings(t *testing.T) {
 		beaconState.Fork(),
 		0,
 		params.BeaconConfig().DomainBeaconAttester,
-		beaconState.GenesisValidatorsRoot(),
+		params.BeaconConfig().GenesisValidatorsRoot[:],
 	)
 	require.NoError(t, err)
 	signingRoot, err := signing.ComputeSigningRoot(firstAtt.Data, domain)
@@ -197,7 +197,7 @@ func TestService_processProposerSlashings(t *testing.T) {
 		beaconState.Fork(),
 		0,
 		params.BeaconConfig().DomainBeaconProposer,
-		beaconState.GenesisValidatorsRoot(),
+		params.BeaconConfig().GenesisValidatorsRoot[:],
 	)
 	require.NoError(t, err)
 	htr, err := firstBlockHeader.Header.HashTreeRoot()