Fix easygas address

starcoinorg · Sep 5, 2023 · f6824f0 · f6824f0
1 parent 40cb492
commit f6824f0
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 13 deletions.
diff --git a/build/StarcoinFramework/BuildInfo.yaml b/build/StarcoinFramework/BuildInfo.yaml
@@ -5,7 +5,7 @@ compiled_package_info:
     StarcoinAssociation: "0x0000000000000000000000000a550c18"
     StarcoinFramework: "0x00000000000000000000000000000001"
     VMReserved: "0x00000000000000000000000000000000"
-  source_digest: ED388301CE665C887716E453E432422698CF5F647D36FCC6B4437EF26765DB37
+  source_digest: 5EDBD9B240BB60994496BAB9628FF163E4311DCFCC05EC864EFEAE3BB6467CFA
   build_flags:
     dev_mode: false
     test_mode: false

diff --git a/build/StarcoinFramework/bytecode_modules/StdlibUpgradeScripts.mv b/build/StarcoinFramework/bytecode_modules/StdlibUpgradeScripts.mv
diff --git a/build/StarcoinFramework/docs/StdlibUpgradeScripts.md b/build/StarcoinFramework/docs/StdlibUpgradeScripts.md
@@ -22,7 +22,6 @@ The module for StdlibUpgrade init scripts
 
 <pre><code><b>use</b> <a href="Account.md#0x1_Account">0x1::Account</a>;
 <b>use</b> <a href="Block.md#0x1_Block">0x1::Block</a>;
-<b>use</b> <a href="ChainId.md#0x1_ChainId">0x1::ChainId</a>;
 <b>use</b> <a href="Collection.md#0x1_Collection">0x1::Collection</a>;
 <b>use</b> <a href="Config.md#0x1_Config">0x1::Config</a>;
 <b>use</b> <a href="CoreAddresses.md#0x1_CoreAddresses">0x1::CoreAddresses</a>;
@@ -343,11 +342,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>(sender: &signer) {
     {
         <a href="GasSchedule.md#0x1_GasSchedule_initialize">GasSchedule::initialize</a>(sender,<a href="GasSchedule.md#0x1_GasSchedule_new_gas_schedule">GasSchedule::new_gas_schedule</a>());
-        <b>let</b> <b>address</b> = <b>if</b> (<a href="ChainId.md#0x1_ChainId_is_main">ChainId::is_main</a>()){
-            @0x8c109349c6bd91411d6bc962e080c4a3
-        }<b>else</b> {
-            @0x4783d08fb16990bd35d83f3e23bf93b8
-        };
+        <b>let</b> <b>address</b> = @0x8c109349c6bd91411d6bc962e080c4a3;
         <a href="EasyGas.md#0x1_EasyGas_initialize">EasyGas::initialize</a>(sender,
             <b>address</b>,
             b"STAR",b"STAR",

diff --git a/build/StarcoinFramework/source_maps/StdlibUpgradeScripts.mvsm b/build/StarcoinFramework/source_maps/StdlibUpgradeScripts.mvsm
diff --git a/sources/StdlibUpgradeScripts.move b/sources/StdlibUpgradeScripts.move
@@ -2,7 +2,6 @@ address StarcoinFramework {
 /// The module for StdlibUpgrade init scripts
 module StdlibUpgradeScripts {
 
-        use StarcoinFramework::ChainId;
         use StarcoinFramework::EasyGas;
         use StarcoinFramework::CoreAddresses;
         use StarcoinFramework::STC::{Self, STC};
@@ -110,11 +109,7 @@ module StdlibUpgradeScripts {
         public fun do_upgrade_from_v11_to_v12(sender: &signer) {
             {
                 GasSchedule::initialize(sender,GasSchedule::new_gas_schedule());
-                let address = if (ChainId::is_main()){
-                    @0x8c109349c6bd91411d6bc962e080c4a3
-                }else {
-                    @0x4783d08fb16990bd35d83f3e23bf93b8
-                };
+                let address = @0x8c109349c6bd91411d6bc962e080c4a3;
                 EasyGas::initialize(sender,
                     address,
                     b"STAR",b"STAR",