Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 61 commits into from Mar 31, 2019
Merged

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

Changes from 1 commit
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
c20964f
Don't create vote reveal tx in last block of phase
ManfredKarrer Mar 26, 2019
ce1da64
Add IRREGULAR txType for txs which are not rule conform but not burnt
ManfredKarrer Mar 26, 2019
ff86831
Merge branch 'master' into add-check-for-bsq-balance
ManfredKarrer Mar 26, 2019
3d5ff1c
Update core/src/main/java/bisq/core/dao/governance/votereveal/VoteRev…
sqrrm Mar 26, 2019
83b7ed9
Update core/src/main/java/bisq/core/dao/governance/votereveal/VoteRev…
sqrrm Mar 26, 2019
a3e1e67
Update core/src/main/java/bisq/core/dao/node/parser/TxParser.java
sqrrm Mar 26, 2019
2758db5
Update desktop/src/main/java/bisq/desktop/main/dao/wallet/dashboard/B…
sqrrm Mar 27, 2019
7479b88
Keep invalid state for txs which cannot have been created by the app
ManfredKarrer Mar 27, 2019
121c0f6
Merge branch 'add-check-for-bsq-balance' of https://github.com/Manfre…
ManfredKarrer Mar 27, 2019
bf83687
Rename BTC_DAO_TESTNET to BTC_DAO_TESTNET2 to enforce new network
ManfredKarrer Mar 27, 2019
8016f45
Add try/catch to print error in case the file does not exist
ManfredKarrer Mar 27, 2019
793d006
Rename BTC_DAO_TESTNET2 to BTC_DAO_REGTEST
ManfredKarrer Mar 27, 2019
1bd6f03
Add new genesis tx for DAO_REGTEST
ManfredKarrer Mar 27, 2019
999fe85
Reduce durations of phases for DAO_REGTEST
ManfredKarrer Mar 27, 2019
fa8b8c5
use new DAO_REGTEST server and seeds
ManfredKarrer Mar 27, 2019
c1edc62
Fix incorrect seed address
ManfredKarrer Mar 27, 2019
73b0a17
Add log for seeds
ManfredKarrer Mar 27, 2019
c6947ba
Merge branch 'master' into add-check-for-bsq-balance
ManfredKarrer Mar 27, 2019
8704ba9
Remove unused param
ManfredKarrer Mar 27, 2019
af3aedb
Update core/src/main/java/bisq/core/dao/governance/param/Param.java
sqrrm Mar 27, 2019
f0787d8
Update core/src/main/java/bisq/core/dao/governance/param/Param.java
sqrrm Mar 27, 2019
9202d28
Update core/src/main/java/bisq/core/dao/governance/param/Param.java
sqrrm Mar 27, 2019
499d91e
Improve formatting
ManfredKarrer Mar 28, 2019
f3ad4ea
Cleanup, add string
ManfredKarrer Mar 28, 2019
39ee4c0
Protect against proposal withhold attack
ManfredKarrer Mar 28, 2019
c3a8c27
Update core/src/main/java/bisq/core/dao/governance/voteresult/VoteRes…
sqrrm Mar 28, 2019
24811ff
Update core/src/main/java/bisq/core/dao/governance/voteresult/VoteRes…
sqrrm Mar 28, 2019
695ed13
Fix if else case
ManfredKarrer Mar 29, 2019
96a20ae
Merge branch 'add-check-for-bsq-balance' of https://github.com/Manfre…
ManfredKarrer Mar 29, 2019
18a3f1e
Merge branch 'master' into add-check-for-bsq-balance
ManfredKarrer Mar 29, 2019
acf2648
Use lockupTxId instead of uid
ManfredKarrer Mar 29, 2019
bb7ff47
Add random delay for proposalPayload publishing
ManfredKarrer Mar 29, 2019
30059eb
Cleanup
ManfredKarrer Mar 29, 2019
995844f
Remove setFitToRowsForTableView, update merit at activate
ManfredKarrer Mar 29, 2019
a08b910
Add support for displaying burned BSQ from invalid txs
ManfredKarrer Mar 30, 2019
bec73dc
Add popup in case the utxo balance does not match the bsq balance
ManfredKarrer Mar 30, 2019
4b11e58
Set MAINNET_GENESIS_TOTAL_SUPPLY of old mainnet genesis
ManfredKarrer Mar 30, 2019
d5c7e0a
Improve Merit handling
ManfredKarrer Mar 30, 2019
a28805b
Use onParseBlockCompleteAfterBatchProcessing to avoid sequence issues
ManfredKarrer Mar 30, 2019
a71a573
Add better comments, cleanup
ManfredKarrer Mar 30, 2019
1e6f0bf
Refactoring: Rename method
ManfredKarrer Mar 30, 2019
b39c8be
Refactoring: Rename method
ManfredKarrer Mar 30, 2019
e2d9fe1
Fix comment
ManfredKarrer Mar 30, 2019
69b134b
Refactoring: Rename method
ManfredKarrer Mar 30, 2019
d422a73
Handle merits better
ManfredKarrer Mar 30, 2019
823cec0
Improve handling fo p2p network data broadcasts
ManfredKarrer Mar 30, 2019
d5fc7cb
Use burnedBsq field in Tx for burnedFee and invalidatedBsq
ManfredKarrer Mar 31, 2019
fe646e5
Add string validations
ManfredKarrer Mar 31, 2019
e624625
Fix missing close handler and avoid nullPointer exception
ManfredKarrer Mar 31, 2019
122bc80
Use null instead of empty string for txId
ManfredKarrer Mar 31, 2019
73db81a
Add more validation
ManfredKarrer Mar 31, 2019
c7bd2ee
Add BTC_DAO_TESTNET again to keep supporting current dao testnet
ManfredKarrer Mar 31, 2019
fa3ec34
Merge branch 'master' into add-check-for-bsq-balance
ManfredKarrer Mar 31, 2019
431f76e
Add BTC_DAO_TESTNET
ManfredKarrer Mar 31, 2019
e74ce12
Improve comments, cleanup
ManfredKarrer Mar 31, 2019
30a710f
Cleanup
ManfredKarrer Mar 31, 2019
dad4b04
Update comment
ManfredKarrer Mar 31, 2019
4d56ce9
Apply ExtraDataMapValidator for all extraDataMap fields
ManfredKarrer Mar 31, 2019
e9e4b49
Add number of irregular txs to UI
ManfredKarrer Mar 31, 2019
0e2bb14
Break up lines
ManfredKarrer Mar 31, 2019
f95f770
Update witness file
ManfredKarrer Mar 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 3 additions & 4 deletions desktop/src/main/java/bisq/desktop/main/dao/governance/ProposalDisplay.java
View file
Open in desktop
Expand Up @@ -355,13 +355,12 @@ public BondedRoleType fromString(String string) {
confiscateBondComboBox.setConverter(new StringConverter<>() {
@Override
public String toString(Bond bond) {
String bondDetails;
String details = " (" + Res.get("dao.bond.table.column.lockupTxId") + ": " + bond.getLockupTxId() + ")";
if (bond instanceof BondedRole) {
bondDetails = bond.getBondedAsset().getDisplayString();
return bond.getBondedAsset().getDisplayString() + details;
} else {
bondDetails = Res.get("dao.bond.bondedReputation");
return Res.get("dao.bond.bondedReputation") + details;
}
return bondDetails + " (" + Res.get("shared.id") + ": " + bond.getBondedAsset().getUid() + ")";
}

@Override
Expand Down