Fix parallel evm revert

core/parallel_state_processor.go

@@ -182,7 +182,7 @@ func (task *ExecutionTask) Settle() {
 
 	coinbaseBalance := task.finalStateDB.GetBalance(task.coinbase)
 
-	task.finalStateDB.ApplyMVWriteSet(task.statedb.MVFullWriteList())
+	task.finalStateDB.ApplyMVWriteSet(task.statedb.MVWriteList())
 
 	for _, l := range task.statedb.GetLogs(task.tx.Hash(), task.blockNumber.Uint64(), task.blockHash, task.blockTime) {
 		task.finalStateDB.AddLog(l)

core/state/journal.go

@@ -23,6 +23,7 @@ import (
 	"sort"
 
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/blockstm"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/holiman/uint256"
 )
@@ -323,6 +324,7 @@ func (ch selfDestructChange) revert(s *StateDB) {
 	obj := s.getStateObject(ch.account)
 	if obj != nil {
 		obj.selfDestructed = false
+		RevertWrite(s, blockstm.NewSubpathKey(ch.account, SuicidePath))
 	}
 }
 

core/state/statedb.go

@@ -421,7 +421,7 @@ func (s *StateDB) ApplyMVWriteSet(writes []blockstm.WriteDescriptor) {
 				s.SetCode(addr, sr.GetCode(addr))
 			case SuicidePath:
 				stateObject := s.getStateObject(addr)
-				if stateObject != nil {
+				if stateObject != nil && sr.HasSelfDestructed(addr) {
 					s.SelfDestruct(addr)
 				}
 			default:

core/state/statedb_test.go

@@ -2025,3 +2025,40 @@
 	codeAfterDeletion := s.GetCode(addr)
 	assert.Equal(t, []byte(nil), codeAfterDeletion, "smart contract should be deleted")
 }
+
+// containsKey returns true if the provided write descriptor list contains the given key.
+func containsKey(writes []blockstm.WriteDescriptor, key blockstm.Key) bool {
+	for _, w := range writes {
+		if w.Path == key {
+			return true
+		}
+	}
+	return false
+}
+
+// Test that selfdestruct writes (suicide and balance) are excluded after revert.
+func TestRevertWriteSelfDestruct(t *testing.T) {
+	t.Parallel()
+
+	db := NewDatabase(triedb.NewDatabase(rawdb.NewMemoryDatabase(), triedb.HashDefaults), nil)
+	mvhm := blockstm.MakeMVHashMap()
+	s, _ := NewWithMVHashmap(common.Hash{}, db, nil, mvhm)
+
+	addr := common.HexToAddress("0x06")
+	s.CreateAccount(addr)
+	s.SetBalance(addr, uint256.NewInt(100), tracing.BalanceChangeTransfer)
+	// Clear writes so only selfdestruct writes are tracked
+	s.ClearWriteMap()
+
+	snap := s.Snapshot()
+	s.SelfDestruct(addr)
+
+	keySuicide := blockstm.NewSubpathKey(addr, SuicidePath)
+	assert.True(t, containsKey(s.MVFullWriteList(), keySuicide))
+	assert.True(t, containsKey(s.MVWriteList(), keySuicide))
+
+	s.RevertToSnapshot(snap)
+	// Full list still contains both, filtered excludes both
+	assert.True(t, containsKey(s.MVFullWriteList(), keySuicide))
+	assert.False(t, containsKey(s.MVWriteList(), keySuicide))
+}