mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-20 10:22:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,675 Commits 4 Branches 148 Tags 4.3 GiB
e74c5082d5
Commit Graph

1223 Commits

Author SHA1 Message Date
Mike Rosseel
00987dadf7 wip 2017-03-21 07:58:39 +01:00
Manfred Karrer
de7b73f7a9 Remove default values in case of null, apply Lombok annotations 2017-03-20 23:28:09 -05:00
Manfred Karrer
5fee4b0b66 Add missing equals/hashcode to Offer 2017-03-20 22:31:18 -05:00
Manfred Karrer
93531c76d0 Apply Lombok annotations, cleanup, check hashcode and equals methods 2017-03-20 22:10:10 -05:00
Manfred Karrer
63bf1942e4 Add extraDataMap field to all StoragePayload objects 2017-03-20 16:27:54 -05:00
Manfred Karrer
a41d13a093 Remove unused fields 2017-03-20 08:59:48 -05:00
Manfred Karrer
6790eec935 Remove marketPriceTypes. Use last price in all cases (no bid and ask) 2017-03-20 00:59:20 -05:00
Manfred Karrer
0c88f204a2 Fix wrong monetaryFormat 2017-03-20 00:37:30 -05:00
Manfred Karrer
48446e454a Refactor price handling 2017-03-19 23:44:58 -05:00
Manfred Karrer
f2c9ff247b Use normal rolling backup in case of restore (support correct handling of pw change - to delete unencrypted backups). 2017-03-18 12:42:29 -05:00
Manfred Karrer
e65a6adb77 Refactor: Rename ContractData to Payload. 2017-03-17 16:55:44 -05:00
Manfred Karrer
a6eae2745b Refactor OptionKeys 2017-03-17 15:42:52 -05:00
Manfred Karrer
4d784d64fa Refactoring: Remove further dependencies to OfferPayload. Rename Offer in protobuffer definition to PB_Offer 2017-03-17 14:21:03 -05:00
Manfred Karrer
0b0be0bb02 Refactor Offer.Direction: Remove dependencies to OfferPayload (WIP) 2017-03-17 13:19:36 -05:00
Manfred Karrer
d793d6732b Refactor Offer and OfferPayload: Make OfferPayload pure value object 2017-03-17 12:49:26 -05:00
Mike Rosseel
e92fd88d52 delegate test 2017-03-17 16:52:27 +01:00
Manfred Karrer
524a176305 setAddPeersFromAddressMessage 2017-03-17 00:44:32 -05:00
Manfred Karrer
30e91ea0ee Dont use peers from AddressMessage calls in btcj if we have set our own node addresses or use localhost. 2017-03-17 00:44:01 -05:00
Manfred Karrer
af48575b7f Apply code inspection 2017-03-16 22:01:25 -05:00
Manfred Karrer
07d428de6f Use base package iwth same name as module in all modules. 2017-03-16 21:12:06 -05:00
Manfred Karrer
3e91b89bbd Rename network-messages module to wire. Further refactorings. 2017-03-16 20:35:46 -05:00
Manfred Karrer
3c9111441e Refactor package structure in network-message module. Move domain objects as far as possible. 2017-03-16 20:03:14 -05:00
Manfred Karrer
dcf71b8196 Refactor package structure in network-message module. Move domain object to core. Add readObject to Offer again 2017-03-16 18:45:48 -05:00
Manfred Karrer
0ce87da0f4 Move trade exceptions back to core 2017-03-16 17:41:50 -05:00
Manfred Karrer
28eed63e0f Move provider and app package form network to core 2017-03-16 17:00:09 -05:00
Manfred Karrer
f174024ac7 Move local to common, refactor setting of default locale 2017-03-16 16:56:47 -05:00
Manfred Karrer
63456ac255 Move Offer and User domain classes to core 2017-03-16 16:37:37 -05:00
Manfred Karrer
23b86922ad Fix missing impl at Utilities.getFeePerByte. Move btcj dependent methods from common Utilities to CoinUtil in core. 2017-03-16 13:26:58 -05:00
Manfred Karrer
ccb060193e Adpot changes to merged branch 2017-03-16 12:59:17 -05:00
Manfred Karrer
34b4c61792 Merge branch 'separateSecDeposit' into DAO 
# Conflicts:
#	gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferDataModel.java
#	gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferDataModel.java
#	gui/src/main/java/io/bisq/gui/main/overlays/windows/DisputeSummaryWindow.java
#	network-messages/src/main/java/io/bisq/network_messages/trade/offer/payload/OfferPayload.java
#	network/src/main/java/io/bisq/p2p/network/ProtoBufferUtilities.java
#	network/src/test/java/io/bisq/p2p/storage/P2PDataStorageTest.java
 2017-03-16 12:28:59 -05:00
