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.

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
merged 150 commits into from Oct 1, 2020
Merged
Changes from 1 commit
Commits
Show all changes
150 commits
Select commit Hold shift + click to select a range
66a2689
Always show deposit and delayed payout tx in trade details window. If…
chimp1984 Sep 21, 2020
690104e
Show popup on MissingDelayedPayoutTxException. Update display string …
chimp1984 Sep 21, 2020
944a77d
Refactor:
chimp1984 Sep 22, 2020
4d7b289
Refactor:
chimp1984 Sep 22, 2020
3d56312
Refactor:
chimp1984 Sep 22, 2020
6a83534
Cleanups. Small functional change by removing wrapping into arraylist
chimp1984 Sep 22, 2020
87c2ddf
Remove Nullable annotations. arbitratorNodeAddress is not null and ac…
chimp1984 Sep 22, 2020
a25dcf2
Refactor: Rename sig to accountAgeWitnessSignatureOfOfferId to make c…
chimp1984 Sep 22, 2020
19afb44
Refactor: rename inputsForDepositTxRequest to request
chimp1984 Sep 22, 2020
c881357
Revert removal of Nullable. arbitratorNodeAddress is null (confused i…
chimp1984 Sep 22, 2020
525360c
Use ApplyFilter at start at take offer process.
chimp1984 Sep 22, 2020
a3864ef
Refactor: Remove final
chimp1984 Sep 22, 2020
3269e8c
Remove check that account age signature can be null. Such old version…
chimp1984 Sep 22, 2020
3a7af57
Refactoring: cleanups, add more checkNotNull tests
chimp1984 Sep 22, 2020
dc8ddbd
Refactoring: cleanups
chimp1984 Sep 22, 2020
03c2fbf
Refactoring: cleanups
chimp1984 Sep 22, 2020
e023557
Unsubscribe before state is set to avoid duplicate calls
chimp1984 Sep 22, 2020
5705d8e
Refactoring: rename inputsForDepositTxResponse , add more checkNotNul…
chimp1984 Sep 22, 2020
a8a3318
Refactoring: cleanups
chimp1984 Sep 22, 2020
53526e3
Remove repeated TakerVerifyMakerAccount and TakerVerifyMakerFeePaymen…
chimp1984 Sep 22, 2020
a725227
Refactor: set string at success handlers correctly
chimp1984 Sep 22, 2020
2aa5fee
Move stopTimeout to second message handler
chimp1984 Sep 22, 2020
9966f9a
Move contractHash creation to TakerVerifyAndSignContract
chimp1984 Sep 22, 2020
fdde4b5
Refactoring: cleanups
chimp1984 Sep 22, 2020
e960e12
Refactoring: cleanups
chimp1984 Sep 22, 2020
17baf18
Refactoring: cleanups
chimp1984 Sep 22, 2020
853dac7
Remove empty task runner
chimp1984 Sep 22, 2020
0f36ae8
Refactoring: cleanups
chimp1984 Sep 22, 2020
538db2f
Move contractHash creation to MakerCreateAndSignContract
chimp1984 Sep 22, 2020
971cd57
Refactoring: cleanups, rename cleanupTradableOnFault
chimp1984 Sep 22, 2020
33c816a
Move SellerPublishesDepositTx after SellerSendsDepositTxAndDelayedPay…
chimp1984 Sep 22, 2020
527f153
Add listener on BuyerSendCounterCurrencyTransferStartedMessage to res…
chimp1984 Sep 22, 2020
2b747cc
Don't return null if name is null by try to use UNDEFINED. Only if th…
chimp1984 Sep 22, 2020
b13e1a3
Resend DepositTxAndDelayedPayoutTxMessage at
chimp1984 Sep 22, 2020
9622131
Change order of tasks
chimp1984 Sep 23, 2020
c7e0c51
Use same model as in SellerSendsDepositTxAndDelayedPayoutTxMessage
chimp1984 Sep 23, 2020
4b7307e
Add checks for state at handle CounterCurrencyTransferStartedMessage
chimp1984 Sep 23, 2020
8ce5eba
Refactoring: rename, cleanups
chimp1984 Sep 23, 2020
1abe6ad
Remove empty tasks.
chimp1984 Sep 23, 2020
5f8f30a
Add BuyerSendCounterCurrencyTransferStartedMessage as second optional…
chimp1984 Sep 23, 2020
48241af
Change isTradeInPhase APi to fluent interface with ifInPhase
chimp1984 Sep 23, 2020
7c6f0ac
Use ifInPhase APi for testing expected phase(s)
chimp1984 Sep 23, 2020
6fa2225
Use fluent interface for checking state and conditions
chimp1984 Sep 23, 2020
0fa4565
Merge branch 'dispute-agent-branch' into wip-merge-tradeprot
chimp1984 Sep 23, 2020
de00845
Remove empty file (from merge)
chimp1984 Sep 23, 2020
2b53312
Various improvements
chimp1984 Sep 23, 2020
3f80d1b
Refactor: Rename condition to preCondition
chimp1984 Sep 23, 2020
d91e44c
Refactor: Rename from to expectedPhase
chimp1984 Sep 23, 2020
faf07f6
Refactor: Rename fromAny to expectedPhases
chimp1984 Sep 23, 2020
9505179
Use FluentProcess for boilerplate code (WIP - some custom code is com…
chimp1984 Sep 23, 2020
968a6df
Refactor: Rename run to runTasks
chimp1984 Sep 23, 2020
54d625e
Add run method to accept runnable which is execute before run tasks
chimp1984 Sep 23, 2020
cdbd6cd
Redesigned fluent API again...
chimp1984 Sep 23, 2020
e59b5b3
Change BuyerProtocol from interface to abstract class
chimp1984 Sep 23, 2020
a2e0ec4
Change SellerProtocol from interface to abstract class
chimp1984 Sep 24, 2020
99afe23
Refactor: Rename takeAvailableOffer to onTakeOffer
chimp1984 Sep 24, 2020
8847f4b
Refactor: Rename createTrade to getNewTrade
chimp1984 Sep 24, 2020
9644920
Refactor: Move mediation code to new class
chimp1984 Sep 24, 2020
f059f08
Refactor: Rearrange methods
chimp1984 Sep 24, 2020
0302356
Fix potential bug with peers pub key check. Use new isPubKeyValid met…
chimp1984 Sep 24, 2020
f6eefef
Remove handling of failed trades. If a trade is in an invalid state (…
chimp1984 Sep 25, 2020
b494434
Add warn icon next to trash icon. Show popup with info about the prob…
chimp1984 Sep 25, 2020
7167e2a
Add check if trade has been paid out for button disable state
chimp1984 Sep 25, 2020
6f614f4
Set takerFeeTxId and depositTx in trade only once they are published.…
chimp1984 Sep 25, 2020
f1df527
improve trade details window
chimp1984 Sep 25, 2020
b958c75
Add MakerRemovesOpenOffer task.
chimp1984 Sep 25, 2020
10bedee
Merge branch 'dispute-agent-branch' into fix-delayed-payout-tx-issues
chimp1984 Sep 25, 2020
568dcda
Update tasks in debugview
chimp1984 Sep 25, 2020
95cb3b2
Fix deposit tx setters
chimp1984 Sep 25, 2020
3987f9c
Fix incorrect getDepositTx calls
chimp1984 Sep 25, 2020
dceba6d
Bug fix: we created a new address entry which causes bugs in case a u…
chimp1984 Sep 26, 2020
98dec09
Rename given method to expect to make it more clear that it is mandat…
chimp1984 Sep 26, 2020
3cc633f
Add check if trade was already taken in the past. If so show a popup …
chimp1984 Sep 26, 2020
612ecd3
Rename onFiatPaymentReceived to onPaymentReceived
chimp1984 Sep 26, 2020
a002fb3
Rename onFiatPaymentStarted to onPaymentStarted
chimp1984 Sep 26, 2020
7023b2a
Remove onPaymentReceived method from TradeManager
chimp1984 Sep 26, 2020
a5f4cb8
Refactor: use getTradableList instead of tradableList.getList()
chimp1984 Sep 26, 2020
6af9cb3
Refactor: rename getTradableList to getTradesAsObservableList
chimp1984 Sep 26, 2020
5d312ae
Refactor: add TODOs
chimp1984 Sep 26, 2020
86569b1
Apply fluent protocol to MediationProtocol
chimp1984 Sep 26, 2020
2fc753b
Rename InputsForDepositTxRequest to TakeOfferRequest
chimp1984 Sep 26, 2020
82749ce
Refactor:
chimp1984 Sep 26, 2020
a07fe30
Refactor: Move method
chimp1984 Sep 26, 2020
96ec87b
Refactor: let TradeManager implement DecryptedDirectMessageListener, …
chimp1984 Sep 26, 2020
4d40ca5
Refactor: Remove handleTakeOfferRequest method
chimp1984 Sep 26, 2020
346d793
Refactor: Remove onOfferRemovedFromRemoteOfferBook method
chimp1984 Sep 26, 2020
246d1e3
Refactor: Remove onCancelAvailabilityRequest method
chimp1984 Sep 26, 2020
1c824f1
Refactor: Cleanups
chimp1984 Sep 26, 2020
35b7584
Refactor: Move methods, rename methods
chimp1984 Sep 26, 2020
0b81db5
Refactor: return early
chimp1984 Sep 26, 2020
9f3fe7a
Refactor: Move getAddressEntriesForAvailableBalanceStream to btcWalle…
chimp1984 Sep 26, 2020
561abd7
Refactor: Move publishDelayedPayoutTx from TradeManager to MediationP…
chimp1984 Sep 26, 2020
fded97f
Refactor: Use task runner for peer publish delayed payout tx
chimp1984 Sep 26, 2020
191b031
Refactor: Rename MediationProtocol to DisputeProtocol
chimp1984 Sep 26, 2020
9e5cdad
Remove precondition as trade was added at that moment
chimp1984 Sep 26, 2020
e61d042
Add ProcessModelServiceProvider to provide all the domain services to…
chimp1984 Sep 26, 2020
0c4af92
Refactor: rename methods
chimp1984 Sep 26, 2020
62a71e2
Remove unused method
chimp1984 Sep 26, 2020
2bb4bff
Refactor: move method, remove unneeded stream call
chimp1984 Sep 26, 2020
766b1e2
Add check to not add a duplicate address entry with same offer ID and…
chimp1984 Sep 26, 2020
456f16d
Remove handleTakeOfferRequest delegate method in maker trade
chimp1984 Sep 26, 2020
7e16982
Remove onTakeOffer delegate method in taker trade
chimp1984 Sep 26, 2020
a661ce6
Remove onPaymentStarted delegate method in buyer trade
chimp1984 Sep 26, 2020
c39a9b0
Remove onPaymentReceived delegate method in seller trade
chimp1984 Sep 26, 2020
143377b
Make some fields in ProcessModel final.
chimp1984 Sep 26, 2020
d6c2429
Remove timeouts as it was not used before.
chimp1984 Sep 26, 2020
27ac2d8
Remove never read field
chimp1984 Sep 26, 2020
7431763
Apply code inspection suggestions
chimp1984 Sep 26, 2020
a9ad72d
Remove offer at close to avoid that button stays active when taking t…
chimp1984 Sep 26, 2020
3ce1ac9
Refactor: improve logs
chimp1984 Sep 26, 2020
07bcf6c
Refactor: improve logs
chimp1984 Sep 26, 2020
6c6332d
Allow also Trade.Phase.PAYOUT_PUBLISHED in onPaymentReceived to supp…
chimp1984 Sep 26, 2020
5309f04
DO not deactivate move to failed trades button. Use different text in…
chimp1984 Sep 26, 2020
f0a3022
Fix bug with showing popup once arbitration has been started
chimp1984 Sep 27, 2020
cabc5af
Make processModel in Trade final and pass in constructor instead of i…
chimp1984 Sep 27, 2020
84a4982
Remove TradeProtocol from Trade
chimp1984 Sep 27, 2020
6deeecb
Move handling of mailbox messages from TradeManager to TradeProtocol
chimp1984 Sep 27, 2020
d085915
Add state listeners to warn icon columns to get correct state updates
chimp1984 Sep 27, 2020
ab30e54
Merge branch 'master_upstream' into fix-delayed-payout-tx-issues
chimp1984 Sep 27, 2020
28a85c1
Fix display strings
chimp1984 Sep 27, 2020
2191693
Apply stupid Codacy rule
chimp1984 Sep 27, 2020
b31f5b7
Another stupid codacy enforcement
chimp1984 Sep 27, 2020
ad83183
Revert copyright text from un-intended change
chimp1984 Sep 28, 2020
eec13cd
Refactor: Return early if not valid
chimp1984 Sep 28, 2020
0258205
Fix typos
chimp1984 Sep 28, 2020
e8ab4c7
Merge branch 'master_upstream' into fix-delayed-payout-tx-issues
chimp1984 Sep 29, 2020
6be21fa
Update core/src/main/resources/i18n/displayStrings.properties
chimp1984 Sep 29, 2020
2850037
Update core/src/main/resources/i18n/displayStrings.properties
chimp1984 Sep 29, 2020
c448b1b
Update core/src/main/resources/i18n/displayStrings.properties
chimp1984 Sep 29, 2020
08e2a2e
Update core/src/main/resources/i18n/displayStrings.properties
chimp1984 Sep 29, 2020
126f996
Update core/src/main/resources/i18n/displayStrings.properties
chimp1984 Sep 29, 2020
e3cc62e
Update core/src/main/resources/i18n/displayStrings.properties
chimp1984 Sep 29, 2020
dc15c7d
Update core/src/main/resources/i18n/displayStrings.properties
chimp1984 Sep 29, 2020
1fef02e
Update core/src/main/resources/i18n/displayStrings.properties
chimp1984 Sep 29, 2020
4e2ccf2
Update core/src/main/resources/i18n/displayStrings.properties
chimp1984 Sep 29, 2020
9290210
Update core/src/main/resources/i18n/displayStrings.properties
chimp1984 Sep 29, 2020
77ae1bd
Update core/src/main/resources/i18n/displayStrings.properties
chimp1984 Sep 29, 2020
6c114b4
Update core/src/main/resources/i18n/displayStrings.properties
chimp1984 Sep 29, 2020
c3d3e52
Update core/src/main/resources/i18n/displayStrings.properties
chimp1984 Sep 29, 2020
9cf368c
Update core/src/main/resources/i18n/displayStrings.properties
chimp1984 Sep 29, 2020
e071d5e
Update core/src/main/resources/i18n/displayStrings.properties
chimp1984 Sep 29, 2020
25e64cd
Update core/src/main/resources/i18n/displayStrings.properties
chimp1984 Sep 29, 2020
e9d7e53
Merge branch 'fix-delayed-payout-tx-issues' of https://github.com/chi…
chimp1984 Sep 29, 2020
24e1155
Set peers pubkey at constructor instead of onInitialized
chimp1984 Sep 30, 2020
7e847cd
Only check pubKey for trade messages. Before we got it called for ins…
chimp1984 Sep 30, 2020
a44ba62
Merge branch 'fix-delayed-payout-tx-issues' of https://github.com/chi…
chimp1984 Oct 1, 2020
fb41a19
Merge branch 'master_upstream' into fix-delayed-payout-tx-issues
chimp1984 Oct 1, 2020
0af9e13
Cleanups
chimp1984 Oct 1, 2020
8a3cacd
Revert renaming from InputsForDepositTxRequest to TakeOfferRequest
chimp1984 Oct 1, 2020
9fce068
Rename baseCurrencyNetworkParameters to networkParameters
chimp1984 Oct 1, 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
6 changes: 3 additions & 3 deletions core/src/main/resources/i18n/displayStrings.properties
Expand Up @@ -833,9 +833,9 @@ portfolio.pending.error.depositTxNull=The deposit transaction is null. You canno
without a valid deposit transaction. Please go to \"Settings/Network info\" and do a SPV resync.\n\n\
For further help please contact the Bisq support channel at the Bisq Keybase team.
portfolio.pending.mediationResult.error.depositTxNull=The deposit transaction is null. You can move the \
trade to the failed trades screen by clicking the trash can icon.
trade to the failed trades.
chimp1984 marked this conversation as resolved.
Show resolved Hide resolved
portfolio.pending.mediationResult.error.delayedPayoutTxNull=The delayed payout transaction is null. You can move the \
trade to the failed trades screen by clicking the trash can icon.
trade to the failed trades.
chimp1984 marked this conversation as resolved.
Show resolved Hide resolved
portfolio.pending.error.depositTxNotConfirmed=The deposit transaction is not confirmed. You can not open an arbitration dispute \
with an unconfirmed deposit transaction. Please wait until it is confirmed or go to \"Settings/Network info\" and do a SPV resync.\n\n\
For further help please contact the Bisq support channel at the Bisq Keybase team.
Expand Down Expand Up @@ -963,7 +963,7 @@ portfolio.failed.Failed=Failed
portfolio.failed.unfail=Before proceeding, make sure you have a backup of your data directory!\n\
Do you want to move this trade back to open trades?\n\
This is a way to unlock funds stuck in a failed trade.
portfolio.failed.cantUnfail=This trade cannot be moved back to pending trades at the moment. \n\
portfolio.failed.cantUnfail=This trade cannot be moved back to open trades at the moment. \n\
Try again after completion of trade(s) {0}
portfolio.failed.depositTxNull=The trade cannot be reverted to a open trade. Deposit transaction is null.
portfolio.failed.delayedPayoutTxNull=The trade cannot be reverted to a open trade. Delayed payout transaction is null.
Expand Down