[bisq-network/bisq] New trade protocol (#3333)

chimp1984 notifications at github.com
Fri Sep 27 08:34:29 UTC 2019


You can view, comment on, or merge this pull request online at:

  https://github.com/bisq-network/bisq/pull/3333

-- Commit Summary --

  * Remove arbitration key, cleanup
  * Add BuyerAsMakerProcessDepositTxAndDelayedPayoutTxMessage
  * Adopt trade protocol
  * Remove arbitratorKey
  * Add new classes
  * Add new message classes
  * Add new task classes
  * Renamed classed (no functional change yet)
  * Add lockTime
  * Add delayedPayoutTxSignature field
  * Add useReimbursementModel field
  * Add new classes
  * Add setting.preferences.useReimbursementModel
  * Apply renamed classes (new classes not added yet)
  * Add useReimbursementModel
  * Add preferences param
  * Add new methods, cleanup
  * Add daoFacade param, apply renaming
  * Add delayedPayoutTx, lockTime and delayedPayoutTxId
  * Remove DirectMessage interface
  * Rename emergencySignAndPublishPayoutTx method, add new one for 2of2 MS
  * Apply new protocol
  * Apply new protocol
  * Add renaming (no functional change yet)
  * Add new messages, apply renaming
  * Remove unneeded P2SHMultiSigOutputScript
  * Remove PREFERRED_PROJECT_CODE_STYLE
  * Refactor: Rename class
  * Use InputsForDepositTxRequest instead of TradeMessage in handleTakeOfferRequest
  * Do not sign deposit tx if maker is seller
  * Apply new trade protocol to seller as maker version
  * Apply new trade protocol
  * Set TRADE_PROTOCOL_VERSION to 2
  * Add PeerPublishedDelayedPayoutTxMessage
  * Add refund agent domain
  * Add refundAgentNodeAddress
  * Apply refund domain
  * Add refund views
  * Apply refundAgent domain
  * Support refundAgent
  * Remove useReimbursementModel field
  * Apply refundAgent payout
  * Handle tx info and balances
  * Remove mediation activation
  * Add new tac accepted flag for v1.2.0 and adjust text
  * Fix params for test classes

-- File Changes --

    M .idea/codeStyles/codeStyleConfig.xml (1)
    M common/src/main/java/bisq/common/app/Version.java (5)
    M common/src/main/proto/pb.proto (120)
    M core/src/main/java/bisq/core/app/BisqSetup.java (14)
    M core/src/main/java/bisq/core/btc/Balances.java (8)
    M core/src/main/java/bisq/core/btc/TxFeeEstimationService.java (19)
    M core/src/main/java/bisq/core/btc/wallet/BtcWalletService.java (51)
    M core/src/main/java/bisq/core/btc/wallet/TradeWalletService.java (790)
    M core/src/main/java/bisq/core/btc/wallet/TxBroadcaster.java (6)
    M core/src/main/java/bisq/core/filter/Filter.java (18)
    M core/src/main/java/bisq/core/offer/AvailabilityResult.java (3)
    M core/src/main/java/bisq/core/offer/OfferBookService.java (13)
    M core/src/main/java/bisq/core/offer/OfferUtil.java (4)
    M core/src/main/java/bisq/core/offer/OpenOffer.java (15)
    M core/src/main/java/bisq/core/offer/OpenOfferManager.java (75)
    M core/src/main/java/bisq/core/offer/availability/DisputeAgentSelection.java (7)
    M core/src/main/java/bisq/core/offer/availability/OfferAvailabilityModel.java (6)
    M core/src/main/java/bisq/core/offer/availability/tasks/ProcessOfferAvailabilityResponse.java (4)
    M core/src/main/java/bisq/core/offer/messages/OfferAvailabilityResponse.java (18)
    M core/src/main/java/bisq/core/proto/network/CoreNetworkProtoResolver.java (38)
    M core/src/main/java/bisq/core/proto/persistable/CorePersistenceProtoResolver.java (5)
    M core/src/main/java/bisq/core/setup/CorePersistedDataHost.java (2)
    M core/src/main/java/bisq/core/support/SupportType.java (3)
    M core/src/main/java/bisq/core/support/dispute/Dispute.java (30)
    M core/src/main/java/bisq/core/support/dispute/DisputeManager.java (70)
    M core/src/main/java/bisq/core/support/dispute/arbitration/ArbitrationManager.java (12)
    M core/src/main/java/bisq/core/support/dispute/mediation/MediationManager.java (19)
    A core/src/main/java/bisq/core/support/dispute/refund/RefundDisputeList.java (83)
    A core/src/main/java/bisq/core/support/dispute/refund/RefundDisputeListService.java (48)
    A core/src/main/java/bisq/core/support/dispute/refund/RefundManager.java (206)
    A core/src/main/java/bisq/core/support/dispute/refund/RefundResultState.java (33)
    A core/src/main/java/bisq/core/support/dispute/refund/RefundSession.java (33)
    A core/src/main/java/bisq/core/support/dispute/refund/refundagent/RefundAgent.java (109)
    A core/src/main/java/bisq/core/support/dispute/refund/refundagent/RefundAgentManager.java (105)
    A core/src/main/java/bisq/core/support/dispute/refund/refundagent/RefundAgentService.java (61)
    M core/src/main/java/bisq/core/trade/BuyerAsMakerTrade.java (7)
    M core/src/main/java/bisq/core/trade/BuyerAsTakerTrade.java (3)
    M core/src/main/java/bisq/core/trade/BuyerTrade.java (4)
    M core/src/main/java/bisq/core/trade/Contract.java (19)
    M core/src/main/java/bisq/core/trade/MakerTrade.java (4)
    M core/src/main/java/bisq/core/trade/SellerAsMakerTrade.java (16)
    M core/src/main/java/bisq/core/trade/SellerAsTakerTrade.java (3)
    M core/src/main/java/bisq/core/trade/SellerTrade.java (4)
    M core/src/main/java/bisq/core/trade/Trade.java (149)
    M core/src/main/java/bisq/core/trade/TradeManager.java (112)
    A core/src/main/java/bisq/core/trade/messages/DelayedPayoutTxSignatureRequest.java (89)
    A core/src/main/java/bisq/core/trade/messages/DelayedPayoutTxSignatureResponse.java (90)
    A core/src/main/java/bisq/core/trade/messages/DepositTxAndDelayedPayoutTxMessage.java (98)
    R core/src/main/java/bisq/core/trade/messages/DepositTxMessage.java (61)
    R core/src/main/java/bisq/core/trade/messages/InputsForDepositTxRequest.java (84)
    R core/src/main/java/bisq/core/trade/messages/InputsForDepositTxResponse.java (87)
    A core/src/main/java/bisq/core/trade/messages/PeerPublishedDelayedPayoutTxMessage.java (77)
    M core/src/main/java/bisq/core/trade/messages/TradeMessage.java (3)
    M core/src/main/java/bisq/core/trade/protocol/BuyerAsMakerProtocol.java (96)
    M core/src/main/java/bisq/core/trade/protocol/BuyerAsTakerProtocol.java (116)
    M core/src/main/java/bisq/core/trade/protocol/MakerProtocol.java (4)
    M core/src/main/java/bisq/core/trade/protocol/ProcessModel.java (58)
    M core/src/main/java/bisq/core/trade/protocol/SellerAsMakerProtocol.java (101)
    M core/src/main/java/bisq/core/trade/protocol/SellerAsTakerProtocol.java (86)
    M core/src/main/java/bisq/core/trade/protocol/TradeProtocol.java (66)
    M core/src/main/java/bisq/core/trade/protocol/TradingPeer.java (14)
    A core/src/main/java/bisq/core/trade/protocol/tasks/ProcessPeerPublishedDelayedPayoutTxMessage.java (63)
    M core/src/main/java/bisq/core/trade/protocol/tasks/SetupPayoutTxListener.java (4)
    A core/src/main/java/bisq/core/trade/protocol/tasks/buyer/BuyerProcessDelayedPayoutTxSignatureRequest.java (59)
    R core/src/main/java/bisq/core/trade/protocol/tasks/buyer/BuyerProcessDepositTxAndDelayedPayoutTxMessage.java (30)
    A core/src/main/java/bisq/core/trade/protocol/tasks/buyer/BuyerSendsDelayedPayoutTxSignatureResponse.java (85)
    R core/src/main/java/bisq/core/trade/protocol/tasks/buyer/BuyerSetupDepositTxListener.java (10)
    R core/src/main/java/bisq/core/trade/protocol/tasks/buyer/BuyerSignPayoutTx.java (11)
    A core/src/main/java/bisq/core/trade/protocol/tasks/buyer/BuyerSignsDelayedPayoutTx.java (68)
    A core/src/main/java/bisq/core/trade/protocol/tasks/buyer/BuyerVerifiesDelayedPayoutTx.java (54)
    M core/src/main/java/bisq/core/trade/protocol/tasks/buyer_as_maker/BuyerAsMakerCreatesAndSignsDepositTx.java (39)
    A core/src/main/java/bisq/core/trade/protocol/tasks/buyer_as_maker/BuyerAsMakerSendsInputsForDepositTxResponse.java (38)
    M core/src/main/java/bisq/core/trade/protocol/tasks/buyer_as_taker/BuyerAsTakerCreatesDepositTxInputs.java (19)
    A core/src/main/java/bisq/core/trade/protocol/tasks/buyer_as_taker/BuyerAsTakerSendsDepositTxMessage.java (87)
    R core/src/main/java/bisq/core/trade/protocol/tasks/buyer_as_taker/BuyerAsTakerSignsDepositTx.java (54)
    M core/src/main/java/bisq/core/trade/protocol/tasks/maker/MakerCreateAndSignContract.java (6)
    R core/src/main/java/bisq/core/trade/protocol/tasks/maker/MakerProcessesInputsForDepositTxRequest.java (58)
    R core/src/main/java/bisq/core/trade/protocol/tasks/maker/MakerSendsInputsForDepositTxResponse.java (32)
    A core/src/main/java/bisq/core/trade/protocol/tasks/maker/MakerSetsLockTime.java (54)
    M core/src/main/java/bisq/core/trade/protocol/tasks/mediation/FinalizeMediatedPayoutTx.java (3)
    M core/src/main/java/bisq/core/trade/protocol/tasks/mediation/SignMediatedPayoutTx.java (3)
    A core/src/main/java/bisq/core/trade/protocol/tasks/seller/SellerCreatesDelayedPayoutTx.java (65)
    A core/src/main/java/bisq/core/trade/protocol/tasks/seller/SellerFinalizesDelayedPayoutTx.java (74)
    A core/src/main/java/bisq/core/trade/protocol/tasks/seller/SellerProcessDelayedPayoutTxSignatureResponse.java (59)
    A core/src/main/java/bisq/core/trade/protocol/tasks/seller/SellerPublishesDepositTx.java (76)
    A core/src/main/java/bisq/core/trade/protocol/tasks/seller/SellerSendDelayedPayoutTxSignatureRequest.java (87)
    R core/src/main/java/bisq/core/trade/protocol/tasks/seller/SellerSendsDepositTxAndDelayedPayoutTxMessage.java (31)
    M core/src/main/java/bisq/core/trade/protocol/tasks/seller/SellerSignAndFinalizePayoutTx.java (7)
    A core/src/main/java/bisq/core/trade/protocol/tasks/seller/SellerSignsDelayedPayoutTx.java (73)
    R core/src/main/java/bisq/core/trade/protocol/tasks/seller_as_maker/SellerAsMakerCreatesUnsignedDepositTx.java (36)
    A core/src/main/java/bisq/core/trade/protocol/tasks/seller_as_maker/SellerAsMakerFinalizesDepositTx.java (57)
    A core/src/main/java/bisq/core/trade/protocol/tasks/seller_as_maker/SellerAsMakerProcessDepositTxMessage.java (56)
    A core/src/main/java/bisq/core/trade/protocol/tasks/seller_as_maker/SellerAsMakerSendsInputsForDepositTxResponse.java (47)
    M core/src/main/java/bisq/core/trade/protocol/tasks/seller_as_taker/SellerAsTakerCreatesDepositTxInputs.java (20)
    R core/src/main/java/bisq/core/trade/protocol/tasks/seller_as_taker/SellerAsTakerSignsDepositTx.java (55)
    D core/src/main/java/bisq/core/trade/protocol/tasks/taker/TakerProcessPublishDepositTxRequest.java (79)
    A core/src/main/java/bisq/core/trade/protocol/tasks/taker/TakerProcessesInputsForDepositTxResponse.java (84)
    R core/src/main/java/bisq/core/trade/protocol/tasks/taker/TakerSendInputsForDepositTxRequest.java (16)
    M core/src/main/java/bisq/core/trade/protocol/tasks/taker/TakerVerifyAndSignContract.java (8)
    M core/src/main/java/bisq/core/trade/statistics/TradeStatistics2.java (1)
    M core/src/main/java/bisq/core/user/Preferences.java (7)
    M core/src/main/java/bisq/core/user/PreferencesPayload.java (7)
    M core/src/main/java/bisq/core/user/User.java (150)
    M core/src/main/java/bisq/core/user/UserPayload.java (20)
    M core/src/main/java/bisq/core/util/BSFormatter.java (8)
    M core/src/main/resources/i18n/displayStrings.properties (35)
    M core/src/test/java/bisq/core/offer/OpenOfferManagerTest.java (6)
    M core/src/test/java/bisq/core/user/UserPayloadModelVOTest.java (1)
    M desktop/src/main/java/bisq/desktop/main/account/AccountView.java (40)
    A desktop/src/main/java/bisq/desktop/main/account/register/refundagent/RefundAgentRegistrationView.fxml (27)
    A desktop/src/main/java/bisq/desktop/main/account/register/refundagent/RefundAgentRegistrationView.java (45)
    A desktop/src/main/java/bisq/desktop/main/account/register/refundagent/RefundAgentRegistrationViewModel.java (68)
    M desktop/src/main/java/bisq/desktop/main/debug/DebugView.java (55)
    M desktop/src/main/java/bisq/desktop/main/funds/transactions/DisplayedTransactionsFactory.java (3)
    M desktop/src/main/java/bisq/desktop/main/funds/transactions/TradableRepository.java (6)
    M desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionAwareTradableFactory.java (24)
    M desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionAwareTrade.java (102)
    M desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionListItemFactory.java (23)
    M desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionsListItem.java (47)
    M desktop/src/main/java/bisq/desktop/main/offer/MutableOfferDataModel.java (5)
    M desktop/src/main/java/bisq/desktop/main/overlays/notifications/NotificationCenter.java (35)
    M desktop/src/main/java/bisq/desktop/main/overlays/windows/ContractWindow.java (45)
    M desktop/src/main/java/bisq/desktop/main/overlays/windows/DisputeSummaryWindow.java (255)
    M desktop/src/main/java/bisq/desktop/main/overlays/windows/FilterWindow.java (11)
    M desktop/src/main/java/bisq/desktop/main/overlays/windows/ManualPayoutTxWindow.java (12)
    M desktop/src/main/java/bisq/desktop/main/overlays/windows/TacWindow.java (14)
    M desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesViewModel.java (2)
    M desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java (150)
    M desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesView.java (2)
    M desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesViewModel.java (18)
    M desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/TradeStepInfo.java (18)
    M desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/TradeStepView.java (90)
    M desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.java (21)
    M desktop/src/main/java/bisq/desktop/main/support/SupportView.fxml (1)
    M desktop/src/main/java/bisq/desktop/main/support/SupportView.java (60)
    A desktop/src/main/java/bisq/desktop/main/support/dispute/agent/refund/RefundAgentView.fxml (30)
    A desktop/src/main/java/bisq/desktop/main/support/dispute/agent/refund/RefundAgentView.java (78)
    A desktop/src/main/java/bisq/desktop/main/support/dispute/client/refund/RefundClientView.fxml (29)
    A desktop/src/main/java/bisq/desktop/main/support/dispute/client/refund/RefundClientView.java (70)
    M desktop/src/test/java/bisq/desktop/main/funds/transactions/TransactionAwareTradableFactoryTest.java (5)
    M desktop/src/test/java/bisq/desktop/main/funds/transactions/TransactionAwareTradeTest.java (9)
    M p2p/src/main/java/bisq/network/p2p/AckMessageSourceType.java (3)

-- Patch Links --

https://github.com/bisq-network/bisq/pull/3333.patch
https://github.com/bisq-network/bisq/pull/3333.diff

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/bisq-network/bisq/pull/3333
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.bisq.network/pipermail/bisq-github/attachments/20190927/182c0938/attachment-0001.html>


More information about the bisq-github mailing list