Commit graph

3798 commits

Author SHA1 Message Date
Mike Rosseel
99c9bb6df7 Merge branch 'DAO' of github.com:bitsquare/bitsquare into DAO 2017-06-15 10:08:23 +02:00
Mike Rosseel
52dbbe8921 replace with guava method 2017-06-15 10:08:14 +02:00
Manfred Karrer
93eecd17e4 Fix transient fields on OfferForJson. Dont dump json in iteration but after. 2017-06-14 23:46:57 +02:00
Manfred Karrer
3f164e7923 Update provider address 2017-06-14 21:32:37 +02:00
Manfred Karrer
ccad4334a7 Move getDefaultBaseCurrencyNetwork from BaseCurrencyNetwork to BisqEnvironment.
Reformat BisqEnvironment with statics on top.
2017-06-14 15:10:50 +02:00
Mike Rosseel
423884ed1f Merge branch 'DAO' of github.com:bitsquare/bitsquare into DAO 2017-06-14 14:47:11 +02:00
Manfred Karrer
275ea6846b Move baseCurrency methods form BaseCurrencyNetwork to BisqEnvironment 2017-06-14 14:46:56 +02:00
Mike Rosseel
c135c46f79 Merge branch 'DAO' of github.com:bitsquare/bitsquare into DAO 2017-06-14 14:07:49 +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
Mike Rosseel
394b1b809e Add Litecoin onion seeds switching logic. 2017-06-14 10:08:55 +02:00
Manfred Karrer
224de8a65a New logo for splash screen 2017-06-14 00:57:31 +02:00
Manfred Karrer
a348cf8bb1 Add DogecoinRegTestParams (placeholder, not impl yet) 2017-06-13 20:58:39 +02:00
Manfred Karrer
72a0c4168d Add readObject to cover transient fields from serialized data 2017-06-13 20:48:56 +02:00
Manfred Karrer
ac2fc814fd Add ltc and doge block explorers 2017-06-13 13:45:53 +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
1b50bc9a3a Make minNonDustOutput base coin context specific 2017-06-13 10:41:41 +02:00
Manfred Karrer
b4fff9e1f6 Add market selection popup at startup 2017-06-13 08:53:13 +02:00
Manfred Karrer
ee4b91abb9 Make bsq format dynamic by base currency 2017-06-13 07:39:19 +02:00
Manfred Karrer
9aba9e607a Make tx fee dynamic by base currency 2017-06-13 07:35:35 +02:00
Manfred Karrer
5a0d493d02 Use 100 000 Sat for 1 BSQ in formatter. Use localhost fee provider 2017-06-12 21:54:08 +02:00
Manfred Karrer
9337101a9b Change fee structure for ltc 2017-06-12 21:39:37 +02:00
Manfred Karrer
ed6b2d9974 Add LtcFeesProvider 2017-06-12 21:15:17 +02:00
Manfred Karrer
029ca8c91b Add delay at blockheight display to cover both dao and bitcoinj updates 2017-06-12 17:50:11 +02:00
Manfred Karrer
a9a9f887f7 Change order of text entry fields 2017-06-12 17:49:36 +02:00
Manfred Karrer
75ed3f3baf Don't check sig if no sig is there. 2017-06-12 17:49:21 +02:00
Manfred Karrer
9b5172b2de Add basic PB support for BSQChainState (java serialized atm) 2017-06-12 12:29:30 +02:00
Manfred Karrer
07b43304c0 Merge remote-tracking branch 'origin/DAO' into DAO 2017-06-12 11:37:41 +02:00
Manfred Karrer
d6cd3cbac4 Add Serializable interface to Tuple2 (used in DAO snapshots) 2017-06-12 11:37:08 +02:00
Mike Rosseel
dddd0623af serializable breaks bsq chainstate snapshotting 2017-06-12 11:17:10 +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
d27c4a6d7f Use https://github.com/bitsquare/bitsquare instead of https://github.com/bisq/bisq 2017-06-11 22:52:47 +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
bf377501ad Add seed node for ltc mainnnet 2017-06-11 22:18:28 +02:00
Manfred Karrer
64a72ddec1 Add comment 2017-06-10 23:57:47 +02:00
Manfred Karrer
8b273c6c24 Only show Mainnet currency networks if not DEV_MODE is set 2017-06-10 14:02:36 +02:00
Manfred Karrer
a860f8c8d3 Support LTB for DAO as base currency 2017-06-10 13:56:30 +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
aea6300994 Add ltc local host seed nodes (port ends with 5) 2017-06-10 13:02:27 +02:00
Manfred Karrer
24d5b2d9ae Use libdohj v 0.14.1.
Update build.md
2017-06-10 12:03:41 +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
b82a0610c3 Run reformat code over project 2017-06-09 17:37:23 +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