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

ethclient/lightclient: addressed tailFetcher TODOs

Browse source
This commit is contained in:
Zsolt Felfoldi 2024-06-10 01:20:52 +02:00
parent d323dac883
commit 40e1577e67
1 changed files with 30 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
ethclient/lightclient/canonical.go
View file

@ -34,24 +34,26 @@ import (
const recentCanonicalLength = 256 const recentCanonicalLength = 256
type canonicalChainFields struct { type canonicalChainFields struct {
chainLock sync.Mutex chainLock sync.Mutex
head, finality *btypes.ExecutionHeader head, finality *btypes.ExecutionHeader
recent map[uint64]common.Hash // nil while head == nil recent map[uint64]common.Hash // nil while head == nil
recentTail uint64 // if recent != nil then recent hashes are available from recentTail to head recentTail uint64 // if recent != nil then recent hashes are available from recentTail to head
tailFetchCh chan struct{} tailFetchCh, closeCh chan struct{}
finalized *lru.Cache[uint64, common.Hash] // finalized but not recent hashes finalized *lru.Cache[uint64, common.Hash] // finalized but not recent hashes
requests *requestMap[uint64, common.Hash] // requested; neither recent nor cached finalized requests *requestMap[uint64, common.Hash] // requested; neither recent nor cached finalized
} }
func (c *Client) initCanonicalChain() { func (c *Client) initCanonicalChain() {
c.finalized = lru.NewCache[uint64, common.Hash](10000) c.finalized = lru.NewCache[uint64, common.Hash](10000)
c.requests = newRequestMap[uint64, common.Hash](nil) c.requests = newRequestMap[uint64, common.Hash](nil)
c.tailFetchCh = make(chan struct{}) c.tailFetchCh = make(chan struct{})
c.closeCh = make(chan struct{})
go c.tailFetcher() go c.tailFetcher()
} }
func (c *Client) closeCanonicalChain() { func (c *Client) closeCanonicalChain() {
c.requests.close() c.requests.close()
close(c.closeCh)
} }
func (c *Client) setHead(head *btypes.ExecutionHeader) bool { func (c *Client) setHead(head *btypes.ExecutionHeader) bool {
@ -117,7 +119,9 @@ func (c *Client) addRecentTail(tail *types.Header) bool {
c.chainLock.Lock() c.chainLock.Lock()
defer c.chainLock.Unlock() defer c.chainLock.Unlock()
if c.recent == nil || tail.Number.Uint64() != c.recentTail || c.recent[c.recentTail] != tail.Hash() { if c.recent == nil || c.head == nil || c.recentTail+recentCanonicalLength <= c.head.BlockNumber() ||
tail.Number.Uint64() != c.recentTail ||
c.recent[c.recentTail] != tail.Hash() {
return false return false
} }
if c.recentTail > 0 { if c.recentTail > 0 {
@ -128,24 +132,27 @@ func (c *Client) addRecentTail(tail *types.Header) bool {
return true return true
} }
func (c *Client) tailFetcher() { //TODO stop func (c *Client) tailFetcher() {
for { for {
c.chainLock.Lock() c.chainLock.Lock()
var ( var (
tailNum uint64 tailNum, needTail uint64
tailHash common.Hash tailHash common.Hash
) )
if c.recent != nil { if c.recent != nil && c.head != nil {
tailNum, tailHash = c.recentTail, c.recent[c.recentTail] tailNum, tailHash = c.recentTail, c.recent[c.recentTail]
} needTail = tailNum
needTail := tailNum for _, reqNum := range c.requests.allKeys() {
for _, reqNum := range c.requests.allKeys() { if reqNum < needTail {
if reqNum < needTail { needTail = reqNum
needTail = reqNum }
}
if headNum := c.head.BlockNumber(); needTail+recentCanonicalLength <= headNum {
needTail = headNum + 1 - recentCanonicalLength
} }
} }
c.chainLock.Unlock() c.chainLock.Unlock()
if needTail < tailNum { //TODO check recentCanonicalLength if needTail < tailNum {
log.Debug("Fetching tail headers", "have", tailNum, "need", needTail) log.Debug("Fetching tail headers", "have", tailNum, "need", needTail)
ctx, _ := context.WithTimeout(context.Background(), time.Second*10) ctx, _ := context.WithTimeout(context.Background(), time.Second*10)
//TODO parallel fetch by number //TODO parallel fetch by number
@ -153,7 +160,11 @@ func (c *Client) tailFetcher() { //TODO stop
c.addRecentTail(header) c.addRecentTail(header)
} }
} else { } else {
<-c.tailFetchCh select {
case <-c.tailFetchCh:
case <-c.closeCh:
return
}
} }
} }
} }