From b125d0bcb9f901abc7471402371721bf934e1177 Mon Sep 17 00:00:00 2001
From: Sina Mahmoodi <itz.s1na@gmail.com>
Date: Mon, 1 Sep 2025 13:47:08 +0200
Subject: [PATCH] add journal test

---
 core/tracing/journal_test.go | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/core/tracing/journal_test.go b/core/tracing/journal_test.go
index 99447e1e1d..cf74d83483 100644
--- a/core/tracing/journal_test.go
+++ b/core/tracing/journal_test.go
@@ -23,6 +23,7 @@ import (
 	"testing"
 
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/crypto"
 )
 
 type testTracer struct {
@@ -56,6 +57,11 @@ func (t *testTracer) OnCodeChange(addr common.Address, prevCodeHash common.Hash,
 	t.code = code
 }
 
+func (t *testTracer) OnCodeChangeV2(addr common.Address, prevCodeHash common.Hash, prevCode []byte, codeHash common.Hash, code []byte, reason CodeChangeReason) {
+	t.t.Logf("OnCodeChangeV2(%v, %v -> %v, %v)", addr, prevCodeHash, codeHash, reason)
+	t.code = code
+}
+
 func (t *testTracer) OnStorageChange(addr common.Address, slot common.Hash, prev common.Hash, new common.Hash) {
 	t.t.Logf("OnStorageCodeChange(%v, %v, %v -> %v)", addr, slot, prev, new)
 	if t.storage == nil {
@@ -232,6 +238,27 @@ func TestOnNonceChangeV2(t *testing.T) {
 	}
 }
 
+func TestOnCodeChangeV2(t *testing.T) {
+	tr := &testTracer{t: t}
+	wr, err := WrapWithJournal(&Hooks{OnCodeChangeV2: tr.OnCodeChangeV2})
+	if err != nil {
+		t.Fatalf("failed to wrap test tracer: %v", err)
+	}
+
+	addr := common.HexToAddress("0x1234")
+	code := []byte{1, 2, 3}
+	{
+		wr.OnEnter(2, 0, addr, addr, nil, 1000, big.NewInt(0))
+		wr.OnCodeChangeV2(addr, common.Hash{}, nil, crypto.Keccak256Hash(code), code, CodeChangeContractCreation)
+		wr.OnExit(2, nil, 100, nil, true)
+	}
+
+	// After revert, code should be nil
+	if tr.code != nil {
+		t.Fatalf("unexpected code after revert: %v", tr.code)
+	}
+}
+
 func TestAllHooksCalled(t *testing.T) {
 	tracer := newTracerAllHooks()
 	hooks := tracer.hooks()
@@ -298,6 +325,7 @@ func newTracerAllHooks() *tracerAllHooks {
 		t.hooksCalled[hooksType.Field(i).Name] = false
 	}
 	delete(t.hooksCalled, "OnNonceChange")
+	delete(t.hooksCalled, "OnCodeChange")
 	return t
 }
 
@@ -322,7 +350,7 @@ func (t *tracerAllHooks) hooks() *Hooks {
 	hooksValue := reflect.ValueOf(h).Elem()
 	for i := 0; i < hooksValue.NumField(); i++ {
 		field := hooksValue.Type().Field(i)
-		if field.Name == "OnNonceChange" {
+		if field.Name == "OnNonceChange" || field.Name == "OnCodeChange" {
 			continue
 		}
 		hookMethod := reflect.MakeFunc(field.Type, func(args []reflect.Value) []reflect.Value {