fix: tracers, add bor fee log in results

2026-07-27 07:06:42 +00:00 · 2024-08-26 17:25:47 +05:30 · 2024-08-26 17:25:47 +05:30 · 68d8614b72
commit 68d8614b72
parent ab2db597d9
16 changed files with 169 additions and 153 deletions
--- a/core/state_transition.go
+++ b/core/state_transition.go
@ -501,10 +501,10 @@ func (st *StateTransition) TransitionDb(interruptCtx context.Context) (*Executio
 		gasRefund = st.refundGas(params.RefundQuotientEIP3529)
 	}

-	effectiveTip := uint256.NewInt(msg.GasPrice.Uint64())
+	effectiveTip := msg.GasPrice

 	if rules.IsLondon {
-		effectiveTip = cmath.BigMinUint256(cmath.BigIntToUint256Int(msg.GasTipCap), new(uint256.Int).Sub(cmath.BigIntToUint256Int(msg.GasFeeCap), cmath.BigIntToUint256Int(st.evm.Context.BaseFee)))
+		effectiveTip = cmath.BigMin(msg.GasTipCap, new(big.Int).Sub(msg.GasFeeCap, st.evm.Context.BaseFee))
 	}

 	// TODO(raneet10): Double check. We might want to inculcate this fix in a separate condition
