mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-20 02:12:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4560 from jmacxx/fix_xmr_amount_check

Browse Source 
XMR autoconf should get amount from trade not offer
This commit is contained in:
sqrrm 2020-09-27 14:40:23 +02:00 committed by GitHub
commit 3174778018
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofModel.java
View File

@ -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

2
core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofParser.java
View File

@ -144,6 +144,8 @@ public class XmrTxProofParser implements AssetTxProofParser<XmrTxProofRequest.Re
amountMatches = jsonAmount == model.getAmount();
if (amountMatches) {
break;
} else {
log.warn("amount {}, expected: {}", jsonAmount, model.getAmount());
}
}
}