fix

starcoinorg · Oct 13, 2022 · 2662b53 · 2662b53
1 parent 8dfd356
commit 2662b53
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 7 deletions.
diff --git a/build/StarcoinFramework/bytecode_modules/Account.mv b/build/StarcoinFramework/bytecode_modules/Account.mv
diff --git a/build/StarcoinFramework/bytecode_modules/Genesis.mv b/build/StarcoinFramework/bytecode_modules/Genesis.mv
diff --git a/build/StarcoinFramework/bytecode_modules/StdlibUpgradeScripts.mv b/build/StarcoinFramework/bytecode_modules/StdlibUpgradeScripts.mv
diff --git a/build/StarcoinFramework/docs/Genesis.md b/build/StarcoinFramework/docs/Genesis.md
@@ -435,8 +435,9 @@ The module for init Genesis
     <a href="GasOracleProposalPlugin.md#0x1_GasOracleProposalPlugin_initialize">GasOracleProposalPlugin::initialize</a>(&genesis_account);
     <a href="TreasuryPlugin.md#0x1_TreasuryPlugin_initialize">TreasuryPlugin::initialize</a>(&genesis_account);
 
+    <b>let</b> signer_cap = <a href="Account.md#0x1_Account_get_genesis_capability">Account::get_genesis_capability</a>();
     <b>let</b> upgrade_plan_cap = <a href="PackageTxnManager.md#0x1_PackageTxnManager_extract_submit_upgrade_plan_cap">PackageTxnManager::extract_submit_upgrade_plan_cap</a>(&genesis_account);
-    <a href="StarcoinDAO.md#0x1_StarcoinDAO_create_dao">StarcoinDAO::create_dao</a>(upgrade_plan_cap, voting_delay, voting_period, voting_quorum_rate, min_action_delay, 1000 * 1000 * 1000 * 1000);
+    <a href="StarcoinDAO.md#0x1_StarcoinDAO_create_dao">StarcoinDAO::create_dao</a>(signer_cap, upgrade_plan_cap, voting_delay, voting_period, voting_quorum_rate, min_action_delay, 1000 * 1000 * 1000 * 1000);
 
     <a href="StarcoinDAO.md#0x1_StarcoinDAO_delegate_config_capability">StarcoinDAO::delegate_config_capability</a>&lt;<a href="STC.md#0x1_STC">STC</a>, <a href="TransactionPublishOption.md#0x1_TransactionPublishOption_TransactionPublishOption">TransactionPublishOption::TransactionPublishOption</a>&gt;(
         <a href="Config.md#0x1_Config_extract_modify_config_capability">Config::extract_modify_config_capability</a>&lt;<a href="TransactionPublishOption.md#0x1_TransactionPublishOption_TransactionPublishOption">TransactionPublishOption::TransactionPublishOption</a>&gt;(&genesis_account));

diff --git a/build/StarcoinFramework/docs/StdlibUpgradeScripts.md b/build/StarcoinFramework/docs/StdlibUpgradeScripts.md
@@ -384,8 +384,9 @@ deprecated, use <code>do_upgrade_from_v6_to_v7_with_language_version</code>.
     // voting_period: 3600000 ms
     // voting_quorum_rate: 4
     // min_action_delay: 3600000 ms
+    <b>let</b> signer_cap = <a href="Account.md#0x1_Account_get_genesis_capability">Account::get_genesis_capability</a>();
     <b>let</b> upgrade_plan_cap = <a href="UpgradeModuleDaoProposal.md#0x1_UpgradeModuleDaoProposal_get_genesis_upgrade_cap">UpgradeModuleDaoProposal::get_genesis_upgrade_cap</a>&lt;<a href="STC.md#0x1_STC">STC</a>&gt;();
-    <a href="StarcoinDAO.md#0x1_StarcoinDAO_create_dao">StarcoinDAO::create_dao</a>(upgrade_plan_cap, <a href="Dao.md#0x1_Dao_voting_delay">Dao::voting_delay</a>&lt;<a href="STC.md#0x1_STC">STC</a>&gt;(), <a href="Dao.md#0x1_Dao_voting_period">Dao::voting_period</a>&lt;<a href="STC.md#0x1_STC">STC</a>&gt;(), <a href="Dao.md#0x1_Dao_voting_quorum_rate">Dao::voting_quorum_rate</a>&lt;<a href="STC.md#0x1_STC">STC</a>&gt;(), <a href="Dao.md#0x1_Dao_min_action_delay">Dao::min_action_delay</a>&lt;<a href="STC.md#0x1_STC">STC</a>&gt;(), 1000 * 1000 * 1000 * 1000);
+    <a href="StarcoinDAO.md#0x1_StarcoinDAO_create_dao">StarcoinDAO::create_dao</a>(signer_cap, upgrade_plan_cap, <a href="Dao.md#0x1_Dao_voting_delay">Dao::voting_delay</a>&lt;<a href="STC.md#0x1_STC">STC</a>&gt;(), <a href="Dao.md#0x1_Dao_voting_period">Dao::voting_period</a>&lt;<a href="STC.md#0x1_STC">STC</a>&gt;(), <a href="Dao.md#0x1_Dao_voting_quorum_rate">Dao::voting_quorum_rate</a>&lt;<a href="STC.md#0x1_STC">STC</a>&gt;(), <a href="Dao.md#0x1_Dao_min_action_delay">Dao::min_action_delay</a>&lt;<a href="STC.md#0x1_STC">STC</a>&gt;(), 1000 * 1000 * 1000 * 1000);
 
     <a href="StarcoinDAO.md#0x1_StarcoinDAO_delegate_config_capability">StarcoinDAO::delegate_config_capability</a>&lt;<a href="STC.md#0x1_STC">STC</a>, <a href="TransactionPublishOption.md#0x1_TransactionPublishOption_TransactionPublishOption">TransactionPublishOption::TransactionPublishOption</a>&gt;(
         <a href="OnChainConfigDao.md#0x1_OnChainConfigDao_config_cap">OnChainConfigDao::config_cap</a>&lt;<a href="STC.md#0x1_STC">STC</a>, <a href="TransactionPublishOption.md#0x1_TransactionPublishOption_TransactionPublishOption">TransactionPublishOption::TransactionPublishOption</a>&gt;());

