Skip to content

fix: sort logs and remove duplicate append in Finalize #1836

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kamuikatsurgi merged 3 commits into from
Oct 23, 2025
Merged

fix: sort logs and remove duplicate append in Finalize #1836

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a2e3a3
fix: append tx only in FinalizeAndAssemble and use state instead of w…
kamuikatsurgi Oct 23, 2025
4c3819b
consensus/bor: sort logs before extracting state-sync logs
manav2401 Oct 23, 2025
60ef9c0
chore: revert statedb changes
kamuikatsurgi Oct 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions consensus/bor/bor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1062,7 +1062,6 @@ func (c *Bor) Finalize(chain consensus.ChainHeaderReader, header *types.Header,
return nil
}
}

// Get the underlying state for updating consensus time
state := wrappedState.Inner()
state.BorConsensusTime = time.Since(start)
Expand All @@ -1077,7 +1076,10 @@ func (c *Bor) Finalize(chain consensus.ChainHeaderReader, header *types.Header,
}

if len(stateSyncData) > 0 && c.config != nil && c.config.IsStateSync(big.NewInt(int64(headerNumber))) {
receipts = insertStateSyncTransactionAndCalculateReceipt(stateSyncData, header, body, wrappedState, receipts)
stateSyncTx := types.NewTx(&types.StateSyncTx{
StateSyncData: stateSyncData,
})
receipts = insertStateSyncTransactionAndCalculateReceipt(stateSyncTx, header, body, wrappedState, receipts)
} else {
// set state sync
hc := chain.(*core.HeaderChain)
Expand All @@ -1086,12 +1088,11 @@ func (c *Bor) Finalize(chain consensus.ChainHeaderReader, header *types.Header,
return receipts
}

func insertStateSyncTransactionAndCalculateReceipt(stateSyncData []*types.StateSyncData, header *types.Header, body *types.Body, state vm.StateDB, receipts []*types.Receipt) []*types.Receipt {
stateSyncTx := types.NewTx(&types.StateSyncTx{
StateSyncData: stateSyncData,
})
body.Transactions = append(body.Transactions, stateSyncTx)
func insertStateSyncTransactionAndCalculateReceipt(stateSyncTx *types.Transaction, header *types.Header, body *types.Body, state vm.StateDB, receipts []*types.Receipt) []*types.Receipt {
allLogs := state.Logs()
sort.SliceStable(allLogs, func(i, j int) bool {
return allLogs[i].Index < allLogs[j].Index
})
logsFromReceiptCount := countLogsFromReceipts(receipts)
stateSyncLogs := allLogs[logsFromReceiptCount:]

Expand Down Expand Up @@ -1212,7 +1213,11 @@ func (c *Bor) FinalizeAndAssemble(chain consensus.ChainHeaderReader, header *typ
header.UncleHash = types.CalcUncleHash(nil)

if len(stateSyncData) > 0 && c.config != nil && c.config.IsStateSync(big.NewInt(int64(headerNumber))) {
receipts = insertStateSyncTransactionAndCalculateReceipt(stateSyncData, header, body, state, receipts)
stateSyncTx := types.NewTx(&types.StateSyncTx{
StateSyncData: stateSyncData,
})
body.Transactions = append(body.Transactions, stateSyncTx)
receipts = insertStateSyncTransactionAndCalculateReceipt(stateSyncTx, header, body, state, receipts)
} else {
// set state sync
bc := chain.(core.BorStateSyncer)
Expand Down
Loading