[Feature] Member Grant Offer #174

WGB5445 · 2022-10-08T07:48:09Z

Pull request type

Please check the type of change your PR introduces:

WGB5445 · 2022-10-08T11:16:25Z

sources/daospace/DAOSpace.move

+        let dao_signer = dao_signer<DAOT>();
+        let grant_event = borrow_global_mut<GrantEvent>(dao_address);
+        if(exists<DAOGrantWithdrawTokenKey<DAOT, TokenT>>(old_grantee)){
+            let grant_key  = borrow_global<DAOGrantWithdrawTokenKey<DAOT, TokenT>>(new_grantee);
+            if(grant_key.total == total  && grant_key.start_time == start_time && grant_key.period == period){
+                if( old_grantee != new_grantee){
+                    let DAOGrantWithdrawTokenKey<DAOT, TokenT>{
+                        total:old_total,
+                        withdraw:old_withdraw,
+                        start_time:old_start_time,
+                        period: old_period
+                    } = move_from<DAOGrantWithdrawTokenKey<DAOT, TokenT>>(old_grantee);
+                    if( total <= old_withdraw){
+                        Event::emit_event(&mut grant_event.revoke_grant_event_handler, GrantRevokeEvent {
+                            dao_id:dao_id(dao_address),
+                            grantee:old_grantee,
+                            total:old_total,
+                            withdraw:old_withdraw,
+                            start_time:old_start_time,
+                            period: old_period,
+                            token: Token::token_code<TokenT>()
+                        });
+                        return
+                    };
+                    Offer::create_v2(&dao_signer,DAOGrantWithdrawTokenKey<DAOT, TokenT>{
+                        total,
+                        withdraw:old_withdraw,
+                        start_time,
+                        period
+                    }, new_grantee, 0);
+                }else {
+                    let grant_key = borrow_global_mut<DAOGrantWithdrawTokenKey<DAOT, TokenT>>(old_grantee);
+                    if( total <= grant_key.withdraw){
+                        let DAOGrantWithdrawTokenKey<DAOT, TokenT>{
+                            total:old_total,
+                            withdraw:old_withdraw,
+                            start_time:old_start_time,
+                            period: old_period
+                        } = move_from<DAOGrantWithdrawTokenKey<DAOT, TokenT>>(old_grantee);
+
+                        Event::emit_event(&mut grant_event.revoke_grant_event_handler, GrantRevokeEvent {
+                            dao_id:dao_id(dao_address),
+                            grantee: old_grantee,
+                            total:old_total,
+                            withdraw:old_withdraw,
+                            start_time:old_start_time,
+                            period: old_period,
+                            token: Token::token_code<TokenT>()
+                        });
+                        return
+                    };
+                    grant_key.total = total;
+                    grant_key.start_time = start_time;
+                    grant_key.period = period;
+                    Event::emit_event(&mut grant_event.config_grant_event_handler, GrantConfigEvent {
+                        dao_id:dao_id(dao_address),
+                        old_grantee:old_grantee,
+                        new_grantee:new_grantee,
+                        total:grant_key.total,
+                        withdraw:grant_key.withdraw,
+                        start_time:grant_key.start_time,
+                        period:grant_key.period,
+                        token: Token::token_code<TokenT>()
+                    });
+                };


这里在实现 Grant 的 Offer 时候有个问题
因为 Offer 是可以存在多个的，在修改时要找到对应的 Offer并判断是否是目标 Offer时，由于 Offer 模块不知道内部类型，所以只能取出/借用出该接收者的全部 Offer 逐个比对
同理，revake也有该问题

这里我觉得有两种办法：
1.Offer 上增加借出返还的功能和查找某个地址所有的 Offer index 功能，随后在 Space 中遍历查找
2.不支持多个 Grant Offer

@jolestar @baichuan3 @0xpause @welbon

这里在实现 Grant 的 Offer 时候有个问题因为 Offer 是可以存在多个的，在修改时要找到对应的 Offer并判断是否是目标 Offer时，由于 Offer 模块不知道内部类型，所以只能取出/借用出该接收者的全部 Offer 逐个比对同理，revake也有该问题

这里我觉得有两种办法： 1.Offer 上增加借出返还的功能和查找某个地址所有的 Offer index 功能，随后在 Space 中遍历查找 2.不支持多个 Grant Offer

@jolestar @baichuan3 @0xpause @welbon

NFT也有类似的问题吧，当前除了遍历貌似也没有更好的方式了。Module提供内部遍历方法，和取出/借出遍历，性能上有差异没？

感觉没问题

给同一个目标地址不支持多个 Grant Offer 是没问题的。

Grant 是不是不提供修改功能了？感觉修改会很复杂，尤其不能修改 grantee，修改 start_time 貌似也会有问题。

这里在实现 Grant 的 Offer 时候有个问题因为 Offer 是可以存在多个的，在修改时要找到对应的 Offer并判断是否是目标 Offer时，由于 Offer 模块不知道内部类型，所以只能取出/借用出该接收者的全部 Offer 逐个比对同理，revake也有该问题
这里我觉得有两种办法： 1.Offer 上增加借出返还的功能和查找某个地址所有的 Offer index 功能，随后在 Space 中遍历查找 2.不支持多个 Grant Offer
@jolestar @baichuan3 @0xpause @welbon

NFT也有类似的问题吧，当前除了遍历貌似也没有更好的方式了。Module提供内部遍历方法，和取出/借出遍历，性能上有差异没？

这种没法模块内部遍历，因为 Offer 模块不知道泛型判断的规则，只能要求内部的资源带有 copy 让外部遍历，但是这样也不符合 Offer 的用法

感觉没问题

给同一个目标地址不支持多个 Grant Offer 是没问题的。

Grant 是不是不提供修改功能了？感觉修改会很复杂，尤其不能修改 grantee，修改 start_time 貌似也会有问题。

那这里先改成单个目标地址只支持一个 Grant

修改这里各种情况还比较复杂，可以先去掉修改功能？先用 revoke 代替？

修改时间可能会有场景是：颁发了一个 Offer，由于某种原因（延期）需要这个 Offer 从未来某个时间开始释放（必须大于当前时间）

感觉可以先不支持修改。可以 revoke 掉旧的重新发一个新的。如果要修改，也要限制能修改的字段。可能延长 total 和 period 是由意义的。如果修改 start_time 或者缩小 period 和 total，可能和已经释放的部分冲突，逻辑会比较复杂。

WGB5445 · 2022-10-09T02:20:05Z

sources/daospace/DAOSpace.move

+    public fun join_member<DAOT: store>(sender: &signer) acquires DAONFTMintCapHolder, DAOSBTMintCapHolder, DAO, MemberEvent {
+        let dao_address = dao_address<DAOT>();
+        let op_index = Offer::find_offer<OfferMemeber<DAOT>>(dao_address, Signer::address_of(sender));
+        assert!(Option::is_none(&op_index),1003);
+        let OfferMemeber<DAOT> {
+            to_address,
+            image_data,
+            image_url,
+            init_sbt
+        }= Offer::redeem_v2<OfferMemeber<DAOT>>(sender, dao_address, Option::destroy_some(op_index));
+        do_join_member<DAOT>(to_address, image_data, image_url, init_sbt);
+    }
+
+    public (script) fun join_member_entry<DAOT: store>(sender: signer) acquires DAONFTMintCapHolder, DAOSBTMintCapHolder, DAO, MemberEvent {
+        join_member<DAOT>(&sender)
+    }


@yubing744 这里在计划改动 Member 的一些机制，准备改成 Offer 形式，可能会对前端的机制有一些影响

计划将 join_member 改为用户调用，接受 Offer 成为成员

好的，我注意一下

pause125 · 2022-10-09T07:11:12Z

sources/daospace/DAOSpace.move

+    public fun join_member<DAOT: store>(sender: &signer) acquires DAONFTMintCapHolder, DAOSBTMintCapHolder, DAO, MemberEvent {
+        let dao_address = dao_address<DAOT>();
+        let op_index = Offer::find_offer<OfferMemeber<DAOT>>(dao_address, Signer::address_of(sender));
+        assert!(Option::is_none(&op_index),1003);


这里应该是 is_some 吧？

pause125 · 2022-10-09T07:18:01Z

sources/daospace/DAOSpace.move

+    public fun grant_accept_offer<DAOT, Plugin, TokenT:store>(sender: &signer) {
+        let dao_address = dao_address<DAOT>();
+        let op_index = Offer::find_offer<DAOGrantWithdrawTokenKey<DAOT, Plugin, TokenT>>(dao_address, Signer::address_of(sender));
+        assert!(Option::is_none(&op_index),1003);


这里也应该是 is_some

pause125 · 2022-10-09T07:31:41Z

sources/daospace/DAOSpace.move

-    public fun query_grant_can_withdraw<DAOT, PluginT:store, TokenT:store>(addr: address):u128 acquires DAOGrantWithdrawTokenKey{
-        assert!(exists<DAOGrantWithdrawTokenKey<DAOT, PluginT, TokenT>>(addr) , Errors::invalid_state(ERR_NOT_HAVE_GRANT));
-        let cap = borrow_global<DAOGrantWithdrawTokenKey<DAOT, PluginT, TokenT>>(addr);
+    public fun query_grant_can_withdraw<DAOT, Plugin, TokenT:store>(addr: address):u128 acquires DAOGrantWithdrawTokenKey{


query_grant_can_withdraw 改成 query_grant_withdrawable_amount 怎么样？我觉得含义更直接一点

yubing744 · 2022-10-09T15:35:59Z

sources/daospace/DAOSpace.move

+        let op_index = Offer::find_offer<OfferMemeber<DAOT>>(dao_address, to_address);
+        if(Option::is_some(&op_index)){
+            //TODO: return or reoffer
+            Offer::retake<OfferMemeber<DAOT>>(&dao_signer, Option::destroy_some(op_index));


这里返回的offer资源感觉不能被丢弃吧？

感觉这里已经存在Offer了，也应该 Abort

感觉这里已经存在Offer了，也应该 Abort

这里如果 Abort 会导致提案无法执行

这里返回的offer资源感觉不能被丢弃吧？

这里比较倾向于丢弃之前的 Offer ，可能由于sbt 大小问题重新发起提案

嗯，有新的，丢弃旧的也合理。

如果已经是成员或者已经发放了成员Offer，感觉再执行添加成员提案没有意义。如果要修改sbt感觉应该撤销提案，重新发起提案

yubing744 · 2022-10-09T15:37:27Z

sources/daospace/DAOSpace.move

+    public fun member_offer<DAOT: store, PluginT>(_cap: &DAOMemberCap<DAOT, PluginT>, to_address: address, image_data:Option::Option<vector<u8>>, image_url:Option::Option<vector<u8>>, init_sbt: u128) acquires  DAOAccountCapHolder {
+        let dao_address = dao_address<DAOT>();
+        let dao_signer = dao_signer<DAOT>();
+        if(is_member<DAOT>(to_address)){


感觉这里直接Abort比较好，调用方不知道是成功发放了Offer, 还是已经是成员了

感觉这里直接Abort比较好，调用方不知道是成功发放了Offer, 还是已经是成员了

这里其实还是想解决下执行提案失败的问题，成功发了 Offer 和已经是成员我觉得不冲突
这里可能有问题的就是提案虽然看起来执行了，但是 Image 和 SBT 并没有更新。

有可能用户通过其他方式成为成员了？这里得想一下策略。

如果重复发起 MemberProposal，将移除旧的 Offer，发放新的 Offer

已经提供了join_member_with_member_cap 用来给无需 Offer 的Plugin，对于已经是成员的用户，SBT 已经由其他插件定义，那就需要由其他插件修改，所以此处return逻辑没有问题

可以增加 Event / Event 字段使得具体发放情况和是否发放成功展示在 Event 中

是否后期可以考虑 Script支持返回一些copy ,drop 的返回值

@jolestar @yubing744 @baichuan3 @welbon

2 这种情况是否考虑把 sbt 给直接加上。比如邀请一个用户作为成员给予 xxx sbt，但他后来直接 stake 成为会员了。初始化的 sbt 就丢了。

提案一定要执行成功吗？

不一定成功执行，但必须执行掉，不然会卡住后面的。

2 这种情况是否考虑把 sbt 给直接加上。比如邀请一个用户作为成员给予 xxx sbt，但他后来直接 stake 成为会员了。初始化的 sbt 就丢了。

是不是可以在DAOSpace中限制一下，sbt只能增加不能修改和减少，这样插件就不会冲突了

sbt 有减少的场景，比如 stake 后， unstake 的时候是要减少的

提案一定要执行成功吗？

不一定成功执行，但必须执行掉，不然会卡住后面的。

提案一直执行失败怎么会卡后面的，不应该和和提案投票失败的处理逻辑一样吗？

提案一定要执行成功吗？

不一定成功执行，但必须执行掉，不然会卡住后面的。

提案一直执行失败怎么会卡后面的，不应该和和提案投票失败的处理逻辑一样吗？

这里应该是因为“执行失败，但不知道以后会不会执行成功”，这里就有两种方式处理：
1.直接执行提案，但是实际没有成功执行提案逻辑，例如：取款 1k，但balance 只有 100，此时执行提案无取款，在事件中标识真实执行情况
2.提案执行失败，等待可以执行时再执行，例如：取款 1k 但是 balance 只有 100，此时执行提案abort ，等待金额存在时可以成功执行，但是缺点就是可能永远无法执行

# Conflicts: # build/StarcoinFramework/BuildInfo.yaml # build/StarcoinFramework/bytecode_modules/MemberProposalPlugin.mv # build/StarcoinFramework/docs/MemberProposalPlugin.md # build/StarcoinFramework/source_maps/MemberProposalPlugin.mvsm # integration-tests/daospace/dao_grant.exp # sources/daospaceplugin/GrantProposalPlugin.move

jolestar · 2022-10-11T14:50:42Z

sources/daospace/DAOSpace.move

    struct MemberJoinEvent has drop, store{
        /// dao id
        dao_id: u64,
+        // type: direct/offer
+        type: vector<u8>,


这个是不是直接用 u8 定义个常量表达呀，放个字符串感觉有点浪费

这个是不是直接用 u8 定义个常量表达呀，放个字符串感觉有点浪费

好的改成 u8 吧，不过感觉 Event 的话还好，浏览器用户可读？

这个是不是直接用 u8 定义个常量表达呀，放个字符串感觉有点浪费

好的改成 u8 吧，不过感觉 Event 的话还好，浏览器用户可读？

难，现在不是 string，浏览器也会展示成 hex

sources/daospace/DAOSpace.move

jolestar · 2022-10-11T14:54:50Z

sources/daospace/DAOSpace.move

        member_join_event_handler:Event::EventHandle<MemberJoinEvent>,
        member_quit_event_handler:Event::EventHandle<MemberQuitEvent>,
        member_revoke_event_handler:Event::EventHandle<MemberRevokeEvent>,
        member_increase_sbt_event_handler:Event::EventHandle<MemberIncreaseSBTEvent>,
        member_decrease_sbt_event_handler:Event::EventHandle<MemberDecreaseSBTEvent>,
    }

+
+    struct MemberCreaterOfferEvent has drop, store{


这几种 NFT 字段一样，是不是可以合并成一个，然后用类型表示？这样如果要监听 Event 也比较方便

jolestar

其他几位看看

WGB5445 · 2022-10-12T05:16:06Z

@baichuan3 @yubing744 @welbon @0xpause 各位老师有空可以帮忙 review 下

This reverts commit 0234cfc.

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

WGB5445 added 2 commits October 8, 2022 15:45

member grant offer

fb347ef

grant config offer err

acecffc

WGB5445 commented Oct 8, 2022

View reviewed changes

WGB5445 commented Oct 9, 2022

View reviewed changes

WGB5445 added 2 commits October 9, 2022 14:58

remove grant config offer

26c368b

add grant offer revoke

cdd9f5c

pause125 reviewed Oct 9, 2022

View reviewed changes

WGB5445 added 2 commits October 9, 2022 18:52

exp build

1e34020

fix exp build

9ea9bfe

yubing744 reviewed Oct 9, 2022

View reviewed changes

member offer fix

feed5fe

WGB5445 marked this pull request as ready for review October 11, 2022 09:38

WGB5445 added 2 commits October 11, 2022 17:40

fix build file

adf8629

jolestar reviewed Oct 11, 2022

View reviewed changes

fix event type to u8

60cbaf3

jolestar approved these changes Oct 12, 2022

View reviewed changes

baichuan3 approved these changes Oct 12, 2022

View reviewed changes

WGB5445 merged commit 0234cfc into main Oct 12, 2022

WGB5445 deleted the Offer2-member branch October 12, 2022 08:18

pause125 mentioned this pull request Oct 29, 2022

[Feature Request]: DAOSpace Use Offer for Member and Grant #125

Closed

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

Revert "[Feature] Member Grant Offer (#174)"

f50f8e9

This reverts commit 0234cfc.

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

Revert "[Feature] Member Grant Offer (#174)"

a5bd35b

This reverts commit 0234cfc.

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

Revert "[Feature] Member Grant Offer (#174)"

41ec1be

This reverts commit 0234cfc.

nkysg mentioned this pull request Mar 3, 2023

fix Revert daospace commit msg #227

Merged

7 tasks

[Feature] Member Grant Offer #174

[Feature] Member Grant Offer #174

Conversation

WGB5445 commented Oct 8, 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

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

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

Choose a reason for hiding this comment

WGB5445 commented Oct 12, 2022