Commit Graph

1993 Commits

Author SHA1 Message Date
Oscar Guindzberg
423ffa84e1
bitcoinj 0.15: Futures.addCallback() in guava 28 requires an executor. 2020-09-18 18:29:27 -03:00
chimp1984
b2a9262b93
Merge branch 'verify-donation-address-for-refund-agent' into dispute-agent-branch
# Conflicts:
#	core/src/main/java/bisq/core/support/dispute/DisputeManager.java
#	desktop/src/main/java/bisq/desktop/main/support/dispute/agent/DisputeAgentView.java
2020-09-17 19:09:26 -05:00
chimp1984
45cee2a272
Add check for disputes with duplicated trade ID or payout tx ids 2020-09-17 19:05:55 -05:00
chimp1984
3d4427cdfd
Add result of filter match. Add more filter data (tx ids, json) 2020-09-17 13:54:45 -05:00
chimp1984
48a14ee8a7
Merge branch 'master_upstream' into fix-trade-protocol-issues 2020-09-16 20:45:17 -05:00
chimp1984
1c0bef787a
Merge branch 'master_upstream' into verify-donation-address-for-refund-agent 2020-09-16 20:40:08 -05:00
chimp1984
b0b4334345
Merge branch 'master_upstream' into dispute-agents-sign-summary 2020-09-16 20:38:45 -05:00
Christoph Atteneder
81df879881
Merge branch 'master' of github.com:bisq-network/bisq into release/v1.3.9
# Conflicts:
#	build.gradle
#	desktop/package/linux/Dockerfile
#	desktop/package/linux/package.sh
#	desktop/package/linux/release.sh
#	desktop/package/macosx/create_app.sh
#	desktop/package/macosx/finalize.sh
#	desktop/package/macosx/insert_snapshot_version.sh
#	desktop/package/windows/package.bat
#	desktop/package/windows/release.bat
#	relay/src/main/resources/version.txt
2020-09-16 16:52:54 +02:00
Christoph Atteneder
95dd561d91
Revert to SNAPSHOT version 2020-09-16 16:49:48 +02:00
Christoph Atteneder
06ac7a7605
Bump version number for v1.3.9 2020-09-16 15:58:58 +02:00
chimp1984
601de7890d
Add try/catch at setSuggestedSecurityDeposit code 2020-09-16 15:56:13 +02:00
Christoph Atteneder
8cb4b5016c
Merge pull request #4529 from chimp1984/make-moving-average-code-more-safe
Make moving average code more safe
2020-09-16 15:51:14 +02:00
Christoph Atteneder
98b03937d8
Merge branch 'master' of github.com:bisq-network/bisq into release/v1.3.8
# Conflicts:
#	core/src/main/java/bisq/core/support/dispute/agent/MultipleHolderNameDetection.java
#	core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofService.java
2020-09-15 13:24:06 +02:00
Christoph Atteneder
5f957f0a64
Revert to SNAPSHOT version 2020-09-15 09:26:08 +02:00
chimp1984
71d57298b0
Add try/catch at setSuggestedSecurityDeposit code 2020-09-14 16:05:47 -05:00
chimp1984
352e661bac
update devmode price 2020-09-13 15:35:39 -05:00
cd2357
8d793e9a83
Show info popup if Bisq started under Qubes OS
Show popup informing the user about the OS-specific setup guide.
2020-09-13 13:23:12 +02:00
chimp1984
966b22a69d
Fix line breaks 2020-09-12 20:24:32 -05:00
chimp1984
de4fb17a19
Improve summary notes 2020-09-12 20:18:04 -05:00
chimp1984
0c46e7dd52
Add more data to summary msg 2020-09-12 16:19:42 -05:00
chimp1984
48066ae124
Remove setting of pubKey as it is not needed 2020-09-12 00:49:27 -05:00
chimp1984
559028e500
Remove unused var 2020-09-12 00:46:52 -05:00
chimp1984
7ac6e715d3
Dispute agent sign summary. Add tool for verification 2020-09-12 00:35:58 -05:00
chimp1984
05e1039423
Call validatePayoutTx only after trades are initialized 2020-09-11 20:28:23 -05:00
chimp1984
08fb596629
Call validatePayoutTx only after trades are initialized 2020-09-11 20:25:48 -05:00
chimp1984
677211badf
Allow close dispute for refund agent without payout 2020-09-11 20:24:31 -05:00
chimp1984
d82631f52c
Fix some issues found during testing
Refactorings
2020-09-11 19:41:08 -05:00
chimp1984
c48abbf575
Improve address validation code 2020-09-11 17:37:03 -05:00
chimp1984
2b0433870c
Dont allow opening refudn agent dispute if delayed payout tx is invalid. 2020-09-11 17:00:24 -05:00
chimp1984
4f1cbbd00e
Add check for refund agent if donation address is valid 2020-09-11 15:35:47 -05:00
chimp1984
6821c582e9
Add check for open offers and remove them if present at restore from seed 2020-09-09 14:12:03 -05:00
wiz
8cde8ce16a
Fix codacy complaining about missing space character 2020-09-09 15:16:38 +02:00
wiz
cc7e6559ff
Use lots of regex to add http or https for XMR explorer API endpoint
* If Tor *.onion hostname, use HTTP with Tor proxy
* If 127.0.0.1 or localhost, use HTTP without Tor proxy
* If LAN address or *.local FQDN, use HTTP without Tor proxy
* If any other FQDN hostname, use HTTPS with Tor proxy
2020-09-09 15:12:09 +02:00
chimp1984
54fdb5267f
Instead of renaming the AddressEntryList to a backup file we keep it
at restore from seed and create a backup copy.
I don't know what was the motivation of removing the original file
(probably the use case that the seeds are different and thus there
is no match of existing entries with the new addresses) as
that breaks the internal association of addresses with trades/offers and
the reserved balances display.

