AtHeartEngineer/prysm
1
1
Fork 0
mirror of https://github.com/OffchainLabs/prysm.git synced 2026-04-19 03:01:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

harden hdiff state lookups with summary and state-root checks

Browse Source
This commit is contained in:
Preston Van Loon
2026-02-10 21:20:04 -06:00
parent 2ec87e23fb
commit f9cf80feaf
2 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
beacon-chain/db/kv/state.go
View File

@@ -1048,10 +1048,15 @@ func (s *Store) isStateValidatorMigrationOver() (bool, error) {
}
func (s *Store) getStateUsingStateDiff(ctx context.Context, blockRoot [32]byte) (state.BeaconState, error) {
slot, err := s.SlotByBlockRoot(ctx, blockRoot)
stateSummary, err := s.StateSummary(ctx, blockRoot)
if err != nil {
return nil, err
}
if stateSummary == nil {
return nil, ErrNotFoundState
}
slot := stateSummary.Slot
if uint64(slot) < s.getOffset() {
return nil, ErrSlotBeforeOffset
@@ -1065,14 +1070,33 @@ func (s *Store) getStateUsingStateDiff(ctx context.Context, blockRoot [32]byte)
return nil, errors.New("state not found")
}
blk, err := s.Block(ctx, blockRoot)
if err != nil {
return nil, err
}
if blk != nil && !blk.IsNil() {
stateRoot, err := st.HashTreeRoot(ctx)
if err != nil {
return nil, err
}
if stateRoot != blk.Block().StateRoot() {
return nil, errors.Wrap(ErrNotFoundState, "state root mismatch for block")
}
}
return st, nil
}
func (s *Store) hasStateUsingStateDiff(ctx context.Context, blockRoot [32]byte) (bool, error) {
slot, err := s.SlotByBlockRoot(ctx, blockRoot)
stateSummary, err := s.StateSummary(ctx, blockRoot)
if err != nil {
return false, err
}
if stateSummary == nil {
return false, nil
}
slot := stateSummary.Slot
if uint64(slot) < s.getOffset() {
return false, ErrSlotBeforeOffset

25
beacon-chain/db/kv/state_test.go
View File

@@ -26,7 +26,6 @@ import (
"github.com/OffchainLabs/prysm/v7/testing/assert"
"github.com/OffchainLabs/prysm/v7/testing/require"
"github.com/OffchainLabs/prysm/v7/testing/util"
logTest "github.com/sirupsen/logrus/hooks/test"
bolt "go.etcd.io/bbolt"
)
@@ -1349,7 +1348,7 @@ func TestStore_CanSaveRetrieveStateUsingStateDiff(t *testing.T) {
readSt, err := db.State(context.Background(), [32]byte{'A'})
require.IsNil(t, readSt)
require.ErrorContains(t, "neither state summary nor block found", err)
require.ErrorIs(t, err, ErrNotFoundState)
})
t.Run("Slot not in tree", func(t *testing.T) {
@@ -1477,14 +1476,8 @@ func TestStore_CanSaveRetrieveStateUsingStateDiff(t *testing.T) {
require.NoError(t, err)
readSt, err := db.State(context.Background(), r)
require.NoError(t, err)
require.NotNil(t, readSt)
stSSZ, err := st.MarshalSSZ()
require.NoError(t, err)
readStSSZ, err := readSt.MarshalSSZ()
require.NoError(t, err)
require.DeepSSZEqual(t, stSSZ, readStSSZ)
require.ErrorIs(t, err, ErrNotFoundState)
require.IsNil(t, readSt)
})
}
})
@@ -1578,14 +1571,8 @@ func TestStore_CanSaveRetrieveStateUsingStateDiff(t *testing.T) {
require.NoError(t, err)
readSt, err := db.State(context.Background(), r)
require.NoError(t, err)
require.NotNil(t, readSt)
stSSZ, err := st.MarshalSSZ()
require.NoError(t, err)
readStSSZ, err := readSt.MarshalSSZ()
require.NoError(t, err)
require.DeepSSZEqual(t, stSSZ, readStSSZ)
require.ErrorIs(t, err, ErrNotFoundState)
require.IsNil(t, readSt)
})
}
})
@@ -1594,7 +1581,6 @@ func TestStore_CanSaveRetrieveStateUsingStateDiff(t *testing.T) {
func TestStore_HasStateUsingStateDiff(t *testing.T) {
t.Run("No state summary or block", func(t *testing.T) {
hook := logTest.NewGlobal()
db := setupDB(t)
featCfg := &features.Flags{}
featCfg.EnableStateDiff = true
@@ -1607,7 +1593,6 @@ func TestStore_HasStateUsingStateDiff(t *testing.T) {
hasSt := db.HasState(t.Context(), [32]byte{'A'})
require.Equal(t, false, hasSt)
require.LogsContain(t, hook, "neither state summary nor block found")
})
t.Run("slot in tree or not", func(t *testing.T) {