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

[WIP] Atomic trade #4414

Closed
wants to merge 12 commits into from
Closed

[WIP] Atomic trade #4414

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f170dd7
Refactor: extract DonationAddressValidation
sqrrm Jul 7, 2020
51e0464
Add atomic account type
sqrrm Aug 17, 2020
2269f1c
Add atomic trade protocol messages
sqrrm Aug 17, 2020
e4181e5
Add atomic tx fee estimation
sqrrm Aug 17, 2020
b0685cd
Add BSQ specific input signing
sqrrm Aug 17, 2020
c7170d6
Add walletservice helpers for atomic trade protocol
sqrrm Aug 17, 2020
e77ddff
Add atomic trade protocol
sqrrm Aug 17, 2020
d5560f8
Add UI for atomic trade
sqrrm Aug 17, 2020
437273a
Move protocol failed texts to displaystrings
sqrrm Aug 17, 2020
f7b24bb
Fix codacy complaints
sqrrm Aug 17, 2020
12f5125
Less logging
sqrrm Aug 19, 2020
aedea6c
Allow zero BSQ change for taker
sqrrm Aug 24, 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/btc/wallet/BsqWalletService.java
View file
Open in desktop
Expand Up @@ -763,7 +763,7 @@ public Tuple2<Transaction, Coin> prepareAtomicBsqInputs(Coin requiredInput) thro
log.error("Missing funds in takerPreparesAtomicBsqInputs");
throw new InsufficientBsqException(e.missing);
}
checkArgument(Restrictions.isAboveDust(change));
checkArgument(change.isZero() || Restrictions.isAboveDust(change));

return new Tuple2<>(dummyTx, change);
}
Expand Down