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

386 commits

Author SHA1 Message Date
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
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
Manfred Karrer
26d4279d8c Remove bloomfilter nonce 2017-05-04 15:15:50 +02:00
Mike Rosseel
bf7c06e0e2 getting the Trade serialized, wip 2017-05-03 16:52:15 +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
3a79e573ff Merge branch 'DAO' into disk-protobuffer 2017-04-25 11:11:17 +02:00
Manfred Karrer
facdb32670 Add progress bar for chain sync 2017-04-24 22:44:46 -05:00
Manfred Karrer
89990de463 Replace occurances of Bitsquare with bisq 2017-04-24 21:59:17 -05:00
Manfred Karrer
20098cb814 Fixed merge issues (old bitsquare package) 2017-04-24 21:57:24 -05:00
Manfred Karrer
cff0b52e47 Added JNS (Janus) 2017-04-24 21:45:43 -05:00
Manfred Karrer
18d0bc0464 Merge branch 'Development' into DAO 
# Conflicts:
#	gui/src/main/java/io/bisq/gui/main/overlays/windows/SpendFromDepositTxWindow.java
#	gui/src/main/java/io/bisq/gui/util/validation/AltCoinAddressValidator.java
 2017-04-24 21:40:25 -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
56c1448fb4 Set devmode false, remove dummy address in send bsq view 2017-04-23 13:46:25 -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
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
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
a65a28855f Add mapping for json files 2017-04-19 19:41:40 -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
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
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
29e3ad0ee3 Add blockHeight text field to UI. 2017-04-17 15:34:26 -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
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