diff --git a/.circleci/config.yml b/.circleci/config.yml index c338dba3b..c5f358a85 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -718,6 +718,11 @@ workflows: suite: itest-mempool target: "./itests/mempool_test.go" + - test: + name: test-itest-migration + suite: itest-migration + target: "./itests/migration_test.go" + - test: name: test-itest-mpool_msg_uuid suite: itest-mpool_msg_uuid diff --git a/build/actors/v11.tar.zst b/build/actors/v11.tar.zst index 0f2f18fd7..3dfa66597 100644 Binary files a/build/actors/v11.tar.zst and b/build/actors/v11.tar.zst differ diff --git a/build/builtin_actors_gen.go b/build/builtin_actors_gen.go index 08cb5eb07..c6e5c78d8 100644 --- a/build/builtin_actors_gen.go +++ b/build/builtin_actors_gen.go @@ -74,25 +74,25 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet }, { Network: "butterflynet", Version: 11, - BundleGitTag: "v10.0.0", - ManifestCid: MustParseCid("bafy2bzaceckjhsggacixv2d377zfdcnuio4hzkveprio3xnhm3gohi3zy3zco"), + BundleGitTag: "fip0061/20230406", + ManifestCid: MustParseCid("bafy2bzaceb7fupcmybvdg7nbdhfhkcfdu3ypca6s6ofhju5knl34orpyj3xmw"), Actors: map[string]cid.Cid{ - "account": MustParseCid("bafk2bzacedkt3uzgugcsdrcsyfvizcpyr5eshltmienbyhjne2t7t3ktkihny"), - "cron": MustParseCid("bafk2bzacecrehknegmfnhmhwy2g43cw52mvl7ptfpp44syus4iph7az7uveuq"), - "datacap": MustParseCid("bafk2bzaced4krgbpj4sywcc453l3pygqr4qocc6nxylhztsm4duvkgfwd7vws"), - "eam": MustParseCid("bafk2bzacebn5lyg5pfhjpdlf3r7lnah4x33bhp5afftdgbr4kbpuioytr4bhe"), - "ethaccount": MustParseCid("bafk2bzaceaxyu24a2tbiacfr4p367xjtptrbang4qrh3fx65cojyrzolwyi4u"), - "evm": MustParseCid("bafk2bzacea5bqaubqeuqmpguxrem2pgocjr43wcfi5e3jpw2e3b4o6tcvs746"), - "init": MustParseCid("bafk2bzaceaufptkdg2gc4eq4ijqxtqp7wxwifusxb6kxay3vdz3wr5epqjbho"), - "multisig": MustParseCid("bafk2bzacedp3c26ccw3l7fci4xhedxhqeqevkubuf5okuslq7o7rcqwqfahci"), - "paymentchannel": MustParseCid("bafk2bzacedlmiqvbutz4ebx2mezy3pqj72x2yt4gwea7sf4dv4a4s7xidelok"), + "account": MustParseCid("bafk2bzacebhrrrqqa36wjxaezbh7b5gh442kp2sjthaaof3nqafob6s76o6qy"), + "cron": MustParseCid("bafk2bzacebzdh47uqkmaptdbpdjetqejzbg246cxkve2pm7ap4xibm2kz47fm"), + "datacap": MustParseCid("bafk2bzacedi4b3dmroeofoikv3jpborq4kdos3ilwgjzmpexcwymmcrguusr4"), + "eam": MustParseCid("bafk2bzacecxxry2lbx7ezi26sugs35r6vhvfuukqq7y3fctjc25z6lblqiwdu"), + "ethaccount": MustParseCid("bafk2bzacebb3q3qwc6mrsfn7blzis6t4j7dmrjxiuezcsv4cbrw7qf6btlbuy"), + "evm": MustParseCid("bafk2bzacebs5heovvujlf7qdjhr6aw5bqq2qegtoeknmo2l6z56a4ygfha3kc"), + "init": MustParseCid("bafk2bzacechqfsh7oorfvt5ua53fawt3jgcjisbiab6ppgy6tyaz734flnhrc"), + "multisig": MustParseCid("bafk2bzaceb5c4ny4cu2cyuieamxn4rgq5ysppuy5ewmjfiupyiaxf2oletrfe"), + "paymentchannel": MustParseCid("bafk2bzacedmo6vzzxyd5dhiff7ukl2okxf5rkv76yzwzpqsr2zfeuiykpltce"), "placeholder": MustParseCid("bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"), - "reward": MustParseCid("bafk2bzacecrzxiowkhzpgz4rl2pdldzwmmnctuq5zzntqjkgyhyfllo3afb5s"), - "storagemarket": MustParseCid("bafk2bzacebh2q3ofolirt5q2jpx367dfv22aecevsmybba3yhnxfs3foe6c5q"), - "storageminer": MustParseCid("bafk2bzaceavop4j7iwneew6h7p667gvx37baloxilxetwkhsrr26jme6yye5o"), - "storagepower": MustParseCid("bafk2bzacecfblbat4w7jkxx7kjst33lowyb7s6apdnl7fsnpmy5c3jfq5kvye"), - "system": MustParseCid("bafk2bzacebojf25kc5yo7gskdbdgg5f52oppej2jp6nknzlvrww4ue5vkddd2"), - "verifiedregistry": MustParseCid("bafk2bzaceavue3zekq4wmvttck2vgxlcensrsgh5niu5qhna2owejycorftcc"), + "reward": MustParseCid("bafk2bzacedhld6a3dimdvirs7siqbjkwsvcvrgxsuosgtlwjm4nn4xq3igpmk"), + "storagemarket": MustParseCid("bafk2bzacecllt2txfmumxuj3b26a66z7ubluhnu6ufohlbhqfpwpoihvdtl5c"), + "storageminer": MustParseCid("bafk2bzaceb6x4ojvwugfpshof4atv67zf3fv6w5sbrsnzwj2a67o56hcr4su2"), + "storagepower": MustParseCid("bafk2bzacebsccc2m4ns7hvhcaefd5uohjoyppzywtoy23p74hfgbe675dchdg"), + "system": MustParseCid("bafk2bzaceb3jzces4qfkjzkhnxaqysghzcmlfxgsvjnrwonqlvm6g64pyufz6"), + "verifiedregistry": MustParseCid("bafk2bzacebayvz2v4uy4re35s3x6sw6th34kkbibpxiirlj22u4pkexcuq75y"), }, }, { Network: "calibrationnet", @@ -157,25 +157,25 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet }, { Network: "calibrationnet", Version: 11, - BundleGitTag: "v10.0.0", - ManifestCid: MustParseCid("bafy2bzacealnejzebicrebew7e3q2u7prkqeclffcyje2q2w4v4vtz5jqzcto"), + BundleGitTag: "fip0061/20230406", + ManifestCid: MustParseCid("bafy2bzacebwjj7rhfwkyuu5qzoxlu7elhm757nnovmq75w6sevggymnzmnm72"), Actors: map[string]cid.Cid{ - "account": MustParseCid("bafk2bzacedmhjxowg3mu3amnrl6pkm35j6xf6kfe2e3yanaw5l5n6fh7426ta"), - "cron": MustParseCid("bafk2bzacear3td3auuvpicn2mqgpodzmiprzjsugdmbnj5w3nwiachh3zjy3o"), - "datacap": MustParseCid("bafk2bzaceaxb3j7yu4w3wixv6t7h7hymtu7xswdrfxo2pgatmajvkmalig7mm"), - "eam": MustParseCid("bafk2bzacecoiy7gqecoag4hpyamfusq4pxjggziiqd6txy566ze4qu7txbfgm"), - "ethaccount": MustParseCid("bafk2bzacebrf2ryqqwzsvtr2q3azyntrhp3okjqyizhqzwce7j4xkv53lpq46"), - "evm": MustParseCid("bafk2bzacedqnoir3exqgjfi5p3s7glqqr54qgussrk6jpv5577rtan463ejm6"), - "init": MustParseCid("bafk2bzacebjkpyrfypyqjiijoceezznhd7gast4zkqpieqlmtl57qxansat6c"), - "multisig": MustParseCid("bafk2bzacebwirewz7usxyclghpo62kfep3lgmhjyabee4hxs5f53vxouli2sk"), - "paymentchannel": MustParseCid("bafk2bzacecoxwjjmpnpkhm3vdqz2o6azo4l5myaktkdn6bga24qdprlqchgck"), + "account": MustParseCid("bafk2bzaceadb5top4yoz4kpboukubrjbjzghfdz7ca5u7dld72ppntogoghgi"), + "cron": MustParseCid("bafk2bzacebzb562tw3ow2vgyjjccqm77svzacpeterxaqe53p6umzmbwzyaz6"), + "datacap": MustParseCid("bafk2bzacebtnait6t2qgfeput6ua5hprtd5bfvuvs3kod2sypzck525y2qfu2"), + "eam": MustParseCid("bafk2bzacebhuewh2pcuz6bhukkhclykm6qejvm23o6wbzhwher7eyo5ggfnvg"), + "ethaccount": MustParseCid("bafk2bzacebmiuff6pdvrr6mcnnamil2xtq5rmisia7foksuskvpxt2pgilqk4"), + "evm": MustParseCid("bafk2bzacedox6kef5ss35trvkxbdtf77dy7d4zc6vyyq5tf2t3vynl74ipzze"), + "init": MustParseCid("bafk2bzacecedo4avyooz4in5j7rimk7wrlslu5hs5l3q3o4alg2g3m7odq5ze"), + "multisig": MustParseCid("bafk2bzaced7axvecndaph72rdy67aw2nj52xczrbnz5tntaluiglnyzo7v7bg"), + "paymentchannel": MustParseCid("bafk2bzacechwowtvfih3gtzr3fbtasdjflagttixt7s5cexgvqab7pfqzdj5w"), "placeholder": MustParseCid("bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"), - "reward": MustParseCid("bafk2bzacecsdqppgzyt5cveuoafr3a6x2ec5rdtowgh5hs5hr36tjloa3w7ia"), - "storagemarket": MustParseCid("bafk2bzacecalbkp24len5szr7w7yaiah4ajzpqg5kiqqybahgdrazsinfg7ki"), - "storageminer": MustParseCid("bafk2bzacedj2gw7qjccvg6myqyn7fj6noontw2ag574ndj5gtwejs3qhsgsq2"), - "storagepower": MustParseCid("bafk2bzacedw2hcinaswhl2m4quy345i35qfc425ctynukmawrctdxhhauaq5g"), - "system": MustParseCid("bafk2bzaceaved6ikzlaj5is6tadl42b256aghs4fw3u4k33n44ycbcy5zofhk"), - "verifiedregistry": MustParseCid("bafk2bzaceayyax5mvtzs65cuhx4txlt7o2ptqglj3i45sccxxm6mx4g2nsbb6"), + "reward": MustParseCid("bafk2bzaceccouwll3o3k4mlcyeeoz3rlfute2ggyzfpyn5zvxojbpuyaeuzri"), + "storagemarket": MustParseCid("bafk2bzacebi4q7yayn245mwdgsw64xyxai2xjx4n6osm64yoxxmwr5j47noz4"), + "storageminer": MustParseCid("bafk2bzacecl5boweys2bf75htfzx3unbxodn5webdupsnenhdoe7foxrapaii"), + "storagepower": MustParseCid("bafk2bzacebawuegcoc4zo7iv3eemr6adgp7mw7ei2mchpxvwwnh6tlbbxikno"), + "system": MustParseCid("bafk2bzaceaan6xoaagli2sdwowysu7fdhekrdgga3d47zcz6sz3dhbr6odl7s"), + "verifiedregistry": MustParseCid("bafk2bzacedsurcwtxesqtxicb76k6msfajugfbh6ou4ptulvgmygagbnq3myc"), }, }, { Network: "caterpillarnet", @@ -249,25 +249,25 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet }, { Network: "caterpillarnet", Version: 11, - BundleGitTag: "v10.0.0", - ManifestCid: MustParseCid("bafy2bzaceajftd7jawqnwf4kzkotksrwy6ag7mu2apkvypzrrmxboheuum5oi"), + BundleGitTag: "fip0061/20230406", + ManifestCid: MustParseCid("bafy2bzaceacd7pk6anenkqog5eikqdeaxenzlxpd7qrie4yjnixz37zkh7nzs"), Actors: map[string]cid.Cid{ - "account": MustParseCid("bafk2bzacecsbx4tovnr5x2ifcpqbpx33oht74mgtvmaauzrqcq2wnm7prr7ak"), - "cron": MustParseCid("bafk2bzacecpzfajba6m4v4ty342jw6lcu6n63bwtldmzko733wpd2q5jzfdvu"), - "datacap": MustParseCid("bafk2bzaceaa5zplkxvguwvnecfen62buhli5rraa3ga74b33a3sbscanzx4ok"), - "eam": MustParseCid("bafk2bzaceaffoa3eqmj7h53lwjatfqrjw63l3czk3vthyjz6oyhgwka3xwp6g"), - "ethaccount": MustParseCid("bafk2bzaceb7suh5m4xagoq6ap5v5x7vrhex2coq6gu6d54jteblm36cxhk5b2"), - "evm": MustParseCid("bafk2bzaceccmwmnb42pn7y7skbjwjur7b2eqxuw4lvm3he2xpvudjzluss4os"), - "init": MustParseCid("bafk2bzaceai72h4hxbgbp6gwm3m24uujscrj4bmbh6pxoerqtduijxt6dchfq"), - "multisig": MustParseCid("bafk2bzacebycdokda2gysqpnl3dwksgidujgsksf4n6qotjq4erj5zd7clkzy"), - "paymentchannel": MustParseCid("bafk2bzaceb5ucvftftiim6cxjusdpsmbht4x33kgexxgv5447gevk47h7jjqk"), + "account": MustParseCid("bafk2bzaceaorq7vk3mqaqveexi237emb7m4widwen4pjnpmosoqnjgv4jarey"), + "cron": MustParseCid("bafk2bzacebcu5kw2ai7tembinsz47viqt7nxzbaq3ftnx3zymkdvy62hln36y"), + "datacap": MustParseCid("bafk2bzaceafag5jlzjrcywe7dkyyhkjyymv6p7dhwu55i6p7fk663yy6ussqw"), + "eam": MustParseCid("bafk2bzacebzew277ktikih2ht2smzw46bt23xz6455tppjq5llqgse7umy6u2"), + "ethaccount": MustParseCid("bafk2bzacecp7jwlcnx7m22mjwxmhrrhl6ti2jtde7jjaure2mvevqrnmjtsry"), + "evm": MustParseCid("bafk2bzacectylupwt7wr56to3tjqhxp5ymgjs5x3tsyq6t7wdda2jpzv3yjru"), + "init": MustParseCid("bafk2bzacedqyh5joid64ihwdhf5dnykq2fmgp4ugl2hr5g2ghtmhff3de3n7o"), + "multisig": MustParseCid("bafk2bzacebm2c6pr3v3ns5bzxvdopwn73yce53mtdd525eokgfqhyz5qe64c2"), + "paymentchannel": MustParseCid("bafk2bzaceboykiffo7axwmlmroivlsowbro5bsrypkdqzjmpto2b6vtkv24fc"), "placeholder": MustParseCid("bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"), - "reward": MustParseCid("bafk2bzaceajqygfkhamlzfsquqjgoy4p7pc2fruouqajapfucf22rbmtt5yf6"), - "storagemarket": MustParseCid("bafk2bzacednmzko2o5iv5kc6qxvpqfx5rq72krxzvna6cqoqem6flbfukglby"), - "storageminer": MustParseCid("bafk2bzacedayzz5qw7t7ykycf3a2hp666j5hb23a3mnmgp4xbbpvrx3h3ags4"), - "storagepower": MustParseCid("bafk2bzacedd3eiejzp35xuwjf3cvgd43b5ukqhelqmtgzqzqnt2wcy56pb744"), - "system": MustParseCid("bafk2bzacecfivztuulqqv4o5oyvvvrkblwix4hqt24pqru6ivnpioefhuhria"), - "verifiedregistry": MustParseCid("bafk2bzacecdhw6x7dfrxfysmn6tdbn2ny464omgqppxhjuawxauscidppd7pc"), + "reward": MustParseCid("bafk2bzacedy5bmbllb6pdux3zitcp56u4z32sisjg3qlgxvoavdxvzftffyc6"), + "storagemarket": MustParseCid("bafk2bzacednzj3jwcl44xhce4cs3pj5w44cicnx3mpghlfizqxozuxu7uc65g"), + "storageminer": MustParseCid("bafk2bzacebkzvif327362pa6uzfv5nc4xww5m32ltykafjkr6mfxroxptjfyq"), + "storagepower": MustParseCid("bafk2bzacecge2ela4dnojftxsg7p752lia4fz2ni5cu4kuikogujkmttqftks"), + "system": MustParseCid("bafk2bzacec35d2td2jvkdfpgii55k2q2xzjvuju52beu7ldmllagjljwcr6b2"), + "verifiedregistry": MustParseCid("bafk2bzacedokmxtndn7ghzanmwcxrtofp4saqiqtpmounqsdmieqrkj7lddeo"), }, }, { Network: "devnet", @@ -332,25 +332,25 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet }, { Network: "devnet", Version: 11, - BundleGitTag: "v10.0.0", - ManifestCid: MustParseCid("bafy2bzacebzz376j5kizfck56366kdz5aut6ktqrvqbi3efa2d4l2o2m653ts"), + BundleGitTag: "fip0061/20230406", + ManifestCid: MustParseCid("bafy2bzacebewyqzuscnusoynys5mq5u3ujt63gxkfktptq5hhjaxc5o6vvmwm"), Actors: map[string]cid.Cid{ - "account": MustParseCid("bafk2bzacedkj5dqs5xxamnlug2d5dyjl6askf7wlmvwzhmsrzcvogv7acqfe6"), - "cron": MustParseCid("bafk2bzaceabslrigld2vshng6sppbp3bsptjtttvbxctwqe5lkyl2efom2wu4"), - "datacap": MustParseCid("bafk2bzaceagg4qklzhhg5oj4shwqpoeykeyxus7xhj2abuot2tycdwsf2oaaa"), - "eam": MustParseCid("bafk2bzaceafttsbglcetxwtzqtdniittwczogkefgnxztgsp7mymcpvdlhdik"), - "ethaccount": MustParseCid("bafk2bzacedypn6tf3yrj4bavmscddygeima3puih37fbkxuhjhlrzbjh3dbo4"), - "evm": MustParseCid("bafk2bzacec5ywczgg73fnwi36nlxso3zduop3fwj3pq6ynn5zltrs4dpcwglg"), - "init": MustParseCid("bafk2bzacebkanlbkwwtniyz4fawevnkoyje67l5nflltmciplqiutekxzzfh4"), - "multisig": MustParseCid("bafk2bzacectxa2izvpaybmmpvearekrybxtglctwnexzzneyn6xrnrmectmpa"), - "paymentchannel": MustParseCid("bafk2bzacectov7vawkhsvq7aobyjq3oppamytq425wpkxejmq65vvcdm4bt2e"), + "account": MustParseCid("bafk2bzacecvslak4qq6plu4g42d7ubd4oydimohd226tezn2iw2z6prevfmui"), + "cron": MustParseCid("bafk2bzaceahmjxdm5m2jzwzdra7gofuyubtcep7c2l4bbwezx7umi2d2civq2"), + "datacap": MustParseCid("bafk2bzacebwiqcbcvuwxz3uqapp7vjuh6v27h27ghuyayyeodoqssnmjj7ln6"), + "eam": MustParseCid("bafk2bzaceafkscfus3xzzeqxpqykoyzoahh2tc7ihnfp7gnvwlfcrocxjzrbq"), + "ethaccount": MustParseCid("bafk2bzacedgpsaw6w3rftnwrrrakjm77g2xtc7cop7afunzhovau6zivt5cou"), + "evm": MustParseCid("bafk2bzacecn5fjkck24lgohtt3qefeyjveq24be7nqhx54of3gj3iyoxje2r6"), + "init": MustParseCid("bafk2bzaceadr35hd5obybzvuxh7rkftocnusrin474izub37dz7or6c2oojp2"), + "multisig": MustParseCid("bafk2bzacea4fte2n65lcr74hqe3lnzf75z63axbxgpv3ar5wt5fncrjin2pgu"), + "paymentchannel": MustParseCid("bafk2bzaceaz45muzvrclsmknxlwwhbozleqj2x3kp27ygrjaai7fdstmemrmo"), "placeholder": MustParseCid("bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"), - "reward": MustParseCid("bafk2bzacec3xpbrxw2rnpuve4mxfhny44lxbpbwmduy4ula4ohj2bp6wplpvc"), - "storagemarket": MustParseCid("bafk2bzacec5nexsejraoqraywka7zcacjoxgpdbopehdkhiwqwcyghtof4s3w"), - "storageminer": MustParseCid("bafk2bzacecw5xzj6z5b7qxx5xca5py4aoecmqj2pxb6nw673alufy22zckkyo"), - "storagepower": MustParseCid("bafk2bzaceckhnpxoaanjf474wxzkntlnzdofoy75ehyuydfjkuw4swhotws4y"), - "system": MustParseCid("bafk2bzaceairk5qz5hyzt4yyaxa356aszyifswiust5ilxizwxujcmtzvjzoa"), - "verifiedregistry": MustParseCid("bafk2bzaced2mkyqobpgna5jevosym3adv2bvraggigyz2jgn5cxymirxj4x3i"), + "reward": MustParseCid("bafk2bzaceaukxhteoghwm443tg7ee6lo7rrbcsrapuceoludoregi4vv2yick"), + "storagemarket": MustParseCid("bafk2bzacearmlbadowj775ikj5g3yhvws7dgjfgzlmfjhro3mnvjdq2xfanyq"), + "storageminer": MustParseCid("bafk2bzaced4vzru2ex77hoqz4tj5vps56nofnov2p6ixnwjfsnxeh45zekhqq"), + "storagepower": MustParseCid("bafk2bzacedskjtvbp7avhxqkhp2omjfwjx463jaopqwqm53pc2myx5amfmwlc"), + "system": MustParseCid("bafk2bzaced7swl5bxr62s3smnhiuez6e46r67opwmmeblknqegjnsrkpv27lu"), + "verifiedregistry": MustParseCid("bafk2bzacedwnz7ojz6jqr4vgnf3zgm4rgt7e55is4yqlwhacriqyxktojwkpa"), }, }, { Network: "hyperspace", @@ -438,25 +438,25 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet }, { Network: "mainnet", Version: 11, - BundleGitTag: "v10.0.0", - ManifestCid: MustParseCid("bafy2bzacecsuyf7mmvrhkx2evng5gnz5canlnz2fdlzu2lvcgptiq2pzuovos"), + BundleGitTag: "fip0061/20230406", + ManifestCid: MustParseCid("bafy2bzaced3kuy53poa42ygdoext34hdiompqihnjja764tsqgezfhb2bdzwc"), Actors: map[string]cid.Cid{ - "account": MustParseCid("bafk2bzaceampw4romta75hyz5p4cqriypmpbgnkxncgxgqn6zptv5lsp2w2bo"), - "cron": MustParseCid("bafk2bzacedcbtsifegiu432m5tysjzkxkmoczxscb6hqpmrr6img7xzdbbs2g"), - "datacap": MustParseCid("bafk2bzacealj5uk7wixhvk7l5tnredtelralwnceafqq34nb2lbylhtuyo64u"), - "eam": MustParseCid("bafk2bzacedrpm5gbleh4xkyo2jvs7p5g6f34soa6dpv7ashcdgy676snsum6g"), - "ethaccount": MustParseCid("bafk2bzaceaqoc5zakbhjxn3jljc4lxnthllzunhdor7sxhwgmskvc6drqc3fa"), - "evm": MustParseCid("bafk2bzaceahmzdxhqsm7cu2mexusjp6frm7r4kdesvti3etv5evfqboos2j4g"), - "init": MustParseCid("bafk2bzaced2f5rhir3hbpqbz5ght7ohv2kgj42g5ykxrypuo2opxsup3ykwl6"), - "multisig": MustParseCid("bafk2bzaceduf3hayh63jnl4z2knxv7cnrdenoubni22fxersc4octlwpxpmy4"), - "paymentchannel": MustParseCid("bafk2bzaceartlg4mrbwgzcwric6mtvyawpbgx2xclo2vj27nna57nxynf3pgc"), + "account": MustParseCid("bafk2bzacecdd47yu6upauyooi2jocrnzxgil33bimt6yidyfqqpfre22ukdns"), + "cron": MustParseCid("bafk2bzacebexampdt6lxfmul5yjshpbob3cmxpoffglfh5vadiefxtla6mya6"), + "datacap": MustParseCid("bafk2bzacedfbb7r63uxruxfwy2yxtorid5r34jocbebf6wmg533mttygm4svq"), + "eam": MustParseCid("bafk2bzaced5up6dr44txobezpvysflihoyabbpnb4wkzf5h6dudyaqyfzssuw"), + "ethaccount": MustParseCid("bafk2bzaceacxkpvgohdxi6wuuzrjn7ttkmiuqeq64bozmfzoxiet52zsuktnm"), + "evm": MustParseCid("bafk2bzacedtiosqcl7wu62k6lzkptoobdufomwz6par2xmndbdun7vk4szkz4"), + "init": MustParseCid("bafk2bzacec5oyystlc7dxf3o3gthd3ycd3bykm2dplqzebr64vb7zu6wfd2ec"), + "multisig": MustParseCid("bafk2bzacecayhieqijc5pfmhahnmk6nk4lltkfd2qo2uqcyuzmmjmnmfaj2hs"), + "paymentchannel": MustParseCid("bafk2bzacec2xalja7zlmkxbeadqpf75tlcp4gkrbtihnhr4o7gaaubf7aftky"), "placeholder": MustParseCid("bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"), - "reward": MustParseCid("bafk2bzacebnhtaejfjtzymyfmbdrfmo7vgj3zsof6zlucbmkhrvcuotw5dxpq"), - "storagemarket": MustParseCid("bafk2bzaceclejwjtpu2dhw3qbx6ow7b4pmhwa7ocrbbiqwp36sq5yeg6jz2bc"), - "storageminer": MustParseCid("bafk2bzaced4h7noksockro7glnssz2jnmo2rpzd7dvnmfs4p24zx3h6gtx47s"), - "storagepower": MustParseCid("bafk2bzacec4ay4crzo73ypmh7o3fjendhbqrxake46bprabw67fvwjz5q6ixq"), - "system": MustParseCid("bafk2bzacedakk5nofebyup4m7nvx6djksfwhnxzrfuq4oyemhpl4lllaikr64"), - "verifiedregistry": MustParseCid("bafk2bzacedfel6edzqpe5oujno7fog4i526go4dtcs6vwrdtbpy2xq6htvcg6"), + "reward": MustParseCid("bafk2bzacebncfbieltapjca7adcccxecqggu74qgfwq4ugotblbvbeoyqp2cm"), + "storagemarket": MustParseCid("bafk2bzacec4ejaovcgtzkrufv46qatdyvkoa3jaoyapcbfeqo6efwonfq6zvc"), + "storageminer": MustParseCid("bafk2bzaceatcxpwsrbwpzifxe7zmt4mwpboioh4hezxz2p5alwozfcrevojam"), + "storagepower": MustParseCid("bafk2bzacecare6lem5yc3m5l6b4t6rcqvkahfm4i466r4twzo7ufohn5i6bx2"), + "system": MustParseCid("bafk2bzacedyckuohrbrsejxjytnc5jgb3epn2emffkbg3zens6zimxquvfzvq"), + "verifiedregistry": MustParseCid("bafk2bzaceb6t2w4s25yk5xsxesm7l6xt4t24nkmvfvumgcziaculliomsz2vc"), }, }, { Network: "testing", @@ -521,25 +521,25 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet }, { Network: "testing", Version: 11, - BundleGitTag: "v10.0.0", - ManifestCid: MustParseCid("bafy2bzacebsp3bkxwsijenqeimhvhtg52d6o76hn6qhzxveqfq7d5hdd5l2ee"), + BundleGitTag: "fip0061/20230406", + ManifestCid: MustParseCid("bafy2bzaceaylgi44inivc774g5ovhgwbrxkvt2sqmk65pgrwmunfefzfhbmy4"), Actors: map[string]cid.Cid{ - "account": MustParseCid("bafk2bzaceazxb6p2xg6caivmie6k2bvutyesngwyvhwv4eemwu7ia4vnqkcuy"), - "cron": MustParseCid("bafk2bzaceax6ym73boyl5zdpbcr6zmbajzylmcdvlapz5zcqgzcshakz44jbq"), - "datacap": MustParseCid("bafk2bzacea63x3v6lvtb4ast5uq3nhrpokvylymvezyr5xyjl6vtlfwkuw6qo"), - "eam": MustParseCid("bafk2bzacebhualcn7fofyqr6lhrel32ud23hcwzeenfqu3rrn5nmt6gugqgo6"), - "ethaccount": MustParseCid("bafk2bzacecgft7e3v4kbpb3tlt5s6hng74ptu3ggcdi4wmt5p4vr6qkmkw2zc"), - "evm": MustParseCid("bafk2bzaceaoqvbqetgicqpvwvcnpjx5aa74kwlhq3u7mwv4yseszxkimwz5pk"), - "init": MustParseCid("bafk2bzaceapmoyg2qppzle24t25ncyycn2uwhnw6crqkqlokkbc7w4mn74wko"), - "multisig": MustParseCid("bafk2bzacecn3dlepgaps3h6iwlq65dx6zyrbfi4pmgdqxphb5idubb6ibflwe"), - "paymentchannel": MustParseCid("bafk2bzaceaanxurr2k3ueolwcnminmdfp3tyxtntqg5fou37smeulb5dxqjzk"), + "account": MustParseCid("bafk2bzacec75wcc3lv2ani5t7xqyiajmwvcp76xnr4kt4flrry3eir4jrvzki"), + "cron": MustParseCid("bafk2bzaced7vu6sc6exfke533lyptxg7ir3em243zb42uprjd2zzuqebjqm5k"), + "datacap": MustParseCid("bafk2bzaceaf7ycru3njyqz6v4qmahxi4rfce3rk2x6mcq2fwagmhotj5ynndg"), + "eam": MustParseCid("bafk2bzacebzxm56qu7zfeqqn52uz7dfwl2bkmji72anzrsnpju66m6arqja64"), + "ethaccount": MustParseCid("bafk2bzacebw6j4zqyumejofau3py4fus6vj2yjtdmkuyeiskuabw367ktqhzw"), + "evm": MustParseCid("bafk2bzacecqf3oanagk2g6cznb4eox4anoqhy66yndspt5xwza5wx2mu4f7wm"), + "init": MustParseCid("bafk2bzacecm2eztvik5jr76k2zd4c53ivfcgdisur2uhv2z67yvbgwywjb3pc"), + "multisig": MustParseCid("bafk2bzacecilj7v4kehkbztorigxmzdy4veg6bsgzlybaio4vmfu4lqbdif3m"), + "paymentchannel": MustParseCid("bafk2bzacea2roncbfn2zzim7ielcuy526acc5nnmvwmty57od4wmrxpkkanti"), "placeholder": MustParseCid("bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"), - "reward": MustParseCid("bafk2bzacedujdvwk4omjexdnmh2qrkqbw27v4c2g3krajhtzyfzart36bimum"), - "storagemarket": MustParseCid("bafk2bzacecdbjjxvdtltobiu7thwyyr2puunoz3q4vyfnhhxl2sbp4ovwq37s"), - "storageminer": MustParseCid("bafk2bzacebo5q7jrf4qjrhtotwt5ouzlygvml4bzofs2egdnbxyfmuo7tro6c"), - "storagepower": MustParseCid("bafk2bzacebt2ipqnorxbzncwjadkulip6blzksmwd4mmyrfjsmjyf55itra2k"), - "system": MustParseCid("bafk2bzacecf2jimdz7knhngs64ximfz3eaud6s3kiunmkybgrkupdjyo2dw7o"), - "verifiedregistry": MustParseCid("bafk2bzacecdmek2htsgcyoyl35glakyab66cojqo2y335njnm7krleb6yfbps"), + "reward": MustParseCid("bafk2bzaceddqgrgk6jcqp5fujc4r33chhzjxjh4xdp3b2jwsjybng2zzttxmc"), + "storagemarket": MustParseCid("bafk2bzacecrwzwn3nu33oqkzmondgn47tuyenh36ev75wrfftc5ue7bjddty4"), + "storageminer": MustParseCid("bafk2bzacedu4o4hp6jyzivv7ppvuyjl3qhrtm6zbxiufiiztnltye6p3xluru"), + "storagepower": MustParseCid("bafk2bzaceb4p7jn5jpaejkchekppenpjyzdbstt2wzby35h2jfhpwrvqoufbk"), + "system": MustParseCid("bafk2bzacedwrg735yb5sxfqaumidk35uvorfvrx4ckktg7bmtygstwsmf2ckc"), + "verifiedregistry": MustParseCid("bafk2bzacebkjoto2kgwgfn6asssfpeu4cmsd6gcvbb77spobopaxbdchkc4ju"), }, }, { Network: "testing-fake-proofs", @@ -604,24 +604,24 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet }, { Network: "testing-fake-proofs", Version: 11, - BundleGitTag: "v10.0.0", - ManifestCid: MustParseCid("bafy2bzacedwap2uuii4luljckrnb4vkur2unb6fyinn7xjie6xlva2wmlygj2"), + BundleGitTag: "fip0061/20230406", + ManifestCid: MustParseCid("bafy2bzaceaksqnaynaq3olbsmq5n5vewnqiklahvyonqbycyngmavj4juhg4g"), Actors: map[string]cid.Cid{ - "account": MustParseCid("bafk2bzaceazxb6p2xg6caivmie6k2bvutyesngwyvhwv4eemwu7ia4vnqkcuy"), - "cron": MustParseCid("bafk2bzaceax6ym73boyl5zdpbcr6zmbajzylmcdvlapz5zcqgzcshakz44jbq"), - "datacap": MustParseCid("bafk2bzacea63x3v6lvtb4ast5uq3nhrpokvylymvezyr5xyjl6vtlfwkuw6qo"), - "eam": MustParseCid("bafk2bzacebhualcn7fofyqr6lhrel32ud23hcwzeenfqu3rrn5nmt6gugqgo6"), - "ethaccount": MustParseCid("bafk2bzacecgft7e3v4kbpb3tlt5s6hng74ptu3ggcdi4wmt5p4vr6qkmkw2zc"), - "evm": MustParseCid("bafk2bzaceaoqvbqetgicqpvwvcnpjx5aa74kwlhq3u7mwv4yseszxkimwz5pk"), - "init": MustParseCid("bafk2bzaceapmoyg2qppzle24t25ncyycn2uwhnw6crqkqlokkbc7w4mn74wko"), - "multisig": MustParseCid("bafk2bzacecn3dlepgaps3h6iwlq65dx6zyrbfi4pmgdqxphb5idubb6ibflwe"), - "paymentchannel": MustParseCid("bafk2bzaceaanxurr2k3ueolwcnminmdfp3tyxtntqg5fou37smeulb5dxqjzk"), + "account": MustParseCid("bafk2bzacec75wcc3lv2ani5t7xqyiajmwvcp76xnr4kt4flrry3eir4jrvzki"), + "cron": MustParseCid("bafk2bzaced7vu6sc6exfke533lyptxg7ir3em243zb42uprjd2zzuqebjqm5k"), + "datacap": MustParseCid("bafk2bzaceaf7ycru3njyqz6v4qmahxi4rfce3rk2x6mcq2fwagmhotj5ynndg"), + "eam": MustParseCid("bafk2bzacebzxm56qu7zfeqqn52uz7dfwl2bkmji72anzrsnpju66m6arqja64"), + "ethaccount": MustParseCid("bafk2bzacebw6j4zqyumejofau3py4fus6vj2yjtdmkuyeiskuabw367ktqhzw"), + "evm": MustParseCid("bafk2bzacecqf3oanagk2g6cznb4eox4anoqhy66yndspt5xwza5wx2mu4f7wm"), + "init": MustParseCid("bafk2bzacecm2eztvik5jr76k2zd4c53ivfcgdisur2uhv2z67yvbgwywjb3pc"), + "multisig": MustParseCid("bafk2bzacecilj7v4kehkbztorigxmzdy4veg6bsgzlybaio4vmfu4lqbdif3m"), + "paymentchannel": MustParseCid("bafk2bzacea2roncbfn2zzim7ielcuy526acc5nnmvwmty57od4wmrxpkkanti"), "placeholder": MustParseCid("bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"), - "reward": MustParseCid("bafk2bzacedujdvwk4omjexdnmh2qrkqbw27v4c2g3krajhtzyfzart36bimum"), - "storagemarket": MustParseCid("bafk2bzacecdbjjxvdtltobiu7thwyyr2puunoz3q4vyfnhhxl2sbp4ovwq37s"), - "storageminer": MustParseCid("bafk2bzacedc5klueery4fn2voso4u76rgo54uctsculesdbxxbeh6rgp2q4te"), - "storagepower": MustParseCid("bafk2bzacecuz2h2renlfio4xkyrvvro7nwidf7utpjy3oizk2xuszoz3gmea6"), - "system": MustParseCid("bafk2bzacecf2jimdz7knhngs64ximfz3eaud6s3kiunmkybgrkupdjyo2dw7o"), - "verifiedregistry": MustParseCid("bafk2bzacecdmek2htsgcyoyl35glakyab66cojqo2y335njnm7krleb6yfbps"), + "reward": MustParseCid("bafk2bzaceddqgrgk6jcqp5fujc4r33chhzjxjh4xdp3b2jwsjybng2zzttxmc"), + "storagemarket": MustParseCid("bafk2bzacecrwzwn3nu33oqkzmondgn47tuyenh36ev75wrfftc5ue7bjddty4"), + "storageminer": MustParseCid("bafk2bzacedxteto3j3rn5dmnsehzkix6fbh3crybwvfc62o5in5epw2wi3l5i"), + "storagepower": MustParseCid("bafk2bzaceaw55yqsqsajvhxutvop7ofsfpatkmjcgpvmdhobklzboltdnd6nk"), + "system": MustParseCid("bafk2bzacedwrg735yb5sxfqaumidk35uvorfvrx4ckktg7bmtygstwsmf2ckc"), + "verifiedregistry": MustParseCid("bafk2bzacebkjoto2kgwgfn6asssfpeu4cmsd6gcvbb77spobopaxbdchkc4ju"), }, }} diff --git a/go.mod b/go.mod index 7648f4545..4c95f0f80 100644 --- a/go.mod +++ b/go.mod @@ -46,7 +46,7 @@ require ( github.com/filecoin-project/go-legs v0.4.4 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.11.0-alpha-3.0.20230406171822-54b19fe787f2 + github.com/filecoin-project/go-state-types v0.11.0-alpha-3.0.20230406204105-2813ee9cbb0b github.com/filecoin-project/go-statemachine v1.0.2 github.com/filecoin-project/go-statestore v0.2.0 github.com/filecoin-project/go-storedcounter v0.1.0 diff --git a/go.sum b/go.sum index 81a9d3e39..35a2ab6b2 100644 --- a/go.sum +++ b/go.sum @@ -355,8 +355,8 @@ github.com/filecoin-project/go-state-types v0.1.0/go.mod h1:ezYnPf0bNkTsDibL/psS 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.1.10/go.mod h1:UwGVoMsULoCK+bWjEdd/xLCvLAQFBC7EDT477SKml+Q= github.com/filecoin-project/go-state-types v0.11.0-alpha-2.0.20230331142914-3c737db98e58/go.mod h1:aLIas+W8BWAfpLWEPUOGMPBdhcVwoCG4pIQSQk26024= -github.com/filecoin-project/go-state-types v0.11.0-alpha-3.0.20230406171822-54b19fe787f2 h1:ReRX+cQ43cmnJLsTywIXUwnUxKRiLjPMQWnEYmodP8g= -github.com/filecoin-project/go-state-types v0.11.0-alpha-3.0.20230406171822-54b19fe787f2/go.mod h1:SyNPwTsU7I22gL2r0OAPcImvLoTVfgRwdK/Y5rR1zz8= +github.com/filecoin-project/go-state-types v0.11.0-alpha-3.0.20230406204105-2813ee9cbb0b h1:g1o65r/WAe+jXPhj8aWZ/XMX8OfQbcP5SVgoQyoad+U= +github.com/filecoin-project/go-state-types v0.11.0-alpha-3.0.20230406204105-2813ee9cbb0b/go.mod h1:SyNPwTsU7I22gL2r0OAPcImvLoTVfgRwdK/Y5rR1zz8= github.com/filecoin-project/go-statemachine v0.0.0-20200925024713-05bd7c71fbfe/go.mod h1:FGwQgZAt2Gh5mjlwJUlVB62JeYdo+if0xWxSEfBD9ig= github.com/filecoin-project/go-statemachine v1.0.2 h1:421SSWBk8GIoCoWYYTE/d+qCWccgmRH0uXotXRDjUbc= github.com/filecoin-project/go-statemachine v1.0.2/go.mod h1:jZdXXiHa61n4NmgWFG4w8tnqgvZVHYbJ3yW7+y8bF54= diff --git a/itests/migration_test.go b/itests/migration_test.go index 3b8868f35..4082792ce 100644 --- a/itests/migration_test.go +++ b/itests/migration_test.go @@ -7,12 +7,6 @@ import ( "testing" "time" - miner11 "github.com/filecoin-project/go-state-types/builtin/v11/miner" - "github.com/filecoin-project/lotus/build" - - power11 "github.com/filecoin-project/go-state-types/builtin/v11/power" - adt11 "github.com/filecoin-project/go-state-types/builtin/v11/util/adt" - "github.com/stretchr/testify/require" "github.com/filecoin-project/go-address" @@ -20,6 +14,9 @@ import ( actorstypes "github.com/filecoin-project/go-state-types/actors" "github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/builtin" + miner11 "github.com/filecoin-project/go-state-types/builtin/v11/miner" + power11 "github.com/filecoin-project/go-state-types/builtin/v11/power" + adt11 "github.com/filecoin-project/go-state-types/builtin/v11/util/adt" markettypes "github.com/filecoin-project/go-state-types/builtin/v9/market" migration "github.com/filecoin-project/go-state-types/builtin/v9/migration/test" miner9 "github.com/filecoin-project/go-state-types/builtin/v9/miner" @@ -31,6 +28,7 @@ import ( "github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/blockstore" + "github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/chain/actors" builtin2 "github.com/filecoin-project/lotus/chain/actors/builtin" "github.com/filecoin-project/lotus/chain/actors/builtin/datacap"