mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 18:03:12 +01:00
Code Issues Packages Projects Releases Wiki Activity
8,745 Commits 4 Branches 148 Tags 4.3 GiB
e2d9fe1b5f
Commit Graph

8745 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Manfred Karrer
e2d9fe1b5f
Fix comment 2019-03-30 16:53:55 -05:00
Manfred Karrer
b39c8bed41
Refactoring: Rename method 2019-03-30 16:53:33 -05:00
Manfred Karrer
1e6f0bf8e9
Refactoring: Rename method 2019-03-30 16:53:07 -05:00
Manfred Karrer
a71a573dd9
Add better comments, cleanup 2019-03-30 16:51:55 -05:00
Manfred Karrer
a28805b983
Use onParseBlockCompleteAfterBatchProcessing to avoid sequence issues 
When using onParseBlockChainComplete and
onParseBlockCompleteAfterBatchProcessing the
onParseBlockCompleteAfterBatchProcessing is called earlier as
onParseBlockChainComplete which caused incorrect state update in the UI.
 2019-03-30 16:02:20 -05:00
Manfred Karrer
d5c7e0a660
Improve Merit handling 
- We add a filter to the getMeritStake method to avoid an exception at
getWeightedMeritAmount which would set merits to 0 in case the issuance
height blind would be larger than the vote height. I saw that error log
but could not reproduce it afterwards. It basically protects that we do
not add the issuance of the current cycle to the merit used in the
blind vote of that cycle.

- We add 1 block in the getCurrentlyAvailableMerit method to get the
same merit value if the blind vote was included in the next block.
 2019-03-30 16:01:08 -05:00
Manfred Karrer
4b11e582a8
Set MAINNET_GENESIS_TOTAL_SUPPLY of old mainnet genesis 2019-03-30 15:55:38 -05:00
Manfred Karrer
bec73dce53
Add popup in case the utxo balance does not match the bsq balance 2019-03-29 19:42:56 -05:00
Manfred Karrer
a08b91055e
Add support for displaying burned BSQ from invalid txs 2019-03-29 19:42:32 -05:00
Manfred Karrer
995844feb3
Remove setFitToRowsForTableView, update merit at activate 2019-03-29 16:44:34 -05:00
Manfred Karrer
30059ebb44
Cleanup 2019-03-29 14:29:55 -05:00
Manfred Karrer
bb7ff47d9a
Add random delay for proposalPayload publishing 
We want to avoid that all nodes publish at the same time all proposals,
so we add a random delay from 100 ms - 5 sec.
A more sophisticated protection would be probably good but that delay
should help to avoid network spikes and is simple enough to not add
risks that the publishing would fail.
 2019-03-29 13:42:19 -05:00
Manfred Karrer
acf26482dc
Use lockupTxId instead of uid 2019-03-28 20:30:38 -05:00
Manfred Karrer
18a3f1e5fe
Merge branch 'master' into add-check-for-bsq-balance 
# Conflicts:
#	core/src/main/resources/i18n/displayStrings.properties
 2019-03-28 19:53:23 -05:00
Manfred Karrer
96a20aee91
Merge branch 'add-check-for-bsq-balance' of https://github.com/ManfredKarrer/bisq into add-check-for-bsq-balance 2019-03-28 19:51:40 -05:00
Manfred Karrer
695ed137e2
Fix if else case 2019-03-28 19:51:31 -05:00
Manfred Karrer
4587c74c48
Merge pull request #2595 from ripcurlx/dao-ui-improvements 
DAO governance and bond improvements
 2019-03-28 19:50:53 -05:00
sqrrm
24811ffab9
Update core/src/main/java/bisq/core/dao/governance/voteresult/VoteResultService.java 
Co-Authored-By: ManfredKarrer <mk@nucleo.io>
 2019-03-28 16:26:50 -05:00
sqrrm
c3a8c2798a
Update core/src/main/java/bisq/core/dao/governance/voteresult/VoteResultService.java 
Co-Authored-By: ManfredKarrer <mk@nucleo.io>
 2019-03-28 16:26:36 -05:00
Christoph Atteneder
dbc202215c
Improve bonded role display and linkage 2019-03-28 15:37:48 +01:00
Christoph Atteneder
2ee9b882c0
Add transaction id and date to proposal votes table 2019-03-28 12:17:01 +01:00
Christoph Atteneder
1ff3013a0b
Reset selected item to enable re-opening of proposal details 2019-03-28 11:40:34 +01:00
Manfred Karrer
39ee4c079f
Protect against proposal withhold attack 
Set proposals which have been not included in the blind vote but which
have been later published and are part if the cycles proposals to
rejected.
A malicious voter could manipulate the software to withhold publishing
of his proposal and be the only voter on it. At the last block in the
blind vote phase he could publish the proposal but others cannot vote
anymore as they likely have already voted. In the vote result the
other voters would have treated it like ignored and if the voter had
enough BSQ to pass the quorum he could get accepted his proposal.
With this change we set all proposals which are not part in the blind
vote data but found in the cycle's ballot list as rejected.
 2019-03-27 21:39:10 -05:00
