chimp1984
|
07354191a6
|
Remove handling of BundleOfEnvelopes in send method.
It is basically never executed and throttling would avoid it as well.
Cleanups, Rename
|
2021-10-21 10:12:28 +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 |
|
chimp1984
|
0148a36566
|
Extract to method in TradeUtil
|
2021-10-21 01:19:41 +02:00 |
|
chimp1984
|
07883e9b8b
|
Rename trade.getPhase to getTradePhase
Rename getTakeOfferDate to getDate
|
2021-10-21 01:18:33 +02:00 |
|
chimp1984
|
7211f892e1
|
Add exclude fields to EqualsAndHashCode
Add constructor (will be used for bsq swaps)
Not 100% sure if that is valid.
|
2021-10-21 01:17:20 +02:00 |
|
chimp1984
|
4cb074694d
|
Extract methods, cleanups. Rename methods and vars
|
2021-10-21 01:15:46 +02:00 |
|
chimp1984
|
2440d7234d
|
Extract methods, Cleanups
|
2021-10-21 01:14:39 +02:00 |
|
chimp1984
|
12fff5403d
|
Cleanup
|
2021-10-21 01:13:49 +02:00 |
|
chimp1984
|
544dd895fc
|
Rename trade.getState to getTradeState
|
2021-10-20 23:59:29 +02:00 |
|
chimp1984
|
5b0e9ab92f
|
Rename trade.getPhase to getTradePhase
|
2021-10-20 23:57:55 +02:00 |
|
chimp1984
|
e061d6a476
|
Replace Value with Getter
|
2021-10-20 23:54:50 +02:00 |
|
jmacxx
|
1dffec00f2
|
Add option to not repeat popup message of locked up funds from failed trade
|
2021-10-20 16:54:14 -05:00 |
|
chimp1984
|
9d106468b0
|
Move getRandomOfferId method to OfferUtil
Add more methods to OfferUtil
Cleanups
|
2021-10-20 23:54:12 +02:00 |
|
chimp1984
|
a3b3d561ec
|
Simplify
|
2021-10-20 23:53:01 +02:00 |
|
chimp1984
|
d976f11e09
|
Add methods
|
2021-10-20 23:52:27 +02:00 |
|
chimp1984
|
8d2579866a
|
Replace Value annotation with Getter and EqualsAndHashCode
|
2021-10-20 23:51:16 +02:00 |
|
chimp1984
|
9e4be1367a
|
Change log level
|
2021-10-20 23:50:52 +02:00 |
|
chimp1984
|
02d7dfdaef
|
Only print stack trace if dev mode
|
2021-10-20 23:49:53 +02:00 |
|
chimp1984
|
d7f1b00221
|
Rename processModel.getTradingPeer to getTradePeer
|
2021-10-20 22:58:20 +02:00 |
|
chimp1984
|
c15fc0c0a7
|
Add comment, cleanups
|
2021-10-20 22:53:27 +02:00 |
|
chimp1984
|
82c1be1d97
|
Change log level
|
2021-10-20 22:51:44 +02:00 |
|
chimp1984
|
cfc404b4c0
|
Rename signTx to signTxAndVerifyNoDustOutputs (no code change)
|
2021-10-20 16:29:00 +02:00 |
|
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 |
|