forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-19 19:30:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

revert change I made that broke 7778 fix. fix build and tests

Browse source
This commit is contained in:
Jared Wasinger 2026-02-03 11:55:42 -05:00
parent 4a19266d7a
commit b28755e5ae
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/genesis.go
View file

@ -74,7 +74,7 @@ type Genesis struct {
ExcessBlobGas *uint64 `json:"excessBlobGas"` // EIP-4844 ExcessBlobGas *uint64 `json:"excessBlobGas"` // EIP-4844
BlobGasUsed *uint64 `json:"blobGasUsed"` // EIP-4844 BlobGasUsed *uint64 `json:"blobGasUsed"` // EIP-4844
BlockAccessListHash *common.Hash `json:"blockAccessListHash,omitempty"` // EIP-7928 BlockAccessListHash *common.Hash `json:"blockAccessListHash,omitempty"` // EIP-7928
SlotNumber *uint64 `json:"slotNumber"` // EIP-7843 SlotNumber *uint64 `json:"slotNumber"` // EIP-7843
} }
// copy copies the genesis. // copy copies the genesis.
@ -124,11 +124,8 @@ func ReadGenesis(db ethdb.Database) (*Genesis, error) {
genesis.BaseFee = genesisHeader.BaseFee genesis.BaseFee = genesisHeader.BaseFee
genesis.ExcessBlobGas = genesisHeader.ExcessBlobGas genesis.ExcessBlobGas = genesisHeader.ExcessBlobGas
genesis.BlobGasUsed = genesisHeader.BlobGasUsed genesis.BlobGasUsed = genesisHeader.BlobGasUsed
<<<<<<< HEAD
genesis.BlockAccessListHash = genesisHeader.BlockAccessListHash genesis.BlockAccessListHash = genesisHeader.BlockAccessListHash
=======
genesis.SlotNumber = genesisHeader.SlotNumber genesis.SlotNumber = genesisHeader.SlotNumber
>>>>>>> 06c09385b5 (core/vm: implement eip-7843)
return &genesis, nil return &genesis, nil
} }

2
core/state_transition.go
View file

@ -576,7 +576,7 @@ func (st *stateTransition) execute() (*ExecutionResult, error) {
} }
return &ExecutionResult{ return &ExecutionResult{
UsedGas: peakGasUsed, UsedGas: st.gasUsed(),
MaxUsedGas: peakGasUsed, MaxUsedGas: peakGasUsed,
Err: vmerr, Err: vmerr,
ReturnData: ret, ReturnData: ret,

4
tests/block_test.go
View file

@ -126,7 +126,7 @@ func TestBlockchain(t *testing.T) {
bt.skipLoad(`.*\.meta/.*`) bt.skipLoad(`.*\.meta/.*`)
bt.walk(t, blockTestDir, func(t *testing.T, name string, test *BlockTest) { 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 // There is also a LegacyTests folder, containing blockchain tests generated
// prior to Istanbul. However, they are all derived from GeneralStateTests, // 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.skipLoad(".*prague/eip7002_el_triggerable_withdrawals/test_system_contract_deployment.json")
bt.walk(t, testDir, func(t *testing.T, name string, test *BlockTest) { bt.walk(t, testDir, func(t *testing.T, name string, test *BlockTest) {
execBlockTest(t, bt, test) execBlockTest(t, bt, test, false)
}) })
} }