diff --git a/api/types.go b/api/types.go index 647e4048f6..22daca1dc4 100644 --- a/api/types.go +++ b/api/types.go @@ -193,7 +193,7 @@ type ForkUpgradeParams struct { UpgradePhoenixHeight abi.ChainEpoch UpgradeWaffleHeight abi.ChainEpoch UpgradeTuktukHeight abi.ChainEpoch - UpgradeXxHeight abi.ChainEpoch + UpgradeTeepHeight abi.ChainEpoch } // ChainExportConfig holds configuration for chain ranged exports. diff --git a/build/actors/v16.tar.zst b/build/actors/v16.tar.zst index b66a975dc3..4badc6def3 100644 Binary files a/build/actors/v16.tar.zst and b/build/actors/v16.tar.zst differ diff --git a/build/buildconstants/params_2k.go b/build/buildconstants/params_2k.go index b4d975a1de..30b2646037 100644 --- a/build/buildconstants/params_2k.go +++ b/build/buildconstants/params_2k.go @@ -73,7 +73,7 @@ var UpgradeWaffleHeight = abi.ChainEpoch(-26) var UpgradeTuktukHeight = abi.ChainEpoch(-27) -var UpgradeXxHeight = abi.ChainEpoch(200) +var UpgradeTeepHeight = abi.ChainEpoch(200) // FIP-0081: for the power actor state for pledge calculations. // UpgradeTuktukPowerRampDurationEpochs ends up in the power actor state after @@ -169,7 +169,7 @@ func init() { UpgradeWaffleHeight = getUpgradeHeight("LOTUS_WAFFLE_HEIGHT", UpgradeWaffleHeight) UpgradePhoenixHeight = getUpgradeHeight("LOTUS_PHOENIX_HEIGHT", UpgradePhoenixHeight) UpgradeTuktukHeight = getUpgradeHeight("LOTUS_TUKTUK_HEIGHT", UpgradeTuktukHeight) - UpgradeXxHeight = getUpgradeHeight("LOTUS_XX_HEIGHT", UpgradeXxHeight) + UpgradeTeepHeight = getUpgradeHeight("LOTUS_TEEP_HEIGHT", UpgradeTeepHeight) DrandSchedule = map[abi.ChainEpoch]DrandEnum{ 0: DrandQuicknet, diff --git a/build/buildconstants/params_butterfly.go b/build/buildconstants/params_butterfly.go index 98b4048a8d..44fa211140 100644 --- a/build/buildconstants/params_butterfly.go +++ b/build/buildconstants/params_butterfly.go @@ -18,7 +18,7 @@ var DrandSchedule = map[abi.ChainEpoch]DrandEnum{ 0: DrandQuicknet, } -const GenesisNetworkVersion = network.Version22 +const GenesisNetworkVersion = network.Version24 var NetworkBundle = "butterflynet" var ActorDebugging = false @@ -59,7 +59,7 @@ const UpgradeWaffleHeight = -27 const UpgradeTuktukHeight = -28 // ?????? -const UpgradeXxHeight = 999999999999999 +const UpgradeTeepHeight = 100 // FIP-0081: for the power actor state for pledge calculations. // UpgradeTuktukPowerRampDurationEpochs ends up in the power actor state after diff --git a/build/buildconstants/params_calibnet.go b/build/buildconstants/params_calibnet.go index 0e99b5a8e8..47d2eea8e9 100644 --- a/build/buildconstants/params_calibnet.go +++ b/build/buildconstants/params_calibnet.go @@ -102,8 +102,8 @@ const UpgradeWaffleHeight = 1779094 // 2024-10-23T13:30:00Z const UpgradeTuktukHeight = 2078794 -// ?????? -const UpgradeXxHeight = 999999999999999 +// 2024-12-16T23:00:00Z +const UpgradeTeepHeight = 2235454 // FIP-0081: for the power actor state for pledge calculations. // UpgradeTuktukPowerRampDurationEpochs ends up in the power actor state after diff --git a/build/buildconstants/params_interop.go b/build/buildconstants/params_interop.go index e992213c3d..2bbdb1c900 100644 --- a/build/buildconstants/params_interop.go +++ b/build/buildconstants/params_interop.go @@ -57,7 +57,7 @@ var UpgradePhoenixHeight = abi.ChainEpoch(-26) var UpgradeWaffleHeight = abi.ChainEpoch(-27) var UpgradeTuktukHeight = abi.ChainEpoch(-28) -const UpgradeXxHeight = 50 +const UpgradeTeepHeight = 50 // FIP-0081: for the power actor state for pledge calculations. // UpgradeTuktukPowerRampDurationEpochs ends up in the power actor state after diff --git a/build/buildconstants/params_mainnet.go b/build/buildconstants/params_mainnet.go index 941d100d59..5f0e0ea28c 100644 --- a/build/buildconstants/params_mainnet.go +++ b/build/buildconstants/params_mainnet.go @@ -114,7 +114,7 @@ const UpgradeWaffleHeight abi.ChainEpoch = 4154640 var UpgradeTuktukHeight abi.ChainEpoch = 4461240 // ?????? -var UpgradeXxHeight = abi.ChainEpoch(9999999999) +var UpgradeTeepHeight = abi.ChainEpoch(9999999999) // FIP-0081: for the power actor state for pledge calculations. // UpgradeTuktukPowerRampDurationEpochs ends up in the power actor state after @@ -149,8 +149,8 @@ func init() { } SetAddressNetwork(addrNetwork) - if os.Getenv("LOTUS_DISABLE_XX") == "1" { - UpgradeXxHeight = math.MaxInt64 - 1 + if os.Getenv("LOTUS_DISABLE_TEEP") == "1" { + UpgradeTeepHeight = math.MaxInt64 - 1 } // NOTE: DO NOT change this unless you REALLY know what you're doing. This is not consensus critical, however, diff --git a/build/buildconstants/params_testground.go b/build/buildconstants/params_testground.go index 7ab7599ff4..7e2b9d3121 100644 --- a/build/buildconstants/params_testground.go +++ b/build/buildconstants/params_testground.go @@ -107,7 +107,7 @@ var ( UpgradeCalibrationDragonFixHeight abi.ChainEpoch = -28 UpgradeWaffleHeight abi.ChainEpoch = -29 UpgradeTuktukHeight abi.ChainEpoch = -30 - UpgradeXxHeight abi.ChainEpoch = -31 + UpgradeTeepHeight abi.ChainEpoch = -31 UpgradeTuktukPowerRampDurationEpochs uint64 = 0 diff --git a/build/builtin_actors_gen.go b/build/builtin_actors_gen.go index 974dde1ddc..cd01d0f4ed 100644 --- a/build/builtin_actors_gen.go +++ b/build/builtin_actors_gen.go @@ -189,25 +189,25 @@ var EmbeddedBuiltinActorsMetadata = []*BuiltinActorsMetadata{{ }, { Network: "butterflynet", Version: 16, - BundleGitTag: "v16.0.0-dev", - ManifestCid: cid.MustParse("bafy2bzaced3uzaynkdi7wiqiwbje7l3lllpwbokuf7slak627gx7bk5pryjpa"), - Actors: map[string]cid.Cid{ - "account": cid.MustParse("bafk2bzacebyxmngiugdhhio7zn7i67jzsythgy3jqqbqyan735g2rkalufhr6"), - "cron": cid.MustParse("bafk2bzaceadysuxpaeqxwbzg7ksyl2olzizj4kgeq2b2oldlca4et55huauwo"), - "datacap": cid.MustParse("bafk2bzaceals5hcpbvzm24dmmoddqpr2tcpolwwey3qvjf3okzk7ihf75gngu"), - "eam": cid.MustParse("bafk2bzacec2gt4teegjdhbpfwl6qbxjojffxgkmzhua2m2a4lks52abnjyypw"), - "ethaccount": cid.MustParse("bafk2bzacec627lshgjxvfzjledk2wph4u7n47got2ultaijbh4v5wdyhjpxse"), - "evm": cid.MustParse("bafk2bzacebxlvhz665s2kbace6nzeqy5maasqixgirzn4xhbjx42xi2hkc5gk"), - "init": cid.MustParse("bafk2bzacebccioskxaudlyoydyy4yoswgfcffpadhbu6midk3edlhuzt3osu4"), - "multisig": cid.MustParse("bafk2bzacedcpbmiblrhh43kthgrkctrklh27jkvjcorzfreusd7fsjdw2llzq"), - "paymentchannel": cid.MustParse("bafk2bzaceaigyawy2ywyfdqjccfyi62xtn456gavqrwdilpltiqxbeo7zsjf4"), + BundleGitTag: "v16.0.0-rc1", + ManifestCid: cid.MustParse("bafy2bzaceb2sef5dqd24omllj7wolsoy4wruom5wgvjxho2c7wrymznwknnag"), + Actors: map[string]cid.Cid{ + "account": cid.MustParse("bafk2bzaceb6r4cgqw6bshgjbvoodkylcc2qwzutr7bfz7wjcez5gftdsurcoe"), + "cron": cid.MustParse("bafk2bzaceal5a73ltfegx2z7bymcmsv6cpvstmv7hhtehhwfukoq5jv4cgkra"), + "datacap": cid.MustParse("bafk2bzacedrzzej65j2frhywc2pvdxffm2rjqkqz3m7ini4emwj3h5ya2w4nm"), + "eam": cid.MustParse("bafk2bzacecl7lyqmifaml3k3cxrwn6zvklul44tfxshogflzpgtknmjdsx2yg"), + "ethaccount": cid.MustParse("bafk2bzaced7vjluo44pvl4wkzcpwjfkx3lvphfpoydpv3vo4bujeg47apside"), + "evm": cid.MustParse("bafk2bzacea4fjai6ier4rjid7hebzf5yyotpnrvibcy7c66fljskffhgmoh56"), + "init": cid.MustParse("bafk2bzaceadmv6zqn2hoelmkftwyezthyhl67pmuo3rflrzdokzhevnrezjma"), + "multisig": cid.MustParse("bafk2bzacedzr27rgj7lfo3z4yfjx4fqhfaotjl2v2gmnm5olxtg2gfpy7ckmg"), + "paymentchannel": cid.MustParse("bafk2bzacedcfjumckwrymqy4zzxbo5us3vqq6mfyvbh2jsto7hdikkoq5qkls"), "placeholder": cid.MustParse("bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"), - "reward": cid.MustParse("bafk2bzaceagt6mvup6z3atlaftepdex6f45ncml57zsuxy5puwtzcge5vy4wm"), - "storagemarket": cid.MustParse("bafk2bzacedb6p35ax2s2muxvgir73vmdkbxn7uc5aw6n64dewb32drqils5zq"), - "storageminer": cid.MustParse("bafk2bzacedz6zjhfuyexwdco7zmpkypjzllk5v2sv4kdoz4gfqdzxuyq5uz5u"), - "storagepower": cid.MustParse("bafk2bzaceauwj75apfux75zz4owkcjeggu4cp2ldn7weoxakzb5zsz55kthbe"), - "system": cid.MustParse("bafk2bzacebzc4fklfws2ri4jv6mcu4xgs52ve3gqzgm476hkohfahj7s5lig2"), - "verifiedregistry": cid.MustParse("bafk2bzaceasoa42xnnbu2uftlfvlzhbok3q3nqetv6bxcw7vydbxbmwn53ad6"), + "reward": cid.MustParse("bafk2bzacecxspzoypnz2cxqzghiplf6aaeff4cpfyh63iysccvpf7bpjajlk6"), + "storagemarket": cid.MustParse("bafk2bzacealk2e2aygrnsx7pkp7ptdhmb5uo7ynoovp5ocaewauksnd4ujjko"), + "storageminer": cid.MustParse("bafk2bzacebmvsft5tujepbnf3ynabbswd6nyr3duyieywlgybpswclppusice"), + "storagepower": cid.MustParse("bafk2bzaceduvn2h6ij4wiglq7alcipdnhzm2rw5ezfct3r6ysnj7dj4nfqwgs"), + "system": cid.MustParse("bafk2bzaceaprc5x33s4n6pvdqpczpek3mph7ulkehqd5zp47ve4xtetr7n7ae"), + "verifiedregistry": cid.MustParse("bafk2bzacecspvdjl7dkrelltmjjy244ealajchnl5uiz5vg5k4gbff5q7bzzk"), }, }, { Network: "calibrationnet", @@ -387,25 +387,25 @@ var EmbeddedBuiltinActorsMetadata = []*BuiltinActorsMetadata{{ }, { Network: "calibrationnet", Version: 16, - BundleGitTag: "v16.0.0-dev", - ManifestCid: cid.MustParse("bafy2bzacebh7i5gvoegxwyzspvmgknftl4ir3btwuiyv64vhaseohwtexcg6m"), - Actors: map[string]cid.Cid{ - "account": cid.MustParse("bafk2bzaceatwumprigth5bbcn6vy5ytyrge3qxzgkyx3lj4bdqs7cfvmztr2q"), - "cron": cid.MustParse("bafk2bzacecjmqgxmexpxrwdkcwejevgfbbtbuuefbexido2decgnx4zlgdxyq"), - "datacap": cid.MustParse("bafk2bzaceb2stxhcbp74p7sjs22ka2mkbksvoyq66osqkg3arisrup6yuwrjm"), - "eam": cid.MustParse("bafk2bzacebjebpk2drkenqtbcucltdlegcghjyf7x2hkfb2jjgpxbzkzftopw"), - "ethaccount": cid.MustParse("bafk2bzacecwoutls2al5detss46mfq3es5min7jexpfmouciw4ppc43zvffpk"), - "evm": cid.MustParse("bafk2bzacecxeq3h6xottxhu4654qjmj5a256jnybsca7bty6d3mn6ctblngug"), - "init": cid.MustParse("bafk2bzaceaqjilazwqeuo45klyq5gu2szbaiww6v7kpree4nnjkabxplmwj2c"), - "multisig": cid.MustParse("bafk2bzacealoxkhmsyzkqsyvypkdtfufbhbmf65xmlgcruqi2lcv2xx3sdh4q"), - "paymentchannel": cid.MustParse("bafk2bzacebdegahgquxnd6hyz7tbldnzhrjdg7467nttueb4z35iutrlqazmm"), + BundleGitTag: "v16.0.0-rc1", + ManifestCid: cid.MustParse("bafy2bzacecnhy2ffkabgzkvbjh26ne7ssi6w4ze5wivs5xvblzjeoolwt7cik"), + Actors: map[string]cid.Cid{ + "account": cid.MustParse("bafk2bzacebhtin3dmygqrknd4lklq54acuty6xzkmk6ns3xbu64bgbudhjg7q"), + "cron": cid.MustParse("bafk2bzacebyatbqsjismirnvq3xrnukkt6nxbrvpbn6nqlcjjrqvoi5kta4po"), + "datacap": cid.MustParse("bafk2bzacecrkvyfc7u4ugyduc452jym5jh3tsdouyni4lrk7hjbo27fbdwuuc"), + "eam": cid.MustParse("bafk2bzacecqrk6orfccd6aqcm3y5edtffy6psrb7pfz55bhf767bicokmogz2"), + "ethaccount": cid.MustParse("bafk2bzaceauk66kcd33z3fxg5od2mcugtfimpfkzbcl5yuypboapcbclzqodu"), + "evm": cid.MustParse("bafk2bzacedznjpmamqff5h3soivlqtcsjftgpuek3sbkhnxma2fkkvvsm2onw"), + "init": cid.MustParse("bafk2bzaceapbix6qtxgy7uqeufs2sgpkbrvh24f2d25k35ijaibte5vv7v22w"), + "multisig": cid.MustParse("bafk2bzacebt4uhg46auji5hqtabmtcxb2pryex4dgcf66w7asdnzm24kc3xak"), + "paymentchannel": cid.MustParse("bafk2bzacecofzu4t4jgda6uzg4hnla432egslx4o5lw6deytee66ddpkyh3w2"), "placeholder": cid.MustParse("bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"), - "reward": cid.MustParse("bafk2bzacebddofzdmgjscwmmiel5wl4he5palruwj3utouzxuplich4ojqgd4"), - "storagemarket": cid.MustParse("bafk2bzacedwijadxoy54lerxzt6m5m7th6vdp7xeam3mje2zronqajzuldsfg"), - "storageminer": cid.MustParse("bafk2bzaceczbni3malpmgt5nxy2baq6s5lhf22swtwuf7ow43hstiocobyub6"), - "storagepower": cid.MustParse("bafk2bzacebflvznhrbie332q47jqoa33xjxnwfwxsqh25eno3xandfvcf5klm"), - "system": cid.MustParse("bafk2bzacedt2gdtxqwaysoxyrvvnsmfgkewsygntdzjrxp5rmethkhwjhelso"), - "verifiedregistry": cid.MustParse("bafk2bzacebdjvzfbpjuirjeyezf6pwznkx7diclrbfzcwwlrhbkufr3iqbboq"), + "reward": cid.MustParse("bafk2bzacebvl5mzxtqrzavh7nigwiuuarsrht5c6q566ilw4azzbl7sthqj7o"), + "storagemarket": cid.MustParse("bafk2bzaceclswjt5oxdwtrchrmlz3p4jo5i7wpv3j5rmosdvizafdwctuvox2"), + "storageminer": cid.MustParse("bafk2bzacec52wt3anzm2rzfk6kzgdxgaooa2p26fbslgmexxmgnyefiou774g"), + "storagepower": cid.MustParse("bafk2bzaceakvmhul2njhpbqlegop4nid64h37opx47jjxqwdoqsxo7zbo4qjs"), + "system": cid.MustParse("bafk2bzacebzreyva3m7svmdk7rvrg2e2kgomhhjhlgohdqhghyefanst4q2xi"), + "verifiedregistry": cid.MustParse("bafk2bzaceavjhcx4kn7h4pjkydih7al2rrzpw3vatp4qnrmydmp56epsem76i"), }, }, { Network: "caterpillarnet", @@ -594,25 +594,25 @@ var EmbeddedBuiltinActorsMetadata = []*BuiltinActorsMetadata{{ }, { Network: "caterpillarnet", Version: 16, - BundleGitTag: "v16.0.0-dev", - ManifestCid: cid.MustParse("bafy2bzacecdti6tpb76ug5w7vblyehxfsgkjz2tgqooo6yuvo5ikh6zr65qvm"), - Actors: map[string]cid.Cid{ - "account": cid.MustParse("bafk2bzaceanwvt567afbpqabvqasvmx5w3qw4byfh4mf4yryw5fdu4iqbzbpw"), - "cron": cid.MustParse("bafk2bzacec6te3psfw3gl2qq4mxayrrq5wthqthe4cxeaq52lsplsy3txfkjs"), - "datacap": cid.MustParse("bafk2bzacecgo3bnkqrjdacf7ok5f3supwwsor3sdtfozpkj5nf4l7ubtzajt6"), - "eam": cid.MustParse("bafk2bzaceb5sxl73vhuaahivz73r4xgika6xyqepwk5nxs73a37ijsgaklt6k"), - "ethaccount": cid.MustParse("bafk2bzacecoidhamnkgh6vasogbjrrssr4tdf73qaqh7kldod3fyz7kuheei2"), - "evm": cid.MustParse("bafk2bzacedgzkz7ctd5z4waltengv5fccrhovtocbu3g2amsk2nnrvx7njv2m"), - "init": cid.MustParse("bafk2bzacebwwyn3zvv45k5opdscn7wnknjjik6waznmqc6fzzltpt3p4fwlbk"), - "multisig": cid.MustParse("bafk2bzacecbsxn7i2xzd4uql4kld25hywn3qhc5622x5r4wwftdsgv3gqr5xw"), - "paymentchannel": cid.MustParse("bafk2bzaced3xnghkg3knzc2i7h66mxpqpxsblrrfbdqdef4hiqs5kbvuo4cpk"), + BundleGitTag: "v16.0.0-rc1", + ManifestCid: cid.MustParse("bafy2bzaced4e64mrxqrkp3xnxd3ckpxcbzsneylvrtghyw7ewsc4r43sukvbi"), + Actors: map[string]cid.Cid{ + "account": cid.MustParse("bafk2bzacecnox6g2u4zsd7e3jvfjvkixzhkdkeigplsy5rhvunxqsiifzhhba"), + "cron": cid.MustParse("bafk2bzacebp22of6erhezlfw65kcqrarfjqm33m2qg2uvkmkoxbmeffols5li"), + "datacap": cid.MustParse("bafk2bzaced4sds53wixkyqqgg7zqzgksbfy35gyawnsxqhkmtvvmesaeurekq"), + "eam": cid.MustParse("bafk2bzacecayln3yll7gyfdj3gwxsogyvbweaax7qjgktvcskvy7jhbm3x4jk"), + "ethaccount": cid.MustParse("bafk2bzacebrf53cpa3jwuql6ihugkttmn3wmijmyoi3v2hcq3l5ew5ufsgxtq"), + "evm": cid.MustParse("bafk2bzaceada4qpywxzfn6vnh6klrtvsqnxjxffecnxflloanekxb7smestha"), + "init": cid.MustParse("bafk2bzaceamqrupb2jmi37tbkwj63xxjhqpuas5vqi7o3aco6pw2pu3jyid4i"), + "multisig": cid.MustParse("bafk2bzacebkedbffj6nt544xyq6d6ikmgk7evm7otngg3ut5zqc3uunatjhd6"), + "paymentchannel": cid.MustParse("bafk2bzaceb4tkjn3jokovcjumwqdihk6t76hnmkjbkyv7zrlqboudgbyonjgs"), "placeholder": cid.MustParse("bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"), - "reward": cid.MustParse("bafk2bzaceb6nwuzi5fqbbuj7cgsaph56axlo4ujw5gqpgko5m2eolsc536tjw"), - "storagemarket": cid.MustParse("bafk2bzaceb54jk7qfvmullrmbflblofog3hu7xqrnqawchusrkfdvuj5rfj2y"), - "storageminer": cid.MustParse("bafk2bzacebzu4zf5mpmskwbz3kjspqqfnlecfrjgu7orjl5wl3be54uman4wg"), - "storagepower": cid.MustParse("bafk2bzacec63ubs356nbr35phmjvxrdbvly27jcj2gzi6lrimler3wddt6pqo"), - "system": cid.MustParse("bafk2bzacec4zno5lovepjwksdvtvt4v5n7jjm2ve6gp2ojhdvmb7fdhba3x7m"), - "verifiedregistry": cid.MustParse("bafk2bzaceaa2b2yfitq4eexoekyk4ubhnz6qlr7j7qxzrs4o2kbp4s6wva5dc"), + "reward": cid.MustParse("bafk2bzacea4funi4emb6bmtknfzcfeezyozcyftus54wmxsyptxx2e6cttk44"), + "storagemarket": cid.MustParse("bafk2bzaceb5ffkgskw6pyy6h6trpdmu3tlbxlmtozksbt5hca462qrpoyxf2s"), + "storageminer": cid.MustParse("bafk2bzacecsskrrpzzgimek2qoup3is6yu4rsgrlkecgrcqtrorytrvfdoptg"), + "storagepower": cid.MustParse("bafk2bzaceddx3mc3iy4snyimyy6f5vt3vhn6s2ycu3qemhzby2xc6okkniofe"), + "system": cid.MustParse("bafk2bzacecm5kggtlgmqaftx5lkzbfigshza5p3dthqhsrvwmxhdp5hxiikgw"), + "verifiedregistry": cid.MustParse("bafk2bzaceckvlmmqmwz7cgv2fdsmkpi3ycpdxmz6aqwthpbdtt2dq5mllnoog"), }, }, { Network: "devnet", @@ -792,25 +792,25 @@ var EmbeddedBuiltinActorsMetadata = []*BuiltinActorsMetadata{{ }, { Network: "devnet", Version: 16, - BundleGitTag: "v16.0.0-dev", - ManifestCid: cid.MustParse("bafy2bzacedjdkbd5y7ys6gkdcq2np5yx7lmm27zx226fryfzol5idza3g4fe6"), - Actors: map[string]cid.Cid{ - "account": cid.MustParse("bafk2bzaceb25djkqzfcg6uhuwro5awb7zchic5oquuzqkapscbm27zpf6yfqg"), - "cron": cid.MustParse("bafk2bzacedecf6nygqy3fgil7vd6oiph5yzq2veqiqweu6vdagvy726c6jcog"), - "datacap": cid.MustParse("bafk2bzacechq2zpdmegbgpkrorv4bdtuf72nuxnxgvgvpik7cw2eyepnm3bjq"), - "eam": cid.MustParse("bafk2bzaced537mxvvkh7aasjl5upefutkpjrwdmlbqvhtljnmfdjjex4dvr6m"), - "ethaccount": cid.MustParse("bafk2bzacebwquy73akrgy6zqrqquwdzlrn6rk57ar2avunytidqromutdtyxc"), - "evm": cid.MustParse("bafk2bzacedwfrceu3towxofflolf7wv573q3nawro3wtfcprevcf36usixdxo"), - "init": cid.MustParse("bafk2bzaceabsgb37hchqtvjgagi7kndwaa5dvzfymfwzqnevauzgsbqxgm6ay"), - "multisig": cid.MustParse("bafk2bzacednkhtma2jkribgeuuv4j6kxznef6at42ayeor7czxplgznuooazu"), - "paymentchannel": cid.MustParse("bafk2bzacebhti5qtofmblmmkph7rnsrmfpi4c335x5c4h7n2pim3f5ttvyh2a"), + BundleGitTag: "v16.0.0-rc1", + ManifestCid: cid.MustParse("bafy2bzacec6sjrvu2umrtdt7zcmdg3s4asxdwe5lssbty73qda2qas5aeoit2"), + Actors: map[string]cid.Cid{ + "account": cid.MustParse("bafk2bzaced2rd2qlkhm53dhkzrrfnn3noojni5u5i65gtnzthab63rvwojfvi"), + "cron": cid.MustParse("bafk2bzaceccvueu6agbrm2p7jhv2yrx53kk6pgxbb4d5pryjl37gjc6vavo52"), + "datacap": cid.MustParse("bafk2bzacebbyirtv473zmsrdaindtjtkztfyij573ok4tq77iu3sqqmwptib2"), + "eam": cid.MustParse("bafk2bzaceawnymnqomdey5jhulqwbarfm75pq7sdx7pth2bdef362n4zwp3la"), + "ethaccount": cid.MustParse("bafk2bzaceaghwzlxj6u6n5iz7ms5tqa7yfnvkdpaqvoz3aolqsmlaf3ehoo3u"), + "evm": cid.MustParse("bafk2bzacebbujuvpj2hg4qihi5z2zx3625gnfay5ilbwjflrrw66uya7bpm34"), + "init": cid.MustParse("bafk2bzaceaai3wofftjuomfj2bjdeyjr2bnb44kuad374oxdsqa6xlxjndycg"), + "multisig": cid.MustParse("bafk2bzacecxfxse6sdbinuzktgdi2yf7kbqnfymq3ud7uhbpf6hz34boimaky"), + "paymentchannel": cid.MustParse("bafk2bzacebbc35dhiy4o6q7o475qtdavvcy22x2okc7tzdi63d2zdxqqfxpoi"), "placeholder": cid.MustParse("bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"), - "reward": cid.MustParse("bafk2bzacedkd5zyp6lzzanuueelo4bgqblyh64seriobtylmivd4xdge53kkk"), - "storagemarket": cid.MustParse("bafk2bzacedijbo6jlktdvo5uful2nubekc2npgy37taqdnfgkhq4ok4kzte6y"), - "storageminer": cid.MustParse("bafk2bzacec6lajrwzaj3v7jku3vceowed3ja53nuyxppw2brhki3kpwbixr5a"), - "storagepower": cid.MustParse("bafk2bzacecclz2t6rbrmkz2w2rbktax3eieek5uj5u3bimrtt77m3saskn6ay"), - "system": cid.MustParse("bafk2bzacebcjjasu4vws6wqm4uupv7d6pnbuw2ouykwyhfgsrlbis6qfo5qxs"), - "verifiedregistry": cid.MustParse("bafk2bzaced6anmgt2l53v3ssj7fygbyhrjb5cysk4n5pzhr632wfveityua3s"), + "reward": cid.MustParse("bafk2bzacedmlvtkvxxwooaobiwn4uavxyz3zkfpfrj53t33ir3kssvarl4cek"), + "storagemarket": cid.MustParse("bafk2bzacecpnx5ggnegnis3cckhxwl47eckrdv7wfqt2vuw2rpjhxcvlmeimu"), + "storageminer": cid.MustParse("bafk2bzaceaelw3s5kdnlpddhyalmp2nb4kiattgg7za3jd7bun4oe6kal2upq"), + "storagepower": cid.MustParse("bafk2bzacebyiwuy72ibw4wljlc2css7nciouhg5nwn4sgsbodvhhrfu2vmcwo"), + "system": cid.MustParse("bafk2bzaceaid6on264ysr4vpmozxzs2i4nqtntqk3skflu2cbbhwfbpqjem72"), + "verifiedregistry": cid.MustParse("bafk2bzaceabaxub3cj3oa266yiu54tezdhk6myfsuwcrlcip5cxsp64p6julu"), }, }, { Network: "hyperspace", @@ -1013,25 +1013,25 @@ var EmbeddedBuiltinActorsMetadata = []*BuiltinActorsMetadata{{ }, { Network: "mainnet", Version: 16, - BundleGitTag: "v16.0.0-dev", - ManifestCid: cid.MustParse("bafy2bzacedfj2j7fgdbrm7u7pbm2yzpwjn3hzk7wnzde2nkrvdboodpeouwue"), - Actors: map[string]cid.Cid{ - "account": cid.MustParse("bafk2bzaceaz6eeol3n4njfxskf5q4io6jabxgulrvbfbef7akov3hgeeka2xw"), - "cron": cid.MustParse("bafk2bzacedegczjbggvv7cmutlp3pusszkwkqbqpq66n4ltx3wzftqdzbv2ei"), - "datacap": cid.MustParse("bafk2bzaced4b37bpfwjtgnom45454daa2unsnobvoxpgrnzb2jm7p7bue4uhu"), - "eam": cid.MustParse("bafk2bzacedrgwk3r57cqalx3qnngtnm3tueibermsyz7rroi4nizucqzrwhks"), - "ethaccount": cid.MustParse("bafk2bzacedrfzfvvlctfk2tfexdh6ews5v5rgz3ox33kjiegnm5ipypoeg2qu"), - "evm": cid.MustParse("bafk2bzacedzbd34vnaklfhnouzcbm2tzsqelaxpgfu6utnlyjcgreiwavyf36"), - "init": cid.MustParse("bafk2bzacedurelawfasapepkl55hp235wqivmbikik5ooxsbz2tgav3w6vzqu"), - "multisig": cid.MustParse("bafk2bzacec3owvbgt3uppz3spvvkammdfa2nlircssqshoxbxqidd7y2fdp32"), - "paymentchannel": cid.MustParse("bafk2bzacea6cqt2watc2qz7m52bukorycawmerwbnfo6xldg5rrjado2k7uxy"), + BundleGitTag: "v16.0.0-rc1", + ManifestCid: cid.MustParse("bafy2bzacedb5sfhrzpd6joitui6wfyjhnfmmojyvlhlmpkhlrhkrh3tmwwb5e"), + Actors: map[string]cid.Cid{ + "account": cid.MustParse("bafk2bzacebnxdnkdfl7sabglj7kudj6vnqx5rqw2cypumn5ofsyihmb2jdaxy"), + "cron": cid.MustParse("bafk2bzaceap75z4o4buakrybsurk6eqgulmbk7awym33v44cntblffcgi66n6"), + "datacap": cid.MustParse("bafk2bzacedo5gtlepdf4il6re3cykxbvixrvn4q3nsxr3tqpsh3r23fox5lye"), + "eam": cid.MustParse("bafk2bzacedgqybqpjravyypo5n3kb7wwzis4sn6b6mn6y3pz5ebhb5yiefj5k"), + "ethaccount": cid.MustParse("bafk2bzaceckibrqw2o3s2gplxhlnfsaissuwjowzu65wdwyfey4d56mkjcjoi"), + "evm": cid.MustParse("bafk2bzacebz5hfooddihwzzguz7df7u3ciyfdeta5ezdeney772emnjsowroo"), + "init": cid.MustParse("bafk2bzacecmcb3sskaon6ns5ylq2wxthywh7zelbmzymsqtv45vo5l74ywry2"), + "multisig": cid.MustParse("bafk2bzacebqbnin552searxpadxu3xho73xxhmzxu36ssaee2jzt6vwwif66a"), + "paymentchannel": cid.MustParse("bafk2bzacebn372vrci26tamd2zla6bf6aai2t5wuthvh3uo6fbfjabqal2j7m"), "placeholder": cid.MustParse("bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"), - "reward": cid.MustParse("bafk2bzacecv7otv25xsbc7eirrpmy4kh4geozlnj2gsgfkhbkkjc6rnhvhnho"), - "storagemarket": cid.MustParse("bafk2bzacebbe4qkwitqquc42nodt6wxiu65ejtioa533n6pvtxw7mb2jsfybs"), - "storageminer": cid.MustParse("bafk2bzacebtstll6eexhn7ohk45d43phcxsixmx4jgmss6dmhro4sygswissa"), - "storagepower": cid.MustParse("bafk2bzacedm6xf4facweae4e3xiwqfntqx5y7a643pj6gui3dqf6pmvnu3qqw"), - "system": cid.MustParse("bafk2bzacedid2oljyljpj36xril3o4ncloz6kw55spxdukm2kmik3o3wamfdk"), - "verifiedregistry": cid.MustParse("bafk2bzaceceejhhze5tczfdjjnxugc4wian2mpma34th2wupgbx5gtdvet2vy"), + "reward": cid.MustParse("bafk2bzacebce4sfozugmmfucvkmflyvibh7q7cjsnpgekxzogptece5c62brs"), + "storagemarket": cid.MustParse("bafk2bzaceanbda65evztvk4ctgbgvauw7x23eabsig3velz7gzihsncvjxq3y"), + "storageminer": cid.MustParse("bafk2bzacea3xgmz5jyffofu4acixumrv2uup5qyirnirwqrp55lgpsjmtkhf4"), + "storagepower": cid.MustParse("bafk2bzacea7p7vaqqcwuhw2cx7aytutzqfu6nir3w225b5epku6ypaumpfcr6"), + "system": cid.MustParse("bafk2bzacebqdpnpaeob72oxyueufi5ar4iosyfuxmnceig2mpitwgh3vdzsm4"), + "verifiedregistry": cid.MustParse("bafk2bzacebw42q6ybguxtyyth76opu62esu2fjlafktk3vub7ngdxbgntm64s"), }, }, { Network: "testing", @@ -1211,25 +1211,25 @@ var EmbeddedBuiltinActorsMetadata = []*BuiltinActorsMetadata{{ }, { Network: "testing", Version: 16, - BundleGitTag: "v16.0.0-dev", - ManifestCid: cid.MustParse("bafy2bzacecezrtcotnsfdxkzlfsgyg5cdt66k22ycwh2r5rkg2fawsghvoq44"), - Actors: map[string]cid.Cid{ - "account": cid.MustParse("bafk2bzacec5zdrowdsp64jwehsi2rqhkmmzxyukyve3xjtuoq75rfccntmixi"), - "cron": cid.MustParse("bafk2bzacecsd23riny7ivwqvn7wzwow6ox3tdnp2lncjaayvh27fvz3vwkf7e"), - "datacap": cid.MustParse("bafk2bzacedbq3mpk3rewphfo45qlq4dzjmk7atz64r4zs524hgxjrhxwhlgt4"), - "eam": cid.MustParse("bafk2bzaceazf3iilj3wtvxiqjjscmo35izscnmhl7qx5lhkybfethyl4oi7ss"), - "ethaccount": cid.MustParse("bafk2bzaceaqmced2x4jle7uibucz3ap7ft3nk2t3onmzyykscxge77sgp6v26"), - "evm": cid.MustParse("bafk2bzacebwkxkvhitw5dhniuciv62atu2kpyhuodclyzk4tkftrzkaghorxs"), - "init": cid.MustParse("bafk2bzacebg4jaqmjkkr4ibmabowvvsr2slwalxocxs734p6n5rxpllid7f6u"), - "multisig": cid.MustParse("bafk2bzacebufr5gqpc3xochbzpn3yqra7sfeh3inchnh3en2xfg56yk4gdcoq"), - "paymentchannel": cid.MustParse("bafk2bzacedftjqnpzbfb4gxbc7s2znagy75njvxak4j5srmehqiub2jl53b3e"), + BundleGitTag: "v16.0.0-rc1", + ManifestCid: cid.MustParse("bafy2bzaceb4dj3xjtkvqqvmyiktwbme4j5elamg4hhkhs45mgz6fljpbwl7ua"), + Actors: map[string]cid.Cid{ + "account": cid.MustParse("bafk2bzaceb5qmjv47xb6voiumm75u2f77peavaseipgibd44hvhla4pf3vsbo"), + "cron": cid.MustParse("bafk2bzacec6rpmoek5heiuc47ajw2c26zupuhgvyqllivgxugwuxg6voubx6i"), + "datacap": cid.MustParse("bafk2bzacec52hypnxrggpgbx3ldei7m4u7xpqajrrkxk6eysovaydnqdnziga"), + "eam": cid.MustParse("bafk2bzacedqlavbjwirjqvi2ov52nzz2iburriq3mbq2lm5uvw2bjbvjbmuog"), + "ethaccount": cid.MustParse("bafk2bzaceapp3grhk624a5piaaex7hazbe4o5h7bpz35hhrg3s7cpyje4aaio"), + "evm": cid.MustParse("bafk2bzaceboodgpa6xwmyyk7as5izslbdhx5xvsqol65k4e65ird3a7y4acmi"), + "init": cid.MustParse("bafk2bzacecdhamabghqrtpbp4l4iyqloyf6truuot25lzkbcag5oh6zxcpnkm"), + "multisig": cid.MustParse("bafk2bzaceaf73miahtsdbjbbwpxq4ledsle2y274g3fkhhggutjikdhqrrdd6"), + "paymentchannel": cid.MustParse("bafk2bzacedup25gcm3x3ksoinmu2ixszqayfg3htpt4pm3lfxwinhmlm6prby"), "placeholder": cid.MustParse("bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"), - "reward": cid.MustParse("bafk2bzaceb3qwr3jr2pssxon4r6tfwcmxbtrasgqoj4avrhgzkn6vzj2m4pbo"), - "storagemarket": cid.MustParse("bafk2bzacecdvxp5xluzpwatptcah4iesqoafvh4pk3z4xlsikxyea4og5q4i2"), - "storageminer": cid.MustParse("bafk2bzaceao5kplt7x43lpf7eg6cdd7hg4kmkyzh3rbuvj4o6ljf2fvyl55ju"), - "storagepower": cid.MustParse("bafk2bzacecyaz6yzrbhkv5pixj4lzpw72wjpxazu6ywvuijotklhsdzqx75rc"), - "system": cid.MustParse("bafk2bzacecvosmtr6hlhjk6jnzqvxjfhwlauallnxbulodcpadbgb3vjdgj2c"), - "verifiedregistry": cid.MustParse("bafk2bzacebbxt3yls3m7aw2gstueojaied7y4kgs3nmj5rropyhpp3zokdpu6"), + "reward": cid.MustParse("bafk2bzacebrngpymy5v6xj6mzkpcjct7t4oafdoeswrc7pl3xnmp2o6vc6hg4"), + "storagemarket": cid.MustParse("bafk2bzaced7gq7fn7jlybjjzyljlid7ntwtwbasqhfjqhcakivaa5h3d6243k"), + "storageminer": cid.MustParse("bafk2bzaceba7gbwaack3srzgvg3qplb6qhxohnwdcy55awza45ctjsiulf7tq"), + "storagepower": cid.MustParse("bafk2bzacedc7d7ar66pg7tkiaa6luv5jujf5wnmiv5ujts3u5daudtass4heu"), + "system": cid.MustParse("bafk2bzaceazqpygoyd6az65e5gdopwgc3eas7nz5qrxmegcsxvxrq4nyule64"), + "verifiedregistry": cid.MustParse("bafk2bzacebzmntlqv6hyzguur37rt6ercqrymgma7qzariudnogqow2vp6m7w"), }, }, { Network: "testing-fake-proofs", @@ -1409,24 +1409,24 @@ var EmbeddedBuiltinActorsMetadata = []*BuiltinActorsMetadata{{ }, { Network: "testing-fake-proofs", Version: 16, - BundleGitTag: "v16.0.0-dev", - ManifestCid: cid.MustParse("bafy2bzacecdh7jiohvl4fv7e65bw5vqn4plzpdff6yylzuusg6rpcnrebhplq"), - Actors: map[string]cid.Cid{ - "account": cid.MustParse("bafk2bzacec5zdrowdsp64jwehsi2rqhkmmzxyukyve3xjtuoq75rfccntmixi"), - "cron": cid.MustParse("bafk2bzacecsd23riny7ivwqvn7wzwow6ox3tdnp2lncjaayvh27fvz3vwkf7e"), - "datacap": cid.MustParse("bafk2bzacedbq3mpk3rewphfo45qlq4dzjmk7atz64r4zs524hgxjrhxwhlgt4"), - "eam": cid.MustParse("bafk2bzaceazf3iilj3wtvxiqjjscmo35izscnmhl7qx5lhkybfethyl4oi7ss"), - "ethaccount": cid.MustParse("bafk2bzaceaqmced2x4jle7uibucz3ap7ft3nk2t3onmzyykscxge77sgp6v26"), - "evm": cid.MustParse("bafk2bzacebwkxkvhitw5dhniuciv62atu2kpyhuodclyzk4tkftrzkaghorxs"), - "init": cid.MustParse("bafk2bzacebg4jaqmjkkr4ibmabowvvsr2slwalxocxs734p6n5rxpllid7f6u"), - "multisig": cid.MustParse("bafk2bzacebur7w2pt5rowdfqurfrwrs5a7ermfw2bog223wwbp5kjipto5c5c"), - "paymentchannel": cid.MustParse("bafk2bzacedftjqnpzbfb4gxbc7s2znagy75njvxak4j5srmehqiub2jl53b3e"), + BundleGitTag: "v16.0.0-rc1", + ManifestCid: cid.MustParse("bafy2bzaced3bpqm322vi242vuxzhdb6tcchlaxudw2xhg6jczd5ksalz7dclq"), + Actors: map[string]cid.Cid{ + "account": cid.MustParse("bafk2bzaceb5qmjv47xb6voiumm75u2f77peavaseipgibd44hvhla4pf3vsbo"), + "cron": cid.MustParse("bafk2bzacec6rpmoek5heiuc47ajw2c26zupuhgvyqllivgxugwuxg6voubx6i"), + "datacap": cid.MustParse("bafk2bzacec52hypnxrggpgbx3ldei7m4u7xpqajrrkxk6eysovaydnqdnziga"), + "eam": cid.MustParse("bafk2bzacedqlavbjwirjqvi2ov52nzz2iburriq3mbq2lm5uvw2bjbvjbmuog"), + "ethaccount": cid.MustParse("bafk2bzaceapp3grhk624a5piaaex7hazbe4o5h7bpz35hhrg3s7cpyje4aaio"), + "evm": cid.MustParse("bafk2bzaceboodgpa6xwmyyk7as5izslbdhx5xvsqol65k4e65ird3a7y4acmi"), + "init": cid.MustParse("bafk2bzacecdhamabghqrtpbp4l4iyqloyf6truuot25lzkbcag5oh6zxcpnkm"), + "multisig": cid.MustParse("bafk2bzaceb22qtb77spai4lmkaxkvwugpg2wanp35dxzlnbiva3jty44ec4hi"), + "paymentchannel": cid.MustParse("bafk2bzacedup25gcm3x3ksoinmu2ixszqayfg3htpt4pm3lfxwinhmlm6prby"), "placeholder": cid.MustParse("bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"), - "reward": cid.MustParse("bafk2bzaceb3qwr3jr2pssxon4r6tfwcmxbtrasgqoj4avrhgzkn6vzj2m4pbo"), - "storagemarket": cid.MustParse("bafk2bzacecdvxp5xluzpwatptcah4iesqoafvh4pk3z4xlsikxyea4og5q4i2"), - "storageminer": cid.MustParse("bafk2bzaceclqnndkefpiorjlcvavxcqbmjfjw5eatvoew4h2wljs2rnlc646a"), - "storagepower": cid.MustParse("bafk2bzacecyaz6yzrbhkv5pixj4lzpw72wjpxazu6ywvuijotklhsdzqx75rc"), - "system": cid.MustParse("bafk2bzacecvosmtr6hlhjk6jnzqvxjfhwlauallnxbulodcpadbgb3vjdgj2c"), - "verifiedregistry": cid.MustParse("bafk2bzacebbxt3yls3m7aw2gstueojaied7y4kgs3nmj5rropyhpp3zokdpu6"), + "reward": cid.MustParse("bafk2bzacebrngpymy5v6xj6mzkpcjct7t4oafdoeswrc7pl3xnmp2o6vc6hg4"), + "storagemarket": cid.MustParse("bafk2bzaced7gq7fn7jlybjjzyljlid7ntwtwbasqhfjqhcakivaa5h3d6243k"), + "storageminer": cid.MustParse("bafk2bzacedsa2saihoa3ehfwpqba6bhzjpmv3xudfocneoffzjcncjwcvama4"), + "storagepower": cid.MustParse("bafk2bzacedc7d7ar66pg7tkiaa6luv5jujf5wnmiv5ujts3u5daudtass4heu"), + "system": cid.MustParse("bafk2bzaceazqpygoyd6az65e5gdopwgc3eas7nz5qrxmegcsxvxrq4nyule64"), + "verifiedregistry": cid.MustParse("bafk2bzacebzmntlqv6hyzguur37rt6ercqrymgma7qzariudnogqow2vp6m7w"), }, }} diff --git a/build/openrpc/full.json b/build/openrpc/full.json index 1dcaf298e8..3cceadcc53 100644 --- a/build/openrpc/full.json +++ b/build/openrpc/full.json @@ -19907,7 +19907,7 @@ "UpgradePhoenixHeight": 10101, "UpgradeWaffleHeight": 10101, "UpgradeTuktukHeight": 10101, - "UpgradeXxHeight": 10101 + "UpgradeTeepHeight": 10101 }, "Eip155ChainID": 123 } @@ -20021,6 +20021,10 @@ "title": "number", "type": "number" }, + "UpgradeTeepHeight": { + "title": "number", + "type": "number" + }, "UpgradeThunderHeight": { "title": "number", "type": "number" @@ -20044,10 +20048,6 @@ "UpgradeWatermelonHeight": { "title": "number", "type": "number" - }, - "UpgradeXxHeight": { - "title": "number", - "type": "number" } }, "type": "object" diff --git a/chain/consensus/filcns/upgrades.go b/chain/consensus/filcns/upgrades.go index 839288a059..3f68960861 100644 --- a/chain/consensus/filcns/upgrades.go +++ b/chain/consensus/filcns/upgrades.go @@ -331,7 +331,7 @@ func DefaultUpgradeSchedule() stmgr.UpgradeSchedule { }}, Expensive: true, }, { - Height: buildconstants.UpgradeXxHeight, + Height: buildconstants.UpgradeTeepHeight, Network: network.Version25, Migration: UpgradeActorsV16, PreMigrations: []stmgr.PreMigration{{ diff --git a/documentation/en/api-v0-methods.md b/documentation/en/api-v0-methods.md index d2fabb1114..789f6948bb 100644 --- a/documentation/en/api-v0-methods.md +++ b/documentation/en/api-v0-methods.md @@ -4485,7 +4485,7 @@ Response: "UpgradePhoenixHeight": 10101, "UpgradeWaffleHeight": 10101, "UpgradeTuktukHeight": 10101, - "UpgradeXxHeight": 10101 + "UpgradeTeepHeight": 10101 }, "Eip155ChainID": 123 } diff --git a/documentation/en/api-v1-unstable-methods.md b/documentation/en/api-v1-unstable-methods.md index 12077ab579..a7abe61778 100644 --- a/documentation/en/api-v1-unstable-methods.md +++ b/documentation/en/api-v1-unstable-methods.md @@ -6796,7 +6796,7 @@ Response: "UpgradePhoenixHeight": 10101, "UpgradeWaffleHeight": 10101, "UpgradeTuktukHeight": 10101, - "UpgradeXxHeight": 10101 + "UpgradeTeepHeight": 10101 }, "Eip155ChainID": 123 } diff --git a/extern/filecoin-ffi b/extern/filecoin-ffi index dfe9d750a2..72e100df9d 160000 --- a/extern/filecoin-ffi +++ b/extern/filecoin-ffi @@ -1 +1 @@ -Subproject commit dfe9d750a23f77b7671fb1a2baf9c966de3164df +Subproject commit 72e100df9db736aeda690672ab120500ddbd5e0d diff --git a/go.mod b/go.mod index 2a9b9583bd..99831b20ed 100644 --- a/go.mod +++ b/go.mod @@ -50,7 +50,7 @@ require ( github.com/filecoin-project/go-jsonrpc v0.7.0 github.com/filecoin-project/go-padreader v0.0.1 github.com/filecoin-project/go-paramfetch v0.0.4 - github.com/filecoin-project/go-state-types v0.16.0-dev + github.com/filecoin-project/go-state-types v0.16.0-rc1 github.com/filecoin-project/go-statemachine v1.0.3 github.com/filecoin-project/go-statestore v0.2.0 github.com/filecoin-project/go-storedcounter v0.1.0 @@ -131,7 +131,7 @@ require ( github.com/raulk/go-watchdog v1.3.0 github.com/samber/lo v1.39.0 github.com/sirupsen/logrus v1.9.2 - github.com/stretchr/testify v1.9.0 + github.com/stretchr/testify v1.10.0 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 github.com/triplewz/poseidon v0.0.2 github.com/urfave/cli/v2 v2.25.5 diff --git a/go.sum b/go.sum index f88d579c6b..2136ad0650 100644 --- a/go.sum +++ b/go.sum @@ -298,8 +298,8 @@ github.com/filecoin-project/go-state-types v0.0.0-20200928172055-2df22083d8ab/go github.com/filecoin-project/go-state-types v0.0.0-20201102161440-c8033295a1fc/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g= github.com/filecoin-project/go-state-types v0.1.0/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g= github.com/filecoin-project/go-state-types v0.1.6/go.mod h1:UwGVoMsULoCK+bWjEdd/xLCvLAQFBC7EDT477SKml+Q= -github.com/filecoin-project/go-state-types v0.16.0-dev h1:66GP8xfo0elYdLLGxQ4LcAhAvOqKf4IiJkRYxU7UH2M= -github.com/filecoin-project/go-state-types v0.16.0-dev/go.mod h1:k0/j7i06QHRet86mv9/8gregMq59tv+yCr655G9zsX8= +github.com/filecoin-project/go-state-types v0.16.0-rc1 h1:/51MhupBAjfmWygUKDZCdLOzAnKFcayPHX9ApTswgmo= +github.com/filecoin-project/go-state-types v0.16.0-rc1/go.mod h1:4rjTgHP6LWrkQXQCgx+dRGDa0gnk4WiJVCFwZtuDOGE= github.com/filecoin-project/go-statemachine v1.0.3 h1:N07o6alys+V1tNoSTi4WuuoeNC4erS/6jE74+NsgQuk= github.com/filecoin-project/go-statemachine v1.0.3/go.mod h1:jZdXXiHa61n4NmgWFG4w8tnqgvZVHYbJ3yW7+y8bF54= github.com/filecoin-project/go-statestore v0.1.0/go.mod h1:LFc9hD+fRxPqiHiaqUEZOinUJB4WARkRfNl10O7kTnI= @@ -1246,8 +1246,9 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/stvp/go-udp-testing v0.0.0-20201019212854-469649b16807/go.mod h1:7jxmlfBCDBXRzr0eAQJ48XC1hBu1np4CS5+cHEYfwpc= github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY= diff --git a/node/impl/full/state.go b/node/impl/full/state.go index 76ce0a8686..85f43754da 100644 --- a/node/impl/full/state.go +++ b/node/impl/full/state.go @@ -2079,7 +2079,7 @@ func (a *StateAPI) StateGetNetworkParams(ctx context.Context) (*api.NetworkParam UpgradePhoenixHeight: buildconstants.UpgradePhoenixHeight, UpgradeWaffleHeight: buildconstants.UpgradeWaffleHeight, UpgradeTuktukHeight: buildconstants.UpgradeTuktukHeight, - UpgradeXxHeight: buildconstants.UpgradeXxHeight, + UpgradeTeepHeight: buildconstants.UpgradeTeepHeight, }, }, nil }