@ -518,27 +518,26 @@ func (st *StateTransition) TransitionDb(interruptCtx context.Context) (*Executio
 	// 	st.state.AddBalance(st.evm.Context.Coinbase, fee)
 	// }

-	fee := new(uint256.Int).SetUint64(st.gasUsed())
-	fee.Mul(fee, effectiveTip)
+	amount := new(big.Int).Mul(new(big.Int).SetUint64(st.gasUsed()), effectiveTip)

-	var burnAmount *uint256.Int
+	var burnAmount *big.Int

 	var burntContractAddress common.Address

 	if rules.IsLondon {
 		burntContractAddress = common.HexToAddress(st.evm.ChainConfig().Bor.CalculateBurntContract(st.evm.Context.BlockNumber.Uint64()))
-		burnAmount = new(uint256.Int).Mul(new(uint256.Int).SetUint64(st.gasUsed()), cmath.BigIntToUint256Int(st.evm.Context.BaseFee))
+		burnAmount = new(big.Int).Mul(new(big.Int).SetUint64(st.gasUsed()), st.evm.Context.BaseFee)

 		if !st.noFeeBurnAndTip {
-			st.state.AddBalance(burntContractAddress, burnAmount, tracing.BalanceChangeTransfer)
+			st.state.AddBalance(burntContractAddress, uint256.NewInt(burnAmount.Uint64()), tracing.BalanceChangeTransfer)
 		}
 	}

 	if !st.noFeeBurnAndTip {
-		st.state.AddBalance(st.evm.Context.Coinbase, fee, tracing.BalanceIncreaseRewardTransactionFee)
+		st.state.AddBalance(st.evm.Context.Coinbase, uint256.NewInt(amount.Uint64()), tracing.BalanceIncreaseRewardTransactionFee)

 		// add the coinbase to the witness iff the fee is greater than 0
-		if rules.IsEIP4762 && fee.Sign() != 0 {
+		if rules.IsEIP4762 && amount.Sign() != 0 {
 			st.evm.AccessEvents.BalanceGas(st.evm.Context.Coinbase, true)
 		}

@ -553,11 +552,11 @@ func (st *StateTransition) TransitionDb(interruptCtx context.Context) (*Executio
 			msg.From,
 			st.evm.Context.Coinbase,

-			fee.ToBig(),
+			amount,
 			input1.ToBig(),
 			input2.ToBig(),
-			output1.Sub(output1, fee.ToBig()),
-			output2.Add(output2, fee.ToBig()),
+			output1.Sub(output1, amount),
+			output2.Add(output2, amount),
 		)
 	}

@ -567,9 +566,9 @@ func (st *StateTransition) TransitionDb(interruptCtx context.Context) (*Executio
 		Err:                  vmerr,
 		ReturnData:           ret,
 		SenderInitBalance:    input1.ToBig(),
-		FeeBurnt:             burnAmount.ToBig(),
+		FeeBurnt:             burnAmount,
 		BurntContractAddress: burntContractAddress,
-		FeeTipped:            fee.ToBig(),
+		FeeTipped:            amount,
 	}, nil
 }

--- a/eth/tracers/internal/tracetest/calltrace_test.go
+++ b/eth/tracers/internal/tracetest/calltrace_test.go
@ -335,7 +335,7 @@ func TestInternals(t *testing.T) {
 				byte(vm.LOG0),
 			},
 			tracer: mkTracer("callTracer", json.RawMessage(`{ "withLog": true }`)),
-			want:   fmt.Sprintf(`{"from":"%s","gas":"0x13880","gasUsed":"0x5b9e","to":"0x00000000000000000000000000000000deadbeef","input":"0x","logs":[{"address":"0x00000000000000000000000000000000deadbeef","topics":[],"data":"0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","position":"0x0"}],"value":"0x0","type":"CALL"}`, originHex),
+			want:   fmt.Sprintf(`{"from":"%s","gas":"0x13880","gasUsed":"0x5b9e","to":"0x00000000000000000000000000000000deadbeef","input":"0x","logs":[{"address":"0x00000000000000000000000000000000deadbeef","topics":[],"data":"0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","position":"0x0"},{"address":"0x0000000000000000000000000000000000001010","topics":["0x4dfe1bbbcf077ddc3e01291eea2d5c70c2b422b415d95645b9adcfd678cb1d63","0x0000000000000000000000000000000000000000000000000000000000001010","0x00000000000000000000000071562b71999873db5b286df957af199ec94617f7","0x0000000000000000000000000000000000000000000000000000000000000000"],"data":"0x0000000000000000000000000000000000000000000000000000000000005b9e0000000000000000000000000000000000000000000000000001c6bf5263400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001c6bf5262e4620000000000000000000000000000000000000000000000000000000000005b9e","position":"0x0"}],"value":"0x0","type":"CALL"}`, originHex),
 		},
 		{
 			// Leads to OOM on the prestate tracer
--- a/eth/tracers/internal/tracetest/supply_test.go
+++ b/eth/tracers/internal/tracetest/supply_test.go
@ -360,7 +360,7 @@ func TestSupplySelfdestruct(t *testing.T) {
 	// 2. Test post Cancun
 	cancunBlock := big.NewInt(0)
 	gspec.Config.ShanghaiBlock = cancunBlock
-	gspec.Config.ShanghaiBlock = cancunBlock
+	gspec.Config.CancunBlock = cancunBlock

 	postCancunOutput, postCancunChain, err := testSupplyTracer(t, gspec, testBlockGenerationFunc)
 	if err != nil {
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_withLog/calldata.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_withLog/calldata.json
@ -75,43 +75,5 @@
  "tracerConfig": {
    "withLog": true
  },
-  "result": {
-    "from": "0x4f5777744b500616697cb655dcb02ee6cd51deb5",
-    "gas": "0x33085",
-    "gasUsed": "0x1a9e5",
-    "to": "0x200edd17f30485a8735878661960cd7a9a95733f",
-    "input": "0xba51a6df0000000000000000000000000000000000000000000000000000000000000000",
-    "output": "0xba51a6df00000000000000000000000000000000000000000000000000000000",
-    "calls": [
-      {
-        "from": "0x200edd17f30485a8735878661960cd7a9a95733f",
-        "gas": "0x2c263",
-        "gasUsed": "0x1b0e4",
-        "to": "0x273930d21e01ee25e4c219b63259d214872220a2",
-        "input": "0xba51a6df0000000000000000000000000000000000000000000000000000000000000000",
-        "logs": [
-          {
-            "address": "0x200edd17f30485a8735878661960cd7a9a95733f",
-            "topics": [
-              "0xe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda"
-            ],
-            "data": "0x0000000000000000000000004f5777744b500616697cb655dcb02ee6cd51deb5be96016bb57376da7a6d296e0a405ee1501778227dfa604df0a81cb1ae018598",
-            "position": "0x0"
-          },
-          {
-            "address": "0x200edd17f30485a8735878661960cd7a9a95733f",
-            "topics": [
-              "0xacbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da"
-            ],
-            "data": "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "position": "0x0"
-          }
-        ],
-        "value": "0x8ac7230489e80000",
-        "type": "CALLCODE"
-      }
-    ],
-    "value": "0x8ac7230489e80000",
-    "type": "CALL"
-  }
+  "result": {"from":"0x4f5777744b500616697cb655dcb02ee6cd51deb5","gas":"0x33085","gasUsed":"0x1a9e5","to":"0x200edd17f30485a8735878661960cd7a9a95733f","input":"0xba51a6df0000000000000000000000000000000000000000000000000000000000000000","output":"0xba51a6df00000000000000000000000000000000000000000000000000000000","calls":[{"from":"0x200edd17f30485a8735878661960cd7a9a95733f","gas":"0x2c263","gasUsed":"0x1b0e4","to":"0x273930d21e01ee25e4c219b63259d214872220a2","input":"0xba51a6df0000000000000000000000000000000000000000000000000000000000000000","logs":[{"address":"0x200edd17f30485a8735878661960cd7a9a95733f","topics":["0xe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda"],"data":"0x0000000000000000000000004f5777744b500616697cb655dcb02ee6cd51deb5be96016bb57376da7a6d296e0a405ee1501778227dfa604df0a81cb1ae018598","position":"0x0"},{"address":"0x200edd17f30485a8735878661960cd7a9a95733f","topics":["0xacbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da"],"data":"0x0000000000000000000000000000000000000000000000000000000000000000","position":"0x0"}],"value":"0x8ac7230489e80000","type":"CALLCODE"}],"logs":[{"address":"0x0000000000000000000000000000000000001010","topics":["0x4dfe1bbbcf077ddc3e01291eea2d5c70c2b422b415d95645b9adcfd678cb1d63","0x0000000000000000000000000000000000000000000000000000000000001010","0x0000000000000000000000004f5777744b500616697cb655dcb02ee6cd51deb5","0x000000000000000000000000f8b483dba2c3b7176a3da549ad41a48bb3121069"],"data":"0x00000000000000000000000000000000000000000000000000119b54eb98e126000000000000000000000000000000000000000000000000b0983f1b83eec29000000000000000000000000000000000000000000000016969a0ba2c2d384d07000000000000000000000000000000000000000000000000b086a3c69855e16a00000000000000000000000000000000000000000000016969b2558118d12e2d","position":"0x1"}],"value":"0x8ac7230489e80000","type":"CALL"}
 }
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_withLog/delegatecall.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_withLog/delegatecall.json
@ -407,6 +407,19 @@
        "type": "CALL"
      }
    ],