Manfred Karrer
ae2cdcae72 Merge branch 'temp' into DAO 2017-03-16 12:22:00 -05:00
Manfred Karrer
366522444d Fix bug with missing !. Use equals check instead of != check for networkParams 2017-03-16 12:00:38 -05:00
Mike Rosseel
4a56abbf0b renamed package name to conform to module 2017-03-16 16:57:21 +01:00
Mike Rosseel
d89e8e98d1 move the last messages to the correct module 2017-03-16 16:48:54 +01:00
Mike Rosseel
e0151df520 fix bugs and replace errors 2017-03-16 15:33:45 +01:00
Mike Rosseel
2efc3acb29 split network-messages in its own module. Compiles. 2017-03-16 14:38:18 +01:00
Manfred Karrer
5afd2bde11 Separate security deposit for buyer and seller. Remove arbitrator amount and address at dispute result. Remove Payout policy. Add bank as reason. 2017-03-15 17:06:44 -05:00
Manfred Karrer
a4b15f5906 Separate security deposit for buyer and seller (WIP) 2017-03-15 15:04:32 -05:00
Manfred Karrer
3b557463da Rebranding: replace bitsquare with bisq 2017-03-12 16:00:40 -05:00
Manfred Karrer
0435c88717 Add missing displaystrings 2017-03-12 15:59:59 -05:00
Manfred Karrer
be1096582c Rebranding: rename package io.bitsquare to io.bisq 2017-03-12 15:09:39 -05:00
Manfred Karrer
75fc7d2286 Rebranding: Change occurance of Bitsquare to bisq 2017-03-12 14:28:14 -05:00
Manfred Karrer
46995c102c Resolve merge conflicts, move locale package to common, use constancts for dev keypair. 2017-03-12 13:46:40 -05:00
Manfred Karrer
5b557ed37a Merge branch 'doa_with_translations' into DAO 
# Conflicts:
#	common/src/main/java/io/bitsquare/app/DevFlags.java
#	gui/src/main/java/io/bitsquare/gui/components/PeerInfoIcon.java
#	gui/src/main/java/io/bitsquare/gui/components/TxIdTextField.java
#	gui/src/main/java/io/bitsquare/gui/components/paymentmethods/CryptoCurrencyForm.java
#	gui/src/main/java/io/bitsquare/gui/components/paymentmethods/OKPayForm.java
#	gui/src/main/java/io/bitsquare/gui/components/paymentmethods/PaymentMethodForm.java
#	gui/src/main/java/io/bitsquare/gui/components/paymentmethods/PerfectMoneyForm.java
#	gui/src/main/java/io/bitsquare/gui/components/paymentmethods/SameBankForm.java
#	gui/src/main/java/io/bitsquare/gui/main/MainView.java
#	gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java
#	gui/src/main/java/io/bitsquare/gui/main/account/AccountView.java
#	gui/src/main/java/io/bitsquare/gui/main/account/arbitratorregistration/ArbitratorRegistrationView.java
#	gui/src/main/java/io/bitsquare/gui/main/account/content/altcoinaccounts/AltCoinAccountsView.java
#	gui/src/main/java/io/bitsquare/gui/main/account/content/altcoinaccounts/AltCoinAccountsViewModel.java
#	gui/src/main/java/io/bitsquare/gui/main/account/content/arbitratorselection/ArbitratorSelectionView.java
#	gui/src/main/java/io/bitsquare/gui/main/account/content/backup/BackupView.java
#	gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java
#	gui/src/main/java/io/bitsquare/gui/main/dao/DaoView.java
#	gui/src/main/java/io/bitsquare/gui/main/dao/compensation/create/CreateCompensationRequestView.java
#	gui/src/main/java/io/bitsquare/gui/main/dao/wallet/send/BsqSendView.java
#	gui/src/main/java/io/bitsquare/gui/main/debug/DebugView.java
#	gui/src/main/java/io/bitsquare/gui/main/disputes/trader/TraderDisputeView.java
#	gui/src/main/java/io/bitsquare/gui/main/funds/deposit/DepositView.java
#	gui/src/main/java/io/bitsquare/gui/main/funds/transactions/TransactionsView.java
#	gui/src/main/java/io/bitsquare/gui/main/market/offerbook/OfferBookChartView.java
#	gui/src/main/java/io/bitsquare/gui/main/market/spread/SpreadView.java
#	gui/src/main/java/io/bitsquare/gui/main/market/trades/TradesChartsView.java
#	gui/src/main/java/io/bitsquare/gui/main/offer/BuyOfferView.java
#	gui/src/main/java/io/bitsquare/gui/main/offer/OfferView.java
#	gui/src/main/java/io/bitsquare/gui/main/offer/SellOfferView.java
#	gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java
#	gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferView.java
#	gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java
#	gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.java
#	gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferDataModel.java
#	gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferViewModel.java
#	gui/src/main/java/io/bitsquare/gui/main/overlays/Overlay.java
#	gui/src/main/java/io/bitsquare/gui/main/overlays/editor/PeerInfoWithTagEditor.java
#	gui/src/main/java/io/bitsquare/gui/main/overlays/windows/ContractWindow.java
#	gui/src/main/java/io/bitsquare/gui/main/overlays/windows/DisputeSummaryWindow.java
#	gui/src/main/java/io/bitsquare/gui/main/overlays/windows/FilterWindow.java
#	gui/src/main/java/io/bitsquare/gui/main/overlays/windows/OfferDetailsWindow.java
#	gui/src/main/java/io/bitsquare/gui/main/overlays/windows/SendAlertMessageWindow.java
#	gui/src/main/java/io/bitsquare/gui/main/overlays/windows/SendPrivateNotificationWindow.java
#	gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TacWindow.java
#	gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TradeDetailsWindow.java
#	gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.java
#	gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java
#	gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java
#	gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java
#	gui/src/main/java/io/bitsquare/gui/util/BSFormatter.java
#	gui/src/main/java/io/bitsquare/gui/util/GUIUtil.java
#	gui/src/main/java/io/bitsquare/gui/util/validation/AccountNrValidator.java
#	gui/src/main/java/io/bitsquare/gui/util/validation/BankIdValidator.java
#	gui/src/main/java/io/bitsquare/gui/util/validation/BranchIdValidator.java
#	gui/src/main/java/io/bitsquare/gui/util/validation/BtcAddressValidator.java
#	gui/src/main/java/io/bitsquare/gui/util/validation/SecurityDepositValidator.java
#	network/src/main/java/io/bitsquare/messages/provider/price/PriceFeedService.java
#	network/src/main/java/io/bitsquare/messages/trade/offer/payload/Offer.java
 2017-03-12 12:50:36 -05:00
