Change IsDirty to Transaction level

We don't want a reverted transaction to show up in written trace because it was touched by a previous transaction.
cffls · Nov 5, 2024 · 37883dd · 37883dd
1 parent eb7aecc
commit 37883dd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/core/state/intra_block_state.go b/core/state/intra_block_state.go
@@ -426,10 +426,9 @@ func (sdb *IntraBlockState) SeenAccount(addr libcommon.Address) bool {
 	return ok
 }
 
-func (sdb *IntraBlockState) IsDirty(addr libcommon.Address) bool {
-	_, dirtyObj := sdb.stateObjectsDirty[addr]
-	_, dirtyJournal := sdb.journal.dirties[addr]
-	return dirtyObj || dirtyJournal
+func (sdb *IntraBlockState) IsDirtyJournal(addr libcommon.Address) bool {
+	_, ok := sdb.journal.dirties[addr]
+	return ok
 }
 
 func (sdb *IntraBlockState) HasLiveState(addr libcommon.Address, key *libcommon.Hash) bool {

diff --git a/core/vm/evmtypes/evmtypes.go b/core/vm/evmtypes/evmtypes.go
@@ -82,7 +82,7 @@ type IntraBlockState interface {
 	SetState(common.Address, *common.Hash, uint256.Int)
 	HasLiveAccount(addr common.Address) bool
 	SeenAccount(addr common.Address) bool
-	IsDirty(addr common.Address) bool
+	IsDirtyJournal(addr common.Address) bool
 	HasLiveState(addr common.Address, key *common.Hash) bool
 
 	GetTransientState(addr common.Address, key common.Hash) uint256.Int

diff --git a/eth/tracers/native/zero.go b/eth/tracers/native/zero.go
@@ -220,7 +220,7 @@ func (t *zeroTracer) CaptureTxEnd(restGas uint64) {
 			trace.StorageRead = nil
 		}
 
-		if len(trace.StorageWritten) == 0 || !hasLiveAccount || !t.env.IntraBlockState().IsDirty(addr) {
+		if len(trace.StorageWritten) == 0 || !hasLiveAccount || !t.env.IntraBlockState().IsDirtyJournal(addr) {
 			trace.StorageWritten = nil
 		} else {
 			// A slot write could be reverted if the transaction is reverted. We will need to read the value from the statedb again to get the correct value.