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

1572 Commits

Author SHA1 Message Date
Manfred Karrer
728dead33c Add timeout and resend support for p2p messages in trade process 2017-06-26 16:09:59 +02:00
Manfred Karrer
443f871b58 Remove symbol form TradeCurrency. Make tradeLimit dependent to currency (needed to relax limit for SF) 2017-06-26 02:33:53 +02:00
Manfred Karrer
c7b1ab3d77 Add PaymentAccountList to PB of account export/import. 
Show MultiSig address in LockedFunds view.
Stop spinner at trade step for failed trades.
Add shortcut to remove failed trade from pending trades view.
 2017-06-25 23:02:51 +02:00
Manfred Karrer
43bcff00c1 Use Utilities mothod for detecting key combi. 
Change cmd key combis to alt (support still cmd and ctrl).
Check for locked fund in failed trades.
Don't move failed trades which have locked funds to failed trades list.
Clean up address entry list at startup.
 2017-06-25 18:01:02 +02:00
Manfred Karrer
7c1c9a34a4 User getAddressEntry instead of getOrCreateAddressEntry in readOnly access for addressEntries (iteration for lists). 
Remove addressEntry after trade process entered new state.
 2017-06-25 00:57:12 +02:00
Manfred Karrer
5a16864eaa Print address entries at top. Add log when swapping address entries 2017-06-25 00:43:14 +02:00
Manfred Karrer
2655b29dd2 Fix swapToAvailable method 2017-06-25 00:42:28 +02:00
Manfred Karrer
f705dc27c1 Adjust logging 2017-06-24 22:14:27 +02:00
Manfred Karrer
664aeaac4b Adopt fees 2017-06-24 22:14:15 +02:00
Manfred Karrer
9c24179ad4 Add check for isBootstrapped 2017-06-24 22:13:57 +02:00
Manfred Karrer
2b1734e313 Add isBitcoinLocalhostNodeRunning to BisqEnvironment and checkIfLocalHostNodeIsRunning to MainViewModel for detecting localhost btc node to disable tor in that case. 
Rename Preferences db file to PreferencesPayload.
Use default MaxConnections (12) instead of 11.
Use Guice for ProvidersRepository and FeeProvider.
Remove BsqUtxoFeedProvider, BsqUtxoFeedRequest, BsqUtxoFeedData and BsqUtxoFeedService.
Improve logging.
Adust logback logging.
 2017-06-24 18:56:55 +02:00
Manfred Karrer
4bd299427c Add timeout to broadcast callbacks in tasks to avoid timeout errors. 
Add minValue to BtcValidator.
Fix LTC fees.
Log all onStoredInMailbox and onArrived handler calls.
Fix translations.
 2017-06-24 15:03:12 +02:00
