From b842a0789c9ce2d057ed169c3883bbf19e851f5e Mon Sep 17 00:00:00 2001 From: jmacxx <47253594+jmacxx@users.noreply.github.com> Date: Thu, 24 Sep 2020 10:57:33 -0500 Subject: [PATCH] XMR autoconf should get amount from trade not offer Get the amount from the trade rather than the offer. Log the expected amount when not matching the explorer result. It would have made debugging this issue much more straightforward. Fixes #4557 --- .../main/java/bisq/core/trade/txproof/xmr/XmrTxProofModel.java | 3 +-- .../java/bisq/core/trade/txproof/xmr/XmrTxProofParser.java | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofModel.java b/core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofModel.java index f9451448af..6d386437be 100644 --- a/core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofModel.java +++ b/core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofModel.java @@ -60,8 +60,7 @@ public class XmrTxProofModel implements AssetTxProofModel { this.serviceAddress = serviceAddress; this.autoConfirmSettings = autoConfirmSettings; - Coin tradeAmount = trade.getTradeAmount(); - Volume volume = checkNotNull(trade.getOffer()).getVolumeByAmount(tradeAmount); + Volume volume = trade.getTradeVolume(); amount = DevEnv.isDevMode() ? XmrTxProofModel.DEV_AMOUNT : // For dev testing we need to add the matching address to the dev tx key and dev view key volume != null ? volume.getValue() * 10000L : 0L; // XMR satoshis have 12 decimal places vs. bitcoin's 8 diff --git a/core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofParser.java b/core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofParser.java index 5a11cbc5c6..cff4db23fb 100644 --- a/core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofParser.java +++ b/core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofParser.java @@ -144,6 +144,8 @@ public class XmrTxProofParser implements AssetTxProofParser