Skip to content

Commit

Permalink
Revert "merge upgrade entry v12 and v12_1 (#126)"
Browse files Browse the repository at this point in the history
This reverts commit 47b38ad.
  • Loading branch information
nkysg committed Mar 2, 2023
1 parent 34d66e1 commit c18ec5a
Show file tree
Hide file tree
Showing 61 changed files with 566 additions and 262 deletions.
2 changes: 1 addition & 1 deletion build/StarcoinFramework/BuildInfo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ compiled_package_info:
? address: "0x00000000000000000000000000000001"
name: YieldFarmingV2
: StarcoinFramework
source_digest: 806CFB6F3BA8BB0BC5A196E6C6683A880A38E4E8E1BDE8997FC56C6444AC3016
source_digest: D6A543CE7028C8285404C5F14F62781167377952D5E94BAD8A8FDB3CAB4B3D6F
build_flags:
dev_mode: false
test_mode: false
Expand Down
Binary file modified build/StarcoinFramework/bytecode_modules/Genesis.mv
Binary file not shown.
Binary file modified build/StarcoinFramework/bytecode_modules/StdlibUpgradeScripts.mv
Binary file not shown.
1 change: 1 addition & 0 deletions build/StarcoinFramework/docs/Genesis.md
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,7 @@ 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);
Expand Down
48 changes: 48 additions & 0 deletions build/StarcoinFramework/docs/StdlibUpgradeScripts.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ 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)


Expand Down Expand Up @@ -352,7 +354,53 @@ 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>();

Expand Down
Binary file modified build/StarcoinFramework/source_maps/Genesis.mvsm
Binary file not shown.
Binary file modified build/StarcoinFramework/source_maps/StdlibUpgradeScripts.mvsm
Binary file not shown.
12 changes: 9 additions & 3 deletions integration-tests/daospace/dao_extension_point_init.exp
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
processed 5 tasks
processed 6 tasks

task 3 'view'. lines 7-7:
task 3 'run'. lines 7-15:
{
"gas_used": 177755,
"status": "Executed"
}

task 4 'view'. lines 17-17:
store key 0x00000000000000000000000000000001::DAOExtensionPoint::Registry {
next_id: 1
}

