[dao] Implement DAOSpace #32

jolestar · 2022-06-07T18:05:53Z

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

jolestar · 2022-06-29T02:02:21Z

这个是 base 分支，等基础功能搭建完成后再整体 review 吧。

* Implement DaoAccount and GenesisDao module

Co-authored-by: jolestar <jolestar@gmail.com>

sources/genesis_dao/DaoConfig.move

* add salary governance * add salary governance * Salary governance plugin * add script tag for plugin functions

sources/genesis_dao/GenesisDao.move

* Update DaoAccount and write integration test * update build * update CI for genesis_dao branch

* dao proposal implementation * update build files * fixed merge genesis_dao conflicts

* [test] Add dao integration test * fixup * update build file * remove XDao module

baichuan3 · 2022-07-22T03:01:04Z

sources/daospaceplugin/StakeToSBTPlugin.move

+            Option::destroy_some(weight_opt)
+        };
+
+        let sbt_amount = (weight as u128) * Token::value<TokenT>(&token);


考虑到weigh永远大于等于1，结果sbt_amount也总是大于等于token的数量，是不是需要考虑设计成不同的DAO对应不同的释放函数？ @welbon

不同的DAO可以通过调整weight的大小来实现

举个实际的例子，质押100个STC（10000000000），质押期一天，按上面的的公式，对应的sbt_amount最少也是10000000000，调节的颗粒度偏大，很容易造成sbt的膨胀。

这里由于没有回调，其实能做的只有乘法，这里由DAO来控制乘的大小，还有一个思路就是用数组枚举表达式的方式来计算amount，这样处理在合约中过于复杂（例如 sbt=Xtoken/Y，可能配置项存储为["X", "", "token", "Y"]），然后通过这个数组还原表达式来计算。这里其实可以再讨论一下

baichuan3 · 2022-07-22T03:03:17Z

sources/daospaceplugin/StakeToSBTPlugin.move

