merge upgrade entry v12 and v12_1

starcoinorg · Sep 18, 2022 · c591710 · c591710
1 parent 6cccb73
commit c591710
Show file tree

Hide file tree

Showing 19 changed files with 59 additions and 121 deletions.
diff --git a/build/StarcoinFramework/BuildInfo.yaml b/build/StarcoinFramework/BuildInfo.yaml
@@ -318,7 +318,7 @@ compiled_package_info:
     ? address: "0x00000000000000000000000000000001"
       name: YieldFarmingV2
     : StarcoinFramework
-  source_digest: E084083B9449F396039B8495E0E69BE4F2537E6F6E63F8187394FFDA78F1A9B2
+  source_digest: 76C7CCA2A91E023ECA3D6B1F32C82A4B3EA31FE6F6DC8736BE75FB0F56B35C3F
   build_flags:
     dev_mode: false
     test_mode: false

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
@@ -514,7 +514,6 @@ The module for init Genesis
 
     };
     <a href="StdlibUpgradeScripts.md#0x1_StdlibUpgradeScripts_do_upgrade_from_v11_to_v12">StdlibUpgradeScripts::do_upgrade_from_v11_to_v12</a>();
-    <a href="StdlibUpgradeScripts.md#0x1_StdlibUpgradeScripts_do_upgrade_from_v12_to_v12_1">StdlibUpgradeScripts::do_upgrade_from_v12_to_v12_1</a>();
     //Start time, <a href="Timestamp.md#0x1_Timestamp_is_genesis">Timestamp::is_genesis</a>() will <b>return</b> <b>false</b>. this call should at the end of genesis init.
     <a href="Timestamp.md#0x1_Timestamp_set_time_has_started">Timestamp::set_time_has_started</a>(&genesis_account);
     <a href="Account.md#0x1_Account_release_genesis_signer">Account::release_genesis_signer</a>(genesis_account);

