mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2025-02-23 22:56:52 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix filter sync if headers received while syncing (#4463)

Browse source 
* fix filter sync if headers received while syncing

* remove unintended diffs
This commit is contained in:
Shreyansh 2022-07-09 00:14:15 +05:30 • committed by GitHub
parent 2968a9ee15
commit 7c649d39db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 51 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
node-test/src/test/scala/org/bitcoins/node/NeutrinoNodeTest.scala
View file

@ -253,4 +253,19 @@ class NeutrinoNodeTest extends NodeTestWithCachedBitcoindPair {
}
}
}
//intended for test fixtures
it must "sync filters when multiple header messages are sent in succession" in {
nodeConnectedWithBitcoind: NeutrinoNodeConnectedWithBitcoinds =>
val node = nodeConnectedWithBitcoind.node
val bitcoind = nodeConnectedWithBitcoind.bitcoinds(0)
for {
_ <- NodeUnitTest.syncNeutrinoNode(node, bitcoind)
_ <- bitcoind.generateToAddress(2, junkAddress)
_ <- NodeTestUtil.awaitAllSync(node, bitcoind)
} yield {
succeed
}
}
}

38
node/src/main/scala/org/bitcoins/node/networking/peer/DataMessageHandler.scala
View file

@ -119,7 +119,6 @@ case class DataMessageHandler(
} else {
val syncing = newFilterHeight < newFilterHeaderHeight
if (!syncing) {
logger.info(s"We are synced")
Try(initialSyncDone.map(_.success(Done)))
}
syncing
@ -147,11 +146,18 @@ case class DataMessageHandler(
s"Received maximum amount of filters in one batch. This means we are not synced, requesting more")
sendNextGetCompactFilterCommand(peerMsgSender, newFilterHeight)
} else Future.unit
newSyncing2 <- {
if (!newSyncing) {
syncIfHeadersAhead(peerMsgSender)
} else {
Future.successful(newSyncing)
}
}
} yield {
this.copy(
chainApi = newChainApi,
currentFilterBatch = newBatch,
syncing = newSyncing,
syncing = newSyncing2,
filterHeaderHeightOpt = Some(newFilterHeaderHeight),
filterHeightOpt = Some(newFilterHeight)
)
@ -335,6 +341,34 @@ case class DataMessageHandler(
}
}
/** syncs filter headers in case the header chain is still ahead post filter sync */
def syncIfHeadersAhead(
peerMessageSender: PeerMessageSender): Future[Boolean] = {
for {
headerHeight <- chainApi.getBestHashBlockHeight()
filterHeaderCount <- chainApi.getFilterHeaderCount()
filterCount <- chainApi.getFilterCount()
syncing <- {
assert(headerHeight >= Math.max(filterHeaderCount, filterCount),
"Header chain cannot be behind filter or filter header chain")
assert(
filterHeaderCount >= filterCount,
s"Filter header height $filterHeaderCount must be atleast filter height $filterCount")
if (headerHeight > filterHeaderCount) {
logger.info(
s"Starting to fetch filter headers in data message handler")
sendFirstGetCompactFilterHeadersCommand(peerMessageSender)
} else {
assert(
headerHeight == filterHeaderCount && headerHeight == filterCount)
logger.info(s"We are synced")
Try(initialSyncDone.map(_.success(Done)))
Future.successful(false)
}
}
} yield syncing
}
private def sendNextGetCompactFilterHeadersCommand(
peerMsgSender: PeerMessageSender,
prevStopHash: DoubleSha256DigestBE): Future[Boolean] =