+    "logs": [
+      {
+        "address": "0x0000000000000000000000000000000000001010",
+        "topics": [
+          "0x4dfe1bbbcf077ddc3e01291eea2d5c70c2b422b415d95645b9adcfd678cb1d63",
+          "0x0000000000000000000000000000000000000000000000000000000000001010",
+          "0x0000000000000000000000003de712784baf97260455ae25fb74f574ec9c1add",
+          "0x00000000000000000000000061c808d82a3ac53231750dadc13c777b59310bd9"
+        ],
+        "data": "0x000000000000000000000000000000000000000000000000000b9e774e8d580000000000000000000000000000000000000000000000000023c8352f33854625000000000000000000000000000000000000000000000090a7af5d475598456100000000000000000000000000000000000000000000000023bc96b7e4f7ee25000000000000000000000000000000000000000000000090a7bafbbea4259d61",
+        "position": "0x8"
+      }
+    ],
    "value": "0x0",
    "type": "CALL"
  }
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_withLog/frontier_create_outofstorage.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_withLog/frontier_create_outofstorage.json
@ -172,19 +172,34 @@
            "type": "CALL"
          }
        ],
-        "logs":[
+        "logs": [
          {
            "address": "0xf631e3b3aafa084bc51c714825aacf505d2059be",
-            "topics": ["0x1f28d876aff267c3302a63cd25ebcca53e6f60691049df42275b6d06ab455c67"],
-            "data":"0x55bc8431ce52389ac668a9b14a0943290cb7263732251186e960bc8b249b5f32000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000030d41000000000000000000000000000000000000000000000000000000000000000355524c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004c6a736f6e2868747470733a2f2f6170692e6b72616b656e2e636f6d2f302f7075626c69632f5469636b65723f706169723d455448584254292e726573756c742e58455448585842542e632e300000000000000000000000000000000000000000",
-            "position":"0x3"
+            "topics": [
+              "0x1f28d876aff267c3302a63cd25ebcca53e6f60691049df42275b6d06ab455c67"
+            ],
+            "data": "0x55bc8431ce52389ac668a9b14a0943290cb7263732251186e960bc8b249b5f32000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000030d41000000000000000000000000000000000000000000000000000000000000000355524c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004c6a736f6e2868747470733a2f2f6170692e6b72616b656e2e636f6d2f302f7075626c69632f5469636b65723f706169723d455448584254292e726573756c742e58455448585842542e632e300000000000000000000000000000000000000000",
+            "position": "0x3"
          }
        ],
        "value": "0x0",
        "type": "CALL"
      }
    ],
+    "logs": [
+      {
+        "address": "0x0000000000000000000000000000000000001010",
+        "topics": [
+          "0x4dfe1bbbcf077ddc3e01291eea2d5c70c2b422b415d95645b9adcfd678cb1d63",
+          "0x0000000000000000000000000000000000000000000000000000000000001010",
+          "0x0000000000000000000000000047a8033cc6d6ca2ed5044674fd421f44884de8",
+          "0x000000000000000000000000e48430c4e88a929bba0ee3dce284866a9937b609"
+        ],
+        "data": "0x000000000000000000000000000000000000000000000000006a8fb3d104cc0000000000000000000000000000000000000000000000000044f5ced08fe37cf70000000000000000000000000000000000000000000000026758774d51d8677a000000000000000000000000000000000000000000000000448b3f1cbedeb0f700000000000000000000000000000000000000000000000267c3070122dd337a",
+        "position": "0x6"
+      }
+    ],
    "value": "0x0",
    "type": "CREATE"
  }
-}
+}
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_withLog/multi_contracts.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_withLog/multi_contracts.json
@ -2321,6 +2321,19 @@
        "type": "CALL"
      }
    ],
+    "logs": [
+      {
+        "address": "0x0000000000000000000000000000000000001010",
+        "topics": [
+          "0x4dfe1bbbcf077ddc3e01291eea2d5c70c2b422b415d95645b9adcfd678cb1d63",
+          "0x0000000000000000000000000000000000000000000000000000000000001010",
+          "0x000000000000000000000000be3ae5cb97c253dda67181c6e34e43f5c275e08b",
+          "0x000000000000000000000000ea674fdde714fd979de3edf0f56aa9716b898ec8"
+        ],
+        "data": "0x00000000000000000000000000000000000000000000000000e25384e63aa60000000000000000000000000000000000000000000000000167d285b38143c04f00000000000000000000000000000000000000000000004ab3566739e7b2437100000000000000000000000000000000000000000000000166f0322e9b091a4f00000000000000000000000000000000000000000000004ab438babecdece971",
+        "position": "0x23"
+      }
+    ],
    "value": "0x0",
    "type": "CALL"
  }
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_withLog/multilogs.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_withLog/multilogs.json
@ -355,7 +355,7 @@
          "0xcacb62d8acea4678658eb5dc4aaa889b34d893b967c96a5f8c066e6549fa3f42"
        ],
        "data": "0x000000000000000000000000000000000000000000000000000000000000034200000000000000000000000000000000000000000000000000000000000000380000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003fcb0342353c541e210013aaddc2e740b9a33d08fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefefe0000000000000000000000000000000000000000000000000011c37937e08000",
-       "position": "0x0"
+        "position": "0x0"
      },
      {
        "address": "0x350e0ffc780a6a75b44cc52e1ff9092870668945",
@ -363,7 +363,7 @@
          "0xcacb62d8acea4678658eb5dc4aaa889b34d893b967c96a5f8c066e6549fa3f42"
        ],
        "data": "0x00000000000000000000000000000000000000000000000000000000000002fe00000000000000000000000000000000000000000000000000000000000000370000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003fcb0342353c541e210013aaddc2e740b9a33d08ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0a0a00000000000000000000000000000000000000000000000000011c37937e08000",
