Add auto-confirm feature for Monero

core/src/main/java/bisq/core/filter/Filter.java

@@ -240,13 +240,13 @@ public Filter(List<String> bannedOfferIds,
         this.refundAgents = refundAgents;
         this.bannedAccountWitnessSignerPubKeys = bannedAccountWitnessSignerPubKeys;
         this.btcFeeReceiverAddresses = btcFeeReceiverAddresses;
-        this.disableAutoConf = disableAutoConf;
         this.ownerPubKeyBytes = ownerPubKeyBytes;
         this.creationDate = creationDate;
         this.extraDataMap = ExtraDataMapValidator.getValidatedExtraDataMap(extraDataMap);
         this.signatureAsBase64 = signatureAsBase64;
         this.signerPubKeyAsHex = signerPubKeyAsHex;
         this.bannedPrivilegedDevPubKeys = bannedPrivilegedDevPubKeys;
+        this.disableAutoConf = disableAutoConf;
 
         // ownerPubKeyBytes can be null when called from tests
         if (ownerPubKeyBytes != null) {
@@ -358,9 +358,9 @@ public String toString() {
                 ",\n     bannedAccountWitnessSignerPubKeys=" + bannedAccountWitnessSignerPubKeys +
                 ",\n     bannedPrivilegedDevPubKeys=" + bannedPrivilegedDevPubKeys +
                 ",\n     btcFeeReceiverAddresses=" + btcFeeReceiverAddresses +
-                ",\n     disableAutoConf=" + disableAutoConf +
                 ",\n     creationDate=" + creationDate +
                 ",\n     extraDataMap=" + extraDataMap +
+                ",\n     disableAutoConf=" + disableAutoConf +
                 "\n}";
     }
 }

core/src/main/java/bisq/core/trade/TradeManager.java

@@ -330,8 +330,8 @@ private void initPendingTrades() {
                         }
                     }
 