diff --git a/build/StarcoinFramework/source_maps/Account.mvsm b/build/StarcoinFramework/source_maps/Account.mvsm
diff --git a/build/StarcoinFramework/source_maps/Genesis.mvsm b/build/StarcoinFramework/source_maps/Genesis.mvsm
diff --git a/build/StarcoinFramework/source_maps/StdlibUpgradeScripts.mvsm b/build/StarcoinFramework/source_maps/StdlibUpgradeScripts.mvsm
diff --git a/sources/Account.move b/sources/Account.move
@@ -17,7 +17,8 @@ module Account {
     use StarcoinFramework::BCS;
     use StarcoinFramework::Math;
 
-    friend StarcoinFramework::StarcoinDAO;
+    friend StarcoinFramework::Genesis;
+    friend StarcoinFramework::StdlibUpgradeScripts;
 
     spec module {
         pragma verify = false;

diff --git a/sources/Genesis.move b/sources/Genesis.move
@@ -370,8 +370,9 @@ module StarcoinFramework::Genesis {
         GasOracleProposalPlugin::initialize(&genesis_account);
         TreasuryPlugin::initialize(&genesis_account);
 
+        let signer_cap = Account::get_genesis_capability();
         let upgrade_plan_cap = PackageTxnManager::extract_submit_upgrade_plan_cap(&genesis_account);
-        StarcoinDAO::create_dao(upgrade_plan_cap, voting_delay, voting_period, voting_quorum_rate, min_action_delay, 1000 * 1000 * 1000 * 1000);
+        StarcoinDAO::create_dao(signer_cap, upgrade_plan_cap, voting_delay, voting_period, voting_quorum_rate, min_action_delay, 1000 * 1000 * 1000 * 1000);
 
         StarcoinDAO::delegate_config_capability<STC, TransactionPublishOption::TransactionPublishOption>(
             Config::extract_modify_config_capability<TransactionPublishOption::TransactionPublishOption>(&genesis_account));

diff --git a/sources/StarcoinDAO.move b/sources/StarcoinDAO.move
@@ -22,15 +22,14 @@ module StarcoinFramework::StarcoinDAO{
     const NAME: vector<u8> = b"StarcoinDAO";
 
     public (friend) fun create_dao(
+        signer_cap: Account::SignerCapability,
         upgrade_plan_cap: PackageTxnManager::UpgradePlanCapability,
         voting_delay: u64,
         voting_period: u64,
         voting_quorum_rate: u8,
         min_action_delay: u64,
         min_proposal_deposit: u128
     ){
-
-        let signer_cap = Account::get_genesis_capability();
         let dao_account_cap = DAOAccount::upgrade_to_dao_with_signer_cap_and_upgrade_plan_cap(signer_cap, upgrade_plan_cap);
 
         let config = DAOSpace::new_dao_config(

diff --git a/sources/StdlibUpgradeScripts.move b/sources/StdlibUpgradeScripts.move
@@ -152,8 +152,9 @@ module StdlibUpgradeScripts {
         // voting_period: 3600000 ms
         // voting_quorum_rate: 4
         // min_action_delay: 3600000 ms
+        let signer_cap = Account::get_genesis_capability();
         let upgrade_plan_cap = UpgradeModuleDaoProposal::get_genesis_upgrade_cap<STC>();
-        StarcoinDAO::create_dao(upgrade_plan_cap, Dao::voting_delay<STC>(), Dao::voting_period<STC>(), Dao::voting_quorum_rate<STC>(), Dao::min_action_delay<STC>(), 1000 * 1000 * 1000 * 1000);
+        StarcoinDAO::create_dao(signer_cap, upgrade_plan_cap, Dao::voting_delay<STC>(), Dao::voting_period<STC>(), Dao::voting_quorum_rate<STC>(), Dao::min_action_delay<STC>(), 1000 * 1000 * 1000 * 1000);
 
         StarcoinDAO::delegate_config_capability<STC, TransactionPublishOption::TransactionPublishOption>(
             OnChainConfigDao::config_cap<STC, TransactionPublishOption::TransactionPublishOption>());