cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Merge pull request #9915 from filecoin-project/asr/update-fvm

Browse Source 
Update to FVM 3.0.0-alpha.17, actors dev/20221219-fvm-m2
This commit is contained in:
Aayush Rajasekaran 2022-12-19 22:46:21 -05:00 committed by GitHub
commit d55100b6a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 123 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
build/actors/v10.tar.zst
View File

Binary file not shown.

238
build/builtin_actors_gen.go
View File

@ -44,24 +44,24 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
}, {
Network: "butterflynet",
Version: 10,
ManifestCid: MustParseCid("bafy2bzacecjznnswi7dlfjnv7wwakkhpjk5nn4reaegmzm2vg32bivyw74fga"),
ManifestCid: MustParseCid("bafy2bzacea7edwcoohbivjgv6o3yey5svmfb3k7nmp5hqy4rf7hhvdqnxl6xs"),
Actors: map[string]cid.Cid{
"account": MustParseCid("bafk2bzacedgwiknpksim6qpmq5wiostvx3zyc33cd44lkmhg4bvf3rwgokrl6"),
"cron": MustParseCid("bafk2bzaceca6i5v4htv3ahive4j2sc6yrs62ob4aytygvnye3hzxstl4dgbc2"),
"datacap": MustParseCid("bafk2bzacebuxdewh4yqvgzmfc7f33iuezksqw6qikd7manj6ooczzwsurlggm"),
"eam": MustParseCid("bafk2bzaceahtdtksf7rvbnncnhk2bt3sdzglgtiovmgsnwq2ebsrh45xmxkry"),
"embryo": MustParseCid("bafk2bzacecizctcd5rk63cljrpk3c67rpot6apfqyrhlhhkgh6fhhraxiamya"),
"ethaccount": MustParseCid("bafk2bzaceaclfg4x6e3pznlzepq7e5uikre5wwmpim7bep3vp3lu4nglsh6wy"),
"evm": MustParseCid("bafk2bzacece33fvwio6edctezf5n66n4go3erxlwahzcgogko3wxzqfhbvbd2"),
"init": MustParseCid("bafk2bzaceccrmkulhfdrous4guztntalgoitlx3qiu7rthswvl5akh2lfdhme"),
"multisig": MustParseCid("bafk2bzaceabwqfhgkmywum4nvjctwuhyplkc77ajvhkhqe2ompgwcxyuz4rhw"),
"paymentchannel": MustParseCid("bafk2bzaceac25ulff3qxlcmxb7pj7nqntiyw5mafxekcbdtexuw5ddlekglkq"),
"reward": MustParseCid("bafk2bzacecs3iibyfrjvatio7zas76wi4wxg7txrfd2wuq3lig2wgfdutm6om"),
"storagemarket": MustParseCid("bafk2bzacedqwkv54qxqnwgo7ae4fqlzbsdu55smkmvyxawjtpcsg7vbqqm5bk"),
"storageminer": MustParseCid("bafk2bzacebwm3ujlqm6ljglfdc2c64dmzxoettgg3dtp5lhn2qijx5wglynd2"),
"storagepower": MustParseCid("bafk2bzaceci26wftfhpfm7rnanniantnlbggo2vjspmuwmbvbee4let22ovcg"),
"system": MustParseCid("bafk2bzacedhiqtdb6exw4wcczns4e35mekeu7uuyp7i6orzjwr234xfyojwfq"),
"verifiedregistry": MustParseCid("bafk2bzacec732pyoi3qzwcxmtrrczaors4522u6nv33luxohljizqzvixigl6"),
"account": MustParseCid("bafk2bzacec34ox7drngorgal3ujxat2a2dlsh7eissgiisrv2uubuub2avbe2"),
"cron": MustParseCid("bafk2bzaceb77n6gkytpkn2wguemnpfqfaynv7u6ci4j247leg2w3dhcoxa5ns"),
"datacap": MustParseCid("bafk2bzacebj2ztqmlb7mmkggaqf66sv7gao5722vzmpnngiuncu4efpsjyhy4"),
"eam": MustParseCid("bafk2bzaced4362rbaz5v2ukmkql7lwqisldv6xlf7t5cegibz7l25xwhtrvfw"),
"embryo": MustParseCid("bafk2bzacecrloi3xb6bwxsiwtl2chxlgisv5742nkcksahcax3fkrso5wiqrk"),
"ethaccount": MustParseCid("bafk2bzaceaqsjvbisffgbp5aseubjgymc4qyumpqs7iwbonhmoosvhkfxa4la"),
"evm": MustParseCid("bafk2bzacecwxkcytuogzq4c4x3kr6mhqelaosywh52l2gvvuqrcljtdxpzzvy"),
"init": MustParseCid("bafk2bzaceayghd65ndit5zyd3apagbd66rgltiqacvxt52veazknmup7sawmm"),
"multisig": MustParseCid("bafk2bzaceckmb2bcw2m5o4hifhodrq2j6ow5nhouj5wpqsxpzntgveft3hplu"),
"paymentchannel": MustParseCid("bafk2bzacebsvkpbavcdjguev4dxfnjx5j5bqzeeyk3petwbkmfptoej5bqlqc"),
"reward": MustParseCid("bafk2bzacea3rkyhzmugj6ap3uv5m5jnhxt64y2775vo6vemdi5aafzxty3nmq"),
"storagemarket": MustParseCid("bafk2bzacebfacbnuauxhq63f5jbchoi2xwc5ljrxnwgj2xulkx4yzfu6i4lhg"),
"storageminer": MustParseCid("bafk2bzaceal4ct6gwlzl3owu6d4iiudf4ioxth5gn6cvm37enl465px2bhznk"),
"storagepower": MustParseCid("bafk2bzaceb5pdkt55d7wxjgmhvzvnlkuw5r6eamypgqm5kem5tz3sxddwtizw"),
"system": MustParseCid("bafk2bzacecuu2y5b6r4jrj64w5yuh3klnoevrcnbdxozmtagdcyfve7oe27ri"),
"verifiedregistry": MustParseCid("bafk2bzaceckiidxsddxm6xk5aq6wk6fcrulwmjgrhedxsibhdr54loxp4zv7i"),
},
}, {
Network: "calibrationnet",
@ -101,24 +101,24 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
}, {
Network: "calibrationnet",
Version: 10,
ManifestCid: MustParseCid("bafy2bzacechk6wnggmaiy3sy6gortbsl6coeymfub2xj5nprpkejsnrzamq7k"),
ManifestCid: MustParseCid("bafy2bzaceax3rdvi7qn6aiogm2bod7tetepy3u3v445svyousrzusj57hsbv6"),
Actors: map[string]cid.Cid{
"account": MustParseCid("bafk2bzacedoztmyou47wc7pe35cbpdc2bsjjf5ekkcs3ls26nchasdg3joqwc"),
"cron": MustParseCid("bafk2bzacedxu2phcizvvu2otsnhawrgt4zj2gjairsoh3dwc3fr5gmcz3ryew"),
"datacap": MustParseCid("bafk2bzacecuqqsdc5u5hxxb6zegea6o6vtt26tromn6bcm3cmi3k5lpyjtawm"),
"eam": MustParseCid("bafk2bzacecnbhcqdb544yemkxposjkxsrslhu35ei4r6qw3ecay6fyvpiuu3u"),
"embryo": MustParseCid("bafk2bzacecizctcd5rk63cljrpk3c67rpot6apfqyrhlhhkgh6fhhraxiamya"),
"ethaccount": MustParseCid("bafk2bzacecjsijeeuybuhsqusmctd2iefez4mwx43pbqegq3d74myued67466"),
"evm": MustParseCid("bafk2bzacecgzbgkg6j35ykfxf2k7yymlb55ghue6wtsooaobgrlvn5vntzqai"),
"init": MustParseCid("bafk2bzacedt7gs6exwil3gb4ru7p3cisom6elgnhghb2a5pn3jhebmcqintm4"),
"multisig": MustParseCid("bafk2bzacecbcje2iodokqjnchnqdprhckj34kfy7zwvb3lqvnlb4tcle4kotm"),
"paymentchannel": MustParseCid("bafk2bzacedhpbwparapzwurilrgsrgfnhmtxrgpvqcpky7t4bxhfifnofcngs"),
"reward": MustParseCid("bafk2bzacecamwghsaowg6xgxicalclkoljh6woh6svist3lhjfwuit6nuq5w6"),
"storagemarket": MustParseCid("bafk2bzaceayq5vuvraktat3c67i62upzz3neu7plo4g77iwoxo4swnv7pqsae"),
"storageminer": MustParseCid("bafk2bzaceac36sklcqhsnbyelro2okibiu3zqgr2rlyw3isdrkgttrrbbnu5y"),
"storagepower": MustParseCid("bafk2bzaceasuzsfklaqvijkkfqspnza2bmq7v3jebq7n5gdh66bvdcdfyzsho"),
"system": MustParseCid("bafk2bzacedinfrgzsmxux27yhhfvcy7lru6nwkbzpgaxf5ktkq5udues6jzis"),
"verifiedregistry": MustParseCid("bafk2bzaceahvvcmedlxvlkozc2d4halq4da4ywq22lbj2wb7p7jgjvwtgvr4g"),
"account": MustParseCid("bafk2bzaceakcix46r7hh4wjhzaksnha6f5elbg62ld6dklz6ttkhisnppmoe2"),
"cron": MustParseCid("bafk2bzaceb5ezi5dlgxjmxffecrmgiajwseiblgivho5qnfejivuqxfclooma"),
"datacap": MustParseCid("bafk2bzaceag4j2myqvwevm3mdtvmqoeguwtjheyezodjcpq5ugibjx6gtz65u"),
"eam": MustParseCid("bafk2bzaceczqgbjhm6babto776wlzvebe2wenxzsowqyeb6w5irlbju5wauuw"),
"embryo": MustParseCid("bafk2bzacecrloi3xb6bwxsiwtl2chxlgisv5742nkcksahcax3fkrso5wiqrk"),
"ethaccount": MustParseCid("bafk2bzaceciajp3pacjn45zukaw7mxr2fksyscf4ax2hpjudtxgfjndzb54d2"),
"evm": MustParseCid("bafk2bzacedj3pajtbwcvtsawmfo2uzx6nbrogg56hbp2ekbrpuwjczmabw3na"),
"init": MustParseCid("bafk2bzacecoa7y64uh4uqxfdvfnbm2v4vmj4acqzwovy6vecuthbafjtvdau4"),
"multisig": MustParseCid("bafk2bzaceb2hlrmljz26gecv7zj5ymeleiuebf6mnvc7vng3qbcxvxagrlc22"),
"paymentchannel": MustParseCid("bafk2bzacecbn4m6evxxoalujyt4wnas3hdttffzjee5qjp62w7dsjdoeuhzka"),
"reward": MustParseCid("bafk2bzaceds2kn4fn27nwlxx2raawldkytlro6i2qeh6rdtmme6ybd4otpwqq"),
"storagemarket": MustParseCid("bafk2bzacec35rrhgiqqrwqjtuhoseg7e4g67sqaa74b2x2p7f37ylfulc672i"),
"storageminer": MustParseCid("bafk2bzaceaiwkboswmk4kmzctnzd5txf2axdvladlf6x5as7ey7avxa5dgfd4"),
"storagepower": MustParseCid("bafk2bzaceb2nlgx5aw2psgiedc7oqefs6mttwcloczsbucxtit55zzpbgr4fc"),
"system": MustParseCid("bafk2bzacecki2gyvfguathvwva4ilovedftfuxvk3rhuw4y2t4aawkm2e5ttq"),
"verifiedregistry": MustParseCid("bafk2bzaceds6bqzlz7lbqlh5wj7pefs3zqbcvkzqb7kipo33ffgizgwk4e6vi"),
},
}, {
Network: "caterpillarnet",
@ -158,24 +158,24 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
}, {
Network: "caterpillarnet",
Version: 10,
ManifestCid: MustParseCid("bafy2bzacecpyhavlyxgzfonsomgct5gkro2bqqydrepg7rgy5or5ttooaqdz4"),
ManifestCid: MustParseCid("bafy2bzacedct3i7raqskiy5ptdh65bzhyjef6ov4iqo2z4eq5qfupbu3fyif2"),
Actors: map[string]cid.Cid{
"account": MustParseCid("bafk2bzacedvekjpymzry5av5pkzkve4vew5qp2ynquyou2ruvwqeyo7kjfaac"),
"cron": MustParseCid("bafk2bzaceceqrzbextbac7cexmfwtgp64sd2yzlwim3rio4ewhlqsd3j2f5ma"),
"datacap": MustParseCid("bafk2bzaceb7ltkuepkewa32r5hnijwgm5zdw4pnocqitpyptc7tlw3bhn4l7g"),
"eam": MustParseCid("bafk2bzaceah3bs6d5x3nyjjbkowinpw3kylnox2f5vbgw2tovvczprbqomlqa"),
"embryo": MustParseCid("bafk2bzacecizctcd5rk63cljrpk3c67rpot6apfqyrhlhhkgh6fhhraxiamya"),
"ethaccount": MustParseCid("bafk2bzaceb5zanuptxvg5efldsemmlym6rs7xhh4kpzpnj52aty4araw456re"),
"evm": MustParseCid("bafk2bzaceboviczxzd4qyuhrao5wujsx3rjnfhnuhpreqkolvddhondnlxdrm"),
"init": MustParseCid("bafk2bzaceaornkldrcwnmamdjfktk4ixtppzyflp65c2cyhucmvgna4razxcs"),
"multisig": MustParseCid("bafk2bzaceci7m744rba6eiunjj3c6zebrdbhpcoax5u43ympcbjxmt7fmw55g"),
"paymentchannel": MustParseCid("bafk2bzaceavjaflcvtqgo3khh3xf3pno6ndj43upgjldhem6qlmmog3qr772y"),
"reward": MustParseCid("bafk2bzacedftpls6a4avrcy6nvlmu7gyiwzbm75wj3hkhbmjsshj5upefdtk6"),
"storagemarket": MustParseCid("bafk2bzaced57dorxdghfbkxiie632zyqf6xeuorypy6vm464p555qgbrmuy6i"),
"storageminer": MustParseCid("bafk2bzacedpbgirjinx2g6mbz2vtpsw5g647vsn456nuh277vsrf6hxcvnkg2"),
"storagepower": MustParseCid("bafk2bzacecnd7qpt5genyine2lnkx2q4krn6cbybp4i3xj6vnolkywrr34npc"),
"system": MustParseCid("bafk2bzacebpyoqlum3lpdqnhw6o5tr5cmsvnhmvte2oxz4bxdw2mbb2rfaph4"),
"verifiedregistry": MustParseCid("bafk2bzaceal4v6mn7qo3sftjwkwvheeza2wst34tgceaeqm3ezpo25tvraqke"),
"account": MustParseCid("bafk2bzaceaoina2vmmq24ij5kqbgawjrlnxkmj6arzucoigabt25ch6cdvbyc"),
"cron": MustParseCid("bafk2bzaceancnphwoym4pmzatrzfxo3bac72gk4bjgaqxedrigfrua62an3n2"),
"datacap": MustParseCid("bafk2bzaceaoebtmqyqvyv7oq7ehdkhl6fxjamz5fjdje7axslxsc7rhqchcdm"),
"eam": MustParseCid("bafk2bzacebk3bpluettymypn6junclggl75drrhuhxprqkhw2e4umpmi4e6hg"),
"embryo": MustParseCid("bafk2bzacecrloi3xb6bwxsiwtl2chxlgisv5742nkcksahcax3fkrso5wiqrk"),
"ethaccount": MustParseCid("bafk2bzacebcfoajhcnwz73c3lya36wkdujbmc47yyyo7ievppn2bim6eu44n6"),
"evm": MustParseCid("bafk2bzacecewru6fsc5o7wflauvnuxlir6r27zdxz4jo6fe6tvmlgaddm7eww"),
"init": MustParseCid("bafk2bzacecie5karfyo6sucyw6uqdbzj2k6dfzfkxdwduxmpyv2fymw5vocaa"),
"multisig": MustParseCid("bafk2bzacecpscu24o2fwlspi64k3fiaufeh3nnrv6wgumvaeco2jduhposcf4"),
"paymentchannel": MustParseCid("bafk2bzacedxc3fy436wlebsusgwcwqf6lzo7yv5iugy75z5hwrdt33pq2rhho"),
"reward": MustParseCid("bafk2bzacebzvjtzzuo6ijkbx2yx3ly6vlrgw37fymasdwcdymlxc26znib2og"),
"storagemarket": MustParseCid("bafk2bzaceabdr5l4qluc4rgxjxo4xnoyc5e6slp7s3fojhnv4ng3swu7qv556"),
"storageminer": MustParseCid("bafk2bzaceclwbgfqr7wqepi6xkpoqz2bl6p22mlbmsgs4zarxki2cub5rspxy"),
"storagepower": MustParseCid("bafk2bzacean3trpjoxvwztrmbw7lx6osapicxzclyz2cgou4upq432norjnaq"),
"system": MustParseCid("bafk2bzacedeexlnmp677eauba76trar47p2zddbspiodri5aof6ccasyicxxo"),
"verifiedregistry": MustParseCid("bafk2bzacedtbz5abyziamn6zmfx5f7wg7gmynvbw5s6zotbxthvlrozr5ilym"),
},
}, {
Network: "devnet",
@ -215,24 +215,24 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
}, {
Network: "devnet",
Version: 10,
ManifestCid: MustParseCid("bafy2bzacect7l57iayntiz66zxhj2mdar3kibepuij4omcpckgkd2bk4du5zi"),
ManifestCid: MustParseCid("bafy2bzacebatjk3usbionbnmnu7nfnqo7e76p667s4gxs3xz554pv2tonlc6q"),
Actors: map[string]cid.Cid{
"account": MustParseCid("bafk2bzaceda7oddbdh7zo6jb57ufbolkgjvgizfdz7rmlee44lxdza5qftoa4"),
"cron": MustParseCid("bafk2bzacea4fvaifcjw5aqa7gu33yb4a5ur6tf2snmvhueoxsyrfuxxtzlb6k"),
"datacap": MustParseCid("bafk2bzaced77clncnm55wcmnn45lacgsa5wrspdci74i3vh3hjeywr66bxp5s"),
"eam": MustParseCid("bafk2bzacebxqsxtqu5ihsuia3ckkjofwzkyhvjqtxwd2cukutsm6lvsadhvnu"),
"embryo": MustParseCid("bafk2bzacecizctcd5rk63cljrpk3c67rpot6apfqyrhlhhkgh6fhhraxiamya"),
"ethaccount": MustParseCid("bafk2bzacealhl5e3wxwp33jspdqmpuek7lll47ok5jib742kk6txkx6apkfa2"),
"evm": MustParseCid("bafk2bzacedzzjogzqazdr2mbslg67jyqe7qy6oe2xlt2rg4taomonbtn2v3ss"),
"init": MustParseCid("bafk2bzaceb3pxukh4mde4fntmimiag37gdapu2t5d3enueb7w6nyhqpds47mq"),
"multisig": MustParseCid("bafk2bzacebbm2enbsi4ystyshv6b6jckkexq6ctljsnfhv3brji5yc6lrjg3e"),
"paymentchannel": MustParseCid("bafk2bzacec2433dbnzfjlsrqcsjy646ziex3kuof427cf7exzdczpergsmpem"),
"reward": MustParseCid("bafk2bzacea6emrxpetoqmungobje7f2734trgz35av5hoi3kq3ecg2ogakadi"),
"storagemarket": MustParseCid("bafk2bzaceawombqox7y22rzxjhjpu2sfmqk6cd2yomcjsgdu6keyt2qew6xz6"),
"storageminer": MustParseCid("bafk2bzacebi5jbt5cl5h72j3esscpcieviocgn2bb4yr27xz26g2cxegqndpc"),
"storagepower": MustParseCid("bafk2bzacecomvig5zyxafyaz3rovuupomj6hgkpvcuxfstkwbwpzc2btf6emm"),
"system": MustParseCid("bafk2bzacecgdicavx5k4ewzfuytcpipefucr5usclqy67gcrlvs7hah47kmb4"),
"verifiedregistry": MustParseCid("bafk2bzacedsqsaoe4bd4tjaomgeiruwcs7ot4qtuklrk2cqxvwcosf4pqyzf6"),
"account": MustParseCid("bafk2bzacealrkumvvuyeefrnedyh2ilgozgrdp5canubuakp723pczjdcogvw"),
"cron": MustParseCid("bafk2bzacedcfqpqgwj4tgtccliqzwnjbxiceyc3lzylnf6owu54etiv3udjxi"),
"datacap": MustParseCid("bafk2bzacear73heimtdso2qnw77gx6lzqmnr5f5etlggwevut5di6d7nzaoqu"),
"eam": MustParseCid("bafk2bzacebeu5tdbnjv5avoftxb2jlwpno3zylyyvs3ch3x55jxvrzkbmkceq"),
"embryo": MustParseCid("bafk2bzacecrloi3xb6bwxsiwtl2chxlgisv5742nkcksahcax3fkrso5wiqrk"),
"ethaccount": MustParseCid("bafk2bzaceco7ybkncres3pxbtobvj4vax34ixgxsm4ny6ffkmyvisttp6ban6"),
"evm": MustParseCid("bafk2bzacecbpcm5j5ypjxgjwp7g4ksatdcqrfmvqquc3u2aav6gzw47k2vlqs"),
"init": MustParseCid("bafk2bzacebdjwaharaqxneaa5a5yoz44scdhi4v3emtmvfmkjioagyzwi3r2s"),
"multisig": MustParseCid("bafk2bzaceci3czx4l42u22iozsgg6zkls5wdtrztekmzy4qnybg4qlv4b3qli"),
"paymentchannel": MustParseCid("bafk2bzacea54hgf2czdhlxvn66pyoon5cw3fwdlwx4kp4fwftv2tat4r4nnqg"),
"reward": MustParseCid("bafk2bzacebd7ia2qfpxob2enuazpy3yc2wpach5rq2qbm7uwgknyzqqruefmm"),
"storagemarket": MustParseCid("bafk2bzaceam7ns7axlv3sghrwdo7kriw2hrlblim2pingllnvatqu2xfjfhgs"),
"storageminer": MustParseCid("bafk2bzacecbfmgzg5unc3ia7yme75psji2j6uhalt5jco6niu6wcn3pdufavy"),
"storagepower": MustParseCid("bafk2bzacedxzvoqa3a4lzajoke75q2ujhmazm4inb7robfikgtywr4sp6mgcy"),
"system": MustParseCid("bafk2bzaceb5wpgomztoaxfv2hhgb5xtbmq4t53wev6mg4yonax5glbi4dtcoe"),
"verifiedregistry": MustParseCid("bafk2bzacecpqfg7ixkwcgr6u6nb3xvyrur5yelhtge4w6um4spfwcl432mi64"),
},
}, {
Network: "mainnet",
@ -272,24 +272,24 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
}, {
Network: "mainnet",
Version: 10,
ManifestCid: MustParseCid("bafy2bzacecyso2qqnowh37s6yq2ckounp263nltoltzstwqafq35yiqtra3eu"),
ManifestCid: MustParseCid("bafy2bzaceaye52cyxbafknpy5ztpnwu3u66ilen32jl5bz575nv5wsmlg5q72"),
Actors: map[string]cid.Cid{
"account": MustParseCid("bafk2bzacec6736u5tuwjv347vnvwktqg7orfqbshfbvkgim4pryskuen5exc6"),
"cron": MustParseCid("bafk2bzacebjgmhcvyqglqft7wqb4f4ke35cmvwuoj5limyrcr5opw4zghdq5w"),
"datacap": MustParseCid("bafk2bzacedldnafxlpwnwt2aohr3wjdrogbsf5q2y3lurfzv67emd6qcf6wpk"),
"eam": MustParseCid("bafk2bzaceah4d2pcwg67nnexl3wufptvbfhvggy4lypjgnjqcvqbgxit35l7u"),
"embryo": MustParseCid("bafk2bzacecizctcd5rk63cljrpk3c67rpot6apfqyrhlhhkgh6fhhraxiamya"),
"ethaccount": MustParseCid("bafk2bzaceaa7umfcexs4yvmwrevpm3lso7sd5radmh6lvgxxvpwadll3qf4bk"),
"evm": MustParseCid("bafk2bzacebd5cawc2gpywmgts4laxtceowy5xt6ne333wfyy2nd34omiyfi64"),
"init": MustParseCid("bafk2bzacea3jvk74mclllsqob2quupfjuh2guhgyizpez3q5crk5pwhsb63kw"),
"multisig": MustParseCid("bafk2bzacedvdnosfv3udawjmyxra2degr46gseeccjxegxrlt3zha7h5yxtp2"),
"paymentchannel": MustParseCid("bafk2bzaceaj3rtwl37xjusljng6vt5s7dlqumqkjdcstbjudoceggwgsukwig"),
"reward": MustParseCid("bafk2bzacebaq7wjq4leoiwd2s4av3h4bcvgilhzb2hcxlnj5hv6ukl2n6t45m"),
"storagemarket": MustParseCid("bafk2bzaceayfzaso6fk4g3yckoveofev5cgr5dltd7osg5gy6je7gue5jarri"),
"storageminer": MustParseCid("bafk2bzaceasuzpm6tefauon3vj2277krjdxm3kfjjfei6d5yrjgqvau6pzeua"),
"storagepower": MustParseCid("bafk2bzacebu3snrzjai66skbz4dkaucykfw7vpcj4x2web5hnbbgxnoeichay"),
"system": MustParseCid("bafk2bzacebe6hbgssff2obghlzxma76zlgw2uxlpp53zg5ihxw25ibp75ibl6"),
"verifiedregistry": MustParseCid("bafk2bzacedazmuds64djip5aeae2h2mj2nxr4joxvi33erlf6kk4wyrckogwk"),
"account": MustParseCid("bafk2bzaceb7wftmnoa5zbeu6jsrzvqpjfd7kudhueve6duwxcflcaqeagqg6g"),
"cron": MustParseCid("bafk2bzacean2xecc6kfbrueglsujjqswz5nvjstmtvdq2zc5vk4cbh6gvgxcq"),
"datacap": MustParseCid("bafk2bzacear4esja4asfsdeqto6o5cjn5dbgxmzvu2uel36tzdp2s26fkte4y"),
"eam": MustParseCid("bafk2bzacecmcgidxjjaeakhgfh3oexonagta3ukzombuykj4xntkla4hfzzos"),
"embryo": MustParseCid("bafk2bzacecrloi3xb6bwxsiwtl2chxlgisv5742nkcksahcax3fkrso5wiqrk"),
"ethaccount": MustParseCid("bafk2bzacedcrh3gj3yqjylyad2ycon3rtsiitjvrcpcm26e7godh2ep44tw2e"),
"evm": MustParseCid("bafk2bzacec5j7lkeqt7njvqnuvjbfxvtqrbl5v6n7rpqf3y25umjtilecjrsa"),
"init": MustParseCid("bafk2bzaceckpb6a4g5wgqcooc5nd7rxbaziylv43yvvpgas4giwfzdpexh66a"),
"multisig": MustParseCid("bafk2bzacedls4tgmkfkasgcsfrtnkjoi6yoze5yq4cafqzbjvbty5gfeut4n4"),
"paymentchannel": MustParseCid("bafk2bzaceazuokt65n3hqjgmwmgoi6gpcvete2b46nlecnynjkgrzp4wnl4ii"),
"reward": MustParseCid("bafk2bzacecqjpnbxravwqb7liwxowb5bdml4x2qboo5vqxk7slprq3eo4ujp2"),
"storagemarket": MustParseCid("bafk2bzacecuedinzm256nup2pbsdrnxerfk33hqxhakupb3c26fwk576ehgiw"),
"storageminer": MustParseCid("bafk2bzaceb4c7iqlmk4lgnkccpdvzdv6kbwqz2leyluuehh2ino2m6e5cd7d6"),
"storagepower": MustParseCid("bafk2bzacedkwcuzvlx43nbwdwms5smerdaeja45rh7d646k4nc4s5toyryuxi"),
"system": MustParseCid("bafk2bzacedexhpixywvxk37jyp3sehcqmomyq4kpxu3wjhrehawyjhv6grav2"),
"verifiedregistry": MustParseCid("bafk2bzacebgqhqcunonbvtxbb23x6vg7p34qs223es4e4vmbklcyzllp5f2o2"),
},
}, {
Network: "testing",
@ -329,24 +329,24 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
}, {
Network: "testing",
Version: 10,
ManifestCid: MustParseCid("bafy2bzacebb5bfti4fsv32y6wxwhuspagwkqr3tmwf7pabd7wvahco3765ilc"),
ManifestCid: MustParseCid("bafy2bzaceb5ju2tgx55hcykp3ks5cedxosn43v56p5oj5j4ifgmh2tpc7dycu"),
Actors: map[string]cid.Cid{
"account": MustParseCid("bafk2bzacecfqxsyzcphdzgwln3b5umpovfkzx47aznkwfebj4v6bjbas6rrt6"),
"cron": MustParseCid("bafk2bzaceboksft57pinkf7dbfjrls75r476bxztdb6l4uka2vzilsu5o6uug"),
"datacap": MustParseCid("bafk2bzaceaam4245yf3s5qudqznwyc6z74rd4t5tzwo2eye33wvwlvf2p4qww"),
"eam": MustParseCid("bafk2bzacec64tlnnzg2jj3g6f75wjfebftzamnmi2y73ayihp4u5j33fm5k5u"),
"embryo": MustParseCid("bafk2bzacecizctcd5rk63cljrpk3c67rpot6apfqyrhlhhkgh6fhhraxiamya"),
"ethaccount": MustParseCid("bafk2bzaceah7ebvvgau3c2vbcnm4xu273ei76vfytlqco3izjoutu2keusjg2"),
"evm": MustParseCid("bafk2bzacebuuwfmkfxt56haocjgxsa4kug4o63usj6vwgr62au4nbzegz6oku"),
"init": MustParseCid("bafk2bzacecprnaksk7rmm4hyxxbkd3bmf6vwxjb47hso3qijkkico76yczlra"),
"multisig": MustParseCid("bafk2bzacebhhklchvufuhpxt2i7z5mmwdreuselx5muansoshctxinnpgpliy"),
"paymentchannel": MustParseCid("bafk2bzaceb7vn5drx6m5htqz34v36yjf7bhnaiksxk52nzw3qebwfo6jjal2e"),
"reward": MustParseCid("bafk2bzaceatyk4v7h3o7bfsnfk2bhnfeqiu7zzol5ji6u6srrjxvqrqjzbuw2"),
"storagemarket": MustParseCid("bafk2bzacecvdr3ub7dbiaakzs5h4d2nmbkyyzczapr5572kcll5454acbksxs"),
"storageminer": MustParseCid("bafk2bzacecqlaluj7bhhgvxlvpyotsvx5wrakqmxdff4vsluti2gpkdzaya5a"),
"storagepower": MustParseCid("bafk2bzacecswwu6cfmq7pxsdfb2mfbv6gtqn6kjzbak354zdix5dimvzbdt7s"),
"system": MustParseCid("bafk2bzacedx3p6jqiu74wzotaflf3jq5pybqn5ja5e743wvi3aqyusu66g4za"),
"verifiedregistry": MustParseCid("bafk2bzacec3ebmm3m7xuqtsvuqbhw7zdi4gxo2e32xewg2g7uy3qdovwheyoc"),
"account": MustParseCid("bafk2bzaceb56iceglbwg3s2skdjj5vhak7j6srlaxvd7v6hzvxpccwsrvfaxi"),
"cron": MustParseCid("bafk2bzacearjb3buxy4jwhcn4jeqbof3dinsh52zyj74djkfghmjdoxbsvjkq"),
"datacap": MustParseCid("bafk2bzacec2dghsnwhyhquwkbsfcct53pgglxzgmw7j66y3keniklbiq4q7ti"),
"eam": MustParseCid("bafk2bzacecncvb5hhwgippbtl7ievmt4mqxzsainjzouebzcqgdrfdrppav64"),
"embryo": MustParseCid("bafk2bzacecrloi3xb6bwxsiwtl2chxlgisv5742nkcksahcax3fkrso5wiqrk"),
"ethaccount": MustParseCid("bafk2bzacedce5fgwvgu4znffugbnh3rsokd6hwd4slhs7m7p4u7myu4ok2o4g"),
"evm": MustParseCid("bafk2bzaceau4x3lmhtirt34z3cqlrr2o45neof76437ugig3ostctxuodylya"),
"init": MustParseCid("bafk2bzaceaefevckb5rgaldbty6yjce6e6ehtouriz3mvfvrrllm33r663iea"),
"multisig": MustParseCid("bafk2bzacebw6ujt54gyhxvo5jmimg3z54crmfzbbcr677ljqmmb2ejh6srlsm"),
"paymentchannel": MustParseCid("bafk2bzacebfht4drwm5aagcx4kvuiwclldd6rnosce42474u4asnurjqyxhna"),
"reward": MustParseCid("bafk2bzacedqmiebckz7xqs7f7gcj67wzzpko2q3jhom6rwtopogv7iz5bnwlu"),
"storagemarket": MustParseCid("bafk2bzaceam3n2xjbvkyyifw7jvkc4z4lxvblnbmx4ruzr5lpesgmpuhbmb2w"),
"storageminer": MustParseCid("bafk2bzacebcbyuzniiqksk47v7zyfc56noblbsmlqblv3n6s7l5un3heigdwk"),
"storagepower": MustParseCid("bafk2bzacechzbqmunxv6o2zgp4uicswapmgexc3uejco2n2r7cirbijrbgewc"),
"system": MustParseCid("bafk2bzaceb6obdybgoyjvdfxvxg5uxhrpnoixtbof663dllo2eelcuvsfycew"),
"verifiedregistry": MustParseCid("bafk2bzacecnaegov5i37jdpr6rwgviwompt23sghlqjhyseoylxoyzvckvehw"),
},
}, {
Network: "testing-fake-proofs",
@ -386,23 +386,23 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
}, {
Network: "testing-fake-proofs",
Version: 10,
ManifestCid: MustParseCid("bafy2bzaceaf57bp75phft35cnoahig5c7k76uufgije62zdkksfmcot7xvgbe"),
ManifestCid: MustParseCid("bafy2bzacecgynp7le22ye7ooaslgridyccaoybdjpb5wrwsoruqhoyi4aycoc"),
Actors: map[string]cid.Cid{
"account": MustParseCid("bafk2bzacecfqxsyzcphdzgwln3b5umpovfkzx47aznkwfebj4v6bjbas6rrt6"),
"cron": MustParseCid("bafk2bzaceboksft57pinkf7dbfjrls75r476bxztdb6l4uka2vzilsu5o6uug"),
"datacap": MustParseCid("bafk2bzaceaam4245yf3s5qudqznwyc6z74rd4t5tzwo2eye33wvwlvf2p4qww"),
"eam": MustParseCid("bafk2bzacec64tlnnzg2jj3g6f75wjfebftzamnmi2y73ayihp4u5j33fm5k5u"),
"embryo": MustParseCid("bafk2bzacecizctcd5rk63cljrpk3c67rpot6apfqyrhlhhkgh6fhhraxiamya"),
"ethaccount": MustParseCid("bafk2bzaceah7ebvvgau3c2vbcnm4xu273ei76vfytlqco3izjoutu2keusjg2"),
"evm": MustParseCid("bafk2bzacebuuwfmkfxt56haocjgxsa4kug4o63usj6vwgr62au4nbzegz6oku"),
"init": MustParseCid("bafk2bzacecprnaksk7rmm4hyxxbkd3bmf6vwxjb47hso3qijkkico76yczlra"),
"multisig": MustParseCid("bafk2bzacebhhklchvufuhpxt2i7z5mmwdreuselx5muansoshctxinnpgpliy"),
"paymentchannel": MustParseCid("bafk2bzaceb7vn5drx6m5htqz34v36yjf7bhnaiksxk52nzw3qebwfo6jjal2e"),
"reward": MustParseCid("bafk2bzaceatyk4v7h3o7bfsnfk2bhnfeqiu7zzol5ji6u6srrjxvqrqjzbuw2"),
"storagemarket": MustParseCid("bafk2bzacecvdr3ub7dbiaakzs5h4d2nmbkyyzczapr5572kcll5454acbksxs"),
"storageminer": MustParseCid("bafk2bzacebwkphtfrllcv4nskfmcot7drwgk7wd522qutvueh77wxpoq6ag2g"),
"storagepower": MustParseCid("bafk2bzacedt6r5567mt3zxt6xuhdxuapjdcos3e5stebpkfv62x6a3smxhf4y"),
"system": MustParseCid("bafk2bzacedx3p6jqiu74wzotaflf3jq5pybqn5ja5e743wvi3aqyusu66g4za"),
"verifiedregistry": MustParseCid("bafk2bzacec3ebmm3m7xuqtsvuqbhw7zdi4gxo2e32xewg2g7uy3qdovwheyoc"),
"account": MustParseCid("bafk2bzaceb56iceglbwg3s2skdjj5vhak7j6srlaxvd7v6hzvxpccwsrvfaxi"),
"cron": MustParseCid("bafk2bzacearjb3buxy4jwhcn4jeqbof3dinsh52zyj74djkfghmjdoxbsvjkq"),
"datacap": MustParseCid("bafk2bzacec2dghsnwhyhquwkbsfcct53pgglxzgmw7j66y3keniklbiq4q7ti"),
"eam": MustParseCid("bafk2bzacecncvb5hhwgippbtl7ievmt4mqxzsainjzouebzcqgdrfdrppav64"),
"embryo": MustParseCid("bafk2bzacecrloi3xb6bwxsiwtl2chxlgisv5742nkcksahcax3fkrso5wiqrk"),
"ethaccount": MustParseCid("bafk2bzacedce5fgwvgu4znffugbnh3rsokd6hwd4slhs7m7p4u7myu4ok2o4g"),
"evm": MustParseCid("bafk2bzaceau4x3lmhtirt34z3cqlrr2o45neof76437ugig3ostctxuodylya"),
"init": MustParseCid("bafk2bzaceaefevckb5rgaldbty6yjce6e6ehtouriz3mvfvrrllm33r663iea"),
"multisig": MustParseCid("bafk2bzacebw6ujt54gyhxvo5jmimg3z54crmfzbbcr677ljqmmb2ejh6srlsm"),
"paymentchannel": MustParseCid("bafk2bzacebfht4drwm5aagcx4kvuiwclldd6rnosce42474u4asnurjqyxhna"),
"reward": MustParseCid("bafk2bzacedqmiebckz7xqs7f7gcj67wzzpko2q3jhom6rwtopogv7iz5bnwlu"),
"storagemarket": MustParseCid("bafk2bzaceam3n2xjbvkyyifw7jvkc4z4lxvblnbmx4ruzr5lpesgmpuhbmb2w"),
"storageminer": MustParseCid("bafk2bzaceataoi4vlifq2roanrfjt2f2cql2dq4osjs5i3nt4v76462mtrcm2"),
"storagepower": MustParseCid("bafk2bzacede4nq6cbym2z7p5vc2gwbxhnd34qxtd7sy4rmwula3kk6yhbqtve"),
"system": MustParseCid("bafk2bzaceb6obdybgoyjvdfxvxg5uxhrpnoixtbof663dllo2eelcuvsfycew"),
"verifiedregistry": MustParseCid("bafk2bzacecnaegov5i37jdpr6rwgviwompt23sghlqjhyseoylxoyzvckvehw"),
},
}}

