Commit graph

3829 commits

Author SHA1 Message Date
ghubstan
fb4e00fb6b
Fix OfferBookService bug causing extra check in OfferBook.onRemoved
Hash of protectedStorageEntry (should be offerPayload) was sometimes
resulting in incorrect hash being sent to OfferBook listener methods
onAdded(offer,  hashOfPayload,  sequenceNumber), and
onRemoved(offer,  hashOfPayload,  sequenceNumber).
Hash of OfferPayload is correctly passed to listener with this change.

Sending the correct hash allows removal of a dubious code block that
removed a book view list item when hash compare failed, and no matching
offer existed in the OfferBookService.
See https://github.com/bisq-network/bisq/pull/5659#discussion_r689634240
2021-08-18 14:27:20 -03:00
ghubstan
859a5ab4e4
Merge branch '07-show-new-offer-with-pending-status' into 08-handle-extradata-in-editoffer 2021-08-16 14:31:03 -03:00
ghubstan
59c0313277
Fix long method name
Resolves https://github.com/bisq-network/bisq/pull/5659#discussion_r687839333
2021-08-16 14:23:28 -03:00
ghubstan
d709338d63
Refactor 2 predicates as single predicate
Resolves https://github.com/bisq-network/bisq/pull/5659#discussion_r689631147
2021-08-16 14:17:28 -03:00
ghubstan
1c096d0e3a
Merge branch 'master' into 08-handle-extradata-in-editoffer
Resolve file conflicts resulting from merging PRs
    https://github.com/bisq-network/bisq/pull/5577
    https://github.com/bisq-network/bisq/pull/5651
2021-08-16 12:36:49 -03:00
sqrrm
15093720b9
Merge pull request #5625 from ripcurlx/unsigned-account-tooltip
Tooltip for unsigned accounts needs to provide more information
2021-08-16 12:15:43 +02:00
sqrrm
6881c3e0f7
Merge pull request #5640 from ripcurlx/update-public-key
Update expired public key
2021-08-16 11:03:12 +02:00
Christoph Atteneder
b9038fcf3a
Merge pull request #5651 from jmacxx/fix_edit_offer_extra_data
Fix issue with extraData field when editing offer
2021-08-16 10:17:51 +02:00
ghubstan
6a4aceda7b
Handle API's edit+disable offer use case in UI.
This change is a refactoring for handling the removal of a peer UI's offer
item when it is deactivated and edited in the same CLI `editoffer` command.

On the API side, an `editoffer --price=N --enable=false` command results
in the edited offer not being re-published.  On a UI peer's side, the edited
offer is not added to the peer's storage, and the peer's onRemoved(offer)
listener event does not find a storage entry with matching payload-hash.

This fix assumes an offer that is not in the local store should be removed
from the UI's view list -- when the onRemoved method's hashOfPayload does
not match the UI's view list item's hashOfPayload.
2021-08-13 14:53:17 -03:00
Christoph Atteneder
9db2c18f2c
Merge pull request #5649 from sqrrm/refund-double-payout-fix
Avoid creating more than one refund payout
2021-08-12 20:43:22 +02:00
ghubstan
713867b990
Remove comment (question answered) 2021-08-11 11:29:17 -03:00
ghubstan
1a7ad0be0d
Merge branch 'master' into 06-safe-offerbook-add-remove-events 2021-08-07 14:27:11 -03:00
ghubstan
d3508d2037
Revert logback debug config changes
(Accidentally included in last commit.)
2021-08-07 14:11:47 -03:00
ghubstan
6e2400fb0f
Ensure UI OfferBook items are correctly added and removed
Using the API's CLI to edit offers can sometimes result in add/remove messages
being received on peers in the same batch of envolopes, and these messages
are sometimes passed to the UI in (1) add, (2) remove order.  This can result in
a newly edited offer being removed immediately after being added to the OfferBook
list. This change uses storage entry sequence number and storage entry payload
hash comparisons to avoid the problem.

- OfferBookListItem Added new constructor taking P2PDataStorage.ByteArray hashOfPayload,
  and int sequenceNumber params.  Added a new toString() method.

- OfferBook Added new checks on OfferBookListItem hashOfPayload and sequenceNumber while
  determining if offer candidates should be added or removed from the UI's OfferBook List.
  See OfferBook contructor's implementation of OfferBookChangedListener#onAdded and
  OfferBookChangedListener#onRemoved.  Added many comments explaining the add/remove rules,
  and plenty of debug statements to help trace the add/remove event process.

- OfferBookService#OfferBookChangedListener Added new P2PDataStorage.ByteArray hashOfPayload,
  and int sequenceNumber params to listener's onAdded and onRemoved method signatures.
  Added these two new paramater values to listener.onAdded and listener.onRemoved calls.

- TakeOfferDataModel Replaced unused, old tradeManager param in offerBook.removeOffer()
  with (null) P2PDataStorage.ByteArray hashOfPayload, and (-1) int sequenceNumber params.
  OfferBook will remove the candidate offer as before.

- MarketAlerts Adjusted onAdded() & onRemoved listener method signatures, even though
  new P2PDataStorage.ByteArray hashOfPayload, int sequenceNumber params are not used
  by the implementations.
2021-08-07 14:06:38 -03:00
jmacxx
8d9a03bc39
fix issue with extraData field when editing offer 2021-08-02 22:22:29 -05:00
sqrrm
8c666dba92
Avoid creating more than one refund payout
Double clicking the close ticketbutton creates two payout transactions.
This fix makes sure only one payout transaction is created for the
dispute.

