Dao proposal implement #57
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
需要解决下冲突，先合并进去再一起 reivew 吧。 |
jolestar
reviewed
Jul 6, 2022
Comment on lines
+57
to
+63
| let (_, offset) = BCS::deserialize_address(state, offset); | ||
| let (_, offset) = BCS::deserialize_u64(state, offset); | ||
| let (_, offset) = BCS::deserialize_bytes(state, offset); | ||
| let (_, offset) = BCS::deserialize_bytes(state, offset); | ||
| let (_, offset) = BCS::deserialize_bytes(state, offset); | ||
| let (_, offset) = BCS::deserialize_bytes(state, offset); | ||
| let (_, offset) = BCS::deserialize_u64(state, offset); |
|
冲突已经解决了 |
jolestar
added a commit
that referenced
this pull request
Jul 29, 2022
* [genesis_dao] Implement GenesisDao * Implement Proposal * Init MemberJoinPlugin * implement InstallPluginProposalPlugin * update build * update build * Implement DaoAccount and GenesisDao module (#46) * Implement DaoAccount and GenesisDao module * Update BuildInfo.yaml * merge Dao proposal and dao config into genesis dao base code (#47) Co-authored-by: jolestar <jolestar@gmail.com> * Update BuildInfo.yaml * Genesis dao plugin (#49) * add salary governance * add salary governance * Salary governance plugin * add script tag for plugin functions * Dao account test (#53) * Update DaoAccount and write integration test * update build * update CI for genesis_dao branch * Add member event (#55) * Dao proposal implement (#57) * dao proposal implementation * update build files * fixed merge genesis_dao conflicts * Genesis dao test (#59) * [test] Add dao integration test * fixup * update build file * remove XDao module * checkpoints temp Test (#62) * Grant plugin (#61) * add GrantProposalPlugin * add event struct * add grant in GenesisDao * add grant cap * fix grant plugin * Rename DaoGrantWithdrawTokenCap * Add the plugin code that to convert token to SBT amount (#64) * Dao proposal test (#66) * add proposal create and member join test case * upgrade proof params via rpc raw proofs api * generate struct tag for dao resource * add bcs option tuple test case * add queue proposal action script * add script signer * add cast vote scripts * unify daoT ablity * fix dao propsosal abort test case * fix prove (#67) Co-authored-by: WGB5445 <919603023@qq.com> * Dao event and get vote info api (#69) * add dao event and get vote info api * fix get vote info option when has not vote yet * no_with_veto counts as no but also adds a veto vote * event associate with dao id (#71) * Change some functions into Script methods and fix part of the logic (#65) * [ Other ] Rename DaoSpace (#72) * rename DaoSpace * Fix dir name * add AnyMemberPlugin Accept * Rename : DAOSpace * Rename Co-authored-by: WGB5445 <WGB98512@163.com> * Add Grant view and Grant refund (#73) * add query_grant * add refund grant function * add query_grant_can_withdraw * add GrantInfo * [lib] Refactor include source dir * Fix stake SBT plugin from one stake to multiple stake * DAOSpace error code (#74) * [dao] Refactor DAOSpace's error codes * [refactor] Move VoteStrategy to test dir * [Feature and test]Add dao_grant test and query_grant_info_total (#76) * Fixed the problems in PR that relationship between SBT and the staked token * Add some integration test for StakeToSBTPlugin * Add some integration test for StakeToSBTPlugin * Rename Dao to DAO (#79) * [daospace] rename Dao to DAO * update struct tag testcase after change Dao to DAO * fix test exp * fix prove and remove Debug print Co-authored-by: BaiChuan <muzixinly@gmail.com> Co-authored-by: WGB5445 <919603023@qq.com> Co-authored-by: Bai Chuan <muzixinly@gmail.com> Co-authored-by: BobWong <libo.weng@gmail.com> Co-authored-by: WGB5445 <919603023@qq.com> Co-authored-by: WGB5445 <WGB98512@163.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull request type
Please check the type of change your PR introduces:
What is the current behavior?
Issue Number: N/A
What is the new behavior?
Other information