mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 23:18:17 +01:00
Code Issues Projects Releases Packages Wiki Activity
3440 commits 3 branches 150 tags 4.1 GiB
Commit graph

47 commits

Author SHA1 Message Date
Manfred Karrer
8f8f452b16 Revert PubKey changes 2017-03-27 19:38:37 -05:00
Manfred Karrer
242f816b4e Refactor: Rename KeyRingVo to KeyRing 2017-03-27 16:11:08 -05:00
Manfred Karrer
fdf34283a4 Refactor PubKeyRing (WIP) 2017-03-27 15:31:25 -05:00
Manfred Karrer
552a151516 Add vo module. Refactor Alert to separated classes for all differnet domains (core, vo, proto, payload, persistable) 2017-03-21 23:10:55 -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
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
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
Mike Rosseel
4a56abbf0b renamed package name to conform to module 2017-03-16 16:57:21 +01:00
Mike Rosseel
2efc3acb29 split network-messages in its own module. Compiles. 2017-03-16 14:38:18 +01:00
Manfred Karrer
3b557463da Rebranding: replace bitsquare with bisq 2017-03-12 16:00:40 -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
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
55e7871777 Rename shutDownDone to shutDownComplete at WalletsSetup. 2017-03-01 11:27:54 -05:00
Manfred Karrer
60597cec88 Rename all appearances of squ to bsq 2017-02-25 10:45:22 -05:00
Mike Rosseel
a3b31ce32b moving app classes to make it start again. 2017-02-17 14:45:03 +01:00
Mike Rosseel
17798cabf0 move apps back to where they belong 2017-02-16 14:13:34 +01: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
890c724a87 Prepare for v 0.4.9.9 2017-02-10 19:49:33 -05:00
Mike Rosseel
daa5557385 fromProto 50% done, not compiling 2017-02-09 12:23:15 +01:00
Manfred Karrer
13ec29816f Add vote view and domain (WIP) 2016-12-13 14:51:05 +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
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
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
3bf4c60567 Prepare for v0.4.9.8 2016-11-19 14:36:23 +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
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
Manfred Karrer
2f5c1a926a Check if supported crypto key length is > 128 (security policy adopted in Oracel JDK) 2016-10-20 01:45:19 +02:00
Manfred Karrer
22250574d8 Prepare for v 0.4.9.7 2016-10-19 22:04:46 +02:00
Manfred Karrer
83d411eba5 Prepare v0.4.9.6 2016-09-03 10:34:48 -05:00
Manfred Karrer
a803077296 Prepare for v 0.4.9.5 2016-08-26 17:03:01 +02:00
Manfred Karrer
7af384cb30 Prepare for 0.4.9.3 2016-08-23 15:38:08 +02:00
Manfred Karrer
c9129e95af Shot down if memory exceeds limits (restart and the sh run loop would trigger more then 1 java instance to get started) 2016-08-13 00:03:43 +02:00
Manfred Karrer
78ec8ef535 Shutdown instead of restart if uncaught error happens (out of memory) 2016-08-09 22:38:48 +02:00
Manfred Karrer
45b5cbd56d Add UncaughtExceptionHandler and restart in case we get an exception. Delay check for memory after GC. Decrease period for memory check to 3 min. 2016-08-09 22:26:57 +02:00
Manfred Karrer
f7a7c4087b Prepare v 0.4.9.3 2016-08-07 04:17:13 +02:00
Manfred Karrer
4193d338bd Decrease MAX_MEMORY_MB_DEFAULT, improve logging, comments 2016-08-06 19:22:07 +02:00
Manfred Karrer
06ee18550a Add maxMemory option for seed nodes and statistic nodes 2016-08-05 13:53:37 +02:00
Manfred Karrer
814bf8d065 Add statistics dump for offers 2016-07-31 04:10:40 +02:00
Manfred Karrer
ea75705085 Add statistics module 2016-07-31 02:37:47 +02:00