Commit graph

588 commits

Author SHA1 Message Date
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
Manfred Karrer
546737a728 Fix missing handling of mailbox msg 2016-07-15 22:27:00 +02:00
danda
6333452255 initial work/investigation towards routing bitcoinj over jtorproxy. work in progress 2016-07-13 14:49:59 -07:00
Manfred Karrer
2d05ad99b6 Remove reSendConfirmation calls 2016-07-13 15:08:58 +02:00
Manfred Karrer
8fd3169a56 Add FlorinCoin 2016-07-13 11:55:30 +02:00
Manfred Karrer
929a357130 Add myAddress and banlist to options 2016-07-12 16:53:50 +02:00
Manfred Karrer
1df02ee750 Move methods to Superclass 2016-07-12 16:28:32 +02:00
Manfred Karrer
3e18ba94b0 Don't display multiple disputes from same trade (in case when both open dispute). Delay msg so the order is correct (open dispute msg need to be processed before comm. msg or close msg). Add check for isBoostrapped when opening dispute. Add error msg handler. 2016-07-12 14:55:00 +02:00
Manfred Karrer
9295d23df2 Set key to addressEntry at encryptWallet 2016-07-12 01:48:18 +02:00
Manfred Karrer
e019c7a418 Fix bug with missing decryption/encryption of keys in address entries after wallet pw enable/disable 2016-07-11 23:53:03 +02:00
Manfred Karrer
bd47774ff3 Fix ignorelist onion address check 2016-07-09 16:52:08 +02:00
Manfred Karrer
f044555b58 Add check if bootstrapped before calling remove offers at shutdown, improve logging 2016-07-09 16:22:27 +02:00
Manfred Karrer
3d634a9df3 Remove offers at shutdown only if bootstrapped 2016-07-09 16:13:11 +02:00
Manfred Karrer
42e8abaf08 Send payout tx at dispute case to peer if trade was already completed 2016-07-09 16:00:59 +02:00
Manfred Karrer
ac24793b82 Improve logging 2016-07-09 14:32:45 +02:00
Manfred Karrer
46b5eac7f4 Increase pause before shutdown after all offers got removed 2016-07-09 00:38:44 +02:00
Manfred Karrer
c957b53f3a Add headless version for monitoring statistics (Bitsquare-proxy) and network stress testing 2016-07-08 18:45:09 +02:00
Manfred Karrer
fb3bdf0cea Added Worldcoin 2016-07-06 13:44:12 +02:00
Manfred Karrer
251656e4e5 Merge branch 'HotFix_0.4.8.1' 2016-07-05 14:47:14 +02:00
Manfred Karrer
b3dc95f9c8 Fix bug with multiple arbitrators 2016-07-05 14:28:25 +02:00
Manfred Karrer
3f2c79378f v 0.4.8.1 2016-07-05 14:04:21 +02:00
Manfred Karrer
eec5d55428 Set all arbitr. matching language if set in preferences 2016-07-05 02:00:23 +02:00
Manfred Karrer
1e1e4b6113 Add support for 4 digit version nr. 2016-07-04 12:43:03 +02:00
Manfred Karrer
925f59a9ea Add prog args for seedNodes and ignoreDevMsg. Refactor old options 2016-07-03 21:41:22 +02:00
Manfred Karrer
f2d7b440a5 Filter for offerid, nodeaddress and payment account data 2016-07-03 19:06:33 +02:00
Manfred Karrer
0798683bda Add filter 2016-07-03 13:11:56 +02:00