[Feature] Member Grant Offer

build/StarcoinFramework/BuildInfo.yaml

@@ -327,7 +327,7 @@ compiled_package_info:
     ? address: "0x00000000000000000000000000000001"
       name: YieldFarmingV2
     : StarcoinFramework
-  source_digest: 1230BEA3543B7C4D5A397F38B505D8A688DA01A1E47B3BA14964E08D2921AFC6
+  source_digest: A074CFA51CE16ABFB4809859BDFC17B004FD0B5371FCFE4F22827AB0C8FDC399
   build_flags:
     dev_mode: false
     test_mode: false

build/StarcoinFramework/docs/MemberProposalPlugin.md

@@ -245,7 +245,7 @@
     <b>let</b> proposal_cap = <a href="DAOSpace.md#0x1_DAOSpace_acquire_proposal_cap">DAOSpace::acquire_proposal_cap</a>&lt;DAOT, <a href="MemberProposalPlugin.md#0x1_MemberProposalPlugin">MemberProposalPlugin</a>&gt;(&witness);
     <b>let</b> <a href="MemberProposalPlugin.md#0x1_MemberProposalPlugin_MemberJoinAction">MemberJoinAction</a>{member, init_sbt, image_data, image_url} = <a href="DAOSpace.md#0x1_DAOSpace_execute_proposal">DAOSpace::execute_proposal</a>&lt;DAOT, <a href="MemberProposalPlugin.md#0x1_MemberProposalPlugin">MemberProposalPlugin</a>, <a href="MemberProposalPlugin.md#0x1_MemberProposalPlugin_MemberJoinAction">MemberJoinAction</a>&gt;(&proposal_cap, sender, proposal_id);
     <b>let</b> member_cap = <a href="DAOSpace.md#0x1_DAOSpace_acquire_member_cap">DAOSpace::acquire_member_cap</a>&lt;DAOT, <a href="MemberProposalPlugin.md#0x1_MemberProposalPlugin">MemberProposalPlugin</a>&gt;(&witness);
-    <a href="DAOSpace.md#0x1_DAOSpace_join_member">DAOSpace::join_member</a>(&member_cap, member, <a href="Option.md#0x1_Option_some">Option::some</a>(image_data), <a href="Option.md#0x1_Option_some">Option::some</a>(image_url) , init_sbt);
+    <a href="DAOSpace.md#0x1_DAOSpace_member_offer">DAOSpace::member_offer</a>(&member_cap, member, <a href="Option.md#0x1_Option_some">Option::some</a>(image_data), <a href="Option.md#0x1_Option_some">Option::some</a>(image_url) , init_sbt);
 }
 </code></pre>
 

sources/Offer.move

@@ -324,6 +324,7 @@ module Offer {
         pragma verify = false;
     }
 