Manfred Karrer
d45237f6a4 Fix wrong altcoin price 2017-06-24 01:19:40 +02:00
Manfred Karrer
e4bc6075f9 Fix PB paymentAccounts 2017-06-24 01:19:26 +02:00
Manfred Karrer
155565dc7b Dont show fee info popup if not BTC 2017-06-23 22:57:22 +02:00
Manfred Karrer
74423c7264 Fix preferredTradeCurrency handling 2017-06-23 21:57:55 +02:00
Manfred Karrer
260ceda778 Add second provider node 2017-06-23 20:35:01 +02:00
Manfred Karrer
f7993b61c2 Change version nr 0.5.0.0. to 0.5.0 2017-06-23 18:10:26 +02:00
Manfred Karrer
06b90a501b Add new provider node 2017-06-23 18:10:11 +02:00
Manfred Karrer
1500f3beb6 Add counterCurrencyTxId to Trade and BuyerSendCounterCurrencyTransferStartedMessage. Rename BuyerSendFiatTransferStartedMessage to BuyerSendCounterCurrencyTransferStartedMessage 2017-06-23 00:13:49 +02:00
Manfred Karrer
46cc8f57ac Add supportsDirectContact to preferences and offerPayload 2017-06-22 19:56:27 +02:00
Manfred Karrer
0ed4b07f4a Adjust fees for ltc 2017-06-22 15:25:15 +02:00
Manfred Karrer
546e4a6ba2 Fix fees for doge and ltc. use monetaryFormat from params. fix layout issue in takeOfferView. add JsonExclude for pubkeyring 2017-06-22 14:58:44 +02:00
Manfred Karrer
868fbecaec Add localhost seednode (localhost:2008). Fix security desposit values and fees for doge. Fix layout issue with currency box. 2017-06-22 14:18:58 +02:00
Manfred Karrer
727b0d682e Make sec. deposit restrictions adjusted by base currency 2017-06-22 02:49:19 +02:00
Manfred Karrer
f3f05413fe Add checks for isBaseCurrencySupportingBsq 2017-06-22 02:22:50 +02:00
Manfred Karrer
8679c7a9e6 Adjust fees 2017-06-22 02:21:53 +02:00
Manfred Karrer
2664e90aaf Fix missing setter in preferences 2017-06-22 00:30:02 +02:00
Manfred Karrer
9acbcb682f Throw exception if wallet encryption fails. Check if bsq is supported in walletConf. 2017-06-22 00:07:29 +02:00
Manfred Karrer
a46cb5317e handle stopTimer at end of tasks 2017-06-21 23:26:15 +02:00
Manfred Karrer
68501364e9 Add shortcut for displaying DAO menu item 2017-06-21 20:06:21 +02:00
Manfred Karrer
9166494d69 Add filter checks in trade protocol 2017-06-21 19:10:12 +02:00
Manfred Karrer
5adefa2409 Fix price validator min. value. Add FiatPriceValidator to distinguish between volume (0.01) and price (0.0001) 2017-06-21 18:39:54 +02:00
Manfred Karrer
d7f00e48e6 Make tradeLimits custom per baseCurrency 2017-06-21 17:27:38 +02:00
Mike Rosseel
4d2d81174f Merge branch 'DAO' into issue544-api 
Conflicts:
	bsq_utxo_provider/src/main/java/io/bisq/bsq_utxo_provider/BsqUtxoProviderModule.java
	core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java
 2017-06-16 10:48:01 +02:00
Manfred Karrer
01cef04afd Add check if node addresses is in filter at process data at maker and taker 2017-06-16 01:16:42 +02:00
Manfred Karrer
0cb4223246 Add printing of stats for trades by currency 2017-06-16 00:40:29 +02:00
Manfred Karrer
1464beb200 Fix issue with not selecting market price at startup 2017-06-15 23:29:50 +02:00
Manfred Karrer
d35b512007 Add Blockcypher explorer 2017-06-15 18:15:04 +02:00
Manfred Karrer
af9b583a0a Add arbitratorPubKeyRing and mediatorPubKeyRing to trade. remove arbitrator from user at revoke 2017-06-15 15:03:56 +02:00
Manfred Karrer
93eecd17e4 Fix transient fields on OfferForJson. Dont dump json in iteration but after. 2017-06-14 23:46:57 +02:00
Manfred Karrer
3f164e7923 Update provider address 2017-06-14 21:32:37 +02:00
Manfred Karrer
ccad4334a7 Move getDefaultBaseCurrencyNetwork from BaseCurrencyNetwork to BisqEnvironment. 
Reformat BisqEnvironment with statics on top.
 2017-06-14 15:10:50 +02:00
