Commit graph

1149 commits

Author SHA1 Message Date
Manfred Karrer
9ade57842b Dont store unused data if no jsonDump is done. Cleanup. 2017-04-18 15:35:03 -05:00
Manfred Karrer
946e4d9e29 Add verifications for phase 2 features (WIP). Refactor dao domain. Make BsqChainState threadsafe. 2017-04-18 14:53:13 -05:00
Manfred Karrer
df5ad53eb9 Use thread for json export 2017-04-17 15:39:37 -05:00
Manfred Karrer
29e3ad0ee3 Add blockHeight text field to UI. 2017-04-17 15:34:26 -05:00
Manfred Karrer
cfe814e4cd Make snapshot in same thread which is writing the block. Reset data and apply latest snapshot at reorg. 2017-04-17 14:43:18 -05:00
Manfred Karrer
27462f0e83 Use Thread for parsing BsqBlocks at BsqLiteNode 2017-04-16 23:38:50 -05:00
Manfred Karrer
2955c0efff Use Seednode for block requests. Broadcast new blocks to P2P network. Add AppSetup class for SeedNode. Remove utxo_provider module (seednode can be configured to act as BSQ full node) 2017-04-16 23:28:36 -05:00
Manfred Karrer
7752125263 Reenable snapshot handling 2017-04-15 16:39:49 -05:00
Manfred Karrer
c54087542c Make chainstate class thread safe 2017-04-15 12:44:21 -05:00
Manfred Karrer
7d355215a1 Add blocks and txs, clean up 2017-04-15 00:24:41 -05:00
Manfred Karrer
905ca65f33 Use mutable state object and immutable blockchain value objects (WIP) 2017-04-14 23:39:26 -05:00
Manfred Karrer
59162ef0f0 Make Persistable extends Marshaller and rename toProtobuf to toProto (same as in Marshaller) 2017-04-14 00:32:09 -05:00
Manfred Karrer
25337c3b7c Refactoring: move generic stuff to ProtoUtil (reuse for persist.) 2017-04-14 00:29:13 -05:00
Manfred Karrer
c14a07abd4 Refactoring: move protpResolver to other packages. Separate network and persist. resolver 2017-04-14 00:01:33 -05:00
Manfred Karrer
ce3070310e Rename getBaseEnvelope to getEnv 2017-04-13 23:32:17 -05:00
Manfred Karrer
d4bdc6f8e3 Fix msg version issues 2017-04-13 23:29:17 -05:00
Manfred Karrer
1dd6385232 Apply code inspection on network module 2017-04-13 22:26:36 -05:00
Manfred Karrer
4c38e367b4 Remove param form AddressEntry, small refactorings... 2017-04-13 20:02:15 -05:00
Manfred Karrer
36e9831aae Fix AddressEntry issues and pref. issues. Reove KeyBagSupplier 2017-04-13 19:33:55 -05:00
Manfred Karrer
bc32048301 Fix incorrect call at TakerPublishTakerFeeTx 2017-04-13 17:57:25 -05:00
Manfred Karrer
1aefa0284f Merge branch 'dao-disk-merge' into DAO 2017-04-13 17:01:30 -05:00
Manfred Karrer
b95ab354e5 Move snapshot handling to manager class. use callback for each block 2017-04-13 15:16:11 -05:00
Mike Rosseel
61f4ff5ae8 Merge branch 'disk-protobuffer' into dao-disk-merge
Conflicts:
	core/src/main/java/io/bisq/core/dao/blockchain/BsqBlockchainManager.java
	core/src/main/java/io/bisq/core/dao/blockchain/TxOutputMap.java
	core/src/main/java/io/bisq/core/user/Preferences.java
	core/src/test/java/io/bisq/core/dao/blockchain/BsqBlockchainServiceTest.java
	gui/src/main/java/io/bisq/gui/main/dao/wallet/receive/BsqReceiveView.java
	gui/src/main/java/io/bisq/gui/main/dao/wallet/send/BsqSendView.java