Restarting the client allows for creating another refund transaction
for the dispute if needed.
2021-08-02 10:17:17 +02:00
ghubstan
b8379e2003
Merge branch 'master' into 05-update-api-beta-test-guide 2021-07-30 11:53:34 -03:00
jmacxx
3f511f3068
prevent negative suggested mining fee when burning BSQ for fees 2021-07-29 21:59:36 -05:00
Christoph Atteneder
4ef8242719
Update expired public key 2021-07-27 13:43:51 +02:00
Christoph Atteneder
4c451ebc11
Revert to SNAPSHOT version 2021-07-23 14:02:37 +02:00
jmacxx
5cc3f8680e
keep chatview listener open until ack, mailbox, or error 2021-07-23 08:05:56 +02:00
Christoph Atteneder
0cd20d6cc5
Increase MaxRam setting to 8g 2021-07-22 15:01:11 +02:00
Christoph Atteneder
548ecaa595
Update Java options as described in #5609 and #5550 2021-07-22 15:01:10 +02:00
Christoph Atteneder
4ae8ecaecb
Improve formatting and simplify code 2021-07-19 13:55:12 +02:00
BtcContributor
e357528ba5
Remove unused import 2021-07-19 13:55:11 +02:00
BtcContributor
351d26555e
Remove payment account info popup 2021-07-19 13:55:11 +02:00
BtcContributor
870448f5fa
Add review feedbacks from KaiWitt 2021-07-19 13:55:11 +02:00
BtcContributor
41e4e91044
Fix Codacy issues 2021-07-19 13:55:10 +02:00
BtcContributor
50b6f42525
Add Capitual payment method. Waiting for final Info text to add. 2021-07-19 13:55:10 +02:00
jmacxx
0523e44fa5
add dontShowAgain option to DAO resync popup 2021-07-19 09:29:04 +02:00
Christoph Atteneder
12b0a5bf80
Bump version number for v1.7.2 2021-07-16 20:37:10 +02:00
Christoph Atteneder
ef5ff1249b
Merge branch 'master' of github.com:bisq-network/bisq into release/v1.7.1
# Conflicts:
#	build.gradle
#	desktop/package/linux/Dockerfile
#	desktop/package/macosx/finalize.sh
#	desktop/package/macosx/insert_snapshot_version.sh
#	relay/src/main/resources/version.txt
2021-07-16 13:02:18 +02:00
Christoph Atteneder
a924e1058d
Revert to SNAPSHOT version 2021-07-16 12:58:55 +02:00
Christoph Atteneder
ee989a41fd
Adapt style to match @pedromvp design as close as possible 2021-07-16 11:35:52 +02:00
Christoph Atteneder
fdfcd06eab
Prevent to open wrong info popup when it is your own offer 2021-07-16 09:23:45 +02:00
Christoph Atteneder
31b08618fd
Update PopOver component 2021-07-16 09:23:12 +02:00
xyzmaker123
5458dbe90e
Update class name 2021-07-16 09:19:51 +02:00
xyzmaker123
54b93a4411
Update desktop/src/main/java/bisq/desktop/components/AccountStatusTooltipLabel.java
Co-authored-by: Christoph Atteneder <christoph.atteneder@gmail.com>
2021-07-16 09:19:50 +02:00
xyzmaker123
6bcd22bd55
Update desktop/src/main/java/bisq/desktop/components/AccountStatusTooltipLabel.java
Co-authored-by: Christoph Atteneder <christoph.atteneder@gmail.com>
2021-07-16 09:19:50 +02:00
xyzmaker123
b6e8f66553
Tooltip for unsigned accounts needs to provide more information 2021-07-16 09:19:49 +02:00
sqrrm
30b100dfc0
Merge pull request #5621 from ripcurlx/add-payment-account-payload-safeguards
Add payment account payload safeguards
2021-07-13 10:24:49 +02:00
Christoph Atteneder
325c1a76f6
Merge pull request #5615 from jmacxx/import_account_backups
Enable lost payment accounts to be imported from backups
2021-07-13 09:20:52 +02:00
Christoph Atteneder
ff49ec17e8
Add null handling for PaymentAccountPayload in multiple views 2021-07-12 14:56:35 +02:00
Christoph Atteneder
a01fb9e7f7
Only apply filter result for PaymentAccountPayloads if it is available 2021-07-12 14:56:34 +02:00
Christoph Atteneder
dfb97ca05f
Bump version number for v1.7.1 2021-07-12 14:52:38 +02:00
Christoph Atteneder
e858027e69
Add null handling for PaymentAccountPayload in multiple views 2021-07-12 11:39:12 +02:00
Christoph Atteneder
544aa7c2a0
Only apply filter result for PaymentAccountPayloads if it is available 2021-07-12 10:25:20 +02:00
jmacxx
ce0a2591a6
Enable lost payment accounts to be imported from backups 2021-07-10 21:41:48 -05:00
Christoph Atteneder
f4ca766a97
Merge pull request #5602 from jmacxx/fix_withdrawal_fee_bug
Fix custom withdrawal fee bug
2021-07-06 16:04:22 +02:00
Christoph Atteneder
b9db2426ba
Revert to SNAPSHOT version 2021-07-06 11:13:35 +02:00