Manfred Karrer
275ea6846b Move baseCurrency methods form BaseCurrencyNetwork to BisqEnvironment 2017-06-14 14:46:56 +02:00
Manfred Karrer
b334065af0 Use static BaseCurrencyNetwork.getBaseCurrencyNetwork() calls. Rename env to environment and type Environment to BisqEnvironment in concrete classes. 2017-06-14 13:51:34 +02:00
Manfred Karrer
362b0f9793 Add flags for deactivating dao and dao phase 2 features 2017-06-14 13:03:46 +02:00
Manfred Karrer
a348cf8bb1 Add DogecoinRegTestParams (placeholder, not impl yet) 2017-06-13 20:58:39 +02:00
Manfred Karrer
72a0c4168d Add readObject to cover transient fields from serialized data 2017-06-13 20:48:56 +02:00
Manfred Karrer
ac2fc814fd Add ltc and doge block explorers 2017-06-13 13:45:53 +02:00
Manfred Karrer
edb71d1d86 Add altcoin validation for btc. ltc and doge. change order of base currency network to avoid to break port assignment by enum ordinal. add btc to altcoin list if not base currency. 2017-06-13 12:44:25 +02:00
Manfred Karrer
7bd9ba6fb0 Convert btc based market price to ltc or doge based market price 2017-06-13 11:24:11 +02:00
Manfred Karrer
1b50bc9a3a Make minNonDustOutput base coin context specific 2017-06-13 10:41:41 +02:00
Manfred Karrer
b4fff9e1f6 Add market selection popup at startup 2017-06-13 08:53:13 +02:00
Manfred Karrer
9aba9e607a Make tx fee dynamic by base currency 2017-06-13 07:35:35 +02:00
Manfred Karrer
5a0d493d02 Use 100 000 Sat for 1 BSQ in formatter. Use localhost fee provider 2017-06-12 21:54:08 +02:00
Manfred Karrer
9337101a9b Change fee structure for ltc 2017-06-12 21:39:37 +02:00
Manfred Karrer
ed6b2d9974 Add LtcFeesProvider 2017-06-12 21:15:17 +02:00
Manfred Karrer
75ed3f3baf Don't check sig if no sig is there. 2017-06-12 17:49:21 +02:00
Manfred Karrer
9b5172b2de Add basic PB support for BSQChainState (java serialized atm) 2017-06-12 12:29:30 +02:00
Manfred Karrer
7e52f2f6b8 Replace usage of "BTC" in code with base currency. Set LTC genesis tx (dev) 2017-06-12 01:59:10 +02:00
Manfred Karrer
f9cd71c5c2 Replace usage of "BTC" in code with base currency. Remove denomination property in preferences 2017-06-11 23:39:41 +02:00
Manfred Karrer
d27c4a6d7f Use https://github.com/bitsquare/bitsquare instead of https://github.com/bisq/bisq 2017-06-11 22:52:47 +02:00
Manfred Karrer
ba3fcc2cd4 Apply string replace for BTC, Bitcoin and bitcoin to selected base currency 2017-06-11 22:49:26 +02:00
Manfred Karrer
bf377501ad Add seed node for ltc mainnnet 2017-06-11 22:18:28 +02:00
Manfred Karrer
64a72ddec1 Add comment 2017-06-10 23:57:47 +02:00
Manfred Karrer
a860f8c8d3 Support LTB for DAO as base currency 2017-06-10 13:56:30 +02:00
Manfred Karrer
f847900049 Rename BaseCryptoNetwork to BaseCurrencyNetwork 2017-06-10 13:06:24 +02:00
Manfred Karrer
f8c7149e68 Merge branch 'DAO' into altcoins 2017-06-10 11:29:36 +02:00
Manfred Karrer
934474f6d0 Fix incorrect handling of messageVersion. Make NetworkEnvelope a abstract class instead of Interface. 2017-06-09 17:36:16 +02:00
Mike Rosseel
f99a3c1238 Merge branch 'DAO' into altcoins 
Conflicts:
	common/src/main/java/io/bisq/common/proto/ProtoUtil.java
	core/src/main/java/io/bisq/core/user/Preferences.java
 2017-06-09 16:58:06 +02:00
Mike Rosseel
a61a350ec7 read preferred crypto network from property file 2017-06-09 16:45:41 +02:00
Manfred Karrer
e86edd8384 Migrate old trade statistic db to new data structure. 
Use SignaturePubKeyBytes instead of PubKeyRing in TradeStatistics.
Use PersistedEntryMap instead of PersistableHashMap.
Use bytes as Hex encoded instead of toString call.
Use ConcurrentHashMap for SequenceNumberMap and PersistedEntryMap
 2017-06-08 23:47:55 +02:00
Manfred Karrer
a1aa1021eb Apply code formatter 2017-06-08 18:06:17 +02:00
Manfred Karrer
65285bfe30 Apply code inspection 2017-06-08 18:02:05 +02:00
Manfred Karrer
8485e6655d Dont call closeDisputedTrade at onDisputedPayoutTxMessage. 
Add RuntimeException if tx signing fails
 2017-06-08 12:36:40 +02:00
Manfred Karrer
813d896295 Fix P2PDataStorage bug (missing super call for lombok equalsandhashcode) 2017-06-08 12:06:09 +02:00
Manfred Karrer
8c051c3873 Add missing initPersistedDataHosts calls. Refactorings 2017-06-08 12:05:06 +02:00
Mike Rosseel
0249df4ddd Merge branch 'DAO' into issue544-api 2017-06-08 11:35:50 +02:00
Manfred Karrer
677f6c81c6 Add missing contractHash from PB.Trade. 
Dont set nullable trade objects if PB is not set.
Remove Serializable form Proto interface
Remove LookAheadObjectInputStream
 2017-06-08 00:55:53 +02:00
