chimp1984
|
74789b1cc5
|
Move Utilities.objectToJson to JsonUtil.objectToJson
Move inner class AnnotationExclusionStrategy to JsonUtil
Next commit includes changes why that move to core is needed.
|
2021-11-02 16:18:50 +01:00 |
|
chimp1984
|
1c1b2802cc
|
Apply codacy review suggestions
|
2021-11-02 16:18:50 +01:00 |
|
chimp1984
|
f7fcaa915e
|
Add BSQ swap code
|
2021-11-02 16:18:50 +01:00 |
|
chimp1984
|
fd28c63c55
|
Fix merge issues (nothing critical)
|
2021-11-02 16:05:46 +01:00 |
|
chimp1984
|
d5dfdb4a35
|
Merge branch 'chimp-bsq-swap-1' into bsq-swap-low-risk-refactorings-2
# Conflicts:
# core/src/main/java/bisq/core/account/witness/AccountAgeWitnessService.java
# core/src/main/java/bisq/core/api/CoreOffersService.java
# core/src/main/java/bisq/core/btc/listeners/TxConfidenceListener.java
# core/src/main/java/bisq/core/notifications/alerts/market/MarketAlerts.java
# core/src/main/java/bisq/core/offer/OpenOfferManager.java
# core/src/main/java/bisq/core/offer/bisq_v1/CreateOfferService.java
# core/src/main/java/bisq/core/offer/bisq_v1/OfferPayload.java
# core/src/main/java/bisq/core/offer/bisq_v1/TakeOfferModel.java
# core/src/main/java/bisq/core/offer/bisq_v1/TriggerPriceService.java
# core/src/main/java/bisq/core/proto/ProtoDevUtil.java
# core/src/main/java/bisq/core/trade/TradeManager.java
# core/src/main/java/bisq/core/trade/bisq_v1/TradeResultHandler.java
# core/src/main/java/bisq/core/trade/bisq_v1/TradeUtil.java
# core/src/main/java/bisq/core/trade/model/bisq_v1/Trade.java
# core/src/main/java/bisq/core/trade/protocol/FluentProtocol.java
# core/src/main/java/bisq/core/trade/protocol/Provider.java
# core/src/main/java/bisq/core/trade/protocol/TradeProtocol.java
# core/src/main/java/bisq/core/trade/protocol/TradeProtocolFactory.java
# core/src/main/java/bisq/core/trade/protocol/TradeTaskRunner.java
# core/src/main/java/bisq/core/trade/protocol/bisq_v1/DisputeProtocol.java
# core/src/main/java/bisq/core/trade/protocol/bisq_v1/model/ProcessModel.java
# core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/ApplyFilter.java
# core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/TradeTask.java
# core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/maker/MakerCreateAndSignContract.java
# core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/taker/TakerVerifyAndSignContract.java
# core/src/main/java/bisq/core/trade/statistics/TradeStatistics2.java
# core/src/main/java/bisq/core/trade/statistics/TradeStatisticsManager.java
# core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofService.java
# desktop/src/main/java/bisq/desktop/components/paymentmethods/PaymentMethodForm.java
# desktop/src/main/java/bisq/desktop/main/PriceUtil.java
# desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionAwareTradableFactory.java
# desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionAwareTrade.java
# desktop/src/main/java/bisq/desktop/main/market/offerbook/OfferBookChartView.java
# desktop/src/main/java/bisq/desktop/main/market/offerbook/OfferBookChartViewModel.java
# desktop/src/main/java/bisq/desktop/main/market/spread/SpreadViewModel.java
# desktop/src/main/java/bisq/desktop/main/offer/BuyOfferView.java
# desktop/src/main/java/bisq/desktop/main/offer/OfferView.java
# desktop/src/main/java/bisq/desktop/main/offer/SellOfferView.java
# desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/MutableOfferDataModel.java
# desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/MutableOfferView.java
# desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/MutableOfferViewModel.java
# desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/takeoffer/TakeOfferDataModel.java
# desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/takeoffer/TakeOfferView.java
# desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/takeoffer/TakeOfferViewModel.java
# desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBook.java
# desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java
# desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookViewModel.java
# desktop/src/main/java/bisq/desktop/main/overlays/windows/OfferDetailsWindow.java
# desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesDataModel.java
# desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferDataModel.java
# desktop/src/main/java/bisq/desktop/main/portfolio/failedtrades/FailedTradesDataModel.java
# desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersDataModel.java
# desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersView.java
# desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java
# desktop/src/main/java/bisq/desktop/util/DisplayUtils.java
# desktop/src/test/java/bisq/desktop/main/offer/bisq_v1/createoffer/CreateOfferDataModelTest.java
# desktop/src/test/java/bisq/desktop/main/offer/bisq_v1/createoffer/CreateOfferViewModelTest.java
# desktop/src/test/java/bisq/desktop/main/offer/offerbook/OfferBookListItemMaker.java
# desktop/src/test/java/bisq/desktop/main/portfolio/editoffer/EditOfferDataModelTest.java
# desktop/src/test/java/bisq/desktop/maker/OfferMaker.java
# monitor/src/main/java/bisq/monitor/metric/P2PMarketStats.java
|
2021-11-02 16:04:12 +01:00 |
|
chimp1984
|
7d48cdb941
|
Cleanups
|
2021-11-02 15:35:51 +01:00 |
|
chimp1984
|
ed13d7207b
|
Move ProcessModel to package bisq.core.trade.protocol.bisq_v1.model
|
2021-11-02 15:35:51 +01:00 |
|
chimp1984
|
993c6025e7
|
Make setPaymentStartedAckMessage and setDepositTxSentAckMessage public
|
2021-11-02 15:35:51 +01:00 |
|
chimp1984
|
3bb303b27a
|
Move TradingPeer to package bisq.core.trade.protocol.bisq_v1.model
|
2021-11-02 15:35:51 +01:00 |
|
chimp1984
|
6a8f612116
|
Cleanups, refromatting, add final qualifier
|
2021-11-02 15:35:51 +01:00 |
|
chimp1984
|
3dd4a752b1
|
Rename txID to txId
|
2021-11-02 15:35:51 +01:00 |
|
chimp1984
|
449472ed45
|
Rename ProcessModelServiceProvider to Provider
|
2021-11-02 15:35:51 +01:00 |
|
chimp1984
|
ac8dd031b3
|
Move TradeDataValidation, DumpDelayedPayoutTx, TradeDataValidation, TradeUtil, TradeTxException to package bisq.core.trade.bisq_v1
|
2021-11-02 15:35:51 +01:00 |
|
chimp1984
|
3b7a14cd3a
|
Move TransactionResultHandler, TradeResultHandler to package bisq.core.trade.bisq_v1
|
2021-11-02 15:35:51 +01:00 |
|
chimp1984
|
0bc5ede803
|
Move CleanupMailboxMessagesService, ClosedTradeUtil to package bisq.core.trade.bisq_v1
|
2021-11-02 15:35:51 +01:00 |
|
chimp1984
|
bd7af46d3f
|
Rename CleanupMailboxMessages to CleanupMailboxMessagesService
|
2021-11-02 15:35:51 +01:00 |
|
chimp1984
|
c090116f04
|
Move ClosedTradableManager, FailedTradesManager into bisq.core.trade.bisq_v1 package
|
2021-11-02 15:35:51 +01:00 |
|
chimp1984
|
69ca8de0d9
|
Move messages package into bisq.core.trade.protocol.bisq_v1 package
Move TradeMessage into bisq.core.trade.protocol package
|
2021-11-02 15:35:51 +01:00 |
|
chimp1984
|
97903e6a5a
|
Move TradingPeer into bisq.core.trade.protocol.bisq_v1 package
|
2021-11-02 15:35:51 +01:00 |
|
chimp1984
|
83054349e8
|
Move tasks package into bisq.core.trade.protocol.bisq_v1 package
|
2021-11-02 15:35:51 +01:00 |
|
chimp1984
|
21e9bb4bdf
|
Move protocol classes to bisq.core.trade.protocol.bisq_v1 package
|
2021-11-02 15:35:51 +01:00 |
|
chimp1984
|
e2f8236be7
|
Make setup in FluentProtocol public
|
2021-11-02 15:35:51 +01:00 |
|
chimp1984
|
838f7e2e17
|
Make FluentProtocol.Event public
|
2021-11-02 15:35:51 +01:00 |
|
chimp1984
|
5b59d50ed5
|
Move TradableList to bisq.core.trade.model package
|
2021-11-02 15:35:51 +01:00 |
|
chimp1984
|
eef55b7d67
|
Move Tradable to bisq.core.trade.model package
|
2021-11-02 15:35:51 +01:00 |
|
chimp1984
|
2b573092a9
|
Move MakerTrade and TakerTrade to bisq.core.trade.model package
|
2021-11-02 15:35:51 +01:00 |
|
chimp1984
|
4dc71214a0
|
Move Trade to bisq.core.trade.model.bisq_v1 package
|
2021-11-02 15:35:51 +01:00 |
|
chimp1984
|
b580a615b5
|
Make updateDepositTxFromWallet public
|
2021-11-02 15:35:51 +01:00 |
|
chimp1984
|
09aa24ce2d
|
Move Contract, SellerAsMakerTrade, SellerAsTakerTrade, SellerTrade,
BuyerAsMakerTrade, BuyerAsTakerTrade, BuyerTrade
to bisq.core.trade.model.bisq_v1 package
|
2021-11-02 15:35:51 +01:00 |
|
chimp1984
|
4b968ce00c
|
Rename OfferFilter to OfferFilterService
|
2021-11-02 15:35:51 +01:00 |
|
chimp1984
|
aa02ac8a6d
|
Move content of bisq.core.offer.placeoffer package into package bisq.core.offer.placeoffer.bisq_v1
|
2021-11-02 15:35:51 +01:00 |
|
chimp1984
|
fa9896d472
|
Move bisq.core.offer.messages package into package bisq.core.offer.availability
|
2021-11-02 15:35:51 +01:00 |
|
chimp1984
|
ab91be8f2a
|
Move AvailabilityResult into package bisq.core.offer.availability
|
2021-11-02 15:35:51 +01:00 |
|
chimp1984
|
0e8ff7d921
|
Move TakeOfferModel into package bisq.core.offer.bisq_v1
|
2021-11-02 15:35:51 +01:00 |
|
chimp1984
|
990c62b8e9
|
Move TriggerPriceService into package bisq.core.offer.bisq_v1
|
2021-11-02 15:35:51 +01:00 |
|
chimp1984
|
b93295ac0b
|
Move MutableOfferPayloadFields into package bisq.core.offer.bisq_v1
|
2021-11-02 15:35:51 +01:00 |
|
chimp1984
|
76441ffa16
|
Move MarketPriceNotAvailableException into package bisq.core.offer.bisq_v1
|
2021-11-02 15:35:51 +01:00 |
|
chimp1984
|
3838b45e15
|
Move CreateOfferService into package bisq.core.offer.bisq_v1
|
2021-11-02 15:35:51 +01:00 |
|
chimp1984
|
0942d8fc67
|
Move OfferPayload into package bisq.core.offer.bisq_v1
|
2021-11-02 15:35:51 +01:00 |
|
jmacxx
|
f5c653b92a
|
Include owner name for Monese & Satispay accounts
|
2021-11-02 14:54:24 +01:00 |
|
Christoph Atteneder
|
32fcc69fcb
|
Update bitcoinj checkpoints for v1.7.5
|
2021-10-26 11:59:08 +02:00 |
|
chimp1984
|
54f17b00af
|
Cleanups
|
2021-10-21 17:44:48 +02:00 |
|
chimp1984
|
611b944609
|
Move protobuf OfferPayload.Direction to OfferDirection
|
2021-10-21 15:40:25 +02:00 |
|
chimp1984
|
14765d6caa
|
Move protobuf OfferPayload.Direction to OfferDirection
|
2021-10-21 15:36:21 +02:00 |
|
chimp1984
|
b194960c63
|
Use TradeModel instead of Trade where appropriate.
Extend methods with additional params.
Cleanups
|
2021-10-21 15:28:58 +02:00 |
|
chimp1984
|
d063aff5bf
|
Let OfferPayload extend OfferPayloadBase
|
2021-10-21 13:50:15 +02:00 |
|
chimp1984
|
c0e70b81ef
|
Use TradeModel in trade domain
|
2021-10-21 13:08:56 +02:00 |
|
chimp1984
|
453229e370
|
Impl. onAckMessage. Add fields for concrete types
|
2021-10-21 12:50:14 +02:00 |
|
chimp1984
|
308bb687c5
|
Use TradeModel
|
2021-10-21 12:49:43 +02:00 |
|
chimp1984
|
5d687bd064
|
Use TradeModel and ProtocolModel in TradeTaskRunner, TradeTask, TradeProtocol and FluentProtocol
|
2021-10-21 12:49:23 +02:00 |
|