Manfred Karrer
1a634d919f cleanup 2017-03-12 12:23:53 -05:00
Manfred Karrer
47839bede7 Add german from old translation (not complete). cleanup 2017-03-12 11:34:02 -05:00
Manfred Karrer
05678353d7 Add missing display strings (GUIUtils, validations) 2017-03-12 02:16:35 -05:00
Manfred Karrer
055d505ba6 Add missing display strings 2017-03-12 01:37:47 -05:00
Manfred Karrer
1af33f4d9c Apply display strings for formatter and arb selection 2017-03-12 01:15:50 -05:00
Manfred Karrer
ea3f5ebf26 Apply display strings for payment classes 2017-03-12 00:18:31 -05:00
Manfred Karrer
f01d461abe Add dev keys for alert, priv. notification and filter. add comments to devflags 2017-03-10 20:44:51 -05:00
Mike Rosseel
fed47a0342 Merge branch 'DAO' into protobuffer 
Conflicts:
	common/src/main/java/io/bitsquare/app/Log.java
	core/src/main/java/io/bitsquare/arbitration/ArbitratorManager.java
	core/src/main/java/io/bitsquare/btc/BitcoinModule.java
	core/src/main/java/io/bitsquare/btc/wallet/BsqWalletService.java
	core/src/main/java/io/bitsquare/btc/wallet/TradeWalletService.java
	core/src/main/java/io/bitsquare/btc/wallet/WalletService.java
	core/src/main/java/io/bitsquare/btc/wallet/WalletsSetup.java
	core/src/main/java/io/bitsquare/dao/DaoModule.java
	core/src/main/java/io/bitsquare/dao/vote/VotingManager.java
	gui/src/main/java/io/bitsquare/gui/main/account/content/backup/BackupView.java
	gui/src/main/java/io/bitsquare/gui/main/dao/DaoView.java
	gui/src/main/java/io/bitsquare/gui/main/dao/compensation/create/CreateCompensationRequestView.java
	gui/src/main/java/io/bitsquare/gui/main/dao/voting/vote/VoteView.java
	gui/src/main/java/io/bitsquare/gui/main/dao/wallet/send/BsqSendView.java
	gui/src/main/java/io/bitsquare/gui/main/disputes/arbitrator/ArbitratorDisputeView.java
	gui/src/main/java/io/bitsquare/gui/main/disputes/trader/TraderDisputeView.java
	gui/src/main/java/io/bitsquare/gui/main/market/spread/SpreadViewModel.java
	gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java
	gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java
	gui/src/main/java/io/bitsquare/gui/util/validation/AccountNrValidator.java
	network/pom.xml
	network/src/main/java/io/bitsquare/app/BitsquareEnvironment.java
	network/src/main/java/io/bitsquare/messages/alert/Alert.java
	network/src/main/java/io/bitsquare/messages/btc/provider/fee/FeeService.java
	network/src/main/java/io/bitsquare/messages/trade/offer/payload/Offer.java
	network/src/main/java/io/bitsquare/messages/user/Preferences.java
	network/src/main/java/io/bitsquare/p2p/network/Connection.java
	pom.xml
	statistics/src/main/java/io/bitsquare/statistics/Statistics.java
 2017-03-07 16:40:57 +01:00
