Commit graph

8087 commits

Author SHA1 Message Date
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
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