-       "position": "0x0"
+        "position": "0x0"
      },
      {
        "address": "0x350e0ffc780a6a75b44cc52e1ff9092870668945",
@ -371,7 +371,7 @@
          "0xcacb62d8acea4678658eb5dc4aaa889b34d893b967c96a5f8c066e6549fa3f42"
        ],
        "data": "0x000000000000000000000000000000000000000000000000000000000000034200000000000000000000000000000000000000000000000000000000000000370000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003fcb0342353c541e210013aaddc2e740b9a33d08ffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5b5b5b0000000000000000000000000000000000000000000000000011c37937e08000",
-       "position": "0x0"
+        "position": "0x0"
      },
      {
        "address": "0x350e0ffc780a6a75b44cc52e1ff9092870668945",
@ -379,7 +379,7 @@
          "0xcacb62d8acea4678658eb5dc4aaa889b34d893b967c96a5f8c066e6549fa3f42"
        ],
        "data": "0x00000000000000000000000000000000000000000000000000000000000002fe00000000000000000000000000000000000000000000000000000000000000390000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003fcb0342353c541e210013aaddc2e740b9a33d08ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffbababa0000000000000000000000000000000000000000000000000011c37937e08000",
-       "position": "0x0"
+        "position": "0x0"
      },
      {
        "address": "0x350e0ffc780a6a75b44cc52e1ff9092870668945",
@ -387,7 +387,7 @@
          "0xcacb62d8acea4678658eb5dc4aaa889b34d893b967c96a5f8c066e6549fa3f42"
        ],
        "data": "0x000000000000000000000000000000000000000000000000000000000000034200000000000000000000000000000000000000000000000000000000000000390000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003fcb0342353c541e210013aaddc2e740b9a33d08ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000000000000000000000000000000000000011c37937e08000",
-       "position": "0x0"
+        "position": "0x0"
      },
      {
        "address": "0x350e0ffc780a6a75b44cc52e1ff9092870668945",
@ -395,7 +395,7 @@
          "0xcacb62d8acea4678658eb5dc4aaa889b34d893b967c96a5f8c066e6549fa3f42"
        ],
        "data": "0x00000000000000000000000000000000000000000000000000000000000002fe00000000000000000000000000000000000000000000000000000000000000360000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003fcb0342353c541e210013aaddc2e740b9a33d08ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffeaeaea0000000000000000000000000000000000000000000000000011c37937e08000",
-       "position": "0x0"
+        "position": "0x0"
      },
      {
        "address": "0x350e0ffc780a6a75b44cc52e1ff9092870668945",
@ -403,7 +403,7 @@
          "0xcacb62d8acea4678658eb5dc4aaa889b34d893b967c96a5f8c066e6549fa3f42"
        ],
        "data": "0x000000000000000000000000000000000000000000000000000000000000034200000000000000000000000000000000000000000000000000000000000000360000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003fcb0342353c541e210013aaddc2e740b9a33d08ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa9a9a90000000000000000000000000000000000000000000000000011c37937e08000",
-       "position": "0x0"
+        "position": "0x0"
      },
      {
        "address": "0x350e0ffc780a6a75b44cc52e1ff9092870668945",
@ -411,7 +411,7 @@
          "0xcacb62d8acea4678658eb5dc4aaa889b34d893b967c96a5f8c066e6549fa3f42"
        ],
        "data": "0x00000000000000000000000000000000000000000000000000000000000002fe000000000000000000000000000000000000000000000000000000000000003a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003fcb0342353c541e210013aaddc2e740b9a33d08ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffb9b9b90000000000000000000000000000000000000000000000000011c37937e08000",
-       "position": "0x0"
+        "position": "0x0"
      },
      {
        "address": "0x350e0ffc780a6a75b44cc52e1ff9092870668945",
@ -419,7 +419,7 @@
          "0xcacb62d8acea4678658eb5dc4aaa889b34d893b967c96a5f8c066e6549fa3f42"
        ],
        "data": "0x0000000000000000000000000000000000000000000000000000000000000342000000000000000000000000000000000000000000000000000000000000003a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003fcb0342353c541e210013aaddc2e740b9a33d08fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffbfbfb0000000000000000000000000000000000000000000000000011c37937e08000",
-       "position": "0x0"
+        "position": "0x0"
      },
      {
        "address": "0x350e0ffc780a6a75b44cc52e1ff9092870668945",
@ -427,7 +427,7 @@
          "0xcacb62d8acea4678658eb5dc4aaa889b34d893b967c96a5f8c066e6549fa3f42"
        ],
        "data": "0x00000000000000000000000000000000000000000000000000000000000002fe00000000000000000000000000000000000000000000000000000000000000350000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003fcb0342353c541e210013aaddc2e740b9a33d08fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefefe0000000000000000000000000000000000000000000000000011c37937e08000",
-       "position": "0x0"
+        "position": "0x0"
      },
      {
        "address": "0x350e0ffc780a6a75b44cc52e1ff9092870668945",
@ -435,7 +435,7 @@
          "0xcacb62d8acea4678658eb5dc4aaa889b34d893b967c96a5f8c066e6549fa3f42"
        ],
        "data": "0x000000000000000000000000000000000000000000000000000000000000034200000000000000000000000000000000000000000000000000000000000000350000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003fcb0342353c541e210013aaddc2e740b9a33d08fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffefefe0000000000000000000000000000000000000000000000000011c37937e08000",
