Skip to content

dbft: fix Extensible sender verification #319

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
roman-khimov merged 2 commits into from
Sep 11, 2024
Merged

dbft: fix Extensible sender verification #319

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d24d992
dbft: fix extensible sender check
AnnaShaleva Sep 11, 2024
2eb049f
dbft: use slices package for sorting
AnnaShaleva Sep 11, 2024
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
20 changes: 6 additions & 14 deletions consensus/dbft/dbft.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import (
"fmt"
"io"
"math/big"
"sort"
"sync"
"sync/atomic"
"time"
Expand Down Expand Up @@ -460,12 +459,8 @@ func New(config *params.DBFTConfig, _ ethdb.Database) (*DBFT, error) {
return
}

var sorted = make([]common.Hash, len(hashes))
copy(sorted, hashes)
sort.Slice(sorted, func(i, j int) bool {
return sorted[i].Cmp(sorted[j]) < 0
})

sorted := slices.Clone(hashes)
slices.SortFunc(sorted, common.Hash.Cmp)
c.txCbList.Store(sorted)

c.requestTxs(sorted)
Expand Down Expand Up @@ -1621,11 +1616,8 @@ func (c *DBFT) OnTransaction(txs []*types.Transaction) {
var cbList = c.txCbList.Load()
if cbList != nil {
for _, tx := range txs {
var list = cbList.([]common.Hash)
var i = sort.Search(len(list), func(i int) bool {
return list[i].Cmp(tx.Hash()) >= 0
})
if i < len(list) && list[i].Cmp(tx.Hash()) == 0 {
_, found := slices.BinarySearchFunc(cbList.([]common.Hash), tx.Hash(), common.Hash.Cmp)
if found {
c.txs <- tx
}
}
Expand Down Expand Up @@ -1669,8 +1661,8 @@ func (c *DBFT) IsExtensibleAllowed(h uint64, u common.Address) error {
if err != nil {
return fmt.Errorf("failed to get validators: %w", err)
}
n := sort.Search(len(validators), func(i int) bool { return validators[i].Cmp(u) >= 0 })
if n >= len(validators) {
_, found := slices.BinarySearchFunc(validators, u, common.Address.Cmp)
if !found {
return fmt.Errorf("address is not a validator")
}
return nil
Expand Down