Manfred Karrer
a5027d50dc Add language and country combobox to settings tp apply locales 2017-03-07 10:03:59 -05:00
Manfred Karrer
7f5441b953 Merge remote-tracking branch 'origin/Allow_reopen_dispute' into doa_with_translations 2017-03-06 15:08:46 -05:00
Manfred Karrer
5bc1ee2257 Merge branch 'Allow_reopen_dispute' into Development 2017-03-06 15:06:15 -05:00
Manfred Karrer
96f208f82b Allow re-opening of a dispute (in case the arbitrator has not received it) 2017-03-06 14:49:29 -05:00
Manfred Karrer
bbb6d5d244 remove string from fxml, refactor naming (WIP) 2017-03-05 20:41:04 -05:00
Manfred Karrer
d3380bb450 Add translation strings for market and market.offerbook 2017-03-05 18:30:08 -05:00
Manfred Karrer
1470fbb444 Added all resources for MainView 2017-03-04 23:23:30 -05:00
Manfred Karrer
aae59466d4 Rename BSResources to Res 2017-03-04 19:00:58 -05:00
Manfred Karrer
f626509158 Apply resources to BitsquareApp and MainView (WIP) 2017-03-04 18:58:27 -05:00
Manfred Karrer
3441286d46 Add null check 2017-03-04 17:36:36 -05:00
Manfred Karrer
f0bf3daddf Update top altcoin list 2017-03-04 17:21:33 -05:00
Manfred Karrer
560cb0af80 Show sat/byte at tx print 2017-03-04 13:31:52 -05:00
Manfred Karrer
e553a038f5 Add DevFlags.DEV_ARBITRATOR to support dev keys. Autofill key if DEV_ARBITRATOR is set 2017-03-03 18:37:33 -05:00
Manfred Karrer
63c4bc546f Add TODO 2017-03-03 10:57:06 -05:00
Manfred Karrer
28a704ed85 Fix bug with backup path when path became invalid. Improve backup handling and UI. 2017-03-01 20:46:17 -05:00
Manfred Karrer
bbe7192041 Refactor Wallet classes 2017-03-01 19:49:23 -05:00
Manfred Karrer
27306cee11 Add checkpoint for testnet (again) 2017-03-01 18:29:43 -05:00
Manfred Karrer
c6897f730a Update comment 2017-03-01 11:33:34 -05:00
Manfred Karrer
f5b503deaf Update bip 44 nr to 142 2017-03-01 11:33:05 -05:00
Manfred Karrer
0d863fc163 Remove testnet checkpoint 2017-03-01 11:26:40 -05:00
Manfred Karrer
68494bd83d Update to checkpoint of block: 
000000000000000002884993a2b7306aa7b2af94b6ffe00bc7c689738f7816c6 from: 2017-01-22
 2017-03-01 11:26:00 -05:00
Manfred Karrer
f27437b008 Display BuyerMultiSigPubKey and SellerMultiSigPubKey in Contract.toString. Use Utils.HEX.encode instead of Arrays.toString for pub keys printing. 
Remove BuyerMultiSigPubKey and SellerMultiSigPubKey from ContractWindow and TradeDetailsWindow (included in contract.toString now)
 2017-03-01 10:19:23 -05:00
