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

Add mediation support #3221

Merged
merged 181 commits into from Sep 9, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
181 commits
Select commit Hold shift + click to select a range
9c0eb76
Refactoring: Move arbitration package inside dispute package
chimp1984 Aug 30, 2019
ff1011d
Use abstract base class DisputeResolver for arbitrator
chimp1984 Aug 30, 2019
fc5a2b7
Refactoring: Move mediator to mediator package.
chimp1984 Aug 30, 2019
9da8e36
Let Mediator inherit DisputeResolver.
chimp1984 Aug 30, 2019
8f48402
Do not use protobuf inheritance
chimp1984 Aug 30, 2019
324feb7
Refactoring: Move ArbitratorModule to parent package
chimp1984 Aug 30, 2019
62b6c39
Refactoring: Rename ArbitratorModule to DisputeModule
chimp1984 Aug 30, 2019
97b1154
Add mediators to Filter
chimp1984 Aug 30, 2019
4160e43
Add mediators to filter window
chimp1984 Aug 30, 2019
b297715
Use abstract DisputeResolverService as base class for ArbitratorService
chimp1984 Aug 30, 2019
b2b4bc4
Fix test
chimp1984 Aug 30, 2019
406642f
Use abstract DisputeResolverManager as base class for ArbitratorManager
chimp1984 Aug 30, 2019
9171601
Refactor: Move arbitratorregistration package inside register pkg
chimp1984 Aug 30, 2019
b50fca4
Refactor: Rename arbitratorregistration package to arbitrator
chimp1984 Aug 30, 2019
d00ed78
Add registration view for mediator
chimp1984 Aug 30, 2019
40cf1be
Separate pub key list for mediator (no new keys added yet)
chimp1984 Aug 30, 2019
e8f97f0
Set new pubkeys for mediator registration
chimp1984 Aug 31, 2019
0642df5
Set disputes @Nullable. Add null checks
chimp1984 Aug 31, 2019
c280ee2
Remove pre v0.9 handling for supported arbitrators from offer
chimp1984 Aug 31, 2019
7528550
Remove supported arbitrators info in offer details window
chimp1984 Aug 31, 2019
00b1ba5
Remove check for matching arbitrator languages
chimp1984 Aug 31, 2019
a55f8dc
Remove not used classes
chimp1984 Aug 31, 2019
705e09d
Remove checks for arbitrator and mediator in offer
chimp1984 Aug 31, 2019
92d37c8
Add check if sig of proto object is not empty
chimp1984 Aug 31, 2019
e274e2e
Remove TakerSelectMediator
chimp1984 Aug 31, 2019
de43777
Set arbitratorNodeAddresses and mediatorNodeAddresses to deprecated
chimp1984 Aug 31, 2019
035b0f6
Make ArbitratorSelection generic. Add MEDIATOR_ADDRESS
chimp1984 Aug 31, 2019
8ec7849
Refactor: Rename ArbitratorSelection to DisputeResolverSelection
chimp1984 Aug 31, 2019
6553ee7
Add mediator to OfferAvailabilityResponse and mediatorNodeAddress to …
chimp1984 Aug 31, 2019
7ec0dff
Make arbitrator not nullable
chimp1984 Aug 31, 2019
195b773
Add selectedMediator to OfferAvailabilityModel
chimp1984 Aug 31, 2019
bbf903d
Refactor: Rename method
chimp1984 Aug 31, 2019
69f6524
Add todo for using more generic keys for display strings
chimp1984 Aug 31, 2019
fdf708e
Refactor: Rename method
chimp1984 Aug 31, 2019
7c8eb65
Fix wrong handling of registeredMediator
chimp1984 Aug 31, 2019
015a097
Add mediatorNodeAddress to trade
chimp1984 Aug 31, 2019
4a44a0c
Handle nullable mediator in ProcessOfferAvailabilityResponse
chimp1984 Aug 31, 2019
b813c3f
Change log level, cleanup
chimp1984 Aug 31, 2019
12a5402
Revert changes in OfferPayload due backward compatibility issues
chimp1984 Aug 31, 2019
5782cf5
Add checks if any mediator is available
chimp1984 Aug 31, 2019
de63f8c
Cleanup classes
chimp1984 Aug 31, 2019
7ac4151
Fix test
chimp1984 Aug 31, 2019
04ffaab
Add mediator DisputeStates
chimp1984 Aug 31, 2019
067cde5
Cleanup; support isMediationDispute
chimp1984 Aug 31, 2019
d86e0c4
Handle mediator data in Dispute domain
chimp1984 Aug 31, 2019
58794cc
Add support for mediation in dispute domain
chimp1984 Aug 31, 2019
e88d7ba
Remove impossible case
chimp1984 Aug 31, 2019
9aecdcb
Fix typos
chimp1984 Aug 31, 2019
486e9d4
Handle mediator and arbitrator strings
chimp1984 Aug 31, 2019
05bdbc8
Refactor: Rename arbitrator package to disputeresolvers
chimp1984 Aug 31, 2019
3505460
Refactor: Rename ArbitratorDisputeView classes to DisputeResolverView
chimp1984 Aug 31, 2019
1ca8ce5
Add support for close ticket from mediator (WIP)
chimp1984 Aug 31, 2019
1fd86fa
Refactoring: Rename class
chimp1984 Sep 2, 2019
c91aed5
Refactoring: Move dispute classes to dispute package
chimp1984 Sep 2, 2019
3219605
Refactoring: Move Attachment class to dispute package
chimp1984 Sep 2, 2019
84c9816
Refactoring: Move package one level up
chimp1984 Sep 2, 2019
4407477
Add todo comment
chimp1984 Sep 2, 2019
9d9fb42
Use ARBITRATION instead of DISPUTE
chimp1984 Sep 2, 2019
b979aef
Make DisputeManager abstract base class for ArbitrationDisputeManager
chimp1984 Sep 2, 2019
cadc0e0
Add MediationDisputeManager
chimp1984 Sep 2, 2019
6788bc4
Add MediationDisputeManager and ArbitrationDisputeManager to test
chimp1984 Sep 2, 2019
45118ad
Add mediationDisputeManager to relevant classes
chimp1984 Sep 2, 2019
1d9a5c5
Add TradersArbitrationDisputeView and TradersMediationDisputeView
chimp1984 Sep 2, 2019
851e218
Refactor: Rename class
chimp1984 Sep 2, 2019
de1697f
Refactor: Rename support.tab.support to support.tab.mediation.support
chimp1984 Sep 2, 2019
70d533b
Add DisputeView as common base class
chimp1984 Sep 2, 2019
50fdbd2
Refactor: Rename package
chimp1984 Sep 2, 2019
6cbf866
Refactor: Rename DisputesView to SupportView
chimp1984 Sep 2, 2019
3399aa0
Refactor: Rename package
chimp1984 Sep 2, 2019
1b6b17e
Add MediationDisputeManager to CorePersistedDataHost
chimp1984 Sep 2, 2019
c1a83cb
Add MediationDisputeList as db file, refactor DisputeList
chimp1984 Sep 2, 2019
1898c56
Further refactoring to split mediation and arbitration
chimp1984 Sep 2, 2019
e67c973
Further refactoring to split mediation and arbitration
chimp1984 Sep 2, 2019
bf3b15f
Refactor: Rename package
chimp1984 Sep 2, 2019
f68d38c
Refactor: Move dispute domain classes into isq.core.support.dispute p…
chimp1984 Sep 2, 2019
78cfedb
Refactor: Move classes
chimp1984 Sep 2, 2019
a8cb308
Refactor: Move DisputeCommunicationMessage
chimp1984 Sep 2, 2019
adbc97c
Refactor: Rename DisputeCommunicationMessage to ChatMessage
chimp1984 Sep 2, 2019
2dd2a5b
Add comments
chimp1984 Sep 2, 2019
f061f7b
Refactor: Move class
chimp1984 Sep 2, 2019
d5422f2
Refactor: Rename class
chimp1984 Sep 2, 2019
8fc7035
Refactor: Rename addDisputeCommunicationMessage and strings and varia…
chimp1984 Sep 2, 2019
4328d2a
Refactor: Rename method
chimp1984 Sep 2, 2019
6711a7d
Refactor: Rename methods and strings
chimp1984 Sep 2, 2019
b771ce7
Add ArbitrationChatMessage and DisputeChatMessage
chimp1984 Sep 2, 2019
41b1851
Refactor: Rename class
chimp1984 Sep 2, 2019
c1c7c2c
Move ChatMessage.Type to SupportType
chimp1984 Sep 2, 2019
b4115ca
Refactor: Move classed to new package
chimp1984 Sep 2, 2019
5aa8939
Refactor: Rename package
chimp1984 Sep 2, 2019
a7bde14
Refactor: Move classed to new package
chimp1984 Sep 2, 2019
8178614
Refactor: Move classed to new package
chimp1984 Sep 2, 2019
156db1d
Refactor: Rename classes
chimp1984 Sep 2, 2019
0d7b19e
Refactor: Rename package
chimp1984 Sep 2, 2019
740a2b7
Refactor: Rename classes
chimp1984 Sep 2, 2019
0a7c709
Refactor: Rename classes
chimp1984 Sep 2, 2019
88efcd8
Remove empty DisputeModule
chimp1984 Sep 3, 2019
5bd478f
Refactor: Rename classes
chimp1984 Sep 3, 2019
21d84b8
Refactor SupportManager domain (WIP)
chimp1984 Sep 3, 2019
4768a9b
Refactor SupportSession domain (WIP)
chimp1984 Sep 3, 2019
8805454
Remove methods from SupportSession
chimp1984 Sep 3, 2019
9df9d7c
Dont expose p2pService in SupportManager
chimp1984 Sep 3, 2019
a584e1a
Remove supportType in SupportSession
chimp1984 Sep 3, 2019
01e9d19
Remove supportSession from getPeerNodeAddress method
chimp1984 Sep 3, 2019
a48c43c
Remove isBuyer from supportSession
chimp1984 Sep 3, 2019
77f62c7
Move creation of ChatMessage to SupportManager
chimp1984 Sep 3, 2019
a6821db
Remove isMediationDispute fielf in ChatMessage
chimp1984 Sep 3, 2019
948dccf
Remove chatMessage.isMediationDispute()
chimp1984 Sep 3, 2019
d6fabdc
Refactor: Rename trade.getCommunicationMessages()
chimp1984 Sep 3, 2019
5efc3a2
Move creation of ChatMessage to Chat
chimp1984 Sep 3, 2019
05403e2
Refactor: Rename class
chimp1984 Sep 3, 2019
e9c346f
Refactor: Move ChatView class
chimp1984 Sep 3, 2019
9f0a8ab
Refactor: Move PriceFeedComboBoxItem class to shared package
chimp1984 Sep 3, 2019
7fc3ad1
Refactor: Use 'public abstract' instead of 'abstract public'
chimp1984 Sep 3, 2019
2610d49
Refactor: Use 'protected abstract' instead of 'abstract protected'
chimp1984 Sep 3, 2019
dfcaa4d
Add traderChatManager.onAllServicesInitialized() to BisqSetup
chimp1984 Sep 3, 2019
85ec354
Remove unused param
chimp1984 Sep 3, 2019
85671f0
Refactor: Rename addChatMessage to addAndPersistChatMessage
chimp1984 Sep 3, 2019
97b76e9
Fix missing check at ack msg handling
chimp1984 Sep 3, 2019
79009e3
Remove addAndPersistChatMessage from SupportSession
chimp1984 Sep 3, 2019
416c93a
Remove disputeManager from DisputeSession
chimp1984 Sep 3, 2019
aae447a
Fix missing getConcreteDisputeChatSession impl.
chimp1984 Sep 3, 2019
659f55d
Refactor: Rename package
chimp1984 Sep 3, 2019
13d7a51
Refactor: Rename classes
chimp1984 Sep 3, 2019
0f3a22c
Refactor: Move classes to new package
chimp1984 Sep 3, 2019
ba57972
Fix missing protobuf data
chimp1984 Sep 3, 2019
7b18174
Clone list at persisting to avoid ConcurrentModificationException
chimp1984 Sep 3, 2019
0cb0d91
Fix order of SupportType
chimp1984 Sep 3, 2019
aaa6da6
Add getDisputeState_StartedByPeer template method
chimp1984 Sep 3, 2019
be5e805
Add trade protocol tasks for mediation result tx signing and msg sending
chimp1984 Sep 3, 2019
9d5baee
Complete protocol tasks for mediation
chimp1984 Sep 4, 2019
a5e3af7
Refactor: Remove unneeded SuppressWarnings type: "WeakerAccess"
chimp1984 Sep 4, 2019
b5849e2
Complete mediation result protocol
chimp1984 Sep 4, 2019
8d65b6a
Add activation date and capability
chimp1984 Sep 4, 2019
04f6739
Various fixes
chimp1984 Sep 5, 2019
eebf99d
Remove code part which does not make sense (anymore)
chimp1984 Sep 5, 2019
4fb9250
Add check of balance is > 0
chimp1984 Sep 5, 2019
16a4d69
Only close trade if payout tx is set
chimp1984 Sep 5, 2019
c9e4c27
Add missing check if arbitrator and mediator are available
chimp1984 Sep 5, 2019
f229b9f
Fix wrong key
chimp1984 Sep 5, 2019
7b99d93
Improve handling of checks and popup display
chimp1984 Sep 5, 2019
06cd7c6
Rename any occurrance of DisputeResolver to DisputeAgent
chimp1984 Sep 5, 2019
d5f8847
Fix handling of mediatorPubKeyRing
chimp1984 Sep 5, 2019
68eaa76
Remove disputeSummaryWindow.evidence fields
chimp1984 Sep 5, 2019
9d13f47
Add missing persistence for MediationResultState
chimp1984 Sep 6, 2019
91cb68d
Fix tests
chimp1984 Sep 6, 2019
caad832
Make text more compact to not exceed space
chimp1984 Sep 6, 2019
01cd6c8
Refactor NotificationGroup
chimp1984 Sep 6, 2019
d28faf3
Improve text, add dev testing feature for popups
chimp1984 Sep 6, 2019
8cf8003
Improve text
chimp1984 Sep 6, 2019
40a1f9e
Renamed a key and assigned a new text
chimp1984 Sep 6, 2019
aba1162
Fix states
chimp1984 Sep 6, 2019
c46e2b0
Do not set errorMessage
chimp1984 Sep 6, 2019
90b8cef
Remove logs used for dev testing
chimp1984 Sep 6, 2019
b2ad192
Fix getMedian method with empty list
chimp1984 Sep 7, 2019
680363e
Add new methods and tests
chimp1984 Sep 7, 2019
9b6c9d1
Move error log outside of delayed call
chimp1984 Sep 7, 2019
4f4d791
Add capabilities entry to extraDataMap in offer
chimp1984 Sep 7, 2019
4a63f01
Rename non sync protobuf definitions
chimp1984 Sep 8, 2019
d34e215
Fix UI state when arbitration has started
chimp1984 Sep 8, 2019
e5c8451
Remove restriction
chimp1984 Sep 8, 2019
3bf108f
Fix typo; remove errorMessage
chimp1984 Sep 8, 2019
861c579
Improve text
chimp1984 Sep 8, 2019
a291e50
Store full address for localhost dev testing
chimp1984 Sep 8, 2019
acb2da7
Remove errorMessage
chimp1984 Sep 8, 2019
1b1779d
Improve text
chimp1984 Sep 8, 2019
e7bbe9d
Keep accept or reject button enabled after accept
chimp1984 Sep 8, 2019
6a21ee9
Cleanups (no functional change)
chimp1984 Sep 8, 2019
3d14918
Update core/src/main/resources/i18n/displayStrings.properties
chimp1984 Sep 9, 2019
d727ef3
Update core/src/main/resources/i18n/displayStrings.properties
chimp1984 Sep 9, 2019
66e437c
Update core/src/main/resources/i18n/displayStrings.properties
chimp1984 Sep 9, 2019
b9ed4ca
Update core/src/main/resources/i18n/displayStrings.properties
chimp1984 Sep 9, 2019
cbc0b7e
Update core/src/main/resources/i18n/displayStrings.properties
chimp1984 Sep 9, 2019
a17c623
Update core/src/main/resources/i18n/displayStrings.properties
chimp1984 Sep 9, 2019
8193e71
Update core/src/main/resources/i18n/displayStrings.properties
chimp1984 Sep 9, 2019
160b7d5
Update core/src/main/resources/i18n/displayStrings.properties
chimp1984 Sep 9, 2019
a85c06d
Update core/src/main/resources/i18n/displayStrings.properties
chimp1984 Sep 9, 2019
909df56
Update core/src/main/resources/i18n/displayStrings.properties
chimp1984 Sep 9, 2019
b88f225
Improve text
chimp1984 Sep 9, 2019
7e1f06e
Merge branch 'add-mediation-support' of https://github.com/chimp1984/…
chimp1984 Sep 9, 2019
dc8a45b
Merge branch 'v1.1.6' into add-mediation-support
chimp1984 Sep 9, 2019
81bf39c
Auto fill remaining amount in custom payout
chimp1984 Sep 9, 2019
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
13 changes: 8 additions & 5 deletions common/src/main/java/bisq/common/app/Capability.java
Expand Up @@ -32,9 +32,12 @@ public enum Capability {
@Deprecated PROPOSAL, // Not required anymore as no old clients out there not having that support
@Deprecated BLIND_VOTE, // Not required anymore as no old clients out there not having that support
@Deprecated ACK_MSG, // Not required anymore as no old clients out there not having that support
RECEIVE_BSQ_BLOCK,
DAO_STATE,
BUNDLE_OF_ENVELOPES,
SIGNED_ACCOUNT_AGE_WITNESS,
MEDIATION
RECEIVE_BSQ_BLOCK, // Signaling that node which wants to receive BSQ blocks (DAO lite node)
@Deprecated DAO_STATE, // Not required anymore as no old clients out there not having that support

//TODO can be set deprecated after v1.1.6 as we enforce update there
BUNDLE_OF_ENVELOPES, // Supports bundling of messages if many messages are sent in short interval

SIGNED_ACCOUNT_AGE_WITNESS, // Supports the signed account age witness feature
MEDIATION // Supports mediation feature
}
Expand Up @@ -33,6 +33,9 @@ static void setSupportedCapabilities(BisqEnvironment bisqEnvironment) {
Capability.TRADE_STATISTICS_2,
Capability.ACCOUNT_AGE_WITNESS,
Capability.ACK_MSG,
Capability.PROPOSAL,
Capability.BLIND_VOTE,
Capability.DAO_STATE,
Capability.BUNDLE_OF_ENVELOPES,
Capability.MEDIATION
);
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.