-       "position": "0x0"
+        "position": "0x0"
      },
      {
        "address": "0x350e0ffc780a6a75b44cc52e1ff9092870668945",
@ -443,7 +443,7 @@
          "0xcacb62d8acea4678658eb5dc4aaa889b34d893b967c96a5f8c066e6549fa3f42"
        ],
        "data": "0x00000000000000000000000000000000000000000000000000000000000002fe000000000000000000000000000000000000000000000000000000000000003b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003fcb0342353c541e210013aaddc2e740b9a33d08ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffbababa0000000000000000000000000000000000000000000000000011c37937e08000",
-       "position": "0x0"
+        "position": "0x0"
      },
      {
        "address": "0x350e0ffc780a6a75b44cc52e1ff9092870668945",
@ -451,7 +451,7 @@
          "0xcacb62d8acea4678658eb5dc4aaa889b34d893b967c96a5f8c066e6549fa3f42"
        ],
        "data": "0x0000000000000000000000000000000000000000000000000000000000000342000000000000000000000000000000000000000000000000000000000000003b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003fcb0342353c541e210013aaddc2e740b9a33d08ffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6363630000000000000000000000000000000000000000000000000011c37937e08000",
-       "position": "0x0"
+        "position": "0x0"
      },
      {
        "address": "0x350e0ffc780a6a75b44cc52e1ff9092870668945",
@ -459,7 +459,7 @@
          "0xcacb62d8acea4678658eb5dc4aaa889b34d893b967c96a5f8c066e6549fa3f42"
        ],
        "data": "0x00000000000000000000000000000000000000000000000000000000000002fe00000000000000000000000000000000000000000000000000000000000000340000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003fcb0342353c541e210013aaddc2e740b9a33d08ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000000000000000000000000000000000000011c37937e08000",
-       "position": "0x0"
+        "position": "0x0"
      },
      {
        "address": "0x350e0ffc780a6a75b44cc52e1ff9092870668945",
@ -467,7 +467,7 @@
          "0xcacb62d8acea4678658eb5dc4aaa889b34d893b967c96a5f8c066e6549fa3f42"
        ],
        "data": "0x000000000000000000000000000000000000000000000000000000000000034200000000000000000000000000000000000000000000000000000000000000340000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003fcb0342353c541e210013aaddc2e740b9a33d08fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9f9f90000000000000000000000000000000000000000000000000011c37937e08000",
-       "position": "0x0"
+        "position": "0x0"
      },
      {
        "address": "0x350e0ffc780a6a75b44cc52e1ff9092870668945",
@ -475,7 +475,7 @@
          "0xcacb62d8acea4678658eb5dc4aaa889b34d893b967c96a5f8c066e6549fa3f42"
        ],
        "data": "0x00000000000000000000000000000000000000000000000000000000000002fe000000000000000000000000000000000000000000000000000000000000003c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003fcb0342353c541e210013aaddc2e740b9a33d08ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffeaeaea0000000000000000000000000000000000000000000000000011c37937e08000",
-       "position": "0x0"
+        "position": "0x0"
      },
      {
        "address": "0x350e0ffc780a6a75b44cc52e1ff9092870668945",
@ -483,7 +483,7 @@
          "0xcacb62d8acea4678658eb5dc4aaa889b34d893b967c96a5f8c066e6549fa3f42"
        ],
        "data": "0x0000000000000000000000000000000000000000000000000000000000000342000000000000000000000000000000000000000000000000000000000000003c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003fcb0342353c541e210013aaddc2e740b9a33d08ffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9c9c9c0000000000000000000000000000000000000000000000000011c37937e08000",
-       "position": "0x0"
+        "position": "0x0"
      },
      {
        "address": "0x350e0ffc780a6a75b44cc52e1ff9092870668945",
@ -491,7 +491,7 @@
          "0xcacb62d8acea4678658eb5dc4aaa889b34d893b967c96a5f8c066e6549fa3f42"
        ],
        "data": "0x00000000000000000000000000000000000000000000000000000000000002fe00000000000000000000000000000000000000000000000000000000000000330000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003fcb0342353c541e210013aaddc2e740b9a33d08fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8f8f80000000000000000000000000000000000000000000000000011c37937e08000",
-       "position": "0x0"
+        "position": "0x0"
      },
      {
        "address": "0x350e0ffc780a6a75b44cc52e1ff9092870668945",
@ -499,7 +499,7 @@
          "0xcacb62d8acea4678658eb5dc4aaa889b34d893b967c96a5f8c066e6549fa3f42"
        ],
        "data": "0x000000000000000000000000000000000000000000000000000000000000034200000000000000000000000000000000000000000000000000000000000000330000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003fcb0342353c541e210013aaddc2e740b9a33d08ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000000000000000000000000000000000000011c37937e08000",
-       "position": "0x0"
+        "position": "0x0"
      },
      {
        "address": "0x350e0ffc780a6a75b44cc52e1ff9092870668945",
@ -507,7 +507,7 @@
          "0xcacb62d8acea4678658eb5dc4aaa889b34d893b967c96a5f8c066e6549fa3f42"
        ],
        "data": "0x00000000000000000000000000000000000000000000000000000000000002fe000000000000000000000000000000000000000000000000000000000000003d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003fcb0342353c541e210013aaddc2e740b9a33d08fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffdfdfd0000000000000000000000000000000000000000000000000011c37937e08000",
