Commit graph

5309 commits

Author SHA1 Message Date
Christoph Atteneder
588623eb2d
Merge pull request #4885 from chimp1984/fix-bug-with-reapplying-past-trade-state
Avoid that buyer switches back to trade step 2 at startup after payment confirmed
2020-12-04 16:41:41 +01:00
chimp1984
c04b95b996
Remove checkNotNull for takerFeeTxId 2020-12-04 10:10:57 -05:00
sqrrm
57681245ff
Merge pull request #4889 from chimp1984/avoid-case-of-multi-trades-with-same-offer-id
Avoid case of multi trades with same offer
2020-12-04 00:48:45 +01:00
chimp1984
8f99ca0b63
Add uid to trade to make sure that look up for process model cannot
fail in case of multiple trades with the same offer id.
Use uid instead of the weaker offerId as key for the tradeProtocolByTradeId map
2020-12-03 14:43:35 -05:00
chimp1984
2d5fc33ba4
Move MakerRemovesOpenOffer to first task to avoid that if take offer
fails early that we get another trade with same id at maker in case another use takes the offer afterwards.
2020-12-03 14:19:24 -05:00
Christoph Atteneder
91a1a92ac4
Merge pull request #4877 from Jakub-CZ/fix_warning_message
Fix warning about rejected transaction
2020-12-03 19:28:06 +01:00
Christoph Atteneder
baa038aa39
Merge pull request #4886 from jmacxx/hotfix/v1.5.1
add logging of Tx hex
2020-12-03 19:18:50 +01:00
chimp1984
1fdc43e4d0
Increase timeout for trade protocol task runners from 30 to 60 sec 2020-12-03 11:53:35 -05:00
jmacxx
fa80553890
add logging of Tx hex 2020-12-03 10:22:07 -06:00
chimp1984
f843b5477b
Fixes https://github.com/bisq-network/bisq/issues/4864
When seller if offline we resend the CounterCurrencyTransferStartedMessage at startup.
That caused the trade state set to BUYER_SENT_FIAT_PAYMENT_INITIATED_MSG and then after
the msg was stored in mailbox to BUYER_STORED_IN_MAILBOX_FIAT_PAYMENT_INITIATED_MSG.
Those 2 msg trigger diff. UI states which led to the UI glitch that the UI moved to
step 2 and then to step 3 which was correct but confusing to the user.

Now we only apply BUYER_SENT_FIAT_PAYMENT_INITIATED_MSG is trade state ordinal is
smaller avoiding that UI glitch.
2020-12-03 11:19:18 -05:00
ghubstan
74261b1749
Refactor: move getDust(Transaction transaction)
The api is going to need this method, so it was moved from desktop to core.

- Moved the method from WithdrawalView to WalletService.

- Removed an unused initilizer in WithdrawalView.
2020-12-03 12:16:04 -03:00
chimp1984
29d757b741
- revent that a wrong tx is set as deposit tx
We check if the txIds of the inputs matches our maker fee tx and taker fee tx and if the depositTxAddress we
use for the confidence lookup is use as an output address.
This prevents that past txs which have the our depositTxAddress as input or output (deposit or payout txs) could
be interpreted as our deposit tx. This happened because if a bug which caused re-use of the Multisig address
entries and if both traders use the same key for multiple trades the depositTxAddress would be the same.
We fix that bug as well but we also need to avoid that past already used addresses might be taken again
(the Multisig flag got reverted to available in the address entry).

- Add check to swapTradeEntryToAvailableEntry to not swap MULTI_SIG entries.

- Remove swap for MULTI_SIG entries at resetAddressEntriesForPendingTrade

- Add check to swapToAvailable to not swap MULTI_SIG entries.

- Remove swaps for MULTI_SIG entries

- Add setCoinLockedInMultiSigAddressEntry method

- Make coinLockedInMultiSig final and remove setter but use it in constructor.

- Rename getCoinLockedInMultiSig to getCoinLockedInMultiSigAsCoin
We use an immutable list when operating on AddressEntry so changes on the
object would not be reflected in the list.
The only mutable field (beside non critical cache fields) is the keyPair.
Might be good to refactor that as well at some point.