Manfred Karrer
b64457e869 Fix missing ProtocolVersion in Offer. 
Use getTTL() instead of Lombok Getter with instance field
 2017-06-07 21:15:50 +02:00
Manfred Karrer
22d90f627c Use ProtoUtil.protoToNullableString and protoToToNullableByteArray instead of isEmpty checks and null assignement. 
Use fromProto for BlockChainExplorer, Country, CryptoCurrency, FiatCurrency
Use @EqualsAndHashCode(callSuper = true) for PaymentAccounts
Replace Samenknoten with Seednodes in german translation
Clean up PB definitions.
 2017-06-07 20:25:38 +02:00
Mike Rosseel
3a42426f50 Merge branch 'DAO' into issue544-api 2017-06-07 16:41:06 +02:00
Mike Rosseel
5b72e42a4e second part of merge 2017-06-07 15:19:28 +02:00
Mike Rosseel
aed210c33d Merge branch 'DAO' into issue544-api 
Conflicts:
	bsq_utxo_provider/src/main/java/io/bisq/bsq_utxo_provider/BsqUtxoProviderModule.java
	core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java
	core/src/main/java/io/bitsquare/trade/offer/Offer.java
	gui/src/main/java/io/bisq/gui/app/BisqApp.java
	pom.xml
 2017-06-07 15:18:59 +02:00
Mike Rosseel
d50ff6c6dc added the LTC network id's, renamed bitcoinNetwork to baseCryptoNetwork. 
Still a few places with BTC left, needs some more thought like TOR options, file to save the wallet to, ...
 2017-06-06 11:14:15 +02:00
Manfred Karrer
1e01ef3650 Cleanup PB definitions and methods 2017-06-06 02:39:37 +02:00
Manfred Karrer
e5b775d07c Cleanup PB definitions and methods 2017-06-05 23:13:51 +02:00
Manfred Karrer
3f756d4923 Cleanup PB definitions and methods 2017-06-05 21:03:50 +02:00
Manfred Karrer
5558d2f39b Fix nullable fields in Dispute 2017-06-05 20:02:58 +02:00
Manfred Karrer
0c50fb9413 Fix missing check of isMyOwnRegisteredArbitrator 2017-06-04 00:13:42 +02:00
Manfred Karrer
37f8cb8127 Fix issues with dispute, trade, userpayload, persistance 2017-06-02 18:55:17 +02:00
Manfred Karrer
2a7f851936 Fix TradableList, impl. missing fromProto methods 2017-05-31 01:36:12 +02:00
Manfred Karrer
1efe4e8828 Fix PaymentAccount id issue 2017-05-30 22:20:48 +02:00
Manfred Karrer
4b88465b47 Remove AtomicBoolean 2017-05-30 19:52:06 +02:00
Manfred Karrer
bddeb381a6 Fix nullpointer, cleanups.... 2017-05-30 15:34:57 +02:00
Mike Rosseel
5cb30dbffb fix the bug where a persisted paymentaccount would have a wrong id by eliminating the duplicate id on PaymentAccount/PaymentAccountPayload 2017-05-30 14:07:13 +02:00
Mike Rosseel
3570f609a9 don't crash on empty OpenOffers 2017-05-26 14:42:02 +02:00
Mike Rosseel
5752fdc4b6 fix OpenOffer bug 2017-05-24 15:48:40 +02:00
Mike Rosseel
879d1ec392 Persisted_entry_map now saved, tradablelist fixes (wip) 2017-05-22 15:00:46 +02:00
Mike Rosseel
dc32bd24b1 fix don't show again bug. Better log text. 2017-05-18 17:04:05 +02:00
Manfred Karrer
e49b6b8783 Version 0.4.9.9.2 2017-05-18 15:41:48 +02:00
Manfred Karrer
24b19e527b Fix wrong trade fees 2017-05-18 15:41:04 +02:00
Mike Rosseel
790dfa80a7 fix startup bug by ensure the userPayload always has initialized lists, add try/catch in some places 2017-05-18 11:46:44 +02:00
Manfred Karrer
e5585a1b3a Version 0.4.9.9.2 2017-05-18 00:44:43 +02:00
Manfred Karrer
c5e23feccd Increase default tx fee for non-trade txs to 150_000 sat 2017-05-18 00:29:06 +02:00
Manfred Karrer
b38e7806d9 Increase tx fee for trades to 150_000 sat 2017-05-18 00:27:53 +02:00
Manfred Karrer
ec6d67ca72 Add Janus 2017-05-18 00:16:58 +02:00
Manfred Karrer
b50714eb30 Add Janus 2017-05-18 00:16:30 +02:00
Mike Rosseel
32d905e475 no need for atomic, only run on gui thread 2017-05-17 14:31:59 +02:00
Mike Rosseel
a9b8b51bd6 preferences refactoring 2017-05-16 16:13:09 +02:00
Manfred Karrer
6939145045 Merge branch 'WIP' into DAO 
# Conflicts:
#	common/src/main/java/io/bisq/common/storage/FileManager.java
 2017-05-15 14:13:19 +02:00
