core,eth/tracers: fix TestPrestateWithDiffModeTracer

core/state_processor.go

@@ -141,6 +141,9 @@ func applyTransaction(msg *Message, config *params.ChainConfig, gp *GasPool, sta
 		statedb.AddBalance(result.BurntContractAddress, result.FeeBurnt)
 	}
 
+	// TODO(raneet10) Double check
+	statedb.AddBalance(evm.Context.Coinbase, result.FeeTipped)
+
 	if result.Err == vm.ErrInterrupt {
 		return nil, result.Err
 	}

core/state_transition.go

@@ -441,15 +441,16 @@ func (st *StateTransition) TransitionDb(interruptCtx context.Context) (*Executio
 		effectiveTip = cmath.BigMin(msg.GasTipCap, new(big.Int).Sub(msg.GasFeeCap, st.evm.Context.BaseFee))
 	}
 
-	if st.evm.Config.NoBaseFee && msg.GasFeeCap.Sign() == 0 && msg.GasTipCap.Sign() == 0 {
+	// TODO(raneet10): Double check. We might want to inculcate this fix in a separate condition
-		// Skip fee payment when NoBaseFee is set and the fee fields
+	// if st.evm.Config.NoBaseFee && msg.GasFeeCap.Sign() == 0 && msg.GasTipCap.Sign() == 0 {
-		// are 0. This avoids a negative effectiveTip being applied to
+	// 	// Skip fee payment when NoBaseFee is set and the fee fields
-		// the coinbase when simulating calls.
+	// 	// are 0. This avoids a negative effectiveTip being applied to
-	} else {
+	// 	// the coinbase when simulating calls.
-		fee := new(big.Int).SetUint64(st.gasUsed())
+	// } else {
-		fee.Mul(fee, effectiveTip)
+	// 	fee := new(big.Int).SetUint64(st.gasUsed())
-		st.state.AddBalance(st.evm.Context.Coinbase, fee)
+	// 	fee.Mul(fee, effectiveTip)
-	}
+	// 	st.state.AddBalance(st.evm.Context.Coinbase, fee)
+	// }
 
 	amount := new(big.Int).Mul(new(big.Int).SetUint64(st.gasUsed()), effectiveTip)
 

eth/tracers/internal/tracetest/testdata/call_tracer/inner_revert_reason.json

@@ -37,6 +37,13 @@
       "clique": {
         "period": 0,
         "epoch": 30000
+      },
+      "bor": {
+        "validatorContract": "0x0000000000000000000000000000000000001000",
+        "stateReceiverContract": "0x0000000000000000000000000000000000001001",
+        "burntContract": {
+          "0": "0x00000000000000000000000000000000000000000"
+        }
       }
     }
   },

eth/tracers/internal/tracetest/testdata/prestate_tracer_with_diff_mode/create.json

@@ -41,7 +41,14 @@
       "londonBlock": 12965000,
       "arrowGlacierBlock": 13773000,
       "grayGlacierBlock": 15050000,
-      "ethash": {}
+      "ethash": {},
+      "bor": {
+        "validatorContract": "0x0000000000000000000000000000000000001000",
+        "stateReceiverContract": "0x0000000000000000000000000000000000001001",
+        "burntContract": {
+          "0": "0x00000000000000000000000000000000000000000"
+        }
+      }
     }
   },
   "context": {

eth/tracers/internal/tracetest/testdata/prestate_tracer_with_diff_mode/create_failed.json

@@ -56,7 +56,14 @@
       "arrowGlacierBlock": 13773000,
       "grayGlacierBlock": 15050000,
       "terminalTotalDifficultyPassed": true,
-      "ethash": {}
+      "ethash": {},
+      "bor": {
+        "validatorContract": "0x0000000000000000000000000000000000001000",
+        "stateReceiverContract": "0x0000000000000000000000000000000000001001",
+        "burntContract": {
+          "0": "0x0000000000000000000000000000000000000dead"
+        }
+      }
     }
   },
   "context": {

eth/tracers/internal/tracetest/testdata/prestate_tracer_with_diff_mode/create_suicide.json

@@ -53,7 +53,14 @@
       "londonBlock": 12965000,
       "arrowGlacierBlock": 13773000,
       "grayGlacierBlock": 15050000,
-      "ethash": {}
+      "ethash": {},
+      "bor": {
+        "validatorContract": "0x0000000000000000000000000000000000001000",
+        "stateReceiverContract": "0x0000000000000000000000000000000000001001",
+        "burntContract": {
+          "0": "0x00000000000000000000000000000000000000000"
+        }
+      }
     }
   },
   "context": {

eth/tracers/internal/tracetest/testdata/prestate_tracer_with_diff_mode/inner_create.json

@@ -189,7 +189,14 @@
       "londonBlock": 12965000,
       "arrowGlacierBlock": 13773000,
       "grayGlacierBlock": 15050000,
-      "ethash": {}
+      "ethash": {},
+      "bor": {
+        "validatorContract": "0x0000000000000000000000000000000000001000",
+        "stateReceiverContract": "0x0000000000000000000000000000000000001001",
+        "burntContract": {
+          "0": "0x00000000000000000000000000000000000000000"
+        }
+      }
     }
   },
   "context": {

eth/tracers/internal/tracetest/testdata/prestate_tracer_with_diff_mode/simple.json

@@ -41,7 +41,14 @@
       "eip155Block": 10,
       "eip158Block": 10,
       "ethash": {},
-      "homesteadBlock": 0
+      "homesteadBlock": 0,
+      "bor": {
+        "validatorContract": "0x0000000000000000000000000000000000001000",
+        "stateReceiverContract": "0x0000000000000000000000000000000000001001",
+        "burntContract": {
+          "0": "0x00000000000000000000000000000000000000000"
+        }
+      }
     },
     "difficulty": "3509749784",
     "extraData": "0x4554482e45544846414e532e4f52472d4641313738394444",

eth/tracers/internal/tracetest/testdata/prestate_tracer_with_diff_mode/suicide.json

@@ -61,7 +61,14 @@
       "londonBlock": 12965000,
       "arrowGlacierBlock": 13773000,
       "grayGlacierBlock": 15050000,
-      "ethash": {}
+      "ethash": {},
+      "bor": {
+        "validatorContract": "0x0000000000000000000000000000000000001000",
+        "stateReceiverContract": "0x0000000000000000000000000000000000001001",
+        "burntContract": {
+          "0": "0x00000000000000000000000000000000000000000"
+        }
+      }
     }
   },
   "context": {