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
8098 commits 3 branches 150 tags 4.1 GiB
Commit graph

8098 commits

This branch
This branch
All branches
Author SHA1 Message Date
Manfred Karrer
d10d91bb84
Make methods in DaoStateListener default 
To avoid empty handlers I have set all methods to default so the client
code implements only the used one.
Move handler code from onNewBlockHeight to
onParseTxsCompleteAfterBatchProcessing to avoid too much UI updates
while parsing.
 2019-02-06 00:43:02 +01:00
Manfred Karrer
1a71f4928f
Filter vote result items according to majority hash 2019-02-06 00:39:27 +01:00
Manfred Karrer
4868b0e5df
Fix onParseBlockChainComplete handler 
We had 2 times the onParseTxsComplete called in the version before
 2019-02-06 00:26:11 +01:00
Manfred Karrer
df685ceb55
Remove merit from majority hash calculation (use only stake) 2019-02-05 15:00:19 +01:00
Manfred Karrer
e2fac0c759
Only use blind vote payloads which are in majority list 2019-02-05 14:25:48 +01:00
Manfred Karrer
076e3faf95
Refactor: Move code for adding decryptedBallotsWithMeritsSet to daoStateService 2019-02-05 13:41:15 +01:00
Manfred Karrer
5702ab03cc
Fix handling of majority vote 
We need to add any valid vote reveal tx / blind vote tx pair for the
majority hash calculation even if the blind vote payload is missing as
that could be relevant for the majority hash calculation. We add an
empty ballotList and meritList in such cases.
 2019-02-05 13:36:24 +01:00
Manfred Karrer
48df6aff7f
Merge pull request #2370 from ripcurlx/fix-highlight-style 
DAO:Use highlight color without link behavior
 2019-02-05 11:32:11 +01:00
Christoph Atteneder
7d94cb6d05
Merge pull request #2345 from Augmint/augmint 
List Augmint Euro (AEUR)
 2019-02-05 11:11:41 +01:00
Viktor Szathmáry
825103b484 List Augmint Euro (AEUR) 2019-02-05 11:02:39 +01:00
Christoph Atteneder
abcfa71fb5
Use highlight color without link behavior 
Fixes #2139
 2019-02-05 10:41:42 +01:00
Manfred Karrer
68a6de2576
Merge pull request #2346 from devinbileck/tor-on-regtest 
Allow tor to be used with regtest
 2019-02-04 12:24:58 +01:00
Manfred Karrer
3824f6ce80
Merge pull request #2366 from ManfredKarrer/sqrrm-navigate-to-bond 
Dao: Add link from confiscation proposal to bond view
 2019-02-04 12:20:51 +01:00
Devin Bileck
d233aef5b1
Check useTorFlagFromOptions rather than bisqEnvironment.getProperty 2019-02-03 23:17:02 -08:00
Manfred Karrer
1b21030b11
Merge pull request #2365 from ManfredKarrer/dao-handle-burn-cases 
Dao handle burn cases
 2019-02-04 00:54:38 +01:00
Manfred Karrer
3dd8f20b79
User second method in navigationListener 2019-02-04 00:48:39 +01:00
sqrrm
16b766b91f
Highlight selected Bond when clicked through from ProposalDisplay 
- Fix #2351
- Clean up warnings
 2019-02-04 00:48:39 +01:00
sqrrm
ac59c20150
Add optional data argument to navigation 2019-02-04 00:48:39 +01:00
sqrrm
d5fc7743e8
Navigate to BondsView when clicked in ProposalDisplay 2019-02-04 00:48:39 +01:00
Manfred Karrer
3f4e641f19
Merge pull request #2355 from ManfredKarrer/dao-add-filter-flag-for-disable-dao 
Dao add filter flag for disable dao
 2019-02-04 00:17:08 +01:00
Manfred Karrer
2ad6298c0f
Add more TODO and comments 2019-02-04 00:16:38 +01:00
Manfred Karrer
90f656c257
Revert setting to UNDEFINED_TX_TYPE 2019-02-04 00:08:42 +01:00
Manfred Karrer
ff6b303f5f
Cleanup 2019-02-04 00:07:09 +01:00
Manfred Karrer
c94726554c
Cleanup 2019-02-04 00:06:59 +01:00
Manfred Karrer
0abe00ed1d
Add isActive method to bondState 2019-02-04 00:03:37 +01:00
Manfred Karrer
ac670e1afe
Merge pull request #2357 from ManfredKarrer/only-allow-grinbox-addresses 
Remove support for IP:port Grin address format.
 2019-02-03 23:42:14 +01:00
