Skip to content

fix(state): correct (TxIndex, Incarnation) ordering in refreshVersionedAccount #18153

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

Open
VolodymyrBg wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(state): correct (TxIndex, Incarnation) ordering in refreshVersionedAccount #18153

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions execution/state/intra_block_state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -901,15 +901,15 @@ func (sdb *IntraBlockState) refreshVersionedAccount(addr accounts.Address, readA
if err != nil {
return nil, UnknownSource, UnknownVersion, err
}
if bversion.TxIndex >= readVersion.TxIndex {
if bversion.TxIndex > readVersion.TxIndex || (bversion.TxIndex == readVersion.TxIndex && bversion.Incarnation >= readVersion.Incarnation) {
if balance.Cmp(&account.Balance) != 0 {
if account == readAccount {
account = &accounts.Account{}
account.Copy(readAccount)
}
account.Balance = balance
}
if bversion.TxIndex > version.TxIndex || (bversion.TxIndex > version.TxIndex && bversion.Incarnation > version.Incarnation) {
if bversion.TxIndex > version.TxIndex || (bversion.TxIndex == version.TxIndex && bversion.Incarnation > version.Incarnation) {
version = bversion
if bsource != source {
source = bsource
Expand All @@ -921,15 +921,15 @@ func (sdb *IntraBlockState) refreshVersionedAccount(addr accounts.Address, readA
if err != nil {
return nil, UnknownSource, UnknownVersion, err
}
if nversion.TxIndex >= readVersion.TxIndex {
if nversion.TxIndex > readVersion.TxIndex || (nversion.TxIndex == readVersion.TxIndex && nversion.Incarnation >= readVersion.Incarnation) {
if nonce > account.Nonce {
if account == readAccount {
account = &accounts.Account{}
account.Copy(readAccount)
}
account.Nonce = nonce
}
if nversion.TxIndex > version.TxIndex || (nversion.TxIndex > version.TxIndex && nversion.Incarnation > version.Incarnation) {
if nversion.TxIndex > version.TxIndex || (nversion.TxIndex == version.TxIndex && nversion.Incarnation > version.Incarnation) {
version = nversion
if nsource != source {
source = nsource
Expand All @@ -942,15 +942,15 @@ func (sdb *IntraBlockState) refreshVersionedAccount(addr accounts.Address, readA
return nil, UnknownSource, UnknownVersion, err
}

if cversion.TxIndex >= readVersion.TxIndex {
if cversion.TxIndex > readVersion.TxIndex || (cversion.TxIndex == readVersion.TxIndex && cversion.Incarnation >= readVersion.Incarnation) {
if codeHash != account.CodeHash {
if account == readAccount {
account = &accounts.Account{}
account.Copy(readAccount)
}
account.CodeHash = codeHash
}
if cversion.TxIndex > version.TxIndex || (cversion.TxIndex > version.TxIndex && cversion.Incarnation > version.Incarnation) {
if cversion.TxIndex > version.TxIndex || (cversion.TxIndex == version.TxIndex && cversion.Incarnation > version.Incarnation) {
version = cversion
if csource != source {
source = csource
Expand Down