+
+    /// Unstake from staking
+    public fun unstake<DaoT: store, TokenT: store>(member: address): Token::Token<TokenT> acquires Stake {
+        assert!(exists<Stake<DaoT, TokenT>>(member), Errors::invalid_state(ERR_PLUGIN_NOT_STAKE));


成员退出之后，由于不再是DAO的member，已经Stake的Token后续如何处理？ @welbon

成员退出之后，由于不再是DAO的member，已经Stake的Token后续如何处理？ @welbon

这里我想，每一个插件是否应该有自己插件对应功能的 “成员退出接口”，用来处理退出前的操作
现有的退出是清除掉 NFT ，但是当插件功能增加后，退出时需要考虑插件逻辑，否则插件必须设计为不完全依赖成员？

成员退出之后，由于不再是DAO的member，已经Stake的Token后续如何处理？ @welbon

那这里的 unstake 感觉不应该判断是否是 member。 stake 插件不关心是不是 member，如果是 member 就增加 sbt，如果不是就不增加。用户自己第一次加入的时候会一次性计算。

stake: 要求用户为成员，用户退出时，需用户主动再发起一次unstake来取回token

unstake不在判断是否为成员，若用户为成员则减SBT，否则不处理

稍等此特性还没提交，若思路没问题即按此思路实现

* add query_grant * add refund grant function * add query_grant_can_withdraw * add GrantInfo

review again

* [dao] Refactor DAOSpace's error codes * [refactor] Move VoteStrategy to test dir

baichuan3 · 2022-07-26T12:39:05Z

sources/daospaceplugin/GrantProposalPlugin.move

@@ -0,0 +1,107 @@
+//TODO find more good name


当前daospaceplugin下的所有plugins，发布的时候是以starcoinframework形式发布，还是以第三方账号形式发布？ @jolestar

核心的 Plugin 是需要包含在 Framework 中的

… token

* [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>

jolestar · 2022-07-29T09:36:00Z

@baichuan3 @welbon @WGB5445 要不合并了再慢慢测试重构吧

WGB5445 · 2022-07-29T09:37:48Z

@baichuan3 @welbon @WGB5445 要不合并了再慢慢测试重构吧

大部分应该都测了，先合了吧

This reverts commit 0d37c89.

* Revert "fix stake plugin for compatibility (#218)" This reverts commit e618173. * Revert "add some test_functions (#216)" This reverts commit 87859a9. * Revert "Add WithdrawPlugin (#214)" This reverts commit a66f0f3. * Revert "fix StakeToSBTPlugin install event (#215)" This reverts commit 77a968a. * Revert "add install plugin proposal for TreasuryPlugin (#213)" This reverts commit a98de9e. * Revert "Fix v12 (#210)" This reverts commit bfd8fa6. * Revert "release v12 (#205)" This reverts commit 94be70e. * Revert "Fix some entry function and do some clean (#203)" This reverts commit 884f648. * Revert "prepare v12 release (#200)" This reverts commit 3bae7fd. * Revert "Refactor root cap (#198)" This reverts commit b30fdc9. * Revert "feat: add entry for plugin marketplace (#199)" This reverts commit 459ce12. * Revert "Upgrade MerkleNFTDistributor::register to v2 (#196)" This reverts commit 40178bb. * Revert "[daospace] Refactor daospace functions name (#195)" This reverts commit 0dd5c68. * Revert "Accept Offer and Accept NFT (#192)" This reverts commit 19b7d1d. * Revert "Fix sign flag for SignedInteger64 zero (#191)" This reverts commit 722a298. * Revert "fix cmp (#190)" This reverts commit fce8707. * Revert "Fix (#189)" This reverts commit 64d754d. * Revert "feat: remove sender of update_plugin (#187)" This reverts commit cb21b0a. * Revert "Custom proposal's quorum_votes for plugin (#184)" This reverts commit 45eb5ca. * Revert "[Feature] Proposal add title and introduction (#183)" This reverts commit 4ebe51b. * Revert "[DAOSpace] Plugin marketplace remove NFT (#186)" This reverts commit f186ec8. * Revert "Migrate Genesis initialize to new DAOSpace (#181)" This reverts commit 57e859e. * Revert "Update GasOracle module" This reverts commit f0270c3. * Revert "Fix prologue gas token error" This reverts commit 3c58061. * Revert "[Feature] Simple map (#182)" This reverts commit daa971f. * Revert "add some function in Compare (#180)" This reverts commit e5a3108. * Revert "fix to_bytes need store (#179)" This reverts commit 31792d4. * Revert "[Feature] Member Grant Offer (#174)" This reverts commit 0234cfc. * Revert "migrate TreasuryWithdrawDaoProposal to DAOSpace TreasuryPlugin (#175)" This reverts commit f44fd34. * Revert "refactor plugin initialize (#176)" This reverts commit e4c7bf8. * Revert "update old links in README (#173)" This reverts commit cb26bbd. * Revert "[Bugfix]Fix ERR_EXPECT_NOT_MEMBER (#172)" This reverts commit dca2274. * Revert "Fix acount.txn_epilogue_v2 incompatible (#168)" This reverts commit ad81d03. * Revert "[Feature] Add dao create test (#167)" This reverts commit dfbf3d7. * Revert "Remove proposal after executed or rejected (#145)" This reverts commit 1e17512. * Revert "EasyGas support (#92)" This reverts commit e142883. * Revert "Reformat code and decrease_member_sbt when unstake (#166)" This reverts commit 25148a4. * Revert "upgrade mpm to 1.12.5 and fix integration tests (#163)" This reverts commit 0fb8810. * Revert "[Feature] DAOSpace add join_member_with_root_cap (#164)" This reverts commit 1518644. * Revert "[Feature] Add ASCII module and TODO: ascii DAO name (#161)" This reverts commit d3eb047. * Revert "[Feature]DAOAccount Todo : add exists_upgrade_plan_cap (#160)" This reverts commit 1fb3b8a. * Revert "fix eventutil (#146)" This reverts commit d2c4f5c. * Revert "[Feature] Make StarcoinDAO inherit Dao's config (#144)" This reverts commit 8675779. * Revert "migrate script to entry function (#142)" This reverts commit 971a1a2. * Revert "[Feature] Multi Offer (#135)" This reverts commit 4ec8c2f. * Revert "add upgrade plan event (#128)" This reverts commit e82c1d3. * Revert "merge upgrade entry v12 and v12_1 (#126)" This reverts commit 47b38ad. * Revert "[Feature] NFTGallery Add Errors Assert (#138)" This reverts commit 61392b0. * Revert "Add event util (#134)" This reverts commit 545f191. * Revert "#131 Add only_new_module (#132) " This reverts commit f1363a3. * Revert "[Feature] DAO incompatible module upgrade test (#133)" This reverts commit 022ca1a. * Revert "update_module_upgrade_strategy support set min_time_limit (#127)" This reverts commit c8c9ba7. * Revert "Daospace support plugin marketplace (#116)" This reverts commit 6cccb73. * Revert "check StakeList existence (#124)" This reverts commit dee9a0b. * Revert "[ Feature ] do deposit when proposal state is DEFEATED (#122)" This reverts commit 3274821. * Revert "[daospace] Remove proposal info and add get function for proposal (#121)" This reverts commit 7b44ee7. * Revert "[integration-test] StarcoinDAO integration-test (#112)" This reverts commit 45f017a. * Revert "add assertion in stake to `StakeToSBTPlugin::stake` while the lock ti… (#117)" This reverts commit 08928d4. * Revert "Add Script function entry (#111)" This reverts commit 4c32fda. * Revert "Fix DAO Pulgin Event (#118)" This reverts commit 3cda388. * Revert "Plugin Event (#97)" This reverts commit 31b9a9c. * Revert "fix SalaryGovPlugin and migrate to test (#115)" This reverts commit 3e95aef. * Revert "[account] Retry when creating delegate account (#110)" This reverts commit 7a38b4b. * Revert "Add upgrade plugin And add StarcoinDAO (#94)" This reverts commit 85418d7. * Revert "able to update DAOExt (#108)" This reverts commit fc7ac4a. * Revert "[Feature] Public Native name_of function (#107)" This reverts commit 7263b0a. * Revert "MintProposalPlugin (#105)" This reverts commit ff2d802. * Revert "add daospace module upgrade test (#98)" This reverts commit 70429e2. * Revert "Add DAO nft image and member image (#96)" This reverts commit 2c89bbc. * Revert "Dao integration test and upgrade mpm (#95)" This reverts commit 82032cc. * Revert "add integration-test for refund_grant (#93)" This reverts commit 52fb86d. * Revert "signature.move add secp256k1_verify function (#86)" This reverts commit 9ea61ce. * Revert "check DAOAccountCap (#89)" This reverts commit 0404a53. * Revert "Add DAOSpace description (#85)" This reverts commit a981f67. * Revert "Remove decrease SBT when unstake item (#81)" This reverts commit d401c37. * Revert "[signature] Fix EVMAddress padding and crop bug (#84)" This reverts commit 41ad861. * Revert "fix dao snapshot deserialize when some option field is empty (#82)" This reverts commit b272a6f. * Revert "Complete DAOSpace (#80)" This reverts commit 98e96e6. * Revert "[dao] Implement DAOSpace (#32)" This reverts commit 0d37c89. * Revert "Update README.md (#68)" This reverts commit d3bb99f. * Revert "Update .gitattributes (#63)" This reverts commit 41ed34b. * Revert "support installing mpm from source (#56)" This reverts commit 3f46c6c. * Revert "[WIP] add Block state root (#39) (#41)" This reverts commit 67027f9. * Revert "Add multiple types of bcs skip and test (#52)" This reverts commit a5dc012. * Revert "upgrade rust toolchain 1.62.0 (#51)" This reverts commit 81c1e51. * Revert "implement Ring module (#44)" This reverts commit c9582a6. * Revert "support starcoin snapshot proof and verify (#45)" This reverts commit 63b05ec. * Revert "add bcs function , byte to basic type (#43)" This reverts commit e39dfeb. * Revert "account events (#42)" This reverts commit bfbe32c. * Revert "[scripts] fix dev_setup package manager detection and mpm version on ubuntu18.04 (#37)" This reverts commit 796fd3f. * Revert "Upgrade mpm to v1.11.11 (#36)" This reverts commit 92fb22a. * Revert "[Feature] Identifier nft add borrow function (#34)" This reverts commit 3e24ac4. * Revert "[account] Add create_delegate_account function (#31)" This reverts commit a225d41. * Revert "STRATEGY_FREEZE use invalid_argument (#29)" This reverts commit 51828cd. * Revert "remove zero Balance or empty NFTGallery (#28)" This reverts commit 0303214. * Revert "update rust 1.61 (#27)" This reverts commit 6da0321. * Revert "[ci] Upgrade mpm version to v1.11.9 (#26)" This reverts commit c2475ea. * Revert "Improve spec of several modules (#25)" This reverts commit 8f8e5a0. * Revert "Update README.md" This reverts commit 8fc83b6. * Revert "Upgrade mpm to v1.11.5-alpha and rename `spectest` to `integrationt-test` (#24)" This reverts commit a35c3f7. * Revert "Update stdlib spec, remove redundant spec funcs and improve coding style (#23)" This reverts commit 9c9922d. * Revert "[doc] Add a readme template for generate docs (#22)" This reverts commit 2c53e4f. * Revert "[test] Add a signature test for verify message signature from starcoin cli. (#17)" This reverts commit f88c277. * Revert "Add a script to generate docs and commit docs to git (#21)" This reverts commit 60c8002. * Revert "#13 [Feature Request] Account::deposit(address, token) auto create a… (#14)" This reverts commit 88061e9. * Revert "[ci] fix spectest (#15)" This reverts commit 0b866e1. * Revert "config Move highlighting (#12)" This reverts commit 01c8419. * Revert "simplify dev setup scripts (#2)" This reverts commit d2a2fc9. * Revert "[ci & doc] Add more document and setup ci github action workflow. (#1)" This reverts commit 9fd1e52. * add Cargo.lock

* Revert "fix stake plugin for compatibility (#218)" This reverts commit e618173. * Revert "add some test_functions (#216)" This reverts commit 87859a9. * Revert "Add WithdrawPlugin (#214)" This reverts commit a66f0f3. * Revert "fix StakeToSBTPlugin install event (#215)" This reverts commit 77a968a. * Revert "add install plugin proposal for TreasuryPlugin (#213)" This reverts commit a98de9e. * Revert "Fix v12 (#210)" This reverts commit bfd8fa6. * Revert "release v12 (#205)" This reverts commit 94be70e. * Revert "Fix some entry function and do some clean (#203)" This reverts commit 884f648. * Revert "prepare v12 release (#200)" This reverts commit 3bae7fd. * Revert "Refactor root cap (#198)" This reverts commit b30fdc9. * Revert "feat: add entry for plugin marketplace (#199)" This reverts commit 459ce12. * Revert "Upgrade MerkleNFTDistributor::register to v2 (#196)" This reverts commit 40178bb. * Revert "[daospace] Refactor daospace functions name (#195)" This reverts commit 0dd5c68. * Revert "Accept Offer and Accept NFT (#192)" This reverts commit 19b7d1d. * Revert "Fix sign flag for SignedInteger64 zero (#191)" This reverts commit 722a298. * Revert "fix cmp (#190)" This reverts commit fce8707. * Revert "Fix (#189)" This reverts commit 64d754d. * Revert "feat: remove sender of update_plugin (#187)" This reverts commit cb21b0a. * Revert "Custom proposal's quorum_votes for plugin (#184)" This reverts commit 45eb5ca. * Revert "[Feature] Proposal add title and introduction (#183)" This reverts commit 4ebe51b. * Revert "[DAOSpace] Plugin marketplace remove NFT (#186)" This reverts commit f186ec8. * Revert "Migrate Genesis initialize to new DAOSpace (#181)" This reverts commit 57e859e. * Revert "Update GasOracle module" This reverts commit f0270c3. * Revert "Fix prologue gas token error" This reverts commit 3c58061. * Revert "[Feature] Simple map (#182)" This reverts commit daa971f. * Revert "add some function in Compare (#180)" This reverts commit e5a3108. * Revert "fix to_bytes need store (#179)" This reverts commit 31792d4. * Revert "[Feature] Member Grant Offer (#174)" This reverts commit 0234cfc. * Revert "migrate TreasuryWithdrawDaoProposal to DAOSpace TreasuryPlugin (#175)" This reverts commit f44fd34. * Revert "refactor plugin initialize (#176)" This reverts commit e4c7bf8. * Revert "update old links in README (#173)" This reverts commit cb26bbd. * Revert "[Bugfix]Fix ERR_EXPECT_NOT_MEMBER (#172)" This reverts commit dca2274. * Revert "Fix acount.txn_epilogue_v2 incompatible (#168)" This reverts commit ad81d03. * Revert "[Feature] Add dao create test (#167)" This reverts commit dfbf3d7. * Revert "Remove proposal after executed or rejected (#145)" This reverts commit 1e17512. * Revert "EasyGas support (#92)" This reverts commit e142883. * Revert "Reformat code and decrease_member_sbt when unstake (#166)" This reverts commit 25148a4. * Revert "upgrade mpm to 1.12.5 and fix integration tests (#163)" This reverts commit 0fb8810. * Revert "[Feature] DAOSpace add join_member_with_root_cap (#164)" This reverts commit 1518644. * Revert "[Feature] Add ASCII module and TODO: ascii DAO name (#161)" This reverts commit d3eb047. * Revert "[Feature]DAOAccount Todo : add exists_upgrade_plan_cap (#160)" This reverts commit 1fb3b8a. * Revert "fix eventutil (#146)" This reverts commit d2c4f5c. * Revert "[Feature] Make StarcoinDAO inherit Dao's config (#144)" This reverts commit 8675779. * Revert "migrate script to entry function (#142)" This reverts commit 971a1a2. * Revert "[Feature] Multi Offer (#135)" This reverts commit 4ec8c2f. * Revert "add upgrade plan event (#128)" This reverts commit e82c1d3. * Revert "merge upgrade entry v12 and v12_1 (#126)" This reverts commit 47b38ad. * Revert "[Feature] NFTGallery Add Errors Assert (#138)" This reverts commit 61392b0. * Revert "Add event util (#134)" This reverts commit 545f191. * Revert "#131 Add only_new_module (#132) " This reverts commit f1363a3. * Revert "[Feature] DAO incompatible module upgrade test (#133)" This reverts commit 022ca1a. * Revert "update_module_upgrade_strategy support set min_time_limit (#127)" This reverts commit c8c9ba7. * Revert "Daospace support plugin marketplace (#116)" This reverts commit 6cccb73. * Revert "check StakeList existence (#124)" This reverts commit dee9a0b. * Revert "[ Feature ] do deposit when proposal state is DEFEATED (#122)" This reverts commit 3274821. * Revert "[daospace] Remove proposal info and add get function for proposal (#121)" This reverts commit 7b44ee7. * Revert "[integration-test] StarcoinDAO integration-test (#112)" This reverts commit 45f017a. * Revert "add assertion in stake to `StakeToSBTPlugin::stake` while the lock ti… (#117)" This reverts commit 08928d4. * Revert "Add Script function entry (#111)" This reverts commit 4c32fda. * Revert "Fix DAO Pulgin Event (#118)" This reverts commit 3cda388. * Revert "Plugin Event (#97)" This reverts commit 31b9a9c. * Revert "fix SalaryGovPlugin and migrate to test (#115)" This reverts commit 3e95aef. * Revert "[account] Retry when creating delegate account (#110)" This reverts commit 7a38b4b. * Revert "Add upgrade plugin And add StarcoinDAO (#94)" This reverts commit 85418d7. * Revert "able to update DAOExt (#108)" This reverts commit fc7ac4a. * Revert "[Feature] Public Native name_of function (#107)" This reverts commit 7263b0a. * Revert "MintProposalPlugin (#105)" This reverts commit ff2d802. * Revert "add daospace module upgrade test (#98)" This reverts commit 70429e2. * Revert "Add DAO nft image and member image (#96)" This reverts commit 2c89bbc. * Revert "Dao integration test and upgrade mpm (#95)" This reverts commit 82032cc. * Revert "add integration-test for refund_grant (#93)" This reverts commit 52fb86d. * Revert "signature.move add secp256k1_verify function (#86)" This reverts commit 9ea61ce. * Revert "check DAOAccountCap (#89)" This reverts commit 0404a53. * Revert "Add DAOSpace description (#85)" This reverts commit a981f67. * Revert "Remove decrease SBT when unstake item (#81)" This reverts commit d401c37. * Revert "[signature] Fix EVMAddress padding and crop bug (#84)" This reverts commit 41ad861. * Revert "fix dao snapshot deserialize when some option field is empty (#82)" This reverts commit b272a6f. * Revert "Complete DAOSpace (#80)" This reverts commit 98e96e6. * Revert "[dao] Implement DAOSpace (#32)" This reverts commit 0d37c89. * Revert "Update README.md (#68)" This reverts commit d3bb99f. * Revert "Update .gitattributes (#63)" This reverts commit 41ed34b. * Revert "support installing mpm from source (#56)" This reverts commit 3f46c6c. * Revert "[WIP] add Block state root (#39) (#41)" This reverts commit 67027f9. * Revert "Add multiple types of bcs skip and test (#52)" This reverts commit a5dc012. * Revert "upgrade rust toolchain 1.62.0 (#51)" This reverts commit 81c1e51. * Revert "implement Ring module (#44)" This reverts commit c9582a6. * Revert "support starcoin snapshot proof and verify (#45)" This reverts commit 63b05ec. * Revert "add bcs function , byte to basic type (#43)" This reverts commit e39dfeb.

fix Revert daospace (#226) commit msg * Revert "fix stake plugin for compatibility (#218)" This reverts commit e618173. * Revert "add some test_functions (#216)" This reverts commit 87859a9. * Revert "Add WithdrawPlugin (#214)" This reverts commit a66f0f3. * Revert "fix StakeToSBTPlugin install event (#215)" This reverts commit 77a968a. * Revert "add install plugin proposal for TreasuryPlugin (#213)" This reverts commit a98de9e. * Revert "Fix v12 (#210)" This reverts commit bfd8fa6. * Revert "release v12 (#205)" This reverts commit 94be70e. * Revert "Fix some entry function and do some clean (#203)" This reverts commit 884f648. * Revert "prepare v12 release (#200)" This reverts commit 3bae7fd. * Revert "Refactor root cap (#198)" This reverts commit b30fdc9. * Revert "feat: add entry for plugin marketplace (#199)" This reverts commit 459ce12. * Revert "Upgrade MerkleNFTDistributor::register to v2 (#196)" This reverts commit 40178bb. * Revert "[daospace] Refactor daospace functions name (#195)" This reverts commit 0dd5c68. * Revert "Accept Offer and Accept NFT (#192)" This reverts commit 19b7d1d. * Revert "Fix sign flag for SignedInteger64 zero (#191)" This reverts commit 722a298. * Revert "fix cmp (#190)" This reverts commit fce8707. * Revert "Fix (#189)" This reverts commit 64d754d. * Revert "feat: remove sender of update_plugin (#187)" This reverts commit cb21b0a. * Revert "Custom proposal's quorum_votes for plugin (#184)" This reverts commit 45eb5ca. * Revert "[Feature] Proposal add title and introduction (#183)" This reverts commit 4ebe51b. * Revert "[DAOSpace] Plugin marketplace remove NFT (#186)" This reverts commit f186ec8. * Revert "Migrate Genesis initialize to new DAOSpace (#181)" This reverts commit 57e859e. * Revert "Update GasOracle module" This reverts commit f0270c3. * Revert "Fix prologue gas token error" This reverts commit 3c58061. * Revert "[Feature] Simple map (#182)" This reverts commit daa971f. * Revert "add some function in Compare (#180)" This reverts commit e5a3108. * Revert "fix to_bytes need store (#179)" This reverts commit 31792d4. * Revert "[Feature] Member Grant Offer (#174)" This reverts commit 0234cfc. * Revert "migrate TreasuryWithdrawDaoProposal to DAOSpace TreasuryPlugin (#175)" This reverts commit f44fd34. * Revert "refactor plugin initialize (#176)" This reverts commit e4c7bf8. * Revert "update old links in README (#173)" This reverts commit cb26bbd. * Revert "[Bugfix]Fix ERR_EXPECT_NOT_MEMBER (#172)" This reverts commit dca2274. * Revert "Fix acount.txn_epilogue_v2 incompatible (#168)" This reverts commit ad81d03. * Revert "[Feature] Add dao create test (#167)" This reverts commit dfbf3d7. * Revert "Remove proposal after executed or rejected (#145)" This reverts commit 1e17512. * Revert "EasyGas support (#92)" This reverts commit e142883. * Revert "Reformat code and decrease_member_sbt when unstake (#166)" This reverts commit 25148a4. * Revert "upgrade mpm to 1.12.5 and fix integration tests (#163)" This reverts commit 0fb8810. * Revert "[Feature] DAOSpace add join_member_with_root_cap (#164)" This reverts commit 1518644. * Revert "[Feature] Add ASCII module and TODO: ascii DAO name (#161)" This reverts commit d3eb047. * Revert "[Feature]DAOAccount Todo : add exists_upgrade_plan_cap (#160)" This reverts commit 1fb3b8a. * Revert "fix eventutil (#146)" This reverts commit d2c4f5c. * Revert "[Feature] Make StarcoinDAO inherit Dao's config (#144)" This reverts commit 8675779. * Revert "migrate script to entry function (#142)" This reverts commit 971a1a2. * Revert "[Feature] Multi Offer (#135)" This reverts commit 4ec8c2f. * Revert "add upgrade plan event (#128)" This reverts commit e82c1d3. * Revert "merge upgrade entry v12 and v12_1 (#126)" This reverts commit 47b38ad. * Revert "[Feature] NFTGallery Add Errors Assert (#138)" This reverts commit 61392b0. * Revert "Add event util (#134)" This reverts commit 545f191. * Revert "#131 Add only_new_module (#132) " This reverts commit f1363a3. * Revert "[Feature] DAO incompatible module upgrade test (#133)" This reverts commit 022ca1a. * Revert "update_module_upgrade_strategy support set min_time_limit (#127)" This reverts commit c8c9ba7. * Revert "Daospace support plugin marketplace (#116)" This reverts commit 6cccb73. * Revert "check StakeList existence (#124)" This reverts commit dee9a0b. * Revert "[ Feature ] do deposit when proposal state is DEFEATED (#122)" This reverts commit 3274821. * Revert "[daospace] Remove proposal info and add get function for proposal (#121)" This reverts commit 7b44ee7. * Revert "[integration-test] StarcoinDAO integration-test (#112)" This reverts commit 45f017a. * Revert "add assertion in stake to `StakeToSBTPlugin::stake` while the lock ti… (#117)" This reverts commit 08928d4. * Revert "Add Script function entry (#111)" This reverts commit 4c32fda. * Revert "Fix DAO Pulgin Event (#118)" This reverts commit 3cda388. * Revert "Plugin Event (#97)" This reverts commit 31b9a9c. * Revert "fix SalaryGovPlugin and migrate to test (#115)" This reverts commit 3e95aef. * Revert "[account] Retry when creating delegate account (#110)" This reverts commit 7a38b4b. * Revert "Add upgrade plugin And add StarcoinDAO (#94)" This reverts commit 85418d7. * Revert "able to update DAOExt (#108)" This reverts commit fc7ac4a. * Revert "[Feature] Public Native name_of function (#107)" This reverts commit 7263b0a. * Revert "MintProposalPlugin (#105)" This reverts commit ff2d802. * Revert "add daospace module upgrade test (#98)" This reverts commit 70429e2. * Revert "Add DAO nft image and member image (#96)" This reverts commit 2c89bbc. * Revert "Dao integration test and upgrade mpm (#95)" This reverts commit 82032cc. * Revert "add integration-test for refund_grant (#93)" This reverts commit 52fb86d. * Revert "signature.move add secp256k1_verify function (#86)" This reverts commit 9ea61ce. * Revert "check DAOAccountCap (#89)" This reverts commit 0404a53. * Revert "Add DAOSpace description (#85)" This reverts commit a981f67. * Revert "Remove decrease SBT when unstake item (#81)" This reverts commit d401c37. * Revert "[signature] Fix EVMAddress padding and crop bug (#84)" This reverts commit 41ad861. * Revert "fix dao snapshot deserialize when some option field is empty (#82)" This reverts commit b272a6f. * Revert "Complete DAOSpace (#80)" This reverts commit 98e96e6. * Revert "[dao] Implement DAOSpace (#32)" This reverts commit 0d37c89. * Revert "Update README.md (#68)" This reverts commit d3bb99f. * Revert "Update .gitattributes (#63)" This reverts commit 41ed34b. * Revert "support installing mpm from source (#56)" This reverts commit 3f46c6c. * Revert "[WIP] add Block state root (#39) (#41)" This reverts commit 67027f9. * Revert "Add multiple types of bcs skip and test (#52)" This reverts commit a5dc012. * Revert "upgrade rust toolchain 1.62.0 (#51)" This reverts commit 81c1e51. * Revert "implement Ring module (#44)" This reverts commit c9582a6. * Revert "support starcoin snapshot proof and verify (#45)" This reverts commit 63b05ec. * Revert "add bcs function , byte to basic type (#43)" This reverts commit e39dfeb.

jolestar marked this pull request as draft June 7, 2022 18:06

jolestar requested review from nanne007, welbon and WGB5445 June 7, 2022 18:06

WGB5445 approved these changes Jun 8, 2022

View reviewed changes

WGB5445 previously approved these changes Jun 8, 2022

View reviewed changes

jolestar added 6 commits June 24, 2022 20:50

[genesis_dao] Implement GenesisDao

03106a4

Implement Proposal

5d13575

Init MemberJoinPlugin

e34ccee

implement InstallPluginProposalPlugin

e94b12e

update build

d52b8c7

update build

7d013e1

jolestar force-pushed the genesis_dao branch from e004e16 to 7d013e1 Compare June 24, 2022 12:54

Merge branch 'main' into genesis_dao

4c3cd3b

welbon previously approved these changes Jun 29, 2022

View reviewed changes

jolestar and others added 5 commits June 29, 2022 15:34

Implement DaoAccount and GenesisDao module (#46)

d0b5690

* Implement DaoAccount and GenesisDao module

Update BuildInfo.yaml

131c121

merge Dao proposal and dao config into genesis dao base code (#47)

b4870d9

Co-authored-by: jolestar <jolestar@gmail.com>

Merge branch 'main' into genesis_dao

36242c8

Update BuildInfo.yaml

72173ab

jolestar commented Jun 29, 2022

View reviewed changes

sources/genesis_dao/DaoConfig.move Outdated Show resolved Hide resolved

Genesis dao plugin (#49)

e3306a6

* add salary governance * add salary governance * Salary governance plugin * add script tag for plugin functions

jolestar commented Jul 1, 2022

View reviewed changes

sources/genesis_dao/GenesisDao.move Outdated Show resolved Hide resolved

jolestar and others added 6 commits July 5, 2022 10:22

Dao account test (#53)

fdddff4

* Update DaoAccount and write integration test * update build * update CI for genesis_dao branch

Add member event (#55)

6856141

Merge branch 'main' into genesis_dao

5bd7b61

Dao proposal implement (#57)

f081d2e

* dao proposal implementation * update build files * fixed merge genesis_dao conflicts

Genesis dao test (#59)

8b60212

* [test] Add dao integration test * fixup * update build file * remove XDao module

checkpoints temp Test (#62)

2737469

baichuan3 reviewed Jul 22, 2022

View reviewed changes

Add Grant view and Grant refund (#73)

ea66229

* add query_grant * add refund grant function * add query_grant_can_withdraw * add GrantInfo

jolestar marked this pull request as ready for review July 26, 2022 07:13

jolestar requested review from WGB5445, baichuan3 and welbon July 26, 2022 07:14

jolestar and others added 3 commits July 26, 2022 16:47

[lib] Refactor include source dir

322f919

Fix stake SBT plugin from one stake to multiple stake

e17525c

DAOSpace error code (#74)

4bc5d65

* [dao] Refactor DAOSpace's error codes * [refactor] Move VoteStrategy to test dir

baichuan3 reviewed Jul 26, 2022

View reviewed changes

WGB5445 and others added 5 commits July 27, 2022 00:08

[Feature and test]Add dao_grant test and query_grant_info_total (#76)

2e9928a

Fixed the problems in PR that relationship between SBT and the staked…

0d7b1f4

… token

Add some integration test for StakeToSBTPlugin

5ca37d6

Add some integration test for StakeToSBTPlugin

7e798f5

Rename Dao to DAO (#79)

4116929

* [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>

WGB5445 approved these changes Jul 29, 2022

View reviewed changes

jolestar merged commit 0d37c89 into main Jul 29, 2022

jolestar deleted the genesis_dao branch July 29, 2022 09:39

nkysg added a commit that referenced this pull request Mar 2, 2023

Revert "[dao] Implement DAOSpace (#32)"

38a7061

This reverts commit 0d37c89.

nkysg added a commit that referenced this pull request Mar 2, 2023

Revert "[dao] Implement DAOSpace (#32)"

cdfaae4

This reverts commit 0d37c89.

nkysg added a commit that referenced this pull request Mar 3, 2023

Revert "[dao] Implement DAOSpace (#32)"

252c3eb

This reverts commit 0d37c89.

nkysg mentioned this pull request Mar 3, 2023

fix Revert daospace commit msg #227

Merged

7 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[dao] Implement DAOSpace #32

[dao] Implement DAOSpace #32

jolestar commented Jun 7, 2022

jolestar commented Jun 29, 2022

baichuan3 Jul 22, 2022 •

edited

welbon Jul 26, 2022

baichuan3 Jul 26, 2022

welbon Jul 26, 2022

baichuan3 Jul 22, 2022

WGB5445 Jul 22, 2022

jolestar Jul 22, 2022

welbon Jul 26, 2022

jolestar Jul 26, 2022

welbon Jul 26, 2022

welbon Jul 26, 2022

baichuan3 Jul 26, 2022

jolestar Jul 26, 2022

jolestar commented Jul 29, 2022

WGB5445 commented Jul 29, 2022

[dao] Implement DAOSpace #32

[dao] Implement DAOSpace #32

Conversation

jolestar commented Jun 7, 2022

Pull request type

What is the current behavior?

What is the new behavior?

Other information

jolestar commented Jun 29, 2022

baichuan3 Jul 22, 2022 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jolestar commented Jul 29, 2022

WGB5445 commented Jul 29, 2022

baichuan3 Jul 22, 2022 •

edited