-       "position": "0x0"
+        "position": "0x0"
      },
      {
        "address": "0x350e0ffc780a6a75b44cc52e1ff9092870668945",
@ -515,7 +515,7 @@
          "0xcacb62d8acea4678658eb5dc4aaa889b34d893b967c96a5f8c066e6549fa3f42"
        ],
        "data": "0x0000000000000000000000000000000000000000000000000000000000000342000000000000000000000000000000000000000000000000000000000000003d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003fcb0342353c541e210013aaddc2e740b9a33d08ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000000000000000000000000000000000000011c37937e08000",
-       "position": "0x0"
+        "position": "0x0"
      },
      {
        "address": "0x350e0ffc780a6a75b44cc52e1ff9092870668945",
@ -523,7 +523,7 @@
          "0xcacb62d8acea4678658eb5dc4aaa889b34d893b967c96a5f8c066e6549fa3f42"
        ],
        "data": "0x00000000000000000000000000000000000000000000000000000000000002fe00000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003fcb0342353c541e210013aaddc2e740b9a33d08ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000000000000000000000000000000000000011c37937e08000",
-       "position": "0x0"
+        "position": "0x0"
      },
      {
        "address": "0x350e0ffc780a6a75b44cc52e1ff9092870668945",
@ -531,7 +531,7 @@
          "0xcacb62d8acea4678658eb5dc4aaa889b34d893b967c96a5f8c066e6549fa3f42"
        ],
        "data": "0x000000000000000000000000000000000000000000000000000000000000034200000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003fcb0342353c541e210013aaddc2e740b9a33d08fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcfcfc0000000000000000000000000000000000000000000000000011c37937e08000",
-       "position": "0x0"
+        "position": "0x0"
      },
      {
        "address": "0x350e0ffc780a6a75b44cc52e1ff9092870668945",
@ -539,7 +539,7 @@
          "0xcacb62d8acea4678658eb5dc4aaa889b34d893b967c96a5f8c066e6549fa3f42"
        ],
        "data": "0x00000000000000000000000000000000000000000000000000000000000002fe000000000000000000000000000000000000000000000000000000000000003e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003fcb0342353c541e210013aaddc2e740b9a33d08fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffdfdfd0000000000000000000000000000000000000000000000000011c37937e08000",
-       "position": "0x0"
+        "position": "0x0"
      },
      {
        "address": "0x350e0ffc780a6a75b44cc52e1ff9092870668945",
@ -547,7 +547,7 @@
          "0xcacb62d8acea4678658eb5dc4aaa889b34d893b967c96a5f8c066e6549fa3f42"
        ],
        "data": "0x0000000000000000000000000000000000000000000000000000000000000342000000000000000000000000000000000000000000000000000000000000003e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003fcb0342353c541e210013aaddc2e740b9a33d08ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000000000000000000000000000000000000011c37937e08000",
-       "position": "0x0"
+        "position": "0x0"
      },
      {
        "address": "0x350e0ffc780a6a75b44cc52e1ff9092870668945",
@ -555,7 +555,7 @@
          "0xcacb62d8acea4678658eb5dc4aaa889b34d893b967c96a5f8c066e6549fa3f42"
        ],
        "data": "0x00000000000000000000000000000000000000000000000000000000000002fd00000000000000000000000000000000000000000000000000000000000000380000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003fcb0342353c541e210013aaddc2e740b9a33d08ffffffffffffffffffffffffffffffffffffffffffffffffffffffffff4d4e530000000000000000000000000000000000000000000000000011c37937e08000",
-       "position": "0x0"
+        "position": "0x0"
      },
      {
        "address": "0x350e0ffc780a6a75b44cc52e1ff9092870668945",
@ -563,7 +563,7 @@
          "0xcacb62d8acea4678658eb5dc4aaa889b34d893b967c96a5f8c066e6549fa3f42"
        ],
        "data": "0x000000000000000000000000000000000000000000000000000000000000034300000000000000000000000000000000000000000000000000000000000000380000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003fcb0342353c541e210013aaddc2e740b9a33d08ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000000000000000000000000000000000000011c37937e08000",
-       "position": "0x0"
+        "position": "0x0"
      },
      {
        "address": "0x350e0ffc780a6a75b44cc52e1ff9092870668945",
@ -571,7 +571,18 @@
          "0xcacb62d8acea4678658eb5dc4aaa889b34d893b967c96a5f8c066e6549fa3f42"
        ],
        "data": "0x00000000000000000000000000000000000000000000000000000000000002fd00000000000000000000000000000000000000000000000000000000000000370000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003fcb0342353c541e210013aaddc2e740b9a33d08ffffffffffffffffffffffffffffffffffffffffffffffffffffffffff4f494b0000000000000000000000000000000000000000000000000011c37937e08000",
-       "position": "0x0"
+        "position": "0x0"
+      },
+      {
+        "address": "0x0000000000000000000000000000000000001010",
+        "topics": [
+          "0x4dfe1bbbcf077ddc3e01291eea2d5c70c2b422b415d95645b9adcfd678cb1d63",
+          "0x0000000000000000000000000000000000000000000000000000000000001010",
+          "0x0000000000000000000000003fcb0342353c541e210013aaddc2e740b9a33d08",
+          "0x0000000000000000000000002a65aca4d5fc5b5c859090a6c34d164135398226"
+        ],
+        "data": "0x00000000000000000000000000000000000000000000000001b3dd214f1b8c000000000000000000000000000000000000000000000000006a0e4be198f18400000000000000000000000000000000000000000000000044dc051cccdfd2e132000000000000000000000000000000000000000000000000685a6ec049d5f800000000000000000000000000000000000000000000000044ddb8f9ee2eee6d32",
+        "position": "0x0"
      }
    ],
    "value": "0x3782dace9d90000",
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_withLog/notopic.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_withLog/notopic.json
@ -280,6 +280,17 @@
        "topics": [],
        "data": "0x62616e6b726f6c6c5f6d69736d61746368",
        "position": "0x2"
