From 0df329e241168ee33a6fee99111498f00bd52653 Mon Sep 17 00:00:00 2001
From: jimmyneutront <w8250693648@protonmail.ch>
Date: Sun, 11 Jul 2021 14:10:24 -0400
Subject: [PATCH] Improve Validation of Deposit Inputs

Improve the accuracy and readability of error messages that arise during the validation of deposit inputs, and stop throwing unnecessary errors when a trade's reserved-for-trade wallet has been funded by an external wallet
---
 .../bisq/core/trade/TradeDataValidation.java  | 49 ++++++++++++++-----
 1 file changed, 36 insertions(+), 13 deletions(-)

diff --git a/core/src/main/java/bisq/core/trade/TradeDataValidation.java b/core/src/main/java/bisq/core/trade/TradeDataValidation.java
index 013dcdb42ab..fa3c453c734 100644
--- a/core/src/main/java/bisq/core/trade/TradeDataValidation.java
+++ b/core/src/main/java/bisq/core/trade/TradeDataValidation.java
@@ -356,23 +356,46 @@ public static void validatePayoutTxInput(Transaction depositTx,
     }
 
     public static void validateDepositInputs(Trade trade) throws InvalidTxException {
-        // assumption: deposit tx always has 2 inputs, the maker and taker
-        if (trade == null || trade.getDepositTx() == null || trade.getDepositTx().getInputs().size() != 2) {
-            throw new InvalidTxException("Deposit transaction is null or has unexpected input count");
+        /*
+         * deposit tx usually has 2 inputs, the maker and taker
+         * however, if the maker funds the reserved for trade wallet from
+         * an external wallet, the deposit tx will have more than 2 inputs
+         */
+        if (trade == null || trade.getDepositTx() == null) {
+            throw new InvalidTxException("Deposit transaction is null");
+        }
+        if (trade.getDepositTx().getInputs().size() != 2) {
+            log.warn("Deposit transaction has unusual input count: " + trade.getDepositTx().getInputs().size() + " rather than 2");
         }
         Transaction depositTx = trade.getDepositTx();
-        String txIdInput0 = depositTx.getInput(0).getOutpoint().getHash().toString();
-        String txIdInput1 = depositTx.getInput(1).getOutpoint().getHash().toString();
+        boolean hasFoundMakerTx = false;
+        boolean hasFoundTakerTx = false;
         String contractMakerTxId = trade.getContract().getOfferPayload().getOfferFeePaymentTxId();
         String contractTakerTxId = trade.getContract().getTakerFeeTxID();
-        boolean makerFirstMatch = contractMakerTxId.equalsIgnoreCase(txIdInput0) && contractTakerTxId.equalsIgnoreCase(txIdInput1);
-        boolean takerFirstMatch = contractMakerTxId.equalsIgnoreCase(txIdInput1) && contractTakerTxId.equalsIgnoreCase(txIdInput0);
-        if (!makerFirstMatch && !takerFirstMatch) {
-            String errMsg = "Maker/Taker txId in contract does not match deposit tx input";
-            log.error(errMsg +
-                "\nContract Maker tx=" + contractMakerTxId + " Contract Taker tx=" + contractTakerTxId +
-                "\nDeposit Input0=" + txIdInput0 + " Deposit Input1=" + txIdInput1);
-            throw new InvalidTxException(errMsg);
+        for (TransactionInput input : depositTx.getInputs()) {
+            if (contractMakerTxId.equalsIgnoreCase(input.getOutpoint().getHash().toString())) {
+                hasFoundMakerTx = true;
+            } else if (contractTakerTxId.equalsIgnoreCase(input.getOutpoint().getHash().toString())) {
+                hasFoundTakerTx = true;
+            }
+            if (hasFoundMakerTx && hasFoundTakerTx) {
+                break;
+            }
+        }
+        if (!hasFoundMakerTx || !hasFoundTakerTx) {
+            String errMsg = "For trade with id " + trade.getId() + ":\n";
+            if (!hasFoundMakerTx) {
+                errMsg = errMsg + "Maker txId in contract does not match any deposit tx input" +
+                        "\nContract Maker tx=" + contractMakerTxId;
+            }
+            if (!hasFoundTakerTx) {
+                errMsg = errMsg + "Taker txId in contract does not match any deposit tx input" +
+                        "\nContract Taker tx=" + contractTakerTxId;
+            }
+            for (int index = 0; index < depositTx.getInputs().size(); index++) {
+                errMsg = errMsg + "\nDeposit Input" + index + "=" + depositTx.getInput(index).getOutpoint().getHash().toString();
+            }
+            log.warn(errMsg);
         }
     }