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

Only apply last known tip on p2p client after pre processing
Some checks are pending
continuous-integration/drone/push Build is running
Details

Browse source
This commit is contained in:
DataHoarder 2023-07-31 21:47:35 +02:00
parent f49f52a853
commit 43a7603e0f
Signed by: DataHoarder
SSH key fingerprint: SHA256:OLTRf6Fl87G52SiR7sWLGNzlJt4WOX+tfI2yxo0z7xk
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
p2pool/p2p/client.go
View file

@ -517,7 +517,9 @@ func (c *Client) OnConnection() {
tipHash := types.HashFromBytes(block.CoinbaseExtra(sidechain.SideTemplateId))
if isChainTipBlockRequest {
if lastTip := c.LastKnownTip.Load(); lastTip == nil || lastTip.Side.Height <= block.Side.Height {
c.LastKnownTip.Store(block)
if _, err = c.Owner.SideChain().PreprocessBlock(block); err == nil {
c.LastKnownTip.Store(block)
}
}
log.Printf("[P2PClient] Peer %s tip is at id = %s, height = %d, main height = %d", c.AddressPort.String(), tipHash, block.Side.Height, block.Main.Coinbase.GenHeight)
@ -610,9 +612,6 @@ func (c *Client) OnConnection() {
c.LastBroadcastTimestamp.Store(uint64(time.Now().Unix()))
if lastTip := c.LastKnownTip.Load(); lastTip == nil || lastTip.Side.Height <= block.Side.Height {
c.LastKnownTip.Store(block)
}
//log.Printf("[P2PClient] Peer %s broadcast tip is at id = %s, height = %d, main height = %d", c.AddressPort.String(), tipHash, block.Side.Height, block.Main.Coinbase.GenHeight)
if missingBlocks, err := c.Owner.SideChain().PreprocessBlock(block); err != nil {
@ -622,6 +621,10 @@ func (c *Client) OnConnection() {
//TODO: ban here, but sort blocks properly, maybe a queue to re-try?
break
} else {
if lastTip := c.LastKnownTip.Load(); lastTip == nil || lastTip.Side.Height <= block.Side.Height {
c.LastKnownTip.Store(block)
}
ourMinerData := c.Owner.MainChain().GetMinerDataTip()
if block.Main.PreviousId != ourMinerData.PrevId {