This should be tested well though with the related use cases
(diff. offer and trade states, wallet restore with same seed of with
foreign seed -> in that case we need to recreated the AddressEntryList
but that should be handled in the related domain)

- Add copyFile method
2020-09-08 19:14:38 -05:00
chimp1984
fa0224550c
Refactoring
- Add SharedPresentation class for methods in GUIUtil which are no
utility methods.
- Move restoreSeedWords to SharedPresentation
2020-09-08 19:00:16 -05:00
wiz
245027bff4
Fix codacy complaining about missing space character 2020-09-08 20:20:30 +09:00
wiz
a2c6f279a6
Merge remote-tracking branch 'bisq/master' into use-https-for-xmr-explorer-api 2020-09-08 20:19:20 +09:00
chimp1984
062c52dd55
Resolve merge conflict in Merge conflict in desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java 2020-09-08 11:57:51 +02:00
chimp1984
35cd7ac56b
Add check if trade have been dispute to protocol classes 2020-09-08 11:53:29 +02:00
chimp1984
cdf2698e29
Add comment to empty method 2020-09-08 11:53:20 +02:00
chimp1984
5ecbbf601f
Resolve merge conflict in Merge conflict in desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java 2020-09-08 11:53:04 +02:00
chimp1984
a7b5cdbd03
Resolve merge conflict in Merge conflict in desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java 2020-09-08 11:49:33 +02:00
m52go
67fc398f9b
Add note to SetXmrTxKeyWindow
To convey what it's about, and that it's optional.
2020-09-08 11:36:39 +02:00
m52go
2265d8f9e1
Add note to SetXmrTxKeyWindow
To convey what it's about, and that it's optional.
2020-09-07 11:36:32 -04:00
wiz
0869f9a016
Use lots of regex to add http or https for XMR explorer API endpoint
* If Tor *.onion hostname, use HTTP with Tor proxy
* If 127.0.0.1 or localhost, use HTTP without Tor proxy
* If LAN address or *.local FQDN, use HTTP without Tor proxy
* If any other FQDN hostname, use HTTPS with Tor proxy
2020-09-08 00:26:56 +09:00
Christoph Atteneder
b81e804bb1
Merge pull request #4491 from chimp1984/bugfix-xmr-tool
Bug fixes
2020-09-07 09:56:44 +02:00
chimp1984
e704d02801
Bug fixes
- useXmrTxProof was set at active but used in addContent which was
called before activate.
- Fix bug with using currencyName instead of currencyCode
- Refactor: Use methods in base class instead of repeated code
2020-09-07 09:56:13 +02:00
jmacxx
05cc29d854
Minor bug fixes for XMR tx proof feature
Fix missing CSS color code xmr-orange, was missing from dark mode.