Manfred Karrer
4e467b9530 Display BuyerMultiSigPubKey and SellerMultiSigPubKey in Contract.toString. Use Utils.HEX.encode instead of Arrays.toString for pub keys printing. 
Remove BuyerMultiSigPubKey and SellerMultiSigPubKey from ContractWindow and TradeDetailsWindow (included in contract.toString now)
 2017-03-01 10:18:44 -05:00
Mike Rosseel
5b5329ffd4 fix string interning problem by removing Utilities.serialize calls and doing signing also with protobuffer 2017-03-01 09:20:13 +01:00
Manfred Karrer
9704619f6b Merge remote-tracking branch 'origin/Development' into Development 2017-02-28 09:57:14 -05:00
Manfred Karrer
a239ccee10 Remove debug logs 2017-02-28 09:55:37 -05:00
Manfred Karrer
ab01e97ddc Move BTC_NODES and USE_TOR_FOR_BTC to BtcOptionKeys 2017-02-25 13:23:35 -05:00
Manfred Karrer
60597cec88 Rename all appearances of squ to bsq 2017-02-25 10:45:22 -05:00
Manfred Karrer
073302827b Add BSQ to altcoin list 2017-02-25 10:01:46 -05:00
Manfred Karrer
134b0a1220 Replace SQU with BSQ 2017-02-25 09:59:32 -05:00
Manfred Karrer
f5d05f0940 Fix null pointers, improve logs 2017-02-24 15:03:26 -05:00
Manfred Karrer
972721cdba Add more logs to empyt wallet and double spend method 2017-02-23 14:13:10 -05:00
Manfred Karrer
478ecac255 Merge branch 'master' into Development 2017-02-23 14:07:37 -05:00
Manfred Karrer
01fbab60b7 Fix missing tx fee at Empty Wallet method. Add more logs 2017-02-23 14:06:06 -05:00
Mike Rosseel
60e3f155b6 use correct version of neemre 2017-02-22 08:57:20 +01:00
Manfred Karrer
aae9479e1b Use same seed for both BTC and SQU wallet 2017-02-21 15:51:35 -05:00
Manfred Karrer
16ca619057 Overwrite first with random bytes before setting aesKey null 2017-02-21 09:45:56 -05:00
Manfred Karrer
2c211a9ae4 Add comments 2017-02-20 18:15:26 -05:00
Manfred Karrer
827c581a73 Make security deposit customizable at offer creation (allowed range: 0.001 BTC - 0.2 BTC). 
Use new max. trade limits
 2017-02-20 17:58:07 -05:00
Manfred Karrer
159b208273 Add btcd-cli4j lib as local build jar instead of using http repo. Add exclude for diff. version dependencies. 2017-02-20 14:29:58 -05:00
Manfred Karrer
fb63fd7c94 Merge branch 'policyfile' into DAO 2017-02-20 13:32:16 -05:00
Manfred Karrer
023d20da7a Add missing class 2017-02-20 13:30:41 -05:00
Mike Rosseel
f3d1c87d4e hand-merge of policyfile-dev branch 2017-02-20 17:04:17 +01:00
Manfred Karrer
78a8e1ba39 Use percentage based price as default, swap input text controls when toggle between fixed price and percentage based price. Hide percentage based inputs if no market price is available. 2017-02-20 11:02:54 -05:00
Mike Rosseel
f531659bf2 Merge branch 'DAO' into policyfile 2017-02-20 15:31:35 +01:00
Mike Rosseel
26aa1ae48d Merge branch 'DAO' into policyfile 
Conflicts:
	package/mac/create_app.sh
	package/windows/32bitBuild.bat
	package/windows/64bitBuild.bat
 2017-02-20 15:16:13 +01:00
Mike Rosseel
5d6537a0d2 Removed the spring bug fix class because upgrading to 4.3.6-RELEASE fixed the bug + no more confusion on import between the two classes. Bitsquare now starts again, P2P to be tested 2017-02-20 09:50:09 +01:00
Manfred Karrer
a24609e21b Check that MultiSig address entry matches stored pubKey. Save pubKey in processModel. Add more logging of txs. 2017-02-19 19:01:52 -05:00
Manfred Karrer
aa084dba28 User percentage based trade fee as well as market price based factor. Display % in fee info popups. 2017-02-19 13:40:47 -05:00
Manfred Karrer
4f0d6484c5 Add saving of addressEntryList at each change of list, remove usage of AddressEntry in TradeWalletService. 
Add pubKey to contract window at trade details popup.
Remove unused arrays in SpendFromDepositTxWindow.
 2017-02-19 13:14:27 -05:00
