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

1813 commits

Author SHA1 Message Date
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
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
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