Fix log message spelling/typo errors.

Removed 2 fixes from SellerStep3View so that chimp1984 can make
changes.

Remove address validator from XMR service address settings because
it does not support https prefix.
2020-09-07 09:55:05 +02:00
Christoph Atteneder
38cff29d97
Merge pull request #4490 from jmacxx/origin/add-xmr-tx-key-service-fix
Minor bug fixes for XMR tx proof feature
2020-09-07 09:54:38 +02:00
chimp1984
b1b3136969
Improve handling of nullable assetTxProof fields 2020-09-07 09:39:11 +02:00
chimp1984
9eb7900d51
Fix handling of username/accountId
We apply userName to accountId if it is not set (e.g. new account
created with new version). We do not use that for display or for
account signing in case both fields are the same but we need to use
accountId in case the user trades with a not updated user who expects
accountId as only field.
I improved a bit the display of account data in the trade screens.
In case accountId was set with the phone number (updated account with
phone nr used for account signing) we show both userName and phone nr.

- Show phone number if accountId was set by old account. Otherwise
show only userName
- For old users they will see the user name as phone number displayed
if they trade with new users if the new user has created a new account.
If he has updated an existing account the accountId (phone number) is
used, so it displays the phone number.
- At step 2 changed display of own account data to show account name
- Add 'Recipients' prefix to account data of peer at step 2

Step 3: Buyers account data can be
- Phone number if peer is using old version
- User name if peer is updated user with new account (we apply userName
to accountId)
- Phone number if user is on old version and peer is updated user with
updated account (we keep accountId as phone number)
- User name/Phone number if peer is updated user with updated account
2020-09-07 09:39:02 +02:00
chimp1984
a4f6d2af2e
Add check if xmrTxProof is used to avoid null pointer exception 2020-09-07 09:38:44 +02:00
chimp1984
e080b06736
Remove unused method 2020-09-07 09:34:57 +02:00
chimp1984
9cc614a790
Add alert icon to list entries
Support agent can mark a suspicious dispute as resolved so it does not
show the alert icon anymore. In the full report a [ACK] got added to
that dispute.
2020-09-07 09:34:47 +02:00
chimp1984
cc2d258915
Scan disputes for accounts where same user used diff. real names.
Might be fraudulent traders.
2020-09-07 09:34:31 +02:00
chimp1984
38d33ceab3
Remove offer from takers offerbook after take offer is completed.
We do not wait until the offer got removed by a network remove message but remove it
directly from the offer book. The broadcast gets now bundled and has 2 sec. delay so the
removal from the network is a bit slower as it has been before. To avoid that the taker gets
confused to see the same offer still in the offerbook we remove it manually. This removal has
only local effect. Other trader might see the offer for a few seconds
still (but cannot take it).
2020-09-07 09:30:44 +02:00
jmacxx
f49aa0f674
Minor bug fixes for XMR tx proof feature
Fix missing CSS color code xmr-orange, was missing from dark mode.

Fix log message spelling/typo errors.

Removed 2 fixes from SellerStep3View so that chimp1984 can make
changes.