+      },
+      {
+        "address": "0x0000000000000000000000000000000000001010",
+        "topics": [
+          "0x4dfe1bbbcf077ddc3e01291eea2d5c70c2b422b415d95645b9adcfd678cb1d63",
+          "0x0000000000000000000000000000000000000000000000000000000000001010",
+          "0x0000000000000000000000006412becf35cc7e2a9e7e47966e443f295e1e4f4a",
+          "0x00000000000000000000000061c808d82a3ac53231750dadc13c777b59310bd9"
+        ],
+        "data": "0x000000000000000000000000000000000000000000000000000b30d0148e06000000000000000000000000000000000000000000000000000fb5dbfc0d448e7000000000000000000000000000000000000000000000012f621ea72fef44f8480000000000000000000000000000000000000000000000000faaab2bf8b6887000000000000000000000000000000000000000000000012f6229d80003d2fe48",
+        "position": "0x9"
      }
    ],
    "value": "0x429d069189e0000",
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_withLog/simple.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_withLog/simple.json
@ -77,6 +77,17 @@
        ],
        "data": "0x0000000000000000000000000000000000000000000000000000000000989680",
        "position": "0x0"
+      },
+      {
+        "address": "0x0000000000000000000000000000000000001010",
+        "topics": [
+          "0x4dfe1bbbcf077ddc3e01291eea2d5c70c2b422b415d95645b9adcfd678cb1d63",
+          "0x0000000000000000000000000000000000000000000000000000000000001010",
+          "0x000000000000000000000000d1220a0cf47c7b9be7a2e6ba89f429762e7b9adb",
+          "0x000000000000000000000000e2fe6b13287f28e193333fdfe7fedf2f6df6124a"
+        ],
+        "data": "0x00000000000000000000000000000000000000000000000000090886d609c4000000000000000000000000000000000000000000000000014203bee2ea6fbe8c0000000000000000000000000000000000000000000002717a9c870a286f435000000000000000000000000000000000000000000000000141fab65c1465fa8c0000000000000000000000000000000000000000000002717aa58f90fe790750",
+        "position": "0x0"
      }
    ],
    "value": "0x0",
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_withLog/tx_partial_failed.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_withLog/tx_partial_failed.json
@ -100,6 +100,17 @@
        ],
        "data": "0x00000000000000000000000001115b41bd2731353dd3e6abf44818fdc035aaf10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000bb9bc244d798123fde783fcc1c72d3bb8c1894130000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008861393035396362623030303030303030303030303030303030303030303030303930643363313831326465323636396266383037626437373538636562316533343937616337653430303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303031633662663532363334303030",
        "position": "0x0"
+      },
+      {
+        "address": "0x0000000000000000000000000000000000001010",
+        "topics": [
+          "0x4dfe1bbbcf077ddc3e01291eea2d5c70c2b422b415d95645b9adcfd678cb1d63",
+          "0x0000000000000000000000000000000000000000000000000000000000001010",
+          "0x00000000000000000000000001115b41bd2731353dd3e6abf44818fdc035aaf1",
+          "0x00000000000000000000000061c808d82a3ac53231750dadc13c777b59310bd9"
+        ],
+        "data": "0x000000000000000000000000000000000000000000000000000bcd242cec0800000000000000000000000000000000000000000000000000016d99e16e80900000000000000000000000000000000000000000000000006a636960e34bd696f40000000000000000000000000000000000000000000000000161ccbd4194880000000000000000000000000000000000000000000000006a63752e0778c29ef4",
+        "position": "0x1"
      }
    ],
    "value": "0x0",
--- a/eth/tracers/internal/tracetest/testdata/call_tracer_withLog/with_onlyTopCall.json
+++ b/eth/tracers/internal/tracetest/testdata/call_tracer_withLog/with_onlyTopCall.json
@ -83,6 +83,19 @@
    "to": "0x200edd17f30485a8735878661960cd7a9a95733f",
    "input": "0xba51a6df0000000000000000000000000000000000000000000000000000000000000000",
    "output": "0xba51a6df00000000000000000000000000000000000000000000000000000000",
+    "logs": [
+      {
+        "address": "0x0000000000000000000000000000000000001010",
+        "topics": [
+          "0x4dfe1bbbcf077ddc3e01291eea2d5c70c2b422b415d95645b9adcfd678cb1d63",
+          "0x0000000000000000000000000000000000000000000000000000000000001010",
+          "0x0000000000000000000000004f5777744b500616697cb655dcb02ee6cd51deb5",
+          "0x000000000000000000000000f8b483dba2c3b7176a3da549ad41a48bb3121069"
+        ],
+        "data": "0x00000000000000000000000000000000000000000000000000119b54eb98e126000000000000000000000000000000000000000000000000b0983f1b83eec29000000000000000000000000000000000000000000000016969a0ba2c2d384d07000000000000000000000000000000000000000000000000b086a3c69855e16a00000000000000000000000000000000000000000000016969b2558118d12e2d",
+        "position": "0x0"
+      }
+    ],
    "value": "0x8ac7230489e80000",
    "type": "CALL"
  }
