Commit graph

4665 commits

Author SHA1 Message Date
chimp1984
5a53cc6a73
Move remove code from shutDown to onP2pNetworkAndWalletReady 2020-09-09 15:07:35 +02:00
chimp1984
dbefddf940
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-09 15:07:29 +02:00
wiz
8949eaa7e2
Tweak strings of "BSQ Explorer" -> "Bisq Explorer" and "Bitcoin Explorer" 2020-09-09 15:05:56 +02:00
wiz
edad9bd2fe
Replace old Bisq Explorer URLs with new Mempool URLs for the 3 we have 2020-09-09 15:05:45 +02:00
chimp1984
0ee86b3fcb
Improve text in UI in case of failure or error 2020-09-09 15:03:30 +02:00
chimp1984
ca34f8ecad
Rearrange fields and improve toString method 2020-09-09 15:03:23 +02:00
chimp1984
b3c31399a7
Ignore future results in case we had a terminal result already.
Avoid that a success result overwrites an earlier failed/error result.
2020-09-09 15:03:17 +02:00
chimp1984
fa987d1461
- Change entrySet to CopyOnWriteArraySet to avoid potential ConcurrentModificationExceptions
- Make entrySet final
- Avoind unneeded wrapping
- Remove visibility of entrySet
- Add getAddressEntriesAsListImmutable method. This is the only access for the hashSet
so we ensure it cannot be changed from outside.
- Remove stream() method
- Remove unused return types
- Improve some stream structures
- Renaming, improve comments
2020-09-08 18:53:32 -05:00
chimp1984
e197b4ce25
Use a hash set instead of a list to avoid duplicates
In dev testing I got the case of duplicated address entries and thus
incorrect balance. I could not reproduce it later but looking in the
AddressEntry code it was unsafe using the add operation on list without
a contains check. Better instead to use a HashSet and avoid possibility
of duplicated entries by the chosen data structure.
Note that the protobuf representation is still a list and get converted
to a HashSet.
2020-09-08 18:09:48 -05:00
chimp1984
b39e6b5934
Improve text in UI in case of failure or error 2020-09-08 16:22:28 -05:00
chimp1984
b01ecb6b93
Rearrange fields and improve toString method 2020-09-08 16:10:05 -05:00
chimp1984
8c6177742c
Ignore future results in case we had a terminal result already.
Avoid that a success result overwrites an earlier failed/error result.
2020-09-08 16:09:29 -05:00
sqrrm
f1a284ceb0
Merge pull request #4492 from wiz/use-https-for-xmr-explorer-api
Use https:// for XMR explorer API endpoints, except if localhost or Tor
2020-09-08 18:17:11 +02:00
sqrrm
38d62dbf1b
Merge pull request #4501 from wiz/update-mempool-explorer-urls
Update old Bisq Explorer URLs with new Mempool Explorer URLs, tweak strings
2020-09-08 13:50:24 +02:00
wiz
906805ec2e
Rename Monero Explorer to friendlier hostname explorer.monero.wiz.biz 2020-09-08 20:26:23 +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
f566e0975e
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-08 11:53:45 +02:00
chimp1984
35cd7ac56b
Add check if trade have been dispute to protocol classes 2020-09-08 11:53:29 +02:00
Stephan Oeste
f21019d44c
Change from http port 80 clearnet to https 443
To be compatible to https://github.com/bisq-network/bisq/pull/4492
2020-09-08 11:37:31 +02:00
Christoph Atteneder
f05e67028b
Merge pull request #4495 from Emzy/patch-4
XMRexplorer change from http port 80 clearnet to https 443
2020-09-08 11:37:18 +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
wiz
41bebd7811
Tweak strings of "BSQ Explorer" -> "Bisq Explorer" and "Bitcoin Explorer" 2020-09-08 12:44:33 +09:00
wiz
4076784697
Replace old Bisq Explorer URLs with new Mempool URLs for the 3 we have 2020-09-08 12:38:10 +09:00
wiz
5d83ca5c23
Add friendly name for node77.monero.wiz.biz -> explorer.monero.wiz.biz 2020-09-08 12:09:31 +09:00
wiz
1461d95b0b
Tweak string for "Service Addresses" to "Monero Explorer URLs" 2020-09-08 12:08:44 +09: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
Stephan Oeste
447c6ce9aa
Change from http port 80 clearnet to https 443
To be compatible to https://github.com/bisq-network/bisq/pull/4492
2020-09-07 12:38:50 +02:00
Christoph Atteneder
e7d24efb4a
Merge pull request #4489 from chimp1984/various-small-improvements
Various small improvements
2020-09-07 10:58:59 +02:00
chimp1984
82bc445a05
Remove DevTestXmrTxProofHttpClient 2020-09-07 10:03:44 +02:00
chimp1984
b937537926
Resolve conflict in 6a061d2c5
CONFLICT (modify/delete): core/src/main/java/bisq/core/trade/txproof/xmr/DevTestXmrTxProofHttpClient.java
2020-09-07 10:03:00 +02:00
Christoph Atteneder
ee8e931e34
Merge pull request #4494 from chimp1984/fix-xmr-tool-bug-with-single-httpClient
Bugfix: Create new HttpClient for each request.
2020-09-07 09:59:18 +02:00
chimp1984
39680ec7ff
Remove DevTestXmrTxProofHttpClient 2020-09-07 09:58:52 +02:00
chimp1984
1c2a6a8245
Create new HttpClient for each request. 2020-09-07 09:58:43 +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
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