2017-04-13 21:39:39 +02:00
Mike Rosseel
d2010c6088 merge dopersist fix 2017-04-13 21:08:04 +02:00
Mike Rosseel
2d3706f4d7 Merge branch 'disk-protobuffer' of github.com:bitsquare/bitsquare into disk-protobuffer 2017-04-13 21:06:48 +02:00
Mike Rosseel
d5bd386bbd fix preferences saving/loading 2017-04-13 21:06:38 +02:00
Manfred Karrer
552d8f1910 Add reorg handling 2017-04-13 13:50:03 -05:00
Manfred Karrer
8516781ed7 Handle threading issues with parser 2017-04-13 10:37:07 -05:00
Manfred Karrer
b99a428198 Fix wrong doPersist call 2017-04-13 09:00:08 -05:00
Manfred Karrer
ac7714078c Remove useStickyMarketPrice (not used anymore) 2017-04-12 21:54:16 -05:00
Manfred Karrer
1809393b69 User persist method and flag to prevent persist calls at PB setters 2017-04-12 21:50:07 -05:00
Manfred Karrer
566e95274b Preferences use init method to break circ. dependency at injection time. 2017-04-12 21:43:25 -05:00
Manfred Karrer
7312d258f5 Add unverified balance and total balance fieds. Show pending txs in tx list. Fix balance bugs. 2017-04-11 22:42:15 -05:00
Manfred Karrer
d775bbfd8b Remove TakerPublishTradeStatistics task 2017-04-11 20:07:39 -05:00
Manfred Karrer
704fe3f521 Remove CapabilityRequiringPayload from TradeStatistics 2017-04-11 20:04:44 -05:00
Manfred Karrer
60b75f0dbd Fix bug with doublespend at create offer. Handle threading with rpc request. Support snapshots. Start support for P2P network (WIP). 2017-04-11 20:00:12 -05:00
Mike Rosseel
3b09202fd0 Merge remote-tracking branch 'origin/DAO' into disk-protobuffer
Conflicts:
	core/src/main/java/io/bisq/core/dao/blockchain/BsqBlockchainManager.java
	core/src/main/java/io/bisq/core/dao/blockchain/BsqTXOMap.java
	core/src/main/java/io/bisq/core/dao/blockchain/BsqUTXOMap.java
	core/src/test/java/io/bisq/core/dao/blockchain/BsqBlockchainServiceTest.java
	gui/src/main/java/io/bisq/gui/main/dao/wallet/BalanceUtil.java
	gui/src/main/java/io/bisq/gui/main/overlays/Overlay.java
2017-04-11 11:04:42 +02:00
Mike Rosseel
ead174bba6 Merge remote-tracking branch 'origin/DAO' into disk-protobuffer
Conflicts:
	core/src/main/java/io/bisq/core/dao/blockchain/BsqBlockchainManager.java
	core/src/main/java/io/bisq/core/dao/blockchain/BsqTXOMap.java
	core/src/main/java/io/bisq/core/dao/blockchain/BsqUTXOMap.java
	core/src/test/java/io/bisq/core/dao/blockchain/BsqBlockchainServiceTest.java
	gui/src/main/java/io/bisq/gui/main/dao/wallet/BalanceUtil.java
	gui/src/main/java/io/bisq/gui/main/overlays/Overlay.java
2017-04-11 09:58:48 +02:00
Manfred Karrer
a24ca8edaf Remove UTXOMap and use TxoMap instead. Cleanup thread handling. Refactor parser and services. Remove RPC_WALLET_NOTIFICATION_PORT option. 2017-04-11 00:00:34 -05:00
Manfred Karrer
c9917998d8 Merge branch 'DAO' into RefactorUTXOHandling 2017-04-10 13:46:06 -05:00
Manfred Karrer
da79577dff Use BsqBalanceListener (WIP) 2017-04-10 13:45:17 -05:00
Mike Rosseel
1182b08d3b Merge remote-tracking branch 'origin/DAO' into disk-protobuffer
Conflicts:
	core/src/main/java/io/bisq/core/dao/blockchain/BsqBlockchainManager.java
