1135 commits

Author	SHA1	Message	Date
Manfred Karrer	68845d197e	Refactor wallet (add WalletService) (WIP)	2016-12-08 01:29:24 +01:00
Manfred Karrer	7357a1afd1	Rename WalletService to BitcoinWalletService	2016-12-08 00:11:05 +01:00
Manfred Karrer	3654fa815e	Rename WalletAppKit	2016-12-08 00:10:18 +01:00
Manfred Karrer	8d17bef5b2	Merge miningFee branch. Rix delay if provider is not available	2016-12-08 00:09:03 +01:00
Manfred Karrer	eba9fcd051	Merge branch 'MiningFeeFix' into DAO ... # Conflicts: # core/src/main/java/io/bitsquare/btc/WalletService.java	2016-12-07 23:58:49 +01:00
Manfred Karrer	e9f1a887a5	Add token wallet sub views. Use 2 wallets inside walletappkit	2016-12-07 23:44:44 +01:00
Manfred Karrer	44ebfce1b1	Add token wallet	2016-12-07 20:11:54 +01:00
Manfred Karrer	12ec330bf4	Add more tests	2016-12-07 03:59:29 +01:00
Manfred Karrer	cac837097e	Update tests	2016-12-07 01:39:12 +01:00
Manfred Karrer	7eb4413fba	Move mock service to tests	2016-12-07 01:24:47 +01:00
Manfred Karrer	3a0491b4b7	Add tests, input/output checks and getUTXOs	2016-12-07 01:23:23 +01:00
Manfred Karrer	a961c3088c	Merge branch 'Development' into DAO	2016-12-06 22:34:53 +01:00
Manfred Karrer	6c227ee286	Fix merge conflict	2016-12-06 22:34:18 +01:00
Manfred Karrer	bda6046f12	Added Fermat	2016-12-06 22:31:02 +01:00
Manfred Karrer	5bb9c0e093	Start mock tx parsing	2016-12-06 22:05:17 +01:00
Manfred Karrer	bd6240b08f	Merge branch 'Development' into MiningFeeFix	2016-12-06 18:52:18 +01:00
Manfred Karrer	857d31ecc3	Added Georgia	2016-12-06 18:49:04 +01:00
Manfred Karrer	8f670c9b0a	Remove FeeService form Preferences, cleanup	2016-12-06 16:14:25 +01:00
Manfred Karrer	a6ca1cec41	Apply estimated fee to withdrawal methods	2016-12-06 15:08:32 +01:00
Manfred Karrer	a759197f1b	Support custom fee for withdrawal	2016-12-06 01:57:36 +01:00
Manfred Karrer	6f9e7af7b0	Move uid to HttpClient, cleanup	2016-12-05 23:50:09 +01:00
Manfred Karrer	5beb7e6a1b	Use security deposit from offer. Use fixed estimated tx size for fee calculation	2016-12-05 23:39:56 +01:00
Manfred Karrer	963086106f	Move mining fee payment to taker. Refactor package io.bitsquare.pricefeed to io.bitsquare.provider.price. Rename option priceFeedProviders to providers	2016-12-05 17:25:50 +01:00
Manfred Karrer	d5817020a6	Taker pays mining fee for both trade txs.	2016-12-03 02:27:58 +01:00
Manfred Karrer	1389cfd7d5	Remove mining fee for offerer (used for paying in trade - miningfee for createOfferFee tx is deducted form createOfferFee)	2016-12-03 01:10:53 +01:00
Manfred Karrer	b97fe356ca	Remove feeService form Restrictions class, add getTxFeeForWithdrawal to FeeService, user TakerFee from offer (WIP)	2016-12-03 00:57:27 +01:00
Manfred Karrer	f467ae1090	Add new properties to Offer an Trade. Store fees in offer/trade. Replaced static tx fee with fee from FeeService.	2016-12-03 00:25:55 +01:00
Manfred Karrer	f8908668a1	Removed DAO token	2016-12-01 19:58:08 +01:00
Manfred Karrer	9102b81f39	Add check for invalid offer id	2016-12-01 02:49:47 +01:00
Manfred Karrer	6663504dea	Set deposit tx directly and update after broadcast instead of settign only after broadcast (sometimes the deposit tx was missing because user prob. closed before broadcast succeeded).	2016-11-28 19:23:10 +01:00
Manfred Karrer	6619f3d548	Add Xaurum	2016-11-26 21:29:02 +01:00
Manfred Karrer	ddf63cccd8	Improve logging, cleanup	2016-11-26 20:54:04 +01:00
Manfred Karrer	7acfdb23de	Add tool for manually creating the payout tx. Change shortcuts	2016-11-26 18:16:12 +01:00
Manfred Karrer	a87b855164	Add NEVA	2016-11-26 16:36:04 +01:00
Manfred Karrer	323f1cab90	Added AquariusCoin	2016-11-23 14:29:34 +01:00
Manfred Karrer	90565bf43b	Check if offer id is null before republishing	2016-11-19 16:07:18 +01:00
Manfred Karrer	c7e6c0309a	Removed duplicate entry	2016-11-19 16:07:02 +01:00
Manfred Karrer	3bf4c60567	Prepare for v0.4.9.8	2016-11-19 14:36:23 +01:00
Manfred Karrer	6ca66c6b8f	Add export tool for wallet data	2016-11-19 14:31:26 +01:00
Manfred Karrer	c970201833	Show always bank name	2016-11-18 01:28:13 +01:00
Manfred Karrer	abcfe202ea	Avoid duplicate countries in list	2016-11-18 01:25:12 +01:00
Manfred Karrer	e816e8d8ab	Increase max. trade period for US postal money order to 8 days	2016-11-15 14:11:15 +01:00
Manfred Karrer	710789acb9	Update comments	2016-11-15 14:04:19 +01:00
Manfred Karrer	b800999614	Add popup for adding a full btc node ip address at first startup as well in settings	2016-11-15 01:13:24 +01:00
Manfred Karrer	c8022fd7db	Added Crown	2016-11-14 18:59:07 +01:00
Manfred Karrer	4dbd3a03c8	Rename btcSeedNodes prog. arg to btcNodes	2016-11-14 15:17:05 +01:00
Manfred Karrer	3fb7cb1de4	Merge branch 'master' into Development	2016-11-13 22:56:31 +01:00
Manfred Karrer	08695377ce	Rename method, use statics for prefix symbol	2016-11-13 22:30:53 +01:00
Manfred Karrer	061e79137e	Remove comment	2016-11-13 21:48:08 +01:00
Manfred Karrer	fe341e1836	Update request period	2016-11-13 21:47:44 +01:00