forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-05-18 05:56:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

core: fix rebasing errors

Browse source
This commit is contained in:
MariusVanDerWijden 2026-02-05 14:06:44 +01:00
parent b236537fc4
commit 1509dd2d8c
2 changed files with 6 additions and 9 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
} }

10
core/parallel_state_processor.go
View file

@ -3,15 +3,16 @@ package core
import ( import (
"cmp" "cmp"
"fmt" "fmt"
"runtime"
"slices"
"time"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/core/types/bal" "github.com/ethereum/go-ethereum/core/types/bal"
"github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/core/vm"
"golang.org/x/sync/errgroup" "golang.org/x/sync/errgroup"
"runtime"
"slices"
"time"
) )
// ProcessResultWithMetrics wraps ProcessResult with some metrics that are // ProcessResultWithMetrics wraps ProcessResult with some metrics that are
@ -270,8 +271,7 @@ func (p *ParallelStateProcessor) execTx(block *types.Block, tx *types.Transactio
gp := new(GasPool) gp := new(GasPool)
gp.SetGas(block.GasLimit()) gp.SetGas(block.GasLimit())
db.SetTxContext(tx.Hash(), txIdx) db.SetTxContext(tx.Hash(), txIdx)
var gasUsed uint64 receipt, _, err := ApplyTransactionWithEVM(msg, gp, db, block.Number(), block.Hash(), context.Time, tx, 0, evm)
receipt, err := ApplyTransactionWithEVM(msg, gp, db, block.Number(), block.Hash(), context.Time, tx, &gasUsed, evm)
if err != nil { if err != nil {
err := fmt.Errorf("could not apply tx %d [%v]: %w", txIdx, tx.Hash().Hex(), err) err := fmt.Errorf("could not apply tx %d [%v]: %w", txIdx, tx.Hash().Hex(), err)
return &txExecResult{err: err} return &txExecResult{err: err}