[ Feature ] do deposit when proposal state is DEFEATED #122

WGB5445 · 2022-09-15T11:36:36Z

Pull request type

Please check the type of change your PR introduces:

issue #119

    public fun clean_up_defeated_proposal<DAOT: store, ActionT: store>(_sender: &signer, proposal_id: u64) acquires ProposalActions, GlobalProposals, GlobalProposalActions{
        // Only DEFEATED proposal's action can be burn token.
        assert!(proposal_state<DAOT>(proposal_id) == DEFEATED, Errors::invalid_state(ERR_PROPOSAL_STATE_INVALID));
        let dao_address = dao_address<DAOT>();
        assert!(exists<ProposalActions<ActionT>>(dao_address), Errors::invalid_state(ERR_PROPOSAL_ACTIONS_NOT_EXIST));
        burn_proposal_token<ActionT>(dao_address, proposal_id);
    }

baichuan3 · 2022-09-15T11:45:27Z

sources/daospace/DAOSpace.move

+        burn_proposal_token<ActionT>(dao_address, proposal_id);
+    }
+
+    public (script) fun clean_up_defeated_proposal_entry<DAOT: store, ActionT: store>(sender: signer, proposal_id: u64) acquires ProposalActions, GlobalProposals, GlobalProposalActions{


谁来触发这个entry方法？

可以任何人触发，我觉得这里可以给一部分的 token 给执行这个 entry 方法的人

给激励是一种方式，能够持续激励用户去触发。
如果期望对应的proposal的deposit能够被burn，可能加上offchain后台定时触发，作为兜底比较好。

给激励是一种方式，能够持续激励用户去触发。如果期望对应的proposal的deposit能够被burn，可能加上offchain后台定时触发，作为兜底比较好。

对于其他的 DAO 可能没有offchain 方式，我觉得还是用奖励机制，一部分burn ，一部分奖励

给激励是一种方式，能够持续激励用户去触发。如果期望对应的proposal的deposit能够被burn，可能加上offchain后台定时触发，作为兜底比较好。

对于其他的 DAO 可能没有offchain 方式，我觉得还是用奖励机制，一部分burn ，一部分奖励

感觉奖励可以，至少覆盖掉 gas 费就行。

就像 https://starswap.xyz/#/stake/buyBack 没有奖励，但是总体上都会有人去触发

sources/daospace/DAOSpace.move

baichuan3 · 2022-09-15T11:49:11Z

sources/daospace/DAOSpace.move

+        let deposit = &mut Vector::borrow_mut(&mut actions.actions, index).deposit;
+        let amount  = Token::value<STC>(deposit);
+        let token = Token::withdraw<STC>(deposit, amount);
+        STC::burn(token);


这笔STC烧掉的意义是什么？可以作为DAO treasury的一个来源？

烧掉是一个通缩的机制，这里如果注资到 treasury 也是一个方法 @jolestar

为什么不让抵押的人取回呢？

这个是防止垃圾提案的一种方式。不然有人恶意发垃圾提案会把正常提案都冲掉。烧掉最合适，谁都不得利。不然会有动机把正常的提案也 defeated

关于no with veto
https://forum.cosmos.network/t/proposal-75-accepted-establishing-a-definition-of-nowithveto/6898
cosmos 上也有个相关讨论

这里不能直接用 DEFEATED 状态，DEFEATED 是正常状态。需要加一种新的状态，基于 no_with_veto 来判断，这个机制是借鉴 cosmos 的方法 https://hub.cosmos.network/main/governance/process.html

这里不能直接用 DEFEATED 状态，DEFEATED 是正常状态。需要加一种新的状态，基于 no_with_veto 来判断，这个机制是借鉴 cosmos 的方法 https://hub.cosmos.network/main/governance/process.html

我明白了，我增加一下这种机制，但是具体 no_with_veto 的比例应该在 DAO 的 Config 中设置

WGB5445 · 2022-09-16T01:40:45Z

https://github.com/starcoinorg/starcoin-framework/blob/main/sources/daospace/DAOSpace.move#L1687-L1699

这里的投票使用的是choice_no_with_veto算作 no 和 veto，我认为这里应该只应该算 veto
这样在统计票数时，只统计 veto 是否超过某个限度判断是否进入 REJECTED

WGB5445 · 2022-09-16T02:33:44Z

sources/daospace/DAOSpace.move

+    const REJECTED: u8 = 3;
+    const DEFEATED: u8 = 4;
+    const AGREED: u8 = 5;
+    const QUEUED: u8 = 6;
+    const EXECUTABLE: u8 = 7;


增加了一个 REJECTED 状态标识 nowithveto 超过阈值的状态

WGB5445 · 2022-09-16T02:35:35Z

sources/daospace/DAOSpace.move

+    /// Proposals are rejected when their nowithveto option reaches a certain threshold
+    /// A portion of the pledged tokens will be rewarded to the executor who executes the proposal
+    public fun rejected_proposal<DAOT: store, ActionT: store>(sender: &signer, proposal_id: u64) acquires ProposalActions, GlobalProposals, GlobalProposalActions{
+        // Only  REJECTED proposal's action can be burn token.
+        assert!(proposal_state<DAOT>(proposal_id) == REJECTED, Errors::invalid_state(ERR_PROPOSAL_STATE_INVALID));
+        let dao_address = dao_address<DAOT>();
+        assert!(exists<ProposalActions<ActionT>>(dao_address), Errors::invalid_state(ERR_PROPOSAL_ACTIONS_NOT_EXIST));
+        let token = take_proposal_token<ActionT>(dao_address, proposal_id);
+        // Part of the token is awarded to whoever executes this method , TODO: 10 %
+        let award_amount = Token::value(&token) / 10;
+        let (burn_token , award_token) = Token::split(token, award_amount);
+        Account::deposit(Signer::address_of(sender), award_token);
+        STC::burn(burn_token);
+    }
+
+    public (script) fun rejected_proposal_entry<DAOT: store, ActionT: store>(sender: signer, proposal_id: u64) acquires ProposalActions, GlobalProposals, GlobalProposalActions{
+        rejected_proposal<DAOT, ActionT>(&sender, proposal_id);
+    }
+


修改了REJECTED 状态处理函数 rejected_proposal 并给执行者部分奖励

sources/daospace/DAOSpace.move

jolestar · 2022-09-16T02:38:47Z

https://github.com/starcoinorg/starcoin-framework/blob/main/sources/daospace/DAOSpace.move#L1687-L1699

这里的投票使用的是choice_no_with_veto算作 no 和 veto，我认为这里应该只应该算 veto 这样在统计票数时，只统计 veto 是否超过某个限度判断是否进入 REJECTED

这个阈值不好设置，可以借鉴 cosmos 的做法， no_with_veto > yes + no + abstain, 就算作 reject. 是否包含 abstain 也需要考虑下。

如果上面的判断不成立，no_with_veto 最后是要加入到 no 的条件里，所以不能直接叫 veto.

jiangying000 · 2022-09-16T03:56:18Z

现在 deposit 必须是发起人一次性提供吗？

感觉未来可以是某个人发起个 proposal，任何人都可以往某个地址存 token，某个时段内有足够多的 token 存进去，就能进入 voting 状态

WGB5445 · 2022-09-16T04:08:59Z

现在 deposit 必须是发起人一次性提供吗？

感觉未来可以是某个人发起个 proposal，任何人都可以往某个地址存 token，某个时段内有足够多的 token 存进去，就能进入 voting 状态

这是一个很不错的想法，但是我觉得可能需要move 支持 interface，才能把 proposal 定制化插件出来

jolestar · 2022-09-16T06:57:50Z

现在 deposit 必须是发起人一次性提供吗？

感觉未来可以是某个人发起个 proposal，任何人都可以往某个地址存 token，某个时段内有足够多的 token 存进去，就能进入 voting 状态

cosmos 是这样做的。感觉可以先简单来，后面再改进。

jolestar · 2022-09-16T07:00:20Z

sources/daospace/DAOSpace.move

+        } else if (proposal.veto_votes >= (proposal.no_votes + proposal.abstain_votes + proposal.yes_votes) ){
+            // rejected
+            REJECTED      
+        } else if (proposal.yes_votes <= (proposal.no_votes  + proposal.abstain_votes + proposal.veto_votes) ||


这里是不是不能算 abstain_votes？如果算进去 abstain_votes 就和 no 一样了。

这里是不是不能算 abstain_votes？如果算进去 abstain_votes 就和 no 一样了。

这个有道理，abstain_votes 是对这个提案的弃权（我理解也是一种对提案本身不满的做法，但是没有nowithvote强烈），所以 REJECTED 的判断中不应该加 abstain_votes

abstain_votes 的作用是让投票总数超过阈值，但不表态 yes｜no。那后面判断阈值的地方也需要改下。

是不是应该是下面这个规则？

proposal.veto_votes >= proposal.no_votes + proposal.yes_votes => REJECTED proposal.yes_votes <= (proposal.no_votes + proposal.veto_votes) || proposal.yes_votes + proposal.no_votes + proposal.abstain_votes + proposal.veto_votes < proposal.quorum_votes => DEFEATED

另外 proposal 中的 veto_votes 是不是也统一成 no_with_veto_votes, 这样比较容易理解。

是不是应该是下面这个规则？

proposal.veto_votes >= proposal.no_votes + proposal.yes_votes => REJECTED proposal.yes_votes <= (proposal.no_votes + proposal.veto_votes) || proposal.yes_votes + proposal.no_votes + proposal.abstain_votes + proposal.veto_votes < proposal.quorum_votes => DEFEATED

这样限定投票总数必须超过阈值比较合理，以前是关注同意的票数是否超过阈值，随着DAO 的增大，同意的成本增加较快

jolestar

LGTM

sources/daospace/DAOSpace.move

This reverts commit 3274821.

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

add clean_up_defeated_proposal

0d080cb

WGB5445 requested review from baichuan3, welbon, wubuku, jiangying000 and pause125 September 15, 2022 11:36

WGB5445 changed the title ~~add clean_up_defeated_proposal~~ [ Feature ] do deposit when proposal state is DEFEATED Sep 15, 2022

baichuan3 reviewed Sep 15, 2022

View reviewed changes

sources/daospace/DAOSpace.move Outdated Show resolved Hide resolved

baichuan3 reviewed Sep 15, 2022

View reviewed changes

add DAO config

eb06092

WGB5445 commented Sep 16, 2022

View reviewed changes

sources/daospace/DAOSpace.move Outdated Show resolved Hide resolved

Fix do_proposal_state REJECTED and DEFEATED

c028b28

WGB5445 closed this Sep 16, 2022

WGB5445 deleted the burn-proposal branch September 16, 2022 04:09

WGB5445 restored the burn-proposal branch September 16, 2022 04:09

WGB5445 reopened this Sep 16, 2022

jolestar reviewed Sep 16, 2022

View reviewed changes

WGB5445 added 2 commits September 16, 2022 16:12

Fix test

bdf8bd0

Modify the criteria for determining the DEFEATED status of a proposal

7e18c79

jolestar approved these changes Sep 16, 2022

View reviewed changes

sources/daospace/DAOSpace.move Outdated Show resolved Hide resolved

rename rejected_proposal to reject_proposal

b66b28b

jiangying000 approved these changes Sep 16, 2022

View reviewed changes

jolestar merged commit 3274821 into main Sep 16, 2022

jolestar deleted the burn-proposal branch September 16, 2022 14:09

jolestar linked an issue Sep 16, 2022 that may be closed by this pull request

[Feature Request]: check the proposal state and do deposit or burn #119

Closed

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

Revert "[ Feature ] do deposit when proposal state is DEFEATED (#122)"

6782b16

This reverts commit 3274821.

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

Revert "[ Feature ] do deposit when proposal state is DEFEATED (#122)"

62fcaf6

This reverts commit 3274821.

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

Revert "[ Feature ] do deposit when proposal state is DEFEATED (#122)"

fa16371

This reverts commit 3274821.

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

[ Feature ] do deposit when proposal state is DEFEATED #122

[ Feature ] do deposit when proposal state is DEFEATED #122

WGB5445 commented Sep 15, 2022

baichuan3 Sep 15, 2022

WGB5445 Sep 15, 2022

baichuan3 Sep 16, 2022

WGB5445 Sep 16, 2022

jolestar Sep 16, 2022

jiangying000 Sep 16, 2022

baichuan3 Sep 15, 2022

WGB5445 Sep 15, 2022

pause125 Sep 15, 2022

jolestar Sep 16, 2022

jiangying000 Sep 16, 2022

jolestar Sep 16, 2022

WGB5445 Sep 16, 2022 •

edited

Loading

WGB5445 commented Sep 16, 2022

WGB5445 Sep 16, 2022

WGB5445 Sep 16, 2022

jolestar commented Sep 16, 2022

jiangying000 commented Sep 16, 2022

WGB5445 commented Sep 16, 2022

jolestar commented Sep 16, 2022

jolestar Sep 16, 2022

WGB5445 Sep 16, 2022

jolestar Sep 16, 2022

jolestar Sep 16, 2022

jolestar Sep 16, 2022

WGB5445 Sep 16, 2022

jolestar left a comment

[ Feature ] do deposit when proposal state is DEFEATED #122

[ Feature ] do deposit when proposal state is DEFEATED #122

Conversation

WGB5445 commented Sep 15, 2022

Pull request type

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

WGB5445 Sep 16, 2022 • edited Loading

Choose a reason for hiding this comment

WGB5445 commented Sep 16, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jolestar commented Sep 16, 2022

jiangying000 commented Sep 16, 2022

WGB5445 commented Sep 16, 2022

jolestar commented Sep 16, 2022

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 left a comment

Choose a reason for hiding this comment

WGB5445 Sep 16, 2022 •

edited

Loading