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

Part of a multistep refactoring to separate dispute related validation out of TradeDataValidation

Browse Source 
Refactor donationAddress validation out to new method
Rename addressAsString to delayedPayoutTxOutputAddressAsString
Recreate delayedPayoutTxOutputAddress at new validateDonationAddress method from relevant data

Signed-off-by: HenrikJannsen <boilingfrog@gmx.com>
This commit is contained in:
HenrikJannsen 2022-11-02 22:25:11 -05:00
parent e49e634956
commit 2484fa4371
No known key found for this signature in database
GPG Key ID: 02AA2BAE387C8307
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
core/src/main/java/bisq/core/trade/bisq_v1/TradeDataValidation.java
View File

@ -152,27 +152,37 @@ public class TradeDataValidation {
}
NetworkParameters params = btcWalletService.getParams();
Address address = output.getScriptPubKey().getToAddress(params);
if (address == null) {
Address delayedPayoutTxOutputAddress = output.getScriptPubKey().getToAddress(params);
if (delayedPayoutTxOutputAddress == null) {
errorMsg = "Donation address cannot be resolved (not of type P2PK nor P2SH nor P2WH). Output: " + output;
log.error(errorMsg);
log.error(delayedPayoutTx.toString());
throw new DisputeValidation.AddressException(dispute, errorMsg);
}
String addressAsString = address.toString();
String delayedPayoutTxOutputAddressAsString = delayedPayoutTxOutputAddress.toString();
if (addressConsumer != null) {
addressConsumer.accept(addressAsString);
addressConsumer.accept(delayedPayoutTxOutputAddressAsString);
}
DisputeValidation.validateDonationAddress(addressAsString, daoFacade);
validateDonationAddress(dispute, delayedPayoutTx, btcWalletService.getParams(), daoFacade);
}
private static void validateDonationAddress(Dispute dispute,
Transaction delayedPayoutTx,
NetworkParameters params,
DaoFacade daoFacade
)
throws DisputeValidation.AddressException {
String delayedPayoutTxOutputAddress = delayedPayoutTx.getOutput(0).getScriptPubKey().getToAddress(params).toString();
DisputeValidation.validateDonationAddress(delayedPayoutTxOutputAddress, daoFacade);
if (dispute != null) {
// Verify that address in the dispute matches the one in the trade.
String donationAddressOfDelayedPayoutTx = dispute.getDonationAddressOfDelayedPayoutTx();
// Old clients don't have it set yet. Can be removed after a forced update
if (donationAddressOfDelayedPayoutTx != null) {
checkArgument(addressAsString.equals(donationAddressOfDelayedPayoutTx),
checkArgument(delayedPayoutTxOutputAddress.equals(donationAddressOfDelayedPayoutTx),
"donationAddressOfDelayedPayoutTx from dispute does not match address from delayed payout tx");
}
}