core/state: move state account to core/types + abstracted "write account to trie" #23567

gballet · 2021-09-13T13:25:46Z

The verkle trie and state expiry EIPs propose a different way of storing the accounts. As a preparatory work, this PR abstracts account is stored inside the tree, and the implementation details are left to the tree code itself.

Note this is useful beyond verkle trees, as any other tree format will eventually require this change if they are to cohabit with MPTs during the transition period.

holiman · 2021-09-13T18:38:46Z

eth/protocols/snap/handler.go

@@ -319,7 +319,7 @@ func handleMessage(backend Backend, peer *Peer) error {
 				if err != nil {
 					return p2p.Send(peer.rw, StorageRangesMsg, &StorageRangesPacket{ID: req.ID})
 				}
-				var acc state.Account
+				var acc accounT.Account


Suggested change

var acc accounT.Account

var acc account.Account

Is that intentional? That's a definite "Nope" IMO

holiman · 2021-09-13T18:39:28Z

eth/protocols/snap/handler.go

@@ -319,7 +319,7 @@ func handleMessage(backend Backend, peer *Peer) error {
 				if err != nil {
 					return p2p.Send(peer.rw, StorageRangesMsg, &StorageRangesPacket{ID: req.ID})
 				}
-				var acc state.Account
+				var acc accounT.Account


Is that intentional? That's a definite "Nope" IMO

holiman · 2021-09-13T18:39:43Z

eth/protocols/snap/sync.go

@@ -31,6 +31,7 @@ import (
 	"github.com/ethereum/go-ethereum/common/math"
 	"github.com/ethereum/go-ethereum/core/rawdb"
 	"github.com/ethereum/go-ethereum/core/state"
+	accounT "github.com/ethereum/go-ethereum/core/state/account"


seriously though, there is clearly a name clash, if you have a better naming suggestion, I'm happy to update.

Actually, I do have a better sugggestion. Essentially, what you're doing is creating a separate package which contains the state types. As of right now, there's only one type. So how about having an account.go inside core/state/types.?

trie/secure_trie.go

core/state/account/account.go

holiman · 2021-09-13T18:49:32Z

core/state/state_object.go

-func (s *stateObject) EncodeRLP(w io.Writer) error {
-	return rlp.Encode(w, s.data)
-}


Before you remove it completely, might be better to place a panic in it, to make sure we never ever use it aside from the locations where you've alredy replaced it with rlp.Encode(object.data)

light/trie.go

trie/secure_trie.go

Co-authored-by: Martin Holst Swende <martin@swende.se>

holiman · 2021-09-21T08:28:05Z

core/state/state_object.go

+func (s *stateObject) EncodeRLP(io.Writer) error {
+	panic("deprecated code, should not be called")


this should be reverted

holiman · 2021-09-22T09:32:40Z

trie/secure_trie.go

@@ -85,6 +87,21 @@ func (t *SecureTrie) TryGetNode(path []byte) ([]byte, int, error) {
 	return t.trie.TryGetNode(path)
 }

+// TryUpdate account will abstract the write of an account to the
+// secure trie.
+func (t *SecureTrie) TryUpdateAccount(key []byte, acc *types.StateAccount) error {


This method uses a pointer acc *types.StateAccount, but trie.TryUpdateAccount uses account types.StateAccount. Is there any particular reason not to be consistent?

holiman · 2021-09-22T09:34:00Z

core/state/statedb.go

-	}
-	if err = s.trie.TryUpdate(addr[:], data); err != nil {
+	if err := s.trie.TryUpdateAccount(addr[:], &obj.data); err != nil {
+		//if err := s.trie.TryUpdateAccount(addr[:], obj.data); err != nil {


remove this line

holiman

One remaining question from my side, but I think it's ok. LGTM

holiman · 2021-09-27T13:00:56Z

core/state/state_object.go

@@ -130,7 +122,7 @@ func newObject(db *StateDB, address common.Address, data Account) *stateObject {

 // EncodeRLP implements rlp.Encoder.
 func (s *stateObject) EncodeRLP(w io.Writer) error {
-	return rlp.Encode(w, s.data)
+	return rlp.Encode(w, &s.data)


This changes.. something? Not sure if it makes any difference -- but is it safe?

it won't make any difference because this EncodeRLP is not called anymore. I don't think that it will hurt in any case, and would save a copy when called.

…unt to trie" (ethereum#23567) * core/state: abstracted "write account to trie" method * fix appveyor build * Apply suggestions from code review Co-authored-by: Martin Holst Swende <martin@swende.se> * review feedback * core/state/accounts: move Account to core/types * core/types: rename Account -> StateAccount * core/state: restore EncodeRLP for stateObject * core/types: add the missing file * more review feedback * more review feedback Co-authored-by: Martin Holst Swende <martin@swende.se> Co-authored-by: Felix Lange <fjl@twurst.com>

core/state: abstracted "write account to trie" method

0b92ab0

gballet added the status:triage label Sep 13, 2021

gballet requested review from karalabe, holiman and rjl493456442 September 13, 2021 13:25

gballet requested a review from zsfelfoldi as a code owner September 13, 2021 13:25

fix appveyor build

1e142f9

holiman reviewed Sep 13, 2021

View reviewed changes

Apply suggestions from code review

14ad53a

Co-authored-by: Martin Holst Swende <martin@swende.se>

gballet force-pushed the try-update-account branch 2 times, most recently from 068db08 to 260fb94 Compare September 17, 2021 18:13

review feedback

2d803b7

gballet force-pushed the try-update-account branch from 260fb94 to 2d803b7 Compare September 17, 2021 19:52

holiman reviewed Sep 21, 2021

View reviewed changes

fjl added 3 commits September 21, 2021 13:17

core/state/accounts: move Account to core/types

c03d79e

core/types: rename Account -> StateAccount

80f1ddf

core/state: restore EncodeRLP for stateObject

a7bacbe

fjl removed the status:triage label Sep 21, 2021

core/types: add the missing file

e97755c

holiman reviewed Sep 22, 2021

View reviewed changes

gballet added 2 commits September 22, 2021 14:40

more review feedback

cd90b1b

more review feedback

adf1a0a

holiman approved these changes Sep 27, 2021

View reviewed changes

gballet added the status:triage label Sep 28, 2021

holiman changed the title ~~core/state: abstracted "write account to trie" method~~ core/state: move state account to core/types + abstracted "write account to trie" Sep 28, 2021

holiman merged commit 443afc9 into ethereum:master Sep 28, 2021

holiman added this to the 1.10.9 milestone Sep 28, 2021

This was referenced Sep 23, 2022

Metadium to master METADIUM/go-metadium#24

Closed

Metadium to master METADIUM/go-metadium#25

Merged

trinhdn2 mentioned this pull request Jul 20, 2023

[Non-breaking changes] Move statedb.Account struct to types.StateAccount BuildOnViction/victionchain#373

Closed

tungnguyen17 mentioned this pull request Sep 24, 2023

[Non-breaking changes] Move statedb.Account struct to types.StateAccoun tungnguyen17/victionchain-dev#7

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

core/state: move state account to core/types + abstracted "write account to trie" #23567

core/state: move state account to core/types + abstracted "write account to trie" #23567

gballet commented Sep 13, 2021

holiman Sep 13, 2021

holiman Sep 13, 2021

This comment was marked as spam.

holiman Sep 13, 2021

holiman Sep 13, 2021

gballet Sep 17, 2021

gballet Sep 17, 2021

holiman Sep 17, 2021

holiman Sep 13, 2021

holiman Sep 21, 2021

holiman Sep 22, 2021

holiman Sep 22, 2021

holiman left a comment

holiman Sep 27, 2021

gballet Sep 28, 2021

		func (s *stateObject) EncodeRLP(io.Writer) error {
		panic("deprecated code, should not be called")

core/state: move state account to core/types + abstracted "write account to trie" #23567

core/state: move state account to core/types + abstracted "write account to trie" #23567

Conversation

gballet commented Sep 13, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

This comment was marked as spam.

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

holiman left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment