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

Dont include dead transactions in check for unconfirmed txs chain #4648

Merged
merged 2 commits into from Oct 15, 2020
Merged

Dont include dead transactions in check for unconfirmed txs chain #4648

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe3828e
Dont include dead transactions in check for unconfirmed txs chain
chimp1984 Oct 14, 2020
8b404e1
Exclude time-locked txs at isUnconfirmedTransactionsLimitHit
chimp1984 Oct 15, 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
9 changes: 7 additions & 2 deletions core/src/main/java/bisq/core/btc/wallet/WalletService.java
View file
Open in desktop
Expand Up @@ -632,9 +632,14 @@ public int getLastBlockSeenHeight() {
* @return true when queue is full
*/
public boolean isUnconfirmedTransactionsLimitHit() {
return 20 < getTransactions(false).stream()
// For published delayed payout transactions we do not receive the tx confidence
// so we cannot check if it is confirmed so we ignore it for that check. The check is any arbitrarily
// using a limit of 20, so we don't need to be exact here. Should just reduce the likelihood of issues with
// the too long chains of unconfirmed transactions.
return getTransactions(false).stream()
.filter(tx -> tx.getLockTime() == 0)
.filter(Transaction::isPending)
.count();
.count() > 20;
}

public Set<Transaction> getTransactions(boolean includeDead) {
Expand Down