Mike Rosseel
a3b31ce32b moving app classes to make it start again. 2017-02-17 14:45:03 +01:00
Manfred Karrer
0580e73179 Use new tx and trade fees. UI improvements, remove trade fee from provider data 2017-02-16 15:43:38 -05:00
Mike Rosseel
17798cabf0 move apps back to where they belong 2017-02-16 14:13:34 +01:00
Mike Rosseel
b8a68658b0 fromProtoBuf is code complete 2017-02-16 09:04:23 +01:00
Mike Rosseel
22d5d5267b compiles again 2017-02-14 17:33:35 +01:00
Manfred Karrer
839670739d Cleanup 2017-02-12 14:09:01 -05:00
Manfred Karrer
d666490424 Set v 0.5.0.0, fix issues after merge. 2017-02-12 13:38:26 -05:00
Manfred Karrer
358f292cbe Merge branch 'Development' into DAO 
# Conflicts:
#	common/src/main/java/io/bitsquare/app/Version.java
#	core/src/main/java/io/bitsquare/btc/FeePolicy.java
#	core/src/main/java/io/bitsquare/btc/WalletAppKitBitSquare.java
#	core/src/main/java/io/bitsquare/btc/WalletService.java
#	core/src/main/java/io/bitsquare/btc/wallet/TradeWalletService.java
#	core/src/main/java/io/bitsquare/locale/CurrencyUtil.java
#	core/src/main/java/io/bitsquare/trade/BuyerTrade.java
#	core/src/main/java/io/bitsquare/trade/SellerTrade.java
#	core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/OffererCreatesAndSignsDepositTxAsBuyer.java
#	core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SignAndFinalizePayoutTx.java
#	core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SignAndPublishDepositTxAsBuyer.java
#	core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/TakerCreatesDepositTxInputsAsBuyer.java
#	core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/OffererCreatesAndSignsDepositTxAsSeller.java
#	core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SignAndPublishDepositTxAsSeller.java
#	core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SignPayoutTx.java
#	core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/TakerCreatesDepositTxInputsAsSeller.java
#	gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java
#	gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java
#	gui/src/main/java/io/bitsquare/gui/main/overlays/windows/DisputeSummaryWindow.java
#	gui/src/main/java/io/bitsquare/gui/main/overlays/windows/OfferDetailsWindow.java
#	gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TradeDetailsWindow.java
#	gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java
#	gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java
#	network/src/main/resources/PersistedP2PStorageData
#	package/mac/create_app.sh
#	pom.xml
#	provider/src/main/java/io/bitsquare/provider/ProviderMain.java
#	provider/src/main/java/io/bitsquare/provider/price/PriceRequestService.java
 2017-02-12 12:59:29 -05:00