Manfred Karrer
3cc27fe89a Refactor User and Preferences (User still not working correctly) 2017-05-15 14:09:39 +02:00
Mike Rosseel
f0b342d91f Merge remote-tracking branch 'origin/DAO' into DAO 
# Conflicts:
#	common/src/main/java/io/bisq/common/storage/FileManager.java
 2017-05-14 20:23:18 +02:00
Mike Rosseel
f8a315a3d4 second part of the enum fix + logging fixes for filemanager 2017-05-14 18:40:10 +02:00
Manfred Karrer
028d26e23e Handle casting errors at ProtoUtil. Rename ProtoCommonUtil to ProtoUtil, remove ProtoCoreUtil 2017-05-14 15:09:55 +02:00
Manfred Karrer
f7ef638b1c Merge branch 'offerlist' into DAO 
# Conflicts:
#	core/src/main/java/io/bisq/core/trade/TradableList.java
#	core/src/main/java/io/bisq/core/trade/protocol/ProcessModel.java
#	core/src/test/java/io/bisq/core/util/ProtoBufferUtilitiesTest.java
 2017-05-14 14:48:20 +02:00
Manfred Karrer
f899d217c0 Fix missing impl of pb in tradingPeer and fix nullable data and incorrect enum values 2017-05-14 14:42:34 +02:00
Mike Rosseel
559eb59498 first part of the enum fix 2017-05-14 13:50:59 +02:00
Manfred Karrer
ce58862774 WIP 2017-05-14 01:22:23 +02:00
Manfred Karrer
70f81789f0 Fix issue with OpenOffer persistence. 2017-05-14 00:23:32 +02:00
Manfred Karrer
c2c64d9e9d Fix bug in AddressEntryList, add TradeStatisticsList 2017-05-13 23:24:27 +02:00
Manfred Karrer
62f5f3522c Refactored protobuffer AddressEntryList and Navigation 2017-05-13 22:33:10 +02:00
Manfred Karrer
07cd0b5f00 Refactored protobuffer AddressEntryList and PeerList 2017-05-13 21:21:40 +02:00
Manfred Karrer
f8be0f2c2e Add missing handling of nullable data 2017-05-13 20:16:20 +02:00
Manfred Karrer
3e6b338cc7 Refactored PaymentAccounts protobuffer handling 2017-05-13 20:03:28 +02:00
Manfred Karrer
824e26eeca Refactoring: apply Lombok, cleanup 2017-05-13 16:04:03 +02:00
Manfred Karrer
603c3c512e Add semantic version model and test 2017-05-13 14:01:05 +02:00
Manfred Karrer
78d3734945 Refactoring: move packages, renaming.. 2017-05-13 13:23:33 +02:00
Manfred Karrer
0f48a425ac Add ProtobufferException. Cleanup. Rename ProtectedStorageEntryOrProtectedMailboxStorageEntry to StorageEntryHolder 2017-05-13 13:10:58 +02:00
Manfred Karrer
cecb0b0838 CoreNetworkProtoResolver: Moved toProto methods to classes. Cleaned up all NetworkEnvelope classes 2017-05-13 02:00:58 +02:00
Manfred Karrer
26fb83f023 Apply Lombok to more messages and payload objects 2017-05-12 19:56:29 +02:00
Manfred Karrer
07f5cd3391 Remove getUid(), getSenderNodeAddress() and getMessageVersion() getters. Use Lombok instead. 2017-05-12 19:16:41 +02:00
Manfred Karrer
918a8f2115 Rename myNodeAddress to senderNodeAddress to be compatible with interface methods and Lombok getter. 2017-05-12 18:58:58 +02:00
Manfred Karrer
aee2f8ecac Rename getUID to getUid to make it compatible with Lombok Getters 2017-05-12 18:48:09 +02:00
Manfred Karrer
b3d0d25d72 Fix missing params in PrivateNotificationPayload constr. Use static fromProto methods. Removed readObject from SealedAndSigned and PrivateNotificationPayload. Add Sig.getSigPublicKeyFromBytes. 2017-05-12 18:46:42 +02:00
Manfred Karrer
98e702905d Remove serialVersionUID 2017-05-12 17:45:53 +02:00
Manfred Karrer
dcd552f674 Rename classed ending with Msg to Message 2017-05-12 17:34:24 +02:00
Mike Rosseel
e74c5082d5 adding unit test to see what happens in case of an unknown_failure entry in protobuffer (default value) => it throws an IllegalArgumentException 2017-05-12 16:29:40 +02:00
Manfred Karrer
0321448d0f Rename PB def 2017-05-12 15:17:20 +02:00
Manfred Karrer
1cf910e8cb Refactor base interfaces for protobuffer. Rename User to UserPayload and UserModel to User. 2017-05-12 13:26:13 +02:00
Manfred Karrer
752e02dd89 Rename RefreshTTLMsg to RefreshOfferMsg 2017-05-12 02:18:19 +02:00
Manfred Karrer
60a6396ceb Remove default methods in Marshaller 2017-05-12 02:10:32 +02:00
Manfred Karrer
02d002c41d Rename toEnvelopeProto to toProtoMsg and toProto to toProtoMessage 2017-05-12 01:45:15 +02:00
Manfred Karrer
10a43d10ec Renaming 2017-05-12 01:37:03 +02:00
Manfred Karrer
bf6d2b15e9 Refactoring: 
- renamed User to UserModel and UserVO to User
- removed unused/unneeded PB definitions
- rearranged pb def by domain
- renamed Envelope to Msg and DiscEnvelope to Peristable
- removed locale param in paymentAccount classes…
- removed Coin and DecryptedMsgWithPubKey
 2017-05-12 00:51:24 +02:00
