forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 18:32:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix preimage issue in conversion

Browse source
This commit is contained in:
Guillaume Ballet 2023-08-15 10:19:37 +02:00
parent a72e7d94a2
commit 5ba9fb7855
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/state_processor.go
View file

@ -216,23 +216,25 @@ func (p *StateProcessor) Process(block *types.Block, statedb *state.StateDB, cfg
} }
copy(safeValue[32-len(value):], value) copy(safeValue[32-len(value):], value)
var slotnr [32]byte var slotnr []byte
if hasPreimagesBin { if hasPreimagesBin {
if _, err := io.ReadFull(fpreimages, slotnr[:]); err != nil { var s [32]byte
slotnr = s[:]
if _, err := io.ReadFull(fpreimages, slotnr); err != nil {
return nil, nil, 0, fmt.Errorf("reading preimage file: %s", err) return nil, nil, 0, fmt.Errorf("reading preimage file: %s", err)
} }
} else { } else {
slotnr := rawdb.ReadPreimage(migrdb.DiskDB(), stIt.Hash()) slotnr = rawdb.ReadPreimage(migrdb.DiskDB(), stIt.Hash())
if len(slotnr) != 32 { if len(slotnr) != 32 {
return nil, nil, 0, fmt.Errorf("slotnr len is zero is not 32: %d", len(slotnr)) return nil, nil, 0, fmt.Errorf("slotnr len is zero is not 32: %d", len(slotnr))
} }
} }
if crypto.Keccak256Hash(slotnr[:]) != stIt.Hash() { if crypto.Keccak256Hash(slotnr[:]) != stIt.Hash() {
return nil, nil, 0, fmt.Errorf("preimage file does not match storage hash: %s!=%s", crypto.Keccak256Hash(slotnr[:]), stIt.Hash()) return nil, nil, 0, fmt.Errorf("preimage file does not match storage hash: %s!=%s", crypto.Keccak256Hash(slotnr), stIt.Hash())
} }
preimageSeek += int64(len(slotnr)) preimageSeek += int64(len(slotnr))
mkv.addStorageSlot(migrdb.GetCurrentAccountAddress().Bytes(), slotnr[:], safeValue[:]) mkv.addStorageSlot(migrdb.GetCurrentAccountAddress().Bytes(), slotnr, safeValue[:])
// advance the storage iterator // advance the storage iterator
migrdb.SetStorageProcessed(!stIt.Next()) migrdb.SetStorageProcessed(!stIt.Next())