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

Allow some monkey-patching of Peer methods/Peer creation.

Browse Source 
Fix a bug in the min version required feature.
This commit is contained in:
Mike Hearn 2015-10-08 19:15:07 +02:00
parent 0079c272ff
commit 761834bc18
2 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
core/src/main/java/org/bitcoinj/core/Peer.java
View File

@ -452,7 +452,7 @@ public class Peer extends PeerSocketHandler {
} }
} }
private void processUTXOMessage(UTXOsMessage m) { protected void processUTXOMessage(UTXOsMessage m) {
SettableFuture<UTXOsMessage> future = null; SettableFuture<UTXOsMessage> future = null;
lock.lock(); lock.lock();
try { try {
@ -505,7 +505,7 @@ public class Peer extends PeerSocketHandler {
versionHandshakeFuture.set(this); versionHandshakeFuture.set(this);
} }
private void startFilteredBlock(FilteredBlock m) { protected void startFilteredBlock(FilteredBlock m) {
// Filtered blocks come before the data that they refer to, so stash it here and then fill it out as // Filtered blocks come before the data that they refer to, so stash it here and then fill it out as
// messages stream in. We'll call endFilteredBlock when a non-tx message arrives (eg, another // messages stream in. We'll call endFilteredBlock when a non-tx message arrives (eg, another
// FilteredBlock) or when a tx that isn't needed by that block is found. A ping message is sent after // FilteredBlock) or when a tx that isn't needed by that block is found. A ping message is sent after
@ -520,7 +520,7 @@ public class Peer extends PeerSocketHandler {
} }
} }
private void processNotFoundMessage(NotFoundMessage m) { protected void processNotFoundMessage(NotFoundMessage m) {
// This is received when we previously did a getdata but the peer couldn't find what we requested in it's // This is received when we previously did a getdata but the peer couldn't find what we requested in it's
// memory pool. Typically, because we are downloading dependencies of a relevant transaction and reached // memory pool. Typically, because we are downloading dependencies of a relevant transaction and reached
// the bottom of the dependency tree (where the unconfirmed transactions connect to transactions that are // the bottom of the dependency tree (where the unconfirmed transactions connect to transactions that are
@ -539,7 +539,7 @@ public class Peer extends PeerSocketHandler {
} }
} }
private void processAlert(AlertMessage m) { protected void processAlert(AlertMessage m) {
try { try {
if (m.isSignatureValid()) { if (m.isSignatureValid()) {
log.info("Received alert from peer {}: {}", this, m.getStatusBar()); log.info("Received alert from peer {}: {}", this, m.getStatusBar());
@ -554,7 +554,7 @@ public class Peer extends PeerSocketHandler {
} }
} }
private void processHeaders(HeadersMessage m) throws ProtocolException { protected void processHeaders(HeadersMessage m) throws ProtocolException {
// Runs in network loop thread for this peer. // Runs in network loop thread for this peer.
// //
// This method can run if a peer just randomly sends us a "headers" message (should never happen), or more // This method can run if a peer just randomly sends us a "headers" message (should never happen), or more
@ -634,7 +634,7 @@ public class Peer extends PeerSocketHandler {
} }
} }
private void processGetData(GetDataMessage getdata) { protected void processGetData(GetDataMessage getdata) {
log.info("{}: Received getdata message: {}", getAddress(), getdata.toString()); log.info("{}: Received getdata message: {}", getAddress(), getdata.toString());
ArrayList<Message> items = new ArrayList<Message>(); ArrayList<Message> items = new ArrayList<Message>();
for (ListenerRegistration<PeerDataEventListener> registration : dataEventListeners) { for (ListenerRegistration<PeerDataEventListener> registration : dataEventListeners) {
@ -652,7 +652,7 @@ public class Peer extends PeerSocketHandler {
} }
} }
private void processTransaction(final Transaction tx) throws VerificationException { protected void processTransaction(final Transaction tx) throws VerificationException {
// Check a few basic syntax issues to ensure the received TX isn't nonsense. // Check a few basic syntax issues to ensure the received TX isn't nonsense.
tx.verify(); tx.verify();
lock.lock(); lock.lock();
@ -784,7 +784,7 @@ public class Peer extends PeerSocketHandler {
} }
// The marker object in the future returned is the same as the parameter. It is arbitrary and can be anything. // The marker object in the future returned is the same as the parameter. It is arbitrary and can be anything.
private ListenableFuture<Object> downloadDependenciesInternal(final Transaction tx, protected ListenableFuture<Object> downloadDependenciesInternal(final Transaction tx,
final Object marker, final Object marker,
final List<Transaction> results) { final List<Transaction> results) {
final SettableFuture<Object> resultFuture = SettableFuture.create(); final SettableFuture<Object> resultFuture = SettableFuture.create();
@ -865,7 +865,7 @@ public class Peer extends PeerSocketHandler {
return resultFuture; return resultFuture;
} }
private void processBlock(Block m) { protected void processBlock(Block m) {
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("{}: Received broadcast block {}", getAddress(), m.getHashAsString()); log.debug("{}: Received broadcast block {}", getAddress(), m.getHashAsString());
} }
@ -927,7 +927,7 @@ public class Peer extends PeerSocketHandler {
} }
// TODO: Fix this duplication. // TODO: Fix this duplication.
private void endFilteredBlock(FilteredBlock m) { protected void endFilteredBlock(FilteredBlock m) {
if (log.isDebugEnabled()) if (log.isDebugEnabled())
log.debug("{}: Received broadcast filtered block {}", getAddress(), m.getHash().toString()); log.debug("{}: Received broadcast filtered block {}", getAddress(), m.getHash().toString());
if (!vDownloadData) { if (!vDownloadData) {
@ -1062,7 +1062,7 @@ public class Peer extends PeerSocketHandler {
} }
} }
private void processInv(InventoryMessage inv) { protected void processInv(InventoryMessage inv) {
List<InventoryItem> items = inv.getItems(); List<InventoryItem> items = inv.getItems();
// Separate out the blocks and transactions, we'll handle them differently // Separate out the blocks and transactions, we'll handle them differently
@ -1502,7 +1502,7 @@ public class Peer extends PeerSocketHandler {
} }
} }
private void processPong(Pong m) { protected void processPong(Pong m) {
// Iterates over a snapshot of the list, so we can run unlocked here. // Iterates over a snapshot of the list, so we can run unlocked here.
for (PendingPing ping : pendingPings) { for (PendingPing ping : pendingPings) {
if (m.getNonce() == ping.nonce) { if (m.getNonce() == ping.nonce) {
@ -1574,8 +1574,9 @@ public class Peer extends PeerSocketHandler {
*/ */
public boolean setMinProtocolVersion(int minProtocolVersion) { public boolean setMinProtocolVersion(int minProtocolVersion) {
this.vMinProtocolVersion = minProtocolVersion; this.vMinProtocolVersion = minProtocolVersion;
if (getVersionMessage().clientVersion < minProtocolVersion) { VersionMessage ver = getPeerVersionMessage();
log.warn("{}: Disconnecting due to new min protocol version {}", this, minProtocolVersion); if (ver != null && ver.clientVersion < minProtocolVersion) {
log.warn("{}: Disconnecting due to new min protocol version {}, got: {}", this, minProtocolVersion, ver.clientVersion);
close(); close();
return true; return true;
} }

14
core/src/main/java/org/bitcoinj/core/PeerGroup.java
View File

@ -85,8 +85,8 @@ public class PeerGroup implements TransactionBroadcaster {
protected final ReentrantLock lock = Threading.lock("peergroup"); protected final ReentrantLock lock = Threading.lock("peergroup");
private final NetworkParameters params; protected final NetworkParameters params;
@Nullable private final AbstractBlockChain chain; @Nullable protected final AbstractBlockChain chain;
// This executor is used to queue up jobs: it's used when we don't want to use locks for mutual exclusion, // This executor is used to queue up jobs: it's used when we don't want to use locks for mutual exclusion,
// typically because the job might call in to user provided code that needs/wants the freedom to use the API // typically because the job might call in to user provided code that needs/wants the freedom to use the API
@ -123,7 +123,7 @@ public class PeerGroup implements TransactionBroadcaster {
// The version message to use for new connections. // The version message to use for new connections.
@GuardedBy("lock") private VersionMessage versionMessage; @GuardedBy("lock") private VersionMessage versionMessage;
// Switch for enabling download of pending transaction dependencies. // Switch for enabling download of pending transaction dependencies.
@GuardedBy("lock") private boolean downloadTxDependencies; @GuardedBy("lock") protected boolean downloadTxDependencies;
// How many connections we want to have open at the current time. If we lose connections, we'll try opening more // How many connections we want to have open at the current time. If we lose connections, we'll try opening more
// until we reach this count. // until we reach this count.
@GuardedBy("lock") private int maxConnections; @GuardedBy("lock") private int maxConnections;
@ -1301,7 +1301,7 @@ public class PeerGroup implements TransactionBroadcaster {
ver.bestHeight = chain == null ? 0 : chain.getBestChainHeight(); ver.bestHeight = chain == null ? 0 : chain.getBestChainHeight();
ver.time = Utils.currentTimeSeconds(); ver.time = Utils.currentTimeSeconds();
Peer peer = new Peer(params, ver, address, chain, downloadTxDependencies); Peer peer = createPeer(address, ver);
peer.addConnectionEventListener(Threading.SAME_THREAD, startupListener); peer.addConnectionEventListener(Threading.SAME_THREAD, startupListener);
peer.setMinProtocolVersion(vMinRequiredProtocolVersion); peer.setMinProtocolVersion(vMinRequiredProtocolVersion);
pendingPeers.add(peer); pendingPeers.add(peer);
@ -1329,6 +1329,12 @@ public class PeerGroup implements TransactionBroadcaster {
return peer; return peer;
} }
/** You can override this to customise the creation of {@link Peer} objects. */
@GuardedBy("lock")
protected Peer createPeer(PeerAddress address, VersionMessage ver) {
return new Peer(params, ver, address, chain, downloadTxDependencies);
}
/** /**
* Sets the timeout between when a connection attempt to a peer begins and when the version message exchange * Sets the timeout between when a connection attempt to a peer begins and when the version message exchange
* completes. This does not apply to currently pending peers. * completes. This does not apply to currently pending peers.