Commit graph

489 commits

Author SHA1 Message Date
Manfred Karrer
0ed4b07f4a Adjust fees for ltc 2017-06-22 15:25:15 +02:00
Manfred Karrer
868fbecaec Add localhost seednode (localhost:2008). Fix security desposit values and fees for doge. Fix layout issue with currency box. 2017-06-22 14:18:58 +02:00
Manfred Karrer
727b0d682e Make sec. deposit restrictions adjusted by base currency 2017-06-22 02:49:19 +02:00
Manfred Karrer
f3f05413fe Add checks for isBaseCurrencySupportingBsq 2017-06-22 02:22:50 +02:00
Manfred Karrer
e04aedfe3f Fix version check 2017-06-22 02:20:50 +02:00
Manfred Karrer
a46cb5317e handle stopTimer at end of tasks 2017-06-21 23:26:15 +02:00
Mike Rosseel
8fa8906ac2 Merge branch 'DAO' of github.com:bitsquare/bitsquare into DAO 2017-06-19 15:05:11 +02:00
Manfred Karrer
0cb4223246 Add printing of stats for trades by currency 2017-06-16 00:40:29 +02:00
Manfred Karrer
1464beb200 Fix issue with not selecting market price at startup 2017-06-15 23:29:50 +02:00
Manfred Karrer
af9b583a0a Add arbitratorPubKeyRing and mediatorPubKeyRing to trade. remove arbitrator from user at revoke 2017-06-15 15:03:56 +02:00
Mike Rosseel
52dbbe8921 replace with guava method 2017-06-15 10:08:14 +02:00
Manfred Karrer
275ea6846b Move baseCurrency methods form BaseCurrencyNetwork to BisqEnvironment 2017-06-14 14:46:56 +02:00
Manfred Karrer
b334065af0 Use static BaseCurrencyNetwork.getBaseCurrencyNetwork() calls. Rename env to environment and type Environment to BisqEnvironment in concrete classes. 2017-06-14 13:51:34 +02:00
Manfred Karrer
99a8618915 Activate dao flag 2017-06-14 13:05:58 +02:00
Manfred Karrer
362b0f9793 Add flags for deactivating dao and dao phase 2 features 2017-06-14 13:03:46 +02:00
Manfred Karrer
72a0c4168d Add readObject to cover transient fields from serialized data 2017-06-13 20:48:56 +02:00
Manfred Karrer
edb71d1d86 Add altcoin validation for btc. ltc and doge. change order of base currency network to avoid to break port assignment by enum ordinal. add btc to altcoin list if not base currency. 2017-06-13 12:44:25 +02:00
Manfred Karrer
7bd9ba6fb0 Convert btc based market price to ltc or doge based market price 2017-06-13 11:24:11 +02:00
Manfred Karrer
b4fff9e1f6 Add market selection popup at startup 2017-06-13 08:53:13 +02:00
Manfred Karrer
9b5172b2de Add basic PB support for BSQChainState (java serialized atm) 2017-06-12 12:29:30 +02:00
Manfred Karrer
d6cd3cbac4 Add Serializable interface to Tuple2 (used in DAO snapshots) 2017-06-12 11:37:08 +02:00
Manfred Karrer
7e52f2f6b8 Replace usage of "BTC" in code with base currency. Set LTC genesis tx (dev) 2017-06-12 01:59:10 +02:00
Manfred Karrer
f9cd71c5c2 Replace usage of "BTC" in code with base currency. Remove denomination property in preferences 2017-06-11 23:39:41 +02:00
Manfred Karrer
ba3fcc2cd4 Apply string replace for BTC, Bitcoin and bitcoin to selected base currency 2017-06-11 22:49:26 +02:00
Manfred Karrer
0583b7a3cb use capital letter for Bisq. Use bitsquare in github links (new bisq GH not defined yet) 2017-06-11 22:25:25 +02:00
Manfred Karrer
ff548093d9 Fix layout bug. Use resource file for display string. 2017-06-10 13:56:03 +02:00
Manfred Karrer
f847900049 Rename BaseCryptoNetwork to BaseCurrencyNetwork 2017-06-10 13:06:24 +02:00
Manfred Karrer
f8c7149e68 Merge branch 'DAO' into altcoins 2017-06-10 11:29:36 +02:00
Mike Rosseel
dc01aef917 libdohj was lost 2017-06-09 20:03:09 +02:00
Manfred Karrer
934474f6d0 Fix incorrect handling of messageVersion. Make NetworkEnvelope a abstract class instead of Interface. 2017-06-09 17:36:16 +02:00
Mike Rosseel
f99a3c1238 Merge branch 'DAO' into altcoins
Conflicts:
	common/src/main/java/io/bisq/common/proto/ProtoUtil.java
	core/src/main/java/io/bisq/core/user/Preferences.java
