mirror of
https://github.com/OffchainLabs/prysm.git
synced 2026-01-09 15:37:56 -05:00
Using the multi value slice for the beacon state (#12549)
* in progress... * in progress... * remove log * log root * Revert "Auxiliary commit to revert individual files from f12a609ea2a2f1e87e97321f3a717cd324b5ae97" This reverts commit 5ae35edb6477d8d0ea4e94b273efc6590484da85. * cleanup * remove log * remove whitespace * remove logs * more stuff * copy * always rebuild trie * revert * add state * init state * fix all * uintptr * move slice to new package * lock in `Detach` * remove constraint * reorder * blockroots and stateroots * fill roots in empty() * fix hasher * implement slice for balances and inactivity scores * detach in setters * Revert "implement slice for balances and inactivity scores" This reverts commit59eb9df8d7. # Conflicts: # beacon-chain/state/state-native/setters_validator.go * use counter to track states * typos * rename interface * balances * gauge * some improvements * first try with map * fix * inactivity scores in progress * fix test # Conflicts: # beacon-chain/state/state-native/helpers_test.go * test fixes * ToProto fix * copy roots * validators * build fixes * fix bug in `ToProto` * fix fuzz test * fix bug in slice getters * fix state equality checks * make tests pass * make tests pass * more test updates * Revert "Auxiliary commit to revert individual files from 34e7344bff08a589e6341bb1829e3cb74159e878" This reverts commit ecd64efa8917f37ca41460e0356ff007fe55dd9d. * Revert "make tests pass" This reverts commit0cf00f19ee. * Revert "make tests pass" This reverts commit521b65e1d2. * pass tests * deepequal identifiable types * Deflake `cloners_test.go` * feature flag for block roots * feature flag * remove recursive locks * reduce complexity of rootSelector * fix randao mixes root * some fixes * revisit tests * revert change to field trie helpers * initialize field map for tests * remove whitespace * initialize roots with proper length * more fixes * out of bounds message fix * optimize length calculation * remove call to Len in PubkeyAtIndex * don't log deposits * unit tests * unit tests * fix * comments * test fixes * id * remove Enumerator interface * review feedback * simplify field trie * bring back fieldtrie package * fix bazel file * use handle32ByteArrays for root computation * fix locks * metrics * bzl * simplify some things * use htr in state test * remove code from require package * gzl * more htr * Fuzzing of the multi-value slice * assert values * getter optimizations * use At when reading from validators * Nishant's review * restore safe copy * remove empty line * build fix * restore how we get root at index for deafult mode * more review comments * optimize default behavior * simplify Slice calls * test fix * remove unnecessary package * remove unused setter * make fieldMap unexported * some improvements in state package * call `Slice` instead of manually copying * unlock in ReadFromEveryValidator * Potuz's comments * lock the state when reading from all validators # Conflicts: # beacon-chain/state/state-native/getters_validator.go * add back preston's changes * add index --------- Co-authored-by: Potuz <potuz@prysmaticlabs.com> Co-authored-by: nisdas <nishdas93@gmail.com> Co-authored-by: Preston Van Loon <pvanloon@offchainlabs.com>
This commit is contained in:
@@ -89,24 +89,65 @@ func (s *PremineGenesisConfig) prepare(ctx context.Context) (state.BeaconState,
|
||||
func (s *PremineGenesisConfig) empty() (state.BeaconState, error) {
|
||||
var e state.BeaconState
|
||||
var err error
|
||||
|
||||
bRoots := make([][]byte, fieldparams.BlockRootsLength)
|
||||
for i := range bRoots {
|
||||
bRoots[i] = bytesutil.PadTo([]byte{}, 32)
|
||||
}
|
||||
sRoots := make([][]byte, fieldparams.StateRootsLength)
|
||||
for i := range sRoots {
|
||||
sRoots[i] = bytesutil.PadTo([]byte{}, 32)
|
||||
}
|
||||
mixes := make([][]byte, fieldparams.RandaoMixesLength)
|
||||
for i := range mixes {
|
||||
mixes[i] = bytesutil.PadTo([]byte{}, 32)
|
||||
}
|
||||
|
||||
switch s.Version {
|
||||
case version.Phase0:
|
||||
e, err = state_native.InitializeFromProtoPhase0(ðpb.BeaconState{})
|
||||
e, err = state_native.InitializeFromProtoPhase0(ðpb.BeaconState{
|
||||
BlockRoots: bRoots,
|
||||
StateRoots: sRoots,
|
||||
RandaoMixes: mixes,
|
||||
Balances: []uint64{},
|
||||
Validators: []*ethpb.Validator{},
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
case version.Altair:
|
||||
e, err = state_native.InitializeFromProtoAltair(ðpb.BeaconStateAltair{})
|
||||
e, err = state_native.InitializeFromProtoAltair(ðpb.BeaconStateAltair{
|
||||
BlockRoots: bRoots,
|
||||
StateRoots: sRoots,
|
||||
RandaoMixes: mixes,
|
||||
Balances: []uint64{},
|
||||
InactivityScores: []uint64{},
|
||||
Validators: []*ethpb.Validator{},
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
case version.Bellatrix:
|
||||
e, err = state_native.InitializeFromProtoBellatrix(ðpb.BeaconStateBellatrix{})
|
||||
e, err = state_native.InitializeFromProtoBellatrix(ðpb.BeaconStateBellatrix{
|
||||
BlockRoots: bRoots,
|
||||
StateRoots: sRoots,
|
||||
RandaoMixes: mixes,
|
||||
Balances: []uint64{},
|
||||
InactivityScores: []uint64{},
|
||||
Validators: []*ethpb.Validator{},
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
case version.Capella:
|
||||
e, err = state_native.InitializeFromProtoCapella(ðpb.BeaconStateCapella{})
|
||||
e, err = state_native.InitializeFromProtoCapella(ðpb.BeaconStateCapella{
|
||||
BlockRoots: bRoots,
|
||||
StateRoots: sRoots,
|
||||
RandaoMixes: mixes,
|
||||
Balances: []uint64{},
|
||||
InactivityScores: []uint64{},
|
||||
Validators: []*ethpb.Validator{},
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -121,12 +162,6 @@ func (s *PremineGenesisConfig) empty() (state.BeaconState, error) {
|
||||
if err = e.SetSlot(0); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err = e.SetValidators([]*ethpb.Validator{}); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err = e.SetBalances([]uint64{}); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err = e.SetJustificationBits([]byte{0}); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user