Remove address validator from XMR service address settings because
it does not support https prefix.
2020-09-07 00:06:50 -05:00
chimp1984
c40bcfedfc
Fix merge mistake 2020-09-06 23:51:24 -05:00
chimp1984
f3c96bbb62
Merge branch 'master_upstream' into deactive-confirm-buttons-once-mediation-started
# Conflicts:
#	desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java
2020-09-06 23:13:43 -05:00
chimp1984
087dde0e9d
Add check if trade have been dispute to protocol classes 2020-09-06 23:09:45 -05:00
chimp1984
1419f05152
Add comment to empty method 2020-09-06 23:06:27 -05:00
chimp1984
f3a3b6e9a8
Bug fixes
- useXmrTxProof was set at active but used in addContent which was
called before activate.
- Fix bug with using currencyName instead of currencyCode
- Refactor: Use methods in base class instead of repeated code
2020-09-06 21:37:25 -05:00
sqrrm
7389bf898c
Merge pull request #4480 from chimp1984/add-support-for-monero-address-prefix
Remove 'monero:' prefix when adding a XMR account
2020-09-06 23:24:40 +02:00
sqrrm
236e9e6d4b
Merge pull request #4487 from chimp1984/remove-offer-from-offer-list-for-taker
Remove offer from takers offerbook after take offer is completed.
2020-09-06 23:23:19 +02:00
sqrrm
c188284d0b
Merge pull request #4484 from chimp1984/detect-accounts-with-diff-real-names
Scan disputes for accounts where same user used diff. real names.
2020-09-06 23:17:32 +02:00
chimp1984
ec31ecbf43
Improve handling of nullable assetTxProof fields 2020-09-06 12:05:39 -05:00
chimp1984
7fff461669
Remove offer from takers offerbook after take offer is completed.
We do not wait until the offer got removed by a network remove message but remove it
directly from the offer book. The broadcast gets now bundled and has 2 sec. delay so the
removal from the network is a bit slower as it has been before. To avoid that the taker gets
confused to see the same offer still in the offerbook we remove it manually. This removal has
only local effect. Other trader might see the offer for a few seconds
still (but cannot take it).
2020-09-05 19:45:00 -05:00
chimp1984
9908bcf33a
Rename method 2020-09-05 19:19:49 -05:00
chimp1984
55e55d4f19
Deactivate confirm payment or payment received buttons once a dispute
is opened.
2020-09-05 19:18:33 -05:00
chimp1984
959009d6d6
Remove unused method 2020-09-05 17:54:32 -05:00
chimp1984
4a4bd7cd12
Add alert icon to list entries
Support agent can mark a suspicious dispute as resolved so it does not
show the alert icon anymore. In the full report a [ACK] got added to
that dispute.
2020-09-05 17:39:22 -05:00
chimp1984
7c78e98192
Scan disputes for accounts where same user used diff. real names.
Might be fraudulent traders.
2020-09-05 01:40:35 -05:00
chimp1984
97d3383dbb
Fix handling of username/accountId
We apply userName to accountId if it is not set (e.g. new account
created with new version). We do not use that for display or for
account signing in case both fields are the same but we need to use
accountId in case the user trades with a not updated user who expects
accountId as only field.
I improved a bit the display of account data in the trade screens.
In case accountId was set with the phone number (updated account with
phone nr used for account signing) we show both userName and phone nr.

- Show phone number if accountId was set by old account. Otherwise
show only userName
- For old users they will see the user name as phone number displayed
if they trade with new users if the new user has created a new account.
If he has updated an existing account the accountId (phone number) is
used, so it displays the phone number.
- At step 2 changed display of own account data to show account name
- Add 'Recipients' prefix to account data of peer at step 2

