Commit graph

4531 commits

Author SHA1 Message Date
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
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
1a2b17b1cd
Move revolutAccountsUpdateHandler code up to BisqSetup 2020-09-07 09:38:51 +02:00
chimp1984
05353bb43d
Add JsonExclude to userName
For backward compatibility we need to exclude the new field for
the contract json.
We can remove that after a while when risk that users with
pre 1.3.8 version trade with updated
users is very low.
2020-09-07 09:38:37 +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
67e90f908a
Remove unused var 2020-09-07 09:34:39 +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
wiz
d55cc47284
Fix compile error in core/src/main/java/bisq/core/user/Preferences.java 2020-09-07 09:28:28 +02:00
wiz
f5d8f6ddc2
Add new Monero Explorer node77.monero.wiz.biz with onion 2020-09-07 09:28:17 +02:00
chimp1984
2ab779f9b8
Remove DevTestXmrTxProofHttpClient 2020-09-07 01:05:07 -05:00
chimp1984
6a061d2c58
Create new HttpClient for each request. 2020-09-07 01:04:23 -05: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
0bf433350a
Use a checkArgument to ensure that the methods are not called once a
dispute has been opened. This will cause a Runtime exception but that
is justified as the caller need to ensure to do the check and do not
allow to get to that point.
2020-09-06 23:22:31 -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
a4b43f66a9
Apply codacy suggestion (this time a good one ;-)) 2020-09-06 22:04:41 -05:00
chimp1984
199d543c23
Remove ugly parameter
The 'arePeersPaymentAccountDataBanned' method in filterManager had a
parameter 'PaymentAccountFilter[] appliedPaymentAccountFilter' which
was used to pass over the PaymentAccountFilter which matched a banned
account. The result was only used at the fault handler (log) in the
ApplyFilter task. I think this was not needed to display and if it
should be done in a different way, e..g using a Consumer to pass back
the value, but as the method is a validation method returning a boolean
we should avoid to add side-effects like writing some property.
2020-09-06 20:43:43 -05:00
chimp1984
00fe80ef0e
Refactor
Use a stream filter instead of a if clause
2020-09-06 20:16:00 -05:00
sqrrm
cafbbdf94c
Merge pull request #4488 from wiz/add-wiz-xmr-explorer
Add new Monero Explorer node77.monero.wiz.biz with onion
2020-09-07 00:24:10 +02:00
sqrrm
d152f88285
Merge pull request #4479 from chimp1984/improve-xmr-proof-p2pNetworkAndWalletReady-handling
Improve handling of p2pNetworkAndWalletReady
2020-09-06 23:33:05 +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
sqrrm
682cc402e7
Merge pull request #4481 from chimp1984/add-backward-compatibility-for-revolut-change
Add backward compatibility for revolut change
2020-09-06 19:13:09 +02:00
wiz
4b9a1a0138
Fix compile error in core/src/main/java/bisq/core/user/Preferences.java 2020-09-07 00:46:06 +09:00
wiz
82f8cf6d40
Add new Monero Explorer node77.monero.wiz.biz with onion 2020-09-06 18:36:32 +09: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
5a65b150fe
Remove unused var 2020-09-05 07:41:27 -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
wiz
7fba82779a
Tweak a few DAO bonded role names in strings file
* Rename "BSQ explorer operator" to "Explorer operator", as per https://github.com/bisq-network/proposals/issues/257
* Rename "Markets API operator" to "Markets operator" as per https://github.com/bisq-network/projects/issues/41
2020-09-05 15:28:19 +09: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
9e6db6e738
Move revolutAccountsUpdateHandler code up to BisqSetup 2020-09-04 18:20:16 -05:00
chimp1984
61c071184e
Add JsonExclude to userName
For backward compatibility we need to exclude the new field for
the contract json.
We can remove that after a while when risk that users with
pre 1.3.8 version trade with updated
users is very low.
2020-09-04 14:50:53 -05:00
chimp1984
6162e6d0d7
Move remove code from shutDown to onP2pNetworkAndWalletReady 2020-09-04 13:59:35 -05:00
chimp1984
75c85f3d85
Improve handling of p2pNetworkAndWalletReady
The p2pNetworkAndWalletReady MonadicBinding might be removed from GC
if its a local variable. I observed that in BisqSetup with a similar
setup. It might be an implementation weakness in MonadicBinding
(usage of weak references?). A tester reported that he does not see any
result, which might be cause that the service never gets the
onP2pNetworkAndWalletReady triggered if the MonadicBinding is not there
anymore.
By removing the listener we need at shutdown we need it anyway as class
field (so codacy does not complain anymore). As well added a check if
all is already complete to skip the MonadicBinding at all
(not expected case in onAllServicesInitialized).
2020-09-04 13:46:15 -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
720b63fc00
Do not overwrite useDevMode with useDevModeHeader
If --useDevModeHeader is not set it is false by default.
If user has --useDevMode=true set it would overwrite his value.
2020-09-04 10:18:13 +02:00
chimp1984
63444b1f77
Add null check. Improve text 2020-09-04 10:18:07 +02:00
chimp1984
fa9893cdd4
Show tx confidence indicator for XMR blocks. Show info icon 2020-09-04 10:17:53 +02:00
chimp1984
11827a42c6
Set default services based on localhost check not on devMode check 2020-09-04 10:17:31 +02:00
chimp1984
a4a5f18662
Make var local 2020-09-04 10:17:22 +02:00
chimp1984
3359913247
Ensure that p2p network and wallet are ready 2020-09-04 10:17:15 +02:00
chimp1984
5732053382
Enable onFiatPaymentReceived again (was for dev testing)
- Remove commented out code
- do isFiatReceived in stream filter
2020-09-04 10:17:04 +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
chimp1984
6d37bedbbe
Fix bug with all mobile notifications for disputes are sent at startup. 2020-09-03 23:50:28 -05:00
chimp1984
5b588877e7
Do not overwrite useDevMode with useDevModeHeader
If --useDevModeHeader is not set it is false by default.
If user has --useDevMode=true set it would overwrite his value.
2020-09-03 21:21:18 -05:00