add in interfaces

beacon-chain/core/altair/epoch_precompute.go

@@ -270,6 +270,7 @@ func AttestationsDelta(beaconState state.BeaconState, bal *precompute.Balance, v
 	// Modified in Altair and Bellatrix.
 	var inactivityDenominator uint64
 	bias := cfg.InactivityScoreBias
+	inactivityDenominator := bias * beaconState.InactivityPenaltyQuotient()
 	switch beaconState.Version() {
 	case version.Altair:
 		inactivityDenominator = bias * cfg.InactivityPenaltyQuotientAltair

beacon-chain/deterministic-genesis/service.go

@@ -47,18 +47,14 @@ type Config struct {
 // into the beacon chain database and running services at start up. This service should not be used in production
 // as it does not have any value other than ease of use for testing purposes.
 func NewService(ctx context.Context, cfg *Config) *Service {
+	log.Warn("Saving generated genesis state in database for interop testing")
 	ctx, cancel := context.WithCancel(ctx)
 
-	return &Service{
+	s := &Service{
 		cfg:    cfg,
 		ctx:    ctx,
 		cancel: cancel,
 	}
-}
-
-// Start initializes the genesis state from configured flags.
-func (s *Service) Start() {
-	log.Warn("Saving generated genesis state in database for interop testing")
 
 	if s.cfg.GenesisPath != "" {
 		data, err := ioutil.ReadFile(s.cfg.GenesisPath)
@@ -73,14 +69,14 @@ func (s *Service) Start() {
 		if err != nil {
 			log.Fatalf("Could not get state trie: %v", err)
 		}
-		if err := s.saveGenesisState(s.ctx, genesisTrie); err != nil {
+		if err := s.saveGenesisState(ctx, genesisTrie); err != nil {
 			log.Fatalf("Could not save interop genesis state %v", err)
 		}
-		return
+		return s
 	}
 
 	// Save genesis state in db
-	genesisState, _, err := interop.GenerateGenesisState(s.ctx, s.cfg.GenesisTime, s.cfg.NumValidators)
+	genesisState, _, err := interop.GenerateGenesisState(ctx, s.cfg.GenesisTime, s.cfg.NumValidators)
 	if err != nil {
 		log.Fatalf("Could not generate interop genesis state: %v", err)
 	}
@@ -96,11 +92,17 @@ func (s *Service) Start() {
 	if err != nil {
 		log.Fatalf("Could not hash tree root genesis state: %v", err)
 	}
-	go slots.CountdownToGenesis(s.ctx, time.Unix(int64(s.cfg.GenesisTime), 0), s.cfg.NumValidators, gRoot)
+	go slots.CountdownToGenesis(ctx, time.Unix(int64(s.cfg.GenesisTime), 0), s.cfg.NumValidators, gRoot)
 
-	if err := s.saveGenesisState(s.ctx, genesisTrie); err != nil {
+	if err := s.saveGenesisState(ctx, genesisTrie); err != nil {
 		log.Fatalf("Could not save interop genesis state %v", err)
 	}
+
+	return s
+}
+
+// Start initializes the genesis state from configured flags.
+func (_ *Service) Start() {
 }
 
 // Stop does nothing.

beacon-chain/monitor/service.go

@@ -95,7 +95,6 @@ func NewService(ctx context.Context, config *ValidatorMonitorConfig, tracked []t
 		latestPerformance:           make(map[types.ValidatorIndex]ValidatorLatestPerformance),
 		aggregatedPerformance:       make(map[types.ValidatorIndex]ValidatorAggregatedPerformance),
 		trackedSyncCommitteeIndices: make(map[types.ValidatorIndex][]types.CommitteeIndex),
-		isLogging:                   false,
 	}
 	for _, idx := range tracked {
 		r.TrackedValidators[idx] = true
@@ -118,6 +117,7 @@ func (s *Service) Start() {
 		"ValidatorIndices": tracked,
 	}).Info("Starting service")
 
+	s.isLogging = false
 	stateChannel := make(chan *feed.Event, 1)
 	stateSub := s.config.StateNotifier.StateFeed().Subscribe(stateChannel)
 

beacon-chain/node/node.go

@@ -906,7 +906,6 @@ func (b *BeaconNode) registerDeterminsticGenesisService() error {
 			DepositCache:  b.depositCache,
 			GenesisPath:   genesisStatePath,
 		})
-		svc.Start()
 
 		// Register genesis state as start-up state when interop mode.
 		// The start-up state gets reused across services.

beacon-chain/rpc/service.go

@@ -116,14 +116,21 @@ type Config struct {
 // be registered into a running beacon node.
 func NewService(ctx context.Context, cfg *Config) *Service {
 	ctx, cancel := context.WithCancel(ctx)
-	s := &Service{
+	return &Service{
 		cfg:                 cfg,
 		ctx:                 ctx,
 		cancel:              cancel,
 		incomingAttestation: make(chan *ethpbv1alpha1.Attestation, params.BeaconConfig().DefaultBufferSize),
 		connectedRPCClients: make(map[net.Addr]bool),
 	}
+}
 
+// paranoid build time check to ensure ChainInfoFetcher implements required interfaces
+var _ stategen.CanonicalChecker = blockchain.ChainInfoFetcher(nil)
+var _ stategen.CurrentSlotter = blockchain.ChainInfoFetcher(nil)
+
+// Start the gRPC server.
+func (s *Service) Start() {
 	address := fmt.Sprintf("%s:%s", s.cfg.Host, s.cfg.Port)
 	lis, err := net.Listen("tcp", address)
 	if err != nil {
@@ -152,6 +159,7 @@ func NewService(ctx context.Context, cfg *Config) *Service {
 		)),
 		grpc.MaxRecvMsgSize(s.cfg.MaxMsgSize),
 	}
+	grpc_prometheus.EnableHandlingTimeHistogram()
 	if s.cfg.CertFlag != "" && s.cfg.KeyFlag != "" {
 		creds, err := credentials.NewServerTLSFromFile(s.cfg.CertFlag, s.cfg.KeyFlag)
 		if err != nil {
@@ -165,17 +173,6 @@ func NewService(ctx context.Context, cfg *Config) *Service {
 	}
 	s.grpcServer = grpc.NewServer(opts...)
 
-	return s
-}
-
-// paranoid build time check to ensure ChainInfoFetcher implements required interfaces
-var _ stategen.CanonicalChecker = blockchain.ChainInfoFetcher(nil)
-var _ stategen.CurrentSlotter = blockchain.ChainInfoFetcher(nil)
-
-// Start the gRPC server.
-func (s *Service) Start() {
-	grpc_prometheus.EnableHandlingTimeHistogram()
-
 	var stateCache stategen.CachedGetter
 	if s.cfg.StateGen != nil {
 		stateCache = s.cfg.StateGen.CombinedCache()

beacon-chain/state/fieldtrie/field_trie.go

@@ -56,7 +56,7 @@ func NewFieldTrie(field types.FieldIndex, dataType types.DataType, elements inte
 			reference:   stateutil.NewRef(1),
 			RWMutex:     new(sync.RWMutex),
 			length:      length,
-			numOfElems:  retrieveLength(elements),
+			numOfElems:  reflect.Indirect(reflect.ValueOf(elements)).Len(),
 		}, nil
 	case types.CompositeArray, types.CompressedArray:
 		return &FieldTrie{
@@ -66,7 +66,7 @@ func NewFieldTrie(field types.FieldIndex, dataType types.DataType, elements inte
 			reference:   stateutil.NewRef(1),
 			RWMutex:     new(sync.RWMutex),
 			length:      length,
-			numOfElems:  retrieveLength(elements),
+			numOfElems:  reflect.Indirect(reflect.ValueOf(elements)).Len(),
 		}, nil
 	default:
 		return nil, errors.Errorf("unrecognized data type in field map: %v", reflect.TypeOf(dataType).Name())
@@ -97,14 +97,14 @@ func (f *FieldTrie) RecomputeTrie(indices []uint64, elements interface{}) ([32]b
 		if err != nil {
 			return [32]byte{}, err
 		}
-		f.numOfElems = retrieveLength(elements)
+		f.numOfElems = reflect.Indirect(reflect.ValueOf(elements)).Len()
 		return fieldRoot, nil
 	case types.CompositeArray:
 		fieldRoot, f.fieldLayers, err = stateutil.RecomputeFromLayerVariable(fieldRoots, indices, f.fieldLayers)
 		if err != nil {
 			return [32]byte{}, err
 		}
-		f.numOfElems = retrieveLength(elements)
+		f.numOfElems = reflect.Indirect(reflect.ValueOf(elements)).Len()
 		return stateutil.AddInMixin(fieldRoot, uint64(len(f.fieldLayers[0])))
 	case types.CompressedArray:
 		numOfElems, err := f.field.ElemsInChunk()
@@ -133,7 +133,7 @@ func (f *FieldTrie) RecomputeTrie(indices []uint64, elements interface{}) ([32]b
 		if err != nil {
 			return [32]byte{}, err
 		}
-		f.numOfElems = retrieveLength(elements)
+		f.numOfElems = reflect.Indirect(reflect.ValueOf(elements)).Len()
 		return stateutil.AddInMixin(fieldRoot, uint64(f.numOfElems))
 	default:
 		return [32]byte{}, errors.Errorf("unrecognized data type in field map: %v", reflect.TypeOf(f.dataType).Name())

beacon-chain/state/fieldtrie/field_trie_helpers.go

@@ -57,11 +57,9 @@ func validateElements(field types.FieldIndex, dataType types.DataType, elements
 		}
 		length *= comLength
 	}
-	elemLen := retrieveLength(elements)
-
-	castedLen := int(length) // lint:ignore uintcast- ajhdjhd
-	if elemLen > castedLen {
-		return errors.Errorf("elements length is larger than expected for field %s: %d > %d", field.String(version.Phase0), elemLen, length)
+	val := reflect.Indirect(reflect.ValueOf(elements))
+	if uint64(val.Len()) > length {
+		return errors.Errorf("elements length is larger than expected for field %s: %d > %d", field.String(version.Phase0), val.Len(), length)
 	}
 	return nil
 }
@@ -74,7 +72,7 @@ func fieldConverters(field types.FieldIndex, indices []uint64, elements interfac
 		case [][]byte:
 			return handleByteArrays(val, indices, convertAll)
 		case *customtypes.BlockRoots:
-			return handleIndexer(val, indices, convertAll)
+			return handle32ByteArrays(val[:], indices, convertAll)
 		default:
 			return nil, errors.Errorf("Incorrect type used for block roots")
 		}
@@ -92,7 +90,7 @@ func fieldConverters(field types.FieldIndex, indices []uint64, elements interfac
 		case [][]byte:
 			return handleByteArrays(val, indices, convertAll)
 		case *customtypes.RandaoMixes:
-			return handleIndexer(val, indices, convertAll)
+			return handle32ByteArrays(val[:], indices, convertAll)
 		default:
 			return nil, errors.Errorf("Incorrect type used for randao mixes")
 		}
@@ -184,34 +182,6 @@ func handle32ByteArrays(val [][32]byte, indices []uint64, convertAll bool) ([][3
 	return roots, nil
 }
 
-// handle32ByteArrays computes and returns 32 byte arrays in a slice of root format.
-func handleIndexer(indexer customtypes.Indexer, indices []uint64, convertAll bool) ([][32]byte, error) {
-	length := len(indices)
-	totalLength := indexer.TotalLength()
-	if convertAll {
-		length = int(totalLength) // lint:ignore uintcast- ajhdjhd
-	}
-	roots := make([][32]byte, 0, length)
-	rootCreator := func(input [32]byte) {
-		roots = append(roots, input)
-	}
-	if convertAll {
-		for i := uint64(0); i < uint64(length); i++ {
-			rootCreator(indexer.RootAtIndex(i))
-		}
-		return roots, nil
-	}
-	if totalLength > 0 {
-		for _, idx := range indices {
-			if idx > totalLength-1 {
-				return nil, fmt.Errorf("index %d greater than number of byte arrays %d", idx, totalLength)
-			}
-			rootCreator(indexer.RootAtIndex(idx))
-		}
-	}
-	return roots, nil
-}
-
 // handleValidatorSlice returns the validator indices in a slice of root format.
 func handleValidatorSlice(val []*ethpb.Validator, indices []uint64, convertAll bool) ([][32]byte, error) {
 	length := len(indices)
@@ -378,17 +348,3 @@ func handleBalanceSlice(val, indices []uint64, convertAll bool) ([][32]byte, err
 	}
 	return [][32]byte{}, nil
 }
-
-func retrieveLength(elements interface{}) int {
-	elemLen := int(0)
-	elemVal := reflect.ValueOf(elements)
-	if reflect.Indirect(elemVal).Kind() == reflect.Struct {
-		meth := elemVal.MethodByName("TotalLength")
-		ret := meth.Call([]reflect.Value{})
-		elemLen = int(ret[0].Uint()) // lint:ignore uintcast- ajhdjhd
-	} else {
-		val := reflect.Indirect(elemVal)
-		elemLen = val.Len()
-	}
-	return elemLen
-}

beacon-chain/state/phase0.go

@@ -16,12 +16,19 @@ import (
 type BeaconState interface {
 	ReadOnlyBeaconState
 	WriteOnlyBeaconState
+	SpecConstantsProvider
 	Copy() BeaconState
 	HashTreeRoot(ctx context.Context) ([32]byte, error)
 	FutureForkStub
 	StateProver
 }
 
+// SpecConstantsProvider defines a struct which can provide varying configuration
+// values depending on fork versions, such as the beacon state.
+type SpecConstantsProvider interface {
+	InactivityPenaltyQuotient() (uint64, error)
+}
+
 // StateProver defines the ability to create Merkle proofs for beacon state fields.
 type StateProver interface {
 	FinalizedRootProof(ctx context.Context) ([][]byte, error)

beacon-chain/state/state-native/custom-types/BUILD.bazel

@@ -12,7 +12,6 @@ go_library(
     importpath = "github.com/prysmaticlabs/prysm/beacon-chain/state/state-native/custom-types",
     visibility = ["//visibility:public"],
     deps = [
-        "//beacon-chain/state/stateutil:go_default_library",
         "//config/fieldparams:go_default_library",
         "@com_github_ferranbt_fastssz//:go_default_library",
     ],

beacon-chain/state/state-native/custom-types/block_roots.go

@@ -2,162 +2,28 @@ package customtypes
 
 import (
 	"fmt"
-	"reflect"
-	"runtime"
-	"sort"
-	"sync"
-	"unsafe"
 
 	fssz "github.com/ferranbt/fastssz"
-	"github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil"
 	fieldparams "github.com/prysmaticlabs/prysm/config/fieldparams"
 )
 
-var _ fssz.HashRoot = (*BlockRoots)(nil)
+var _ fssz.HashRoot = (BlockRoots)([fieldparams.BlockRootsLength][32]byte{})
 var _ fssz.Marshaler = (*BlockRoots)(nil)
 var _ fssz.Unmarshaler = (*BlockRoots)(nil)
 
-type Indexer interface {
-	RootAtIndex(idx uint64) [32]byte
-	TotalLength() uint64
-}
-
 // BlockRoots represents block roots of the beacon state.
-type BlockRoots struct {
-	baseArray    *baseArrayBlockRoots
-	fieldJournal map[uint64][32]byte
-	generation   uint64
-	*stateutil.Reference
-}
-
-type baseArrayBlockRoots struct {
-	baseArray     *[fieldparams.BlockRootsLength][32]byte
-	descendantMap map[uint64][]uintptr
-	*sync.RWMutex
-	*stateutil.Reference
-}
-
-type sorter struct {
-	objs        [][]uintptr
-	generations []uint64
-}
-
-func (s sorter) Len() int {
-	return len(s.generations)
-}
-
-func (s sorter) Swap(i, j int) {
-	s.objs[i], s.objs[j] = s.objs[j], s.objs[i]
-	s.generations[i], s.generations[j] = s.generations[j], s.generations[i]
-}
-
-func (s sorter) Less(i, j int) bool {
-	return s.generations[i] < s.generations[j]
-}
-
-func (b *baseArrayBlockRoots) RootAtIndex(idx uint64) [32]byte {
-	b.RWMutex.RLock()
-	defer b.RWMutex.RUnlock()
-	return b.baseArray[idx]
-}
-
-func (b *baseArrayBlockRoots) TotalLength() uint64 {
-	return fieldparams.BlockRootsLength
-}
-
-func (b *baseArrayBlockRoots) addGeneration(generation uint64, descendant uintptr) {
-	b.RWMutex.Lock()
-	defer b.RWMutex.Unlock()
-	b.descendantMap[generation] = append(b.descendantMap[generation], descendant)
-}
-
-func (b *baseArrayBlockRoots) removeGeneration(generation uint64, descendant uintptr) {
-	b.RWMutex.Lock()
-	defer b.RWMutex.Unlock()
-	ptrVals := b.descendantMap[generation]
-	newVals := []uintptr{}
-	for _, v := range ptrVals {
-		if v == descendant {
-			continue
-		}
-		newVals = append(newVals, v)
-	}
-	b.descendantMap[generation] = newVals
-}
-
-func (b *baseArrayBlockRoots) numOfDescendants() uint64 {
-	b.RWMutex.RLock()
-	defer b.RWMutex.RUnlock()
-	return uint64(len(b.descendantMap))
-}
-
-func (b *baseArrayBlockRoots) cleanUp() {
-	b.RWMutex.Lock()
-	defer b.RWMutex.Unlock()
-	fmt.Printf("\n cleaning up block roots %d \n ", len(b.descendantMap))
-	listOfObjs := [][]uintptr{}
-	generations := []uint64{}
-	for g, objs := range b.descendantMap {
-		generations = append(generations, g)
-		listOfObjs = append(listOfObjs, objs)
-	}
-	sortedObj := sorter{
-		objs:        listOfObjs,
-		generations: generations,
-	}
-	sort.Sort(sortedObj)
-	lastReferencedGen := 0
-	lastRefrencedIdx := 0
-	lastRefPointer := 0
-	for i, g := range sortedObj.generations {
-		for j, o := range sortedObj.objs[i] {
-
-			x := (*BlockRoots)(unsafe.Pointer(o))
-			if x == nil {
-				continue
-			}
-
-			lastReferencedGen = int(g) // lint:ignore uintcast- ajhdjhd
-			lastRefrencedIdx = i
-			lastRefPointer = j
-			break
-		}
-		if lastReferencedGen != 0 {
-			break
-		}
-	}
-	fmt.Printf("\n block root map %d, %d, %d \n ", lastReferencedGen, lastRefrencedIdx, lastRefPointer)
-
-	br := (*BlockRoots)(unsafe.Pointer(sortedObj.objs[lastRefrencedIdx][lastRefPointer]))
-	for k, v := range br.fieldJournal {
-		b.baseArray[k] = v
-	}
-	sortedObj.generations = sortedObj.generations[lastRefrencedIdx:]
-	sortedObj.objs = sortedObj.objs[lastRefrencedIdx:]
-
-	newMap := make(map[uint64][]uintptr)
-	for i, g := range sortedObj.generations {
-		newMap[g] = sortedObj.objs[i]
-	}
-	b.descendantMap = newMap
-}
+type BlockRoots [fieldparams.BlockRootsLength][32]byte
 
 // HashTreeRoot returns calculated hash root.
-func (r *BlockRoots) HashTreeRoot() ([32]byte, error) {
+func (r BlockRoots) HashTreeRoot() ([32]byte, error) {
 	return fssz.HashWithDefaultHasher(r)
 }
 
 // HashTreeRootWith hashes a BlockRoots object with a Hasher from the default HasherPool.
-func (r *BlockRoots) HashTreeRootWith(hh *fssz.Hasher) error {
+func (r BlockRoots) HashTreeRootWith(hh *fssz.Hasher) error {
 	index := hh.Index()
-
-	for i := uint64(0); i < r.baseArray.TotalLength(); i++ {
-		if val, ok := r.fieldJournal[i]; ok {
-			hh.Append(val[:])
-			continue
-		}
-		rt := r.baseArray.RootAtIndex(i)
-		hh.Append(rt[:])
+	for _, sRoot := range r {
+		hh.Append(sRoot[:])
 	}
 	hh.Merkleize(index)
 	return nil
@@ -168,13 +34,12 @@ func (r *BlockRoots) UnmarshalSSZ(buf []byte) error {
 	if len(buf) != r.SizeSSZ() {
 		return fmt.Errorf("expected buffer of length %d received %d", r.SizeSSZ(), len(buf))
 	}
-	r.baseArray.Lock()
-	defer r.baseArray.Unlock()
 
-	for i := range r.baseArray.baseArray {
-		copy(r.baseArray.baseArray[i][:], buf[i*32:(i+1)*32])
+	var roots BlockRoots
+	for i := range roots {
+		copy(roots[i][:], buf[i*32:(i+1)*32])
 	}
-
+	*r = roots
 	return nil
 }
 
@@ -190,13 +55,10 @@ func (r *BlockRoots) MarshalSSZTo(dst []byte) ([]byte, error) {
 // MarshalSSZ marshals BlockRoots into a serialized object.
 func (r *BlockRoots) MarshalSSZ() ([]byte, error) {
 	marshalled := make([]byte, fieldparams.BlockRootsLength*32)
-	for i := uint64(0); i < r.baseArray.TotalLength(); i++ {
-		if val, ok := r.fieldJournal[i]; ok {
-			copy(marshalled[i*32:], val[:])
-			continue
+	for i, r32 := range r {
+		for j, rr := range r32 {
+			marshalled[i*32+j] = rr
 		}
-		rt := r.baseArray.RootAtIndex(i)
-		copy(marshalled[i*32:], rt[:])
 	}
 	return marshalled, nil
 }
@@ -211,152 +73,10 @@ func (r *BlockRoots) Slice() [][]byte {
 	if r == nil {
 		return nil
 	}
-	bRoots := make([][]byte, r.baseArray.TotalLength())
-	for i := uint64(0); i < r.baseArray.TotalLength(); i++ {
-		if val, ok := r.fieldJournal[i]; ok {
-			bRoots[i] = val[:]
-			continue
-		}
-		rt := r.baseArray.RootAtIndex(i)
-		bRoots[i] = rt[:]
+	bRoots := make([][]byte, len(r))
+	for i, root := range r {
+		tmp := root
+		bRoots[i] = tmp[:]
 	}
 	return bRoots
 }
-
-// Slice converts a customtypes.BlockRoots object into a 2D byte slice.
-func (r *BlockRoots) Array() [fieldparams.BlockRootsLength][32]byte {
-	if r == nil {
-		return [fieldparams.BlockRootsLength][32]byte{}
-	}
-	bRoots := [fieldparams.BlockRootsLength][32]byte{}
-	for i := uint64(0); i < r.baseArray.TotalLength(); i++ {
-		if val, ok := r.fieldJournal[i]; ok {
-			bRoots[i] = val
-			continue
-		}
-		rt := r.baseArray.RootAtIndex(i)
-		bRoots[i] = rt
-	}
-	return bRoots
-}
-
-func SetFromSlice(slice [][]byte) *BlockRoots {
-	br := &BlockRoots{
-		baseArray: &baseArrayBlockRoots{
-			baseArray:     new([fieldparams.BlockRootsLength][32]byte),
-			descendantMap: map[uint64][]uintptr{},
-			RWMutex:       new(sync.RWMutex),
-			Reference:     stateutil.NewRef(1),
-		},
-		fieldJournal: map[uint64][32]byte{},
-		Reference:    stateutil.NewRef(1),
-	}
-	for i, rt := range slice {
-		copy(br.baseArray.baseArray[i][:], rt)
-	}
-	runtime.SetFinalizer(br, blockRootsFinalizer)
-	return br
-}
-
-func (r *BlockRoots) SetFromBaseField(field [fieldparams.BlockRootsLength][32]byte) {
-	r.baseArray = &baseArrayBlockRoots{
-		baseArray:     &field,
-		descendantMap: map[uint64][]uintptr{},
-		RWMutex:       new(sync.RWMutex),
-		Reference:     stateutil.NewRef(1),
-	}
-	r.fieldJournal = map[uint64][32]byte{}
-	r.Reference = stateutil.NewRef(1)
-	r.baseArray.addGeneration(0, reflect.ValueOf(r).Pointer())
-	runtime.SetFinalizer(r, blockRootsFinalizer)
-}
-
-func (r *BlockRoots) RootAtIndex(idx uint64) [32]byte {
-	if val, ok := r.fieldJournal[idx]; ok {
-		return val
-	}
-	return r.baseArray.RootAtIndex(idx)
-}
-
-func (r *BlockRoots) SetRootAtIndex(idx uint64, val [32]byte) {
-	if r.Refs() <= 1 && r.baseArray.Refs() <= 1 {
-		r.baseArray.Lock()
-		r.baseArray.baseArray[idx] = val
-		r.baseArray.Unlock()
-		return
-	}
-	if r.Refs() <= 1 {
-		r.fieldJournal[idx] = val
-		r.baseArray.removeGeneration(r.generation, reflect.ValueOf(r).Pointer())
-		r.generation++
-		r.baseArray.addGeneration(r.generation, reflect.ValueOf(r).Pointer())
-		return
-	}
-	newJournal := make(map[uint64][32]byte)
-	for k, val := range r.fieldJournal {
-		newJournal[k] = val
-	}
-
-	r.fieldJournal = newJournal
-	r.MinusRef()
-	r.Reference = stateutil.NewRef(1)
-	r.fieldJournal[idx] = val
-	r.baseArray.removeGeneration(r.generation, reflect.ValueOf(r).Pointer())
-	r.generation++
-	r.baseArray.addGeneration(r.generation, reflect.ValueOf(r).Pointer())
-}
-
-func (r *BlockRoots) Copy() *BlockRoots {
-	r.baseArray.AddRef()
-	r.Reference.AddRef()
-	br := &BlockRoots{
-		baseArray:    r.baseArray,
-		fieldJournal: r.fieldJournal,
-		Reference:    r.Reference,
-		generation:   r.generation,
-	}
-	r.baseArray.addGeneration(r.generation, reflect.ValueOf(br).Pointer())
-	if r.baseArray.numOfDescendants() > 20 {
-		r.baseArray.cleanUp()
-	}
-	runtime.SetFinalizer(br, blockRootsFinalizer)
-	return br
-}
-
-func (r *BlockRoots) TotalLength() uint64 {
-	return fieldparams.BlockRootsLength
-}
-
-func (r *BlockRoots) IncreaseRef() {
-	r.Reference.AddRef()
-	r.baseArray.Reference.AddRef()
-}
-
-func (r *BlockRoots) DecreaseRef() {
-	r.Reference.MinusRef()
-	r.baseArray.Reference.MinusRef()
-}
-
-func blockRootsFinalizer(br *BlockRoots) {
-	br.baseArray.Lock()
-	defer br.baseArray.Unlock()
-	ptrVal := reflect.ValueOf(br).Pointer()
-	vals, ok := br.baseArray.descendantMap[br.generation]
-	if !ok {
-		return
-	}
-	exists := false
-	wantedVals := []uintptr{}
-	for _, v := range vals {
-		if v == ptrVal {
-			exists = true
-			continue
-		}
-		newV := v
-		wantedVals = append(wantedVals, newV)
-	}
-	if !exists {
-		return
-	}
-	br.baseArray.descendantMap[br.generation] = wantedVals
-}

beacon-chain/state/state-native/custom-types/block_roots_test.go

@@ -1,25 +1,24 @@
 package customtypes
 
 import (
-	"bytes"
 	"reflect"
 	"testing"
 
 	fieldparams "github.com/prysmaticlabs/prysm/config/fieldparams"
+	"github.com/prysmaticlabs/prysm/testing/assert"
 )
 
 func TestBlockRoots_Casting(t *testing.T) {
 	var b [fieldparams.BlockRootsLength][32]byte
-	f := SetFromSlice([][]byte{})
-	f.SetFromBaseField(b)
-	if !reflect.DeepEqual(f.Array(), b) {
-		t.Errorf("Unequal: %v = %v", f.Array(), b)
+	d := BlockRoots(b)
+	if !reflect.DeepEqual([fieldparams.BlockRootsLength][32]byte(d), b) {
+		t.Errorf("Unequal: %v = %v", d, b)
 	}
 }
 
 func TestBlockRoots_UnmarshalSSZ(t *testing.T) {
 	t.Run("Ok", func(t *testing.T) {
-		d := SetFromSlice([][]byte{})
+		d := BlockRoots{}
 		var b [fieldparams.BlockRootsLength][32]byte
 		b[0] = [32]byte{'f', 'o', 'o'}
 		b[1] = [32]byte{'b', 'a', 'r'}
@@ -33,8 +32,8 @@ func TestBlockRoots_UnmarshalSSZ(t *testing.T) {
 		if err != nil {
 			t.Fatalf("Unexpected error: %v", err)
 		}
-		if !reflect.DeepEqual(b, d.Array()) {
-			t.Errorf("Unequal: %v = %v", b, d.Array())
+		if !reflect.DeepEqual(b, [fieldparams.BlockRootsLength][32]byte(d)) {
+			t.Errorf("Unequal: %v = %v", b, [fieldparams.BlockRootsLength][32]byte(d))
 		}
 	})
 
@@ -71,47 +70,28 @@ func TestBlockRoots_MarshalSSZTo(t *testing.T) {
 }
 
 func TestBlockRoots_MarshalSSZ(t *testing.T) {
-	d := SetFromSlice([][]byte{})
-	d.IncreaseRef()
-	d.SetRootAtIndex(0, [32]byte{'f', 'o', 'o'})
-	d.IncreaseRef()
-	d.IncreaseRef()
-	d.SetRootAtIndex(1, [32]byte{'b', 'a', 'r'})
+	d := BlockRoots{}
+	d[0] = [32]byte{'f', 'o', 'o'}
+	d[1] = [32]byte{'b', 'a', 'r'}
 	b, err := d.MarshalSSZ()
 	if err != nil {
 		t.Fatalf("Unexpected error: %v", err)
 	}
-	rt := d.RootAtIndex(0)
-	if !reflect.DeepEqual(rt[:], b[0:32]) {
-		t.Errorf("Unequal: %v = %v", rt, b[0:32])
+	if !reflect.DeepEqual(d[0][:], b[0:32]) {
+		t.Errorf("Unequal: %v = %v", d[0], b[0:32])
 	}
-	rt = d.RootAtIndex(1)
-	if !reflect.DeepEqual(rt[:], b[32:64]) {
-		t.Errorf("Unequal: %v = %v", rt, b[32:64])
-	}
-	d2 := SetFromSlice([][]byte{})
-	err = d2.UnmarshalSSZ(b)
-	if err != nil {
-		t.Error(err)
-	}
-	res, err := d2.MarshalSSZ()
-	if err != nil {
-		t.Error(err)
-	}
-	if !bytes.Equal(res, b) {
-		t.Error("unequal")
+	if !reflect.DeepEqual(d[1][:], b[32:64]) {
+		t.Errorf("Unequal: %v = %v", d[0], b[32:64])
 	}
 }
 
 func TestBlockRoots_SizeSSZ(t *testing.T) {
-	d := SetFromSlice([][]byte{})
+	d := BlockRoots{}
 	if d.SizeSSZ() != fieldparams.BlockRootsLength*32 {
 		t.Errorf("Wrong SSZ size. Expected %v vs actual %v", fieldparams.BlockRootsLength*32, d.SizeSSZ())
 	}
 }
 
-/*
-
 func TestBlockRoots_Slice(t *testing.T) {
 	a, b, c := [32]byte{'a'}, [32]byte{'b'}, [32]byte{'c'}
 	roots := BlockRoots{}
@@ -123,4 +103,3 @@ func TestBlockRoots_Slice(t *testing.T) {
 	assert.DeepEqual(t, b[:], slice[10])
 	assert.DeepEqual(t, c[:], slice[100])
 }
-*/

beacon-chain/state/state-native/custom-types/randao_mixes.go

@@ -2,77 +2,48 @@ package customtypes
 
 import (
 	"fmt"
-	"sync"
 
 	fssz "github.com/ferranbt/fastssz"
-	"github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil"
 	fieldparams "github.com/prysmaticlabs/prysm/config/fieldparams"
 )
 
-var _ fssz.HashRoot = (*RandaoMixes)(nil)
+var _ fssz.HashRoot = (RandaoMixes)([fieldparams.RandaoMixesLength][32]byte{})
 var _ fssz.Marshaler = (*RandaoMixes)(nil)
 var _ fssz.Unmarshaler = (*RandaoMixes)(nil)
 
-// BlockRoots represents block roots of the beacon state.
-type RandaoMixes struct {
-	baseArray    *baseArrayRandaoMixes
-	fieldJournal map[uint64][32]byte
-	*stateutil.Reference
-}
-
-type baseArrayRandaoMixes struct {
-	baseArray *[fieldparams.RandaoMixesLength][32]byte
-	*sync.RWMutex
-	*stateutil.Reference
-}
-
-func (b *baseArrayRandaoMixes) RootAtIndex(idx uint64) [32]byte {
-	b.RWMutex.RLock()
-	defer b.RWMutex.RUnlock()
-	return b.baseArray[idx]
-}
-
-func (b *baseArrayRandaoMixes) TotalLength() uint64 {
-	return fieldparams.RandaoMixesLength
-}
+// RandaoMixes represents RANDAO mixes of the beacon state.
+type RandaoMixes [fieldparams.RandaoMixesLength][32]byte
 
 // HashTreeRoot returns calculated hash root.
-func (r *RandaoMixes) HashTreeRoot() ([32]byte, error) {
+func (r RandaoMixes) HashTreeRoot() ([32]byte, error) {
 	return fssz.HashWithDefaultHasher(r)
 }
 
-// HashTreeRootWith hashes a BlockRoots object with a Hasher from the default HasherPool.
-func (r *RandaoMixes) HashTreeRootWith(hh *fssz.Hasher) error {
+// HashTreeRootWith hashes a RandaoMixes object with a Hasher from the default HasherPool.
+func (r RandaoMixes) HashTreeRootWith(hh *fssz.Hasher) error {
 	index := hh.Index()
-
-	for i := uint64(0); i < r.baseArray.TotalLength(); i++ {
-		if val, ok := r.fieldJournal[i]; ok {
-			hh.Append(val[:])
-			continue
-		}
-		rt := r.baseArray.RootAtIndex(i)
-		hh.Append(rt[:])
+	for _, sRoot := range r {
+		hh.Append(sRoot[:])
 	}
 	hh.Merkleize(index)
 	return nil
 }
 
-// UnmarshalSSZ deserializes the provided bytes buffer into the BlockRoots object.
+// UnmarshalSSZ deserializes the provided bytes buffer into the RandaoMixes object.
 func (r *RandaoMixes) UnmarshalSSZ(buf []byte) error {
 	if len(buf) != r.SizeSSZ() {
 		return fmt.Errorf("expected buffer of length %d received %d", r.SizeSSZ(), len(buf))
 	}
-	r.baseArray.Lock()
-	defer r.baseArray.Unlock()
 
-	for i := range r.baseArray.baseArray {
-		copy(r.baseArray.baseArray[i][:], buf[i*32:(i+1)*32])
+	var roots RandaoMixes
+	for i := range roots {
+		copy(roots[i][:], buf[i*32:(i+1)*32])
 	}
-
+	*r = roots
 	return nil
 }
 
-// MarshalSSZTo marshals BlockRoots with the provided byte slice.
+// MarshalSSZTo marshals RandaoMixes with the provided byte slice.
 func (r *RandaoMixes) MarshalSSZTo(dst []byte) ([]byte, error) {
 	marshalled, err := r.MarshalSSZ()
 	if err != nil {
@@ -81,16 +52,13 @@ func (r *RandaoMixes) MarshalSSZTo(dst []byte) ([]byte, error) {
 	return append(dst, marshalled...), nil
 }
 
-// MarshalSSZ marshals BlockRoots into a serialized object.
+// MarshalSSZ marshals RandaoMixes into a serialized object.
 func (r *RandaoMixes) MarshalSSZ() ([]byte, error) {
 	marshalled := make([]byte, fieldparams.RandaoMixesLength*32)
-	for i := uint64(0); i < r.baseArray.TotalLength(); i++ {
-		if val, ok := r.fieldJournal[i]; ok {
-			copy(marshalled[i*32:], val[:])
-			continue
+	for i, r32 := range r {
+		for j, rr := range r32 {
+			marshalled[i*32+j] = rr
 		}
-		rt := r.baseArray.RootAtIndex(i)
-		copy(marshalled[i*32:], rt[:])
 	}
 	return marshalled, nil
 }
@@ -100,90 +68,15 @@ func (_ *RandaoMixes) SizeSSZ() int {
 	return fieldparams.RandaoMixesLength * 32
 }
 
-// Slice converts a customtypes.BlockRoots object into a 2D byte slice.
+// Slice converts a customtypes.RandaoMixes object into a 2D byte slice.
 func (r *RandaoMixes) Slice() [][]byte {
 	if r == nil {
 		return nil
 	}
-	bRoots := make([][]byte, r.baseArray.TotalLength())
-	for i := uint64(0); i < r.baseArray.TotalLength(); i++ {
-		if val, ok := r.fieldJournal[i]; ok {
-			bRoots[i] = val[:]
-			continue
-		}
-		rt := r.baseArray.RootAtIndex(i)
-		bRoots[i] = rt[:]
+	mixes := make([][]byte, len(r))
+	for i, root := range r {
+		tmp := root
+		mixes[i] = tmp[:]
 	}
-	return bRoots
-}
-
-func SetFromSliceRandao(slice [][]byte) *RandaoMixes {
-	br := &RandaoMixes{
-		baseArray: &baseArrayRandaoMixes{
-			baseArray: new([fieldparams.RandaoMixesLength][32]byte),
-			RWMutex:   new(sync.RWMutex),
-			Reference: stateutil.NewRef(1),
-		},
-		fieldJournal: map[uint64][32]byte{},
-		Reference:    stateutil.NewRef(1),
-	}
-	for i, rt := range slice {
-		copy(br.baseArray.baseArray[i][:], rt)
-	}
-	return br
-}
-
-func (r *RandaoMixes) SetFromBaseField(field [fieldparams.RandaoMixesLength][32]byte) {
-	r.baseArray.baseArray = &field
-}
-
-func (r *RandaoMixes) RootAtIndex(idx uint64) [32]byte {
-	if val, ok := r.fieldJournal[idx]; ok {
-		return val
-	}
-	return r.baseArray.RootAtIndex(idx)
-}
-
-func (r *RandaoMixes) SetRootAtIndex(idx uint64, val [32]byte) {
-	if r.Refs() <= 1 && r.baseArray.Refs() <= 1 {
-		r.baseArray.baseArray[idx] = val
-		return
-	}
-	if r.Refs() <= 1 {
-		r.fieldJournal[idx] = val
-		return
-	}
-	newJournal := make(map[uint64][32]byte)
-	for k, val := range r.fieldJournal {
-		newJournal[k] = val
-	}
-	r.fieldJournal = newJournal
-	r.MinusRef()
-	r.Reference = stateutil.NewRef(1)
-	r.fieldJournal[idx] = val
-}
-
-func (r *RandaoMixes) Copy() *RandaoMixes {
-	r.baseArray.AddRef()
-	r.Reference.AddRef()
-	rm := &RandaoMixes{
-		baseArray:    r.baseArray,
-		fieldJournal: r.fieldJournal,
-		Reference:    r.Reference,
-	}
-	return rm
-}
-
-func (r *RandaoMixes) TotalLength() uint64 {
-	return fieldparams.RandaoMixesLength
-}
-
-func (r *RandaoMixes) IncreaseRef() {
-	r.Reference.AddRef()
-	r.baseArray.Reference.AddRef()
-}
-
-func (r *RandaoMixes) DecreaseRef() {
-	r.Reference.MinusRef()
-	r.baseArray.Reference.MinusRef()
+	return mixes
 }

beacon-chain/state/state-native/v1/getters_block.go

@@ -76,8 +76,8 @@ func (b *BeaconState) BlockRootAtIndex(idx uint64) ([]byte, error) {
 // input index value.
 // This assumes that a lock is already held on BeaconState.
 func (b *BeaconState) blockRootAtIndex(idx uint64) ([32]byte, error) {
-	if b.blockRoots.TotalLength() <= idx {
+	if uint64(len(b.blockRoots)) <= idx {
 		return [32]byte{}, fmt.Errorf("index %d out of range", idx)
 	}
-	return b.blockRoots.RootAtIndex(idx), nil
+	return b.blockRoots[idx], nil
 }

beacon-chain/state/state-native/v1/getters_randao.go

@@ -37,10 +37,10 @@ func (b *BeaconState) RandaoMixAtIndex(idx uint64) ([]byte, error) {
 // input index value.
 // This assumes that a lock is already held on BeaconState.
 func (b *BeaconState) randaoMixAtIndex(idx uint64) ([32]byte, error) {
-	if b.randaoMixes.TotalLength() <= idx {
+	if uint64(len(b.randaoMixes)) <= idx {
 		return [32]byte{}, fmt.Errorf("index %d out of range", idx)
 	}
-	return b.randaoMixes.RootAtIndex(idx), nil
+	return b.randaoMixes[idx], nil
 }
 
 // RandaoMixesLength returns the length of the randao mixes slice.
@@ -62,5 +62,5 @@ func (b *BeaconState) randaoMixesLength() int {
 		return 0
 	}
 
-	return int(b.randaoMixes.TotalLength()) // lint:ignore uintcast- ajhdjhd
+	return len(b.randaoMixes)
 }

beacon-chain/state/state-native/v1/setters_block.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	customtypes "github.com/prysmaticlabs/prysm/beacon-chain/state/state-native/custom-types"
+	"github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil"
 	fieldparams "github.com/prysmaticlabs/prysm/config/fieldparams"
 	ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
 )
@@ -24,12 +25,14 @@ func (b *BeaconState) SetBlockRoots(val [][]byte) error {
 	b.lock.Lock()
 	defer b.lock.Unlock()
 
+	b.sharedFieldReferences[blockRoots].MinusRef()
+	b.sharedFieldReferences[blockRoots] = stateutil.NewRef(1)
+
 	var rootsArr [fieldparams.BlockRootsLength][32]byte
 	for i := 0; i < len(rootsArr); i++ {
 		copy(rootsArr[i][:], val[i])
 	}
-	roots := customtypes.BlockRoots{}
-	roots.SetFromBaseField(rootsArr)
+	roots := customtypes.BlockRoots(rootsArr)
 	b.blockRoots = &roots
 	b.markFieldAsDirty(blockRoots)
 	b.rebuildTrie[blockRoots] = true
@@ -39,13 +42,24 @@ func (b *BeaconState) SetBlockRoots(val [][]byte) error {
 // UpdateBlockRootAtIndex for the beacon state. Updates the block root
 // at a specific index to a new value.
 func (b *BeaconState) UpdateBlockRootAtIndex(idx uint64, blockRoot [32]byte) error {
-	if b.blockRoots.TotalLength() <= idx {
+	if uint64(len(b.blockRoots)) <= idx {
 		return fmt.Errorf("invalid index provided %d", idx)
 	}
 	b.lock.Lock()
 	defer b.lock.Unlock()
 
-	b.blockRoots.SetRootAtIndex(idx, blockRoot)
+	r := b.blockRoots
+	if ref := b.sharedFieldReferences[blockRoots]; ref.Refs() > 1 {
+		// Copy elements in underlying array by reference.
+		roots := *b.blockRoots
+		rootsCopy := roots
+		r = &rootsCopy
+		ref.MinusRef()
+		b.sharedFieldReferences[blockRoots] = stateutil.NewRef(1)
+	}
+
+	r[idx] = blockRoot
+	b.blockRoots = r
 
 	b.markFieldAsDirty(blockRoots)
 	b.addDirtyIndices(blockRoots, []uint64{idx})

beacon-chain/state/state-native/v1/setters_randao.go

@@ -3,6 +3,7 @@ package v1
 import (
 	"github.com/pkg/errors"
 	customtypes "github.com/prysmaticlabs/prysm/beacon-chain/state/state-native/custom-types"
+	"github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil"
 	fieldparams "github.com/prysmaticlabs/prysm/config/fieldparams"
 	"github.com/prysmaticlabs/prysm/encoding/bytesutil"
 )
@@ -13,12 +14,14 @@ func (b *BeaconState) SetRandaoMixes(val [][]byte) error {
 	b.lock.Lock()
 	defer b.lock.Unlock()
 
+	b.sharedFieldReferences[randaoMixes].MinusRef()
+	b.sharedFieldReferences[randaoMixes] = stateutil.NewRef(1)
+
 	var mixesArr [fieldparams.RandaoMixesLength][32]byte
 	for i := 0; i < len(mixesArr); i++ {
 		copy(mixesArr[i][:], val[i])
 	}
-	mixes := customtypes.RandaoMixes{}
-	mixes.SetFromBaseField(mixesArr)
+	mixes := customtypes.RandaoMixes(mixesArr)
 	b.randaoMixes = &mixes
 	b.markFieldAsDirty(randaoMixes)
 	b.rebuildTrie[randaoMixes] = true
@@ -28,13 +31,24 @@ func (b *BeaconState) SetRandaoMixes(val [][]byte) error {
 // UpdateRandaoMixesAtIndex for the beacon state. Updates the randao mixes
 // at a specific index to a new value.
 func (b *BeaconState) UpdateRandaoMixesAtIndex(idx uint64, val []byte) error {
-	if b.randaoMixes.TotalLength() <= idx {
+	if uint64(len(b.randaoMixes)) <= idx {
 		return errors.Errorf("invalid index provided %d", idx)
 	}
 	b.lock.Lock()
 	defer b.lock.Unlock()
 
-	b.randaoMixes.SetRootAtIndex(idx, bytesutil.ToBytes32(val))
+	mixes := b.randaoMixes
+	if refs := b.sharedFieldReferences[randaoMixes].Refs(); refs > 1 {
+		// Copy elements in underlying array by reference.
+		m := *b.randaoMixes
+		mCopy := m
+		mixes = &mCopy
+		b.sharedFieldReferences[randaoMixes].MinusRef()
+		b.sharedFieldReferences[randaoMixes] = stateutil.NewRef(1)
+	}
+
+	mixes[idx] = bytesutil.ToBytes32(val)
+	b.randaoMixes = mixes
 	b.markFieldAsDirty(randaoMixes)
 	b.addDirtyIndices(randaoMixes, []uint64{idx})
 

beacon-chain/state/state-native/v1/spec_constants.go

@@ -0,0 +1,7 @@
+package v1
+
+import "github.com/prysmaticlabs/prysm/config/params"
+
+func (b *BeaconState) InactivityPenaltyQuotient() uint64 {
+	return params.BeaconConfig().InactivityPenaltyQuotient
+}

beacon-chain/state/state-native/v1/state_trie.go

@@ -36,8 +36,10 @@ func InitializeFromProtoUnsafe(st *ethpb.BeaconState) (state.BeaconState, error)
 		return nil, errors.New("received nil state")
 	}
 
-	bRoots := customtypes.SetFromSlice(st.BlockRoots)
-
+	var bRoots customtypes.BlockRoots
+	for i, r := range st.BlockRoots {
+		copy(bRoots[i][:], r)
+	}
 	var sRoots customtypes.StateRoots
 	for i, r := range st.StateRoots {
 		copy(sRoots[i][:], r)
@@ -46,7 +48,10 @@ func InitializeFromProtoUnsafe(st *ethpb.BeaconState) (state.BeaconState, error)
 	for i, r := range st.HistoricalRoots {
 		copy(hRoots[i][:], r)
 	}
-	mixes := customtypes.SetFromSliceRandao(st.RandaoMixes)
+	var mixes customtypes.RandaoMixes
+	for i, m := range st.RandaoMixes {
+		copy(mixes[i][:], m)
+	}
 
 	fieldCount := params.BeaconConfig().BeaconStateFieldCount
 	b := &BeaconState{
@@ -55,7 +60,7 @@ func InitializeFromProtoUnsafe(st *ethpb.BeaconState) (state.BeaconState, error)
 		slot:                        st.Slot,
 		fork:                        st.Fork,
 		latestBlockHeader:           st.LatestBlockHeader,
-		blockRoots:                  bRoots,
+		blockRoots:                  &bRoots,
 		stateRoots:                  &sRoots,
 		historicalRoots:             hRoots,
 		eth1Data:                    st.Eth1Data,
@@ -63,7 +68,7 @@ func InitializeFromProtoUnsafe(st *ethpb.BeaconState) (state.BeaconState, error)
 		eth1DepositIndex:            st.Eth1DepositIndex,
 		validators:                  st.Validators,
 		balances:                    st.Balances,
-		randaoMixes:                 mixes,
+		randaoMixes:                 &mixes,
 		slashings:                   st.Slashings,
 		previousEpochAttestations:   st.PreviousEpochAttestations,
 		currentEpochAttestations:    st.CurrentEpochAttestations,
@@ -94,6 +99,7 @@ func InitializeFromProtoUnsafe(st *ethpb.BeaconState) (state.BeaconState, error)
 	// Initialize field reference tracking for shared data.
 	b.sharedFieldReferences[randaoMixes] = stateutil.NewRef(1)
 	b.sharedFieldReferences[stateRoots] = stateutil.NewRef(1)
+	b.sharedFieldReferences[blockRoots] = stateutil.NewRef(1)
 	b.sharedFieldReferences[previousEpochAttestations] = stateutil.NewRef(1)
 	b.sharedFieldReferences[currentEpochAttestations] = stateutil.NewRef(1)
 	b.sharedFieldReferences[slashings] = stateutil.NewRef(1)
@@ -121,9 +127,9 @@ func (b *BeaconState) Copy() state.BeaconState {
 		slashings: b.slashings,
 
 		// Large arrays, infrequently changed, constant size.
-		blockRoots:                b.blockRoots.Copy(),
+		blockRoots:                b.blockRoots,
 		stateRoots:                b.stateRoots,
-		randaoMixes:               b.randaoMixes.Copy(),
+		randaoMixes:               b.randaoMixes,
 		previousEpochAttestations: b.previousEpochAttestations,
 		currentEpochAttestations:  b.currentEpochAttestations,
 		eth1DataVotes:             b.eth1DataVotes,
@@ -205,9 +211,6 @@ func (b *BeaconState) Copy() state.BeaconState {
 			}
 
 		}
-		b.blockRoots.MinusRef()
-		b.randaoMixes.MinusRef()
-
 		for i := 0; i < fieldCount; i++ {
 			field := types.FieldIndex(i)
 			delete(b.stateFieldLeaves, field)

beacon-chain/state/state-native/v2/getters_block.go

@@ -76,8 +76,9 @@ func (b *BeaconState) BlockRootAtIndex(idx uint64) ([]byte, error) {
 // input index value.
 // This assumes that a lock is already held on BeaconState.
 func (b *BeaconState) blockRootAtIndex(idx uint64) ([32]byte, error) {
-	if b.blockRoots.TotalLength() <= idx {
+	if uint64(len(b.blockRoots)) <= idx {
 		return [32]byte{}, fmt.Errorf("index %d out of range", idx)
 	}
-	return b.blockRoots.RootAtIndex(idx), nil
+
+	return b.blockRoots[idx], nil
 }

beacon-chain/state/state-native/v2/getters_randao.go

@@ -37,10 +37,11 @@ func (b *BeaconState) RandaoMixAtIndex(idx uint64) ([]byte, error) {
 // input index value.
 // This assumes that a lock is already held on BeaconState.
 func (b *BeaconState) randaoMixAtIndex(idx uint64) ([32]byte, error) {
-	if b.randaoMixes.TotalLength() <= idx {
+	if uint64(len(b.randaoMixes)) <= idx {
 		return [32]byte{}, fmt.Errorf("index %d out of range", idx)
 	}
-	return b.randaoMixes.RootAtIndex(idx), nil
+
+	return b.randaoMixes[idx], nil
 }
 
 // RandaoMixesLength returns the length of the randao mixes slice.
@@ -62,5 +63,5 @@ func (b *BeaconState) randaoMixesLength() int {
 		return 0
 	}
 
-	return int(b.randaoMixes.TotalLength()) // lint:ignore uintcast- ajhdjhd
+	return len(b.randaoMixes)
 }

beacon-chain/state/state-native/v2/setters_block.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	customtypes "github.com/prysmaticlabs/prysm/beacon-chain/state/state-native/custom-types"
+	"github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil"
 	fieldparams "github.com/prysmaticlabs/prysm/config/fieldparams"
 	ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
 )
@@ -24,12 +25,14 @@ func (b *BeaconState) SetBlockRoots(val [][]byte) error {
 	b.lock.Lock()
 	defer b.lock.Unlock()
 
+	b.sharedFieldReferences[blockRoots].MinusRef()
+	b.sharedFieldReferences[blockRoots] = stateutil.NewRef(1)
+
 	var rootsArr [fieldparams.BlockRootsLength][32]byte
 	for i := 0; i < len(rootsArr); i++ {
 		copy(rootsArr[i][:], val[i])
 	}
-	roots := customtypes.BlockRoots{}
-	roots.SetFromBaseField(rootsArr)
+	roots := customtypes.BlockRoots(rootsArr)
 	b.blockRoots = &roots
 	b.markFieldAsDirty(blockRoots)
 	b.rebuildTrie[blockRoots] = true
@@ -39,13 +42,24 @@ func (b *BeaconState) SetBlockRoots(val [][]byte) error {
 // UpdateBlockRootAtIndex for the beacon state. Updates the block root
 // at a specific index to a new value.
 func (b *BeaconState) UpdateBlockRootAtIndex(idx uint64, blockRoot [32]byte) error {
-	if b.blockRoots.TotalLength() <= idx {
+	if uint64(len(b.blockRoots)) <= idx {
 		return fmt.Errorf("invalid index provided %d", idx)
 	}
 	b.lock.Lock()
 	defer b.lock.Unlock()
 
-	b.blockRoots.SetRootAtIndex(idx, blockRoot)
+	r := b.blockRoots
+	if ref := b.sharedFieldReferences[blockRoots]; ref.Refs() > 1 {
+		// Copy elements in underlying array by reference.
+		roots := *b.blockRoots
+		rootsCopy := roots
+		r = &rootsCopy
+		ref.MinusRef()
+		b.sharedFieldReferences[blockRoots] = stateutil.NewRef(1)
+	}
+
+	r[idx] = blockRoot
+	b.blockRoots = r
 
 	b.markFieldAsDirty(blockRoots)
 	b.addDirtyIndices(blockRoots, []uint64{idx})

beacon-chain/state/state-native/v2/setters_randao.go

@@ -3,6 +3,7 @@ package v2
 import (
 	"github.com/pkg/errors"
 	customtypes "github.com/prysmaticlabs/prysm/beacon-chain/state/state-native/custom-types"
+	"github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil"
 	fieldparams "github.com/prysmaticlabs/prysm/config/fieldparams"
 	"github.com/prysmaticlabs/prysm/encoding/bytesutil"
 )
@@ -13,12 +14,14 @@ func (b *BeaconState) SetRandaoMixes(val [][]byte) error {
 	b.lock.Lock()
 	defer b.lock.Unlock()
 
+	b.sharedFieldReferences[randaoMixes].MinusRef()
+	b.sharedFieldReferences[randaoMixes] = stateutil.NewRef(1)
+
 	var mixesArr [fieldparams.RandaoMixesLength][32]byte
 	for i := 0; i < len(mixesArr); i++ {
 		copy(mixesArr[i][:], val[i])
 	}
-	mixes := customtypes.RandaoMixes{}
-	mixes.SetFromBaseField(mixesArr)
+	mixes := customtypes.RandaoMixes(mixesArr)
 	b.randaoMixes = &mixes
 	b.markFieldAsDirty(randaoMixes)
 	b.rebuildTrie[randaoMixes] = true
@@ -28,13 +31,24 @@ func (b *BeaconState) SetRandaoMixes(val [][]byte) error {
 // UpdateRandaoMixesAtIndex for the beacon state. Updates the randao mixes
 // at a specific index to a new value.
 func (b *BeaconState) UpdateRandaoMixesAtIndex(idx uint64, val []byte) error {
-	if b.randaoMixes.TotalLength() <= idx {
+	if uint64(len(b.randaoMixes)) <= idx {
 		return errors.Errorf("invalid index provided %d", idx)
 	}
 	b.lock.Lock()
 	defer b.lock.Unlock()
 
-	b.randaoMixes.SetRootAtIndex(idx, bytesutil.ToBytes32(val))
+	mixes := b.randaoMixes
+	if refs := b.sharedFieldReferences[randaoMixes].Refs(); refs > 1 {
+		// Copy elements in underlying array by reference.
+		m := *b.randaoMixes
+		mCopy := m
+		mixes = &mCopy
+		b.sharedFieldReferences[randaoMixes].MinusRef()
+		b.sharedFieldReferences[randaoMixes] = stateutil.NewRef(1)
+	}
+
+	mixes[idx] = bytesutil.ToBytes32(val)
+	b.randaoMixes = mixes
 	b.markFieldAsDirty(randaoMixes)
 	b.addDirtyIndices(randaoMixes, []uint64{idx})
 

beacon-chain/state/state-native/v2/spec_constants.go

@@ -0,0 +1,7 @@
+package v2
+
+import "github.com/prysmaticlabs/prysm/config/params"
+
+func (b *BeaconState) InactivityPenaltyQuotient() uint64 {
+	return params.BeaconConfig().InactivityPenaltyQuotientAltair
+}

beacon-chain/state/state-native/v2/state_trie.go

@@ -35,8 +35,10 @@ func InitializeFromProtoUnsafe(st *ethpb.BeaconStateAltair) (*BeaconState, error
 		return nil, errors.New("received nil state")
 	}
 
-	bRoots := customtypes.SetFromSlice(st.BlockRoots)
-
+	var bRoots customtypes.BlockRoots
+	for i, r := range st.BlockRoots {
+		bRoots[i] = bytesutil.ToBytes32(r)
+	}
 	var sRoots customtypes.StateRoots
 	for i, r := range st.StateRoots {
 		sRoots[i] = bytesutil.ToBytes32(r)
@@ -45,7 +47,10 @@ func InitializeFromProtoUnsafe(st *ethpb.BeaconStateAltair) (*BeaconState, error
 	for i, r := range st.HistoricalRoots {
 		hRoots[i] = bytesutil.ToBytes32(r)
 	}
-	mixes := customtypes.SetFromSliceRandao(st.RandaoMixes)
+	var mixes customtypes.RandaoMixes
+	for i, m := range st.RandaoMixes {
+		mixes[i] = bytesutil.ToBytes32(m)
+	}
 
 	fieldCount := params.BeaconConfig().BeaconStateAltairFieldCount
 	b := &BeaconState{
@@ -54,7 +59,7 @@ func InitializeFromProtoUnsafe(st *ethpb.BeaconStateAltair) (*BeaconState, error
 		slot:                        st.Slot,
 		fork:                        st.Fork,
 		latestBlockHeader:           st.LatestBlockHeader,
-		blockRoots:                  bRoots,
+		blockRoots:                  &bRoots,
 		stateRoots:                  &sRoots,
 		historicalRoots:             hRoots,
 		eth1Data:                    st.Eth1Data,
@@ -62,7 +67,7 @@ func InitializeFromProtoUnsafe(st *ethpb.BeaconStateAltair) (*BeaconState, error
 		eth1DepositIndex:            st.Eth1DepositIndex,
 		validators:                  st.Validators,
 		balances:                    st.Balances,
-		randaoMixes:                 mixes,
+		randaoMixes:                 &mixes,
 		slashings:                   st.Slashings,
 		previousEpochParticipation:  st.PreviousEpochParticipation,
 		currentEpochParticipation:   st.CurrentEpochParticipation,
@@ -96,6 +101,7 @@ func InitializeFromProtoUnsafe(st *ethpb.BeaconStateAltair) (*BeaconState, error
 	// Initialize field reference tracking for shared data.
 	b.sharedFieldReferences[randaoMixes] = stateutil.NewRef(1)
 	b.sharedFieldReferences[stateRoots] = stateutil.NewRef(1)
+	b.sharedFieldReferences[blockRoots] = stateutil.NewRef(1)
 	b.sharedFieldReferences[previousEpochParticipationBits] = stateutil.NewRef(1) // New in Altair.
 	b.sharedFieldReferences[currentEpochParticipationBits] = stateutil.NewRef(1)  // New in Altair.
 	b.sharedFieldReferences[slashings] = stateutil.NewRef(1)
@@ -122,9 +128,9 @@ func (b *BeaconState) Copy() state.BeaconState {
 		eth1DepositIndex: b.eth1DepositIndex,
 
 		// Large arrays, infrequently changed, constant size.
-		blockRoots:    b.blockRoots.Copy(),
+		blockRoots:    b.blockRoots,
 		stateRoots:    b.stateRoots,
-		randaoMixes:   b.randaoMixes.Copy(),
+		randaoMixes:   b.randaoMixes,
 		slashings:     b.slashings,
 		eth1DataVotes: b.eth1DataVotes,
 
@@ -209,8 +215,6 @@ func (b *BeaconState) Copy() state.BeaconState {
 				b.stateFieldLeaves[field].FieldReference().MinusRef()
 			}
 		}
-		b.blockRoots.DecreaseRef()
-		b.randaoMixes.DecreaseRef()
 		for i := 0; i < fieldCount; i++ {
 			field := types.FieldIndex(i)
 			delete(b.stateFieldLeaves, field)

beacon-chain/state/state-native/v3/getters_block.go

@@ -76,8 +76,9 @@ func (b *BeaconState) BlockRootAtIndex(idx uint64) ([]byte, error) {
 // input index value.
 // This assumes that a lock is already held on BeaconState.
 func (b *BeaconState) blockRootAtIndex(idx uint64) ([32]byte, error) {
-	if b.blockRoots.TotalLength() <= idx {
+	if uint64(len(b.blockRoots)) <= idx {
 		return [32]byte{}, fmt.Errorf("index %d out of range", idx)
 	}
-	return b.blockRoots.RootAtIndex(idx), nil
+
+	return b.blockRoots[idx], nil
 }

beacon-chain/state/state-native/v3/getters_randao.go

@@ -37,10 +37,11 @@ func (b *BeaconState) RandaoMixAtIndex(idx uint64) ([]byte, error) {
 // input index value.
 // This assumes that a lock is already held on BeaconState.
 func (b *BeaconState) randaoMixAtIndex(idx uint64) ([32]byte, error) {
-	if b.randaoMixes.TotalLength() <= idx {
+	if uint64(len(b.randaoMixes)) <= idx {
 		return [32]byte{}, fmt.Errorf("index %d out of range", idx)
 	}
-	return b.randaoMixes.RootAtIndex(idx), nil
+
+	return b.randaoMixes[idx], nil
 }
 
 // RandaoMixesLength returns the length of the randao mixes slice.
@@ -62,5 +63,5 @@ func (b *BeaconState) randaoMixesLength() int {
 		return 0
 	}
 
-	return int(b.randaoMixes.TotalLength()) // lint:ignore uintcast- ajhdjhd
+	return len(b.randaoMixes)
 }

beacon-chain/state/state-native/v3/setters_block.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	customtypes "github.com/prysmaticlabs/prysm/beacon-chain/state/state-native/custom-types"
+	"github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil"
 	fieldparams "github.com/prysmaticlabs/prysm/config/fieldparams"
 	ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
 )
@@ -24,12 +25,14 @@ func (b *BeaconState) SetBlockRoots(val [][]byte) error {
 	b.lock.Lock()
 	defer b.lock.Unlock()
 
+	b.sharedFieldReferences[blockRoots].MinusRef()
+	b.sharedFieldReferences[blockRoots] = stateutil.NewRef(1)
+
 	var rootsArr [fieldparams.BlockRootsLength][fieldparams.RootLength]byte
 	for i := 0; i < len(rootsArr); i++ {
 		copy(rootsArr[i][:], val[i])
 	}
-	roots := customtypes.BlockRoots{}
-	roots.SetFromBaseField(rootsArr)
+	roots := customtypes.BlockRoots(rootsArr)
 	b.blockRoots = &roots
 	b.markFieldAsDirty(blockRoots)
 	b.rebuildTrie[blockRoots] = true
@@ -39,13 +42,24 @@ func (b *BeaconState) SetBlockRoots(val [][]byte) error {
 // UpdateBlockRootAtIndex for the beacon state. Updates the block root
 // at a specific index to a new value.
 func (b *BeaconState) UpdateBlockRootAtIndex(idx uint64, blockRoot [32]byte) error {
-	if b.blockRoots.TotalLength() <= idx {
+	if uint64(len(b.blockRoots)) <= idx {
 		return fmt.Errorf("invalid index provided %d", idx)
 	}
 	b.lock.Lock()
 	defer b.lock.Unlock()
 
-	b.blockRoots.SetRootAtIndex(idx, blockRoot)
+	r := b.blockRoots
+	if ref := b.sharedFieldReferences[blockRoots]; ref.Refs() > 1 {
+		// Copy elements in underlying array by reference.
+		roots := *b.blockRoots
+		rootsCopy := roots
+		r = &rootsCopy
+		ref.MinusRef()
+		b.sharedFieldReferences[blockRoots] = stateutil.NewRef(1)
+	}
+
+	r[idx] = blockRoot
+	b.blockRoots = r
 
 	b.markFieldAsDirty(blockRoots)
 	b.addDirtyIndices(blockRoots, []uint64{idx})

beacon-chain/state/state-native/v3/setters_randao.go

@@ -3,6 +3,7 @@ package v3
 import (
 	"github.com/pkg/errors"
 	customtypes "github.com/prysmaticlabs/prysm/beacon-chain/state/state-native/custom-types"
+	"github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil"
 	fieldparams "github.com/prysmaticlabs/prysm/config/fieldparams"
 	"github.com/prysmaticlabs/prysm/encoding/bytesutil"
 )
@@ -13,12 +14,14 @@ func (b *BeaconState) SetRandaoMixes(val [][]byte) error {
 	b.lock.Lock()
 	defer b.lock.Unlock()
 
-	var mixesArr [fieldparams.RandaoMixesLength][32]byte
+	b.sharedFieldReferences[randaoMixes].MinusRef()
+	b.sharedFieldReferences[randaoMixes] = stateutil.NewRef(1)
+
+	var mixesArr [fieldparams.RandaoMixesLength][fieldparams.RootLength]byte
 	for i := 0; i < len(mixesArr); i++ {
 		copy(mixesArr[i][:], val[i])
 	}
-	mixes := customtypes.RandaoMixes{}
-	mixes.SetFromBaseField(mixesArr)
+	mixes := customtypes.RandaoMixes(mixesArr)
 	b.randaoMixes = &mixes
 	b.markFieldAsDirty(randaoMixes)
 	b.rebuildTrie[randaoMixes] = true
@@ -28,13 +31,24 @@ func (b *BeaconState) SetRandaoMixes(val [][]byte) error {
 // UpdateRandaoMixesAtIndex for the beacon state. Updates the randao mixes
 // at a specific index to a new value.
 func (b *BeaconState) UpdateRandaoMixesAtIndex(idx uint64, val []byte) error {
-	if b.randaoMixes.TotalLength() <= idx {
+	if uint64(len(b.randaoMixes)) <= idx {
 		return errors.Errorf("invalid index provided %d", idx)
 	}
 	b.lock.Lock()
 	defer b.lock.Unlock()
 
-	b.randaoMixes.SetRootAtIndex(idx, bytesutil.ToBytes32(val))
+	mixes := b.randaoMixes
+	if refs := b.sharedFieldReferences[randaoMixes].Refs(); refs > 1 {
+		// Copy elements in underlying array by reference.
+		m := *b.randaoMixes
+		mCopy := m
+		mixes = &mCopy
+		b.sharedFieldReferences[randaoMixes].MinusRef()
+		b.sharedFieldReferences[randaoMixes] = stateutil.NewRef(1)
+	}
+
+	mixes[idx] = bytesutil.ToBytes32(val)
+	b.randaoMixes = mixes
 	b.markFieldAsDirty(randaoMixes)
 	b.addDirtyIndices(randaoMixes, []uint64{idx})
 

beacon-chain/state/state-native/v3/spec_constants.go

@@ -0,0 +1,7 @@
+package v3
+
+import "github.com/prysmaticlabs/prysm/config/params"
+
+func (b *BeaconState) InactivityPenaltyQuotient() uint64 {
+	return params.BeaconConfig().InactivityPenaltyQuotientBellatrix
+}

beacon-chain/state/state-native/v3/state_trie.go

@@ -36,8 +36,10 @@ func InitializeFromProtoUnsafe(st *ethpb.BeaconStateBellatrix) (state.BeaconStat
 		return nil, errors.New("received nil state")
 	}
 
-	bRoots := customtypes.SetFromSlice(st.BlockRoots)
-
+	var bRoots customtypes.BlockRoots
+	for i, r := range st.BlockRoots {
+		bRoots[i] = bytesutil.ToBytes32(r)
+	}
 	var sRoots customtypes.StateRoots
 	for i, r := range st.StateRoots {
 		sRoots[i] = bytesutil.ToBytes32(r)
@@ -46,7 +48,10 @@ func InitializeFromProtoUnsafe(st *ethpb.BeaconStateBellatrix) (state.BeaconStat
 	for i, r := range st.HistoricalRoots {
 		hRoots[i] = bytesutil.ToBytes32(r)
 	}
-	mixes := customtypes.SetFromSliceRandao(st.RandaoMixes)
+	var mixes customtypes.RandaoMixes
+	for i, m := range st.RandaoMixes {
+		mixes[i] = bytesutil.ToBytes32(m)
+	}
 
 	fieldCount := params.BeaconConfig().BeaconStateBellatrixFieldCount
 	b := &BeaconState{
@@ -55,7 +60,7 @@ func InitializeFromProtoUnsafe(st *ethpb.BeaconStateBellatrix) (state.BeaconStat
 		slot:                         st.Slot,
 		fork:                         st.Fork,
 		latestBlockHeader:            st.LatestBlockHeader,
-		blockRoots:                   bRoots,
+		blockRoots:                   &bRoots,
 		stateRoots:                   &sRoots,
 		historicalRoots:              hRoots,
 		eth1Data:                     st.Eth1Data,
@@ -63,7 +68,7 @@ func InitializeFromProtoUnsafe(st *ethpb.BeaconStateBellatrix) (state.BeaconStat
 		eth1DepositIndex:             st.Eth1DepositIndex,
 		validators:                   st.Validators,
 		balances:                     st.Balances,
-		randaoMixes:                  mixes,
+		randaoMixes:                  &mixes,
 		slashings:                    st.Slashings,
 		previousEpochParticipation:   st.PreviousEpochParticipation,
 		currentEpochParticipation:    st.CurrentEpochParticipation,
@@ -96,7 +101,9 @@ func InitializeFromProtoUnsafe(st *ethpb.BeaconStateBellatrix) (state.BeaconStat
 	}
 
 	// Initialize field reference tracking for shared data.
+	b.sharedFieldReferences[randaoMixes] = stateutil.NewRef(1)
 	b.sharedFieldReferences[stateRoots] = stateutil.NewRef(1)
+	b.sharedFieldReferences[blockRoots] = stateutil.NewRef(1)
 	b.sharedFieldReferences[previousEpochParticipationBits] = stateutil.NewRef(1) // New in Altair.
 	b.sharedFieldReferences[currentEpochParticipationBits] = stateutil.NewRef(1)  // New in Altair.
 	b.sharedFieldReferences[slashings] = stateutil.NewRef(1)
@@ -123,9 +130,9 @@ func (b *BeaconState) Copy() state.BeaconState {
 		eth1DepositIndex: b.eth1DepositIndex,
 
 		// Large arrays, infrequently changed, constant size.
-		randaoMixes:   b.randaoMixes.Copy(),
+		randaoMixes:   b.randaoMixes,
 		stateRoots:    b.stateRoots,
-		blockRoots:    b.blockRoots.Copy(),
+		blockRoots:    b.blockRoots,
 		slashings:     b.slashings,
 		eth1DataVotes: b.eth1DataVotes,
 
@@ -201,7 +208,6 @@ func (b *BeaconState) Copy() state.BeaconState {
 			}
 		}
 	}
-
 	state.StateCount.Inc()
 	// Finalizer runs when dst is being destroyed in garbage collection.
 	runtime.SetFinalizer(dst, func(b *BeaconState) {
@@ -211,9 +217,6 @@ func (b *BeaconState) Copy() state.BeaconState {
 				b.stateFieldLeaves[field].FieldReference().MinusRef()
 			}
 		}
-		b.blockRoots.DecreaseRef()
-		b.randaoMixes.DecreaseRef()
-
 		for i := 0; i < fieldCount; i++ {
 			field := types.FieldIndex(i)
 			delete(b.stateFieldLeaves, field)

beacon-chain/state/v1/spec_constants.go

@@ -0,0 +1,7 @@
+package v1
+
+import "github.com/prysmaticlabs/prysm/config/params"
+
+func (b *BeaconState) InactivityPenaltyQuotient() uint64 {
+	return params.BeaconConfig().InactivityPenaltyQuotient
+}

beacon-chain/state/v2/spec_constants.go

@@ -0,0 +1,7 @@
+package v1
+
+import "github.com/prysmaticlabs/prysm/config/params"
+
+func (b *BeaconState) InactivityPenaltyQuotient() uint64 {
+	return params.BeaconConfig().InactivityPenaltyQuotientAltair
+}

beacon-chain/state/v3/spec_constants.go

@@ -0,0 +1,7 @@
+package v1
+
+import "github.com/prysmaticlabs/prysm/config/params"
+
+func (b *BeaconState) InactivityPenaltyQuotient() uint64 {
+	return params.BeaconConfig().InactivityPenaltyQuotientBellatrix
+}

beacon-chain/sync/service.go

@@ -154,7 +154,6 @@ func NewService(ctx context.Context, opts ...Option) *Service {
 	}
 	r.subHandler = newSubTopicHandler()
 	r.rateLimiter = newRateLimiter(r.cfg.p2p)
-	r.initCaches()
 
 	go r.registerHandlers()
 	go r.verifierRoutine()
@@ -164,6 +163,8 @@ func NewService(ctx context.Context, opts ...Option) *Service {
 
 // Start the regular sync service.
 func (s *Service) Start() {
+	s.initCaches()
+
 	s.cfg.p2p.AddConnectionHandler(s.reValidatePeer, s.sendGoodbye)
 	s.cfg.p2p.AddDisconnectionHandler(func(_ context.Context, _ peer.ID) error {
 		// no-op

config/features/flags.go

@@ -144,7 +144,6 @@ var devModeFlags = []cli.Flag{
 	enablePeerScorer,
 	enableVecHTR,
 	enableForkChoiceDoublyLinkedTree,
-	enableNativeState,
 }
 
 // ValidatorFlags contains a list of all the feature flags that apply to the validator client.

consensus-types/interfaces.go

@@ -0,0 +1,72 @@
+package consensus_types
+
+import (
+	ssz "github.com/ferranbt/fastssz"
+	types "github.com/prysmaticlabs/eth2-types"
+	enginev1 "github.com/prysmaticlabs/prysm/proto/engine/v1"
+	ethpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1"
+	validatorpb "github.com/prysmaticlabs/prysm/proto/prysm/v1alpha1/validator-client"
+	"google.golang.org/protobuf/proto"
+)
+
+// SSZItem defines a struct which provides Marshal,
+// Unmarshal, and HashTreeRoot SSZ operations.
+type SSZItem interface {
+	ssz.Marshaler
+	ssz.Unmarshaler
+	ssz.HashRoot
+}
+
+// Container defines the base methods required for a consensus
+// data structure used in Prysm, containing utilities for SSZ
+// as well as conversion methods to a protobuf representation for use
+// with Prysm's gRPC API.
+type Container interface {
+	SSZItem
+	IsNil() bool
+	Proto() proto.Message
+	FromProto(m proto.Message)
+}
+
+// SignedBeaconBlock describes the method set of a signed beacon block.
+type SignedBeaconBlock interface {
+	Container
+	Block() BeaconBlock
+	Signature() []byte
+	Copy() SignedBeaconBlock
+	PbGenericBlock() (*ethpb.GenericSignedBeaconBlock, error)
+	PbPhase0Block() (*ethpb.SignedBeaconBlock, error)
+	PbAltairBlock() (*ethpb.SignedBeaconBlockAltair, error)
+	PbBellatrixBlock() (*ethpb.SignedBeaconBlockBellatrix, error)
+	PbBlindedBellatrixBlock() (*ethpb.SignedBlindedBeaconBlockBellatrix, error)
+	Header() (*ethpb.SignedBeaconBlockHeader, error)
+}
+
+// BeaconBlock describes an interface which states the methods
+// employed by an object that is a beacon block.
+type BeaconBlock interface {
+	Container
+	Slot() types.Slot
+	ProposerIndex() types.ValidatorIndex
+	ParentRoot() []byte
+	StateRoot() []byte
+	Body() BeaconBlockBody
+	AsSignRequestObject() validatorpb.SignRequestObject
+}
+
+// BeaconBlockBody describes the method set employed by an object
+// that is a beacon block body.
+type BeaconBlockBody interface {
+	Container
+	RandaoReveal() []byte
+	Eth1Data() *ethpb.Eth1Data
+	Graffiti() []byte
+	ProposerSlashings() []*ethpb.ProposerSlashing
+	AttesterSlashings() []*ethpb.AttesterSlashing
+	Attestations() []*ethpb.Attestation
+	Deposits() []*ethpb.Deposit
+	VoluntaryExits() []*ethpb.SignedVoluntaryExit
+	SyncAggregate() (*ethpb.SyncAggregate, error)
+	ExecutionPayload() (*enginev1.ExecutionPayload, error)
+	ExecutionPayloadHeader() (*ethpb.ExecutionPayloadHeader, error)
+}

nogo_config.json

@@ -1,7 +1,6 @@
 {
   "unsafeptr": {
     "exclude_files": {
-      "beacon-chain/state/state-native/custom-types/block_roots.go": "Needed for field management operations",
       "external/.*": "Unsafe third party code",
       "rules_go_work-.*": "Third party code"
     }

validator/client/service.go

@@ -101,7 +101,7 @@ type Config struct {
 // registry.
 func NewValidatorService(ctx context.Context, cfg *Config) (*ValidatorService, error) {
 	ctx, cancel := context.WithCancel(ctx)
-	s := &ValidatorService{
+	return &ValidatorService{
 		ctx:                   ctx,
 		cancel:                cancel,
 		endpoint:              cfg.Endpoint,
@@ -124,35 +124,34 @@ func NewValidatorService(ctx context.Context, cfg *Config) (*ValidatorService, e
 		logDutyCountDown:      cfg.LogDutyCountDown,
 		Web3SignerConfig:      cfg.Web3SignerConfig,
 		feeRecipientConfig:    cfg.FeeRecipientConfig,
-	}
-
-	dialOpts := ConstructDialOptions(
-		s.maxCallRecvMsgSize,
-		s.withCert,
-		s.grpcRetries,
-		s.grpcRetryDelay,
-	)
-	if dialOpts == nil {
-		return s, nil
-	}
-
-	s.ctx = grpcutil.AppendHeaders(ctx, s.grpcHeaders)
-
-	conn, err := grpc.DialContext(ctx, s.endpoint, dialOpts...)
-	if err != nil {
-		return s, err
-	}
-	if s.withCert != "" {
-		log.Info("Established secure gRPC connection")
-	}
-	s.conn = conn
-
-	return s, nil
+	}, nil
 }
 
 // Start the validator service. Launches the main go routine for the validator
 // client.
 func (v *ValidatorService) Start() {
+	dialOpts := ConstructDialOptions(
+		v.maxCallRecvMsgSize,
+		v.withCert,
+		v.grpcRetries,
+		v.grpcRetryDelay,
+	)
+	if dialOpts == nil {
+		return
+	}
+
+	v.ctx = grpcutil.AppendHeaders(v.ctx, v.grpcHeaders)
+
+	conn, err := grpc.DialContext(v.ctx, v.endpoint, dialOpts...)
+	if err != nil {
+		log.Errorf("Could not dial endpoint: %s, %v", v.endpoint, err)
+		return
+	}
+	if v.withCert != "" {
+		log.Info("Established secure gRPC connection")
+	}
+
+	v.conn = conn
 	cache, err := ristretto.NewCache(&ristretto.Config{
 		NumCounters: 1920, // number of keys to track.
 		MaxCost:     192,  // maximum cost of cache, 1 item = 1 cost.

validator/client/service_test.go

@@ -2,6 +2,7 @@ package client
 
 import (
 	"context"
+	"strings"
 	"testing"
 	"time"
 
@@ -32,11 +33,36 @@ func TestStop_CancelsContext(t *testing.T) {
 	}
 }
 
-func TestNew_Insecure(t *testing.T) {
+func TestLifecycle(t *testing.T) {
 	hook := logTest.NewGlobal()
-	_, err := NewValidatorService(context.Background(), &Config{})
-	require.NoError(t, err)
+	// Use canceled context so that the run function exits immediately..
+	ctx, cancel := context.WithCancel(context.Background())
+	cancel()
+	validatorService := &ValidatorService{
+		ctx:      ctx,
+		cancel:   cancel,
+		endpoint: "merkle tries",
+		withCert: "alice.crt",
+	}
+	validatorService.Start()
+	require.NoError(t, validatorService.Stop(), "Could not stop service")
+	require.LogsContain(t, hook, "Stopping service")
+}
+
+func TestLifecycle_Insecure(t *testing.T) {
+	hook := logTest.NewGlobal()
+	// Use canceled context so that the run function exits immediately.
+	ctx, cancel := context.WithCancel(context.Background())
+	cancel()
+	validatorService := &ValidatorService{
+		ctx:      ctx,
+		cancel:   cancel,
+		endpoint: "merkle tries",
+	}
+	validatorService.Start()
 	require.LogsContain(t, hook, "You are using an insecure gRPC connection")
+	require.NoError(t, validatorService.Stop(), "Could not stop service")
+	require.LogsContain(t, hook, "Stopping service")
 }
 
 func TestStatus_NoConnectionError(t *testing.T) {
@@ -46,7 +72,9 @@ func TestStatus_NoConnectionError(t *testing.T) {
 
 func TestStart_GrpcHeaders(t *testing.T) {
 	hook := logTest.NewGlobal()
-	ctx := context.Background()
+	// Use canceled context so that the run function exits immediately.
+	ctx, cancel := context.WithCancel(context.Background())
+	cancel()
 	for input, output := range map[string][]string{
 		"should-break": {},
 		"key=value":    {"key", "value"},
@@ -59,9 +87,13 @@ func TestStart_GrpcHeaders(t *testing.T) {
 			"Authorization", "this is a valid value",
 		},
 	} {
-		cfg := &Config{GrpcHeadersFlag: input}
-		validatorService, err := NewValidatorService(ctx, cfg)
-		require.NoError(t, err)
+		validatorService := &ValidatorService{
+			ctx:         ctx,
+			cancel:      cancel,
+			endpoint:    "merkle tries",
+			grpcHeaders: strings.Split(input, ","),
+		}
+		validatorService.Start()
 		md, _ := metadata.FromOutgoingContext(validatorService.ctx)
 		if input == "should-break" {
 			require.LogsContain(t, hook, "Incorrect gRPC header flag format. Skipping should-break")

validator/rpc/health_test.go

@@ -46,7 +46,7 @@ func TestServer_GetBeaconNodeConnection(t *testing.T) {
 	require.NoError(t, err)
 	want := &pb.NodeConnectionResponse{
 		BeaconNodeEndpoint: endpoint,
-		Connected:          true,
+		Connected:          false,
 		Syncing:            false,
 		GenesisTime:        uint64(time.Unix(0, 0).Unix()),
 	}