Commit Graph

869 Commits

Author SHA1 Message Date
Manfred Karrer
1fd526199d Add bitcoind rpc service for requesting blocks. Add params in voting. Change UI for voting. (WIP) 2017-01-08 22:09:41 +01:00
Manfred Karrer
7fde564e80 Use key of SQU input for signing 2017-01-04 20:18:53 +01:00
Manfred Karrer
f286cb6791 Use delegate in WalletService to avoid direct access to wallet 2017-01-03 14:50:48 +01:00
Manfred Karrer
8058c17db9 Merge branch 'Development' into DAO 2017-01-03 12:35:20 +01:00
Manfred Karrer
aa29f94a88 Merge branch 'master' into Development 2017-01-03 12:15:12 +01:00
HostFat
6b1dd041b6 Adding Bitaps block explorer 2016-12-29 09:23:51 +01:00
Manfred Karrer
cf6f305533 Add DaoService, phases (WIP) 2016-12-25 16:35:47 +01:00
Manfred Karrer
4cbd0f8966 Add voting parameters 2016-12-22 11:57:25 +01:00
Manfred Karrer
7a813961f9 Add sorting of requests, support null values in data map 2016-12-22 03:26:17 +01:00
Manfred Karrer
32e7bd7f0b Update voting hash calculation 2016-12-22 01:46:14 +01:00
Manfred Karrer
5dc00eb427 Use version byte and ripemd160 hash of json for comp. data. Use only primitive data in comp. data. 2016-12-21 23:05:04 +01:00
Manfred Karrer
5c9c14255c Refactor SquCoinSelectors 2016-12-20 20:31:08 +01:00
Manfred Karrer
bb2ba7a6de Use adoption of org.bitcoinj.wallet.DefaultCoinSelector as super class for BtcCoinSelector 2016-12-20 16:30:35 +01:00
Manfred Karrer
4bddbdfb91 Refactor coin selector and trade wallet wire up 2016-12-20 16:05:59 +01:00
Manfred Karrer
ba27bddf61 Fix private constructors, add ignore inspection annotations 2016-12-20 16:01:07 +01:00
Manfred Karrer
5de17018f0 Clean up tx creation, fix issue with tx commit in both wallets. Add data for voting hash 2016-12-19 00:47:21 +01:00
Manfred Karrer
03d986138b Add Safe FileSystem Coin 2016-12-17 22:20:36 +01:00
Manfred Karrer
4ccb84dd4f Sign all squ inputs, rename proposal to compensation. 2016-12-15 18:48:54 +01:00
Manfred Karrer
d9f8e20554 Change naming: Proposal to CompensationRequest 2016-12-14 19:24:53 +01:00
Manfred Karrer
13ec29816f Add vote view and domain (WIP) 2016-12-13 14:51:05 +01:00
Manfred Karrer
c8d58248bb Fix ProposalDisplay 2016-12-13 13:20:02 +01:00
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