2017-04-10 20:40:51 +02:00
Manfred Karrer
1d53055e2c Add check if rpc is used 2017-04-10 13:38:26 -05:00
Mike Rosseel
2878db9c0b Merge remote-tracking branch 'origin/DAO' into disk-protobuffer
Conflicts:
	common/src/main/java/io/bisq/common/locale/CountryUtil.java
	common/src/main/java/io/bisq/common/locale/FiatCurrency.java
	core/src/main/java/io/bisq/core/btc/wallet/TradeWalletService.java
	core/src/main/java/io/bisq/core/btc/wallet/WalletsSetup.java
	core/src/main/java/io/bisq/core/payment/AliPayAccount.java
	core/src/main/java/io/bisq/core/payment/ChaseQuickPayAccount.java
	core/src/main/java/io/bisq/core/payment/ClearXchangeAccount.java
	core/src/main/java/io/bisq/core/payment/FasterPaymentsAccount.java
	core/src/main/java/io/bisq/core/payment/InteracETransferAccount.java
	core/src/main/java/io/bisq/core/payment/OKPayAccount.java
	core/src/main/java/io/bisq/core/payment/PerfectMoneyAccount.java
	core/src/main/java/io/bisq/core/payment/SepaAccount.java
	core/src/main/java/io/bisq/core/payment/SwishAccount.java
	core/src/main/java/io/bisq/core/payment/USPostalMoneyOrderAccount.java
	core/src/main/java/io/bisq/core/trade/protocol/ProcessModel.java
	core/src/main/java/io/bisq/core/trade/protocol/tasks/taker/TakerCreateTakerFeeTx.java
	core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java
	core/src/main/java/io/bisq/core/user/BlockChainExplorer.java
	core/src/main/java/io/bisq/core/user/Preferences.java
	core/src/main/java/io/bisq/core/user/User.java
	gui/src/main/java/io/bisq/gui/components/PeerInfoIcon.java
	gui/src/main/java/io/bisq/gui/components/paymentmethods/CashDepositForm.java
	gui/src/main/java/io/bisq/gui/components/paymentmethods/OKPayForm.java
	gui/src/main/java/io/bisq/gui/components/paymentmethods/PaymentMethodForm.java
	gui/src/main/java/io/bisq/gui/components/paymentmethods/SepaForm.java
	gui/src/main/java/io/bisq/gui/main/MainViewModel.java
	gui/src/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationView.java
	gui/src/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationViewModel.java
	gui/src/main/java/io/bisq/gui/main/account/content/password/PasswordView.java
	gui/src/main/java/io/bisq/gui/main/account/content/seedwords/SeedWordsView.java
	gui/src/main/java/io/bisq/gui/main/dao/wallet/BalanceUtil.java
	gui/src/main/java/io/bisq/gui/main/dao/wallet/receive/BsqReceiveView.java
	gui/src/main/java/io/bisq/gui/main/dao/wallet/send/BsqSendView.java
	gui/src/main/java/io/bisq/gui/main/market/offerbook/OfferBookChartViewModel.java
	gui/src/main/java/io/bisq/gui/main/market/trades/TradesChartsViewModel.java
	gui/src/main/java/io/bisq/gui/main/offer/OfferView.java
	gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferDataModel.java
	gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferView.java
	gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferViewModel.java
	gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookView.java
	gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookViewModel.java
	gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferView.java
	gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferViewModel.java
	gui/src/main/java/io/bisq/gui/main/overlays/Overlay.java
	gui/src/main/java/io/bisq/gui/main/overlays/editor/PeerInfoWithTagEditor.java
	gui/src/main/java/io/bisq/gui/main/overlays/notifications/NotificationCenter.java
	gui/src/main/java/io/bisq/gui/main/overlays/windows/ContractWindow.java
	gui/src/main/java/io/bisq/gui/main/overlays/windows/OfferDetailsWindow.java
	gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesView.java
	gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersView.java
	gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesView.java
	gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java
	gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep4View.java
	gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java
	gui/src/main/java/io/bisq/gui/main/settings/preferences/PreferencesView.java
	gui/src/main/java/io/bisq/gui/util/BSFormatter.java
	gui/src/main/java/io/bisq/gui/util/GUIUtil.java
	pom.xml
	statistics/src/main/java/io/bisq/statistics/Statistics.java