Manfred Karrer
246b15bee9 Add util for printing all altcoins for adding to FAQ page 2017-02-11 22:33:08 -05:00
Manfred Karrer
f42628fcd8 Add offer as parameter to getSecurityDeposit and getFixedTxFeeForTrades calls if available to support trades between different protocol versions 2017-02-11 21:06:01 -05:00
Manfred Karrer
890c724a87 Prepare for v 0.4.9.9 2017-02-10 19:49:33 -05:00
Manfred Karrer
49940b6420 Small adoptions, cleanups 2017-02-10 19:47:44 -05:00
Manfred Karrer
7028b3afef Add checkIfOpenOffersMatchTradeProtocolVersion method at startup 2017-02-10 18:36:32 -05:00
Manfred Karrer
6cf439b8bd Connect to local Bitcoin Core node if it is running (ignore use Tor flag) 2017-02-10 16:33:17 -05:00
Manfred Karrer
6a03ce31e1 Fix missing breaks 2017-02-10 16:33:04 -05:00
Manfred Karrer
891580f458 Add test for version update check (support versions with more then 4 digits) 2017-02-10 14:11:26 -05:00
Manfred Karrer
376adb6d1e Move digest-enforcer-rules to gui module and add more entries 2017-02-09 23:58:55 -05:00
Manfred Karrer
75946a3901 Add SWT 2017-02-09 18:00:17 -05:00
Mike Rosseel
6c6937f61f add maven dependency check plugin 2017-02-09 16:22:45 +01:00
Mike Rosseel
daa5557385 fromProto 50% done, not compiling 2017-02-09 12:23:15 +01:00
Manfred Karrer
8c57616f7a Remove used key 2017-02-08 18:35:34 -05:00
Manfred Karrer
a83acbeb25 Reduce tx fee, sec. deposit and createe offer fee, cleanup, comments update 2017-02-08 16:15:14 -05:00
Manfred Karrer
c6f5c9ecb5 Increase trade and offer availability timeouts 2017-02-07 21:05:32 -05:00
Manfred Karrer
4cafddabc7 Add version nr to offer id, use more randomized prefix for short id 2017-02-07 19:44:45 -05:00
Manfred Karrer
d65e098933 Increase tx fee to 0.0007 btc, increase tradeprotocol version, change log level for tx details to INFO 2017-02-07 18:47:20 -05:00
Manfred Karrer
088370fa1d Remove duplicate entry 2017-02-07 10:35:49 -05:00
Manfred Karrer
283b4723e6 Added Botswana 2017-02-07 10:11:08 -05:00
Manfred Karrer
d88aceddf8 Clean up, add missing coins (LTBcoin, SFSC) 2017-02-07 10:05:15 -05:00
Mike Rosseel
219ea61f85 all toProto implemented on messages and payloads, remaining: fromProto 2017-02-07 08:54:04 +01:00
Manfred Karrer
86face32d6 Add PIVX 2017-02-06 22:42:44 -05:00
Manfred Karrer
e1d917f6c7 Merged PR (https://github.com/bitsquare/bitsquare/pull/730) with some fixes and improvements. Use bitcoinj v 0.13.1.8 2017-02-03 07:42:33 -05:00
Mike Rosseel
113e28f9ed all Messages and Payloads have been converted to proto, remaining task is implement all to/from proto methods 2017-02-03 07:56:37 +01:00
Manfred Karrer
7cba76fbe9 Revert merged PR (https://github.com/bitsquare/bitsquare/pull/730) 2017-02-02 20:36:10 -05:00
Manfred Karrer
a1e7ccc1bf Merge pull request #730 from dan-da/hiddenservices_pr 
DNS lookups over Tor and connecting bitcoinj to .onion addresses.
 2017-02-02 19:24:54 -05:00
Manfred Karrer
e14d70b9d9 Correct input validation of Norwegian bank account numbers 
(https://github.com/bitsquare/bitsquare/pull/707)
 2017-02-02 19:23:19 -05:00
Mike Rosseel
a71ee3a9a0 remove commented out adding of property files. A full rework of this class is outside of the scope of this task but some things can surely be removed. 2017-01-30 08:11:56 +01:00
Manfred Karrer
3d60ad4d76 Improve logs 2017-01-28 17:12:06 +01:00
Manfred Karrer
051c5259b0 Adjust fields for Chile 2017-01-28 17:09:37 +01:00
Mike Rosseel
52b0e547e3 small fixes 2017-01-26 09:08:31 +01:00
Mike Rosseel
a7f590d6a3 more runtime permissions needed 2017-01-25 09:54:10 +01:00
Mike Rosseel
7dac393e61 after tests in production 2017-01-24 21:23:20 +01:00
Mike Rosseel
0581d05eca Merge branch 'DAO' into policyfile 2017-01-24 08:44:20 +01:00
Mike Rosseel
fd643a7a88 working policy file 2017-01-24 08:43:53 +01:00
danda
9da8939aa6 Changes to support DNS lookups over Tor: 
+ Add DnsTorLookup class that uses Tor Socks5 RESOLVE extension.

+ Add Socks5DnsDiscovery class that runs on separate threads for each lookup

Changes to support connecting to .onion addresses:

+ Add Socks5SeedOnionDiscovery class for discovery of .onion seeds.

+ Add Socks5MultiDiscovery wrapper class with modes for using ipv4 seeds, .onion seeds, dns, or all/mixed.

remove unused class
 2017-01-21 08:45:49 -08:00
Manfred Karrer
e224422b83 Cleanup 2017-01-17 22:33:15 +01:00
Manfred Karrer
8f871e2629 Add UTXO handling of orphan transactions, Add SquBlockchainManager, add Unittests 2017-01-17 02:56:30 +01:00
Manfred Karrer
37a8d6af94 et pubkey transient and use bytearray instead 2017-01-10 16:40:56 +01:00
Manfred Karrer
dd591a44da Remove UTXOProvider -> use CoinSelector instead. Add prog args for block and wallet notification ports for rpc to support 2 apps 2017-01-10 03:06:58 +01:00
Manfred Karrer
7ea1718d86 Fix wrong txId in SquUtxo, use walletFactroy and custom SquWallet (WIP) 2017-01-10 00:06:01 +01:00
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
10a5e84a4a Add Byte 2017-01-06 00:35:12 +01:00
Manfred Karrer
7fde564e80 Use key of SQU input for signing 2017-01-04 20:18:53 +01:00
Manfred Karrer
1b58b4c54e Rename lists 2017-01-04 14:28:28 +01:00
Manfred Karrer
deb8a1ba12 Add notes to emergency payout tool, update logs 2017-01-04 14:02:43 +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
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
Manfred Karrer
3bf4c60567 Prepare for v0.4.9.8 2016-11-19 14:36:23 +01:00
Manfred Karrer
6ca66c6b8f Add export tool for wallet data 2016-11-19 14:31:26 +01:00
Manfred Karrer
c970201833 Show always bank name 2016-11-18 01:28:13 +01:00
Manfred Karrer
abcfe202ea Avoid duplicate countries in list 2016-11-18 01:25:12 +01:00
Manfred Karrer
e816e8d8ab Increase max. trade period for US postal money order to 8 days 2016-11-15 14:11:15 +01:00
Manfred Karrer
710789acb9 Update comments 2016-11-15 14:04:19 +01:00
Manfred Karrer
b800999614 Add popup for adding a full btc node ip address at first startup as well in settings 2016-11-15 01:13:24 +01:00
Manfred Karrer
c8022fd7db Added Crown 2016-11-14 18:59:07 +01:00
Manfred Karrer
4dbd3a03c8 Rename btcSeedNodes prog. arg to btcNodes 2016-11-14 15:17:05 +01:00
Manfred Karrer
3fb7cb1de4 Merge branch 'master' into Development 2016-11-13 22:56:31 +01:00
Manfred Karrer
08695377ce Rename method, use statics for prefix symbol 2016-11-13 22:30:53 +01:00
Manfred Karrer
061e79137e Remove comment 2016-11-13 21:48:08 +01:00
Manfred Karrer
fe341e1836 Update request period 2016-11-13 21:47:44 +01:00
Manfred Karrer
e751958de1 Request Pricefeed via proxy and use new BtcAverage API and add coinmarketcap. 
* Now all traffic is going over Tor (price requests from Poloniex could not be routed over Tor because they use Cloudflare)
* Added request to CoinMarketCap to get more prices for altcoins not listed at Poloniex
* Use 2 proxy price feed providers as hidden service for requesting accumulated BitcoinAverage (new API), Poloniex and CoinMarketCap price data
* Add program argument to add custom price feed providers
* Add module for running a own proxy price feed provider (requires BitcoinAverage API keys). Supports both clearnet and hidden service
* Display time of latest price update at tooltip over provider icon in market price widget
* Remove http proxy option because it is not needed anymore (Cloudflare issue with Poloniex solved by the proxy)
* Remove tor bridge support (was not solving GFW issues and caused only problems when connections to Tor failed at startup)
 2016-11-13 21:12:46 +01:00
Ricardo Filipe
502e43f875 create a getter for the GUI symbols of trade currencies 2016-11-12 23:11:15 +00:00
Manfred Karrer
00f17c6d14 Add log for trade state, improve install doc 2016-11-12 12:50:49 +01:00
Manfred Karrer
34928fb61f Add Zclassic 2016-11-10 01:00:17 +01:00
Manfred Karrer
d81f74a3ef Add Zclassic 2016-11-09 19:03:06 +01:00
Manfred Karrer
c767b7faa2 Remove dangling trades when dispute was already closed 2016-11-06 19:58:16 +01:00
Manfred Karrer
c58ec43e46 Added Smileycoin, RealEst. Coin 2016-11-04 14:28:18 +01:00
Manfred Karrer
2d1d3251c3 Merge branch 'master' into Development 2016-11-04 14:25:30 +01:00
HostFat
44caef6664 Missing commas 2016-11-04 05:16:54 +01:00
HostFat
b724e1af8d Added some blockexplorers 2016-11-04 05:13:49 +01:00
Manfred Karrer
4e7f44a213 Revert change of WalletAppKit 2016-11-03 21:13:03 +01:00
Manfred Karrer
c239b37b59 Add notification support to dispute view 2016-11-03 21:08:11 +01:00