--- a/eth/tracers/internal/tracetest/testdata/prestate_tracer/blob_tx.json
+++ b/eth/tracers/internal/tracetest/testdata/prestate_tracer/blob_tx.json
@ -1,64 +0,0 @@
-{
-  "genesis": {
-    "baseFeePerGas": "7",
-    "blobGasUsed": "0",
-    "difficulty": "0",
-    "excessBlobGas": "36306944",
-    "extraData": "0xd983010e00846765746888676f312e32312e308664617277696e",
-    "gasLimit": "15639172",
-    "hash": "0xc682259fda061bb9ce8ccb491d5b2d436cb73daf04e1025dd116d045ce4ad28c",
-    "miner": "0x0000000000000000000000000000000000000000",
-    "mixHash": "0xae1a5ba939a4c9ac38aabeff361169fb55a6fc2c9511457e0be6eff9514faec0",
-    "nonce": "0x0000000000000000",
-    "number": "315",
-    "parentBeaconBlockRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
-    "stateRoot": "0x577f42ab21ccfd946511c57869ace0bdf7c217c36f02b7cd3459df0ed1cffc1a",
-    "timestamp": "1709626771",
-    "totalDifficulty": "1",
-    "withdrawals": [],
-    "withdrawalsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-    "alloc": {
-      "0x0000000000000000000000000000000000000000": {
-        "balance": "0x272e0528"
-      },
-      "0x0c2c51a0990aee1d73c1228de158688341557508": {
-        "balance": "0xde0b6b3a7640000"
-      }
-    },
-    "config": {
-      "chainId": 1337,
-      "homesteadBlock": 0,
-      "eip150Block": 0,
-      "eip155Block": 0,
-      "eip158Block": 0,
-      "byzantiumBlock": 0,
-      "constantinopleBlock": 0,
-      "petersburgBlock": 0,
-      "istanbulBlock": 0,
-      "muirGlacierBlock": 0,
-      "berlinBlock": 0,
-      "londonBlock": 0,
-      "arrowGlacierBlock": 0,
-      "grayGlacierBlock": 0,
-      "shanghaiTime": 0,
-      "cancunTime": 0,
-      "terminalTotalDifficulty": 0,
-      "terminalTotalDifficultyPassed": true
-    }
-  },
-  "context": {
-    "number": "316",
-    "difficulty": "0",
-    "timestamp": "1709626785",
-    "gasLimit": "15654443",
-    "miner": "0x0000000000000000000000000000000000000000",
-    "baseFeePerGas": "7"
-  },
-  "input": "0x03f8b1820539806485174876e800825208940c2c51a0990aee1d73c1228de1586883415575088080c083020000f842a00100c9fbdf97f747e85847b4f3fff408f89c26842f77c882858bf2c89923849aa00138e3896f3c27f2389147507f8bcec52028b0efca6ee842ed83c9158873943880a0dbac3f97a532c9b00e6239b29036245a5bfbb96940b9d848634661abee98b945a03eec8525f261c2e79798f7b45a5d6ccaefa24576d53ba5023e919b86841c0675",
-  "result": {
-    "0x0000000000000000000000000000000000000000": { "balance": "0x272e0528" },
-    "0x0c2c51a0990aee1d73c1228de158688341557508": {
-      "balance": "0xde0b6b3a7640000"
-    }
-  }
-}
--- a/eth/tracers/internal/tracetest/testdata/prestate_tracer/create_create.json
+++ b/eth/tracers/internal/tracetest/testdata/prestate_tracer/create_create.json
@ -40,7 +40,14 @@
      "shanghaiTime": 0,
      "terminalTotalDifficulty": 0,
      "terminalTotalDifficultyPassed": true,
-      "isDev": true
+      "isDev": true,
+       "bor": {
+        "validatorContract": "0x0000000000000000000000000000000000001000",
+        "stateReceiverContract": "0x0000000000000000000000000000000000001001",
+        "burntContract": {
+          "0": "0x00000000000000000000000000000000000000000"
+        }
+      }
    }
  },
  "context": {
--- a/eth/tracers/internal/tracetest/testdata/prestate_tracer/create_post_eip158.json
+++ b/eth/tracers/internal/tracetest/testdata/prestate_tracer/create_post_eip158.json
@ -40,6 +40,13 @@
      "clique": {
        "period": 5,
        "epoch": 30000
+      },
+      "bor": {
+        "validatorContract": "0x0000000000000000000000000000000000001000",
+        "stateReceiverContract": "0x0000000000000000000000000000000000001001",
+        "burntContract": {
+          "0": "0x00000000000000000000000000000000000000000"
+        }
      }
    }
  },
--- a/eth/tracers/internal/tracetest/testdata/prestate_tracer_with_diff_mode/create_post_eip158.json
+++ b/eth/tracers/internal/tracetest/testdata/prestate_tracer_with_diff_mode/create_post_eip158.json
@ -40,6 +40,13 @@
      "clique": {
        "period": 5,
        "epoch": 30000
+      },
+      "bor": {
+        "validatorContract": "0x0000000000000000000000000000000000001000",
+        "stateReceiverContract": "0x0000000000000000000000000000000000001001",
+        "burntContract": {
+          "0": "0x00000000000000000000000000000000000000000"
+        }
      }
    }
  },