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

3049 commits

Author SHA1 Message Date
Christoph Atteneder
702cb2d3f1
Update translations 2019-03-29 11:33:19 +01: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
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
2ee9b882c0
Add transaction id and date to proposal votes table 2019-03-28 12:17:01 +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
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
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
33bf07577d
Update wording 2019-03-27 15:13:00 +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
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
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
Manfred Karrer
8016f452f3
Add try/catch to print error in case the file does not exist 2019-03-26 20:12:43 -05:00
Manfred Karrer
bf83687524
Rename BTC_DAO_TESTNET to BTC_DAO_TESTNET2 to enforce new network 2019-03-26 19:24:45 -05:00
Manfred Karrer
121c0f6f68
Merge branch 'add-check-for-bsq-balance' of https://github.com/ManfredKarrer/bisq into add-check-for-bsq-balance 2019-03-26 19:05:03 -05:00
Manfred Karrer
7479b88a08
Keep invalid state for txs which cannot have been created by the app 2019-03-26 19:04:51 -05:00
sqrrm
a3e1e677c7
Update core/src/main/java/bisq/core/dao/node/parser/TxParser.java 
Co-Authored-By: ManfredKarrer <mk@nucleo.io>
 2019-03-26 18:57:31 -05:00
sqrrm
83b7ed9fea
Update core/src/main/java/bisq/core/dao/governance/votereveal/VoteRevealService.java 
Co-Authored-By: ManfredKarrer <mk@nucleo.io>
 2019-03-26 18:56:28 -05:00
sqrrm
3d5ff1c674
Update core/src/main/java/bisq/core/dao/governance/votereveal/VoteRevealService.java 
Co-Authored-By: ManfredKarrer <mk@nucleo.io>
 2019-03-26 18:56:20 -05:00
Manfred Karrer
ff868311bb
Merge branch 'master' into add-check-for-bsq-balance 
# Conflicts:
#	desktop/src/main/java/bisq/desktop/main/dao/wallet/dashboard/BsqDashboardView.java
 2019-03-26 00:40:27 -05:00
Manfred Karrer
ce1da644c2
Add IRREGULAR txType for txs which are not rule conform but not burnt 
We don't want to burn BSQ in cases like that the tx was published too
late, which is a valid case if the tx does not make it in the next block.
We set such txs as IRREGULAR and allow spending of the BSQ, but there
function in the governance is invalidated.

We also add a check if the sum of all UTXO is the same as the sum of the
genesis + sum of issuance txs - burned fees.
 2019-03-26 00:37:55 -05:00
Manfred Karrer
c20964f47a
Don't create vote reveal tx in last block of phase 2019-03-26 00:33:57 -05:00
Manfred Karrer
15bf8ff08b
Merge pull request #2584 from ManfredKarrer/add-issuance-limit 
Add ISSUANCE_LIMIT param and check for max issuance per cycle
 2019-03-25 18:34:22 -05:00
Manfred Karrer
2a46133292
Merge pull request #2566 from ripcurlx/ui-dao-improvements 
DAO UI improvements
 2019-03-25 18:34:02 -05:00
Christoph Atteneder
f6f2a663e8
Improve layout and fix issue with phase breaks 2019-03-25 20:47:28 +01:00
Manfred Karrer
f75ddf9346
Add ISSUANCE_LIMIT param and check for max issuance per cycle 
We limit the possible max. issuance (including reimbursements) to the
valued defined in the ISSUANCE_LIMIT param.
In case we exceed that limit the whole cycle becomes invalid.

The main reason for that feature is limitation of max.
damage in case that an attacker manages to create unjustified issuance.

For valid cases we consider such a case as social consensus problem as
the majority of voters should be aware of that limit before they
accept such a high issuance. If known in advance that an extraordinary
high issuance is expected the DAO parameter can be changed.
 2019-03-25 13:36:34 -05:00
Christoph Atteneder
ab4d203ece
Merge pull request #2575 from ManfredKarrer/higher-max-buyer-security-deposit 
Set max buyer's security deposit to 20% instead of 10%
 2019-03-25 10:24:48 +01:00
Christoph Atteneder
f65b340d3d
Merge pull request #2576 from ManfredKarrer/mk-fix-get-all-bonds 
Fix get all bonds not returning not active bonds
 2019-03-25 10:24:33 +01:00
Christoph Atteneder
3491c40e13
Merge pull request #2579 from devinbileck/update-change-param-validator-error-messages 
Update change param validator error messages
 2019-03-25 10:24:01 +01:00
Christoph Atteneder
100d838908
Set max buyer's security deposit to 20% instead of 10% 
A Bisq trader suggested that change to cover risks with volatility
for seller.
 2019-03-25 10:17:08 +01:00
Manfred Karrer
a9aaef7e9b
Complete pull request 
We only want to show active bonds in the list for confiscation.
The Inactive bond label is not necessary in the vote result as a
confiscated bond is inactive anyway. Intention was probably to show it
as inactive in the proposal display but they will be filtered out
anyway there.
 2019-03-25 10:05:19 +01:00
Ben Kaufman
f1077b82b3
Disallow proposing to confiscate inactive bonds 2019-03-25 10:05:19 +01:00
Ben Kaufman
5c066a6942
Fix get all bonds not returning not active bonds 
Fix #2522
 2019-03-25 10:05:18 +01:00
Christoph Atteneder
942d8366b2
Add informational popup when voting for the first time 2019-03-25 09:51:42 +01:00
Christoph Atteneder
e4ecb869ad
Use stake to reference voting weight 2019-03-25 09:51:42 +01:00
Christoph Atteneder
4ba8342f20
Move display of selected proposal into popup instead of showing it inline 2019-03-25 09:51:42 +01:00