Oscar Guindzberg
b89e9e1168
Code quality: Use {} in if oneliners
2020-09-18 18:29:39 -03:00
Oscar Guindzberg
24da46879f
bugfix: When creating a new BSQ wallet, use the BTC wallet seed
2020-09-18 18:29:39 -03:00
Oscar Guindzberg
0d25ca1381
Remove okhttp and okio dependencies
2020-09-18 18:29:38 -03:00
Oscar Guindzberg
f1738f0b19
Code polishing to make Codacy happier
2020-09-18 18:29:38 -03:00
Oscar Guindzberg
f342c89c8e
Code polishing to make Codacy happy
2020-09-18 18:29:37 -03:00
Oscar Guindzberg
02559f2334
Revert "bitcoinj 0.15: Remove call to PeerGroup.setIgnoreHttpSeeds(true)."
...
This reverts commit 9be6a9dd295b439a66c4d369563411009c9db329.
2020-09-18 18:29:37 -03:00
Oscar Guindzberg
daaacecafb
Use bitcoinj 0.15.8 (commit 0d98efb)
2020-09-18 18:29:37 -03:00
Oscar Guindzberg
4de39fc2a3
Make it clear P2PKH is used always used
...
Make it clear P2PKH is used for both BSQ and BTC wallets
until segwit is implemented.
2020-09-18 18:29:36 -03:00
Oscar Guindzberg
d0b00fb6f4
Use bitcoinj 0.15.8 (commit 0d7762b)
2020-09-18 18:29:36 -03:00
Oscar Guindzberg
00c9f401c1
WalletConfig.preferredOutputScriptType: make it a method variable
2020-09-18 18:29:36 -03:00
Oscar Guindzberg
b472e3851c
Update btcd-cli4j to 27b9433
2020-09-18 18:29:35 -03:00
Oscar Guindzberg
053b22f16f
Prevent seednode to use older guava version
2020-09-18 18:29:35 -03:00
Oscar Guindzberg
5a00770377
bitcoinj 0.15: BisqRiskAnalisys: Add commented out code to match original DefaultRiskAnalysis.
2020-09-18 18:29:35 -03:00
Oscar Guindzberg
d8e0ba752f
bitcoinj 0.15: Replace deprecated Script methods with ScriptPattern methods.
2020-09-18 18:29:34 -03:00
Oscar Guindzberg
08cc836bab
bitcoinj 0.15: Fix TransactionAwareTradeTest
2020-09-18 18:29:34 -03:00
Oscar Guindzberg
76e6955aa4
bitcoinj 0.15: Replace deprecated Transaction.getHash() with Transaction.getTxId().
2020-09-18 18:29:34 -03:00
Oscar Guindzberg
9a9b067d70
bitcoinj 0.15: Replace deprecated Transaction.getHashAsString with Transaction.getTxId().toString().
2020-09-18 18:29:33 -03:00
Oscar Guindzberg
6e50996ae4
bitcoinj 0.15: Remove call to PeerGroup.setIgnoreHttpSeeds(true).
2020-09-18 18:29:33 -03:00
Oscar Guindzberg
e5fa24e909
bitcoinj 0.15: Bip44 refactor.
...
- WalletConfig was rewritten from scratch based on bitcoinj 0.15 WalletAppKit.
- bitcoinj 0.15 allows bip32 custom paths by constructor parameters, some subclasses were removed.
2020-09-18 18:29:33 -03:00
Oscar Guindzberg
7b172c1280
bitcoinj 0.15: PeerAddress: BtcNodeConverterTest fixes.
2020-09-18 18:29:32 -03:00
Oscar Guindzberg
3717323444
bitcoinj 0.15: PeerAddress: Use InetSocketAddress constructor instead of InetAddress+port.
2020-09-18 18:29:32 -03:00
Oscar Guindzberg
4348f663ca
bitcoinj 0.15: PeerAddress: don't set addr when already using hostname.
2020-09-18 18:29:32 -03:00
Oscar Guindzberg
8e45633dd8
bitcoinj 0.15: Use PeerAddress constructor with NetworkParameters parameter.
2020-09-18 18:29:31 -03:00
Oscar Guindzberg
e57c3010e3
bitcoinj 0.15: Replace Utils.closeUnchecked() to Closeables.closeQuietly() to match WalletAppKit.
2020-09-18 18:29:31 -03:00
Oscar Guindzberg
7e57bdb416
bitcoinj 0.15: Deal with methods throwing SignatureDecodeException.
2020-09-18 18:29:31 -03:00
Oscar Guindzberg
87481cdbf5
bitcoinj 0.15: Replace usage of bitcoinj's removed methods with new ones.
2020-09-18 18:29:30 -03:00
Oscar Guindzberg
26b20f0af7
bitcoinj 0.15: replace ECKey.toAddress() with LegacyAddress.fromKey().
2020-09-18 18:29:30 -03:00
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
f0735a3b0c
bitcoinj 0.15: ScriptException moved to another package.
2020-09-18 18:29:29 -03:00
Oscar Guindzberg
da8ab931aa
bitcoinj 0.15: NetworkParameters.acceptableAddressCodes was removed.
2020-09-18 18:29:28 -03:00
Oscar Guindzberg
d4ac45da21
bitcoinj 0.15: bitcoinj moved from spongycastle to bouncycastle.
2020-09-18 18:29:28 -03:00
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
9f767377e8
bitcoinj 0.15: Update modified dependencies hashes.
2020-09-18 18:29:27 -03:00
Oscar Guindzberg
3aea094538
bitcoinj 0.15: bitcoinj exclude dependency bcprov-jdk15on because already included by bisq.
2020-09-18 18:29:27 -03:00
Oscar Guindzberg
41556f25df
bitcoinj 0.15: Update depencencies to match bitcoinj versions
2020-09-18 18:29:26 -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
f46a991101
Merge branch 'dispute-agents-sign-summary' into dispute-agent-branch
2020-09-17 19:07:28 -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
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
chimp1984
29f3a7c495
Merge branch 'master_upstream' into allow-refund-agent-close-without-payout
2020-09-16 20:38:02 -05:00
sqrrm
b22ab6a1fa
Merge pull request #4531 from bisq-network/release/v1.3.9
...
Release/v1.3.9
2020-09-16 17:01:48 +02: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
