Manfred Karrer
b9a53d333c
Reformatting
2016-07-25 17:03:35 +02:00
Manfred Karrer
dd316736a2
Merge pull request #541 from dan-da/seedpeers
...
Use Seedpeers for default DNS Discovery when Socks proxy active. ( Tor )
2016-07-25 16:43:15 +02:00
Manfred Karrer
70542acdeb
Decrease delay at offermanager shutdown
2016-07-25 16:30:36 +02:00
Manfred Karrer
9bbe295e84
Merge branch 'master' into Development
2016-07-25 16:20:39 +02:00
danda
96f69ebfdf
Fixes build breakage in commit:
...
3a8c09c0d5
2016-07-23 18:52:14 -07:00
danda
a2929f1c19
remove unneeded import
2016-07-23 18:34:07 -07:00
danda
83beba4c44
Using SeedPeers for default discovery instead of SeedPeersSocks5Dns
...
because there were weird perf issues with the latter.
This change relies on updated seed IPs in:
https://github.com/bitsquare/bitcoinj/pull/2
Otherwise it will probably fail to connect to any bitcoin peers.
This commit also adds support for parsing --btcSeedPeers=name,name:port.
Previously only name:port format was supported.
Conflicts:
core/src/main/java/io/bitsquare/btc/WalletService.java
2016-07-23 18:32:49 -07:00
Manfred Karrer
099118a75a
Fix renamed method
2016-07-23 01:42:54 +02:00
Manfred Karrer
de3a0e7669
Create walletInitialized at declaration, improve logging
2016-07-22 17:01:06 +02:00
Manfred Karrer
e3b3342901
Merge branch 'master' into Development
...
Conflicts:
seednode/src/main/java/io/bitsquare/seednode/SeedNodeMain.java
2016-07-22 16:33:35 +02:00
Manfred Karrer
25b17e638f
Merge remote-tracking branch 'origin/Development' into Development
2016-07-22 16:32:31 +02:00
Manfred Karrer
3a8c09c0d5
Add memorey check and restart routine for seednode
2016-07-22 16:32:01 +02:00
Manfred Karrer
3399e8a45a
Add cleanup dangling handlers
2016-07-22 14:33:04 +02:00
Manfred Karrer
dc06523814
Merge pull request #535 from dan-da/route_bitcoinj_over_jtoryproxy
...
Route bitcoinj over jtoryproxy
2016-07-22 13:17:19 +02:00
Manfred Karrer
af3a4c62f4
Fix Bitsquare color
2016-07-22 12:03:13 +02:00
Manfred Karrer
d91f340146
Decrease delay for offer refreshing
2016-07-22 12:02:43 +02:00
danda
b2bd8bba94
+ Enables remote DNS lookup when using socks5 proxy, eg Tor.
...
+ Enable/Disable use of internal Tor proxy based on user pref.
+ parse and make use of --btcSeedNodes arg.
+ code in place for user to specify other socks5 proxy, eg i2p, ssh.
it just needs GUI or CLI prefs added.
2016-07-21 14:21:43 -07:00
danda
89ab87d4e7
prelim support for --seedNodes param. not working yet.
2016-07-19 19:22:13 -07:00
danda
c392915c4a
ensure useTor==false case works, and also that wallet init is deferred only for useTor==true case
2016-07-19 17:59:32 -07:00
danda
6198307d76
Merge branch 'upstream-dev' into route_bitcoinj_over_jtoryproxy
2016-07-19 16:44:02 -07:00
danda
1bfee1e6c9
merged in upstream/Development
2016-07-19 16:40:04 -07:00
Manfred Karrer
513f07d58c
Fix null pointer
2016-07-20 01:20:29 +02:00
Manfred Karrer
d4946ef443
Add seednodes and useTor options, re-enable useTor in preferences and settingsview
2016-07-20 01:13:08 +02:00
Manfred Karrer
f0e3370dbb
Rename option classes
2016-07-20 00:34:50 +02:00
danda
fcb08c12ad
some cleanup of the bitcoinj/jtorproxy integration
2016-07-19 12:54:48 -07:00
Manfred Karrer
5cb6a4f912
Adjust delay at remove offers at shutdown
2016-07-19 19:11:56 +02:00
Manfred Karrer
f15bbf98eb
Increase timout for shutdown, reduce delay at remove offers at shutdown
2016-07-19 19:00:59 +02:00
Manfred Karrer
ee9df3e476
Increase delay at shutdown
2016-07-19 18:47:52 +02:00
Manfred Karrer
a0947d903f
Add more details for logging.
2016-07-19 18:45:41 +02:00
Manfred Karrer
3bf075b7c2
Remove scanner as it conflicts when running seednode with nohup
2016-07-19 18:44:48 +02:00
Manfred Karrer
902ce4dd88
Prevent that shutdown is called twice
2016-07-19 17:40:06 +02:00
Manfred Karrer
3835d9d09c
Fix time period formatting
2016-07-19 17:16:51 +02:00
Manfred Karrer
fd8db49d25
Improve logging
2016-07-19 16:28:13 +02:00
Manfred Karrer
9f22fe2450
Add missing master thread
2016-07-19 16:27:59 +02:00
Manfred Karrer
59ce63471f
Change logging, add getTruncatedMessage method
2016-07-19 16:27:33 +02:00
Manfred Karrer
ef1aaff264
Clone map before iterating to avoid ConcurrentModificationException exception
2016-07-18 00:55:45 +02:00
Manfred Karrer
e07a67e825
Fix layout
2016-07-17 23:28:31 +02:00
Manfred Karrer
7b7e0e721e
Change log level
2016-07-17 23:19:18 +02:00
Manfred Karrer
31748cbe15
Change log level
2016-07-17 23:03:24 +02:00
Manfred Karrer
0b74d79d39
Add null check
2016-07-17 22:57:19 +02:00
Manfred Karrer
7eded1aaf6
v0.4.9
2016-07-17 16:33:31 +02:00
Manfred Karrer
952c2f1d48
Fix missing super call
2016-07-17 16:32:09 +02:00
Manfred Karrer
02ab26513e
Fix wrong confirm popup msg for crypto currencies. add eth/ethc fork warning to create and take offer screens
2016-07-17 14:05:20 +02:00
Manfred Karrer
a4573208b4
Fix wrong thread at shutdownhook
2016-07-17 13:03:12 +02:00
Manfred Karrer
6f641bff1c
Fix busy animation display
2016-07-16 17:50:46 +02:00
Manfred Karrer
874b05b67b
Add sorting
2016-07-16 17:50:30 +02:00
Manfred Karrer
6282da8201
Add nr of bid/ask offers to statistics view
2016-07-16 03:29:05 +02:00
Manfred Karrer
3b01caee7b
Add error msg when take offer attempt failed, decrease Connection timeout to 60 sec
2016-07-16 02:44:17 +02:00
Manfred Karrer
1490102deb
Add ETHC
2016-07-16 02:43:33 +02:00
Manfred Karrer
604c8cfb5b
Add date check for ETHC
2016-07-16 02:43:22 +02:00