Manfred Karrer
05230e3794 Rename Envelope in PB definition to Msg. Rename p2pMessageVersion to MsVersion 2017-05-11 23:17:31 +02:00
Manfred Karrer
e8d2b54d3e Rename openOffers to openOfferList in OpenOffer. Fix comments. Remove unused stuff,... 2017-05-11 22:52:01 +02:00
Manfred Karrer
53494b08b8 Fix setup for UserVO 2017-05-11 22:05:01 +02:00
Manfred Karrer
46bbecff3c Fix PubKeyRing 2017-05-11 19:22:26 +02:00
Manfred Karrer
a7b7cbbbca Fix missing methods 2017-05-11 18:32:00 +02:00
Manfred Karrer
be73d4d83c Merge branch 'DAO' into disk-protobuffer 2017-05-11 18:14:32 +02:00
Manfred Karrer
00268cd6af Use 4 days for sepa 2017-05-11 18:13:35 +02:00
Mike Rosseel
3108e784cc Merge remote-tracking branch 'origin/DAO' into disk-protobuffer 
Conflicts:
	core/src/main/java/io/bisq/core/trade/protocol/ProcessModel.java
 2017-05-11 14:42:19 +02:00
Mike Rosseel
093b7828b1 tradablelist fixes 2017-05-11 14:38:24 +02:00
Manfred Karrer
a97a3cc08b Improve BSQ fee handling in createOffer and TakeOffer screens 2017-05-11 00:46:58 +02:00
Manfred Karrer
8633e0eaf2 Show price provider URL at tooltip 2017-05-10 21:54:35 +02:00
Manfred Karrer
b31f8ea243 Fix issuanceVerification in parser 2017-05-10 21:18:32 +02:00
Mike Rosseel
4f68de2a96 ViewPath works 2017-05-09 22:32:42 +02:00
Mike Rosseel
423e5c8e05 TradableList works 2017-05-08 21:46:17 +02:00
Manfred Karrer
9ae3e1e4c3 Refactor handling of DecryptedMsgWithPubKey in Trade. 2017-05-05 14:22:16 +02:00
Manfred Karrer
776893761c Add removeMailboxMessage method 2017-05-05 13:12:15 +02:00
Manfred Karrer
204385b4d9 Make getMailboxMessageSet private 2017-05-05 13:07:50 +02:00
Mike Rosseel
d99cab1d3c CompensationRequest done (added extends Persistable), ProcessModel done. 
TODO: adding trade objects to resolver
 2017-05-04 22:19:49 +02:00
