mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-23 15:00:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add DonationAddressValidation static class

Browse source
This commit is contained in:
chimp1984 2020-04-07 22:16:02 -05:00
parent 8a604ea60c
commit 856863ee70
No known key found for this signature in database
GPG key ID: 9801B4EC591F90E3
2 changed files with 106 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
core/src/main/java/bisq/core/trade/DonationAddressValidation.java Normal file
View file

@ -0,0 +1,94 @@
/*
* This file is part of Bisq.
*
* Bisq is free software: you can redistribute it and/or modify it
* under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or (at
* your option) any later version.
*
* Bisq is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
* License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.core.trade;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.dao.DaoFacade;
import bisq.core.dao.governance.param.Param;
import org.bitcoinj.core.Address;
import org.bitcoinj.core.NetworkParameters;
import org.bitcoinj.core.Transaction;
import org.bitcoinj.core.TransactionOutput;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import static com.google.common.base.Preconditions.checkNotNull;
@Slf4j
public class DonationAddressValidation {
@Getter
public static class DonationAddressException extends Exception {
private final String addressAsString;
private final String recentDonationAddressString;
private final String defaultDonationAddressString;
DonationAddressException(String addressAsString,
String recentDonationAddressString,
String defaultDonationAddressString) {
this.addressAsString = addressAsString;
this.recentDonationAddressString = recentDonationAddressString;
this.defaultDonationAddressString = defaultDonationAddressString;
}
}
public static class MissingDelayedPayoutTxException extends Exception {
public MissingDelayedPayoutTxException(String msg) {
super(msg);
}
}
public static void validate(Transaction delayedPayoutTx,
DaoFacade daoFacade,
BtcWalletService btcWalletService) throws DonationAddressException, MissingDelayedPayoutTxException {
if (delayedPayoutTx == null) {
throw new MissingDelayedPayoutTxException("DelayedPayoutTx must not be null");
}
// Get most recent donation address.
// We do not support past DAO param addresses to avoid that those receive funds (no bond set up anymore).
// Users who have not synced the DAO cannot trade.
String recentDonationAddressString = daoFacade.getParamValue(Param.RECIPIENT_BTC_ADDRESS);
// In case the seller has deactivated the DAO the default address will be used.
String defaultDonationAddressString = Param.RECIPIENT_BTC_ADDRESS.getDefaultValue();
TransactionOutput output = delayedPayoutTx.getOutput(0);
NetworkParameters params = btcWalletService.getParams();
Address address = output.getAddressFromP2PKHScript(params);
if (address == null) {
// The donation address can be as well be a multisig address.
address = output.getAddressFromP2SH(params);
checkNotNull(address, "address must not be null");
}
String addressAsString = address.toString();
boolean isValid = recentDonationAddressString.equals(addressAsString) ||
defaultDonationAddressString.equals(addressAsString);
if (!isValid) {
log.warn("Donation address is invalid." +
"\nAddress used by BTC seller: " + addressAsString +
"\nRecent donation address:" + recentDonationAddressString +
"\nDefault donation address: " + defaultDonationAddressString);
throw new DonationAddressException(addressAsString, recentDonationAddressString, defaultDonationAddressString);
}
}
}

49
core/src/main/java/bisq/core/trade/protocol/tasks/buyer/BuyerVerifiesDonationAddress.java
View file

@ -17,21 +17,14 @@
package bisq.core.trade.protocol.tasks.buyer;
import bisq.core.dao.governance.param.Param;
import bisq.core.trade.DonationAddressValidation;
import bisq.core.trade.Trade;
import bisq.core.trade.protocol.tasks.TradeTask;
import bisq.common.taskrunner.TaskRunner;
import org.bitcoinj.core.Address;
import org.bitcoinj.core.NetworkParameters;
import org.bitcoinj.core.Transaction;
import org.bitcoinj.core.TransactionOutput;
import lombok.extern.slf4j.Slf4j;
import static com.google.common.base.Preconditions.checkNotNull;
@Slf4j
public class BuyerVerifiesDonationAddress extends TradeTask {
@SuppressWarnings({"unused"})
@ -44,35 +37,17 @@ public class BuyerVerifiesDonationAddress extends TradeTask {
try {
runInterceptHook();
Transaction preparedDelayedPayoutTx = checkNotNull(processModel.getPreparedDelayedPayoutTx(), "preparedDelayedPayoutTx must not be null");
// Get most recent donation address.
// We do not support past DAO param addresses to avoid that those receive funds (no bond set up anymore).
// Users who have not synced the DAO cannot trade.
String recentDonationAddressString = processModel.getDaoFacade().getParamValue(Param.RECIPIENT_BTC_ADDRESS);
// In case the seller has deactivated the DAO the default address will be used.
String defaultDonationAddressString = Param.RECIPIENT_BTC_ADDRESS.getDefaultValue();
TransactionOutput output = preparedDelayedPayoutTx.getOutput(0);
NetworkParameters params = processModel.getBtcWalletService().getParams();
Address address = output.getAddressFromP2PKHScript(params);
if (address == null) {
// The donation address can be as well be a multisig address.
address = output.getAddressFromP2SH(params);
checkNotNull(address, "address must not be null");
}
String addressAsString = address.toString();
if (recentDonationAddressString.equals(addressAsString) ||
defaultDonationAddressString.equals(addressAsString)) {
complete();
} else {
failed("Sellers donation address not recognized." +
"\nAddress used by BTC seller: " + addressAsString +
"\nRecent donation address:" + recentDonationAddressString +
"\nDefault donation address: " + defaultDonationAddressString);
}
DonationAddressValidation.validate(processModel.getPreparedDelayedPayoutTx(),
processModel.getDaoFacade(),
processModel.getBtcWalletService());
complete();
} catch (DonationAddressValidation.DonationAddressException e) {
failed("Sellers donation address is invalid." +
"\nAddress used by BTC seller: " + e.getAddressAsString() +
"\nRecent donation address:" + e.getRecentDonationAddressString() +
"\nDefault donation address: " + e.getDefaultDonationAddressString());
} catch (DonationAddressValidation.MissingDelayedPayoutTxException e) {
failed(e.getMessage());
} catch (Throwable t) {
failed(t);
}