Commit Graph

15419 Commits

Author SHA1 Message Date
chimp1984
d95356be21
Add verifiedBalance field.
Use WalletService.signTx and WalletService.verifyNonDustTxo inside signTx instance method
2021-10-20 16:28:37 +02:00
chimp1984
5f8bc834f7
Remove unused signTx method 2021-10-20 16:27:48 +02:00
chimp1984
54e81d1473
Add signTx and verifyNonDustTxo methods 2021-10-20 16:27:34 +02:00
chimp1984
e582ffddad
Add new methods 2021-10-20 16:06:22 +02:00
chimp1984
0f6364d2bd
Inline TransactionWitness
Add line breaks, cleanups
2021-10-20 16:05:47 +02:00
chimp1984
47572888e7
Add isMine method. Add error logs 2021-10-20 15:53:01 +02:00
chimp1984
34c4eefb59
Add allowSpendMyOwnUnconfirmedTxOutputs flag to BsqCoinSelector
Extract variable for TxOutputKey
2021-10-20 15:47:30 +02:00
chimp1984
559bc58ec2
Fix merge issues 2021-10-20 15:30:31 +02:00
chimp1984
8ee255412f
Merge branch 'bsq-swap-low-risk-refactorings' into wip-merge2
# 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/Offer.java
#	core/src/main/java/bisq/core/offer/OfferForJson.java
#	core/src/main/java/bisq/core/offer/OfferUtil.java
#	core/src/main/java/bisq/core/offer/bisq_v1/TakeOfferModel.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/statistics/TradeStatistics2.java
#	core/src/test/java/bisq/core/offer/OfferMaker.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/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/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
2021-10-20 15:29:38 +02:00
chimp1984
561ebe940e
Move test classes into bisq.desktop.main.offer.bisq_v1.createoffer 2021-10-20 14:30:07 +02:00
chimp1984
75072ebc26
Add deprecated annotation, null checks and comment to getRawInputFromTransactionInput 2021-10-20 13:41:21 +02:00
chimp1984
a927bea71f
Add scriptTypeId to RawTransactionInput
Add convenience methods
2021-10-20 13:36:41 +02:00
chimp1984
f8751a8c4d
Make TxConfidenceListener and its onTransactionConfidenceChanged method abstract
Use lombok getter
2021-10-20 13:28:32 +02:00
chimp1984
d4bb026e3e
Only check for localhost btc node if mainnet 2021-10-20 13:26:37 +02:00
chimp1984
88198be7ff
Rename availableConfirmedBalance to availableBalance
It does not include only confirmed txs as we include
the unconfirmed own change outputs.
2021-10-20 13:25:29 +02:00
chimp1984
dad19ba1c1
Add isFiat and isAltcoin methods.
Use isFiat instead of negation of isBlockchain.
Use isAltcoin if all non btc assets are targeted
2021-10-20 13:12:54 +02:00
chimp1984
6cf0a7c126
Rename paymentMethod.isAsset to paymentMethod.isBlockchain
We will need later to distinguish between BSQ and other Blockchain assets
2021-10-20 12:52:59 +02:00
chimp1984
dfbc746d5b
Move Offer.Direction one level up and rename to OfferDirection 2021-10-20 12:51:41 +02:00
chimp1984
d1d1706a7f
Add delegate methods to offer
Remove unused methods
2021-10-20 12:49:11 +02:00
chimp1984
8768345b74
Remove Inject annotation at abstract classes 2021-10-20 12:34:26 +02:00
chimp1984
dc82fbabab
Increase visibility 2021-10-20 12:33:29 +02:00
chimp1984
9f3034e91c
Fix layout/text issues 2021-10-20 12:33:11 +02:00
chimp1984
e752965577
Add linebreak in error popup
Remove delay for success popup
2021-10-20 12:26:05 +02:00
chimp1984
dca0c93f47
Cleanups 2021-10-20 12:20:53 +02:00
chimp1984
734d429cc9
Move ProcessModel to package bisq.core.trade.protocol.bisq_v1.model 2021-10-20 11:58:04 +02:00
chimp1984
afed78813d
Make setPaymentStartedAckMessage and setDepositTxSentAckMessage public 2021-10-20 11:58:04 +02:00
chimp1984
401880b64e
Move TradingPeer to package bisq.core.trade.protocol.bisq_v1.model 2021-10-20 11:58:04 +02:00
chimp1984
777287af95
Cleanups, refromatting, add final qualifier 2021-10-20 11:58:04 +02:00
chimp1984
25bbad1f9c
Move OfferViewModelUtil into bisq.desktop.main.offer.bisq_v1 package 2021-10-20 11:58:04 +02:00
chimp1984
4a9db79068
Rename FeeUtil to OfferViewModelUtil 2021-10-20 11:58:04 +02:00
chimp1984
9777005ec7
Move OfferDataModel, OfferViewUtil into bisq.desktop.main.offer.bisq_v1 package 2021-10-20 11:58:04 +02:00
chimp1984
601956dc1f
Move MutableOffer view classes into bisq.desktop.main.offer.bisq_v1 package 2021-10-20 11:58:04 +02:00
chimp1984
0efa0bd7ca
Move takeoffer package inside bisq.desktop.main.offer.bisq_v1 package 2021-10-20 11:58:04 +02:00
chimp1984
932c0f856a
Move createoffer package inside bisq.desktop.main.offer.bisq_v1 package 2021-10-20 11:58:04 +02:00
chimp1984
2733af955a
Rename txID to txId 2021-10-20 11:58:04 +02:00
chimp1984
e1de502a9b
Rename ProcessModelServiceProvider to Provider 2021-10-20 11:58:04 +02:00
chimp1984
eacf446ab4
Move TradeDataValidation, DumpDelayedPayoutTx, TradeDataValidation, TradeUtil, TradeTxException to package bisq.core.trade.bisq_v1 2021-10-20 11:58:04 +02:00
chimp1984
956ffc902d
Move TransactionResultHandler, TradeResultHandler to package bisq.core.trade.bisq_v1 2021-10-20 11:58:04 +02:00
chimp1984
e80cdf8ac7
Move CleanupMailboxMessagesService, ClosedTradeUtil to package bisq.core.trade.bisq_v1 2021-10-20 11:58:04 +02:00
chimp1984
fe2871baa5
Rename CleanupMailboxMessages to CleanupMailboxMessagesService 2021-10-20 11:58:04 +02:00
chimp1984
fd6934c4e3
Move ClosedTradableManager, FailedTradesManager into bisq.core.trade.bisq_v1 package 2021-10-20 11:58:04 +02:00
chimp1984
cbf2822cdf
Move messages package into bisq.core.trade.protocol.bisq_v1 package
Move TradeMessage into bisq.core.trade.protocol package
2021-10-20 11:58:04 +02:00
chimp1984
97906e05db
Move TradingPeer into bisq.core.trade.protocol.bisq_v1 package 2021-10-20 11:58:04 +02:00
chimp1984
508296c2a3
Move tasks package into bisq.core.trade.protocol.bisq_v1 package 2021-10-20 11:58:04 +02:00
chimp1984
1b2e798faa
Move protocol classes to bisq.core.trade.protocol.bisq_v1 package 2021-10-20 11:58:04 +02:00
chimp1984
e3eea6350c
Make setup in FluentProtocol public 2021-10-20 11:58:04 +02:00
chimp1984
d7b2e99e43
Make FluentProtocol.Event public 2021-10-20 11:58:04 +02:00
chimp1984
3474a2b695
Move TradableList to bisq.core.trade.model package 2021-10-20 11:58:04 +02:00
chimp1984
58cfcffeb9
Move Tradable to bisq.core.trade.model package 2021-10-20 11:58:04 +02:00
chimp1984
fc3177c23f
Move MakerTrade and TakerTrade to bisq.core.trade.model package 2021-10-20 11:58:04 +02:00