Manfred Karrer
5d755f7288 Add toProto to ProcessModel (WIP) 2017-05-04 15:49:45 +02:00
Mike Rosseel
0c872396b0 Merge remote-tracking branch 'origin/disk-protobuffer' into disk-protobuffer 2017-05-04 15:45:12 +02:00
Mike Rosseel
7f56d01cee getting the Trade serialized, missing processmodel and decryptmsgwithpubkey 2017-05-04 15:44:30 +02:00
Manfred Karrer
26d4279d8c Remove bloomfilter nonce 2017-05-04 15:15:50 +02:00
Manfred Karrer
963494918d Add better logs, remove local seednode 2017-05-04 15:02:55 +02:00
Mike Rosseel
bf7c06e0e2 getting the Trade serialized, wip 2017-05-03 16:52:15 +02:00
Mike Rosseel
5498025a3a fix paymentaccount deser 2017-04-28 20:50:46 +02:00
Mike Rosseel
6cee0e415c fix paymentaccount reading + refactor tradecurrency to fromProto 2017-04-28 16:27:54 +02:00
Mike Rosseel
cea1c0c778 VoteItemsList added, paymentaccount debugging 2017-04-27 16:34:39 +02:00
Mike Rosseel
ab19521b6f Preferences fixes 2017-04-26 21:19:35 +02:00
Mike Rosseel
19c1659459 Merge remote-tracking branch 'origin/DAO' into disk-protobuffer 
Conflicts:
	core/src/main/java/io/bisq/core/proto/CoreNetworkProtoResolver.java
 2017-04-25 11:27:27 +02:00
Mike Rosseel
3a79e573ff Merge branch 'DAO' into disk-protobuffer 2017-04-25 11:11:17 +02:00
Manfred Karrer
89990de463 Replace occurances of Bitsquare with bisq 2017-04-24 21:59:17 -05:00
Manfred Karrer
9fe3bf7510 Fix nullpointer in constructor 2017-04-24 14:09:04 -05:00
Manfred Karrer
a410da43ad Remove all json files at startup. Improve logs 2017-04-24 13:43:22 -05:00
Mike Rosseel
c7e765d52c Merge remote-tracking branch 'origin/DAO' into disk-protobuffer 
Conflicts:
	core/src/main/java/io/bisq/core/proto/CoreNetworkProtoResolver.java
 2017-04-24 15:33:25 +02:00
Mike Rosseel
64f13e1bfd sequencenumbermap resolver 2017-04-24 15:13:13 +02: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
87af0b4644 Add another seednode, add more logging 2017-04-23 18:21:51 -05:00
Manfred Karrer
445823412a Remove startup timeout for seednode 2017-04-23 15:33:45 -05:00
Manfred Karrer
cd8daaf483 Set testnet genesis tx 2017-04-23 13:39:54 -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
c6af0c5e72 Remove rpc property file and put it in code. 2017-04-22 01:35:45 -05:00
Manfred Karrer
6b5ae740f5 Add ScriptTypes: witness_v0_keyhash and witness_v0_scripthash. Use testnet genesis tx. Use version 0.5.8.1. of btcd rpc lib. Update docs 2017-04-22 01:02:18 -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
9ab7cff156 Made Transaction and Coin fields transient. Do instantiation of transient fields in getters. Removed readObject and init methods. 2017-04-20 15:37:46 -05:00
Manfred Karrer
df1d5924d0 Make Transaction transient in Trade and fetch it on demand from wallet 2017-04-20 13:50:52 -05:00
Manfred Karrer
7771ba393d Use connected txo in txin, remove isverfied from tx 2017-04-20 13:14:49 -05:00
Mike Rosseel
6f18939fcb fix arbitrator signature which was not UTF-8 (convert to hex would be better?), null field errors. 2017-04-20 16:06:25 +02:00
Mike Rosseel
9e0056a276 Merge remote-tracking branch 'origin/DAO' into disk-protobuffer 2017-04-20 08:51:17 +02:00
Mike Rosseel
93b9847e47 User split in User and UserVO, all persisted stuff goes to UserVO, a lot cleaner than a class loading itself and fiddling at its internal bits - now you load your VO and replace it with the loaded version, update observables and done, code is shorter and more readable as well. Added fromProto() methods. Fixed a toProto bug. 2017-04-20 08:50:58 +02:00
Manfred Karrer
4cf791cf3a Refactor chainstate domain: Wrap immutable state into mutable classes instead of maintaining maps with mutable state. Improve Json exporter. 2017-04-20 01:13:01 -05:00
Manfred Karrer
5533a4e93f Add null check 2017-04-19 20:06:16 -05:00
Manfred Karrer
a65a28855f Add mapping for json files 2017-04-19 19:41:40 -05:00
Manfred Karrer
db73db02a6 Rename burnedFee to burntFee 2017-04-19 15:06:05 -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
Manfred Karrer
9dec307faa Merge branch 'WIP' into DAO 2017-04-19 14:04:43 -05:00
Manfred Karrer
1f8b6ca388 Add checks for chainheight, cleanup. 2017-04-19 11:10:23 -05:00
Mike Rosseel
18be5ec9aa Merge branch 'DAO' into disk-protobuffer 2017-04-19 11:07:19 +02:00
Mike Rosseel
c6bb61337f threading proposal + remove ctor 2017-04-19 11:04:08 +02:00
Manfred Karrer
9ade57842b Dont store unused data if no jsonDump is done. Cleanup. 2017-04-18 15:35:03 -05: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
Mike Rosseel
b878389c25 Merge branch 'DAO' into disk-protobuffer 
Conflicts:
	bsq_utxo_provider/src/main/java/io/bisq/bsq_utxo_provider/BsqUtxoProviderModule.java
	common/src/main/java/io/bisq/common/storage/FileManager.java
	core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java
	gui/src/main/java/io/bisq/gui/app/BisqAppModule.java
	seednode/src/main/java/io/bisq/seednode/SeedNodeModule.java
 2017-04-18 09:36:12 +02:00
