Commit Graph

11978 Commits

Author SHA1 Message Date
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
Christoph Atteneder
a0c298e000
Merge pull request #4503 from chimp1984/xmr-tool-bugfix-ignore-future-results-after-terminal-result
Xmr tool bugfix: Ignore future results after terminal result
2020-09-09 14:59:01 +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
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
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
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
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
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
Christoph Atteneder
d73a284991
Merge pull request #4497 from m52go/add-autoconfirm-note
Add note to SetXmrTxKeyWindow
2020-09-08 11:36:06 +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
Florian Reimair
e3193e5daf
Tor 0.4.3.6 2020-09-07 14:23:30 +02: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
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
Christoph Atteneder
27a9f9636f
Merge pull request #4493 from chimp1984/deactive-confirm-buttons-once-mediation-started
Deactive confirm buttons once mediation started
2020-09-07 09:42:59 +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
1a2b17b1cd
Move revolutAccountsUpdateHandler code up to BisqSetup 2020-09-07 09:38:51 +02:00
chimp1984
a4f6d2af2e
Add check if xmrTxProof is used to avoid null pointer exception 2020-09-07 09:38:44 +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
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