Commit graph

848 commits

Author SHA1 Message Date
Manfred Karrer
563fa3cc28 Move proposal payload in separate class 2016-12-13 13:12:35 +01:00
Manfred Karrer
1126c50a7c Improve proposal list view with splitpane and scroller 2016-12-13 12:31:58 +01:00
Manfred Karrer
313ad63f17 Add proposal list view 2016-12-13 00:42:52 +01:00
Manfred Karrer
790563e997 Add create proposal view and fee payment tx. Add tabs for other dao subviews 2016-12-12 21:51:23 +01:00
Manfred Karrer
1f6842bd53 Update with new mock utxo, increase width of btc balance box 2016-12-11 23:31:42 +01:00
Manfred Karrer
4c488fd574 Cleanup 2016-12-11 23:10:22 +01:00
Manfred Karrer
c288c107af Fix bug with restore form seed. Remove one path element at BIP 44 chain path. Add UTXO provider support. 2016-12-11 23:00:46 +01:00
Manfred Karrer
9dab7aa2ed Add squUtxo provider and request classes 2016-12-11 19:09:24 +01:00
Manfred Karrer
a218bd1e15 Refactor wallets, add support for both wallet seeds (restore still not working). Cleanups. 2016-12-10 23:55:15 +01:00
Manfred Karrer
38a69c7711 Cleanup 2016-12-10 03:11:50 +01:00
Manfred Karrer
3041affe2c Support BIP 44 coin_type key chain.
Add sendFunds (SQU) method using BTC fees (BTC wallet).
Add send view.
Add EmptyWalletWindow for SQU wallet.
Add SQU formatter.
Remove unused AddressEntry.Context entires.
Add SQU wallet data to export window.
2016-12-10 03:09:32 +01:00
Manfred Karrer
8f7f1c06ec Rename BitcoinWalletService to BtcWalletService 2016-12-08 14:23:11 +01:00
Manfred Karrer
a7c5866935 Refactor wallet (WIP) 2016-12-08 14:14:39 +01:00
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