+
     /// Take Offer and put to signer's Collection<Offered>.
     public(script) fun take_offer<Offered: store>(_signer: signer, _offer_address: address){
         abort Errors::invalid_state(ERR_DEPRECATED)

sources/daospaceplugin/AnyMemberPlugin.move

@@ -45,7 +45,7 @@ module StarcoinFramework::AnyMemberPlugin{
         let witness = AnyMemberPlugin{};
         let member_cap = DAOSpace::acquire_member_cap<DAOT, AnyMemberPlugin>(&witness);
         IdentifierNFT::accept<DAOSpace::DAOMember<DAOT>,DAOSpace::DAOMemberBody<DAOT>>(sender);
-        DAOSpace::join_member(&member_cap, Signer::address_of(sender), Option::some(image_data), Option::some(image_url), 1);
+        DAOSpace::member_offer(&member_cap, Signer::address_of(sender), Option::some(image_data), Option::some(image_url), 1);
     }
 
     public (script) fun join_entry<DAOT: store>(sender: signer, image_data:vector<u8>, image_url:vector<u8>){

sources/daospaceplugin/GrantProposalPlugin.move

@@ -1,11 +1,9 @@
 //TODO find more good name
 module StarcoinFramework::GrantProposalPlugin{
     use StarcoinFramework::GenesisSignerCapability;
-    use StarcoinFramework::Errors;
     use StarcoinFramework::Option;
     use StarcoinFramework::DAOPluginMarketplace;
     use StarcoinFramework::DAOSpace::{Self, CapType};
-    use StarcoinFramework::Signer;
     use StarcoinFramework::Vector;
     use StarcoinFramework::InstallPluginProposalPlugin;
 
@@ -27,7 +25,10 @@ module StarcoinFramework::GrantProposalPlugin{
     }
 
     struct GrantRevokeAction<phantom TokenT:store> has store, drop {
-        grantee:address
+        grantee: address,
+        total: u128,
+        start_time:u64,
+        period:u64
     }
 
     public fun initialize() {
@@ -84,74 +85,37 @@ module StarcoinFramework::GrantProposalPlugin{
         let witness = GrantProposalPlugin{};
         let proposal_cap = DAOSpace::acquire_proposal_cap<DAOT, GrantProposalPlugin>(&witness);
         let GrantCreateAction{grantee, total, start_time, period} = DAOSpace::execute_proposal<DAOT, GrantProposalPlugin, GrantCreateAction<TokenT>>(&proposal_cap, sender, proposal_id);
-        assert!(grantee == Signer::address_of(sender),Errors::not_published(ERR_SENDER_NOT_SAME));
         let grant_cap = DAOSpace::acquire_grant_cap<DAOT, GrantProposalPlugin>(&witness);
-        DAOSpace::create_grant<DAOT, GrantProposalPlugin, TokenT>(&grant_cap, sender, total, start_time, period);
+        DAOSpace::grant_offer<DAOT, GrantProposalPlugin, TokenT>(&grant_cap, grantee, total, start_time, period);
     }
 
     public (script) fun execute_grant_proposal_entry<DAOT: store, TokenT:store>(sender: signer, proposal_id: u64){
         execute_grant_proposal<DAOT, TokenT>(&sender, proposal_id);
     }
 
-    public fun create_grant_revoke_proposal<DAOT: store, TokenT:store>(sender: &signer, description: vector<u8>, grantee:address, action_delay:u64){
+    public fun create_grant_revoke_proposal<DAOT: store, TokenT:store>(sender: &signer, description: vector<u8>, grantee:address, total: u128, start_time:u64, period: u64, action_delay:u64){
         let witness = GrantProposalPlugin{};
         let cap = DAOSpace::acquire_proposal_cap<DAOT, GrantProposalPlugin>(&witness);
-        let action = GrantRevokeAction<TokenT>{ grantee };
+        let action = GrantRevokeAction<TokenT>{ grantee, total, start_time, period };
         DAOSpace::create_proposal(&cap, sender, action, description, action_delay);
     }
 
-    public (script) fun create_grant_revoke_proposal_entry<DAOT: store, TokenT:store>(sender: signer, description: vector<u8>, grantee:address, action_delay:u64){
-        create_grant_revoke_proposal<DAOT, TokenT>(&sender, description, grantee, action_delay);
+    public (script) fun create_grant_revoke_proposal_entry<DAOT: store, TokenT:store>(sender: signer, description: vector<u8>, grantee:address, total: u128, start_time:u64, period: u64, action_delay:u64){
+        create_grant_revoke_proposal<DAOT, TokenT>(&sender, description, grantee, total, start_time, period, action_delay);
     }
 
     public fun execute_grant_revoke_proposal<DAOT: store, TokenT:store>(sender: &signer, proposal_id: u64){
         let witness = GrantProposalPlugin{};
         let proposal_cap = DAOSpace::acquire_proposal_cap<DAOT, GrantProposalPlugin>(&witness);
-        let GrantRevokeAction{ grantee } = DAOSpace::execute_proposal<DAOT, GrantProposalPlugin, GrantRevokeAction<TokenT>>(&proposal_cap, sender, proposal_id);
+        let GrantRevokeAction{ grantee, total, start_time, period } = DAOSpace::execute_proposal<DAOT, GrantProposalPlugin, GrantRevokeAction<TokenT>>(&proposal_cap, sender, proposal_id);
         let grant_cap = DAOSpace::acquire_grant_cap<DAOT, GrantProposalPlugin>(&witness);
-        DAOSpace::grant_revoke<DAOT, GrantProposalPlugin, TokenT>(&grant_cap , grantee);
+        DAOSpace::grant_revoke<DAOT, GrantProposalPlugin, TokenT>(&grant_cap , grantee, total, start_time, period);
     }
 
     public (script) fun execute_grant_revoke_proposal_entry<DAOT: store, TokenT:store>(sender: signer, proposal_id: u64){
         execute_grant_revoke_proposal<DAOT, TokenT>(&sender, proposal_id);
     }
 
-    public fun create_grant_config_proposal<DAOT: store, TokenT:store>(sender: &signer, description: vector<u8>, old_grantee: address, new_grantee: address, total: u128, period: u64, start_time:u64, action_delay:u64){
-        let witness = GrantProposalPlugin{};
-        let cap = DAOSpace::acquire_proposal_cap<DAOT, GrantProposalPlugin>(&witness);
-        let action = GrantConfigAction<TokenT>{
-            old_grantee: old_grantee,
-            new_grantee: new_grantee,
-            total:total,
-            start_time:start_time,
-            period:period
-        };
-        DAOSpace::create_proposal(&cap, sender, action, description,action_delay);
-    }
-
-    public (script) fun create_grant_config_proposal_entry<DAOT: store, TokenT:store>(sender: signer, description: vector<u8>, old_grantee: address, new_grantee: address, total: u128, period: u64, start_time:u64, action_delay:u64){
-        create_grant_config_proposal<DAOT, TokenT>(&sender, description, old_grantee, new_grantee, total, period, start_time, action_delay);
-    }
-
-    public fun execute_grant_config_proposal<DAOT: store, TokenT:store>(sender: &signer, proposal_id: u64){
-        let witness = GrantProposalPlugin{};
-        let proposal_cap = DAOSpace::acquire_proposal_cap<DAOT, GrantProposalPlugin>(&witness);
-        let GrantConfigAction{
-            old_grantee: old_grantee,
-            new_grantee: new_grantee,
-            total:total,
-            start_time:start_time,
-            period:period
-        } = DAOSpace::execute_proposal<DAOT, GrantProposalPlugin, GrantConfigAction<TokenT>>(&proposal_cap, sender, proposal_id);
-        assert!(new_grantee == Signer::address_of(sender),Errors::not_published(ERR_SENDER_NOT_SAME));
-        let grant_cap = DAOSpace::acquire_grant_cap<DAOT, GrantProposalPlugin>(&witness);
-        DAOSpace::grant_config<DAOT, GrantProposalPlugin, TokenT>(&grant_cap , old_grantee , sender, total, start_time, period);
-    }
-
-    public (script) fun execute_grant_config_proposal_entry<DAOT: store, TokenT:store>(sender: signer, proposal_id: u64){
-        execute_grant_config_proposal<DAOT, TokenT>(&sender, proposal_id);
-    }
-
     public fun install_plugin_proposal<DAOT:store>(sender: &signer, description: vector<u8>, action_delay:u64){
         InstallPluginProposalPlugin::create_proposal<DAOT, GrantProposalPlugin>(sender, required_caps(), description, action_delay);
     }

sources/daospaceplugin/MemberProposalPlugin.move

@@ -67,7 +67,7 @@ module StarcoinFramework::MemberProposalPlugin{
         let proposal_cap = DAOSpace::acquire_proposal_cap<DAOT, MemberProposalPlugin>(&witness);
         let MemberJoinAction{member, init_sbt, image_data, image_url} = DAOSpace::execute_proposal<DAOT, MemberProposalPlugin, MemberJoinAction>(&proposal_cap, sender, proposal_id);
         let member_cap = DAOSpace::acquire_member_cap<DAOT, MemberProposalPlugin>(&witness);
-        DAOSpace::join_member(&member_cap, member, Option::some(image_data), Option::some(image_url) , init_sbt);
+        DAOSpace::member_offer(&member_cap, member, Option::some(image_data), Option::some(image_url) , init_sbt);
     }
 
     public (script) fun execute_proposal_entry<DAOT: store>(sender: signer, proposal_id: u64){

sources/daospaceplugin/StakeToSBTPlugin.move

@@ -191,7 +191,7 @@ module StarcoinFramework::StakeToSBTPlugin {
 
         if (!DAOSpace::is_member<DAOT>(sender_addr)) {
             IdentifierNFT::accept<DAOSpace::DAOMember<DAOT>, DAOSpace::DAOMemberBody<DAOT>>(sender);
-            DAOSpace::join_member<DAOT, StakeToSBTPlugin>(
+            DAOSpace::member_offer<DAOT, StakeToSBTPlugin>(
                 &member_cap,
                 sender_addr,
                 Option::none<vector<u8>>(),