chimp1984
3675e76194
Refactor: Move egexValidator from desktop to core
2020-09-20 22:13:18 -05:00
chimp1984
48a3f7443e
Merge branch 'master_upstream' into fix-trade-protocol-issues
...
# Conflicts:
# core/src/main/java/bisq/core/offer/placeoffer/tasks/CreateMakerFeeTx.java
2020-09-19 10:23:40 -05:00
Oscar Guindzberg
9a7439bef7
Break lines at 120 characters
2020-09-18 18:29:39 -03:00
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
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
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
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
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
e9a8be372a
Use bitcoinj 0.15.8 (commit 86c7094)
2020-09-18 18:29:24 -03:00
chimp1984
48a14ee8a7
Merge branch 'master_upstream' into fix-trade-protocol-issues
2020-09-16 20:45:17 -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
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
