From b28755e5ae3e7de0cd7bc2a405bb70aa5cff7862 Mon Sep 17 00:00:00 2001
From: Jared Wasinger <j-wasinger@hotmail.com>
Date: Tue, 3 Feb 2026 11:55:42 -0500
Subject: [PATCH] revert change I made that broke 7778 fix.  fix build and
 tests

---
 core/genesis.go          | 5 +----
 core/state_transition.go | 2 +-
 tests/block_test.go      | 4 ++--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/core/genesis.go b/core/genesis.go
index e18f7c5f43..25b54cdfbd 100644
--- a/core/genesis.go
+++ b/core/genesis.go
@@ -74,7 +74,7 @@ type Genesis struct {
 	ExcessBlobGas       *uint64      `json:"excessBlobGas"`                 // EIP-4844
 	BlobGasUsed         *uint64      `json:"blobGasUsed"`                   // EIP-4844
 	BlockAccessListHash *common.Hash `json:"blockAccessListHash,omitempty"` // EIP-7928
-	SlotNumber    *uint64     `json:"slotNumber"`    // EIP-7843
+	SlotNumber          *uint64      `json:"slotNumber"`                    // EIP-7843
 }
 
 // copy copies the genesis.
@@ -124,11 +124,8 @@ func ReadGenesis(db ethdb.Database) (*Genesis, error) {
 	genesis.BaseFee = genesisHeader.BaseFee
 	genesis.ExcessBlobGas = genesisHeader.ExcessBlobGas
 	genesis.BlobGasUsed = genesisHeader.BlobGasUsed
-<<<<<<< HEAD
 	genesis.BlockAccessListHash = genesisHeader.BlockAccessListHash
-=======
 	genesis.SlotNumber = genesisHeader.SlotNumber
->>>>>>> 06c09385b5 (core/vm: implement eip-7843)
 
 	return &genesis, nil
 }
diff --git a/core/state_transition.go b/core/state_transition.go
index 0e9c3283f9..140bdd0fbd 100644
--- a/core/state_transition.go
+++ b/core/state_transition.go
@@ -576,7 +576,7 @@ func (st *stateTransition) execute() (*ExecutionResult, error) {
 	}
 
 	return &ExecutionResult{
-		UsedGas:    peakGasUsed,
+		UsedGas:    st.gasUsed(),
 		MaxUsedGas: peakGasUsed,
 		Err:        vmerr,
 		ReturnData: ret,
diff --git a/tests/block_test.go b/tests/block_test.go
index f5953fdd27..65bdd84d0c 100644
--- a/tests/block_test.go
+++ b/tests/block_test.go
@@ -126,7 +126,7 @@ func TestBlockchain(t *testing.T) {
 	bt.skipLoad(`.*\.meta/.*`)
 
 	bt.walk(t, blockTestDir, func(t *testing.T, name string, test *BlockTest) {
-		execBlockTest(t, bt, test)
+		execBlockTest(t, bt, test, false)
 	})
 	// There is also a LegacyTests folder, containing blockchain tests generated
 	// prior to Istanbul. However, they are all derived from GeneralStateTests,
@@ -144,7 +144,7 @@ func testExecutionSpecBlocktests(t *testing.T, testDir string) {
 	bt.skipLoad(".*prague/eip7002_el_triggerable_withdrawals/test_system_contract_deployment.json")
 
 	bt.walk(t, testDir, func(t *testing.T, name string, test *BlockTest) {
-		execBlockTest(t, bt, test)
+		execBlockTest(t, bt, test, false)
 	})
 }