A reorganize occurs when the blocks that make up the best known chain changes. Note that simply adding a - * new block to the top of the best chain isn't as reorganize, but that a reorganize is always triggered by adding + *
A reorganize occurs when the blocks that make up the best known chain change. Note that simply adding a + * new block to the top of the best chain isn't a reorganize, but that a reorganize is always triggered by adding * a new block that connects to some other (non best head) block. By "best" we mean the chain representing the largest * amount of work done.
* @@ -543,7 +543,8 @@ private void connectBlock(final Block block, StoredBlock storedPrev, boolean exp block.transactions == null ? block : block.cloneAsHeader(), txOutChanges); versionTally.add(block.getVersion()); setChainHead(newStoredBlock); - log.debug("Chain is now {} blocks high, running listeners", newStoredBlock.getHeight()); + if (log.isDebugEnabled()) + log.debug("Chain is now {} blocks high, running listeners", newStoredBlock.getHeight()); informListenersForNewBlock(block, NewBlockType.BEST_CHAIN, filteredTxHashList, filteredTxn, newStoredBlock); } else { // This block connects to somewhere other than the top of the best known chain. We treat these differently. @@ -898,7 +899,8 @@ private void tryConnectingOrphans() throws VerificationException, BlockStoreExce StoredBlock prev = getStoredBlockInCurrentScope(orphanBlock.block.getPrevBlockHash()); if (prev == null) { // This is still an unconnected/orphan block. - log.debug("Orphan block {} is not connectable right now", orphanBlock.block.getHash()); + if (log.isDebugEnabled()) + log.debug("Orphan block {} is not connectable right now", orphanBlock.block.getHash()); continue; } // Otherwise we can connect it now. @@ -1042,7 +1044,7 @@ void trackFalsePositives(int count) { // Track false positives in batch by adding alpha to the false positive estimate once per count. // Each false positive counts as 1.0 towards the estimate. falsePositiveRate += FP_ESTIMATOR_ALPHA * count; - if (count > 0) + if (count > 0 && log.isDebugEnabled()) log.debug("{} false positives, current rate = {} trend = {}", count, falsePositiveRate, falsePositiveTrend); } diff --git a/core/src/main/java/org/bitcoinj/core/ECKey.java b/core/src/main/java/org/bitcoinj/core/ECKey.java index 0144ebf7f81..6572b061570 100644 --- a/core/src/main/java/org/bitcoinj/core/ECKey.java +++ b/core/src/main/java/org/bitcoinj/core/ECKey.java @@ -148,7 +148,7 @@ public int compare(ECKey k1, ECKey k2) { // The two parts of the key. If "priv" is set, "pub" can always be calculated. If "pub" is set but not "priv", we // can only verify signatures not make them. - protected final BigInteger priv; // A field element. + @Nullable protected final BigInteger priv; // A field element. protected final LazyECPoint pub; // Creation time of the key in seconds since the epoch, or zero if the key was deserialized from a version that did @@ -992,7 +992,7 @@ public static ECKey recoverFromSignature(int recId, ECDSASignature sig, Sha256Ha // 1.2. Convert the integer x to an octet string X of length mlen using the conversion routine // specified in Section 2.3.7, where mlen = ⌈(log2 p)/8⌉ or mlen = ⌈m/8⌉. // 1.3. Convert the octet string (16 set binary digits)||X to an elliptic curve point R using the - // conversion routine specified in Section 2.3.4. If this conversion routine outputs “invalid”, then + // conversion routine specified in Section 2.3.4. If this conversion routine outputs "invalid", then // do another iteration of Step 1. // // More concisely, what these points mean is to use X as a compressed public key. diff --git a/core/src/main/java/org/bitcoinj/core/Peer.java b/core/src/main/java/org/bitcoinj/core/Peer.java index a8cbcb2847e..87531b7a175 100644 --- a/core/src/main/java/org/bitcoinj/core/Peer.java +++ b/core/src/main/java/org/bitcoinj/core/Peer.java @@ -575,7 +575,8 @@ private void processVersionMessage(VersionMessage m) throws ProtocolException { // Now it's our turn ... // Send an ACK message stating we accept the peers protocol version. sendMessage(new VersionAck()); - log.debug("{}: Incoming version handshake complete.", this); + if (log.isDebugEnabled()) + log.debug("{}: Incoming version handshake complete.", this); incomingVersionHandshakeFuture.set(this); } @@ -586,12 +587,14 @@ private void processVersionAck(VersionAck m) throws ProtocolException { if (outgoingVersionHandshakeFuture.isDone()) { throw new ProtocolException("got more than one version ack"); } - log.debug("{}: Outgoing version handshake complete.", this); + if (log.isDebugEnabled()) + log.debug("{}: Outgoing version handshake complete.", this); outgoingVersionHandshakeFuture.set(this); } private void versionHandshakeComplete() { - log.debug("{}: Handshake complete.", this); + if (log.isDebugEnabled()) + log.debug("{}: Handshake complete.", this); setTimeoutEnabled(false); for (final ListenerRegistrationThe reason for this split, instead of just interpreting directly, is to make it easier * to reach into a programs structure and pull out bits of data without having to run it. - * This is necessary to render the to/from addresses of transactions in a user interface. + * This is necessary to render the to addresses of transactions in a user interface. * Bitcoin Core does something similar.
*/ private void parse(byte[] program) throws ScriptException { diff --git a/core/src/main/java/org/bitcoinj/script/ScriptChunk.java b/core/src/main/java/org/bitcoinj/script/ScriptChunk.java index a8b2d29830d..fc54d4d5c64 100644 --- a/core/src/main/java/org/bitcoinj/script/ScriptChunk.java +++ b/core/src/main/java/org/bitcoinj/script/ScriptChunk.java @@ -44,11 +44,11 @@ public class ScriptChunk { public final byte[] data; private int startLocationInProgram; - public ScriptChunk(int opcode, byte[] data) { + public ScriptChunk(int opcode, @Nullable byte[] data) { this(opcode, data, -1); } - public ScriptChunk(int opcode, byte[] data, int startLocationInProgram) { + public ScriptChunk(int opcode, @Nullable byte[] data, int startLocationInProgram) { this.opcode = opcode; this.data = data; this.startLocationInProgram = startLocationInProgram; diff --git a/core/src/main/java/org/bitcoinj/script/ScriptPattern.java b/core/src/main/java/org/bitcoinj/script/ScriptPattern.java index ff282e427fa..3f6321e51a6 100644 --- a/core/src/main/java/org/bitcoinj/script/ScriptPattern.java +++ b/core/src/main/java/org/bitcoinj/script/ScriptPattern.java @@ -197,8 +197,8 @@ public static byte[] extractHashFromP2WH(Script script) { } /** - * Returns whether this script matches the format used for multisig outputs: - * {@code [n] [keys...] [m] CHECKMULTISIG} + * Returns whether this script matches the format used for m-of-n multisig outputs: + * {@code [m] [keys...] [n] CHECKMULTISIG} */ public static boolean isSentToMultisig(Script script) { List+ * Triggers an auto save (if enabled.) + *
+ * Unlike {@link Wallet#commitTx} this method does not throw an exception if the transaction + * was already added to the wallet, instead it will return {@code false} * + * @param tx transaction to commit * @return true if the tx was added to the wallet, or false if it was already in the pending pool + * @throws VerificationException If transaction fails to verify */ public boolean maybeCommitTx(Transaction tx) throws VerificationException { tx.verify(); @@ -2699,15 +2707,21 @@ public boolean maybeCommitTx(Transaction tx) throws VerificationException { } /** - *
Updates the wallet with the given transaction: puts it into the pending pool, sets the spent flags and runs - * the onCoinsSent/onCoinsReceived event listener. Used in two situations:
- * + * Updates the wallet with the given transaction: puts it into the pending pool, sets the spent flags and runs + * the onCoinsSent/onCoinsReceived event listener. Used in two situations: + **
+ * Triggers an auto save (if enabled.) + *
+ * Unlike {@link Wallet#maybeCommitTx} {@code commitTx} throws an exception if the transaction + * was already added to the wallet. * - *
Triggers an auto save.
+ * @param tx transaction to commit + * @throws VerificationException if transaction was already in the pending pool */ public void commitTx(Transaction tx) throws VerificationException { checkArgument(maybeCommitTx(tx), "commitTx called on the same transaction twice"); diff --git a/core/src/test/java/org/bitcoinj/core/PeerGroupTest.java b/core/src/test/java/org/bitcoinj/core/PeerGroupTest.java index 2b8539c632f..b69dcd52d9f 100644 --- a/core/src/test/java/org/bitcoinj/core/PeerGroupTest.java +++ b/core/src/test/java/org/bitcoinj/core/PeerGroupTest.java @@ -607,8 +607,8 @@ public void shutdown() { } @Test - public void testBloomOnP2Pubkey() throws Exception { - // Cover bug 513. When a relevant transaction with a p2pubkey output is found, the Bloom filter should be + public void testBloomOnP2PK() throws Exception { + // Cover bug 513. When a relevant transaction with a P2PK output is found, the Bloom filter should be // recalculated to include that transaction hash but not re-broadcast as the remote nodes should have followed // the same procedure. However a new node that's connected should get the fresh filter. peerGroup.start(); @@ -616,12 +616,13 @@ public void testBloomOnP2Pubkey() throws Exception { // Create a couple of peers. InboundMessageQueuer p1 = connectPeer(1); InboundMessageQueuer p2 = connectPeer(2); - // Create a pay to pubkey tx. + // Create a P2PK tx. Transaction tx = FakeTxBuilder.createFakeTx(UNITTEST, COIN, key); Transaction tx2 = new Transaction(UNITTEST); tx2.addInput(tx.getOutput(0)); TransactionOutPoint outpoint = tx2.getInput(0).getOutpoint(); assertTrue(p1.lastReceivedFilter.contains(key.getPubKey())); + assertTrue(p1.lastReceivedFilter.contains(key.getPubKeyHash())); assertFalse(p1.lastReceivedFilter.contains(tx.getTxId().getBytes())); inbound(p1, tx); // p1 requests dep resolution, p2 is quiet. @@ -635,6 +636,7 @@ public void testBloomOnP2Pubkey() throws Exception { // Now we connect p3 and there is a new bloom filter sent, that DOES match the relevant outpoint. InboundMessageQueuer p3 = connectPeer(3); assertTrue(p3.lastReceivedFilter.contains(key.getPubKey())); + assertTrue(p3.lastReceivedFilter.contains(key.getPubKeyHash())); assertTrue(p3.lastReceivedFilter.contains(outpoint.unsafeBitcoinSerialize())); } diff --git a/core/src/test/java/org/bitcoinj/script/ScriptTest.java b/core/src/test/java/org/bitcoinj/script/ScriptTest.java index 8777f0b37c7..587557203e5 100644 --- a/core/src/test/java/org/bitcoinj/script/ScriptTest.java +++ b/core/src/test/java/org/bitcoinj/script/ScriptTest.java @@ -437,7 +437,7 @@ public void testCLTVPaymentChannelOutput() { @Test public void getToAddress() throws Exception { - // pay to pubkey + // P2PK ECKey toKey = new ECKey(); Address toAddress = LegacyAddress.fromKey(TESTNET, toKey); assertEquals(toAddress, ScriptBuilder.createP2PKOutputScript(toKey).getToAddress(TESTNET, true)); diff --git a/core/src/test/java/org/bitcoinj/wallet/DefaultRiskAnalysisTest.java b/core/src/test/java/org/bitcoinj/wallet/DefaultRiskAnalysisTest.java index d731352fd1a..5a146d4e251 100644 --- a/core/src/test/java/org/bitcoinj/wallet/DefaultRiskAnalysisTest.java +++ b/core/src/test/java/org/bitcoinj/wallet/DefaultRiskAnalysisTest.java @@ -209,7 +209,7 @@ public void standardOutputs() throws Exception { tx.addInput(MAINNET.getGenesisBlock().getTransactions().get(0).getOutput(0)); // A pay to address output tx.addOutput(Coin.CENT, ScriptBuilder.createP2PKHOutputScript(key1)); - // A pay to pubkey output + // A P2PK output tx.addOutput(Coin.CENT, ScriptBuilder.createP2PKOutputScript(key1)); tx.addOutput(Coin.CENT, ScriptBuilder.createP2PKOutputScript(key1)); // 1-of-2 multisig output. diff --git a/examples/build.gradle b/examples/build.gradle index 5c1b1a0df96..2134d7be043 100644 --- a/examples/build.gradle +++ b/examples/build.gradle @@ -5,12 +5,13 @@ eclipse.project.name = 'bitcoinj-examples' dependencies { implementation project(':core') - implementation 'com.google.guava:guava:27.0.1-android' + implementation 'com.google.guava:guava:27.1-android' implementation 'net.sf.jopt-simple:jopt-simple:5.0.4' - implementation 'org.slf4j:slf4j-jdk14:1.7.25' + implementation 'org.slf4j:slf4j-jdk14:1.7.28' implementation 'org.fusesource.leveldbjni:leveldbjni-all:1.8' } sourceCompatibility = 1.8 compileJava.options.encoding = 'UTF-8' compileTestJava.options.encoding = 'UTF-8' +javadoc.options.encoding = 'UTF-8' diff --git a/tools/build.gradle b/tools/build.gradle index 9a78bfde62c..476b4ecb013 100644 --- a/tools/build.gradle +++ b/tools/build.gradle @@ -5,14 +5,15 @@ eclipse.project.name = 'bitcoinj-tools' dependencies { implementation project(':core') - implementation 'com.google.guava:guava:27.0.1-android' + implementation 'com.google.guava:guava:27.1-android' implementation 'net.sf.jopt-simple:jopt-simple:5.0.4' - implementation 'org.slf4j:slf4j-jdk14:1.7.25' + implementation 'org.slf4j:slf4j-jdk14:1.7.28' } sourceCompatibility = 1.8 compileJava.options.encoding = 'UTF-8' compileTestJava.options.encoding = 'UTF-8' +javadoc.options.encoding = 'UTF-8' task wallet_tool(type: JavaExec) { description = 'Print and manipulate wallets.' diff --git a/wallettemplate/build.gradle b/wallettemplate/build.gradle index 9e0fe15d27a..918bc208300 100644 --- a/wallettemplate/build.gradle +++ b/wallettemplate/build.gradle @@ -11,11 +11,11 @@ eclipse.project.name = 'bitcoinj-wallettemplate' dependencies { implementation project(':core') - implementation 'com.google.guava:guava:27.0.1-android' + implementation 'com.google.guava:guava:27.1-android' implementation 'org.fxmisc.easybind:easybind:1.0.2' implementation 'de.jensd:fontawesomefx:8.0.0' implementation 'net.glxn:qrgen:1.3' - implementation 'org.slf4j:slf4j-jdk14:1.7.25' + implementation 'org.slf4j:slf4j-jdk14:1.7.28' } javafx { @@ -25,6 +25,7 @@ javafx { sourceCompatibility = 1.11 compileJava.options.encoding = 'UTF-8' compileTestJava.options.encoding = 'UTF-8' +javadoc.options.encoding = 'UTF-8' mainClassName = 'wallettemplate.Main'