Add irregular txType, add check for total balance, prevent proposal withhold attack #2587

ManfredKarrer · 2019-03-26T05:38:55Z

No description provided.

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.

# Conflicts: # desktop/src/main/java/bisq/desktop/main/dao/wallet/dashboard/BsqDashboardView.java

sqrrm

utACK

I have some suggested changes that you can use if you feel like.

There is also some questions on how lenient we should be with irregular txs for failed issuance, just added my thoughts.

core/src/main/java/bisq/core/dao/governance/votereveal/VoteRevealService.java

core/src/main/java/bisq/core/dao/node/parser/TxParser.java

desktop/src/main/java/bisq/desktop/main/dao/wallet/dashboard/BsqDashboardView.java

…ealService.java Co-Authored-By: ManfredKarrer <mk@nucleo.io>

Co-Authored-By: ManfredKarrer <mk@nucleo.io>

…sqDashboardView.java Co-Authored-By: ManfredKarrer <mk@nucleo.io>

…dKarrer/bisq into add-check-for-bsq-balance

sqrrm

utACK

core/src/main/java/bisq/core/dao/governance/param/Param.java

# Conflicts: # core/src/main/resources/i18n/displayStrings.properties # desktop/src/main/java/bisq/desktop/main/dao/wallet/dashboard/BsqDashboardView.java

Co-Authored-By: ManfredKarrer <mk@nucleo.io>

We did not update the merit correctly in case there was no proposal selected.

In case of an invalid tx we burn all available BSQ input. We only know that at parsing time. We renamed the burntFee field to burntBsq to make it more generic and use it for the burnt fee in case if a normal tx and as invalidatedBsq in case of an invalid tx.

sqrrm

utACK

I think changing the name to burntBsq made it a lot easier to read and understand. Looks like a good solution.

core/src/main/java/bisq/core/dao/governance/merit/MeritConsensus.java

- Check max length of strings and byte arrays - Check that tx ID has 64 chars - Add ExtraDataMapValidator for validating extraDataMap fields

- It is more safe to separate the BTC_DAO_TESTNET and BTC_DAO_REGTEST by the network ID as that prevents on the P2P network layer that the network could interconnect. We would have risked that we receive network data from the other network as users would use the persisted peers for connections.

# Conflicts: # core/src/main/resources/i18n/displayStrings_de.properties # core/src/main/resources/i18n/displayStrings_el.properties # core/src/main/resources/i18n/displayStrings_es.properties # core/src/main/resources/i18n/displayStrings_fa.properties # core/src/main/resources/i18n/displayStrings_fr.properties # core/src/main/resources/i18n/displayStrings_hu.properties # core/src/main/resources/i18n/displayStrings_pt.properties # core/src/main/resources/i18n/displayStrings_ro.properties # core/src/main/resources/i18n/displayStrings_ru.properties # core/src/main/resources/i18n/displayStrings_sr.properties # core/src/main/resources/i18n/displayStrings_th.properties # core/src/main/resources/i18n/displayStrings_vi.properties # core/src/main/resources/i18n/displayStrings_zh.properties

sqrrm

utACK

common/src/main/java/bisq/common/util/ExtraDataMapValidator.java

ManfredKarrer · 2019-03-31T22:44:16Z

Last commits have been rather trivial, but you are welcome to review them post merge as well.

ManfredKarrer · 2019-03-31T22:55:25Z

Build error is prob caused due cache issue. Local build works and witness has not changed. Pushed anotehr change to trigger re-build.

sqrrm · 2019-04-01T09:56:44Z

Latest changes also look good.

ManfredKarrer added 2 commits March 26, 2019 00:33

Don't create vote reveal tx in last block of phase

c20964f

ManfredKarrer added the in:dao label Mar 26, 2019

ManfredKarrer added this to the v0.9.6 milestone Mar 26, 2019

ManfredKarrer requested a review from sqrrm March 26, 2019 05:38

Merge branch 'master' into add-check-for-bsq-balance

ff86831

# Conflicts: # desktop/src/main/java/bisq/desktop/main/dao/wallet/dashboard/BsqDashboardView.java

ManfredKarrer changed the title ~~Add check for bsq balance~~ Add irregular txType, add check for total balance Mar 26, 2019

devinbileck mentioned this pull request Mar 26, 2019

For March 2019 bisq-network/compensation#244

Closed

sqrrm approved these changes Mar 26, 2019

View reviewed changes

sqrrm and others added 14 commits March 26, 2019 18:56

Update core/src/main/java/bisq/core/dao/governance/votereveal/VoteRev…

3d5ff1c

…ealService.java Co-Authored-By: ManfredKarrer <mk@nucleo.io>

Update core/src/main/java/bisq/core/dao/governance/votereveal/VoteRev…

83b7ed9

…ealService.java Co-Authored-By: ManfredKarrer <mk@nucleo.io>

Update core/src/main/java/bisq/core/dao/node/parser/TxParser.java

a3e1e67

Co-Authored-By: ManfredKarrer <mk@nucleo.io>

Update desktop/src/main/java/bisq/desktop/main/dao/wallet/dashboard/B…

2758db5

