chimp1984
|
b021f96738
|
Refactor methods
Prepare that BsqSwapTrades can be added
|
2021-11-03 18:58:10 +01:00 |
|
chimp1984
|
98bed9682d
|
Move ClosedTradableManager and ClosedTradeUtil one level up
We will move BsqSwapTrades into closed trades as well once confrimed
|
2021-11-03 18:21:45 +01:00 |
|
chimp1984
|
01b3691241
|
Add null check
|
2021-11-03 18:09:59 +01:00 |
|
chimp1984
|
a5eec8c998
|
Add getOptionalTakerFee and getOptionalMakerFee to Tradeable
|
2021-11-03 17:06:11 +01:00 |
|
chimp1984
|
080255ce11
|
Add getMakerFee to TradeModel
|
2021-11-03 17:04:00 +01:00 |
|
chimp1984
|
f6d2f7c8a5
|
Rename makerFee to makerFeeAsLong in BsqSwapTrade
|
2021-11-03 17:02:49 +01:00 |
|
chimp1984
|
128bd5b297
|
Add getOptionalTxFee method
|
2021-11-03 17:01:17 +01:00 |
|
chimp1984
|
310de35af3
|
Add getTakerFee to TradeModel
|
2021-11-03 17:00:59 +01:00 |
|
chimp1984
|
964144c89f
|
Rename takerFee to takerFeeAsLong
|
2021-11-03 16:58:27 +01:00 |
|
chimp1984
|
baa1fe5282
|
Add getTxFee method to TradeModel
|
2021-11-03 14:49:58 +01:00 |
|
chimp1984
|
300e19d095
|
Add default methods for volume, price, amount
|
2021-11-03 14:49:38 +01:00 |
|
chimp1984
|
d9d054f2bd
|
Add getPrice to TradeModel
|
2021-11-03 14:15:09 +01:00 |
|
chimp1984
|
d235daef01
|
Add getVolume to TradeModel
|
2021-11-03 14:14:06 +01:00 |
|
chimp1984
|
3fa4b57d70
|
Rename getTradeVolume to getVolume in Trade
|
2021-11-03 14:10:34 +01:00 |
|
chimp1984
|
1f96122e96
|
Add getAmount to TradeModel
|
2021-11-03 14:06:41 +01:00 |
|
chimp1984
|
12aadf9ab8
|
Add getAmountAsLong to TradeModel
|
2021-11-03 13:42:06 +01:00 |
|
chimp1984
|
863a52077d
|
Rename getAmount to getAmountAsLong in Trade
|
2021-11-03 13:39:47 +01:00 |
|
chimp1984
|
05de48b9e0
|
Rename setTradePrice to setPriceAsLong in Trade
|
2021-11-03 13:37:55 +01:00 |
|
chimp1984
|
5b4e2a0deb
|
Rename getTradeAmountAsLong to getAmountAsLong in Trade
|
2021-11-03 13:36:48 +01:00 |
|
chimp1984
|
b3e8d56f48
|
Rename tradeAmountProperty to amountProperty in Trade
|
2021-11-03 13:36:23 +01:00 |
|
chimp1984
|
d0cdf9fac6
|
Rename tradeVolumeProperty to volumeProperty in Trade
|
2021-11-03 13:35:58 +01:00 |
|
chimp1984
|
5bf02e944f
|
Rename getTradePrice to getPrice in Trade
|
2021-11-03 13:35:20 +01:00 |
|
chimp1984
|
bc4241cbe0
|
Rename tradeAmount to amount in Trade
|
2021-11-03 13:34:55 +01:00 |
|
chimp1984
|
9778950018
|
Rename BSQ SWAP TRADES to BSQ Swap Trades
|
2021-11-03 12:27:24 +01:00 |
|
Christoph Atteneder
|
41ce2d8088
|
Remove unused import
|
2021-11-03 11:39:55 +01:00 |
|
chimp1984
|
c5f2cbc008
|
Merge branch 'bsq-swap-low-risk-refactorings-2' into bsq-swap-impl-3
|
2021-11-02 17:16:47 +01:00 |
|
chimp1984
|
ab7d6ed18b
|
Add missing class (merge mistake)
|
2021-11-02 17:16:16 +01:00 |
|
chimp1984
|
17d7388aa7
|
Fix link to BSQ_Swaps wiki
|
2021-11-02 16:18:50 +01:00 |
|
chimp1984
|
0c0c27c0d9
|
Rename package
|
2021-11-02 16:18:50 +01:00 |
|
chimp1984
|
8ee8cba668
|
Apply patch from ghubstan
Remove currency params. Bsq swaps have statically defined currencies (BSQ/BTC).
|
2021-11-02 16:18:50 +01:00 |
|
chimp1984
|
bcbce6e0d5
|
Revert behaviour to old version in master to return null if amount is null.
This caused an issue in the UI so its more safe to leave old behaviour.
|
2021-11-02 16:18:50 +01:00 |
|
chimp1984
|
311d1e4c4e
|
Fix linebreak
|
2021-11-02 16:18:50 +01:00 |
|
chimp1984
|
d0bb421839
|
Improve naming, cleanups, use static imports
|
2021-11-02 16:18:50 +01:00 |
|
chimp1984
|
3276c80d9b
|
Remove redundant complete call
|
2021-11-02 16:18:50 +01:00 |
|
chimp1984
|
3b8692180e
|
Improve naming, comments, extract variables, inline method
|
2021-11-02 16:18:50 +01:00 |
|
chimp1984
|
fbe15cdaea
|
Improve naming, comments, extract variables
|
2021-11-02 16:18:50 +01:00 |
|
chimp1984
|
90e5cf1ba0
|
Add requestPersistence call.
Extract variables, inline method
|
2021-11-02 16:18:50 +01:00 |
|
chimp1984
|
91276c9bde
|
Use checkNotNull and checkArgument for checking pre conditions
in signBsqSwapTransaction.
Remove unused code
|
2021-11-02 16:18:50 +01:00 |
|
chimp1984
|
0e41c96377
|
Change log level
|
2021-11-02 16:18:50 +01:00 |
|
chimp1984
|
8ab630224c
|
Update text
|
2021-11-02 16:18:50 +01:00 |
|
chimp1984
|
75fff982b8
|
Add custom json serializer for OfferPayload
Order of fields is different and that would cause
a diff. json and diff. hash for the contract.
|
2021-11-02 16:18:50 +01:00 |
|
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 |
|
chimp1984
|
dcd0101c52
|
Generify TradeResultHandler
|
2021-10-21 12:25:51 +02:00 |
|
chimp1984
|
8cd85a77c1
|
Let Trade extend TradeModel
|
2021-10-21 12:23:35 +02:00 |
|
chimp1984
|
c920da36c0
|
Add abstract classes and interfaces. Let ProcessModel and TradingPeer extend those.
|
2021-10-21 12:05:22 +02:00 |
|
chimp1984
|
1c0b52cd31
|
Move OfferDirection from bisq.core.offer.bisq_v1 to bisq.core.offer
|
2021-10-21 09:43:14 +02:00 |
|
chimp1984
|
19aabba12c
|
Add method. cleanups
|
2021-10-21 09:42:20 +02:00 |
|
chimp1984
|
e940f6f9f0
|
Add method. Dont return null in case of no amount but min fee
|
2021-10-21 09:41:57 +02:00 |
|
chimp1984
|
ee374c3c39
|
Cleanups, apply rename of getTradePhase
|
2021-10-21 01:23:36 +02:00 |
|
chimp1984
|
8219bf8407
|
Extract method. Rename vars
|
2021-10-21 01:23:13 +02:00 |
|
chimp1984
|
10516407de
|
Use early return. cleanup
|
2021-10-21 01:22:41 +02:00 |
|