Commit graph

3727 commits

Author SHA1 Message Date
Manfred Karrer
331320f202 Added PEPECASH 2017-06-04 15:57:05 +02:00
Manfred Karrer
0c50fb9413 Fix missing check of isMyOwnRegisteredArbitrator 2017-06-04 00:13:42 +02:00
Manfred Karrer
ede90eb4cd Fix logs 2017-06-02 18:58:29 +02:00
Manfred Karrer
9374d4907f Fix issues with dispute, trade, userpayload, persistance 2017-06-02 18:57:05 +02:00
Manfred Karrer
ab81f76bf0 Merge remote-tracking branch 'origin/DAO' into DAO
# Conflicts:
#	common/src/main/java/io/bisq/common/storage/FileManager.java
2017-06-02 18:56:08 +02:00
Manfred Karrer
37f8cb8127 Fix issues with dispute, trade, userpayload, persistance 2017-06-02 18:55:17 +02:00
Mike Rosseel
b5298d360f change logging from error to info, distracting in logs 2017-05-31 11:50:07 +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
3a6fe00d4f Add log 2017-05-30 20:01:27 +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
991f6c9319 Don't hide guice exceptions when popup doesn't work, log it! 2017-05-19 10:29:44 +02:00
Mike Rosseel
dc32bd24b1 fix don't show again bug. Better log text. 2017-05-18 17:04:05 +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
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
8eaa7b5cd6 Merge remote-tracking branch 'origin/DAO' into DAO 2017-05-13 13:24:17 +02:00
Manfred Karrer
78d3734945 Refactoring: move packages, renaming.. 2017-05-13 13:23:33 +02:00
Manfred Karrer
17666f56e1 Refactoring: move packages, renaming.. 2017-05-13 13:19:23 +02:00
Manfred Karrer
0f48a425ac Add ProtobufferException. Cleanup. Rename ProtectedStorageEntryOrProtectedMailboxStorageEntry to StorageEntryHolder 2017-05-13 13:10:58 +02:00
Manfred Karrer
48dd93db82 Cleanup Connection. Remove protoInputStream.available() (is always 0) 2017-05-13 12:50:34 +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