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

core: revert faulty API behavior, add shador code with correct behavior

Browse source
This commit is contained in:
Péter Szilágyi 2024-10-16 19:20:55 +03:00
parent a6c4273a59
commit bcd993a13d
1 changed files with 30 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
core/blockchain.go
View file

@ -2191,11 +2191,6 @@ func (bc *BlockChain) reorg(oldHead *types.Header, newHead *types.Header) error
oldChain []*types.Header oldChain []*types.Header
commonBlock *types.Header commonBlock *types.Header
) )
// Skip handling the newHead as it's handled outside
newHead = bc.GetHeader(newHead.ParentHash, newHead.Number.Uint64()-1)
if newHead == nil {
return errInvalidNewChain
}
// Reduce the longer chain to the same number as the shorter one // Reduce the longer chain to the same number as the shorter one
if oldHead.Number.Uint64() > newHead.Number.Uint64() { if oldHead.Number.Uint64() > newHead.Number.Uint64() {
// Old chain is longer, gather all transactions and logs as deleted ones // Old chain is longer, gather all transactions and logs as deleted ones
@ -2273,19 +2268,17 @@ func (bc *BlockChain) reorg(oldHead *types.Header, newHead *types.Header) error
deletedLogs []*types.Log deletedLogs []*types.Log
rebirthLogs []*types.Log rebirthLogs []*types.Log
) )
// Undo old blocks in reverse order // Deleted log emission on the API uses forward order, which is borked, but
for i := 0; i < len(oldChain); i++ { // we'll leave it in for legacy reasons.
// Collect all the deleted transactions //
// TODO(karalabe): This should be nuked out, no idea how, deprecate some APIs?
{
for i := len(oldChain) - 1; i >= 0; i-- {
block := bc.GetBlock(oldChain[i].Hash(), oldChain[i].Number.Uint64()) block := bc.GetBlock(oldChain[i].Hash(), oldChain[i].Number.Uint64())
if block == nil { if block == nil {
return errInvalidOldChain // Corrupt database, mostly here to avoid weird panics return errInvalidOldChain // Corrupt database, mostly here to avoid weird panics
} }
for _, tx := range block.Transactions() {
deletedTxs = append(deletedTxs, tx.Hash())
}
// Collect deleted logs and emit them
if logs := bc.collectLogs(block, true); len(logs) > 0 { if logs := bc.collectLogs(block, true); len(logs) > 0 {
slices.Reverse(logs) // Emit revertals latest first, older then
deletedLogs = append(deletedLogs, logs...) deletedLogs = append(deletedLogs, logs...)
} }
if len(deletedLogs) > 512 { if len(deletedLogs) > 512 {
@ -2296,8 +2289,27 @@ func (bc *BlockChain) reorg(oldHead *types.Header, newHead *types.Header) error
if len(deletedLogs) > 0 { if len(deletedLogs) > 0 {
bc.rmLogsFeed.Send(RemovedLogsEvent{deletedLogs}) bc.rmLogsFeed.Send(RemovedLogsEvent{deletedLogs})
} }
}
// Undo old blocks in reverse order
for i := 0; i < len(oldChain); i++ {
// Collect all the deleted transactions
block := bc.GetBlock(oldChain[i].Hash(), oldChain[i].Number.Uint64())
if block == nil {
return errInvalidOldChain // Corrupt database, mostly here to avoid weird panics
}
for _, tx := range block.Transactions() {
deletedTxs = append(deletedTxs, tx.Hash())
}
// Collect deleted logs and emit them for new integrations
if logs := bc.collectLogs(block, true); len(logs) > 0 {
// Emit revertals latest first, older then
slices.Reverse(logs)
// TODO(karalabe): Hook into the reverse emission part
}
}
// Apply new blocks in forward order // Apply new blocks in forward order
for i := len(newChain) - 1; i > 0; i-- { for i := len(newChain) - 1; i >= 1; i-- {
// Collect all the included transactions // Collect all the included transactions
block := bc.GetBlock(newChain[i].Hash(), newChain[i].Number.Uint64()) block := bc.GetBlock(newChain[i].Hash(), newChain[i].Number.Uint64())
if block == nil { if block == nil {
@ -2330,8 +2342,8 @@ func (bc *BlockChain) reorg(oldHead *types.Header, newHead *types.Header) error
// Because the reorg function does not handle new chain head, all hash // Because the reorg function does not handle new chain head, all hash
// markers greater than or equal to new chain head should be deleted. // markers greater than or equal to new chain head should be deleted.
number := commonBlock.Number number := commonBlock.Number
if len(newChain) > 0 { if len(newChain) > 1 {
number = newChain[0].Number number = newChain[1].Number
} }
for i := number.Uint64() + 1; ; i++ { for i := number.Uint64() + 1; ; i++ {
hash := rawdb.ReadCanonicalHash(bc.db, i) hash := rawdb.ReadCanonicalHash(bc.db, i)