14
chain/vm/fvm.go
View File

@ -329,20 +329,6 @@ func NewFVM(ctx context.Context, opts *VMOpts) (*FVM, error) {
return nil, xerrors.Errorf("creating fvm opts: %w", err)
}
if os.Getenv("LOTUS_USE_FVM_CUSTOM_BUNDLE") == "1" {
av, err := actorstypes.VersionForNetwork(opts.NetworkVersion)
if err != nil {
return nil, xerrors.Errorf("mapping network version to actors version: %w", err)
}
c, ok := actors.GetManifest(av)
if !ok {
return nil, xerrors.Errorf("no manifest for custom bundle (actors version %d)", av)
}
fvmOpts.Manifest = c
}
fvm, err := ffi.CreateFVM(fvmOpts)
if err != nil {

6
chain/vm/vm.go
View File

@ -57,10 +57,10 @@ func ResolveToKeyAddr(state types.StateTree, cst cbor.IpldStore, addr address.Ad
}
if state.Version() >= types.StateTreeVersion5 {
if act.Address == nil {
return address.Undef, xerrors.Errorf("actor at %s doesn't have a predictable address", addr)
if act.Address != nil {
// If there _is_ an f4 address, return it as "key" address
return *act.Address, nil
}
return *act.Address, nil
}
aast, err := account.Load(adt.WrapStore(context.TODO(), cst), act)

2
extern/filecoin-ffi vendored

@ -1 +1 @@
Subproject commit 21217875e44f50c3851615de3ced674a6fdc386c
Subproject commit 9f2ccf7d8c50737a06c1bd5dbe72c088d143cf37