Skip to content

Commit

Permalink
fix: improve dry run to include creating denominations
Browse files Browse the repository at this point in the history
  • Loading branch information
@HashEngineering
HashEngineering committed Dec 24, 2023
1 parent db35ac3 commit 7ccf954
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 37 deletions.
5 changes: 3 additions & 2 deletions core/src/main/java/org/bitcoinj/coinjoin/CoinJoinClientManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ public boolean doAutomaticDenominating() {
return doAutomaticDenominating(false);
}
public boolean doAutomaticDenominating(boolean dryRun) {
if (!CoinJoinClientOptions.isEnabled() || !isMixing())
if (!CoinJoinClientOptions.isEnabled() || (!dryRun && !isMixing()))
return false;

if (context.masternodeSync.hasSyncFlag(MasternodeSync.SYNC_FLAGS.SYNC_GOVERNANCE) && !mixingWallet.getContext().masternodeSync.isBlockchainSynced()) {
Expand Down Expand Up @@ -288,7 +288,8 @@ public boolean doAutomaticDenominating(boolean dryRun) {
for (CoinJoinClientSession session: deqSessions) {
if (!checkAutomaticBackup()) return false;

if (waitForAnotherBlock()) {
// we may not need this
if (!dryRun && waitForAnotherBlock()) {
if (Utils.currentTimeMillis() - lastTimeReportTooRecent > 15000 ) {
strAutoDenomResult = "Last successful action was too recent.";
log.info("DoAutomaticDenominating -- {}", strAutoDenomResult);
Expand Down
68 changes: 37 additions & 31 deletions core/src/main/java/org/bitcoinj/coinjoin/CoinJoinClientSession.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public class CoinJoinClientSession extends CoinJoinBaseSession {
= new CopyOnWriteArrayList<>();

/// Create denominations
private boolean createDenominated(Coin balanceToDenominate) {
private boolean createDenominated(Coin balanceToDenominate, boolean dryRun) {

if (!CoinJoinClientOptions.isEnabled()) return false;

Expand All @@ -137,15 +137,12 @@ private boolean createDenominated(Coin balanceToDenominate) {
}

// Start from the largest balances first to speed things up by creating txes with larger/largest denoms included
vecTally.sort(new Comparator<CompactTallyItem>() {
@Override
public int compare(CompactTallyItem o, CompactTallyItem t1) {
if (o.amount.isGreaterThan(t1.amount))
return 1;
if (o.amount.equals(t1.amount))
return 0;
return -1;
}
vecTally.sort((a, b) -> {
if (a.amount.isGreaterThan(b.amount))
return 1;
if (a.amount.equals(b.amount))
return 0;
return -1;
});

boolean fCreateMixingCollaterals = !mixingWallet.hasCollateralInputs();
Expand Down Expand Up @@ -190,17 +187,17 @@ interface CountPossibleOutputs {
int process(Coin amount);
}

private boolean createDenominated(Coin balanceToDenominate, CompactTallyItem tallyItem, boolean fCreateMixingCollaterals) {
private boolean createDenominated(Coin balanceToDenominate, CompactTallyItem tallyItem, boolean fCreateMixingCollaterals, boolean dryRun) {

if (!CoinJoinClientOptions.isEnabled())
if (!CoinJoinClientOptions.isEnabled())
return false;

// denominated input is always a single one, so we can check its amount directly and return early
if (tallyItem.inputCoins.size() == 1 && CoinJoin.isDenominatedAmount(tallyItem.amount)) {
return false;
}

try (TransactionBuilder txBuilder = new TransactionBuilder(mixingWallet, tallyItem)) {
try (TransactionBuilder txBuilder = new TransactionBuilder(mixingWallet, tallyItem, dryRun)) {
log.info("coinjoin: Start {}", txBuilder);

// ****** Add an output for mixing collaterals ************ /
Expand Down Expand Up @@ -367,18 +364,20 @@ public int process(Coin amount) {
return false;
}

StringBuilder strResult = new StringBuilder();
if (!txBuilder.commit(strResult)) {
log.info("coinjoin: Commit failed: {}", strResult.toString());
return false;
}
if (!dryRun) {
StringBuilder strResult = new StringBuilder();
if (!txBuilder.commit(strResult)) {
log.info("coinjoin: Commit failed: {}", strResult);
return false;
}

// use the same nCachedLastSuccessBlock as for DS mixing to prevent race
mixingWallet.getContext().coinJoinManager.coinJoinClientManagers.get(mixingWallet.getDescription()).updatedSuccessBlock();
// use the same nCachedLastSuccessBlock as for DS mixing to prevent race
mixingWallet.getContext().coinJoinManager.coinJoinClientManagers.get(mixingWallet.getDescription()).updatedSuccessBlock();

log.info("coinjoin: txid: {}", strResult);
log.info("coinjoin: txid: {}", strResult);

queueTransactionListeners(txBuilder.getTransaction(), CoinJoinTransactionType.CreateDenomination);
queueTransactionListeners(txBuilder.getTransaction(), CoinJoinTransactionType.CreateDenomination);
}
}
return true;
}
Expand Down Expand Up @@ -444,7 +443,7 @@ private boolean makeCollateralAmounts(CompactTallyItem tallyItem, boolean fTryDe
return false;
}

try (TransactionBuilder txBuilder = new TransactionBuilder(wallet, tallyItem)) {
try (TransactionBuilder txBuilder = new TransactionBuilder(wallet, tallyItem, false)) {
log.info("coinjoin: Start {}", txBuilder);

// Skip way too tiny amounts. Smallest we want is minimum collateral amount in a one output tx
Expand Down Expand Up @@ -1264,7 +1263,8 @@ public boolean doAutomaticDenominating(boolean fDryRun) {
}

if (getEntriesCount() > 0) {
setStatus(PoolStatus.MIXING);
if (!fDryRun)
setStatus(PoolStatus.MIXING);
return false;
}

Expand All @@ -1274,7 +1274,7 @@ public boolean doAutomaticDenominating(boolean fDryRun) {
return false;
}
try {
if (mixingWallet.getContext().masternodeListManager.getListAtChainTip().getValidMNsCount() == 0 &&
if (!fDryRun && mixingWallet.getContext().masternodeListManager.getListAtChainTip().getValidMNsCount() == 0 &&
!mixingWallet.getContext().getParams().getId().equals(NetworkParameters.ID_REGTEST)) {
strAutoDenomResult = "No Masternodes detected.";
log.info("coinjoin: {}", strAutoDenomResult);
Expand All @@ -1292,11 +1292,13 @@ public boolean doAutomaticDenominating(boolean fDryRun) {
balanceNeedsAnonymized = CoinJoinClientOptions.getAmount().subtract(nBalanceAnonymized);

if (balanceNeedsAnonymized.isLessThanOrEqualTo(Coin.ZERO)) {
log.info("coinjoin: Nothing to do");
log.info("coinjoin: Nothing to do {}", fDryRun);
// nothing to do, just keep it in idle mode
//status.set(PoolStatus.FINISHED);
//hasNothingToDo.set(true);
setStatus(PoolStatus.FINISHED);
if (!fDryRun) {
setStatus(PoolStatus.FINISHED);
}
return false;
}
hasNothingToDo.set(false);
Expand All @@ -1321,10 +1323,11 @@ public boolean doAutomaticDenominating(boolean fDryRun) {
//queueSessionCompleteListeners(getState(), ERR_SESSION);
//return false;
Coin balanceLeftToMix = mixingWallet.getAnonymizableBalance(false, false);
if (!balanceLeftToMix.isGreaterThanOrEqualTo(nValueMin)) {
if (!fDryRun && !balanceLeftToMix.isGreaterThanOrEqualTo(nValueMin)) {
setStatus(PoolStatus.ERR_NOT_ENOUGH_FUNDS);
queueSessionCompleteListeners(getState(), ERR_SESSION);
}
log.info("coinjoin: balance to low: {}", fDryRun);
return false;
}

Expand Down Expand Up @@ -1375,14 +1378,17 @@ public boolean doAutomaticDenominating(boolean fDryRun) {
nBalanceToDenominate.toFriendlyString()
);

if (fDryRun) return true;

// Check if we have should create more denominated inputs i.e.
// there are funds to denominate and denominated balance does not exceed
// max amount to mix yet.
lastCreateDenominatedResult = true;
if (nBalanceAnonimizableNonDenom.isGreaterThanOrEqualTo(nValueMin.add(CoinJoin.getCollateralAmount())) && nBalanceToDenominate.isGreaterThan(Coin.ZERO)) {
lastCreateDenominatedResult = createDenominated(nBalanceToDenominate);
lastCreateDenominatedResult = createDenominated(nBalanceToDenominate, fDryRun);
}

if (fDryRun) {
log.info("coinjoin: create denominations {}, {}", lastCreateDenominatedResult, fDryRun);
return lastCreateDenominatedResult;
}

//check if we have the collateral sized inputs
Expand Down
13 changes: 11 additions & 2 deletions core/src/main/java/org/bitcoinj/coinjoin/utils/TransactionBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import org.bitcoinj.core.Coin;
import org.bitcoinj.core.ECKey;
import org.bitcoinj.core.InsufficientMoneyException;
import org.bitcoinj.core.KeyId;
import org.bitcoinj.core.Transaction;
import org.bitcoinj.core.TransactionInput;
import org.bitcoinj.core.TransactionOutput;
Expand All @@ -34,6 +35,7 @@

import javax.annotation.concurrent.GuardedBy;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.locks.ReentrantLock;

Expand All @@ -56,6 +58,8 @@ public class TransactionBuilder implements AutoCloseable {
private int bytesOutput = 0;
/// Call KeepKey for all keys in destructor if fKeepKeys is true, call ReturnKey for all key if its false.
private boolean keepKeys = false;

final private boolean dryRun;
/// Protect vecOutputs
private final ReentrantLock lock = Threading.lock("outputs");
/// Contains all outputs already added to the transaction
Expand All @@ -65,7 +69,8 @@ public class TransactionBuilder implements AutoCloseable {

private Transaction transaction;

public TransactionBuilder(WalletEx wallet, final CompactTallyItem tallyItem) {
public TransactionBuilder(WalletEx wallet, final CompactTallyItem tallyItem, boolean dryRun) {
this.dryRun = dryRun;
this.wallet = wallet;
dummyReserveDestination = new ReserveDestination(wallet);
this.tallyItem = tallyItem;
Expand Down Expand Up @@ -130,7 +135,7 @@ public TransactionBuilderOutput addOutput(Coin amountOutput) {
if (couldAddOutput(amountOutput)) {
lock.lock();
try {
vecOutputs.add(new TransactionBuilderOutput(this, wallet, amountOutput));
vecOutputs.add(new TransactionBuilderOutput(this, wallet, amountOutput, dryRun));
return vecOutputs.get(vecOutputs.size() - 1);
} finally {
lock.unlock();
Expand All @@ -157,6 +162,10 @@ public boolean commit(StringBuilder strResult) {
try {
vecSend = Lists.newArrayListWithExpectedSize(vecOutputs.size());
for (TransactionBuilderOutput out : vecOutputs) {
// make sure the output is not invalid
if(ScriptPattern.isP2PKH(out.getScript()) && Arrays.equals(ScriptPattern.extractHashFromP2PKH(out.getScript()), new byte[20])) {
return false;
}
vecSend.add(new Recipient(out.getScript(), out.getAmount(), false));
}
} finally {
Expand Down
7 changes: 5 additions & 2 deletions core/src/main/java/org/bitcoinj/coinjoin/utils/TransactionBuilderOutput.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
package org.bitcoinj.coinjoin.utils;

import org.bitcoinj.core.Coin;
import org.bitcoinj.core.KeyId;
import org.bitcoinj.core.NoDestination;
import org.bitcoinj.core.ScriptId;
import org.bitcoinj.core.TransactionDestination;
import org.bitcoinj.script.Script;
import org.bitcoinj.wallet.WalletEx;
Expand All @@ -30,11 +33,11 @@ public class TransactionBuilderOutput {
/// ScriptPubKey of this output
Script script;

public TransactionBuilderOutput(TransactionBuilder txBuilder, WalletEx wallet, Coin amount) {
public TransactionBuilderOutput(TransactionBuilder txBuilder, WalletEx wallet, Coin amount, boolean dryRun) {
this.txBuilder = txBuilder;
this.amount = amount;
this.dest = new ReserveDestination(wallet);
TransactionDestination txdest = dest.getReservedDestination(false);
TransactionDestination txdest = dryRun ? dest.getReservedDestination(false) : KeyId.fromBytes(new byte[20]);
script = txdest.getScript();
}

Expand Down

0 comments on commit 7ccf954

Please sign in to comment.