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
3249 commits 3 branches 150 tags 4.1 GiB
Commit graph

577 commits

Author SHA1 Message Date
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
Mike Rosseel
af0f748cb2 add optional to dispute protobuf 2017-03-07 07:59:24 +01:00
Mike Rosseel
e06db65629 fix various mailbox related errors 2017-03-06 12:21:45 +01:00
Mike Rosseel
9041960e74 set null fields to the default protobuffer values, otherwise Offer classes are not the same on both sides of the wire 2017-03-02 22:43:53 +01:00
Manfred Karrer
7ad15f8567 Add PersistedP2PStorageData 2017-03-01 18:30:14 -05:00
Mike Rosseel
c25e083cbe fix protobuffer bugs, nullcheck for truncatedString utility 2017-03-01 16:28:27 +01:00
Mike Rosseel
cc08e31546 logging changes 2017-03-01 16:26:40 +01:00
Mike Rosseel
fd9e48d8b7 revert to as close as the old version as possible 2017-03-01 16:26:07 +01: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
56db98b788 Use MAX_MSG_SIZE_GET_DATA for GetDataRequest 2017-02-28 09:53:55 -05:00
Mike Rosseel
2cdb9917de fix missing round-trip ctor arguments 2017-02-24 16:13:28 +01:00
Mike Rosseel
f6f61a36fc fix the non-serialisable LazyStringArrayList objects which come from protobuffer if no value was present. 2017-02-22 16:55:38 +01:00
Mike Rosseel
a18bbc5f39 first pass at fixing NPE's 2017-02-21 15:05:44 +01:00
Mike Rosseel
1017502035 fix communication problem 2017-02-20 15:12:42 +01:00
Mike Rosseel
7db8b8ece3 remove BSEnvironment changes, add logging to fromProtoBuffer 2017-02-20 10:58:34 +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
Mike Rosseel
92323ce561 moving app classes to make it start again. 2017-02-17 14:46:06 +01: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
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
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
3bd1f65f05 Update PersistedP2PStorageData 2017-02-11 18:02:43 -05:00
Manfred Karrer
890c724a87 Prepare for v 0.4.9.9 2017-02-10 19:49:33 -05:00
Manfred Karrer
33f16cee80 Deactivate outdated tests, cleanup 2017-02-10 14:59:23 -05:00
Mike Rosseel
6c6937f61f add maven dependency check plugin 2017-02-09 16:22:45 +01:00
Mike Rosseel
104914a4de adding new/moved files 2017-02-09 12:32:50 +01:00
Mike Rosseel
daa5557385 fromProto 50% done, not compiling 2017-02-09 12:23:15 +01:00
Manfred Karrer
7aea53bf6b Update dumped trade statistics data 2017-02-08 21:14:38 -05:00
Mike Rosseel
219ea61f85 all toProto implemented on messages and payloads, remaining: fromProto 2017-02-07 08:54:04 +01: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
Manfred Karrer
93c1700796 Merged PR (https://github.com/bitsquare/bitsquare/pull/730) with some fixes and improvements 2017-02-03 07:39:36 -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
2c9d4ab0ec Added prog arg for discovery mode, fixed small issues with PR #730 2017-02-02 20:26:47 -05:00
Mike Rosseel
f327b03e18 added some more proto messages, have utility to convert proto -> messages to keep as much of the existing flow as possible. Might not compile. 2017-01-31 16:23:33 +01:00
Mike Rosseel
8f68b25c15 added a few more messages, introduced interface to more cleanly convert between protobuf and messages - maybe need similar to convert in the other direction. No more errors in logs so all messages are correctly sent in protobuf format for the minimal usecase. 2017-01-30 16:49:10 +01:00
Mike Rosseel
dd17069b1e working ping/pong 2017-01-30 07:53:52 +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
8f871e2629 Add UTXO handling of orphan transactions, Add SquBlockchainManager, add Unittests 2017-01-17 02:56:30 +01:00
Manfred Karrer
4ccb84dd4f Sign all squ inputs, rename proposal to compensation. 2016-12-15 18:48:54 +01:00
Manfred Karrer
44f8baecef Add URL to exception logging 2016-12-12 13:02:15 +01:00
Manfred Karrer
6f9e7af7b0 Move uid to HttpClient, cleanup 2016-12-05 23:50:09 +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
020222ea2a Update PersistedP2PStorageData 2016-11-19 16:51:31 +01:00
Manfred Karrer
3bf4c60567 Prepare for v0.4.9.8 2016-11-19 14:36:23 +01:00
Manfred Karrer
f94a390b89 Dont apply TTL check for persisted data, increase timeouts, dont show btc nodes window at startup 2016-11-15 23:21:45 +01:00
Manfred Karrer
31760bbfd8 Add dev test seed node 2016-11-15 15:43:55 +01:00
Manfred Karrer
4dbd3a03c8 Rename btcSeedNodes prog. arg to btcNodes 2016-11-14 15:17:05 +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