feat(coinjoin): fix private send and regular send

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

@@ -378,4 +378,19 @@ public static String getStatusById(PoolStatus status) {
     public static boolean hasDSTX(Sha256Hash hash) {
         return mapDSTX.containsKey(hash);
     }
+
+    public static String getRoundsString(int rounds) {
+        switch (rounds) {
+            case -4:
+                return "bad index";
+            case -3:
+                return "collateral";
+            case -2:
+                return "non-denominated";
+            case -1:
+                return "no such tx";
+            default:
+                return "coinjoin";
+        }
+    }
 }

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

@@ -65,6 +65,8 @@ public static void setAmount(Coin amount) {
 
     public static boolean removeDenomination(Coin amount) { return CoinJoinClientOptions.get().allowedDenominations.get().remove(amount); }
 
+    public static boolean removeDenomination(Denomination denomination) { return CoinJoinClientOptions.get().allowedDenominations.get().remove(denomination.value); }
+
     public static void resetDenominations() { CoinJoinClientOptions.get().allowedDenominations.set(CoinJoin.getStandardDenominations()); }
     private static CoinJoinClientOptions instance;
     private static boolean onceFlag;

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

@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2023 Dash Core Group
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.bitcoinj.coinjoin;
+
+import org.bitcoinj.core.Coin;
+
+public enum Denomination {
+    TEN(Coin.COIN.multiply(10).add(Coin.valueOf(10000))),
+    ONE(Coin.COIN.add(Coin.valueOf(1000))),
+    TENTH(Coin.COIN.div(10).add(Coin.valueOf(100))),
+    HUNDREDTH(Coin.COIN.div(100).add(Coin.valueOf(10))),
+    THOUSANDTH(Coin.COIN.div(1000).add(Coin.valueOf(1))),
+    SMALLEST(THOUSANDTH.value);
+
+    final Coin value;
+    Denomination(Coin value) {
+        this.value = value;
+    }
+}

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

@@ -26,17 +26,10 @@
 import java.util.List;
 
 public class UnmixedZeroConfCoinSelector extends ZeroConfCoinSelector {
-    //private final Wallet wallet;
-    private boolean onlyConfirmed = false;
-
-    private static final UnmixedZeroConfCoinSelector instance = new UnmixedZeroConfCoinSelector();
-
-    public static UnmixedZeroConfCoinSelector get() {
-        return instance;
-    }
-
-    protected UnmixedZeroConfCoinSelector() {
+    private final Wallet wallet;
+    public UnmixedZeroConfCoinSelector(Wallet wallet) {
         super();
+        this.wallet = wallet;
     }
 
     @Override
@@ -58,10 +51,8 @@ public CoinSelection select(Coin target, List<TransactionOutput> candidates) {
     protected boolean shouldSelect(Transaction tx) {
         if (tx != null) {
             for (TransactionOutput output : tx.getOutputs()) {
-                if (!output.isDenominated()) {
+                if (!output.isFullyMixed(wallet)) {
                     TransactionConfidence confidence = tx.getConfidence();
-                    if (onlyConfirmed)
-                        return confidence.getConfidenceType() == TransactionConfidence.ConfidenceType.BUILDING;
                     return super.shouldSelect(tx);
                 }
             }

core/src/main/java/org/bitcoinj/core/TransactionBag.java

@@ -57,4 +57,7 @@ public interface TransactionBag {
 
     /** Returns transactions from a specific pool. */
     Map<Sha256Hash, Transaction> getTransactionPool(WalletTransaction.Pool pool);
+
+    /** Returns true if this output is fully mixed **/
+    boolean isFullyMixed(TransactionOutput output);
 }

core/src/main/java/org/bitcoinj/core/TransactionOutput.java

@@ -320,12 +320,14 @@ else if (ScriptPattern.isP2PKH(script))
     }
 
     /**
-     * Returns true if this output is to a coinjoin related key
+     * Returns true if this output is to a coinjoin related key and is fully mixed
      */
     public boolean isCoinJoin(TransactionBag transactionBag) {
         try {
             if(!isDenominated())
                 return false;
+            if(!transactionBag.isFullyMixed(this))
+                return false;
 
             Script script = getScriptPubKey();
             if (ScriptPattern.isP2PK(script))
@@ -445,4 +447,8 @@ public int hashCode() {
     public boolean equalsWithoutParent(TransactionOutput output) {
         return value == output.value && Arrays.equals(scriptBytes, output.scriptBytes);
     }
+
+    public boolean isFullyMixed(TransactionBag transactionBag) {
+        return transactionBag.isFullyMixed(this);
+    }
 }

core/src/main/java/org/bitcoinj/wallet/CoinJoinExtension.java

@@ -22,8 +22,10 @@
 import com.google.protobuf.CodedOutputStream;
 import org.bitcoinj.coinjoin.CoinJoin;
 import org.bitcoinj.coinjoin.CoinJoinClientOptions;
+import org.bitcoinj.core.Address;
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.Transaction;
+import org.bitcoinj.core.TransactionOutPoint;
 import org.bitcoinj.core.TransactionOutput;
 import org.bitcoinj.crypto.ChildNumber;
 import org.bitcoinj.crypto.factory.ECKeyFactory;
@@ -178,6 +180,7 @@ public void setRounds(int rounds) {
     }
 
     public TreeMap<Integer, List<TransactionOutput>> getOutputs() {
+        checkNotNull(wallet);
         TreeMap<Integer, List<TransactionOutput>> outputs = Maps.newTreeMap();
         for (Coin amount : CoinJoin.getStandardDenominations()) {
             outputs.put(CoinJoin.amountToDenomination(amount), Lists.newArrayList());
@@ -205,8 +208,27 @@ public String toString(boolean includeLookahead, boolean includePrivateKeys, @Nu
             int denom = entry.getKey();
             List<TransactionOutput> outputs = entry.getValue();
             Coin value = outputs.stream().map(TransactionOutput::getValue).reduce(Coin::add).orElse(Coin.ZERO);
-            builder.append(CoinJoin.denominationToString(denom)).append(" ").append(outputs.size()).append(" ")
+            builder.append(CoinJoin.denominationToString(denom)).append(" outputs:").append(outputs.size()).append(" total:")
                     .append(value.toFriendlyString()).append("\n");
+            outputs.forEach(output -> {
+                TransactionOutPoint outPoint = new TransactionOutPoint(output.getParams(), output.getIndex(), output.getParentTransactionHash());
+                builder.append("  addr:")
+                        .append(Address.fromPubKeyHash(output.getParams(), ScriptPattern.extractHashFromP2PKH(output.getScriptPubKey())))
+                        .append(" outpoint:")
+                        .append(outPoint.toStringShort())
+                        .append(" ");
+                int rounds = ((WalletEx) wallet).getRealOutpointCoinJoinRounds(outPoint);
+                builder.append(CoinJoin.getRoundsString(rounds));
+                if (rounds >= 0) {
+                    builder.append(" ").append(rounds).append(" rounds");
+                    if (((WalletEx) wallet).isFullyMixed(outPoint)) {
+                        builder.append(" (fully mixed)");
+                    }
+                } else {
+                    builder.append(" ").append(output.getValue().toFriendlyString());
+                }
+                builder.append("\n");
+            });
         }
         return builder.toString();
     }

core/src/main/java/org/bitcoinj/wallet/Wallet.java

@@ -6242,4 +6242,9 @@ public List<Address> getIssuedSendAddresses(EvolutionContact contact) {
             addresses.add(Address.fromKey(getParams(), key));
         return addresses;
     }
+
+    @Override
+    public boolean isFullyMixed(TransactionOutput output) {
+        return false;
+    }
 }

core/src/main/java/org/bitcoinj/wallet/WalletEx.java

@@ -212,8 +212,7 @@ public Coin getBalance(BalanceType balanceType) {
                 List<TransactionOutput> all = calculateAllSpendCandidates(true, balanceType == BalanceType.COINJOIN_SPENDABLE);
                 Coin value = Coin.ZERO;
                 for (TransactionOutput out : all) {
-                    // exclude non coinjoin outputs if isCoinJoinOnly is true
-                    // exclude coinjoin outputs when isCoinJoinOnly is false
+                    // coinjoin outputs must be denominated, using coinjoin keys and fully mixed
                     boolean isCoinJoin = out.isDenominated() && out.isCoinJoin(this) && isFullyMixed(out);
 
                     if (isCoinJoin)
@@ -312,7 +311,7 @@ public boolean isLockedCoin(TransactionOutPoint outPoint) {
 
     HashMap<TransactionOutPoint, Integer> mapOutpointRoundsCache = new HashMap<>();
     // Recursively determine the rounds of a given input (How deep is the CoinJoin chain for a given input)
-    int getRealOutpointCoinJoinRounds(TransactionOutPoint outPoint) {
+    public int getRealOutpointCoinJoinRounds(TransactionOutPoint outPoint) {
         return getRealOutpointCoinJoinRounds(outPoint, 0);
     }
 
@@ -439,6 +438,7 @@ int getRealOutpointCoinJoinRounds(TransactionOutPoint outpoint, int rounds) {
 
     Sha256Hash coinJoinSalt = Sha256Hash.ZERO_HASH;
 
+    @Override
     public boolean isFullyMixed(TransactionOutput output) {
         return isFullyMixed(new TransactionOutPoint(params, output));
     }

tools/src/main/java/org/bitcoinj/tools/WalletTool.java

@@ -22,6 +22,7 @@
 import org.bitcoinj.coinjoin.CoinJoinClientManager;
 import org.bitcoinj.coinjoin.CoinJoinClientOptions;
 import org.bitcoinj.coinjoin.CoinJoinSendRequest;
+import org.bitcoinj.coinjoin.Denomination;
 import org.bitcoinj.coinjoin.UnmixedZeroConfCoinSelector;
 import org.bitcoinj.coinjoin.utils.CoinJoinReporter;
 import org.bitcoinj.coinjoin.utils.ProTxToOutpoint;
@@ -1638,7 +1639,8 @@ private static void mix() {
         CoinJoinClientOptions.setEnabled(true);
         CoinJoinClientOptions.setRounds(4);
         CoinJoinClientOptions.setSessions(1);
-        CoinJoinClientOptions.removeDenomination(CoinJoin.getSmallestDenomination());
+        CoinJoinClientOptions.removeDenomination(Denomination.SMALLEST);
+        //CoinJoinClientOptions.removeDenomination(CoinJoinClientOptions.getDenominations().stream().min(Coin::compareTo).get());
         Coin amountToMix = wallet.getBalance();
 
         // set command line arguments