Oscar Guindzberg
7356b64f59
bitcoinj 0.15: Use LegacyAddress.fromBase58() instead of Address.fromBase58().
2020-09-18 18:29:30 -03:00
Oscar Guindzberg
46f2ba6ee0
bitcoinj 0.15: WalletEventListener was replaced by more granular listeners.
2020-09-18 18:29:29 -03:00
Oscar Guindzberg
d4ac45da21
bitcoinj 0.15: bitcoinj moved from spongycastle to bouncycastle.
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
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
3d4427cdfd
Add result of filter match. Add more filter data (tx ids, json)
2020-09-17 13:54:45 -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
Christoph Atteneder
81df879881
Merge branch 'master' of github.com:bisq-network/bisq into release/v1.3.9
...
# Conflicts:
# build.gradle
# desktop/package/linux/Dockerfile
# desktop/package/linux/package.sh
# desktop/package/linux/release.sh
# desktop/package/macosx/create_app.sh
# desktop/package/macosx/finalize.sh
# desktop/package/macosx/insert_snapshot_version.sh
# desktop/package/windows/package.bat
# desktop/package/windows/release.bat
# relay/src/main/resources/version.txt
2020-09-16 16:52:54 +02:00
Christoph Atteneder
95dd561d91
Revert to SNAPSHOT version
2020-09-16 16:49:48 +02:00
Christoph Atteneder
06ac7a7605
Bump version number for v1.3.9
2020-09-16 15:58:58 +02:00
chimp1984
601de7890d
Add try/catch at setSuggestedSecurityDeposit code
2020-09-16 15:56:13 +02:00
Christoph Atteneder
8cb4b5016c
Merge pull request #4529 from chimp1984/make-moving-average-code-more-safe
...
Make moving average code more safe
2020-09-16 15:51:14 +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
Christoph Atteneder
5f957f0a64
Revert to SNAPSHOT version
2020-09-15 09:26:08 +02:00
chimp1984
71d57298b0
Add try/catch at setSuggestedSecurityDeposit code
2020-09-14 16:05:47 -05:00
chimp1984
352e661bac
update devmode price
2020-09-13 15:35:39 -05:00
cd2357
8d793e9a83
Show info popup if Bisq started under Qubes OS
...
Show popup informing the user about the OS-specific setup guide.
2020-09-13 13:23:12 +02:00
chimp1984
966b22a69d
Fix line breaks
2020-09-12 20:24:32 -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
48066ae124
Remove setting of pubKey as it is not needed
2020-09-12 00:49:27 -05:00
chimp1984
559028e500
Remove unused var
2020-09-12 00:46:52 -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
2b0433870c
Dont allow opening refudn agent dispute if delayed payout tx is invalid.
2020-09-11 17:00:24 -05:00
chimp1984
4f1cbbd00e
Add check for refund agent if donation address is valid
2020-09-11 15:35:47 -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
wiz
8cde8ce16a
Fix codacy complaining about missing space character
2020-09-09 15:16:38 +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
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
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
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
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
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
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