- Add setCoinLockedInMultiSigAddressEntrymethods

- Apply API changes:
-- resetCoinLockedInMultiSigAddressEntry
-- setCoinLockedInMultiSigAddressEntry
-- renamed methods
2020-12-03 10:01:01 -05:00
chimp1984
a39f2e8fcb
Apply project format rules (no code change) 2020-12-03 09:54:43 -05:00
sqrrm
9b774d1515
Merge pull request #4858 from ghubstan/21-fee-rate-apis
Add tx fee rate api methods:  gettxfeerate, settxfeerate, unsettxfeerate
2020-12-03 10:41:54 +01:00
Jakub Loucký
b8bdbbc551
Fix warning for rejected transaction 2020-12-02 21:16:41 +01:00
ghubstan
7f636e45f9
Prevent attempt to send amount of BSQ < dust 2020-12-02 15:21:20 -03:00
ghubstan
2efd094f68
Remove method only used in class' toString 2020-12-02 15:01:34 -03:00
ghubstan
65df9e1503
Change sendbsq's amount parameter type to String 2020-12-02 14:52:05 -03:00
ghubstan
9b4bdfc5ad
Make salt an editable payment acct json form field
Users need to be able to preserve their acct age when moving a
payment account to a new client.

Also adjusted affected tests, and did some minor refactoring
of the custom gson type adaptor.
2020-12-02 13:52:39 -03:00
ghubstan
987d89319e
Use ListenableFuture and callback when requesting tx fee
This change fixes the blocking problem in the fee rate request api.
Also redefined the TxFeeRateInfo.

- Redefined grpc.proto message TxFeeRateInfo, added
  lastFeeServiceRequestTs field. (CLI user may want to know
  TS of last fee request.)

- Adjusted TxFeeRateInfo proto wrapper.

- Adjusted CurrencyFormat and BtcTxFeeRateTest to new TxFeeRateInfo.

- Added @Getter annotation to FeeService.  (CLI user may want to know
  TS of last fee request).

- Pass resultHandler from GrpcWalletsService through CoreApi, to
  CoreWalletsService's tx fee rate api methods.
2020-12-01 21:10:47 -03:00
ghubstan
faf030fbc5
Add useCustomTxFeeRate field to TxFeeRateInfo proto wrapper
This is set from the core preferences.isUseCustomWithdrawalTxFee(),
and simplifies fee changing logic in the API.
2020-12-01 17:14:08 -03:00
ghubstan
62a2aa8543
Don't be so polite 2020-12-01 15:55:53 -03:00
ghubstan
45cfb95245
Remove many log.isDebugEnabled() checks
These do not buy enough in the way of performance, at the cost of
so many additional lines.  Buy these checks should be done for
debug log statements that have expensive parameters.
2020-12-01 15:48:11 -03:00
Christoph Atteneder
740071d54c
Merge pull request #4859 from oscarguindzberg/fixEmergencyPayout
Fix emergency payout
2020-12-01 13:58:01 +01:00
Christoph Atteneder
49d0e75eac
Merge pull request #4852 from chimp1984/stop-rpc-service-at-shutdown
Shut down rpc service at app shut down routine
2020-11-30 15:29:36 +01:00
Christoph Atteneder
c7b92c36c9
Merge pull request #4850 from chimp1984/improve-stratup-info-display
Improve startup info display
2020-11-27 16:08:07 +01:00
Steven Barclay
d59b425c94
Add missing output value check to takerSignsDepositTx
Make sure the taker checks the value of the 2-of-2 multisig output of
the deposit tx created by the maker, before signing it. This avoids a
potential security hole, where the maker attempts to steal most of the
deposit by using the wrong output value and adding an extra 'change'
output to himself.

