Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Limit number of unconfirmed offers #4053

Merged
merged 5 commits into from Apr 10, 2020
Merged

Limit number of unconfirmed offers #4053

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3fdfb50
Limit number of unconfirmed offers
freimair Mar 12, 2020
7f86956
Limit number of unconfirmed transactions
freimair Mar 19, 2020
565c51b
i18n
freimair Mar 20, 2020
28eca1d
Fix error reporting
freimair Mar 20, 2020
85106b1
Check BSQ wallet as well
freimair Mar 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/src/main/java/bisq/core/offer/OpenOfferManager.java
View file
Open in desktop
Expand Up @@ -638,7 +638,7 @@ private void handleOfferAvailabilityRequest(OfferAvailabilityRequest request, No
availabilityResult = AvailabilityResult.OFFER_TAKEN;
}

if (btcWalletService.isUnconfirmedTransactionsLimitHit()) {
if (btcWalletService.isUnconfirmedTransactionsLimitHit() || bsqWalletService.isUnconfirmedTransactionsLimitHit()) {
errorMessage = Res.get("shared.unconfirmedTransactionsLimitReached");
log.warn(errorMessage);
availabilityResult = AvailabilityResult.UNKNOWN_FAILURE;
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/bisq/core/offer/placeoffer/tasks/CheckNumberOfUnconfirmedTransactions.java
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@ public CheckNumberOfUnconfirmedTransactions(TaskRunner taskHandler, PlaceOfferMo

@Override
protected void run() {
if (model.getWalletService().isUnconfirmedTransactionsLimitHit())
if (model.getWalletService().isUnconfirmedTransactionsLimitHit() || model.getBsqWalletService().isUnconfirmedTransactionsLimitHit())
failed(Res.get("shared.unconfirmedTransactionsLimitReached"));
complete();
}
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/bisq/core/trade/TradeManager.java
View file
Open in desktop
Expand Up @@ -440,7 +440,7 @@ public void checkOfferAvailability(Offer offer,
ResultHandler resultHandler,
ErrorMessageHandler errorMessageHandler) {

if (btcWalletService.isUnconfirmedTransactionsLimitHit()) {
if (btcWalletService.isUnconfirmedTransactionsLimitHit() || bsqWalletService.isUnconfirmedTransactionsLimitHit()) {
String errorMessage = Res.get("shared.unconfirmedTransactionsLimitReached");
errorMessageHandler.handleErrorMessage(errorMessage);
log.warn(errorMessage);
Expand Down