Manfred Karrer
f3ad4ea5b5
Cleanup, add string 2019-03-27 21:35:05 -05:00
Manfred Karrer
499d91e7d5
Improve formatting 2019-03-27 21:34:49 -05:00
sqrrm
9202d28c79
Update core/src/main/java/bisq/core/dao/governance/param/Param.java 
Co-Authored-By: ManfredKarrer <mk@nucleo.io>
 2019-03-27 14:51:04 -05:00
sqrrm
f0787d8009
Update core/src/main/java/bisq/core/dao/governance/param/Param.java 
Co-Authored-By: ManfredKarrer <mk@nucleo.io>
 2019-03-27 14:50:56 -05:00
sqrrm
af3aedb51b
Update core/src/main/java/bisq/core/dao/governance/param/Param.java 
Co-Authored-By: ManfredKarrer <mk@nucleo.io>
 2019-03-27 14:50:47 -05:00
Manfred Karrer
8704ba9aa5
Remove unused param 2019-03-27 14:14:48 -05:00
Manfred Karrer
c6947ba2d2
Merge branch 'master' into add-check-for-bsq-balance 
# Conflicts:
#	core/src/main/resources/i18n/displayStrings.properties
#	desktop/src/main/java/bisq/desktop/main/dao/wallet/dashboard/BsqDashboardView.java
 2019-03-27 12:27:29 -05:00
Christoph Atteneder
b0226ef576
Merge pull request #2592 from ripcurlx/prevent-bsq-amount-below-dust-limit 
Prevent BSQ offers below dust limit
 2019-03-27 17:17:12 +01:00
Christoph Atteneder
e7a059950e
Prevent BSQ offers below dust limit 2019-03-27 17:00:29 +01:00
Manfred Karrer
9ca5899d4c
Merge pull request #2591 from oscarguindzberg/addr-msg 
Disable "add peers from addr message" custom bitcoinj feature when a …
 2019-03-27 09:49:12 -05:00
Christoph Atteneder
d339f4274d
Ignore jenv config files 2019-03-27 15:48:55 +01:00
Christoph Atteneder
2356d2eba2
Merge pull request #2513 from ripcurlx/create-dao-section-for-economy 
Move BSQ dashboard into separate Facts & Figures section
 2019-03-27 15:44:19 +01:00
Christoph Atteneder
9143616d85
Increase height of chart to fill window in default size 2019-03-27 15:21:54 +01:00
Christoph Atteneder
33bf07577d
Update wording 2019-03-27 15:13:00 +01:00
Christoph Atteneder
ff21c916fa
Improve layout 2019-03-27 15:06:39 +01:00
Oscar Guindzberg
5f3907caf3 Disable "add peers from addr message" custom bitcoinj feature when a list of peers is provided. 2019-03-27 10:51:29 -03:00
Christoph Atteneder
4c46b3865b
Put charts into white panes to improve layout 2019-03-27 14:33:22 +01:00
Christoph Atteneder
44764d1fb7
Add supply and transactions sections 2019-03-27 12:19:28 +01:00
Christoph Atteneder
b00f96d06e
Move BSQ economy details into separate view 2019-03-27 09:39:58 +01:00
Christoph Atteneder
1fb9a15668
Move BSQ dashboard in separate economy view 2019-03-27 09:39:58 +01:00
Manfred Karrer
55c54356a1
Merge pull request #2590 from devinbileck/no-trading-account-for-selected-currency 
Show close button when creating offer without required account
 2019-03-26 21:52:19 -05:00
Manfred Karrer
73b0a17dd5
Add log for seeds 2019-03-26 21:35:52 -05:00
Manfred Karrer
c1edc622c9
Fix incorrect seed address 2019-03-26 21:34:26 -05:00
Manfred Karrer
fa8b8c5764
use new DAO_REGTEST server and seeds 2019-03-26 21:14:30 -05:00
Manfred Karrer
999fe85afc
Reduce durations of phases for DAO_REGTEST 2019-03-26 20:46:30 -05:00
Manfred Karrer
1bd6f03e15
Add new genesis tx for DAO_REGTEST 2019-03-26 20:43:08 -05:00
Manfred Karrer
793d00699a
Rename BTC_DAO_TESTNET2 to BTC_DAO_REGTEST 2019-03-26 20:13:08 -05:00