task 4 'run'. lines 9-17:
task 5 'run'. lines 19-27:
{
"gas_used": 13211,
"status": {
Expand Down
10 changes: 10 additions & 0 deletions integration-tests/daospace/dao_extension_point_init.move
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@

//# 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
Expand Down
30 changes: 18 additions & 12 deletions integration-tests/daospace/dao_extension_point_publish_version.exp
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
processed 16 tasks
processed 17 tasks

task 4 'run'. lines 46-54:
{
"gas_used": 177755,
"status": "Executed"
}

task 5 'run'. lines 56-64:
{
"gas_used": 418615,
"status": "Executed"
}

task 5 'view'. lines 56-56:
task 6 'view'. lines 66-66:
store key 0x00000000000000000000000000000001::DAOExtensionPoint::Registry {
next_id: 2
}

task 6 'view'. lines 58-58:
task 7 'view'. lines 68-68:
store key 0x00000000000000000000000000000001::DAOExtensionPoint::Entry<0x662ba5a1a1da0f1c70a9762c7eeb7aaf::TestExtentionPoint::TestExtentionPoint> {
id: 1
name: 54657374457874656e74696f6e506f696e74
Expand All @@ -33,18 +39,18 @@ store key 0x00000000000000000000000000000001::DAOExtensionPoint::Entry<0x662ba5a
updated_at: 10
}

task 7 'run'. lines 60-68:
task 8 'run'. lines 70-78:
{
"gas_used": 152078,
"status": "Executed"
}

task 8 'view'. lines 70-70:
task 9 'view'. lines 80-80:
store key 0x00000000000000000000000000000001::DAOExtensionPoint::Registry {
next_id: 2
}

task 9 'view'. lines 72-72:
task 10 'view'. lines 82-82:
store key 0x00000000000000000000000000000001::DAOExtensionPoint::Entry<0x662ba5a1a1da0f1c70a9762c7eeb7aaf::TestExtentionPoint::TestExtentionPoint> {
id: 1
name: 54657374457874656e74696f6e506f696e74
Expand Down Expand Up @@ -73,18 +79,18 @@ store key 0x00000000000000000000000000000001::DAOExtensionPoint::Entry<0x662ba5a
updated_at: 10
}

task 10 'run'. lines 74-82:
task 11 'run'. lines 84-92:
{
"gas_used": 156078,
"status": "Executed"
}

task 11 'view'. lines 84-84:
task 12 'view'. lines 94-94:
store key 0x00000000000000000000000000000001::DAOExtensionPoint::Registry {
next_id: 2
}

task 12 'view'. lines 86-86:
task 13 'view'. lines 96-96:
store key 0x00000000000000000000000000000001::DAOExtensionPoint::Entry<0x662ba5a1a1da0f1c70a9762c7eeb7aaf::TestExtentionPoint::TestExtentionPoint> {
id: 1
name: 54657374457874656e74696f6e506f696e74
Expand Down Expand Up @@ -120,7 +126,7 @@ store key 0x00000000000000000000000000000001::DAOExtensionPoint::Entry<0x662ba5a
updated_at: 10
}

task 13 'run'. lines 88-96:
task 14 'run'. lines 98-106:
{
"gas_used": 111323,
"status": {
Expand All @@ -136,12 +142,12 @@ task 13 'run'. lines 88-96:
}
}

task 14 'view'. lines 98-98:
task 15 'view'. lines 108-108:
store key 0x00000000000000000000000000000001::DAOExtensionPoint::Registry {
next_id: 2
}

task 15 'view'. lines 100-100:
task 16 'view'. lines 110-110:
store key 0x00000000000000000000000000000001::DAOExtensionPoint::Entry<0x662ba5a1a1da0f1c70a9762c7eeb7aaf::TestExtentionPoint::TestExtentionPoint> {
id: 1
name: 54657374457874656e74696f6e506f696e74
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,16 @@ 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;
Expand Down
20 changes: 13 additions & 7 deletions integration-tests/daospace/dao_extension_point_register.exp
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
processed 13 tasks
processed 14 tasks

task 4 'run'. lines 48-56:
{
"gas_used": 177755,
"status": "Executed"
}

task 5 'run'. lines 58-66:
{
"gas_used": 466466,
"status": "Executed"
}

task 5 'view'. lines 58-58:
task 6 'view'. lines 68-68:
store key 0x00000000000000000000000000000001::DAOExtensionPoint::Registry {
next_id: 2
}

task 6 'view'. lines 60-60:
task 7 'view'. lines 70-70:
store key 0x00000000000000000000000000000001::DAOExtensionPoint::Entry<0x662ba5a1a1da0f1c70a9762c7eeb7aaf::TestExtentionPoint::TestExtentionPoint> {
id: 1
name: 54657374457874656e74696f6e506f696e74
Expand All @@ -35,7 +41,7 @@ store key 0x00000000000000000000000000000001::DAOExtensionPoint::Entry<0x662ba5a
updated_at: 10
}

task 7 'run'. lines 62-70:
task 8 'run'. lines 72-80:
{
"gas_used": 60246,
"status": {
Expand All @@ -51,7 +57,7 @@ task 7 'run'. lines 62-70:
}
}

task 8 'view'. lines 72-72:
task 9 'view'. lines 82-82:
store key 0x00000000000000000000000000000001::DAOExtensionPoint::Entry<0x662ba5a1a1da0f1c70a9762c7eeb7aaf::TestExtentionPoint::TestExtentionPoint> {
id: 1
name: 54657374457874656e74696f6e506f696e74
Expand All @@ -75,7 +81,7 @@ store key 0x00000000000000000000000000000001::DAOExtensionPoint::Entry<0x662ba5a
updated_at: 10
}

task 10 'run'. lines 100-108:
task 11 'run'. lines 110-118:
{
"gas_used": 38409,
"status": {
Expand All @@ -91,7 +97,7 @@ task 10 'run'. lines 100-108:
}
}

task 12 'run'. lines 137-145:
task 13 'run'. lines 147-155:
{
"gas_used": 137491,
"status": {
Expand Down
10 changes: 10 additions & 0 deletions integration-tests/daospace/dao_extension_point_register.move
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,16 @@ 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;
Expand Down
18 changes: 12 additions & 6 deletions integration-tests/daospace/dao_extension_point_star_and_unstar.exp
Original file line number Diff line number Diff line change
@@ -1,18 +1,24 @@
processed 12 tasks
processed 13 tasks

task 6 'run'. lines 32-40:
{
"gas_used": 177755,
"status": "Executed"
}

task 7 'run'. lines 42-50:
{
"gas_used": 418615,
"status": "Executed"
}

task 7 'run'. lines 42-51:
task 8 'run'. lines 52-61:
{
"gas_used": 59320,
"status": "Executed"
}

task 8 'run'. lines 53-62:
task 9 'run'. lines 63-72:
{
"gas_used": 15374,
"status": {
Expand All @@ -28,18 +34,18 @@ task 8 'run'. lines 53-62:
}
}

task 9 'run'. lines 64-73:
task 10 'run'. lines 74-83:
{
"gas_used": 59320,
"status": "Executed"
}

task 10 'view'. lines 75-75:
task 11 'view'. lines 85-85:
store key 0x00000000000000000000000000000001::DAOExtensionPoint::Registry {
next_id: 2
}

task 11 'view'. lines 77-77:
task 12 'view'. lines 87-87:
store key 0x00000000000000000000000000000001::DAOExtensionPoint::Entry<0x662ba5a1a1da0f1c70a9762c7eeb7aaf::TestExtentionPoint::TestExtentionPoint> {
id: 1
name: 54657374457874656e74696f6e506f696e74
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,16 @@ 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;
Expand Down
Loading

0 comments on commit c18ec5a

Please sign in to comment.