P2Pool/consensus
P2Pool/consensus
1
1
Fork 0
Code Issues 3 Pull requests Releases Activity

Cleanup seen blocks properly to prevent slow leak like p2pool had before eab8a51bb7a30813d4cd8f570486fbee034acdb8

Browse source
This commit is contained in:
DataHoarder 2023-05-23 06:39:52 +02:00
parent 3ac9b9f5bd
commit 69cfc3f3da
Signed by: DataHoarder
SSH key fingerprint: SHA256:OLTRf6Fl87G52SiR7sWLGNzlJt4WOX+tfI2yxo0z7xk
2 changed files with 45 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
p2pool/sidechain/poolblock.go
View file

@ -338,6 +338,18 @@ var zeroFullId FullId
type FullId [FullIdSize]byte
func (id FullId) TemplateId() (h types.Hash) {
return types.Hash(h[:types.HashSize])
}
func (id FullId) Nonce() uint32 {
return binary.LittleEndian.Uint32(id[types.HashSize:])
}
func (id FullId) ExtraNonce() uint32 {
return binary.LittleEndian.Uint32(id[types.HashSize+unsafe.Sizeof(uint32(0)):])
}
func (b *PoolBlock) CalculateFullId(consensus *Consensus) FullId {
var buf FullId
sidechainId := b.SideTemplateId(consensus)

51
p2pool/sidechain/sidechain.go
View file

@ -232,7 +232,6 @@ func (c *SideChain) AddPoolBlockExternal(block *PoolBlock) (missingBlocks []type
//specifically check Main id for nonce changes! p2pool does not do this
if _, err := block.PowHashWithError(c.Consensus().GetHasher(), c.getSeedByHeightFunc()); err != nil {
c.BlockUnsee(block)
return nil, err, false
} else {
if isHigherMainChain, err := block.IsProofHigherThanMainDifficultyWithError(c.Consensus().GetHasher(), c.server.GetDifficultyByHeight, c.getSeedByHeightFunc()); err != nil {
@ -246,25 +245,27 @@ func (c *SideChain) AddPoolBlockExternal(block *PoolBlock) (missingBlocks []type
} else if !isHigher {
return nil, fmt.Errorf("not enough PoW for id %s, height = %d, mainchain height %d", templateId.String(), block.Side.Height, block.Main.Coinbase.GenHeight), true
}
c.sidechainLock.Lock()
defer c.sidechainLock.Unlock()
log.Printf("[SideChain] add_external_block: ALTERNATE height = %d, id = %s, mainchain height = %d, verified = %t, total = %d", block.Side.Height, block.SideTemplateId(c.Consensus()), block.Main.Coinbase.GenHeight, block.Verified.Load(), len(c.blocksByTemplateId))
{
c.sidechainLock.Lock()
defer c.sidechainLock.Unlock()
block.Verified.Store(true)
block.Invalid.Store(false)
if block.SideTemplateId(c.Consensus()) == c.watchBlockSidechainId {
c.server.UpdateBlockFound(c.watchBlock, block)
c.watchBlockSidechainId = types.ZeroHash
log.Printf("[SideChain] add_external_block: ALTERNATE height = %d, id = %s, mainchain height = %d, verified = %t, total = %d", block.Side.Height, block.SideTemplateId(c.Consensus()), block.Main.Coinbase.GenHeight, block.Verified.Load(), len(c.blocksByTemplateId))
block.Verified.Store(true)
block.Invalid.Store(false)
if block.SideTemplateId(c.Consensus()) == c.watchBlockSidechainId {
c.server.UpdateBlockFound(c.watchBlock, block)
c.watchBlockSidechainId = types.ZeroHash
}
block.Depth.Store(otherBlock.Depth.Load())
if block.WantBroadcast.Load() && !block.Broadcasted.Swap(true) {
//re-broadcast alternate blocks
c.server.Broadcast(block)
}
c.server.Store(block)
}
block.Depth.Store(otherBlock.Depth.Load())
if block.WantBroadcast.Load() && !block.Broadcasted.Swap(true) {
//re-broadcast alternate blocks
c.server.Broadcast(block)
}
c.server.Store(block)
}
}
return nil, nil, false
@ -810,7 +811,6 @@ func (c *SideChain) pruneOldBlocks() {
if block.Depth.Load() >= pruneDistance || (curTime >= (block.LocalTimestamp + pruneDelay)) {
if _, ok := c.blocksByTemplateId[block.SideTemplateId(c.Consensus())]; ok {
delete(c.blocksByTemplateId, block.SideTemplateId(c.Consensus()))
c.BlockUnsee(block)
numBlocksPruned++
} else {
log.Printf("[SideChain] blocksByHeight and blocksByTemplateId are inconsistent at height = %d, id = %s", height, block.SideTemplateId(c.Consensus()))
@ -831,9 +831,24 @@ func (c *SideChain) pruneOldBlocks() {
if !c.precalcFinished.Swap(true) {
c.derivationCache.Clear()
}
numSeenBlocksPruned := c.cleanupSeenBlocks()
if numSeenBlocksPruned > 0 {
//log.Printf("[SideChain] pruned %d seen blocks", numBlocksPruned)
}
}
}
func (c *SideChain) cleanupSeenBlocks() (cleaned int) {
for k, _ := range c.seenBlocks {
if c.getPoolBlockByTemplateId(k.TemplateId()) == nil {
delete(c.seenBlocks, k)
cleaned++
}
}
return cleaned
}
func (c *SideChain) GetMissingBlocks() []types.Hash {
c.sidechainLock.RLock()
defer c.sidechainLock.RUnlock()