Mike Rosseel
25d2366b71 user disk saving 2017-04-18 09:31:36 +02:00
Manfred Karrer
df5ad53eb9 Use thread for json export 2017-04-17 15:39:37 -05:00
Manfred Karrer
29e3ad0ee3 Add blockHeight text field to UI. 2017-04-17 15:34:26 -05:00
Manfred Karrer
cfe814e4cd Make snapshot in same thread which is writing the block. Reset data and apply latest snapshot at reorg. 2017-04-17 14:43:18 -05:00
Manfred Karrer
27462f0e83 Use Thread for parsing BsqBlocks at BsqLiteNode 2017-04-16 23:38:50 -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
c54087542c Make chainstate class thread safe 2017-04-15 12:44:21 -05:00
Manfred Karrer
7d355215a1 Add blocks and txs, clean up 2017-04-15 00:24:41 -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
4c38e367b4 Remove param form AddressEntry, small refactorings... 2017-04-13 20:02:15 -05:00
Manfred Karrer
36e9831aae Fix AddressEntry issues and pref. issues. Reove KeyBagSupplier 2017-04-13 19:33:55 -05:00
Manfred Karrer
bc32048301 Fix incorrect call at TakerPublishTakerFeeTx 2017-04-13 17:57:25 -05:00
Manfred Karrer
1aefa0284f Merge branch 'dao-disk-merge' into DAO 2017-04-13 17:01:30 -05:00
Manfred Karrer
b95ab354e5 Move snapshot handling to manager class. use callback for each block 2017-04-13 15:16:11 -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
d2010c6088 merge dopersist fix 2017-04-13 21:08:04 +02:00
Mike Rosseel
2d3706f4d7 Merge branch 'disk-protobuffer' of github.com:bitsquare/bitsquare into disk-protobuffer 2017-04-13 21:06:48 +02:00
Mike Rosseel
d5bd386bbd fix preferences saving/loading 2017-04-13 21:06:38 +02:00
Manfred Karrer
552d8f1910 Add reorg handling 2017-04-13 13:50:03 -05:00
Manfred Karrer
8516781ed7 Handle threading issues with parser 2017-04-13 10:37:07 -05:00
Manfred Karrer
b99a428198 Fix wrong doPersist call 2017-04-13 09:00:08 -05:00
Manfred Karrer
ac7714078c Remove useStickyMarketPrice (not used anymore) 2017-04-12 21:54:16 -05:00
Manfred Karrer
1809393b69 User persist method and flag to prevent persist calls at PB setters 2017-04-12 21:50: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
Manfred Karrer
d775bbfd8b Remove TakerPublishTradeStatistics task 2017-04-11 20:07:39 -05:00
Manfred Karrer
704fe3f521 Remove CapabilityRequiringPayload from TradeStatistics 2017-04-11 20:04:44 -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
3b09202fd0 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 11:04:42 +02: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