From d8932299a0a87e870f3a13284b87a91adca6924c Mon Sep 17 00:00:00 2001 From: Lee Bousfield Date: Mon, 20 Nov 2023 16:59:47 -0700 Subject: [PATCH] Revert "core/state: mark account as dirty when resetObject occurs" This reverts commit 15bd21f3c878155bc2254bb43460763298f58ad1. --- core/state/journal.go | 3 +-- core/state/statedb.go | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/core/state/journal.go b/core/state/journal.go index 137ec76395..57d4445be9 100644 --- a/core/state/journal.go +++ b/core/state/journal.go @@ -90,7 +90,6 @@ type ( account *common.Address } resetObjectChange struct { - account *common.Address prev *stateObject prevdestruct bool prevAccount []byte @@ -181,7 +180,7 @@ func (ch resetObjectChange) revert(s *StateDB) { } func (ch resetObjectChange) dirtied() *common.Address { - return ch.account + return nil } func (ch selfDestructChange) revert(s *StateDB) { diff --git a/core/state/statedb.go b/core/state/statedb.go index 9b56640de2..b176ecb627 100644 --- a/core/state/statedb.go +++ b/core/state/statedb.go @@ -718,7 +718,6 @@ func (s *StateDB) createObject(addr common.Address) (newobj, prev *stateObject) // cache the latest account/storage data. prevAccount, ok := s.accountsOrigin[prev.address] s.journal.append(resetObjectChange{ - account: &addr, prev: prev, prevdestruct: prevdestruct, prevAccount: s.accounts[prev.addrHash],