mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2025-02-22 22:25:41 +01:00
Code Issues Projects Releases Packages Wiki Activity

NetworkParameters: fix protocol version for BIP37 bloom filters

Browse source 
According to BIP111, the protocol version must be greater than 70000.
Since we use "greater or equals", 70001 is the correct number.
This commit is contained in:
Andreas Schildbach 2023-03-30 19:23:12 +02:00
parent 90fc2bfb5e
commit dd07d2cf62
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/main/java/org/bitcoinj/core/NetworkParameters.java
View file

@ -555,7 +555,7 @@ public abstract class NetworkParameters {
public static enum ProtocolVersion { public static enum ProtocolVersion {
MINIMUM(70000), MINIMUM(70000),
PONG(60001), PONG(60001),
BLOOM_FILTER(70000), // BIP37 BLOOM_FILTER(70001), // BIP37
BLOOM_FILTER_BIP111(70011), // BIP111 BLOOM_FILTER_BIP111(70011), // BIP111
WITNESS_VERSION(70012), WITNESS_VERSION(70012),
FEEFILTER(70013), // BIP133 FEEFILTER(70013), // BIP133

4
integration-test/src/test/java/org/bitcoinj/core/PeerGroupTest.java
View file

@ -732,10 +732,10 @@ public class PeerGroupTest extends TestWithPeerGroup {
CompletableFuture<List<Peer>> future = peerGroup.waitForPeersWithServiceMask(2, 3); CompletableFuture<List<Peer>> future = peerGroup.waitForPeersWithServiceMask(2, 3);
VersionMessage ver1 = new VersionMessage(UNITTEST, 10); VersionMessage ver1 = new VersionMessage(UNITTEST, 10);
ver1.clientVersion = 70000; ver1.clientVersion = 70001;
ver1.localServices = Services.of(Services.NODE_NETWORK); ver1.localServices = Services.of(Services.NODE_NETWORK);
VersionMessage ver2 = new VersionMessage(UNITTEST, 10); VersionMessage ver2 = new VersionMessage(UNITTEST, 10);
ver2.clientVersion = 70000; ver2.clientVersion = 70001;
ver2.localServices = Services.of(Services.NODE_NETWORK | 2); ver2.localServices = Services.of(Services.NODE_NETWORK | 2);
peerGroup.start(); peerGroup.start();
assertFalse(future.isDone()); assertFalse(future.isDone());