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 |
|
Manfred Karrer
|
8516781ed7
|
Handle threading issues with parser
|
2017-04-13 10:37:07 -05:00 |
|
Manfred Karrer
|
ac7714078c
|
Remove useStickyMarketPrice (not used anymore)
|
2017-04-12 21:54:16 -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
|
cd33a623e8
|
Fill table in bsqTxView after resize window
|
2017-04-12 12:53:35 -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
|
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
|
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 |
|
Manfred Karrer
|
381a84db22
|
Add checks for null messages
|
2017-04-10 13:43:53 -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
|
68ab1b6cb0
|
Fix missing check for isCloseButtonHidden
|
2017-04-08 15:59:46 -05:00 |
|
Manfred Karrer
|
8f06131a58
|
Remove redundant data from createOfferModel
|
2017-04-08 12:13:05 -05:00 |
|
Manfred Karrer
|
7dfe245827
|
Rename MakerFeeTx to CreateMakerFeeTx
|
2017-04-08 12:07:37 -05:00 |
|
Manfred Karrer
|
174b126017
|
Rename TakerCreateTakerFeeTx to CreateTakerFeeTx
|
2017-04-08 12:07:04 -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 |
|
Manfred Karrer
|
eacf30ce6d
|
Support BSQ as trade fee currency in CreateOfferView and TakeOfferView (WIP)
|
2017-04-07 15:31:58 -05:00 |
|
Mike Rosseel
|
a448444bf1
|
guice debugging
|
2017-04-07 20:53:16 +02:00 |
|
Mike Rosseel
|
8a352a91e5
|
preference debugging
|
2017-04-07 10:53:38 +02:00 |
|
Manfred Karrer
|
1783441ac6
|
Rename CreateOfferFee to Maker fee. Add isCurrencyForMakerFeeBtc to OfferPayload. use StringUtils.deleteWhitespace instead of String.replace.
|
2017-04-06 15:24:38 -05:00 |
|
Mike Rosseel
|
67c70bf138
|
Preferences refactoring
|
2017-04-06 15:28:08 +02:00 |
|
Manfred Karrer
|
c6d96eba71
|
Add toggle for BSQ trade fee at create offer view. Add txs for using BSQ for trade fee. Add button to settings to delete spv chain file.
|
2017-04-06 00:34:48 -05:00 |
|
Mike Rosseel
|
30a2876538
|
everything should now be Persistable, also HashSet, HashMap, Long, ... .
commit before Preferences refactoring.
|
2017-04-05 14:18:01 +02:00 |
|
Manfred Karrer
|
f1054446db
|
Update guice version. Add utxo_provider module.
|
2017-04-04 21:54:02 -05:00 |
|
Manfred Karrer
|
cd591b9f9e
|
Add snapshot mechanism for persisting utxo map
|
2017-04-04 01:00:32 -05:00 |
|
Manfred Karrer
|
0cf3072902
|
Dont use tor if regtest. Dont use tor for provider node if localhost
|
2017-04-03 22:11:29 -05:00 |
|
Manfred Karrer
|
986ac67f84
|
Keep historical bsq txos for displaying bss txs in tx list. refactor data structure. detect invalid bsq tx and show popup.
|
2017-04-03 16:02:33 -05:00 |
|
Manfred Karrer
|
0386f1e739
|
Fix BSQ algo, add tx view
|
2017-04-02 20:19:03 -05:00 |
|
Manfred Karrer
|
e96e408e33
|
Fix incorrect handling of logical and/or. Rename rpc optionkeys. Use lombok in BSQ tx value objcts. Use map with txId, index tuple instead of nested map for utxo. Rename BSQ Tx classes. Fix BSQ parsing algo. Add and improve tests.
|
2017-04-01 11:41:13 -05:00 |
|
Mike Rosseel
|
ce6620a291
|
AddressEntryList save/load cycle works
|
2017-03-31 16:44:36 +02:00 |
|
Manfred Karrer
|
34ca2ecf28
|
Add OctoCoin
|
2017-03-30 21:18:19 -05:00 |
|
Manfred Karrer
|
1d9113499d
|
Merge branch 'Development' into master
|
2017-03-30 21:14:57 -05:00 |
|
MyFirst
|
efb1689eb3
|
Fix missing P2SH prefix in validation regex
|
2017-03-30 16:09:31 -04:00 |
|
MyFirst
|
f9c4bb730c
|
Fix Typos in Octocoin validation
|
2017-03-30 15:29:33 -04:00 |
|
MyFirst
|
23c4768d29
|
Rename OctocoinAddressValidator to OctocoinAddressValidator.java
|
2017-03-30 15:01:59 -04:00 |
|
Manfred Karrer
|
4c8f20d237
|
Fixed some OctroCoin bugs. Tests still failing. Need fix
|
2017-03-30 09:24:30 -05:00 |
|
MyFirst
|
8462867afe
|
Fix P2SH
|
2017-03-30 02:09:27 -04:00 |
|
MyFirst
|
38b66e7f9a
|
Add Octocoin
|
2017-03-30 01:25:55 -04:00 |
|
MyFirst
|
2e8bc02b5d
|
Add Octocoin
|
2017-03-30 01:09:04 -04:00 |
|
MyFirst
|
d2190efb66
|
Add Octocoin
|
2017-03-30 01:07:33 -04:00 |
|
MyFirst
|
cb4716e85f
|
Add Octcoin
|
2017-03-30 01:02:33 -04:00 |
|
Mike Rosseel
|
bcc93ca602
|
Merge branch 'DAO' into disk-protobuffer + small changes
Conflicts:
core/src/main/java/io/bisq/core/arbitration/Dispute.java
core/src/main/java/io/bisq/core/arbitration/DisputeManager.java
core/src/main/java/io/bisq/core/trade/protocol/ProcessModel.java
network/src/main/java/io/bisq/network/p2p/DecryptedMsgWithPubKey.java
network/src/main/java/io/bisq/network/p2p/storage/P2PDataStorage.java
|
2017-03-28 08:17:20 +02:00 |
|