tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

eth/downloader: handle missing withdrawals if empty list is expected (#26675)

Browse Source 
This PR relaxes the block body ingress handling a bit: if block body withdrawals are missing (but expected to be empty), the body withdrawals are set to 'empty list' before being passed to upper layers. 

This fixes an issue where a block passed from EthereumJS to geth was deemed invalid.
This commit is contained in:
Marius van der Wijden 2023-02-15 13:23:07 +01:00 committed by GitHub
parent 5967a2290a
commit 7fb42e6db2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/genesis.go
View File

@ -465,10 +465,12 @@ func (g *Genesis) ToBlock() *types.Block {
head.BaseFee = new(big.Int).SetUint64(params.InitialBaseFee) head.BaseFee = new(big.Int).SetUint64(params.InitialBaseFee)
} }
} }
var withdrawals []*types.Withdrawal
if g.Config != nil && g.Config.IsShanghai(g.Timestamp) { if g.Config != nil && g.Config.IsShanghai(g.Timestamp) {
head.WithdrawalsHash = &types.EmptyRootHash head.WithdrawalsHash = &types.EmptyRootHash
withdrawals = make([]*types.Withdrawal, 0)
} }
return types.NewBlock(head, nil, nil, nil, trie.NewStackTrie(nil)) return types.NewBlock(head, nil, nil, nil, trie.NewStackTrie(nil)).WithWithdrawals(withdrawals)
} }
// Commit writes the block and state of a genesis specification to the database. // Commit writes the block and state of a genesis specification to the database.

4
eth/downloader/queue.go
View File

@ -783,6 +783,10 @@ func (q *queue) DeliverBodies(id string, txLists [][]*types.Transaction, txListH
if header.WithdrawalsHash == nil { if header.WithdrawalsHash == nil {
// discard any withdrawals if we don't have a withdrawal hash set // discard any withdrawals if we don't have a withdrawal hash set
withdrawalLists[index] = nil withdrawalLists[index] = nil
} else if *header.WithdrawalsHash == types.EmptyRootHash && withdrawalLists[index] == nil {
// if the withdrawal hash is the emptyRootHash,
// we expect withdrawals to be [] instead of nil
withdrawalLists[index] = make([]*types.Withdrawal, 0)
} else if withdrawalListHashes[index] != *header.WithdrawalsHash { } else if withdrawalListHashes[index] != *header.WithdrawalsHash {
return errInvalidBody return errInvalidBody
} }

2
eth/protocols/eth/handler_test.go
View File

@ -424,7 +424,7 @@ func testGetBlockBodies(t *testing.T, protocol uint) {
RequestId: 123, RequestId: 123,
BlockBodiesPacket: bodies, BlockBodiesPacket: bodies,
}); err != nil { }); err != nil {
t.Errorf("test %d: bodies mismatch: %v", i, err) t.Fatalf("test %d: bodies mismatch: %v", i, err)
} }
} }
} }