…sqDashboardView.java Co-Authored-By: ManfredKarrer <mk@nucleo.io>

Keep invalid state for txs which cannot have been created by the app

7479b88

Merge branch 'add-check-for-bsq-balance' of https://github.com/Manfre…

121c0f6

…dKarrer/bisq into add-check-for-bsq-balance

Rename BTC_DAO_TESTNET to BTC_DAO_TESTNET2 to enforce new network

bf83687

Add try/catch to print error in case the file does not exist

8016f45

Rename BTC_DAO_TESTNET2 to BTC_DAO_REGTEST

793d006

Add new genesis tx for DAO_REGTEST

1bd6f03

Reduce durations of phases for DAO_REGTEST

999fe85

use new DAO_REGTEST server and seeds

fa8b8c5

Fix incorrect seed address

c1edc62

Add log for seeds

73b0a17

sqrrm approved these changes Mar 27, 2019

View reviewed changes

core/src/main/java/bisq/core/dao/governance/param/Param.java Outdated Show resolved Hide resolved

core/src/main/java/bisq/core/dao/governance/param/Param.java Outdated Show resolved Hide resolved

core/src/main/java/bisq/core/dao/governance/param/Param.java Outdated Show resolved Hide resolved

ManfredKarrer and others added 6 commits March 27, 2019 12:27

Merge branch 'master' into add-check-for-bsq-balance

c6947ba

# Conflicts: # core/src/main/resources/i18n/displayStrings.properties # desktop/src/main/java/bisq/desktop/main/dao/wallet/dashboard/BsqDashboardView.java

Remove unused param

8704ba9

Update core/src/main/java/bisq/core/dao/governance/param/Param.java

af3aedb

Co-Authored-By: ManfredKarrer <mk@nucleo.io>

Update core/src/main/java/bisq/core/dao/governance/param/Param.java

f0787d8

Co-Authored-By: ManfredKarrer <mk@nucleo.io>

Update core/src/main/java/bisq/core/dao/governance/param/Param.java

9202d28

Co-Authored-By: ManfredKarrer <mk@nucleo.io>

Improve formatting

499d91e

ManfredKarrer added 5 commits March 30, 2019 16:53

Fix comment

e2d9fe1

Refactoring: Rename method

69b134b

Handle merits better

d422a73

We did not update the merit correctly in case there was no proposal selected.

Improve handling fo p2p network data broadcasts

823cec0

sqrrm approved these changes Mar 31, 2019

View reviewed changes

core/src/main/java/bisq/core/dao/governance/merit/MeritConsensus.java Show resolved Hide resolved

ManfredKarrer added 9 commits March 31, 2019 13:37

Add string validations

fe646e5

Fix missing close handler and avoid nullPointer exception

e624625

Use null instead of empty string for txId

122bc80

Add more validation

73db81a

- Check max length of strings and byte arrays - Check that tx ID has 64 chars - Add ExtraDataMapValidator for validating extraDataMap fields

Add BTC_DAO_TESTNET

431f76e

Improve comments, cleanup

e74ce12

Cleanup

30a710f

sqrrm approved these changes Mar 31, 2019

View reviewed changes

common/src/main/java/bisq/common/util/ExtraDataMapValidator.java Outdated Show resolved Hide resolved

ManfredKarrer added 4 commits March 31, 2019 17:31

Update comment

dad4b04

Apply ExtraDataMapValidator for all extraDataMap fields

4d56ce9

Add number of irregular txs to UI

e9e4b49

Break up lines

0e2bb14

ManfredKarrer marked this pull request as ready for review March 31, 2019 22:43

ManfredKarrer requested a review from ripcurlx as a code owner March 31, 2019 22:43

Update witness file

f95f770

ManfredKarrer requested a review from cbeams as a code owner March 31, 2019 22:54

ManfredKarrer merged commit 3854907 into bisq-network:master Mar 31, 2019

ManfredKarrer deleted the add-check-for-bsq-balance branch April 4, 2019 17:56

sqrrm mentioned this pull request May 7, 2019

Cycle 1 bisq-network/compensation#282

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add irregular txType, add check for total balance, prevent proposal withhold attack #2587

Add irregular txType, add check for total balance, prevent proposal withhold attack #2587

ManfredKarrer commented Mar 26, 2019

sqrrm left a comment

sqrrm left a comment

sqrrm left a comment

sqrrm left a comment

ManfredKarrer commented Mar 31, 2019

ManfredKarrer commented Mar 31, 2019 •

edited

Loading

sqrrm commented Apr 1, 2019

Add irregular txType, add check for total balance, prevent proposal withhold attack #2587

Add irregular txType, add check for total balance, prevent proposal withhold attack #2587

Conversation

ManfredKarrer commented Mar 26, 2019

sqrrm left a comment

Choose a reason for hiding this comment

sqrrm left a comment

Choose a reason for hiding this comment

sqrrm left a comment

Choose a reason for hiding this comment

sqrrm left a comment

Choose a reason for hiding this comment

ManfredKarrer commented Mar 31, 2019

ManfredKarrer commented Mar 31, 2019 • edited Loading

sqrrm commented Apr 1, 2019

ManfredKarrer commented Mar 31, 2019 •

edited

Loading