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

3796 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
9791ca82d1 Merge pull request #803 from bitsquare/DAO-threading 
threading proposal + remove ctor
 2017-04-19 11:10:35 -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
f9634ce052 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:20 +02: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
d38037cb8b Add PROTO_BUFFER entries 2017-04-16 17:40:51 -05:00
Manfred Karrer
70caec1860 Fix incorrect error/shutdown handling 2017-04-16 17:38:54 -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
bac9863d9d Apply code inspection on common module 2017-04-13 21:58:17 -05:00
Manfred Karrer
4a74837b21 Apply code inspection on GUI module 2017-04-13 21:42:43 -05:00
Manfred Karrer
4011dfb432 Remove unneeded Preference references 2017-04-13 20:39:18 -05:00
Manfred Karrer
4c38e367b4 Remove param form AddressEntry, small refactorings... 2017-04-13 20:02:15 -05:00
Manfred Karrer
05af4dd708 PlainTextWrapper does not need Persistable 2017-04-13 19:37:43 -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
a219bee7cb fix merge problems 2017-04-13 21:53:57 +02: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