Bsq swap: Implementation [3] #5775
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ore.trade.bisq_v1
…radeUtil, TradeTxException to package bisq.core.trade.bisq_v1
…core.offer.placeoffer.bisq_v1
BuyerAsMakerTrade, BuyerAsTakerTrade, BuyerTrade to bisq.core.trade.model.bisq_v1 package
We will move BsqSwapTrades into closed trades as well once confrimed
Prepare that BsqSwapTrades can be added
checkArgument(trade instanceof BuyerTrade) failed in dev testing when clicking very fast confirm buttons. Likely due lagging UI (previous trade in selection...). Could not reproduce it afterwards
Move it left to closed trades
classes and comparators Add bsq wallet balance listener to update list Use BsqSwapTrade details window if Bsq trade Show "N/A" for deposits in case of BSQ swaps Cleanup ClosedTradesDataModel
Fix num trades
Implement getTxFee in concrete classes. For Maker trades we return the txFee from the offer. We use txFee in 2 different context: 1. For the txFee the taker pays and which is used for all the trade txs 2. As generic tx fee the user has paid. The makers tx fee is in the offer. The taker pays 3 times the tradeTxFee
to bisq.core.util.validation package. No code change. Is needed for next refactorings.
chimp1984
force-pushed
the
bsq-swap-impl
branch
from
345cefe
to
acf7c21
Compare
Renamed ClosedTradeUtil to ClosedTradableUtil Leaves only static functional methods in ClosedTradableUtil Domain methods requiring services are in ClosedTradableManager This keeps also the TradableList All formatting code is in ClosedTradableFormatter
chimp1984
force-pushed
the
bsq-swap-impl
branch
from
d9c74e4
to
8fa66ea
Compare
|
NIT: If there is no BSQ swap I think we should not show the
|
ripcurlx
approved these changes
Nov 4, 2021
There was a problem hiding this comment.
ACK - Besides the NIT I mentioned above I think it is good to move to some extended developer testing on master. Everyone running on master please be aware that the offer propagation might not be very stable until our seednodes have been updated (hint to @Emzy). Besides that BSQ swaps were thoroughly manually and automated tested on Regtest and on Mainnet.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Based on #5770
Starts at 9c56202
This adds the whole BSQ swap implementation. I did not see much value in breaking it up into many commits. I think for review its best to check it out and do a full compare to the previous PR to see the changes.
All that work is derived from the work of @sqrrm at #5729
EDIT:
Merged and rebased #5770