Skip to content

Commit 4e0e7f6

Browse files
rjl493456442Doozers
authored andcommitted
core/state: make stateobject.create selfcontain (ethereum#28459)
1 parent 3610d09 commit 4e0e7f6

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

core/state/state_object.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,10 @@ func (s *stateObject) empty() bool {
9898

9999
// newObject creates a state object.
100100
func newObject(db *StateDB, address common.Address, acct *types.StateAccount) *stateObject {
101-
origin := acct
101+
var (
102+
origin = acct
103+
created = acct == nil // true if the account was not existent
104+
)
102105
if acct == nil {
103106
acct = types.NewEmptyStateAccount()
104107
}
@@ -111,6 +114,7 @@ func newObject(db *StateDB, address common.Address, acct *types.StateAccount) *s
111114
originStorage: make(Storage),
112115
pendingStorage: make(Storage),
113116
dirtyStorage: make(Storage),
117+
created: created,
114118
}
115119
}
116120

core/state/statedb.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -658,9 +658,6 @@ func (s *StateDB) createObject(addr common.Address) (newobj, prev *stateObject)
658658
delete(s.accountsOrigin, prev.address)
659659
delete(s.storagesOrigin, prev.address)
660660
}
661-
662-
newobj.created = true
663-
664661
s.setStateObject(newobj)
665662
if prev != nil && !prev.deleted {
666663
return newobj, prev

0 commit comments

Comments
 (0)