Commit graph

9331 commits

Author SHA1 Message Date
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
Manfred Karrer
2615464511
Merge pull request #2360 from ManfredKarrer/dao-fix-issues-with-majority-hash
Dao fix issues with majority hash
2019-02-03 19:01:27 +01:00
Manfred Karrer
0232fadad5
Rename heightOfFirstBlock to heightOfFirstBlockInCycle 2019-02-03 18:49:57 +01:00
sqrrm
5a7d177e7c
Update core/src/main/java/bisq/core/dao/governance/votereveal/VoteRevealService.java
Co-Authored-By: ManfredKarrer <mk@nucleo.io>
2019-02-03 18:48:08 +01:00
sqrrm
964407f8e0
Update core/src/main/java/bisq/core/dao/governance/votereveal/VoteRevealService.java
Co-Authored-By: ManfredKarrer <mk@nucleo.io>
2019-02-03 18:47:46 +01:00
sqrrm
25948c966e
Update core/src/main/java/bisq/core/dao/governance/votereveal/VoteRevealService.java
Co-Authored-By: ManfredKarrer <mk@nucleo.io>
2019-02-03 18:47:36 +01:00
sqrrm
2fc010098a
Update core/src/main/java/bisq/core/dao/node/BsqNode.java
Co-Authored-By: ManfredKarrer <mk@nucleo.io>
2019-02-03 18:47:11 +01:00
Manfred Karrer
90d0f4a9af
Add key event handler for republishing all governance data 2019-02-03 18:45:57 +01:00
Manfred Karrer
160088f248
Fix republish checks
Remove parsingComplete check
2019-02-03 18:21:31 +01:00
Manfred Karrer
71502d9594
Call missingDataRequestService.sendRepublishRequest() if data missing 2019-02-03 18:20:40 +01:00
Manfred Karrer
9c37457630
Call maybeCalculateVoteResult at onParseBlockChainComplete 2019-02-03 17:36:56 +01:00
Manfred Karrer
22b33b6485
Add throws ConsensusException 2019-02-03 16:55:46 +01:00
Manfred Karrer
ae5b96cca8
Merge branch 'dao-permute-blindvotelist-if-not-majority-hash' into dao-fix-vote-result-with-permutated-blindvotelist
# Conflicts:
#	core/src/main/java/bisq/core/dao/governance/votereveal/VoteRevealService.java
2019-02-03 16:54:14 +01:00
Manfred Karrer
c5381a8b46
Merge branch 'dao-fix-issues-with-majority-hash' into dao-fix-vote-result-with-permutated-blindvotelist 2019-02-03 16:52:28 +01:00
Manfred Karrer
39d94eec99
Show myVote as invalid if not included in result list 2019-02-03 16:38:51 +01:00
sqrrm
686bd2f90e
Merge branch 'master' into dao-avoid-bsq-burn 2019-02-03 15:59:32 +01:00
Florian Reimair
05554f4149 Remove message listener when done 2019-02-03 15:24:38 +01:00
Florian Reimair
051568f1eb Remove superfluous message listener removal 2019-02-03 15:09:13 +01:00
Florian Reimair
9266fd8147 Remove wrongly placed connection shutdown operations 2019-02-03 15:05:52 +01:00
Florian Reimair
ef2bff469f NetworkLoadSnapshot metric delivers diff metrics 2019-02-03 15:04:18 +01:00
Florian Reimair
bfd33a15f6 Only report non-zero values 2019-02-03 15:00:30 +01:00
Florian Reimair
ca623c6ed9 History buffer size is configurable 2019-02-03 15:00:11 +01:00
Manfred Karrer
3005df42bf
Fixes https://github.com/bisq-network/bisq/issues/2358 2019-02-03 14:51:07 +01:00
Manfred Karrer
71723b5e4b
Add comment 2019-02-03 14:48:52 +01:00
Florian Reimair
cda802078d Do not report duplicate messages 2019-02-03 14:47:26 +01:00
cryptocrowdclub
434a727c88 List CRowdCLassic (CRCL) 2019-02-03 15:43:03 +02:00
Florian Reimair
7c860e005b Init proper NetworkLoad Metric 2019-02-03 13:40:36 +01:00
Manfred Karrer
1a7200859d
Fix testclass with missing param 2019-02-03 11:17:24 +01:00
Manfred Karrer
686588f0c8
Merge pull request #2356 from ManfredKarrer/add-btc-new-node
Add new btc node from KanoczTomas
2019-02-03 11:14:31 +01:00
Manfred Karrer
c11ec1399a
Remove support for IP:port Grin address format.
Add popup with info for proof tool
2019-02-03 01:46:45 +01:00
Manfred Karrer
fd97fb535f
Add new btc node from KanoczTomas
onion address: mbm6ffx6j5ygi2ck.onion
ipv4 address: 193.58.196.212
dns: btc.ispol.sk
2019-02-03 01:01:14 +01:00
Manfred Karrer
1df8d77b9a
Add DaoKillSwitch to disable all BSQ/DAO transactions 2019-02-03 00:52:25 +01:00
Manfred Karrer
0c53699bc9
Add checkbox for disabling DAO 2019-02-03 00:20:48 +01:00
Manfred Karrer
b249289213
Add PermutationUtil
In case that the users blind vote list does not match the hash of the
majority we want to find if any variation of our list leads to a match
so we can still calculate the vote result.
2019-02-02 23:28:26 +01:00
TeelaBrown
7dda725822 List Helium (HLM) 2019-02-02 20:47:21 +02:00
Manfred Karrer
9be41fcb7f
Add logs for blindVoteList used for hash 2019-02-02 12:12:53 +01:00
Manfred Karrer
6459e3c86c
Return true if we find a permutated list matching the majority hash 2019-02-02 12:12:08 +01:00