-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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.
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
Trade protocol domain improvements #4566
Merged
sqrrm
merged 150 commits into
bisq-network:master
from
chimp1984:fix-delayed-payout-tx-issues
Oct 1, 2020
Merged
Trade protocol domain improvements #4566
sqrrm
merged 150 commits into
bisq-network:master
from
chimp1984:fix-delayed-payout-tx-issues
Oct 1, 2020
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
… null it shows N/A
- Remove '@SuppressWarnings({"unused"})'
…countAgeWitnessSignatureOfOfferId was added in v 0.6 so is with todays versions also not null
…ontext more clear
Remove final Cleanups
…t with acceptedArbitratorNodeAddresses)
Make paymentAccountPayload nullable Set TempTradingPeerNodeAddress with value from trade.getTradingPeerNodeAddress()
…s are not supported anymore. Cleanups.
…t from taker protocol
Co-authored-by: m52go <mfiver@gmail.com>
Co-authored-by: m52go <mfiver@gmail.com>
Co-authored-by: m52go <mfiver@gmail.com>
Co-authored-by: m52go <mfiver@gmail.com>
Co-authored-by: m52go <mfiver@gmail.com>
Co-authored-by: m52go <mfiver@gmail.com>
Co-authored-by: m52go <mfiver@gmail.com>
Co-authored-by: m52go <mfiver@gmail.com>
Co-authored-by: m52go <mfiver@gmail.com>
Co-authored-by: m52go <mfiver@gmail.com>
Co-authored-by: m52go <mfiver@gmail.com>
Co-authored-by: m52go <mfiver@gmail.com>
Co-authored-by: m52go <mfiver@gmail.com>
@m52go Thanks! |
…mp1984/bisq into fix-delayed-payout-tx-issues
…tance when the mediator sent the dispute-opened-by-peer msg, causing an error as its mediators key not peers key. We need to check first for the message type and then apply the check.
…mp1984/bisq into fix-delayed-payout-tx-issues
@chimp1984 It seems all my comments and concerns have been addressed. Once conflicts are resolved I think we can merge this. Do you want more testing done before merging? |
# Conflicts: # core/src/main/java/bisq/core/trade/TradeManager.java # desktop/src/main/java/bisq/desktop/main/overlays/windows/TradeDetailsWindow.java
Prefer to keep it in sync with protobuf entry.
@sqrrm Yes please get it merged asap... |
sqrrm
approved these changes
Oct 1, 2020
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ACK
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.
To fix the issues with missing delayed payout tx I added a automatic re-send of the relevant message and changed the order of the tasks so that the deposit tx is not published if the message was not ACKed from the peer.
Another major change is to remove all automated handling of failed trades and show instead a warn icon in the open trades list. The user can then click on a button to move the trade to failed trades. A popup gives detail info about the failure and instructions. From failed trades there is also a button to move the trade back to pending trades.
The trade details window shows now always all 4 trade txs and if one is missing it sets the text color to red and shows a warn icon.
UPDATE:
This PR also removes the refresh button for resending a message. It does instead an automated resend from the senders side until it gets an ACK message back, signaling that the message arrived.
Beside that there have been fixed various edge case bugs.
This PR comes also with some major refactorings. The trade protocol got a new fluent interface so it is more readable.
Example:
For testing error case there is a debug tool which let any selected task fail. With cmd+ z and devMode enabled it opens.
As the PR has tons of code changes it will require proper testing of all trade protocol and dispute related use cases, specially cases with the other peer being offline.
I have tested quite a lot but have not tested backward compatibility yet. I am not aware that there should be any issue, but it should be tested as well.
Review will be a bit challenging as there are so many changes, but I think a proper testing should be enough.
Here are some screenshots: