Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-02-14 19:25:51 +00:00
Code Issues Projects Releases Wiki Activity

Clamp the blocksLeft parameter of the PeerEventListener.onBlocksDownloaded() callback to zero. It was being set from the difference between chain height and peer advertised chain height, which can legitimately be negative, but this is confusing and resulted in a bug in DownloadListener which could cause it to never correctly flag the end of chain download. Resolves issue 86.

Browse Source
This commit is contained in:
Mike Hearn 2012-02-13 22:02:13 +01:00
parent 5fde54e8e3
commit cbf60e1056
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/google/bitcoin/core/Peer.java
View File

@ -16,6 +16,7 @@
package com.google.bitcoin.core;
import com.google.bitcoin.utils.EventListenerInvoker;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -335,12 +336,17 @@ public class Peer {
}
}
private void invokeOnBlocksDownloaded(Block m) {
for (PeerEventListener listener : eventListeners) {
synchronized (listener) {
listener.onBlocksDownloaded(this, m, getPeerBlockHeightDifference());
private void invokeOnBlocksDownloaded(final Block m) {
// It is possible for the peer block height difference to be negative when blocks have been solved and broadcast
// since the time we first connected to the peer. However, it's weird and unexpected to receive a callback
// with negative "blocks left" in this case, so we clamp to zero so the API user doesn't have to think about it.
final int blocksLeft = Math.max(0, getPeerBlockHeightDifference());
EventListenerInvoker.invoke(eventListeners, new EventListenerInvoker<PeerEventListener>() {
@Override
public void invoke(PeerEventListener listener) {
listener.onBlocksDownloaded(Peer.this, m, blocksLeft);
}
}
});
}
private void processInv(InventoryMessage inv) throws IOException {
@ -599,7 +605,7 @@ public class Peer {
// https://en.bitcoin.it/wiki/Protocol_specification#getblocks
// However, this should be taken seriously going forward. The old implementation only added the hash of the
// genesis block and the current chain head, which randomly led us to halt block fetching when ending on a
// chain that turned out not to be the longest. This happened roughly once a week.
// chain that turned out not to be the longest. This happened roughly once a week.
// Now we add three hashes to the locator:
// 1. Hash of genesis block
// 2. Hash of the block previous to the chain head
@ -658,8 +664,7 @@ public class Peer {
// node. If that happens it means the user overrode us somewhere.
throw new RuntimeException("Connected to peer advertising negative chain height.");
}
int blocksToGet = chainHeight - blockChain.getChainHead().getHeight();
return blocksToGet;
return chainHeight - blockChain.getChainHead().getHeight();
}
/**