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.

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

Dao avoid bsq burn #2242

Merged
merged 6 commits into from Feb 3, 2019

Conversation

Projects
None yet
3 participants
@sqrrm
Copy link
Member

sqrrm commented Jan 11, 2019

No description provided.

sqrrm added some commits Dec 19, 2018

@sqrrm sqrrm requested review from ManfredKarrer and ripcurlx as code owners Jan 11, 2019

@ripcurlx ripcurlx added the in:dao label Jan 11, 2019

This was referenced Jan 11, 2019

@ManfredKarrer ManfredKarrer removed the request for review from ripcurlx Jan 11, 2019

@sqrrm

This comment has been minimized.

Copy link
Member Author

sqrrm commented Jan 15, 2019

Regarding Bond.isActive(), I think it's already correct the way it is now.

tempTx.setTxType(TxType.INVALID);
// Even though the request part if invalid the BSQ transfer and change output should still be valid
// as long as the BSQ change <= BSQ inputs.
tempTx.setTxType(TxType.UNDEFINED_TX_TYPE);

This comment has been minimized.

@ManfredKarrer

ManfredKarrer Feb 3, 2019

Member

Not sure if we should use UNDEFINED_TX_TYPE as it does not describe it correctly. Maybe some weaker term than "invalid"? What about NON_STANDARD or "NON_RULED_COMFORM"?

This comment has been minimized.

@sqrrm

sqrrm Feb 3, 2019

Author Member

If we add another type we can, this was an attempt to avoid adding more txTypes.

This comment has been minimized.

@ManfredKarrer

ManfredKarrer Feb 3, 2019

Member

I think IRREGULAR might be a good type for not-rule-conform but still valid txs.

This comment has been minimized.

@sqrrm

sqrrm Feb 3, 2019

Author Member

Yeah, let's do that to show it's parsed and something is not right but it's still a valid BSQ tx in some way.

Show resolved Hide resolved core/src/main/java/bisq/core/dao/governance/bond/Bond.java
Show resolved Hide resolved core/src/main/resources/i18n/displayStrings.properties Outdated

@ManfredKarrer ManfredKarrer merged commit c4d561b into bisq-network:master Feb 3, 2019

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@sqrrm sqrrm referenced this pull request Feb 28, 2019

Closed

For February 2019 #228

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.