Commit graph

12015 commits

Author SHA1 Message Date
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
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
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
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
c40bcfedfc
Fix merge mistake 2020-09-06 23:51:24 -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
1419f05152
Add comment to empty method 2020-09-06 23:06:27 -05:00