Manfred Karrer
c4d561b7aa
Merge pull request #2242 from sqrrm/dao-avoid-bsq-burn 
Dao avoid bsq burn
 2019-02-03 22:59:30 +01:00
Manfred Karrer
6ad44fe34d
Merge pull request #2336 from ManfredKarrer/dao-add-params 
Add LOCK_TIME_TRADE_PAYOUT and ARBITRATOR_FEE param
 2019-02-03 22:47:48 +01:00
Manfred Karrer
957da9f8d8
Add log 2019-02-03 22:38:34 +01:00
Manfred Karrer
cc7d7086af
Call onParseTxsComplete always in onParseBlockComplete 2019-02-03 22:38:26 +01:00
Manfred Karrer
f6e8473324
Improve logs 2019-02-03 21:22:35 +01:00
Manfred Karrer
69a9f6f311
Merge branch 'master' into dao-add-params 2019-02-03 21:13:48 +01:00
Manfred Karrer
002f225bdd
Merge branch 'master' into dao-add-filter-flag-for-disable-dao 2019-02-03 21:13:06 +01:00
Manfred Karrer
2befc7d09f
Merge pull request #2361 from ManfredKarrer/dao-permute-blindvotelist-if-not-majority-hash 
Dao permute blindvotelist if not majority hash
 2019-02-03 21:11:15 +01:00
Manfred Karrer
fcc0dcf91f
Improve logs 2019-02-03 21:05:00 +01:00
Manfred Karrer
42e37d7a07
Cleanup 2019-02-03 21:03:35 +01:00
Manfred Karrer
7a6cce615a
Merge remote-tracking branch 'origin/dao-permute-blindvotelist-if-not-majority-hash' into dao-permute-blindvotelist-if-not-majority-hash 2019-02-03 21:02:31 +01:00
Manfred Karrer
672b5a482c
Merge branch 'master' into dao-permute-blindvotelist-if-not-majority-hash 2019-02-03 21:01:56 +01:00
Manfred Karrer
774113418a
Merge pull request #2363 from ManfredKarrer/dao-fix-vote-result-with-permutated-blindvotelist 
Dao: Add handler for republishing all dao governance data, improve vote result handling
 2019-02-03 20:55:03 +01:00
sqrrm
5f0e64f173
Update common/src/test/java/bisq/common/util/PermutationTest.java 
Co-Authored-By: ManfredKarrer <mk@nucleo.io>
 2019-02-03 20:52:18 +01:00
sqrrm
ada67fa8e7
Update common/src/test/java/bisq/common/util/PermutationTest.java 
Co-Authored-By: ManfredKarrer <mk@nucleo.io>
 2019-02-03 20:52:09 +01:00
sqrrm
46dfaf280f
Update common/src/test/java/bisq/common/util/PermutationTest.java 
Co-Authored-By: ManfredKarrer <mk@nucleo.io>
 2019-02-03 20:52:00 +01:00
sqrrm
aff5a551bc
Update common/src/test/java/bisq/common/util/PermutationTest.java 
Co-Authored-By: ManfredKarrer <mk@nucleo.io>
 2019-02-03 20:51:54 +01:00
sqrrm
204e505fed
Update common/src/test/java/bisq/common/util/PermutationTest.java 
Co-Authored-By: ManfredKarrer <mk@nucleo.io>
 2019-02-03 20:51:47 +01:00
sqrrm
e496ddcc90
Update common/src/test/java/bisq/common/util/PermutationTest.java 
Co-Authored-By: ManfredKarrer <mk@nucleo.io>
 2019-02-03 20:51:35 +01:00
sqrrm
4ae98b5709
Update common/src/test/java/bisq/common/util/PermutationTest.java 
Co-Authored-By: ManfredKarrer <mk@nucleo.io>
 2019-02-03 20:51:20 +01:00
sqrrm
32ebb07c48
Update common/src/main/java/bisq/common/util/PermutationUtil.java 
Co-Authored-By: ManfredKarrer <mk@nucleo.io>
 2019-02-03 20:49:38 +01:00
Manfred Karrer
2d86910e55
Merge branch 'master' into dao-permute-blindvotelist-if-not-majority-hash 
# Conflicts:
#	core/src/main/java/bisq/core/dao/governance/votereveal/VoteRevealService.java
 2019-02-03 19:10:30 +01:00
Manfred Karrer
fe3af46198
Add throws VoteResultException.ConsensusException 2019-02-03 19:07:49 +01:00
Manfred Karrer
33eb90849d
Merge branch 'master' into dao-fix-vote-result-with-permutated-blindvotelist 2019-02-03 19:02:46 +01:00