merge upgrade entry v12 and v12_1 (#126)

* merge upgrade entry v12 and v12_1 * fix stdlib upgrade * fix test cases who's capability migrated to StarcoinDAO * fix * rebase master
starcoinorg · Sep 20, 2022 · 47b38ad · 47b38ad
1 parent 61392b0
commit 47b38ad
Show file tree

Hide file tree

Showing 61 changed files with 262 additions and 566 deletions.
diff --git a/build/StarcoinFramework/BuildInfo.yaml b/build/StarcoinFramework/BuildInfo.yaml
@@ -321,7 +321,7 @@ compiled_package_info:
     ? address: "0x00000000000000000000000000000001"
       name: YieldFarmingV2
     : StarcoinFramework
-  source_digest: D6A543CE7028C8285404C5F14F62781167377952D5E94BAD8A8FDB3CAB4B3D6F
+  source_digest: 806CFB6F3BA8BB0BC5A196E6C6683A880A38E4E8E1BDE8997FC56C6444AC3016
   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_extension_point_init.exp b/integration-tests/daospace/dao_extension_point_init.exp
@@ -1,17 +1,11 @@
-processed 6 tasks
+processed 5 tasks
 
-task 3 'run'. lines 7-15:
-{
-  "gas_used": 177755,
-  "status": "Executed"
-}
-
-task 4 'view'. lines 17-17:
+task 3 'view'. lines 7-7:
 store key 0x00000000000000000000000000000001::DAOExtensionPoint::Registry {
     next_id: 1
 }
 
-task 5 'run'. lines 19-27:
+task 4 'run'. lines 9-17:
 {
   "gas_used": 13211,
   "status": {

diff --git a/integration-tests/daospace/dao_extension_point_init.move b/integration-tests/daospace/dao_extension_point_init.move
@@ -4,16 +4,6 @@
 
 //# faucet --addr bob --amount 2000000000
 
-//# run --signers Genesis
-script {
-    use StarcoinFramework::DAOExtensionPoint;
-
-    fun main(_sender: signer) {
-        DAOExtensionPoint::initialize();
-    }
-}
-// check: EXECUTED
-
 //# view --address Genesis --resource 0x1::DAOExtensionPoint::Registry
 
 //# run --signers Genesis

diff --git a/integration-tests/daospace/dao_extension_point_publish_version.exp b/integration-tests/daospace/dao_extension_point_publish_version.exp
@@ -1,23 +1,17 @@
-processed 17 tasks
+processed 16 tasks
 
 task 4 'run'. lines 46-54:
-{
-  "gas_used": 177755,
-  "status": "Executed"
-}
-
-task 5 'run'. lines 56-64:
 {
   "gas_used": 418615,
   "status": "Executed"
 }
 
-task 6 'view'. lines 66-66:
+task 5 'view'. lines 56-56:
 store key 0x00000000000000000000000000000001::DAOExtensionPoint::Registry {
     next_id: 2
 }
 
-task 7 'view'. lines 68-68:
+task 6 'view'. lines 58-58:
 store key 0x00000000000000000000000000000001::DAOExtensionPoint::Entry<0x662ba5a1a1da0f1c70a9762c7eeb7aaf::TestExtentionPoint::TestExtentionPoint> {
     id: 1
     name: 54657374457874656e74696f6e506f696e74
@@ -39,18 +33,18 @@ store key 0x00000000000000000000000000000001::DAOExtensionPoint::Entry<0x662ba5a
     updated_at: 10
 }
 
-task 8 'run'. lines 70-78:
+task 7 'run'. lines 60-68:
 {
   "gas_used": 152078,
   "status": "Executed"
 }
 
-task 9 'view'. lines 80-80:
+task 8 'view'. lines 70-70:
 store key 0x00000000000000000000000000000001::DAOExtensionPoint::Registry {
     next_id: 2
 }
 
-task 10 'view'. lines 82-82:
+task 9 'view'. lines 72-72:
 store key 0x00000000000000000000000000000001::DAOExtensionPoint::Entry<0x662ba5a1a1da0f1c70a9762c7eeb7aaf::TestExtentionPoint::TestExtentionPoint> {
     id: 1
     name: 54657374457874656e74696f6e506f696e74
@@ -79,18 +73,18 @@ store key 0x00000000000000000000000000000001::DAOExtensionPoint::Entry<0x662ba5a
     updated_at: 10
 }
 
-task 11 'run'. lines 84-92:
+task 10 'run'. lines 74-82:
 {
   "gas_used": 156078,
   "status": "Executed"
 }
 
-task 12 'view'. lines 94-94:
+task 11 'view'. lines 84-84:
 store key 0x00000000000000000000000000000001::DAOExtensionPoint::Registry {
     next_id: 2
 }
 
-task 13 'view'. lines 96-96:
+task 12 'view'. lines 86-86:
 store key 0x00000000000000000000000000000001::DAOExtensionPoint::Entry<0x662ba5a1a1da0f1c70a9762c7eeb7aaf::TestExtentionPoint::TestExtentionPoint> {
     id: 1
     name: 54657374457874656e74696f6e506f696e74
@@ -126,7 +120,7 @@ store key 0x00000000000000000000000000000001::DAOExtensionPoint::Entry<0x662ba5a
     updated_at: 10
 }
 
-task 14 'run'. lines 98-106:
+task 13 'run'. lines 88-96:
 {
   "gas_used": 111323,
   "status": {
@@ -142,12 +136,12 @@ task 14 'run'. lines 98-106:
   }
 }
 
-task 15 'view'. lines 108-108:
+task 14 'view'. lines 98-98:
 store key 0x00000000000000000000000000000001::DAOExtensionPoint::Registry {
     next_id: 2
 }
 
-task 16 'view'. lines 110-110:
+task 15 'view'. lines 100-100:
 store key 0x00000000000000000000000000000001::DAOExtensionPoint::Entry<0x662ba5a1a1da0f1c70a9762c7eeb7aaf::TestExtentionPoint::TestExtentionPoint> {
     id: 1
     name: 54657374457874656e74696f6e506f696e74

diff --git a/integration-tests/daospace/dao_extension_point_publish_version.move b/integration-tests/daospace/dao_extension_point_publish_version.move
@@ -43,16 +43,6 @@ module creator::TestExtentionPoint {
     }
 }
 
-//# run --signers Genesis
-script {
-    use StarcoinFramework::DAOExtensionPoint;
-
-    fun main(_sender: signer) {
-        DAOExtensionPoint::initialize();
-    }
-}
-// check: EXECUTED
-
 //# run --signers creator
 script {
     use creator::TestExtentionPoint;

diff --git a/integration-tests/daospace/dao_extension_point_register.exp b/integration-tests/daospace/dao_extension_point_register.exp
@@ -1,23 +1,17 @@
-processed 14 tasks
+processed 13 tasks
 
 task 4 'run'. lines 48-56:
-{
-  "gas_used": 177755,
-  "status": "Executed"
-}
-
-task 5 'run'. lines 58-66:
 {
   "gas_used": 466466,
   "status": "Executed"
 }
 
-task 6 'view'. lines 68-68:
+task 5 'view'. lines 58-58:
 store key 0x00000000000000000000000000000001::DAOExtensionPoint::Registry {
     next_id: 2
 }
 
-task 7 'view'. lines 70-70:
+task 6 'view'. lines 60-60:
 store key 0x00000000000000000000000000000001::DAOExtensionPoint::Entry<0x662ba5a1a1da0f1c70a9762c7eeb7aaf::TestExtentionPoint::TestExtentionPoint> {
     id: 1
     name: 54657374457874656e74696f6e506f696e74
@@ -41,7 +35,7 @@ store key 0x00000000000000000000000000000001::DAOExtensionPoint::Entry<0x662ba5a
     updated_at: 10
 }
 
-task 8 'run'. lines 72-80:
+task 7 'run'. lines 62-70:
 {
   "gas_used": 60246,
   "status": {
@@ -57,7 +51,7 @@ task 8 'run'. lines 72-80:
   }
 }
 
-task 9 'view'. lines 82-82:
+task 8 'view'. lines 72-72:
 store key 0x00000000000000000000000000000001::DAOExtensionPoint::Entry<0x662ba5a1a1da0f1c70a9762c7eeb7aaf::TestExtentionPoint::TestExtentionPoint> {
     id: 1
     name: 54657374457874656e74696f6e506f696e74
@@ -81,7 +75,7 @@ store key 0x00000000000000000000000000000001::DAOExtensionPoint::Entry<0x662ba5a
     updated_at: 10
 }
 
-task 11 'run'. lines 110-118:
+task 10 'run'. lines 100-108:
 {
   "gas_used": 38409,
   "status": {
@@ -97,7 +91,7 @@ task 11 'run'. lines 110-118:
   }
 }
 
-task 13 'run'. lines 147-155:
+task 12 'run'. lines 137-145:
 {
   "gas_used": 137491,
   "status": {

diff --git a/integration-tests/daospace/dao_extension_point_register.move b/integration-tests/daospace/dao_extension_point_register.move
@@ -45,16 +45,6 @@ module creator::TestExtentionPoint {
     }
 }
 
-//# run --signers Genesis
-script {
-    use StarcoinFramework::DAOExtensionPoint;
-
-    fun main(_sender: signer) {
-        DAOExtensionPoint::initialize();
-    }
-}
-// check: EXECUTED
-
 //# run --signers creator
 script {
     use creator::TestExtentionPoint;

diff --git a/integration-tests/daospace/dao_extension_point_star_and_unstar.exp b/integration-tests/daospace/dao_extension_point_star_and_unstar.exp
@@ -1,24 +1,18 @@
-processed 13 tasks
+processed 12 tasks
 
 task 6 'run'. lines 32-40:
-{
-  "gas_used": 177755,
-  "status": "Executed"
-}
-
-task 7 'run'. lines 42-50:
 {
   "gas_used": 418615,
   "status": "Executed"
 }
 
-task 8 'run'. lines 52-61:
+task 7 'run'. lines 42-51:
 {
   "gas_used": 59320,
   "status": "Executed"
 }
 
-task 9 'run'. lines 63-72:
+task 8 'run'. lines 53-62:
 {
   "gas_used": 15374,
   "status": {
@@ -34,18 +28,18 @@ task 9 'run'. lines 63-72:
   }
 }
 
-task 10 'run'. lines 74-83:
+task 9 'run'. lines 64-73:
 {
   "gas_used": 59320,
   "status": "Executed"
 }
 
-task 11 'view'. lines 85-85:
+task 10 'view'. lines 75-75:
 store key 0x00000000000000000000000000000001::DAOExtensionPoint::Registry {
     next_id: 2
 }
 
-task 12 'view'. lines 87-87:
+task 11 'view'. lines 77-77:
 store key 0x00000000000000000000000000000001::DAOExtensionPoint::Entry<0x662ba5a1a1da0f1c70a9762c7eeb7aaf::TestExtentionPoint::TestExtentionPoint> {
     id: 1
     name: 54657374457874656e74696f6e506f696e74

diff --git a/integration-tests/daospace/dao_extension_point_star_and_unstar.move b/integration-tests/daospace/dao_extension_point_star_and_unstar.move
@@ -29,16 +29,6 @@ module creator::TestExtentionPoint {
     }
 }
 
-//# run --signers Genesis
-script {
-    use StarcoinFramework::DAOExtensionPoint;
-
-    fun main(_sender: signer) {
-        DAOExtensionPoint::initialize();
-    }
-}
-// check: EXECUTED
-
 //# run --signers creator
 script {
     use creator::TestExtentionPoint;