Commit graph

763 commits

Author SHA1 Message Date
Manfred Karrer
590c48a10c Set useTorForBtcJ to default false 2016-07-25 22:55:39 +02:00
Manfred Karrer
423cb141f4 added prog arg for btc proxy, overrides the proxy in the WalletService if defined 2016-07-25 21:33:37 +02:00
Manfred Karrer
a284f0f5b1 trade statistics published also by taker, delay batch publishing 2016-07-25 21:14:09 +02:00
Manfred Karrer
391930e9d0 Move trade statistics in package 2016-07-25 20:40:42 +02:00
Manfred Karrer
f56b717f25 Refactor option keys 2016-07-25 20:31:29 +02:00
Manfred Karrer
591a4e224f Use ETC instead of ETHC 2016-07-25 20:19:55 +02:00
Manfred Karrer
11ebdf39d2 Set v 0.4.9.1 2016-07-25 19:37:01 +02:00
Manfred Karrer
8b7ee140e4 Move Capabilities to own class 2016-07-25 18:28:29 +02:00
Manfred Karrer
a41e78290e Cleanup 2016-07-25 18:14:20 +02:00
Manfred Karrer
2240daf9c0 Merge branch 'LiveStats' into Development 2016-07-25 17:04:20 +02:00
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
ada3bd4dc3 Add publish statistics task for taker if offerer uses old version 2016-07-25 16:13:26 +02:00
Manfred Karrer
38cc71c6aa Add offerID 2016-07-25 10:24:45 +02:00
Manfred Karrer
a6660d04c9 Add TradeStatsisticsManager, add CoreOptionKeys, rename method in Storage 2016-07-25 10:16:06 +02:00
Manfred Karrer
b656226bd7 Add time check for trade statistics publishing 2016-07-25 01:28:14 +02:00
Manfred Karrer
274ac1870d Chart UI completed 2016-07-25 00:44:22 +02:00
Manfred Karrer
86273768b1 Separate volume chart. 2016-07-24 22:01:24 +02: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
3d11f8295d Add SupportedCapabilitiesMessage interface 2016-07-23 21:04:38 +02:00
Manfred Karrer
81b3eeb3f8 Reverted getSupportedCapabilities support in all messages 2016-07-23 19:59:36 +02:00
Manfred Karrer
b92c3ee1b6 Move supportedCapabilities from super class to concrete classes as it breaks serialisation. 2016-07-23 15:30:11 +02:00
Manfred Karrer
8e34eea62f Add supportedCapabilities 2016-07-23 15:00:38 +02:00
Manfred Karrer
bb6436eb0a Add try/catch and null checks 2016-07-23 14:53:00 +02:00
Manfred Karrer
3663a94f10 Rename CapabilityAwarePayload to CapabilityRequiringPayload 2016-07-23 14:49:35 +02:00
Manfred Karrer
12fbc6bde7 Add publishing of trade stat data 2016-07-23 14:44:26 +02:00
Manfred Karrer
37d31772c2 Add TradeStatistics and add it to P2P data storage after trade is completed 2016-07-22 17:34:38 +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
3a8c09c0d5 Add memorey check and restart routine for seednode 2016-07-22 16:32:01 +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
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
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
fd8db49d25 Improve logging 2016-07-19 16:28:13 +02:00
Manfred Karrer
952c2f1d48 Fix missing super call 2016-07-17 16:32:09 +02:00
Manfred Karrer
a4573208b4 Fix wrong thread at shutdownhook 2016-07-17 13:03:12 +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