Step 3: Buyers account data can be
- Phone number if peer is using old version
- User name if peer is updated user with new account (we apply userName
to accountId)
- Phone number if user is on old version and peer is updated user with
updated account (we keep accountId as phone number)
- User name/Phone number if peer is updated user with updated account
2020-09-04 18:30:08 -05:00
chimp1984
c87899c662
Add check if xmrTxProof is used to avoid null pointer exception 2020-09-04 14:51:34 -05:00
chimp1984
9a57525a46
Remove 'monero:' prefix when adding a XMR account
Some wallets copy the address with a 'monero:' prefix. If user pastes
that directly into the form he gets a validation error. We remove now
that prefix so the input is automatically adjusted to the address only.
2020-09-04 14:33:30 -05:00
chimp1984
3e933c31a5
Fix bug with all mobile notifications for disputes are sent at startup. 2020-09-04 10:21:29 +02:00
Christoph Atteneder
57bed13cf8
Merge pull request #4475 from chimp1984/fix-mobile-notification-bug
Fix bug with all mobile notifications for disputes are sent at startup.
2020-09-04 10:20:43 +02:00
chimp1984
2400014db6
Change hex color code to lower case 2020-09-04 10:18:20 +02:00
chimp1984
63444b1f77
Add null check. Improve text 2020-09-04 10:18:07 +02:00
chimp1984
044d23f933
Adjust auto-conf css for badge
- make it xmr orange
- make with dynamic with 10 px padding left/right
- fix 1 px vertical offset
2020-09-04 10:18:00 +02:00
chimp1984
fa9893cdd4
Show tx confidence indicator for XMR blocks. Show info icon 2020-09-04 10:17:53 +02:00
chimp1984
33c8728fde
Add monero orange color code for tx confidence indicator 2020-09-04 10:17:45 +02:00
chimp1984
e01ebdf6e8
Change min required confirmations from 0 to 1.
If users accept visible in mempool only txs its their own risk and they
can manually confirm anyway. We should not support 0 conf txs.
2020-09-04 10:17:39 +02:00
chimp1984
11827a42c6
Set default services based on localhost check not on devMode check 2020-09-04 10:17:31 +02:00
chimp1984
05296af47e
Add check if dispute is open
If a mediation or arbitration dispute has been opened we do not use the
auto-confirm feature.
2020-09-04 10:16:49 +02:00
chimp1984
2da08a5620
Refactor dependency structure to enable adding dispute managers
If we would add DisputeManager to previous structure it would cause a
circular dependency error from guice. We change dependency structure so
that TradeManager does not know XmrTxProofService but XmrTxProofService
gets an instance of TradeManager. It makes code cleaner in total as well
as responsibility is better defined.

Next commit will contain the DisputeManager addition.
2020-09-04 10:16:37 +02:00
Christoph Atteneder
d33b40128e
Merge pull request #4474 from chimp1984/stop-xmr-proof-service-at-dispute
Stop xmr proof service at dispute
2020-09-04 10:16:00 +02:00
chimp1984
688bef885a
Rmove short cut info for removed key handlers 2020-09-04 10:14:50 +02:00
Christoph Atteneder
2c39ded714
Merge pull request #4472 from chimp1984/update-about-view
Remove short cut info for removed key handlers
2020-09-04 10:12:53 +02:00
Christoph Atteneder
766d04588f
Merge pull request #4471 from chimp1984/add-setup-info-to-app-header
Add flags to header to signal which dev setup is used
2020-09-04 10:12:14 +02:00
chimp1984
6d37bedbbe
Fix bug with all mobile notifications for disputes are sent at startup. 2020-09-03 23:50:28 -05:00
chimp1984
a7e10155b1
Change hex color code to lower case 2020-09-03 21:22:54 -05:00
chimp1984
1016c73b35
Add null check. Improve text 2020-09-03 21:14:06 -05:00
chimp1984
6ab679c479
Adjust auto-conf css for badge
- make it xmr orange
- make with dynamic with 10 px padding left/right
- fix 1 px vertical offset
2020-09-03 21:02:16 -05:00
chimp1984
4e27b93acf
Show tx confidence indicator for XMR blocks. Show info icon 2020-09-03 20:51:19 -05:00
chimp1984
7cc021d7d6
Add monero orange color code for tx confidence indicator 2020-09-03 20:50:46 -05:00
chimp1984
023eb97f04
Change min required confirmations from 0 to 1.
If users accept visible in mempool only txs its their own risk and they
can manually confirm anyway. We should not support 0 conf txs.
2020-09-03 20:33:49 -05:00
chimp1984
b80082005c
Set default services based on localhost check not on devMode check 2020-09-03 19:15:42 -05:00
chimp1984
e74edc254a
Add check if dispute is open
If a mediation or arbitration dispute has been opened we do not use the
auto-confirm feature.
2020-09-03 15:38:47 -05:00
chimp1984
0434ba52b6
Refactor dependency structure to enable adding dispute managers
If we would add DisputeManager to previous structure it would cause a
circular dependency error from guice. We change dependency structure so
that TradeManager does not know XmrTxProofService but XmrTxProofService
gets an instance of TradeManager. It makes code cleaner in total as well
as responsibility is better defined.

Next commit will contain the DisputeManager addition.
2020-09-03 14:36:28 -05:00