From 65b23b867c442a2132441a48128ee098d029fe8e Mon Sep 17 00:00:00 2001 From: zenground0 Date: Tue, 11 Apr 2023 18:00:48 -0600 Subject: [PATCH 1/4] Butterfly artifacts --- build/bootstrap/butterflynet.pi | 4 ++-- build/genesis/butterflynet.car | Bin 8383893 -> 8383896 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/bootstrap/butterflynet.pi b/build/bootstrap/butterflynet.pi index 5b10e2bc4a..ce71427d5c 100644 --- a/build/bootstrap/butterflynet.pi +++ b/build/bootstrap/butterflynet.pi @@ -1,2 +1,2 @@ -/dns4/bootstrap-0.butterfly.fildev.network/tcp/1347/p2p/12D3KooWCa1wgMMBB9JjA2kYqaN1v5uh7xvcsc2gQJBHzPp7G57H -/dns4/bootstrap-1.butterfly.fildev.network/tcp/1347/p2p/12D3KooWD6fCvo1dyci6wsjTLyv7eJK73pCVz6RCQjbtPvbc8LYw +/dns4/bootstrap-0.butterfly.fildev.network/tcp/1347/p2p/12D3KooWMQBVoPirSWwrNr9QBj6RhGa48NGAeyr4cZvMMAzSEUZW +/dns4/bootstrap-1.butterfly.fildev.network/tcp/1347/p2p/12D3KooWQ2Q1yhD799kSDcbjeb5mr4ZSCK2PsGa4gyBZemfgx1uT diff --git a/build/genesis/butterflynet.car b/build/genesis/butterflynet.car index 589e5ab7574a37bf39581d4acbf393ee942c476d..dcc70f5117cbe2d8a5d4df89d75617dc1ec30aed 100644 GIT binary patch delta 2539 zcmb8wX*kqt6aerUL&%iK)QqOqTXpP3?8;hCY=M zZb(-~3w}&BqH~NYLux!Oab+s9h^FjR-|m0&S+VeRy$u^>!D6G_GPv$YQDyb(w4t1d zB=aSih}}UGW3DAyP14s$P|gcLZ$mqXi;0(P({fve z`d+f~TKw1I*T1zsWr^imMlSv_e_m)lfot1*)@zyIyB>=jPB(g z^kl8|pL%!qcBR>HCnfWdySZmv*rWPY_jZhBJ2O}DeKRzRz2X)b4or6BY`Anyh4(;; zD1itHyhlzb(2`Y?BREF3sy1`psBejKzM*^IgW(wyg@D!@GWBT0sqWRdUOuBNuG{xf zKdstOdZ5}rrSKxzpx9>IDvE?ylT;STs5iUAJa_ zV_BOp_@v%a>Sn7l8QCu%WX}+qo2hXjuhqEkqR82?5)yFY8!PJ73ydUH8^*LBFn&Xpb4~qHdp~x0v(_W^ngAv0IPr@ zFapNF1gr*YfGJoD)`9iFjDJ^X?$hQXu9rpS9}OoY_5{hCh)GH34Y98`^Ai-YD`E*I zp@Fz{_n#=Jg$#Axxu4BF)HL}r>oU##HYf721=s*AffcX@8vzN}05Y%zc3=~*2M)jy zYzA9^6W9uzfeWAjSFjDZ0e9d5Ji&Ib19$;%uoLV8K43TS1ytY%{6PQ+1VMlXfQ07QTDvJ$glX>nvZ?uG<#IH+S zl=z~xWjwvyT%mHrcJa!6HVyT=pUMaJBrv#78QDfd$GW`HeR$vLumWkbv<~-=4HmCb zOJ7g0$cIT^(cRz18Ui9II;3s$vN~xz2lZ&h1SjUbB*S5bGv04Hj5*Wmh!143DH7R5 zstX#3pU!o83D9YrS-rMxJpuxzPxNVh0)y(a0n_%&h{S#4vt{k4=rnr*W>EAgD2TMy zE^Xq_6mDm_+NX=7^e0c56$H%N=}Pj1PAV18nrh0fkbeI&%6r!Hq^qPB?wxDzl{^ZH zJ!>6fzu4iej^m_qdP@5*Z|WoC14Jo3-_B1={%m$Mmx2qNe=nGr&GBOsF#XdR|4)}Q ze{OTUKbuWKn_i~83@`ndsFaftomgenQt8mHjSqr<4aiaElF<9KO0_Gj(pdbqD z1^YlWhye`#LBam=N~XBiM|AmT+F%~vn^@eNB}&bl=^_5eE$*ok<&aJjak+mUTdGp!Ie&%vqBm(ja*KN*MY(5sc{t~@ PVnG}@z(1eG{7m@^pmND? delta 2547 zcmb8wdpJ~S7y$4&GsqZ8HJKTyj_bHYil}7DJyVI0$u%0HMx_~zE=*=(B$XVkipsVW z(Pe}w4@>vkC|$^<+Q@FMMM<+e7fy&@JTPidad$eu`rHa``tz*lUV)kXLBbpnJ*D+M21=JB5kF+5qCk;S zqbZAy`!?_ADHo@iq#miW9@%-&F{kbH4cXhZ;~7_OcscmYDrB!$!_)~@sKP-Zgkn@Q zFwWkUR^^9iR+N{;pFC!4Uex(P`sSIgZg>ChtDS2wGbIUHH~SP3!55Qbi^n^B$MbZ| zuaATiL#|`v|g$ z-#-7kLcLneIfJ-n(-SP4E*=@y2GfC#bYytO*`2nEI-lr^*luBe;1DMdlSb{_v6I>4 z1Iyg(#m&5#U=~1uF3=Y1R8BVU0eD*0Oy1$w?`;(Jp;@_A!lClE9oDTKShk zj88l!>-c6LI$m_y+5N(!9Iv8x%l~*_FMAa_gcEb`E(H$25jX*7-~wEM8(0S10TV0- zE5J(N0agJ|;00C#Z{P!b!5ZKPSYR#i2LT`u1c6`>0@i_05C+x*HV6k1U;~H*QD7t3 z1UMiXYzAAvRuBWW0WRQ4xp!kDNCHK>TJ*OAE+xmUrfb*4$uB=8#_`)8KIvXkDJjz* zJjJ|is1mqqb{CECjuRHk$3^vGW^N*@tSY;Cwkd%X>tEAq5C))Wej&@F^lY}q?c(aAeU z)aDcn*SvZ_(ziKXLnHJG74};2&t_9MK*oRFKvaJy6}L>4Vl$e?p?9u%ZEWbwDs=Lg zK_he~%4;2U);y}Va6qtB*2K!Q^m;w-bwUp(`S>|+S@e(_-$`t>HdL>2_iU&NI5r;tw_j!UU=s;^$zWJcWxwaQLKHSRyw)s8lnweiW;jD}d} z`7}b8ywoA$f-I9K^o8r}N+0_)uh`vWU}orDo7?inti#B_kW#p&*zBl!1wy)nNZufw zXHuw<@?Y3trgop%6EXDpqH+?lYOx+FSnU@|BXoS7{f};HYWUZ%A3e~hQD4K-hxnsg z$7VA>5I_0v=tcR;+{hGz1B`(r%3DsVKe0D=8rx;;>Q6j7a(*3tiaDT{pk9^I~olpo`H23#*mqtnt1ek3?@ZYyPqEmFpOt>yiz6po?FrND9`<)i#8j< V4yYT6Wm&sHJV=nrvIH{UzW{@t&Kv*$ From 44979541be640b56571dd4affe9710ece9371923 Mon Sep 17 00:00:00 2001 From: zenground0 Date: Tue, 11 Apr 2023 18:12:44 -0600 Subject: [PATCH 2/4] Set calibration net upgrade height --- build/params_calibnet.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/params_calibnet.go b/build/params_calibnet.go index a48fa5fda0..ed6dd645df 100644 --- a/build/params_calibnet.go +++ b/build/params_calibnet.go @@ -73,11 +73,11 @@ const UpgradeSharkHeight = 16800 // 6 days after genesis // 2023-02-21T16:30:00Z const UpgradeHyggeHeight = 322354 -// ?????????? -const UpgradeLightningHeight = 999999999999999 +// 2023-04-18T16:30:00Z +const UpgradeLightningHeight = 483634 -// ?????????????????? -const UpgradeThunderHeight = UpgradeLightningHeight + 1 +// 2023-04-18T20:30:00Z +const UpgradeThunderHeight = UpgradeLightningHeight + 480 var SupportedProofTypes = []abi.RegisteredSealProof{ abi.RegisteredSealProof_StackedDrg32GiBV1, From 24da8bdb34d533443b3f0d8cd76b4bdef4c29201 Mon Sep 17 00:00:00 2001 From: zenground0 Date: Tue, 11 Apr 2023 18:29:33 -0600 Subject: [PATCH 3/4] Review Response --- build/params_calibnet.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/params_calibnet.go b/build/params_calibnet.go index ed6dd645df..3a206b1a7a 100644 --- a/build/params_calibnet.go +++ b/build/params_calibnet.go @@ -76,8 +76,8 @@ const UpgradeHyggeHeight = 322354 // 2023-04-18T16:30:00Z const UpgradeLightningHeight = 483634 -// 2023-04-18T20:30:00Z -const UpgradeThunderHeight = UpgradeLightningHeight + 480 +// 2023-04-20T16:30:00Z +const UpgradeThunderHeight = UpgradeLightningHeight + 5760 var SupportedProofTypes = []abi.RegisteredSealProof{ abi.RegisteredSealProof_StackedDrg32GiBV1, From 4443ac662fb448470ae1bf4e844c5441e8ea6d52 Mon Sep 17 00:00:00 2001 From: zenground0 Date: Wed, 12 Apr 2023 08:22:34 -0600 Subject: [PATCH 4/4] Fix state tree version assert --- chain/consensus/filcns/upgrades.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chain/consensus/filcns/upgrades.go b/chain/consensus/filcns/upgrades.go index 5754c4bea3..c82ad6a5c2 100644 --- a/chain/consensus/filcns/upgrades.go +++ b/chain/consensus/filcns/upgrades.go @@ -1778,9 +1778,9 @@ func upgradeActorsV11Common( return cid.Undef, xerrors.Errorf("failed to decode state root: %w", err) } - if stateRoot.Version != types.StateTreeVersion5 { + if stateRoot.Version != types.StateTreeVersion4 { return cid.Undef, xerrors.Errorf( - "expected state root version 4 for actors v10 upgrade, got %d", + "expected state root version 4 for actors v11 upgrade, got %d", stateRoot.Version, ) }