Skip to content

core/state: various fixes in EIP-7928 #34641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jwasinger merged 4 commits into from
Apr 3, 2026
+8 −7
Merged

core/state: various fixes in EIP-7928 #34641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
68d390d
core/state: fix setError in BAL ST
s1na Apr 2, 2026
c698661
Fix balance change txindex check
s1na Apr 2, 2026
a5aee0d
fix origin code hash
s1na Apr 2, 2026
d834cd6
Apply suggestion from @jwasinger
jwasinger Apr 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions core/state/bal_state_transition.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ func (s *BALStateTransition) Error() error {
}

func (s *BALStateTransition) setError(err error) {
if s.err != nil {
if s.err == nil {
s.err = err
}
}
Expand Down Expand Up @@ -169,10 +169,11 @@ func (s *BALStateTransition) commitAccount(addr common.Address) (*accountUpdate,
)
op := &accountUpdate{
address: addr,
data: types.SlimAccountRLP(*s.postStates[addr]), // TODO: cache the updated state acocunt somewhere
data: types.SlimAccountRLP(*s.postStates[addr]), // TODO: cache the updated state account somewhere
}
if prestate, exist := s.prestates.Load(addr); exist {
prestate := prestate.(*types.StateAccount)
var prestate *types.StateAccount
if ps, exist := s.prestates.Load(addr); exist {
prestate = ps.(*types.StateAccount)
op.origin = types.SlimAccountRLP(*prestate)
}

Expand All @@ -181,10 +182,10 @@ func (s *BALStateTransition) commitAccount(addr common.Address) (*accountUpdate,
hash: crypto.Keccak256Hash(s.diffs[addr].Code),
blob: s.diffs[addr].Code,
}
if op.origin == nil {
if prestate == nil {
code.originHash = types.EmptyCodeHash
} else {
code.originHash = crypto.Keccak256Hash(op.origin)
code.originHash = common.BytesToHash(prestate.CodeHash)
}
op.code = &code
}
Expand Down
2 changes: 1 addition & 1 deletion core/types/bal/bal_encoding.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ func (e *AccountAccess) validate(blockTxCount int) error {
return errors.New("balance changes not in ascending order by tx index")
}

if len(e.BalanceChanges) > 0 && int(e.BalanceChanges[len(e.BalanceChanges)-1].TxIdx) > blockTxCount+2 {
if len(e.BalanceChanges) > 0 && int(e.BalanceChanges[len(e.BalanceChanges)-1].TxIdx) > blockTxCount+1 {
return errors.New("highest balance change index beyond what is allowed")
}
// check that the balance values are set and there are no duplicate index entries
Expand Down
Loading