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 disabling bloom filters on the peer group without using a

Browse Source 
FullPrunedBlockChain
This commit is contained in:
Oscar Guindzberg 2015-02-19 17:28:58 -03:00 committed by Mike Hearn
parent c6ee7449c3
commit 2c5d9f73ed
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -243,6 +243,9 @@ public class PeerGroup implements TransactionBroadcaster {
/** The default timeout between when a connection attempt begins and version message exchange completes */ /** The default timeout between when a connection attempt begins and version message exchange completes */
public static final int DEFAULT_CONNECT_TIMEOUT_MILLIS = 5000; public static final int DEFAULT_CONNECT_TIMEOUT_MILLIS = 5000;
private volatile int vConnectTimeoutMillis = DEFAULT_CONNECT_TIMEOUT_MILLIS; private volatile int vConnectTimeoutMillis = DEFAULT_CONNECT_TIMEOUT_MILLIS;
/** Whether bloom filter support is enabled when using a non FullPrunedBlockchain*/
private volatile boolean vBloomFilteringEnabled = true;
/** /**
* Creates a PeerGroup with the given parameters. No chain is provided so this node will report its chain height * Creates a PeerGroup with the given parameters. No chain is provided so this node will report its chain height
@ -587,12 +590,12 @@ public class PeerGroup implements TransactionBroadcaster {
// Updates the relayTxesBeforeFilter flag of ver // Updates the relayTxesBeforeFilter flag of ver
private void updateVersionMessageRelayTxesBeforeFilter(VersionMessage ver) { private void updateVersionMessageRelayTxesBeforeFilter(VersionMessage ver) {
// We will provide the remote node with a bloom filter (ie they shouldn't relay yet) // We will provide the remote node with a bloom filter (ie they shouldn't relay yet)
// iff chain == null || !chain.shouldVerifyTransactions() and a wallet is added // if chain == null || !chain.shouldVerifyTransactions() and a wallet is added and bloom filters are enabled
// Note that the default here means that no tx invs will be received if no wallet is ever added // Note that the default here means that no tx invs will be received if no wallet is ever added
lock.lock(); lock.lock();
try { try {
boolean spvMode = chain != null && !chain.shouldVerifyTransactions(); boolean spvMode = chain != null && !chain.shouldVerifyTransactions();
boolean willSendFilter = spvMode && peerFilterProviders.size() > 0; boolean willSendFilter = spvMode && peerFilterProviders.size() > 0 && vBloomFilteringEnabled;
ver.relayTxesBeforeFilter = !willSendFilter; ver.relayTxesBeforeFilter = !willSendFilter;
} finally { } finally {
lock.unlock(); lock.unlock();
@ -1044,7 +1047,7 @@ public class PeerGroup implements TransactionBroadcaster {
public void go() { public void go() {
checkState(!lock.isHeldByCurrentThread()); checkState(!lock.isHeldByCurrentThread());
// Fully verifying mode doesn't use this optimization (it can't as it needs to see all transactions). // Fully verifying mode doesn't use this optimization (it can't as it needs to see all transactions).
if (chain != null && chain.shouldVerifyTransactions()) if ((chain != null && chain.shouldVerifyTransactions()) || !vBloomFilteringEnabled)
return; return;
// We only ever call bloomFilterMerger.calculate on jobQueue, so we cannot be calculating two filters at once. // We only ever call bloomFilterMerger.calculate on jobQueue, so we cannot be calculating two filters at once.
FilterMerger.Result result = bloomFilterMerger.calculate(ImmutableList.copyOf(peerFilterProviders /* COW */)); FilterMerger.Result result = bloomFilterMerger.calculate(ImmutableList.copyOf(peerFilterProviders /* COW */));
@ -1909,4 +1912,12 @@ public class PeerGroup implements TransactionBroadcaster {
public boolean isRunning() { public boolean isRunning() {
return vRunning; return vRunning;
} }
public void setBloomFilteringEnabled(boolean bloomFilteringEnabled) {
this.vBloomFilteringEnabled = bloomFilteringEnabled;
}
public boolean isBloomFilteringEnabled() {
return vBloomFilteringEnabled;
}
} }