diff --git a/integration-tests/daospaceplugin/stake_to_sbt_plugin.exp b/integration-tests/daospaceplugin/stake_to_sbt_plugin.exp index 8077e933..a0bc302a 100644 --- a/integration-tests/daospaceplugin/stake_to_sbt_plugin.exp +++ b/integration-tests/daospaceplugin/stake_to_sbt_plugin.exp @@ -2,13 +2,13 @@ processed 17 tasks task 5 'run'. lines 52-60: { - "gas_used": 1958252, + "gas_used": 1887227, "status": "Executed" } task 6 'run'. lines 62-98: { - "gas_used": 1159804, + "gas_used": 1022609, "status": "Executed" } @@ -26,25 +26,25 @@ task 9 'run'. lines 121-139: task 10 'run'. lines 141-157: { - "gas_used": 475573, + "gas_used": 458467, "status": "Executed" } task 12 'run'. lines 161-174: { - "gas_used": 554865, + "gas_used": 417670, "status": "Executed" } task 13 'run'. lines 176-192: { - "gas_used": 609447, + "gas_used": 592341, "status": "Executed" } task 15 'run'. lines 196-211: { - "gas_used": 278963, + "gas_used": 261857, "status": "Executed" } diff --git a/integration-tests/starcoin_dao/starcoin_onchain_config.exp b/integration-tests/starcoin_dao/starcoin_onchain_config.exp index eb180b72..f3307d40 100644 --- a/integration-tests/starcoin_dao/starcoin_onchain_config.exp +++ b/integration-tests/starcoin_dao/starcoin_onchain_config.exp @@ -2,25 +2,25 @@ processed 42 tasks task 11 'run'. lines 23-37: { - "gas_used": 1096577, + "gas_used": 959229, "status": "Executed" } task 12 'run'. lines 39-53: { - "gas_used": 976335, + "gas_used": 959229, "status": "Executed" } task 13 'run'. lines 55-69: { - "gas_used": 976335, + "gas_used": 959229, "status": "Executed" } task 14 'run'. lines 71-85: { - "gas_used": 976335, + "gas_used": 959229, "status": "Executed" } diff --git a/integration-tests/starcoin_dao/starcoin_treasury_withdraw.exp b/integration-tests/starcoin_dao/starcoin_treasury_withdraw.exp index a7db4faf..4fc5a70b 100644 --- a/integration-tests/starcoin_dao/starcoin_treasury_withdraw.exp +++ b/integration-tests/starcoin_dao/starcoin_treasury_withdraw.exp @@ -2,25 +2,25 @@ processed 44 tasks task 11 'run'. lines 23-37: { - "gas_used": 1096577, + "gas_used": 959229, "status": "Executed" } task 12 'run'. lines 39-53: { - "gas_used": 976335, + "gas_used": 959229, "status": "Executed" } task 13 'run'. lines 55-69: { - "gas_used": 976335, + "gas_used": 959229, "status": "Executed" } task 14 'run'. lines 71-85: { - "gas_used": 976335, + "gas_used": 959229, "status": "Executed" } diff --git a/integration-tests/starcoin_dao/starcoin_upgrade_module.exp b/integration-tests/starcoin_dao/starcoin_upgrade_module.exp index 322345ca..f1643f60 100644 --- a/integration-tests/starcoin_dao/starcoin_upgrade_module.exp +++ b/integration-tests/starcoin_dao/starcoin_upgrade_module.exp @@ -2,25 +2,25 @@ processed 45 tasks task 11 'run'. lines 23-37: { - "gas_used": 1096577, + "gas_used": 959229, "status": "Executed" } task 12 'run'. lines 39-53: { - "gas_used": 976335, + "gas_used": 959229, "status": "Executed" } task 13 'run'. lines 55-69: { - "gas_used": 976335, + "gas_used": 959229, "status": "Executed" } task 14 'run'. lines 71-85: { - "gas_used": 976335, + "gas_used": 959229, "status": "Executed" } diff --git a/sources/daospace/DAOSpace.move b/sources/daospace/DAOSpace.move index 480d6636..b94b03f0 100644 --- a/sources/daospace/DAOSpace.move +++ b/sources/daospace/DAOSpace.move @@ -967,10 +967,6 @@ module StarcoinFramework::DAOSpace { EventUtil::init_event(&dao_signer); } - public fun exist_plugin_event(): bool { - EventUtil::exist_event(dao_address()) - } - public fun emit_plugin_event< DAOT: store, PluginT: store, diff --git a/sources/daospaceplugin/StakeToSBTPlugin.move b/sources/daospaceplugin/StakeToSBTPlugin.move index a3ef1002..46b12b29 100644 --- a/sources/daospaceplugin/StakeToSBTPlugin.move +++ b/sources/daospaceplugin/StakeToSBTPlugin.move @@ -117,16 +117,19 @@ module StarcoinFramework::StakeToSBTPlugin { /// Accept token with token type by given DAO public fun accept_token_by_dao(_witness: &DAOT) { + install_event(); accept_token(AcceptTokenCap {}); } - fun install_event() { - if (!DAOSpace::exist_plugin_event()) { - let witness = StakeToSBTPlugin {}; - let plugin_event_cap = - DAOSpace::acquire_plugin_event_cap(&witness); - DAOSpace::init_plugin_event(&plugin_event_cap); - } + public fun install_event() { + let witness = StakeToSBTPlugin {}; + let plugin_event_cap = + DAOSpace::acquire_plugin_event_cap(&witness); + + DAOSpace::init_plugin_event(&plugin_event_cap); + DAOSpace::init_plugin_event(&plugin_event_cap); + DAOSpace::init_plugin_event(&plugin_event_cap); + DAOSpace::init_plugin_event(&plugin_event_cap); } /// Set sbt weight by given DAO @@ -158,7 +161,6 @@ module StarcoinFramework::StakeToSBTPlugin { weight_vec: Vector::empty>() }); - install_event(); let witness = StakeToSBTPlugin {}; let plugin_event_cap = DAOSpace::acquire_plugin_event_cap(&witness); @@ -222,7 +224,6 @@ module StarcoinFramework::StakeToSBTPlugin { }); stake_list.next_id = id; - install_event(); let witness = StakeToSBTPlugin {}; let plugin_event_cap = DAOSpace::acquire_plugin_event_cap(&witness); @@ -300,7 +301,6 @@ module StarcoinFramework::StakeToSBTPlugin { Account::deposit(member, unstake_item(member, poped_item)); - install_event(); let witness = StakeToSBTPlugin {}; let plugin_event_cap = DAOSpace::acquire_plugin_event_cap(&witness); @@ -431,20 +431,7 @@ module StarcoinFramework::StakeToSBTPlugin { }); }; - install_event(); let witness = StakeToSBTPlugin {}; - let plugin_event_cap = - DAOSpace::acquire_plugin_event_cap(&witness); - DAOSpace::emit_plugin_event( - &plugin_event_cap, - SBTWeightChangedEvent { - dao_id: DAOSpace::dao_id(DAOSpace::dao_address()), - token_code: Token::token_code(), - lock_time, - weight, - } - ); - let modify_config_cap = DAOSpace::acquire_modify_config_cap(&witness);