mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 15:10:44 +01:00
Code Issues Projects Releases Packages Wiki Activity
11918 commits 3 branches 150 tags 4.1 GiB
Commit graph

4435 commits

Author SHA1 Message Date
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
chimp1984
156559cb9a
Increase timeouts 2020-09-14 09:53:52 +02:00
chimp1984
76267afabf
Increase timeouts 2020-09-13 17:12:25 -05:00
Christoph Atteneder
a19c662b44
Merge pull request #4511 from sqrrm/return-on-null 
Return if setting not present
 2020-09-11 16:53:21 +02:00
Christoph Atteneder
2b9445d50f
Merge pull request #4507 from chimp1984/fix-bug-with-seed-restore-and-open-offers 
Fix bug with seed restore and open offers
 2020-09-11 16:52:11 +02:00
wiz
ab5aee5aab
Revert Tether USD for now due to various issues 2020-09-10 21:31:22 +02:00
wiz
de48b3b040
Revert Tether USD for now due to various issues 2020-09-11 00:51:19 +09:00
Devin Bileck
8dcb5dadd5
Add new Monero explorer xmrblocks.bisq.services with onion 
As per https://github.com/bisq-network/proposals/issues/257
 2020-09-10 14:01:38 +02:00
sqrrm
db8c02b40b
Return if setting not present 2020-09-10 10:29:05 +02:00
sqrrm
579c2c416b
Merge pull request #4510 from devinbileck/add-xmr-explorer 
Add new Monero explorer xmrblocks.bisq.services with onion
 2020-09-10 10:23:52 +02:00
Devin Bileck
18496b71e2
Add new Monero explorer xmrblocks.bisq.services with onion 
As per https://github.com/bisq-network/proposals/issues/257
 2020-09-09 21:17:15 -07:00
chimp1984
00d267e4db
Merge branch 'master_upstream' into fix-bug-with-seed-restore-and-open-offers 2020-09-09 14:29:27 -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
chimp1984
1bea05d8c6
Fix bug with wallet restore with same seed and when there was 
an open offer.

Improve handling of restore and add more checks to avoid invalid
entries.
 2020-09-09 13:52:34 -05:00
chimp1984
77e5d71ca4
Remove unused method 2020-09-09 13:50:42 -05:00
chimp1984
7fb42f37eb
Improve toString method 2020-09-09 13:47:32 -05:00
chimp1984
38299a9498
Remove side effect in setUserName method and add extra handling for the 
moment we save the account. Only at that moment we check if we need to
set the accountId with the value of the userName.
We do that in the domain layer to avoid more domain logic code in the UI
layer.

Fixes bug found at:
https://github.com/bisq-network/bisq/pull/4481#pullrequestreview-485066342
 2020-09-09 20:42:48 +02:00
chimp1984
20cb98aa93
Remove side effect in setUserName method and add extra handling for the 
moment we save the account. Only at that moment we check if we need to
set the accountId with the value of the userName.
We do that in the domain layer to avoid more domain logic code in the UI
layer.

Fixes bug found at:
https://github.com/bisq-network/bisq/pull/4481#pullrequestreview-485066342
 2020-09-09 11:21:43 -05:00
wiz
e7016a3ede
Rename Monero Explorer to friendlier hostname explorer.monero.wiz.biz 2020-09-09 15:16:46 +02:00
wiz
bafd116c82
Tweak string for "Service Addresses" to "Monero Explorer URLs" 2020-09-09 15:12:16 +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
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