Skip to content

fix: avoid lazy RegTestParams construction in ZeroConfCoinSelector #298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HashEngineering wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: avoid lazy RegTestParams construction in ZeroConfCoinSelector #298

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions core/src/main/java/org/bitcoinj/wallet/ZeroConfCoinSelector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@

package org.bitcoinj.wallet;

import org.bitcoinj.core.NetworkParameters;
import org.bitcoinj.core.Transaction;
import org.bitcoinj.core.TransactionConfidence;
import org.bitcoinj.params.RegTestParams;

public class ZeroConfCoinSelector extends DefaultCoinSelector {

Expand Down Expand Up @@ -45,6 +45,9 @@ boolean isTransactionSelectable(Transaction tx) {
return type.equals(TransactionConfidence.ConfidenceType.BUILDING) || type.equals(TransactionConfidence.ConfidenceType.PENDING) &&
// In regtest mode we expect to have only one peer, so we won't see transactions propagate.
// TODO: The value 1 below dates from a time when transactions we broadcast *to* were counted, set to 0
(confidence.numBroadcastPeers() > 1 || tx.getParams() == RegTestParams.get());
// Compare against the network id rather than RegTestParams.get(): the latter lazily constructs
// RegTestParams (recomputing and asserting the regtest genesis X11 hash), which can throw when first
// triggered on a contended background thread (e.g. CoinJoin) even on mainnet/testnet wallets.
(confidence.numBroadcastPeers() > 1 || NetworkParameters.ID_REGTEST.equals(tx.getParams().getId()));
}
}
Loading