feat(coinjoin): mix balance

core/src/main/java/org/bitcoinj/coinjoin/CoinJoin.java

@@ -148,6 +148,7 @@ public static boolean isCollateralValid(Transaction txCollateral) {
         return isCollateralValid(txCollateral, true);
     }
 
+    // TODO: consider IS Locks with InstantSendManager.isLocked(input)?
     public static boolean isCollateralValid(Transaction txCollateral, boolean checkInputs) {
         if (txCollateral.getOutputs().isEmpty()) {
             log.info("coinjoin: Collateral invalid due to no outputs: {}", txCollateral.getTxId());
@@ -175,6 +176,10 @@ public static boolean isCollateralValid(Transaction txCollateral, boolean checkI
             for (TransactionInput txin : txCollateral.getInputs()) {
                 Transaction tx = txin.getConnectedTransaction();
                 if (tx != null) {
+                    if (tx.getOutput(txin.getOutpoint().getIndex()).getSpentBy() != null) {
+                        log.info("coinjoin: spent or non-locked mempool input! txin={}", txin);
+                        return false;
+                    }
                     nValueIn = nValueIn.add(tx.getOutput(txin.getOutpoint().getIndex()).getValue());
                 } else {
                     log.info("coinjoin: -- Unknown inputs in collateral transaction, txCollateral={}", txCollateral); /* Continued */
@@ -189,15 +194,7 @@ public static boolean isCollateralValid(Transaction txCollateral, boolean checkI
             }
         }
 
-        // the collateral tx must not have been seen on the network
-        TransactionConfidence confidence = txCollateral.getConfidence();
-        boolean hasBeenSeen = confidence.getConfidenceType() != TransactionConfidence.ConfidenceType.UNKNOWN ||
-                confidence.numBroadcastPeers() > 0 || confidence.getIXType() != TransactionConfidence.IXType.IX_NONE;
-        if (hasBeenSeen) {
-            log.info("coinjoin: collateral has been spent, need to recreate txCollateral={}", txCollateral.getTxId());
-        }
-        log.info("coinjoin: collateral: {}", txCollateral); /* Continued */
-        return !hasBeenSeen;
+        return true;
     }
     public static Coin getCollateralAmount() { return getSmallestDenomination().div(10); }
     public static Coin getMaxCollateralAmount() { return getCollateralAmount().multiply(4); }

core/src/main/java/org/bitcoinj/coinjoin/CoinJoinClientManager.java

@@ -32,6 +32,7 @@
 import org.bitcoinj.core.Sha256Hash;
 import org.bitcoinj.core.StoredBlock;
 import org.bitcoinj.core.Transaction;
+import org.bitcoinj.core.Utils;
 import org.bitcoinj.core.VerificationException;
 import org.bitcoinj.core.listeners.NewBestBlockListener;
 import org.bitcoinj.evolution.Masternode;
@@ -211,6 +212,9 @@ public String getSessionDenoms() {
         }
     }
 
+    private long lastTimeReportTooRecent = 0;
+    private long lastMasternodesUsed = 0;
+
     /// Passively run mixing in the background according to the configuration in settings
     public boolean doAutomaticDenominating() {
         return doAutomaticDenominating(false);
@@ -234,7 +238,13 @@ public boolean doAutomaticDenominating(boolean dryRun) {
         // If we've used 90% of the Masternode list then drop the oldest first ~30%
         int thresholdHigh = (int) (mnCountEnabled * 0.9);
         int thresholdLow = (int) (thresholdHigh * 0.7);
-        log.info("Checking masternodesUsed: size: {}, threshold: {}", masternodesUsed.size(), thresholdHigh);
+
+        if (!waitForAnotherBlock()) {
+            if (masternodesUsed.size() != lastMasternodesUsed) {
+                log.info("Checking masternodesUsed: size: {}, threshold: {}", masternodesUsed.size(), thresholdHigh);
+                lastMasternodesUsed = masternodesUsed.size();
+            }
+        }
 
         if (masternodesUsed.size() > thresholdHigh) {
             // remove the first masternodesUsed.size() - thresholdLow masternodes
@@ -279,8 +289,11 @@ public boolean doAutomaticDenominating(boolean dryRun) {
                 if (!checkAutomaticBackup()) return false;
 
                 if (waitForAnotherBlock()) {
-                    strAutoDenomResult = "Last successful action was too recent.";
-                    log.info("DoAutomaticDenominating -- {}", strAutoDenomResult);
+                    if (Utils.currentTimeMillis() - lastTimeReportTooRecent > 15000 ) {
+                        strAutoDenomResult = "Last successful action was too recent.";
+                        log.info("DoAutomaticDenominating -- {}", strAutoDenomResult);
+                        lastTimeReportTooRecent = Utils.currentTimeMillis();
+                    }
                     return false;
                 }
 

core/src/main/java/org/bitcoinj/coinjoin/CoinJoinClientOptions.java

@@ -58,6 +58,9 @@ public static void setAmount(Coin amount) {
         get().coinJoinAmount.set(amount);
     }
 
+    public static void setDenomsGoal(int goal) { get().coinJoinDenomsGoal.set(goal); }
+    public static void setDenomsHardCap(int hardCap) { get().coinJoinDenomsHardCap.set(hardCap); }
+
     public static boolean isEnabled() { return CoinJoinClientOptions.get().enableCoinJoin.get(); }
     public static boolean isMultiSessionEnabled() { return CoinJoinClientOptions.get().isCoinJoinMultiSession.get(); }
 

core/src/main/java/org/bitcoinj/coinjoin/CoinJoinClientQueueManager.java

@@ -45,7 +45,7 @@ public void processDSQueue(Peer from, CoinJoinQueue dsq, boolean enable_bip61) {
                     }
                     if (q.isReady() == dsq.isReady() && q.getProTxHash().equals(dsq.getProTxHash())) {
                         // no way the same mn can send another dsq with the same readiness this soon
-                        log.info("coinjoin: DSQUEUE -- Peer {} is sending WAY too many dsq messages for a masternode {}", from.getAddress().getAddr(), dsq.getProTxHash());
+                        log.debug("coinjoin: DSQUEUE -- Peer {} is sending WAY too many dsq messages for a masternode {}", from.getAddress().getAddr(), dsq.getProTxHash());
                         return;
                     }
                 }