Note that there's no actual vulnerability at present, as the output
value is indirectly checked via the validation of the delayed payout tx.
In particular, the extra checks added in 345426f as part of #4789 (Fix
remaining blackmail vulnerabilities) place a lower bound on the delayed
payout tx input value and with it the deposit tx output value. However,
explicitly checking the amount is more robust.
2020-11-26 23:39:51 +00:00
Oscar Guindzberg
f2acf42edc
Set payoutTx as parent tx 2020-11-26 20:30:23 -03:00
Oscar Guindzberg
0b834a94f8
Use empty byte array for script sig 2020-11-26 20:30:00 -03:00
Oscar Guindzberg
91a2def86e
Use AddressEntry.getAddress() 2020-11-26 20:28:50 -03:00
ghubstan
0b0f9f1120
Add gettxfeerate, settxfeerate, unsettxfeerate implementations 2020-11-26 18:36:15 -03:00
ghubstan
abe7160608
Add TxFeeRateInfo proto wrapper 2020-11-26 18:35:24 -03:00
ghubstan
5a06e4ea3e
Adjust to changed CoinUtil 2020-11-26 17:19:47 -03:00
ghubstan
8f13b85e19
Merge branch 'master' into 20-pr-change-requests-A 2020-11-26 17:19:00 -03:00
ghubstan
15592887dd
Implement fromProto
This is marked unused, but it will be in future tests.
2020-11-26 15:06:14 -03:00
ghubstan
9d863e5a40
Remove deprecated method long getAvailableBalance 2020-11-26 14:25:24 -03:00
chimp1984
1b68b02857
Shut down rpc service at app shut down routine 2020-11-26 11:31:05 -05:00
chimp1984
673a4d8718
Improve block % and fee display 2020-11-26 11:19:01 -05:00
chimp1984
3ded086808
Add stateStartingOrRunning check (if we close before state
is ready we would get an exception in walletConfig.chain())
2020-11-26 11:18:38 -05:00
chimp1984
e1180d9662
Reformat, org imports (no code change) 2020-11-26 11:16:10 -05:00
Christoph Atteneder
99d5652aef
Merge pull request #4841 from jmacxx/fix_issue_4833
Prompt for confirmation before initiating SPV resync
2020-11-26 16:13:00 +01:00
Christoph Atteneder
4e4711a6f5
Merge pull request #4845 from jmacxx/fix_issue_4641
Show price deviation in portfolio open offers and history view
2020-11-26 15:33:50 +01:00
Christoph Atteneder
11b0a466ce
Merge branch 'master' of github.com:bisq-network/bisq into release/v1.5.0
# Conflicts:
#	core/src/main/java/bisq/core/provider/fee/FeeService.java
#	core/src/main/resources/i18n/displayStrings.properties
#	seednode/src/main/java/bisq/seednode/SeedNodeMain.java
2020-11-25 14:05:37 +01:00
jmacxx
2e52b5472f
Show price deviation in portfolio open offers and closed trades
Fixes #4641
2020-11-24 23:03:53 -06:00
sqrrm
3a5fba8196
Merge pull request #4838 from ripcurlx/update-resources-for-v1.5.0
Update resources for v1.5.0
2020-11-24 10:27:53 +01:00
Christoph Atteneder
788e0259d8
Merge branch 'release/v1.5.0' of github.com:bisq-network/bisq into add-delay-to-exit
# Conflicts:
#	core/src/main/java/bisq/core/app/BisqExecutable.java
2020-11-24 09:23:16 +01:00
Christoph Atteneder
94453cf27c
Merge pull request #4829 from chimp1984/prevent-downgrade
Check if user has downgraded to an older version
2020-11-24 09:15:47 +01:00
chimp1984
6b3a002b1c
Add 1 sec delay before calling exit
To persist in the very last moment before exit might cause problems on some OS.
We do not have confirmed that this might be an issue but to be on the safe side
we add a 1 sec. delay between persistence completed and exit.
2020-11-23 18:22:44 -05:00
Oscar Guindzberg
e667f8fbad
Upgrade bitcoinj to commit 60b4f2f 2020-11-23 14:39:26 -03:00
jmacxx
395af3c4c8
Prompt for confirmation before initiating SPV resync
Allows user to back off if invoked by accident.
2020-11-23 11:37:31 -06:00