Commit graph

367 commits

Author SHA1 Message Date
Manfred Karrer
facdb32670 Add progress bar for chain sync 2017-04-24 22:44:46 -05:00
Manfred Karrer
89990de463 Replace occurances of Bitsquare with bisq 2017-04-24 21:59:17 -05:00
Manfred Karrer
20098cb814 Fixed merge issues (old bitsquare package) 2017-04-24 21:57:24 -05:00
Manfred Karrer
cff0b52e47 Added JNS (Janus) 2017-04-24 21:45:43 -05:00
Manfred Karrer
18d0bc0464 Merge branch 'Development' into DAO
# Conflicts:
#	gui/src/main/java/io/bisq/gui/main/overlays/windows/SpendFromDepositTxWindow.java
#	gui/src/main/java/io/bisq/gui/util/validation/AltCoinAddressValidator.java
2017-04-24 21:40:25 -05:00
Manfred Karrer
a410da43ad Remove all json files at startup. Improve logs 2017-04-24 13:43:22 -05:00
Manfred Karrer
61981c0c3d Fix issue with marketbased price. Change format for BSQ to 4 decimals instead of 8 in create offer view 2017-04-23 23:47:41 -05:00
Manfred Karrer
56c1448fb4 Set devmode false, remove dummy address in send bsq view 2017-04-23 13:46:25 -05:00
Manfred Karrer
f885716a3d Check if BSQ wallet is funded when using BSQ for trade fee 2017-04-23 13:05:21 -05:00
Manfred Karrer
64c696a264 Show popup if no btc funds available for BSQ tx 2017-04-22 14:12:36 -05:00
Manfred Karrer
b0a51c0389 Fix emptyWallet issues (allowspedignUnconfiremd was missing). Add better icons for tx type. 2017-04-22 12:37:12 -05:00
Manfred Karrer
c9238fbc32 Use UNVERIFIED and INVALID txTypes instead of UNDEFINED 2017-04-21 23:15:39 -05:00
Manfred Karrer
5e3b68453c Add Tx type column. Display all wallet txs also invalid or unverified 2017-04-21 22:57:45 -05:00
Manfred Karrer
9b4e40aacc Use Address.fromBase58() instead of deprecated new Address(). Use "B" as prefix for bsq addresses. Add BSQAddressTextField. 2017-04-21 21:19:42 -05:00
Manfred Karrer
c81d208ab7 Add info field for mediator 2017-04-21 20:43:16 -05:00
Manfred Karrer
b805a795dd Adjust code to work with BitcoinJ 0.14.4.1 2017-04-21 15:20:32 -05:00
Manfred Karrer
a65a28855f Add mapping for json files 2017-04-19 19:41:40 -05:00
Manfred Karrer
a7c152f4ee Use functional style for read/write locks. Add callable for throwable method calls. 2017-04-19 14:45:23 -05:00
Mike Rosseel
c6bb61337f threading proposal + remove ctor 2017-04-19 11:04:08 +02: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
29e3ad0ee3 Add blockHeight text field to UI. 2017-04-17 15:34:26 -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
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
bac9863d9d Apply code inspection on common module 2017-04-13 21:58:17 -05:00
Manfred Karrer
4c38e367b4 Remove param form AddressEntry, small refactorings... 2017-04-13 20:02:15 -05:00
Manfred Karrer
05af4dd708 PlainTextWrapper does not need Persistable 2017-04-13 19:37:43 -05:00
Manfred Karrer
36e9831aae Fix AddressEntry issues and pref. issues. Reove KeyBagSupplier 2017-04-13 19:33:55 -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
d5bd386bbd fix preferences saving/loading 2017-04-13 21:06:38 +02:00
Manfred Karrer
8516781ed7 Handle threading issues with parser 2017-04-13 10:37: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
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
da79577dff Use BsqBalanceListener (WIP) 2017-04-10 13:45:17 -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
2f865aa863 Add Serbian 2017-04-09 16:41:06 -05:00
riclas
7443c79a5c add serbian translation from transifex 2017-04-09 22:13:39 +01: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
ec6f15e7d6 Remove static references from Preferences 2017-04-07 23:28:48 -05:00
Manfred Karrer
3cab62ed22 Use same layout for TakeOfferView as in CreateOfferView 2017-04-07 16:25:42 -05:00