From 5fccdfbfd38919ce22b263682902a43cbacaca04 Mon Sep 17 00:00:00 2001
From: Martin Holst Swende <martin@swende.se>
Date: Mon, 2 Dec 2024 14:16:07 +0100
Subject: [PATCH] core/state: fix journal to account for setcode over non-empty
 code

---
 core/state/journal.go      | 19 +++++++++++++------
 core/state/state_object.go |  2 +-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/core/state/journal.go b/core/state/journal.go
index a2fea6b6ec..13332dbd79 100644
--- a/core/state/journal.go
+++ b/core/state/journal.go
@@ -23,7 +23,7 @@ import (
 	"sort"
 
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/holiman/uint256"
 )
 
@@ -192,8 +192,11 @@ func (j *journal) balanceChange(addr common.Address, previous *uint256.Int) {
 	})
 }
 
-func (j *journal) setCode(address common.Address) {
-	j.append(codeChange{account: address})
+func (j *journal) setCode(address common.Address, prevCode []byte) {
+	j.append(codeChange{
+		account:  address,
+		prevCode: prevCode,
+	})
 }
 
 func (j *journal) nonceChange(address common.Address, prev uint64) {
@@ -256,7 +259,8 @@ type (
 		origvalue common.Hash
 	}
 	codeChange struct {
-		account common.Address
+		account  common.Address
+		prevCode []byte
 	}
 
 	// Changes to other state values.
@@ -377,7 +381,7 @@ func (ch nonceChange) copy() journalEntry {
 }
 
 func (ch codeChange) revert(s *StateDB) {
-	s.getStateObject(ch.account).setCode(types.EmptyCodeHash, nil)
+	s.getStateObject(ch.account).setCode(crypto.Keccak256Hash(ch.prevCode), ch.prevCode)
 }
 
 func (ch codeChange) dirtied() *common.Address {
@@ -385,7 +389,10 @@ func (ch codeChange) dirtied() *common.Address {
 }
 
 func (ch codeChange) copy() journalEntry {
-	return codeChange{account: ch.account}
+	return codeChange{
+		account:  ch.account,
+		prevCode: ch.prevCode,
+	}
 }
 
 func (ch storageChange) revert(s *StateDB) {
diff --git a/core/state/state_object.go b/core/state/state_object.go
index 8c5442e590..76a3aba92c 100644
--- a/core/state/state_object.go
+++ b/core/state/state_object.go
@@ -543,8 +543,8 @@ func (s *stateObject) CodeSize() int {
 }
 
 func (s *stateObject) SetCode(codeHash common.Hash, code []byte) (prev []byte) {
-	s.db.journal.setCode(s.address)
 	prev = slices.Clone(s.code)
+	s.db.journal.setCode(s.address, prev)
 	s.setCode(codeHash, code)
 	return prev
 }