forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-16 17:03:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add support

Browse source 
Update simulate.go

Update simulate.go

Update simulate.go

Update consensus.go

passed withdrawals - now state root mismartch

working but withdrawals issue

Added support
This commit is contained in:
Rez 2025-02-26 17:13:38 +11:00
parent f485e213b6
commit 2407255bb3
No known key found for this signature in database
2 changed files with 27 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
internal/ethapi/override/override.go
View file

@ -128,6 +128,8 @@ type BlockOverrides struct {
PrevRandao *common.Hash PrevRandao *common.Hash
BaseFeePerGas *hexutil.Big BaseFeePerGas *hexutil.Big
BlobBaseFee *hexutil.Big BlobBaseFee *hexutil.Big
BeaconRoot *common.Hash
Withdrawals *types.Withdrawals
} }
// Apply overrides the given header fields into the given block context. // Apply overrides the given header fields into the given block context.

35
internal/ethapi/simulate.go
View file

@ -209,6 +209,10 @@ func (sim *simulator) processBlock(ctx context.Context, block *simBlock, header,
if sim.chainConfig.IsPrague(header.Number, header.Time) || sim.chainConfig.IsVerkle(header.Number, header.Time) { if sim.chainConfig.IsPrague(header.Number, header.Time) || sim.chainConfig.IsVerkle(header.Number, header.Time) {
core.ProcessParentBlockHash(header.ParentHash, evm) core.ProcessParentBlockHash(header.ParentHash, evm)
} }
if block.BlockOverrides.BeaconRoot != nil {
core.ProcessBeaconBlockRoot(*block.BlockOverrides.BeaconRoot, evm)
}
var allLogs []*types.Log var allLogs []*types.Log
for i, call := range block.Calls { for i, call := range block.Calls {
if err := ctx.Err(); err != nil { if err := ctx.Err(); err != nil {
@ -254,6 +258,11 @@ func (sim *simulator) processBlock(ctx context.Context, block *simBlock, header,
} }
callResults[i] = callRes callResults[i] = callRes
} }
header.GasUsed = gasUsed
if sim.chainConfig.IsCancun(header.Number, header.Time) {
header.BlobGasUsed = &blobGasUsed
}
var requests [][]byte var requests [][]byte
// Process EIP-7685 requests // Process EIP-7685 requests
if sim.chainConfig.IsPrague(header.Number, header.Time) { if sim.chainConfig.IsPrague(header.Number, header.Time) {
@ -267,20 +276,26 @@ func (sim *simulator) processBlock(ctx context.Context, block *simBlock, header,
// EIP-7251 // EIP-7251
core.ProcessConsolidationQueue(&requests, evm) core.ProcessConsolidationQueue(&requests, evm)
} }
header.Root = sim.state.IntermediateRoot(true)
header.GasUsed = gasUsed
if sim.chainConfig.IsCancun(header.Number, header.Time) {
header.BlobGasUsed = &blobGasUsed
}
var withdrawals types.Withdrawals
if sim.chainConfig.IsShanghai(header.Number, header.Time) {
withdrawals = make([]*types.Withdrawal, 0)
}
if requests != nil { if requests != nil {
reqHash := types.CalcRequestsHash(requests) reqHash := types.CalcRequestsHash(requests)
header.RequestsHash = &reqHash header.RequestsHash = &reqHash
} }
b := types.NewBlock(header, &types.Body{Transactions: txes, Withdrawals: withdrawals}, receipts, trie.NewStackTrie(nil)) var withdrawals types.Withdrawals
if sim.chainConfig.IsShanghai(header.Number, header.Time) {
if block.BlockOverrides.Withdrawals != nil {
withdrawals = *block.BlockOverrides.Withdrawals
} else {
withdrawals = make([]*types.Withdrawal, 0)
}
}
blockBody := &types.Body{Transactions: txes, Withdrawals: withdrawals}
if block.BlockOverrides.Withdrawals != nil {
// We assume that if the user provides Withdrawals, we're operating on Beacon consensus
// which can have nil ChainHeadReader
sim.b.Engine().Finalize(nil, header, sim.state, blockBody)
}
header.Root = sim.state.IntermediateRoot(true)
b := types.NewBlock(header, blockBody, receipts, trie.NewStackTrie(nil))
repairLogs(callResults, b.Hash()) repairLogs(callResults, b.Hash())
return b, callResults, nil return b, callResults, nil
} }