From f6824f0973acf43d6521a029a9d64e745a14c19f Mon Sep 17 00:00:00 2001 From: sanlee42 Date: Tue, 5 Sep 2023 15:26:21 +0000 Subject: [PATCH] Fix easygas address --- build/StarcoinFramework/BuildInfo.yaml | 2 +- .../bytecode_modules/StdlibUpgradeScripts.mv | Bin 2129 -> 2068 bytes .../docs/StdlibUpgradeScripts.md | 7 +------ .../source_maps/StdlibUpgradeScripts.mvsm | Bin 6863 -> 6609 bytes sources/StdlibUpgradeScripts.move | 7 +------ 5 files changed, 3 insertions(+), 13 deletions(-) diff --git a/build/StarcoinFramework/BuildInfo.yaml b/build/StarcoinFramework/BuildInfo.yaml index cd836bc6..bd862b2c 100644 --- 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 index 9ee2f379251e8c71eed74e45fdd4d3a74f44d308..b53e7f3f3f9a2d1ee96f357fcec55bae401585af 100644 GIT binary patch delta 553 zcmWlWJ8~2;5Qe)Y&1hDmosmX6`=$5L#`X&8psk-;>!kt`={-iMgv=BC8vy!iVqxvqYXfJ-C{;WPE z$rtP5Z}y$NZvXtWJwDeu2V*qkxdvP-2zM+37I&Fa0s@2wtf6GxW%L+*K^U;ABw@%H zDZ-f5gfS)P8OES%jS$xff|%2d=zx&b1h+URrYw`1zHAOn3hKxr>h=;)Xq~LsyMYW^ zbxu}Rc$`s^6O6!aeSs>Rb`X`k2c(Pp-5#p^;h=)(5jo`JXh>&gqcK9Uo6wnjG95Cbv&a$Q*`+QC;({6k0CSh96!a=zx55rNp3hS_O7+Vmrm1u=k7-7Pz1ez<{ zHhcVf`(8M4`%(SH<}!Z!GBe;)Z#7tY$DpQ}qHm|*Gl5haWJ6BjC_F`xf)?=`?i~#+ zeP~|m*=c7726jmIdV;H)8S?fyDWx0GcIAg6LIp0*z>k_6y>R_CNm`Plwk9d)+(JQtphHR@A&`PW(BuJ9P*DL| zgoKblJOWAq1(yavn{;V-0eAsQ&dlh1`e)8R*YnDpnE8j!U*!Wp8DYj|Tse8UF+GGt$_SJaV2l8qa){>|0c+r`jb#$Dzv!J*WB(89@%v2bl|m(hwzxobJX(w9H>297Z|Ot`f9Uuse 0x1::Account; use 0x1::Block; -use 0x1::ChainId; use 0x1::Collection; use 0x1::Config; use 0x1::CoreAddresses; @@ -343,11 +342,7 @@ deprecated, use do_upgrade_from_v6_to_v7_with_language_version. 
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",
diff --git a/build/StarcoinFramework/source_maps/StdlibUpgradeScripts.mvsm b/build/StarcoinFramework/source_maps/StdlibUpgradeScripts.mvsm
index 40646defaefbf8132bfd32146545f6d935ba8ad6..34fb9e4f915f1d6450c50da7094f2353aa6ae0ce 100644
GIT binary patch
literal 6609
zcmb7|TWB0r9EZ;~&F0=DO={C??rAQxKE(JU3f7n=R*@PjRY{j|cajcCcEjv8AtG8Y
zZ4hljy^ucG#ENNO;=O``)C&5dCWy5VMO#rxgR#;?L2MBGj+>Gj
zJJ91hF}E}7djqMY$up)&R6JW^%p90dIO)b?uCE4si+l+}SxzkGyUC;)5GggL8_XI#
zn<~6|2+4UjV70?4Y35>eK!!9utmk31G}HH#Db07O_W^{ZIg51xvZT3)wG7$P`~&M6
zW5e#gO2JctaG5Fnvu`r2OZVlsF#bWqgs!(19Vi&uxnFWLTpdc!Fz6+F
zCGsZMZv`<_6lDF%ukvFj
zy+fcw@D$cz&>?sL>j>x&%wb&w9fEUMmq3SL39Fd*NZs!%uqq+IElshTKLr~XuP3hG
zW>qj!Yd^8|cVf<=VS2b!5^r)scCedWS(r
zW&~>#bY%8oje(BL1+4EuM`jx92hfpO#46zlt&z{jTBQ)+mfFZ*m(5|&UbG)MW(V-J
zw_
zyI30!OoI;T?RXuaL%Ip;F3=$z!5RbI(T-uA1l`g4uwDb*(b9LXJKA5=t6*_;NBab`
z5>t1ybT)NI+e5vFL4WjgVeJR~(Q_MC1oTJGIMzp?KYG#`*PS;V?Lyfa(_6Agn&}Nt
zEX@V(W(n3x^K-0aD3N9!t)Lo8rI~IV>!dkIy%D%Un$Kd5!g^_rVZ97x(zNxgy+NAe
zSSMhkG*4o^4x6NT8tWa{EX^sbQ?Nyv6Ihe5Rhql8-h*;!rq84bX_jXjvkfYx*?`po
zRnlBxjyGdgOY_0qIf69j0ro%|DX
z!2TN(^zF?;ygK
zR;)WgpXFh!Hqd9ewRS;(1MML`=M&fSAHV?epdAq8z56uco1m9r6zeU}%V4dy!I*ym
DD*J)R

literal 6863
zcmb7|TWl0n9EWFHcDFaSOK;MOR;jHLgjjqqMjnW$lmfM-79X%~#@%UM+0K^T!3GS*
zsD&3|Y`kDFp#hBw5gO9a25Tg?)UOmsb!6dikB*>Qw5<&-f>e-P7MelN1>pwv7uSXLx}6E8DOVU
zIVYc2{(k(Iz~Wyiw-v7)LelKO>W2bpuEE*~h0=Tt>s?qRO@9u;()@&aa}bfHU$aP>
zF=oFRilyn-ES0AJl**);=E_-EEX_fz0}zwuQLJN7F3saurywrPNvvsDBF!$W8K{uv
zpIHAur8MWTtQymXD)Z%7aR?Cl?KFQL0ynmYyvGdS8OT3!25|y(^Sy%gDd^^#!@3N*
z`KGbvK{wyZGU5-q`KqwifNs8atZfjLv$PKDQP6GLyx6kt0o|qp)cXKRQEkQA1UjmfSerpd
z)mU2~fSN%&WYmIyui`h6k3c+QyS=;YUMKOilgp>Gu3ARkXV6FHO5{z>UqjroR)C(r
zby)47=Wiue2k7}L!rBVD)fcd?fo}EFSbu?T^{yqBwH`@zuS0N@dhdY_!Evk;phNI1
z)=AJIFdw54&>@(oUKCS@pcd<1(Cd8*)2Y#S
zN<}6{RH`A!&f-D5&7dRGhUJ2e%u=i@=*am0R7d6=>YV@`nGvip(2?1TH4Zv5e`77;
zQ$|N-7Bh^gBU6cWALwssW37b%x8#z+L6gIvYtcUB17-kEORgFdh-X2EWVr>34GJ
ztXw-zQ}#nB$$NIrOL*x%M_u6<`Y43|n`C7l!W@RO>zUC(=4J@26*{D8yq%y!x*jVB
zI;105^Y31-X!T5N3+NT?C$78^Q?F=#HuZ|On|d#R-t-J&
z?E}5(>A~6$debw3brJNY$IrN4dHrbXQw+Z)^(ltm0QwXoPTSUkKE=4geb-^?Q;fT@
zHi16H@E4A1`C2$ky%DI9<|(W(xIvoZSRcbuX_|V*u9fBl)@M*B>4az>U(J!TJuC
zNplKo8g7#2S*%I8S(KU8tcT%NX?9?B!*XdhU_A~E(v0w-8-v@V
z8OLgXMrk%;wLz0K+p#*}c4_{>-E76YLz>3wgaAwJGn~Y{Y))f>e!UGLA2b7ahsi%O
zg*XfP#ds3yD^pgl`B%}(ujf=Kj$9M;R49q~6zIR4!RiD3E?W$XwP#7
kaL^nV1buREARjgZf_!(+Abt&c8pg1`0X+@I`W7tfUt`{1oB#j-

diff --git a/sources/StdlibUpgradeScripts.move b/sources/StdlibUpgradeScripts.move
index df232b9f..2218b334 100644
--- 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",