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

Throw client-friendly EX for payment sent/rcvd msgs

Browse Source 
Don't depend on silent, UI purposed task runner errors if confirmpaymentstarted
or confirmpaymentreceived msgs are sent outside the proper context.
Throw a FailedPreconditionException instead, and it will be translated
into the proper gPRC StatusRuntimeException before being sent to client.

For BTC buyers and sellers, block the messaging attempt if the taker
deposit tx has not been confirmed.

For BTC sellers, block an attempt to send a confirmpaymentreceived message
until after receiving a confirmpaymentstarted message has been sent from
the buyer.
This commit is contained in:
ghubstan 2022-06-13 21:16:14 -03:00
parent 0a20306585
commit 57509890f2
No known key found for this signature in database
GPG Key ID: E35592D6800A861E
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
core/src/main/java/bisq/core/api/CoreTradesService.java
View File

@ -17,6 +17,7 @@
package bisq.core.api;
import bisq.core.api.exception.FailedPreconditionException;
import bisq.core.api.exception.NotAvailableException;
import bisq.core.api.exception.NotFoundException;
import bisq.core.btc.model.AddressEntry;
@ -177,6 +178,13 @@ class CoreTradesService {
void confirmPaymentStarted(String tradeId) {
var trade = getTrade(tradeId);
if (isFollowingBuyerProtocol(trade)) {
if (!trade.isDepositConfirmed()) {
throw new FailedPreconditionException(
format("cannot send a payment started message for trade '%s'%n"
+ "until trade deposit tx '%s' is confirmed",
trade.getId(),
trade.getDepositTxId()));
}
var tradeProtocol = tradeManager.getTradeProtocol(trade);
((BuyerProtocol) tradeProtocol).onPaymentStarted(
() -> {
@ -186,15 +194,29 @@ class CoreTradesService {
}
);
} else {
throw new IllegalStateException("you are the seller and not sending payment");
throw new FailedPreconditionException("you are the seller, and not sending payment");
}
}
void confirmPaymentReceived(String tradeId) {
var trade = getTrade(tradeId);
if (isFollowingBuyerProtocol(trade)) {
throw new IllegalStateException("you are the buyer, and not receiving payment");
throw new FailedPreconditionException("you are the buyer, and not receiving payment");
} else {
if (!trade.isDepositConfirmed()) {
throw new FailedPreconditionException(
format("cannot send a payment received message for trade '%s'%n"
+ "until trade deposit tx '%s' is confirmed",
trade.getId(),
trade.getDepositTxId()));
}
if (!trade.isFiatSent()) {
throw new FailedPreconditionException(
format("cannot send a payment received confirmation message for trade '%s'%n"
+ "until after a trade payment started message has been sent",
trade.getId()));
}
var tradeProtocol = tradeManager.getTradeProtocol(trade);
((SellerProtocol) tradeProtocol).onPaymentReceived(
() -> {