mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 23:18:17 +01:00
Code Issues Projects Releases Packages Wiki Activity
8361 commits 3 branches 150 tags 4.1 GiB
Commit graph

2771 commits

Author SHA1 Message Date
Manfred Karrer
df0a8b7571
Remove duplicate log 2019-02-05 22:51:32 +01:00
Manfred Karrer
fc362c71be
Fix missing removal of old or invalid proposals 
- If a proposal had a tx which is not in our BSQ state it was not removed
- If a tx was outdated (> 60 days old) it was only removed if we are
in proposal phase. We added check for past cycle to cover those as well.
 2019-02-05 21:16:16 +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
69b8dacae4
Move DaoUtil to bisq.core.dao.presentation 2019-02-05 16:59:59 +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
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
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
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
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
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
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
fcc0dcf91f
Improve logs 2019-02-03 21:05:00 +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
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
1a7200859d
Fix testclass with missing param 2019-02-03 11:17:24 +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