Manfred Karrer
e8844ee50c
Rename DecryptedBallotsWithMerits to txOutputToDecryptedBallotsWithMerits
2019-02-09 08:34:20 -05:00
Manfred Karrer
b471fea9a7
Merge pull request #2 from sqrrm/refactor-vote-result
...
Refactor voteresult to make it easier to understand
2019-02-09 14:32:45 +01:00
sqrrm
9f005f44d6
Refactor voteresult to make it easier to understand
2019-02-08 15:59:02 +01:00
Manfred Karrer
a110d7d82d
Merge branch 'master' into dao-fix-majorityvote-issue
...
# Conflicts:
# desktop/src/main/java/bisq/desktop/main/dao/governance/make/MakeProposalView.java
2019-02-06 11:37:00 +01:00
Christoph Atteneder
0b81095ccb
Merge pull request #2376 from ManfredKarrer/refactor-clock-handlers
...
Refactor: Add handler, make onMissedSecondTick default
2019-02-06 09:20:49 +01:00
Manfred Karrer
31a54b29bd
Cleanup DaoStateListener handlers
2019-02-06 01:11:31 +01:00
Manfred Karrer
1d5d9678bf
Add popup for invalid votes
2019-02-06 00:50:24 +01:00
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
c53612fb78
Improve logging
2019-02-05 20:44:27 +01:00
Manfred Karrer
dcf40bcfb5
Refactor: Add handler, make onMissedSecondTick default
2019-02-05 20:43:46 +01:00
Manfred Karrer
26ffe14778
Cleanup
2019-02-05 20:14:14 +01:00
Manfred Karrer
69b8dacae4
Move DaoUtil to bisq.core.dao.presentation
2019-02-05 16:59:59 +01:00
Manfred Karrer
a4428ffc06
Merge pull request #2372 from ripcurlx/add-wait-until-next-proposal-phase-state
...
Show info if not in proposal phase
2019-02-05 16:57:52 +01:00
Christoph Atteneder
0aa931dce6
Display time of next make proposal phase
2019-02-05 15:52:42 +01:00
Christoph Atteneder
20a1cf567f
Improve not in make proposal phase state
2019-02-05 15:21:23 +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
67b255562f
Merge pull request #2368 from oscarguindzberg/remove-libdohj
...
Remove libdohj dependency
2019-02-05 13:49:07 +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
Oscar Guindzberg
52e36187d1
Remove libdohj dependency
2019-02-05 09:33:58 -03: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
