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

4565 commits

Author SHA1 Message Date
Oscar Guindzberg
850ae9a6aa
bitcoinj 0.15: Use new Wallet.toString() with includeLookAhead boolean param. 2020-09-18 18:29:28 -03:00
Oscar Guindzberg
423ffa84e1
bitcoinj 0.15: Futures.addCallback() in guava 28 requires an executor. 2020-09-18 18:29:27 -03:00
Oscar Guindzberg
e9a8be372a
Use bitcoinj 0.15.8 (commit 86c7094) 2020-09-18 18:29:24 -03:00
chimp1984
b2a9262b93
Merge branch 'verify-donation-address-for-refund-agent' into dispute-agent-branch 
# Conflicts:
#	core/src/main/java/bisq/core/support/dispute/DisputeManager.java
#	desktop/src/main/java/bisq/desktop/main/support/dispute/agent/DisputeAgentView.java
 2020-09-17 19:09:26 -05:00
chimp1984
45cee2a272
Add check for disputes with duplicated trade ID or payout tx ids 2020-09-17 19:05:55 -05:00
chimp1984
1c41db4a76
Fix wrong handling of mainnet RECIPIENT_BTC_ADDRESSes 
We must not add main net addresses if not on mainnet
 2020-09-17 13:46:00 -05:00
chimp1984
48a14ee8a7
Merge branch 'master_upstream' into fix-trade-protocol-issues 2020-09-16 20:45:17 -05:00
chimp1984
1c0bef787a
Merge branch 'master_upstream' into verify-donation-address-for-refund-agent 2020-09-16 20:40:08 -05:00
chimp1984
b0b4334345
Merge branch 'master_upstream' into dispute-agents-sign-summary 2020-09-16 20:38:45 -05:00
sqrrm
b812a261cf
Merge pull request #4524 from ghubstan/1-register-regest-dispute-agents 
Add core support for registration of regtest dispute agents via API
 2020-09-16 16:33:18 +02:00
ghubstan
57423f4fdb
Refactor to fix dispute agent mgr usage 2020-09-16 11:14:30 -03:00
sqrrm
e8c2974f14
Merge pull request #4515 from m52go/refresh-strings-1 
Refresh strings, 1/n
 2020-09-16 14:46:06 +02:00
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
ghubstan
bbf4f09181
Add core impl for registering dispute agents 
This change supports registering mediators and refund agents on
daemons running on regest or testnet chains.  Registering
arbitrators is not supported.
 2020-09-14 11:04:10 -03: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
chimp1984
19021ebcd7
Use 1 sec timeout for bsq trade fee txs 2020-09-13 15:35:06 -05:00
chimp1984
f9f981fb65
Improve state handling 2020-09-13 15:34:20 -05:00
chimp1984
296506fb47
Update ascii logo 2020-09-13 14:50:16 -05:00
chimp1984
06703f97c2
Add bisq ascii logo at start 2020-09-13 14:17:25 -05:00
chimp1984
dea56d0903
Increase timouts 2020-09-13 13:41:47 -05:00
chimp1984
e770684397
Add log to see better bisq start in log files 2020-09-13 13:23:07 -05:00
chimp1984
349bd13c0d
Set always uid from tradeMessage 
Seems in the past there was partial support for uid but now all trade messages have uid.
 2020-09-13 13:06:22 -05:00
chimp1984
de4fb17a19
Improve summary notes 2020-09-12 20:18:04 -05:00
chimp1984
0c46e7dd52
Add more data to summary msg 2020-09-12 16:19:42 -05:00
chimp1984
7ac6e715d3
Dispute agent sign summary. Add tool for verification 2020-09-12 00:35:58 -05:00
chimp1984
05e1039423
Call validatePayoutTx only after trades are initialized 2020-09-11 20:28:23 -05:00
chimp1984
08fb596629
Call validatePayoutTx only after trades are initialized 2020-09-11 20:25:48 -05:00
chimp1984
677211badf
Allow close dispute for refund agent without payout 2020-09-11 20:24:31 -05:00
chimp1984
d82631f52c
Fix some issues found during testing 
Refactorings
 2020-09-11 19:41:08 -05:00
chimp1984
c48abbf575
Improve address validation code 2020-09-11 17:37:03 -05:00
chimp1984
4f1cbbd00e
Add check for refund agent if donation address is valid 2020-09-11 15:35:47 -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