Manfred Karrer
69a9f6f311
Merge branch 'master' into dao-add-params
2019-02-03 21:13:48 +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
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
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
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
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
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
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
Manfred Karrer
af0c5fe4ab
Remove exception which is never thrown
2019-02-02 12:11:31 +01:00
Manfred Karrer
159a5e5f65
Merge pull request #2348 from freimair/monitor
...
Monitor release: Showing off
2019-02-01 13:13:53 +01:00
Florian Reimair
d13dceb4ab
Insert null checks
2019-02-01 12:58:58 +01:00
Florian Reimair
f066fc2413
Refactoring: remove unneeded exception
2019-02-01 12:56:59 +01:00
Manfred Karrer
0a7ff45d7f
Merge pull request #2350 from devinbileck/execute-permission-for-shell-scripts
...
Add execute permission for shell scripts
2019-02-01 01:21:34 +01:00
Devin Bileck
f873fab49d
Add execute permission for shell scripts
2019-01-31 10:39:14 -08:00
Florian Reimair
3ca0f678f8
Monitor release: Showing off
2019-01-31 11:21:19 +01:00
Florian Reimair
8cacd92d32
GraphiteReporter can handle non-HS target urls
2019-01-31 10:50:25 +01:00
Florian Reimair
f54ea610d1
Remove superfluous code
2019-01-30 16:48:50 +01:00
Florian Reimair
1e8a6e7efc
Add torProxyPort setting to example config
2019-01-30 16:48:26 +01:00
Florian Reimair
834a7dee26
The lockcount does no longer influence the timeout
2019-01-30 15:43:39 +01:00
