Skip to content
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

Jump to bottom

Amend incarnation logic #8954

Merged
merged 16 commits into from
Dec 12, 2023
Merged

Amend incarnation logic #8954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
2d57f66
Check incarnation in accountsEqual
yperbasis Oct 24, 2023
3ee08c7
Amend incarnation logic
yperbasis Oct 24, 2023
4d733da
Merge branch 'devel' into phoenix
yperbasis Oct 24, 2023
c57cfbb
Merge branch 'devel' into phoenix
yperbasis Oct 31, 2023
82a2846
Merge branch 'devel' into phoenix
yperbasis Nov 8, 2023
e796b30
trace logging
yperbasis Nov 14, 2023
bac9c5a
sort keys for logging
yperbasis Nov 14, 2023
f8d3fa6
log incarnation
yperbasis Nov 14, 2023
228f383
rework PrevIncarnation logic
yperbasis Nov 14, 2023
09703f4
Merge branch 'devel' into phoenix
yperbasis Nov 14, 2023
7c88a7d
Update IncarnationMap for resurrected accounts
yperbasis Dec 8, 2023
8e4f5e6
Revert "log incarnation"
yperbasis Dec 8, 2023
4361b50
Revert "sort keys for logging"
yperbasis Dec 8, 2023
c96e535
Revert "trace logging"
yperbasis Dec 8, 2023
0be4c98
Merge branch 'devel' into phoenix
yperbasis Dec 8, 2023
44137c9
Merge branch 'devel' into phoenix
yperbasis Dec 11, 2023
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
5 changes: 4 additions & 1 deletion core/state/change_set_writer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ package state

import (
"fmt"
"github.com/ledgerwatch/erigon-lib/kv/dbutils"

"github.com/holiman/uint256"

libcommon "github.com/ledgerwatch/erigon-lib/common"
"github.com/ledgerwatch/erigon-lib/common/hexutility"
"github.com/ledgerwatch/erigon-lib/kv"
"github.com/ledgerwatch/erigon-lib/kv/dbutils"
historyv22 "github.com/ledgerwatch/erigon-lib/kv/temporal/historyv2"

"github.com/ledgerwatch/erigon/core/types/accounts"
Expand Down Expand Up @@ -70,6 +71,8 @@ func accountsEqual(a1, a2 *accounts.Account) bool {
return false
} else if a1.Balance.Cmp(&a2.Balance) != 0 {
return false
} else if a1.Incarnation != a2.Incarnation {
return false
}
if a1.IsEmptyCodeHash() {
if !a2.IsEmptyCodeHash() {
Expand Down
12 changes: 11 additions & 1 deletion core/state/db_state_writer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@ import (
"bytes"
"encoding/binary"
"fmt"
dbutils2 "github.com/ledgerwatch/erigon-lib/kv/dbutils"

"github.com/RoaringBitmap/roaring/roaring64"
"github.com/holiman/uint256"

libcommon "github.com/ledgerwatch/erigon-lib/common"
"github.com/ledgerwatch/erigon-lib/kv"
"github.com/ledgerwatch/erigon-lib/kv/bitmapdb"
dbutils2 "github.com/ledgerwatch/erigon-lib/kv/dbutils"
"github.com/ledgerwatch/erigon-lib/kv/temporal/historyv2"

"github.com/ledgerwatch/erigon/common/math"
Expand Down Expand Up @@ -74,6 +75,15 @@ func (dsw *DbStateWriter) UpdateAccountData(address libcommon.Address, original,
if err := dsw.db.Put(kv.HashedAccounts, addrHash[:], value); err != nil {
return err
}

if account.Incarnation == 0 && original.Incarnation > 0 {
Copy link
Collaborator

@AskAlexSharov AskAlexSharov Dec 12, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not if original.Incarnation > account.Incarnation { ?

Copy link
Member Author

@yperbasis yperbasis Dec 12, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that in that case IncarnationMap isn't too relevant. My understanding is that IncarnationMap is relevant when a contract is self-destructed and then recreated as a smart contract. Within a block, IntraBlockState rather than IncarnationMap is used to determine the right incarnation. But here we're treating a special corner case when at the end of the block a contract is destroyed and then re-recreated as a non-smart account (account.Incarnation == 0).

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here the lines I'm adding to UpdateAccountData are copy-pasted from DeleteAccount.

var b [8]byte
binary.BigEndian.PutUint64(b[:], original.Incarnation)
if err := dsw.db.Put(kv.IncarnationMap, address[:], b[:]); err != nil {
return err
}
}

return nil
}

Expand Down
18 changes: 10 additions & 8 deletions core/state/intra_block_state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,23 +547,25 @@ func (sdb *IntraBlockState) createObject(addr libcommon.Address, previous *state
func (sdb *IntraBlockState) CreateAccount(addr libcommon.Address, contractCreation bool) {
var prevInc uint64
previous := sdb.getStateObject(addr)
if contractCreation {
if previous != nil && previous.selfdestructed {
prevInc = previous.data.Incarnation
if previous != nil && previous.selfdestructed {
prevInc = previous.data.Incarnation
} else {
if inc, err := sdb.stateReader.ReadAccountIncarnation(addr); err == nil {
prevInc = inc
} else {
if inc, err := sdb.stateReader.ReadAccountIncarnation(addr); err == nil {
prevInc = inc
} else {
sdb.savedErr = err
}
sdb.savedErr = err
}
}
if previous != nil && prevInc < previous.data.PrevIncarnation {
prevInc = previous.data.PrevIncarnation
}

newObj := sdb.createObject(addr, previous)
if previous != nil && !previous.selfdestructed {
newObj.data.Balance.Set(&previous.data.Balance)
}
newObj.data.Initialised = true
newObj.data.PrevIncarnation = prevInc

if contractCreation {
newObj.createdContract = true
Expand Down
11 changes: 10 additions & 1 deletion core/state/plain_state_writer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ package state

import (
"encoding/binary"
"github.com/ledgerwatch/erigon-lib/kv/dbutils"

"github.com/holiman/uint256"

libcommon "github.com/ledgerwatch/erigon-lib/common"
"github.com/ledgerwatch/erigon-lib/kv"
"github.com/ledgerwatch/erigon-lib/kv/dbutils"

"github.com/ledgerwatch/erigon/core/types/accounts"
"github.com/ledgerwatch/erigon/turbo/shards"
Expand Down Expand Up @@ -56,6 +57,14 @@ func (w *PlainStateWriter) UpdateAccountData(address libcommon.Address, original
w.accumulator.ChangeAccount(address, account.Incarnation, value)
}

if account.Incarnation == 0 && original.Incarnation > 0 {
var b [8]byte
binary.BigEndian.PutUint64(b[:], original.Incarnation)
if err := w.db.Put(kv.IncarnationMap, address[:], b[:]); err != nil {
return err
}
}

return w.db.Put(kv.PlainState, address[:], value)
}

Expand Down
13 changes: 7 additions & 6 deletions core/types/accounts/account.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@ import (
// These objects are stored in the main account trie.
// DESCRIBED: docs/programmers_guide/guide.md#ethereum-state
type Account struct {
Initialised bool
Nonce uint64
Balance uint256.Int
Root libcommon.Hash // merkle root of the storage trie
CodeHash libcommon.Hash // hash of the bytecode
Incarnation uint64
Initialised bool
Nonce uint64
Balance uint256.Int
Root libcommon.Hash // merkle root of the storage trie
CodeHash libcommon.Hash // hash of the bytecode
Incarnation uint64
PrevIncarnation uint64
}

const (
Expand Down
Loading