-            if (trade.getState() == Trade.State.SELLER_RECEIVED_FIAT_PAYMENT_INITIATED_MSG &&
-                    trade.getCounterCurrencyExtraData() != null) {
+            if (trade.getState() == Trade.State.SELLER_RECEIVED_FIAT_PAYMENT_INITIATED_MSG) {
+                // This state can be only appear at a SellerTrade
                 checkArgument(trade instanceof SellerTrade, "Trade must be instance of SellerTrade");
                 // We delay a bit as at startup lots of stuff is happening
                 UserThread.runAfter(() -> maybeStartXmrTxProofServices((SellerTrade) trade), 1);

core/src/main/java/bisq/core/trade/protocol/tasks/seller/SellerProcessCounterCurrencyTransferStartedMessage.java

@@ -58,12 +58,14 @@ protected void run() {
             }
 
             String counterCurrencyExtraData = message.getCounterCurrencyExtraData();
-            if (counterCurrencyExtraData != null &&
-                    counterCurrencyExtraData.length() < 100) {
+            if (counterCurrencyExtraData != null && counterCurrencyExtraData.length() < 100) {
                 trade.setCounterCurrencyExtraData(counterCurrencyExtraData);
-                checkArgument(trade instanceof SellerTrade, "Trade must be instance of SellerTrade");
-                processModel.getTradeManager().maybeStartXmrTxProofServices((SellerTrade) trade);
             }
+
+            checkArgument(trade instanceof SellerTrade, "Trade must be instance of SellerTrade");
+            // We return early in the service if its not XMR. We prefer to not have additional checks outside...
+            processModel.getTradeManager().maybeStartXmrTxProofServices((SellerTrade) trade);
+
             processModel.removeMailboxMessageAfterProcessing(trade);
 
             trade.setState(Trade.State.SELLER_RECEIVED_FIAT_PAYMENT_INITIATED_MSG);

core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofRequestsPerTrade.java

@@ -73,13 +73,6 @@ void requestFromAllServices(Consumer<AssetTxProofResult> resultHandler, FaultHan
                 callResultHandlerAndMaybeTerminate(resultHandler, AssetTxProofResult.PAYOUT_TX_ALREADY_PUBLISHED);
             }
         };
-        String txId = trade.getCounterCurrencyTxId();
-        String txHash = trade.getCounterCurrencyExtraData();
-        if (is32BitHexStringInValid(txId) || is32BitHexStringInValid(txHash)) {
-
-            callResultHandlerAndMaybeTerminate(resultHandler, AssetTxProofResult.INVALID_DATA);
-            return;
-        }
 
         if (isTradeAmountAboveLimit(trade)) {
             callResultHandlerAndMaybeTerminate(resultHandler, AssetTxProofResult.TRADE_LIMIT_EXCEEDED);
@@ -195,15 +188,6 @@ void terminate() {
     // Validation
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    private boolean is32BitHexStringInValid(String hexString) {
-        if (hexString == null || hexString.isEmpty() || !hexString.matches("[a-fA-F0-9]{64}")) {
-            log.warn("Invalid hexString: {}", hexString);
-            return true;
-        }
-
-        return false;
-    }
-
     private boolean isTradeAmountAboveLimit(Trade trade) {
         Coin tradeAmount = trade.getTradeAmount();
         Coin tradeLimit = Coin.valueOf(autoConfirmSettings.getTradeLimit());

core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofService.java

@@ -98,22 +98,30 @@ public void maybeStartRequests(Trade trade,
                                    List<Trade> activeTrades,
                                    Consumer<AssetTxProofResult> resultHandler,
                                    FaultHandler faultHandler) {
-        Optional<AutoConfirmSettings> optionalAutoConfirmSettings = preferences.findAutoConfirmSettings("XMR");
-        if (!optionalAutoConfirmSettings.isPresent()) {
-            log.error("autoConfirmSettings is not present");
+        if (!isXmrBuyer(trade)) {
             return;
         }
-        AutoConfirmSettings autoConfirmSettings = optionalAutoConfirmSettings.get();
 
-        if (!isXmrBuyer(trade)) {
+        String txId = trade.getCounterCurrencyTxId();
+        String txHash = trade.getCounterCurrencyExtraData();
+        if (is32BitHexStringInValid(txId) || is32BitHexStringInValid(txHash)) {
+            trade.setAssetTxProofResult(AssetTxProofResult.INVALID_DATA.details(Res.get("portfolio.pending.autoConf.state.txKeyOrTxIdInvalid")));
             return;
         }
 
-        if (!isFeatureEnabled(trade, autoConfirmSettings)) {
+        if (!networkAndWalletReady()) {
             return;
         }
 
-        if (!networkAndWalletReady()) {
+        Optional<AutoConfirmSettings> optionalAutoConfirmSettings = preferences.findAutoConfirmSettings("XMR");
+        if (!optionalAutoConfirmSettings.isPresent()) {
+            // Not expected
+            log.error("autoConfirmSettings is not present");
+            return;
+        }
+        AutoConfirmSettings autoConfirmSettings = optionalAutoConfirmSettings.get();
+
+        if (!isFeatureEnabled(trade, autoConfirmSettings)) {
             return;
         }
 
@@ -164,6 +172,15 @@ private boolean isXmrBuyer(Trade trade) {
         return checkNotNull(trade.getContract()).getSellerPaymentAccountPayload() instanceof AssetsAccountPayload;
     }
 
+    private boolean is32BitHexStringInValid(String hexString) {
+        if (hexString == null || hexString.isEmpty() || !hexString.matches("[a-fA-F0-9]{64}")) {
+            log.warn("Invalid hexString: {}", hexString);
+            return true;
+        }
+
+        return false;
+    }
+
     private boolean networkAndWalletReady() {
         return p2PService.isBootstrapped() &&
                 walletsSetup.isDownloadComplete() &&

core/src/main/resources/i18n/displayStrings.properties

@@ -573,9 +573,10 @@ portfolio.pending.step5.completed=Completed
 portfolio.pending.step3_seller.autoConf.status.label=Auto-confirm status
 portfolio.pending.autoConf=Auto-confirmed
 
-portfolio.pending.autoConf.state.xmr.txKeyReused=The peer re-used a transaction key. Please open a dispute.
+portfolio.pending.autoConf.state.xmr.txKeyReused=Transaction key re-used. Please open a dispute.
 portfolio.pending.autoConf.state.confirmations=Confirmations: {0}/{1}
 portfolio.pending.autoConf.state.txNotFound=Transaction not confirmed yet
+portfolio.pending.autoConf.state.txKeyOrTxIdInvalid=No valid transaction ID / transaction key
 
 # suppress inspection "UnusedProperty"
 portfolio.pending.autoConf.state.FEATURE_DISABLED=Auto-confirm feature is disabled

desktop/src/main/java/bisq/desktop/main/overlays/windows/SetXmrTxKeyWindow.java

@@ -37,6 +37,7 @@
 
 import static bisq.common.app.DevEnv.isDevMode;
 import static bisq.desktop.util.FormBuilder.addInputTextField;
+import static javafx.beans.binding.Bindings.createBooleanBinding;
 
 public class SetXmrTxKeyWindow extends Overlay<SetXmrTxKeyWindow> {
 
@@ -69,6 +70,21 @@ public void show() {
             txKeyInputTextField.setText(XmrTxProofModel.DEV_TX_KEY);
         }
 
+        actionButton.disableProperty().bind(createBooleanBinding(() -> {
+                    String txHash = txHashInputTextField.getText();
+                    String txKey = txKeyInputTextField.getText();
+
+                    // If a field is empty we allow to continue. We do not enforce that users send the data.
+                    if (txHash.isEmpty() || txKey.isEmpty()) {
+                        return false;
+                    }
+
+                    // Otherwise we require that input is valid
+                    return !txHashInputTextField.getValidator().validate(txHash).isValid ||
+                            !txKeyInputTextField.getValidator().validate(txKey).isValid;
+                },
+                txHashInputTextField.textProperty(), txKeyInputTextField.textProperty()));
+
         applyStyles();
         display();
     }

desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java

@@ -74,7 +74,6 @@
 import bisq.core.trade.DelayedPayoutTxValidation;
 import bisq.core.trade.Trade;
 import bisq.core.user.DontShowAgainLookup;
-import bisq.core.util.validation.InputValidator;
 
 import bisq.common.Timer;
 import bisq.common.UserThread;
@@ -470,20 +469,6 @@ private void onPaymentStarted() {
                             return;
                         }
 
-                        InputValidator.ValidationResult validateTxKey = setXmrTxKeyWindow.getRegexValidator().validate(txKey);
-                        if (!validateTxKey.isValid) {
-                            UserThread.runAfter(() -> new Popup().warning(validateTxKey.errorMessage).show(),
-                                    Transitions.DEFAULT_DURATION, TimeUnit.MILLISECONDS);
-                            return;
-                        }
-
-                        InputValidator.ValidationResult validateTxHash = setXmrTxKeyWindow.getRegexValidator().validate(txHash);
-                        if (!validateTxHash.isValid) {
-                            UserThread.runAfter(() -> new Popup().warning(validateTxHash.errorMessage).show(),
-                                    Transitions.DEFAULT_DURATION, TimeUnit.MILLISECONDS);
-                            return;
-                        }
-
                         trade.setCounterCurrencyExtraData(txKey);
                         trade.setCounterCurrencyTxId(txHash);
                         showConfirmPaymentStartedPopup();