diff --git a/build/StarcoinFramework/docs/StdlibUpgradeScripts.md b/build/StarcoinFramework/docs/StdlibUpgradeScripts.md
@@ -17,8 +17,6 @@ The module for StdlibUpgrade init scripts
 -  [Function `do_upgrade_from_v7_to_v8`](#0x1_StdlibUpgradeScripts_do_upgrade_from_v7_to_v8)
 -  [Function `upgrade_from_v11_to_v12`](#0x1_StdlibUpgradeScripts_upgrade_from_v11_to_v12)
 -  [Function `do_upgrade_from_v11_to_v12`](#0x1_StdlibUpgradeScripts_do_upgrade_from_v11_to_v12)
--  [Function `upgrade_from_v12_to_v12_1`](#0x1_StdlibUpgradeScripts_upgrade_from_v12_to_v12_1)
--  [Function `do_upgrade_from_v12_to_v12_1`](#0x1_StdlibUpgradeScripts_do_upgrade_from_v12_to_v12_1)
 -  [Module Specification](#@Module_Specification_0)
 
 
@@ -354,53 +352,7 @@ deprecated, use <code>do_upgrade_from_v6_to_v7_with_language_version</code>.
 <pre><code><b>public</b> <b>fun</b> <a href="StdlibUpgradeScripts.md#0x1_StdlibUpgradeScripts_do_upgrade_from_v11_to_v12">do_upgrade_from_v11_to_v12</a>() {
     <a href="Block.md#0x1_Block_checkpoints_init">Block::checkpoints_init</a>();
     <a href="DAORegistry.md#0x1_DAORegistry_initialize">DAORegistry::initialize</a>();
-}
-</code></pre>
-
-
-
-</details>
-
-<a name="0x1_StdlibUpgradeScripts_upgrade_from_v12_to_v12_1"></a>
-
-## Function `upgrade_from_v12_to_v12_1`
-
-
-
-<pre><code><b>public</b>(<b>script</b>) <b>fun</b> <a href="StdlibUpgradeScripts.md#0x1_StdlibUpgradeScripts_upgrade_from_v12_to_v12_1">upgrade_from_v12_to_v12_1</a>()
-</code></pre>
-
-
-
-<details>
-<summary>Implementation</summary>
-
-
-<pre><code><b>public</b>(<b>script</b>) <b>fun</b> <a href="StdlibUpgradeScripts.md#0x1_StdlibUpgradeScripts_upgrade_from_v12_to_v12_1">upgrade_from_v12_to_v12_1</a>()  {
-    <a href="StdlibUpgradeScripts.md#0x1_StdlibUpgradeScripts_do_upgrade_from_v12_to_v12_1">do_upgrade_from_v12_to_v12_1</a>();
-}
-</code></pre>
-
-
-
-</details>
-
-<a name="0x1_StdlibUpgradeScripts_do_upgrade_from_v12_to_v12_1"></a>
-
-## Function `do_upgrade_from_v12_to_v12_1`
-
-
-
-<pre><code><b>public</b> <b>fun</b> <a href="StdlibUpgradeScripts.md#0x1_StdlibUpgradeScripts_do_upgrade_from_v12_to_v12_1">do_upgrade_from_v12_to_v12_1</a>()
-</code></pre>
-
-
-
-<details>
-<summary>Implementation</summary>
-
 
-<pre><code><b>public</b> <b>fun</b> <a href="StdlibUpgradeScripts.md#0x1_StdlibUpgradeScripts_do_upgrade_from_v12_to_v12_1">do_upgrade_from_v12_to_v12_1</a>() {
     <a href="DAOExtensionPoint.md#0x1_DAOExtensionPoint_initialize">DAOExtensionPoint::initialize</a>();
     <a href="DAOPluginMarketplace.md#0x1_DAOPluginMarketplace_initialize">DAOPluginMarketplace::initialize</a>();
 

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/integration-tests/daospace/dao_grant.move b/integration-tests/daospace/dao_grant.move
@@ -122,11 +122,9 @@ module creator::DAOHelper {
 
 //# run --signers creator
 script{
-    use StarcoinFramework::StdlibUpgradeScripts;
     use creator::DAOHelper;
 
     fun main(sender: signer){
-        StdlibUpgradeScripts::upgrade_from_v12_to_v12_1();
         DAOHelper::initialize_x_plugin(&sender);
 
         // time unit is millsecond

diff --git a/integration-tests/daospace/dao_proposal.move b/integration-tests/daospace/dao_proposal.move
@@ -168,11 +168,9 @@ module creator::DAOHelper {
 
 //# run --signers creator
 script{
-    use StarcoinFramework::StdlibUpgradeScripts;
     use creator::DAOHelper;
 
     fun main(sender: signer){
-        StdlibUpgradeScripts::upgrade_from_v12_to_v12_1();
         DAOHelper::initialize_x_plugin(&sender);
 
         // time unit is millsecond

diff --git a/integration-tests/daospace/dao_upgrade.move b/integration-tests/daospace/dao_upgrade.move
@@ -4,15 +4,15 @@
 
 //# faucet --addr alice --amount 10000000000
 
-//# run --signers creator
-script {
-    use StarcoinFramework::StdlibUpgradeScripts;
-
-    fun upgrade_from_v11_to_v12() {
-        StdlibUpgradeScripts::upgrade_from_v12_to_v12_1();
-    }
-}
-// check: EXECUTED
+// //# run --signers creator
+// script {
+//     use StarcoinFramework::StdlibUpgradeScripts;
+
+//     fun upgrade_from_v11_to_v12() {
+//         StdlibUpgradeScripts::upgrade_from_v12_to_v12_1();
+//     }
+// }
+// // check: EXECUTED
 
 //# publish
 module creator::DAOHelper {

diff --git a/integration-tests/daospace/stake_to_sbt_plugin.move b/integration-tests/daospace/stake_to_sbt_plugin.move
@@ -16,15 +16,15 @@
 // }
 // // check: EXECUTED
 
-//# run --signers creator
-script {
-    use StarcoinFramework::StdlibUpgradeScripts;
+// //# run --signers creator
+// script {
+//     use StarcoinFramework::StdlibUpgradeScripts;
 
-    fun upgrade_from_v11_to_v12() {
-        StdlibUpgradeScripts::upgrade_from_v12_to_v12_1();
-    }
-}
-// check: EXECUTED
+//     fun upgrade_from_v11_to_v12() {
+//         StdlibUpgradeScripts::upgrade_from_v12_to_v12_1();
+//     }
+// }
+// // check: EXECUTED
 
 //# publish
 module creator::XDAO {

diff --git a/integration-tests/daospace/xdao.move b/integration-tests/daospace/xdao.move
@@ -4,14 +4,14 @@
 
 // TODO figure out how to call genesis init script in integration tests
 
-//# run --signers creator
-script{
-    use StarcoinFramework::StdlibUpgradeScripts;
+// //# run --signers creator
+// script{
+//     use StarcoinFramework::StdlibUpgradeScripts;
 
-    fun main(){
-        StdlibUpgradeScripts::upgrade_from_v12_to_v12_1();
-    }
-}
+//     fun main(){
+//         StdlibUpgradeScripts::upgrade_from_v12_to_v12_1();
+//     }
+// }
 
 //# publish
 module creator::XDAO {

diff --git a/integration-tests/daospaceplugin/mint_proposal_plugin.move b/integration-tests/daospaceplugin/mint_proposal_plugin.move
@@ -8,14 +8,14 @@
 
 //# faucet --addr cindy --amount 10000000000
 
-//# run --signers creator
-script{
-    use StarcoinFramework::StdlibUpgradeScripts;
-
-    fun main(){
-        StdlibUpgradeScripts::upgrade_from_v12_to_v12_1();
-    }
-}
+// //# run --signers creator
+// script{
+//     use StarcoinFramework::StdlibUpgradeScripts;
+
+//     fun main(){
+//         StdlibUpgradeScripts::upgrade_from_v12_to_v12_1();
+//     }
+// }
 
 //# publish
 module creator::XDAO {

diff --git a/integration-tests/daospaceplugin/salary_gov_plugin.move b/integration-tests/daospaceplugin/salary_gov_plugin.move
@@ -251,12 +251,10 @@ module creator::XDAO {
 
 //# run --signers creator
 script {
-    use StarcoinFramework::StdlibUpgradeScripts;
     use creator::SalaryGovPlugin;
     use creator::XDAO;
 
     fun main(sender: signer) {
-        StdlibUpgradeScripts::upgrade_from_v12_to_v12_1();
         SalaryGovPlugin::initialize(&sender);
 
         // time unit is millsecond

diff --git a/integration-tests/starcoin_dao/starcoin_dao.move b/integration-tests/starcoin_dao/starcoin_dao.move
@@ -5,12 +5,12 @@
 //# faucet --addr alice --amount 10000000000
 
 
-//# run --signers creator
-script{
-   use StarcoinFramework::StdlibUpgradeScripts;
+// //# run --signers creator
+// script{
+//    use StarcoinFramework::StdlibUpgradeScripts;
 
-   fun main(){
-       StdlibUpgradeScripts::upgrade_from_v12_to_v12_1();
-   }
-}
-// check: EXECUTED
+//    fun main(){
+//        StdlibUpgradeScripts::upgrade_from_v12_to_v12_1();
+//    }
+// }
+// // check: EXECUTED
diff --git a/integration-tests/starcoin_dao/starcoin_onchain_config.move b/integration-tests/starcoin_dao/starcoin_onchain_config.move
@@ -6,15 +6,15 @@
 
 //# block --author 0x1 --timestamp 86400000
 
-//# run --signers Genesis
-script{
-   use StarcoinFramework::StdlibUpgradeScripts;
-
-   fun main(){
-       StdlibUpgradeScripts::upgrade_from_v12_to_v12_1();
-   }
-}
-// check: EXECUTED
+// //# run --signers Genesis
+// script{
+//    use StarcoinFramework::StdlibUpgradeScripts;
+
+//    fun main(){
+//        StdlibUpgradeScripts::upgrade_from_v12_to_v12_1();
+//    }
+// }
+// // check: EXECUTED
 
 //# run --signers alice
 script {

diff --git a/integration-tests/starcoin_dao/starcoin_upgrade_module.move b/integration-tests/starcoin_dao/starcoin_upgrade_module.move
@@ -6,15 +6,15 @@
 
 //# block --author 0x1 --timestamp 86400000
 
-//# run --signers Genesis
-script{
-   use StarcoinFramework::StdlibUpgradeScripts;
-
-   fun main(){
-       StdlibUpgradeScripts::upgrade_from_v12_to_v12_1();
-   }
-}
-// check: EXECUTED
+// //# run --signers Genesis
+// script{
+//    use StarcoinFramework::StdlibUpgradeScripts;
+
+//    fun main(){
+//        StdlibUpgradeScripts::upgrade_from_v12_to_v12_1();
+//    }
+// }
+// // check: EXECUTED
 
 //# run --signers alice
 script {

diff --git a/sources/Genesis.move b/sources/Genesis.move
@@ -452,7 +452,6 @@ module Genesis {
 
         };
         StdlibUpgradeScripts::do_upgrade_from_v11_to_v12();
-        StdlibUpgradeScripts::do_upgrade_from_v12_to_v12_1();
         //Start time, Timestamp::is_genesis() will return false. this call should at the end of genesis init.
         Timestamp::set_time_has_started(&genesis_account);
         Account::release_genesis_signer(genesis_account);

diff --git a/sources/StdlibUpgradeScripts.move b/sources/StdlibUpgradeScripts.move
@@ -120,13 +120,7 @@ module StdlibUpgradeScripts {
         public fun do_upgrade_from_v11_to_v12() {
             Block::checkpoints_init();
             DAORegistry::initialize();
-        }
-
-        public(script) fun upgrade_from_v12_to_v12_1()  {
-            do_upgrade_from_v12_to_v12_1();
-        }
 
-        public fun do_upgrade_from_v12_to_v12_1() {
             DAOExtensionPoint::initialize();
             DAOPluginMarketplace::initialize();