2017-04-10 17:46:27 +02:00
Mike Rosseel
3a7d714385 Merge remote-tracking branch 'origin/DAO' into disk-protobuffer
Conflicts:
	common/src/main/java/io/bisq/common/locale/CountryUtil.java
	common/src/main/java/io/bisq/common/locale/FiatCurrency.java
	core/src/main/java/io/bisq/core/btc/wallet/TradeWalletService.java
	core/src/main/java/io/bisq/core/btc/wallet/WalletsSetup.java
	core/src/main/java/io/bisq/core/payment/AliPayAccount.java
	core/src/main/java/io/bisq/core/payment/ChaseQuickPayAccount.java
	core/src/main/java/io/bisq/core/payment/ClearXchangeAccount.java
	core/src/main/java/io/bisq/core/payment/FasterPaymentsAccount.java
	core/src/main/java/io/bisq/core/payment/InteracETransferAccount.java
	core/src/main/java/io/bisq/core/payment/OKPayAccount.java
	core/src/main/java/io/bisq/core/payment/PerfectMoneyAccount.java
	core/src/main/java/io/bisq/core/payment/SepaAccount.java
	core/src/main/java/io/bisq/core/payment/SwishAccount.java
	core/src/main/java/io/bisq/core/payment/USPostalMoneyOrderAccount.java
	core/src/main/java/io/bisq/core/trade/protocol/ProcessModel.java
	core/src/main/java/io/bisq/core/trade/protocol/tasks/taker/TakerCreateTakerFeeTx.java
	core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java
	core/src/main/java/io/bisq/core/user/BlockChainExplorer.java
	core/src/main/java/io/bisq/core/user/Preferences.java
	core/src/main/java/io/bisq/core/user/User.java
	gui/src/main/java/io/bisq/gui/components/PeerInfoIcon.java
	gui/src/main/java/io/bisq/gui/components/paymentmethods/CashDepositForm.java
	gui/src/main/java/io/bisq/gui/components/paymentmethods/OKPayForm.java
	gui/src/main/java/io/bisq/gui/components/paymentmethods/PaymentMethodForm.java
	gui/src/main/java/io/bisq/gui/components/paymentmethods/SepaForm.java
	gui/src/main/java/io/bisq/gui/main/MainViewModel.java
	gui/src/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationView.java
	gui/src/main/java/io/bisq/gui/main/account/arbitratorregistration/ArbitratorRegistrationViewModel.java
	gui/src/main/java/io/bisq/gui/main/account/content/password/PasswordView.java
	gui/src/main/java/io/bisq/gui/main/account/content/seedwords/SeedWordsView.java
	gui/src/main/java/io/bisq/gui/main/dao/wallet/BalanceUtil.java
	gui/src/main/java/io/bisq/gui/main/dao/wallet/receive/BsqReceiveView.java
	gui/src/main/java/io/bisq/gui/main/dao/wallet/send/BsqSendView.java
	gui/src/main/java/io/bisq/gui/main/market/offerbook/OfferBookChartViewModel.java
	gui/src/main/java/io/bisq/gui/main/market/trades/TradesChartsViewModel.java
	gui/src/main/java/io/bisq/gui/main/offer/OfferView.java
	gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferDataModel.java
	gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferView.java
	gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferViewModel.java
	gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookView.java
	gui/src/main/java/io/bisq/gui/main/offer/offerbook/OfferBookViewModel.java
	gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferView.java
	gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferViewModel.java
	gui/src/main/java/io/bisq/gui/main/overlays/Overlay.java
	gui/src/main/java/io/bisq/gui/main/overlays/editor/PeerInfoWithTagEditor.java
	gui/src/main/java/io/bisq/gui/main/overlays/notifications/NotificationCenter.java
	gui/src/main/java/io/bisq/gui/main/overlays/windows/ContractWindow.java
	gui/src/main/java/io/bisq/gui/main/overlays/windows/OfferDetailsWindow.java
	gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesView.java
	gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersView.java
	gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesView.java
	gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java
	gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep4View.java
	gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java
	gui/src/main/java/io/bisq/gui/main/settings/preferences/PreferencesView.java
	gui/src/main/java/io/bisq/gui/util/BSFormatter.java
	gui/src/main/java/io/bisq/gui/util/GUIUtil.java
	pom.xml
	statistics/src/main/java/io/bisq/statistics/Statistics.java
2017-04-10 17:46:10 +02:00
Manfred Karrer
30df6f9721 Add spend infor to tx outputs. adopt json for txo. add custom encoding for bsq addresses. 2017-04-10 00:04:46 -05:00
Manfred Karrer
c54251d109 Cleanup CoinSelectors 2017-04-09 16:28:50 -05:00
Manfred Karrer
35e2d09aae Apply bsq fee for taker 2017-04-08 20:43:55 -05:00
Manfred Karrer
0efba3827b Force another restart after SPV chain sync at startup 2017-04-08 16:00:26 -05:00
Manfred Karrer
08affae63a Use getter/setter instead of public fields in PlaceOfferModel 2017-04-08 12:17:22 -05:00