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

Fix min threshold and vote power bugs in cw3-fixed-multisig #588

Merged
merged 9 commits into from
Dec 22, 2021

Conversation

ueco-jb
Copy link
Contributor

@ueco-jb ueco-jb commented Dec 21, 2021

closes #551

Couple hundred lines are mostly move some stuff like Proposal and Ballot structs from flex to fixed-multisig contracts, following Mauro's comment.

EDIT: Actually scratch that... It appears that I can't just import common implementation in cw3-flex-multisig from cw3-fixed-multisig, because wasm-build complains during flex compilation about duplicate of symbols for instantiate, execute and query functions.
So in the end, I just copied whole implementation into fixed contract and removed tests from flex - bit controversial, but they are copied into fixed. But I get that duplicated tests are still tests, so I can bring them back anyway.

<yoda's voice>Use the library feature you must.</yoda's voice>

@maurolacy maurolacy mentioned this pull request Dec 22, 2021
@ueco-jb ueco-jb force-pushed the 551-fix-cw3fixedmultisig-votingpower branch 3 times, most recently from 6964f10 to f97bebb Compare December 22, 2021 11:58
@ueco-jb ueco-jb force-pushed the 551-fix-cw3fixedmultisig-votingpower branch from f97bebb to 090ccdd Compare December 22, 2021 11:59
@ueco-jb ueco-jb marked this pull request as ready for review December 22, 2021 12:57
@maurolacy
Copy link
Contributor

You can use the library feature to avoid duplicate symbols.

Copy link
Contributor

@maurolacy maurolacy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

contracts/cw3-fixed-multisig/src/state.rs Show resolved Hide resolved
@ueco-jb ueco-jb merged commit f4d42c6 into main Dec 22, 2021
@ueco-jb ueco-jb deleted the 551-fix-cw3fixedmultisig-votingpower branch December 22, 2021 14:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Check (and possibly fix) threshold and voting power implementation in cw3-fixed-multisig
2 participants