Commit graph

1881 commits

Author SHA1 Message Date
Manfred Karrer
ab07e6c47c
Merge branch 'ibininja-master'
# Conflicts:
#	core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java
#	gui/src/main/java/io/bisq/gui/util/validation/AltCoinAddressValidator.java
#	gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java
2017-12-19 21:19:26 +01:00
Manfred Karrer
f3b759046b
Merge 2017-12-19 21:18:37 +01:00
Manfred Karrer
de88328362
Add CAGE 2017-12-19 21:13:48 +01:00
Manfred Karrer
8637bc4cc8
Merge branch 'master' into Development 2017-12-19 20:59:42 +01:00
Manfred Karrer
2f1015475d
Update IP of btc node. Remove unused classes 2017-12-19 20:59:26 +01:00
Manfred Karrer
013a960d01
Merge master 2017-12-19 20:55:03 +01:00
Manfred Karrer
e3488184a5
Merge branch 'master' into Development
# Conflicts:
#	provider/src/main/java/io/bisq/provider/price/providers/PoloniexProvider.java
2017-12-19 20:52:27 +01:00
Manfred Karrer
40b23b28d6
Merge non critical changes from dev branch 2017-12-19 20:52:00 +01:00
Manfred Karrer
c80d891d6f
Refactoring: Rename calss 2017-12-19 20:13:47 +01:00
Manfred Karrer
e5eff0d648
Remove unneeded broadcast trade fee tasks 2017-12-19 20:12:29 +01:00
Manfred Karrer
8f48e080cb
Merge branch 'master' into Development
# Conflicts:
#	core/src/main/java/io/bisq/core/btc/BitcoinNodes.java
#	core/src/main/java/io/bisq/core/btc/wallet/WalletsSetup.java
#	core/src/main/java/io/bisq/core/filter/FilterManager.java
2017-12-19 19:55:00 +01:00
Manfred Karrer
2710da63a6
Add support for checking btc nodes. Add new option keys: useAllProvidedNodes, numConnectionForBtc. Change DEFAULT_CONNECTIONS back from 8 to 10. Refactorings. 2017-12-19 19:15:29 +01:00
Manfred Karrer
852d4c5ba5
Add and change btc, seed and provider nodes. Use only HS nodes if tor is used for btcj 2017-12-18 23:37:32 +01:00
Manfred Karrer
f9f510ef1b
Remove outdated filter entries from properties file 2017-12-18 15:55:48 +01:00
Manfred Karrer
f4e22253e4
Add userAgent 2017-12-18 15:55:17 +01:00
Manfred Karrer
ed0845c62b
Fix seed node monitoring error handling. Prefer hostname over IP if both are provided in btc nodes. 2017-12-18 13:30:56 +01:00
Manfred Karrer
04e7742c60
Increase offer refresh and republish intervals and TTL. 2017-12-18 00:15:45 +01:00
Manfred Karrer
4e0ddd8fe7
Decrease maxConnections for btc network from 10 to 8 2017-12-18 00:14:51 +01:00
Manfred Karrer
045bfd21b3
Clean up btc nodes 2017-12-18 00:14:18 +01:00
Manfred Karrer
7d14975241
Increase timeouts. Rename TIME_OUT to TIMEOUT. 2017-12-17 22:35:09 +01:00
Manfred Karrer
83cd1b7ebc
Merge branch 'master' into Development
# Conflicts:
#	core/src/main/java/io/bisq/core/app/BisqEnvironment.java
2017-12-17 22:11:12 +01:00
Manfred Karrer
d77eb89e78
Add seed node monitor module 2017-12-17 20:39:00 +01:00
Manfred Karrer
c6cfdb2b58
Increase socket timoput to 2 minutes. Revert to old netlayer library version. Add user agent. 2017-12-16 00:12:25 +01:00
Manfred Karrer
44b3043577
Add comments, Fix tx commit 2017-12-15 17:31:36 +01:00
Manfred Karrer
5bcbdc74b2
Use domainname instead of IP if both are known for btc nodes 2017-12-08 19:37:30 -05:00
Manfred Karrer
a2e67e9965
Change IP of Jochen's btc node 2017-12-08 19:31:20 -05:00
Manfred Karrer
4a30d5874e
Fix missing callbacks for balance and com request updates 2017-12-08 17:16:26 -05:00
Manfred Karrer
430a304906
Fix threading issue 2017-12-08 15:21:41 -05:00
Manfred Karrer
0e16522307
Merge branch 'Development' into dao
# Conflicts:
#	core/src/main/java/io/bisq/core/dao/blockchain/BsqNode.java
2017-12-08 11:17:47 -05:00
Manfred Karrer
22eb845e00
Merge branch 'master' into Development 2017-12-08 11:16:04 -05:00
Manfred Karrer
76e1cd2eca
Add comment with old price relay nodes 2017-12-08 11:15:40 -05:00
Manfred Karrer
a784cf90fa
Add more log info 2017-12-08 01:05:15 -05:00
Manfred Karrer
a6e94af3b2
Fix wrong handler for DAO startup. Change log level. 2017-12-08 00:02:21 -05:00
Manfred Karrer
558157082d
Add filter for btc nodes 2017-12-07 23:14:34 -05:00
Manfred Karrer
b4d01ade87
Merge branch 'Development' into dao 2017-12-07 22:31:38 -05:00
Manfred Karrer
147ed07370
Adjust fee 2017-12-07 22:30:38 -05:00
Manfred Karrer
a43ab663db
Merge branch 'master' into Development
# Conflicts:
#	core/src/main/java/io/bisq/core/provider/fee/FeeService.java
#	gui/src/main/java/io/bisq/gui/main/dao/DaoView.java
2017-12-07 22:27:26 -05:00
Manfred Karrer
a03e093d69
Update node operator 2017-12-07 22:08:54 -05:00
Manfred Karrer
6b8276ba10
Set version 0.6.1 for provider node. Increase timout for offer availibility. 2017-12-07 14:48:49 -05:00
Manfred Karrer
b70bcd25b4
Deactive tabs of not impl. DAO features 2017-12-07 13:38:24 -05:00
Manfred Karrer
fa517511bb
Change price tolerance to 2% 2017-12-07 13:14:18 -05:00
Manfred Karrer
06f2a02119
Change to new Regtest genesis tx id 2017-12-07 12:19:03 -05:00
Manfred Karrer
8454f4dfce
Further refactorings, cleanup, fix missing handlers. 2017-12-05 23:10:39 -05:00
Manfred Karrer
8be0b53ecc
Refactoring: Remove BsqBlockchainManager 2017-12-05 20:17:09 -05:00
Manfred Karrer
fc91aeecf8
Refactoring: Remove BsqTxProvider interface 2017-12-05 16:21:25 -05:00
Manfred Karrer
81a719d207
-Refactoring: Rename BsqChainState to BsqBlockChain 2017-12-05 16:16:34 -05:00
Manfred Karrer
ac2c95c987
Remove CompensationRequestModel 2017-12-05 15:57:05 -05:00
Manfred Karrer
74d180fcf7
Add chainHeightProperty to WalletService 2017-12-05 15:39:41 -05:00
Manfred Karrer
6dc76205b0
Refactor BsqBlockchainManager dependencies. Add BsqTxProvider interface. 2017-12-05 15:19:36 -05:00
Manfred Karrer
57a019708d
Split list of requests in active and past. Improve tests 2017-12-05 15:01:11 -05:00