2017-06-09 16:58:06 +02:00
Mike Rosseel
a61a350ec7 read preferred crypto network from property file 2017-06-09 16:45:41 +02:00
Manfred Karrer
e86edd8384 Migrate old trade statistic db to new data structure.
Use SignaturePubKeyBytes instead of PubKeyRing in TradeStatistics.
Use PersistedEntryMap instead of PersistableHashMap.
Use bytes as Hex encoded instead of toString call.
Use ConcurrentHashMap for SequenceNumberMap and PersistedEntryMap
2017-06-08 23:47:55 +02:00
Manfred Karrer
8189749125 Add in-dev resource files 2017-06-08 18:07:45 +02:00
Manfred Karrer
61809779f0 Apply code formatter 2017-06-08 18:03:35 +02:00
Manfred Karrer
65285bfe30 Apply code inspection 2017-06-08 18:02:05 +02:00
Manfred Karrer
e81c72232d Add "open log file" button to backup view 2017-06-08 13:25:49 +02:00
Manfred Karrer
813d896295 Fix P2PDataStorage bug (missing super call for lombok equalsandhashcode) 2017-06-08 12:06:09 +02:00
Manfred Karrer
677f6c81c6 Add missing contractHash from PB.Trade.
Dont set nullable trade objects if PB is not set.
Remove Serializable form Proto interface
Remove LookAheadObjectInputStream
2017-06-08 00:55:53 +02:00
Manfred Karrer
b64457e869 Fix missing ProtocolVersion in Offer.
Use getTTL() instead of Lombok Getter with instance field
2017-06-07 21:15:50 +02:00
Manfred Karrer
22d90f627c Use ProtoUtil.protoToNullableString and protoToToNullableByteArray instead of isEmpty checks and null assignement.
Use fromProto for BlockChainExplorer, Country, CryptoCurrency, FiatCurrency
Use @EqualsAndHashCode(callSuper = true) for PaymentAccounts
Replace Samenknoten with Seednodes in german translation
Clean up PB definitions.
2017-06-07 20:25:38 +02:00
Mike Rosseel
d50ff6c6dc added the LTC network id's, renamed bitcoinNetwork to baseCryptoNetwork.
Still a few places with BTC left, needs some more thought like TOR options, file to save the wallet to, ...
2017-06-06 11:14:15 +02:00
Manfred Karrer
1e01ef3650 Cleanup PB definitions and methods 2017-06-06 02:39:37 +02:00
Manfred Karrer
e5b775d07c Cleanup PB definitions and methods 2017-06-05 23:13:51 +02:00
Manfred Karrer
3f756d4923 Cleanup PB definitions and methods 2017-06-05 21:03:50 +02:00
Manfred Karrer
5558d2f39b Fix nullable fields in Dispute 2017-06-05 20:02:58 +02:00
Manfred Karrer
331320f202 Added PEPECASH 2017-06-04 15:57:05 +02:00
Manfred Karrer
0c50fb9413 Fix missing check of isMyOwnRegisteredArbitrator 2017-06-04 00:13:42 +02:00
Manfred Karrer
ede90eb4cd Fix logs 2017-06-02 18:58:29 +02:00
Manfred Karrer
9374d4907f Fix issues with dispute, trade, userpayload, persistance 2017-06-02 18:57:05 +02:00