Commit graph

845 commits

Author SHA1 Message Date
Manfred Karrer
73f2139923 Fixed missing price update in offerbook table.
Rename currenciesUpdateFlagProperty to updateCounterProperty.
Remove dev logs
2017-07-01 00:11:20 +02:00
Manfred Karrer
875db1f32e Move base currency/network selection from network settings to preferences 2017-06-30 22:01:35 +02:00
Manfred Karrer
926f317a37 Add support for different REFERENCE_DEFAULT_MIN_TX_FEE by base currency 2017-06-30 21:29:32 +02:00
Manfred Karrer
5be0a3750e Add btc address validator to last trade step for withdrawal.
Remove dontshow again option for tx summary popup.
2017-06-30 21:03:36 +02:00
Manfred Karrer
45001ad965 Increase timeout to 2 min 2017-06-30 20:27:08 +02:00
Manfred Karrer
bb0f0ec273 Add callback for tradeFee tx to be seen in the network to avoid errors at take offer that the trade address is not funded. 2017-06-30 20:17:27 +02:00
Manfred Karrer
35635c7b9d Turn off logs for BlockingClient 2017-06-30 13:10:53 +02:00
Manfred Karrer
31ace1c5d3 Fix missing handling of diff. PersistedEntryMaps (trade statistics) from resource file 2017-06-29 20:22:08 +02:00
Manfred Karrer
7441f346a2 Fix issue with InsufficientMoneyException 2017-06-28 13:14:09 +02:00
Manfred Karrer
d6e3bdd100 Fix issue with InsufficientMoneyException 2017-06-28 12:45:23 +02:00
Manfred Karrer
8197be2c8a Cleanup TODOs 2017-06-27 21:47:03 +02:00
Manfred Karrer
e11b314bbb Add email to bank accounts. Add warning and info for bank accounts regarding chargeback risk and id verification. Add warning to CXC accounts. 2017-06-27 21:05:47 +02:00
Manfred Karrer
e258b17e7a Update license with Bisq instead of bisq 2017-06-27 01:39:11 +02:00
Manfred Karrer
f268abe2e1 Merge DAO branch to Development branch 2017-06-27 01:30:24 +02:00
Manfred Karrer
e2fa679a68 Merge DAO branch to Development branch 2017-06-27 01:29:54 +02:00
Manfred Karrer
24b19e527b Fix wrong trade fees 2017-05-18 15:41:04 +02:00
Manfred Karrer
c5e23feccd Increase default tx fee for non-trade txs to 150_000 sat 2017-05-18 00:29:06 +02:00
Manfred Karrer
b38e7806d9 Increase tx fee for trades to 150_000 sat 2017-05-18 00:27:53 +02:00
Manfred Karrer
ec6d67ca72 Add Janus 2017-05-18 00:16:58 +02:00
Manfred Karrer
b50714eb30 Add Janus 2017-05-18 00:16:30 +02:00
Manfred Karrer
34ca2ecf28 Add OctoCoin 2017-03-30 21:18:19 -05:00
Manfred Karrer
57f201fa55 Reduce nr. of backups for PersistedP2PStorageData and TradeStatisitics 2017-03-22 21:31:56 -05:00
Manfred Karrer
adbb547eb1 Rename offererMultiSigPubKey to offererBtcPubKey (as well as wellers side) to not break serialized data 2017-03-22 13:31:45 -05:00
Manfred Karrer
50329567bd Increase non trade tx fee default value. change upper limit for tx fee. increase width of data column in arbitr. screen 2017-03-22 13:04:13 -05:00
Manfred Karrer
b2a85d65f3 Merge branch 'master' into Development
# Conflicts:
#	pom.xml
2017-03-22 12:14:42 -05:00
Manfred Karrer
6348c9c70a Cleanup 2017-03-22 11:55:15 -05:00
Manfred Karrer
30e91ea0ee Dont use peers from AddressMessage calls in btcj if we have set our own node addresses or use localhost. 2017-03-17 00:44:01 -05:00
Manfred Karrer
5bc1ee2257 Merge branch 'Allow_reopen_dispute' into Development 2017-03-06 15:06:15 -05:00
Manfred Karrer
96f208f82b Allow re-opening of a dispute (in case the arbitrator has not received it) 2017-03-06 14:49:29 -05:00
Manfred Karrer
4e467b9530 Display BuyerMultiSigPubKey and SellerMultiSigPubKey in Contract.toString. Use Utils.HEX.encode instead of Arrays.toString for pub keys printing.
Remove BuyerMultiSigPubKey and SellerMultiSigPubKey from ContractWindow and TradeDetailsWindow (included in contract.toString now)
2017-03-01 10:18:44 -05:00
Manfred Karrer
9704619f6b Merge remote-tracking branch 'origin/Development' into Development 2017-02-28 09:57:14 -05:00
Manfred Karrer
a239ccee10 Remove debug logs 2017-02-28 09:55:37 -05:00
Manfred Karrer
478ecac255 Merge branch 'master' into Development 2017-02-23 14:07:37 -05:00
Manfred Karrer
01fbab60b7 Fix missing tx fee at Empty Wallet method. Add more logs 2017-02-23 14:06:06 -05:00
Manfred Karrer
4f0d6484c5 Add saving of addressEntryList at each change of list, remove usage of AddressEntry in TradeWalletService.
Add pubKey to contract window at trade details popup.
Remove unused arrays in SpendFromDepositTxWindow.
2017-02-19 13:14:27 -05:00
Manfred Karrer
246b15bee9 Add util for printing all altcoins for adding to FAQ page 2017-02-11 22:33:08 -05:00
Manfred Karrer
f42628fcd8 Add offer as parameter to getSecurityDeposit and getFixedTxFeeForTrades calls if available to support trades between different protocol versions 2017-02-11 21:06:01 -05:00
Manfred Karrer
49940b6420 Small adoptions, cleanups 2017-02-10 19:47:44 -05:00
Manfred Karrer
7028b3afef Add checkIfOpenOffersMatchTradeProtocolVersion method at startup 2017-02-10 18:36:32 -05:00
Manfred Karrer
6cf439b8bd Connect to local Bitcoin Core node if it is running (ignore use Tor flag) 2017-02-10 16:33:17 -05:00
Manfred Karrer
6a03ce31e1 Fix missing breaks 2017-02-10 16:33:04 -05:00
Manfred Karrer
891580f458 Add test for version update check (support versions with more then 4 digits) 2017-02-10 14:11:26 -05:00
Manfred Karrer
75946a3901 Add SWT 2017-02-09 18:00:17 -05:00
Manfred Karrer
8c57616f7a Remove used key 2017-02-08 18:35:34 -05:00
Manfred Karrer
a83acbeb25 Reduce tx fee, sec. deposit and createe offer fee, cleanup, comments update 2017-02-08 16:15:14 -05:00
Manfred Karrer
c6f5c9ecb5 Increase trade and offer availability timeouts 2017-02-07 21:05:32 -05:00
Manfred Karrer
4cafddabc7 Add version nr to offer id, use more randomized prefix for short id 2017-02-07 19:44:45 -05:00
Manfred Karrer
d65e098933 Increase tx fee to 0.0007 btc, increase tradeprotocol version, change log level for tx details to INFO 2017-02-07 18:47:20 -05:00
Manfred Karrer
283b4723e6 Added Botswana 2017-02-07 10:11:08 -05:00
Manfred Karrer
d88aceddf8 Clean up, add missing coins (LTBcoin, SFSC) 2017-02-07 10:05:15 -05:00