diff --git a/Makefile b/Makefile index 67267fb66..c085faafb 100644 --- a/Makefile +++ b/Makefile @@ -87,6 +87,9 @@ interopnet: build-devnets wallabynet: GOFLAGS+=-tags=wallabynet wallabynet: build-devnets +hyperspacenet: GOFLAGS+=-tags=hyperspacenet +hyperspacenet: build-devnets + lotus: $(BUILD_DEPS) rm -f lotus $(GOCC) build $(GOFLAGS) -o lotus ./cmd/lotus diff --git a/build/actors/pack.sh b/build/actors/pack.sh index c2060e67c..2702c80d5 100755 --- a/build/actors/pack.sh +++ b/build/actors/pack.sh @@ -1,6 +1,6 @@ #!/bin/bash -NETWORKS=(devnet mainnet caterpillarnet butterflynet testing testing-fake-proofs calibrationnet) +NETWORKS=(devnet mainnet caterpillarnet butterflynet testing testing-fake-proofs calibrationnet hyperspace) set -e diff --git a/build/actors/v10.tar.zst b/build/actors/v10.tar.zst index 911e89549..5d6f16678 100644 Binary files a/build/actors/v10.tar.zst and b/build/actors/v10.tar.zst differ diff --git a/build/builtin_actors_gen.go b/build/builtin_actors_gen.go index 1a5989cb2..55d3b0aa7 100644 --- a/build/builtin_actors_gen.go +++ b/build/builtin_actors_gen.go @@ -44,24 +44,24 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet }, { Network: "butterflynet", Version: 10, - ManifestCid: MustParseCid("bafy2bzaceb5nbv4t5oinnynbhhto5i75wjthnepki6yfuegngx4x6d3ytnlki"), + ManifestCid: MustParseCid("bafy2bzaceav7txndea2xt6kvaosokp42vyjkhtplbb67tpkov3jbsvbwplnz4"), Actors: map[string]cid.Cid{ "account": MustParseCid("bafk2bzacec34ox7drngorgal3ujxat2a2dlsh7eissgiisrv2uubuub2avbe2"), "cron": MustParseCid("bafk2bzaceb77n6gkytpkn2wguemnpfqfaynv7u6ci4j247leg2w3dhcoxa5ns"), "datacap": MustParseCid("bafk2bzacebj2ztqmlb7mmkggaqf66sv7gao5722vzmpnngiuncu4efpsjyhy4"), - "eam": MustParseCid("bafk2bzaced4362rbaz5v2ukmkql7lwqisldv6xlf7t5cegibz7l25xwhtrvfw"), - "embryo": MustParseCid("bafk2bzacecrloi3xb6bwxsiwtl2chxlgisv5742nkcksahcax3fkrso5wiqrk"), - "ethaccount": MustParseCid("bafk2bzaceaqsjvbisffgbp5aseubjgymc4qyumpqs7iwbonhmoosvhkfxa4la"), - "evm": MustParseCid("bafk2bzaceb6v5nimmw4qh235yctliz4544ipdbtqfzdiua7udadmseys7fc3y"), - "init": MustParseCid("bafk2bzaceayghd65ndit5zyd3apagbd66rgltiqacvxt52veazknmup7sawmm"), + "eam": MustParseCid("bafk2bzacecvl6xpmldfk5oyehqhmuasp7cbx3kh3y425curdy65hlmhovc4oi"), + "ethaccount": MustParseCid("bafk2bzacec2wy3fknb63r5zili7qojvt4f3rvstweqvnjne5adarx3lskgz5m"), + "evm": MustParseCid("bafk2bzacebtoqzucrh7kvtxpo4ruzisey67z6t3z5cbff4c36du3dlm3aj4l6"), + "init": MustParseCid("bafk2bzacebvc5t5u3opeyx4rxbeinshjsghjhttdbsyqifb4ikzpa2ic5mkhu"), "multisig": MustParseCid("bafk2bzaceckmb2bcw2m5o4hifhodrq2j6ow5nhouj5wpqsxpzntgveft3hplu"), "paymentchannel": MustParseCid("bafk2bzacebsvkpbavcdjguev4dxfnjx5j5bqzeeyk3petwbkmfptoej5bqlqc"), + "placeholder": MustParseCid("bafk2bzacedv773z6clfjh7wxvlqd6ki7bncztt73org7apnnt2acjigrjdg4a"), "reward": MustParseCid("bafk2bzacea3rkyhzmugj6ap3uv5m5jnhxt64y2775vo6vemdi5aafzxty3nmq"), "storagemarket": MustParseCid("bafk2bzacebfacbnuauxhq63f5jbchoi2xwc5ljrxnwgj2xulkx4yzfu6i4lhg"), "storageminer": MustParseCid("bafk2bzaceal4ct6gwlzl3owu6d4iiudf4ioxth5gn6cvm37enl465px2bhznk"), "storagepower": MustParseCid("bafk2bzaceb5pdkt55d7wxjgmhvzvnlkuw5r6eamypgqm5kem5tz3sxddwtizw"), "system": MustParseCid("bafk2bzacecuu2y5b6r4jrj64w5yuh3klnoevrcnbdxozmtagdcyfve7oe27ri"), - "verifiedregistry": MustParseCid("bafk2bzaceckiidxsddxm6xk5aq6wk6fcrulwmjgrhedxsibhdr54loxp4zv7i"), + "verifiedregistry": MustParseCid("bafk2bzacediez3q42tjeit7hbsglv33ltfeamoa43lftwsxh2nyov5ijhuihm"), }, }, { Network: "calibrationnet", @@ -101,24 +101,24 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet }, { Network: "calibrationnet", Version: 10, - ManifestCid: MustParseCid("bafy2bzacedos7zqn7flbdqeyud3ia4nd7cwzng6bky4n3sufc2lbf7ggvyrnc"), + ManifestCid: MustParseCid("bafy2bzacebb4qaymahytofcakf3vcyuv4tnu4zsgxp4iikc6kkmfagtaierro"), Actors: map[string]cid.Cid{ "account": MustParseCid("bafk2bzaceakcix46r7hh4wjhzaksnha6f5elbg62ld6dklz6ttkhisnppmoe2"), "cron": MustParseCid("bafk2bzaceb5ezi5dlgxjmxffecrmgiajwseiblgivho5qnfejivuqxfclooma"), "datacap": MustParseCid("bafk2bzaceag4j2myqvwevm3mdtvmqoeguwtjheyezodjcpq5ugibjx6gtz65u"), - "eam": MustParseCid("bafk2bzaceczqgbjhm6babto776wlzvebe2wenxzsowqyeb6w5irlbju5wauuw"), - "embryo": MustParseCid("bafk2bzacecrloi3xb6bwxsiwtl2chxlgisv5742nkcksahcax3fkrso5wiqrk"), - "ethaccount": MustParseCid("bafk2bzaceciajp3pacjn45zukaw7mxr2fksyscf4ax2hpjudtxgfjndzb54d2"), - "evm": MustParseCid("bafk2bzacebzsl4l4rs5vcuayiy6y76nharwreis75lkdkjwiztrngg7spnnr2"), - "init": MustParseCid("bafk2bzacecoa7y64uh4uqxfdvfnbm2v4vmj4acqzwovy6vecuthbafjtvdau4"), + "eam": MustParseCid("bafk2bzacedwnuqthwpl3si5gs27xnxq7bcr5ucg3vg4utltfhnytaqzwlk33g"), + "ethaccount": MustParseCid("bafk2bzacechx3zdc4yw7ehtelecwsp6hb2iguefusfccqxfmdinjjoa64ado4"), + "evm": MustParseCid("bafk2bzaceaqtomr2odeyjabgkwnwfgm54b44cpshpkssn7nq35umzogkqqbee"), + "init": MustParseCid("bafk2bzacebtqjmdudvfl5cq6yqswortlc46cjpz36qj5igzfglu55kppuovyw"), "multisig": MustParseCid("bafk2bzaceb2hlrmljz26gecv7zj5ymeleiuebf6mnvc7vng3qbcxvxagrlc22"), "paymentchannel": MustParseCid("bafk2bzacecbn4m6evxxoalujyt4wnas3hdttffzjee5qjp62w7dsjdoeuhzka"), + "placeholder": MustParseCid("bafk2bzacedv773z6clfjh7wxvlqd6ki7bncztt73org7apnnt2acjigrjdg4a"), "reward": MustParseCid("bafk2bzaceds2kn4fn27nwlxx2raawldkytlro6i2qeh6rdtmme6ybd4otpwqq"), "storagemarket": MustParseCid("bafk2bzacec35rrhgiqqrwqjtuhoseg7e4g67sqaa74b2x2p7f37ylfulc672i"), "storageminer": MustParseCid("bafk2bzaceaiwkboswmk4kmzctnzd5txf2axdvladlf6x5as7ey7avxa5dgfd4"), "storagepower": MustParseCid("bafk2bzaceb2nlgx5aw2psgiedc7oqefs6mttwcloczsbucxtit55zzpbgr4fc"), "system": MustParseCid("bafk2bzacecki2gyvfguathvwva4ilovedftfuxvk3rhuw4y2t4aawkm2e5ttq"), - "verifiedregistry": MustParseCid("bafk2bzaceds6bqzlz7lbqlh5wj7pefs3zqbcvkzqb7kipo33ffgizgwk4e6vi"), + "verifiedregistry": MustParseCid("bafk2bzacebvicauwopayihp5jjegtma26nuhubauya73tkhpdfs27xwjutn4w"), }, }, { Network: "caterpillarnet", @@ -158,24 +158,24 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet }, { Network: "caterpillarnet", Version: 10, - ManifestCid: MustParseCid("bafy2bzaced6oprsryct3hn5ds6n6ijefeebj6zmpu26uuqax6jxrjihbezhrm"), + ManifestCid: MustParseCid("bafy2bzacedktxutlehqmx2uryphph6dln4wbgy6yfsj7un36b2u7l7a32n3km"), Actors: map[string]cid.Cid{ "account": MustParseCid("bafk2bzaceaoina2vmmq24ij5kqbgawjrlnxkmj6arzucoigabt25ch6cdvbyc"), "cron": MustParseCid("bafk2bzaceancnphwoym4pmzatrzfxo3bac72gk4bjgaqxedrigfrua62an3n2"), "datacap": MustParseCid("bafk2bzaceaoebtmqyqvyv7oq7ehdkhl6fxjamz5fjdje7axslxsc7rhqchcdm"), - "eam": MustParseCid("bafk2bzacebk3bpluettymypn6junclggl75drrhuhxprqkhw2e4umpmi4e6hg"), - "embryo": MustParseCid("bafk2bzacecrloi3xb6bwxsiwtl2chxlgisv5742nkcksahcax3fkrso5wiqrk"), - "ethaccount": MustParseCid("bafk2bzacebcfoajhcnwz73c3lya36wkdujbmc47yyyo7ievppn2bim6eu44n6"), - "evm": MustParseCid("bafk2bzacedll35l3fvsy3o45voqf4i3c734scppah6uncycqduyslgjxzccfs"), - "init": MustParseCid("bafk2bzacecie5karfyo6sucyw6uqdbzj2k6dfzfkxdwduxmpyv2fymw5vocaa"), + "eam": MustParseCid("bafk2bzaceazfxudfagmhdmwx46sjeyqoba3quy7cllqv2nuksh3ikc6gw63yg"), + "ethaccount": MustParseCid("bafk2bzaceblsm6aaymb2ua64eqbe32uyxdoyqzger5recw6k4p43yeu2oyigi"), + "evm": MustParseCid("bafk2bzacea7jveqmq5u6ijabkbuujtgqzmy3p5zl5x45frnygio3hqqnabbso"), + "init": MustParseCid("bafk2bzacecdewh4goftyp2cmuq3zpkyjinv6faysksjgqxtbk2j5dljv75rgq"), "multisig": MustParseCid("bafk2bzacecpscu24o2fwlspi64k3fiaufeh3nnrv6wgumvaeco2jduhposcf4"), "paymentchannel": MustParseCid("bafk2bzacedxc3fy436wlebsusgwcwqf6lzo7yv5iugy75z5hwrdt33pq2rhho"), + "placeholder": MustParseCid("bafk2bzacedv773z6clfjh7wxvlqd6ki7bncztt73org7apnnt2acjigrjdg4a"), "reward": MustParseCid("bafk2bzacebzvjtzzuo6ijkbx2yx3ly6vlrgw37fymasdwcdymlxc26znib2og"), "storagemarket": MustParseCid("bafk2bzaceabdr5l4qluc4rgxjxo4xnoyc5e6slp7s3fojhnv4ng3swu7qv556"), "storageminer": MustParseCid("bafk2bzaceclwbgfqr7wqepi6xkpoqz2bl6p22mlbmsgs4zarxki2cub5rspxy"), "storagepower": MustParseCid("bafk2bzacean3trpjoxvwztrmbw7lx6osapicxzclyz2cgou4upq432norjnaq"), "system": MustParseCid("bafk2bzacedeexlnmp677eauba76trar47p2zddbspiodri5aof6ccasyicxxo"), - "verifiedregistry": MustParseCid("bafk2bzacedtbz5abyziamn6zmfx5f7wg7gmynvbw5s6zotbxthvlrozr5ilym"), + "verifiedregistry": MustParseCid("bafk2bzaceayctmu2avbckz4scuep3ocxsw5r3eqxz7wu27volaxnvfvoxjhbq"), }, }, { Network: "devnet", @@ -215,24 +215,46 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet }, { Network: "devnet", Version: 10, - ManifestCid: MustParseCid("bafy2bzaceacjowbwyzmumpklljrvpykppgg7pbnnghzqcrwghig2nhmvpaw3k"), + ManifestCid: MustParseCid("bafy2bzacea2wblucgi2tztgk52fap2wsjddrrobito5zdklqdhpdwhmyr7lbk"), Actors: map[string]cid.Cid{ "account": MustParseCid("bafk2bzacealrkumvvuyeefrnedyh2ilgozgrdp5canubuakp723pczjdcogvw"), "cron": MustParseCid("bafk2bzacedcfqpqgwj4tgtccliqzwnjbxiceyc3lzylnf6owu54etiv3udjxi"), "datacap": MustParseCid("bafk2bzacear73heimtdso2qnw77gx6lzqmnr5f5etlggwevut5di6d7nzaoqu"), - "eam": MustParseCid("bafk2bzacebeu5tdbnjv5avoftxb2jlwpno3zylyyvs3ch3x55jxvrzkbmkceq"), - "embryo": MustParseCid("bafk2bzacecrloi3xb6bwxsiwtl2chxlgisv5742nkcksahcax3fkrso5wiqrk"), - "ethaccount": MustParseCid("bafk2bzaceco7ybkncres3pxbtobvj4vax34ixgxsm4ny6ffkmyvisttp6ban6"), - "evm": MustParseCid("bafk2bzaceayr2nqixvlb4nuhvyogaie2i3ji6ydv52r4idh5xwluj646qxmeq"), - "init": MustParseCid("bafk2bzacebdjwaharaqxneaa5a5yoz44scdhi4v3emtmvfmkjioagyzwi3r2s"), + "eam": MustParseCid("bafk2bzacecff4dgsqjcele3zejp77weofbqkef57r2tcy4alkx7e7n3kbkmyy"), + "ethaccount": MustParseCid("bafk2bzacec75pm3q66lsex2mqpm7fax7h6bfbkpwodf4o5gzgnrc2cdifbvfw"), + "evm": MustParseCid("bafk2bzaceacbkauvu7ia3euoz5jfdrkw5s7mk4ga5byf3oqndxeaxyxhgnk4m"), + "init": MustParseCid("bafk2bzacebtc7p3fq4d7m76jphagzpav2kfxfok7d56wrkek4zqyfqvtpihwm"), "multisig": MustParseCid("bafk2bzaceci3czx4l42u22iozsgg6zkls5wdtrztekmzy4qnybg4qlv4b3qli"), "paymentchannel": MustParseCid("bafk2bzacea54hgf2czdhlxvn66pyoon5cw3fwdlwx4kp4fwftv2tat4r4nnqg"), + "placeholder": MustParseCid("bafk2bzacedv773z6clfjh7wxvlqd6ki7bncztt73org7apnnt2acjigrjdg4a"), "reward": MustParseCid("bafk2bzacebd7ia2qfpxob2enuazpy3yc2wpach5rq2qbm7uwgknyzqqruefmm"), "storagemarket": MustParseCid("bafk2bzaceam7ns7axlv3sghrwdo7kriw2hrlblim2pingllnvatqu2xfjfhgs"), "storageminer": MustParseCid("bafk2bzacecbfmgzg5unc3ia7yme75psji2j6uhalt5jco6niu6wcn3pdufavy"), "storagepower": MustParseCid("bafk2bzacedxzvoqa3a4lzajoke75q2ujhmazm4inb7robfikgtywr4sp6mgcy"), "system": MustParseCid("bafk2bzaceb5wpgomztoaxfv2hhgb5xtbmq4t53wev6mg4yonax5glbi4dtcoe"), - "verifiedregistry": MustParseCid("bafk2bzacecpqfg7ixkwcgr6u6nb3xvyrur5yelhtge4w6um4spfwcl432mi64"), + "verifiedregistry": MustParseCid("bafk2bzacedf2f53g4cuvt6efwlga2sbovuy3tzcc2rhjh5eaa5f2ivri25ehc"), + }, +}, { + Network: "hyperspace", + Version: 10, + ManifestCid: MustParseCid("bafy2bzacearfqpg6omcyjot2zc5yynkb4bsfkykqacmwaiwiodvhlin4j4xta"), + Actors: map[string]cid.Cid{ + "account": MustParseCid("bafk2bzacec63ehicn6roe4hwtktiqjdpn7buw4vewix2fshvk7ruk6bg54bga"), + "cron": MustParseCid("bafk2bzacedgz5736vxapicnbdrk5yrbgwbjizhr5hjglxwkb6sonqpoyaid4u"), + "datacap": MustParseCid("bafk2bzacedmuhap3ephpwcvyqxry54irmw5zaz74abhmnjlwrf6ioihrzcqgu"), + "eam": MustParseCid("bafk2bzacedx5iw3jyrdfkvgqcas244e6hqotli72uinwiy74ae7s4imax6agc"), + "ethaccount": MustParseCid("bafk2bzacectie3kbxquentwvrlcwoqzfisfcqfgngzgyndhjgclmg7cyf6zwa"), + "evm": MustParseCid("bafk2bzacedtbvq77pb4vd7rx2inklizjeipt7myb7tim5hms2vzzmuareekrw"), + "init": MustParseCid("bafk2bzacebcmb4nwbhambosg2xcfhifkqnaoxsotfwekmxeq7phgqgxzzxnts"), + "multisig": MustParseCid("bafk2bzacedw73tmdl7stykyycxmhsb3iom7notxmx24b2647g3vwmrg2brgqu"), + "paymentchannel": MustParseCid("bafk2bzaced5frgcp6bszhis5kxtm6uko5jlgbuzyczqsj7uavovkayrbizg4s"), + "placeholder": MustParseCid("bafk2bzacedv773z6clfjh7wxvlqd6ki7bncztt73org7apnnt2acjigrjdg4a"), + "reward": MustParseCid("bafk2bzaceddc5c45lnbo7i3uknk5zi3qbq6k4rocfoq3n7x3qerehyevjl7ja"), + "storagemarket": MustParseCid("bafk2bzaceafqt55lykve6ex5bw65ueuec6bjcwfmq6vbhwbgjmpt4cztldzle"), + "storageminer": MustParseCid("bafk2bzacebongyek6ijaqzup6fe2kplq24dr3dtvweu5fmfjl236rjhyqv3gs"), + "storagepower": MustParseCid("bafk2bzaceapgnms6ldjpewmniaqawu5sflssycjbwydqvilja66y5wm4lulwq"), + "system": MustParseCid("bafk2bzaceaki4yktxjcaxuj4be4q2ybrjiqcqq7orgzqgmidcavn3dzxyo7ds"), + "verifiedregistry": MustParseCid("bafk2bzacedrd4uxho6tpksyullgb6lofudlwntjwt7sqrtdgzjoj6eu7onwnc"), }, }, { Network: "mainnet", @@ -272,24 +294,24 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet }, { Network: "mainnet", Version: 10, - ManifestCid: MustParseCid("bafy2bzacebcqsdiam2ow7p4jj4uwkfylbdlr6nzjylpquas3glhzzavjzxlv4"), + ManifestCid: MustParseCid("bafy2bzacedjq47v3yxxptl3vvtpin4optnhoe7ynxjncuhpak2ifdvff2mrfy"), Actors: map[string]cid.Cid{ "account": MustParseCid("bafk2bzaceb7wftmnoa5zbeu6jsrzvqpjfd7kudhueve6duwxcflcaqeagqg6g"), "cron": MustParseCid("bafk2bzacean2xecc6kfbrueglsujjqswz5nvjstmtvdq2zc5vk4cbh6gvgxcq"), "datacap": MustParseCid("bafk2bzacear4esja4asfsdeqto6o5cjn5dbgxmzvu2uel36tzdp2s26fkte4y"), - "eam": MustParseCid("bafk2bzacecmcgidxjjaeakhgfh3oexonagta3ukzombuykj4xntkla4hfzzos"), - "embryo": MustParseCid("bafk2bzacecrloi3xb6bwxsiwtl2chxlgisv5742nkcksahcax3fkrso5wiqrk"), - "ethaccount": MustParseCid("bafk2bzacedcrh3gj3yqjylyad2ycon3rtsiitjvrcpcm26e7godh2ep44tw2e"), - "evm": MustParseCid("bafk2bzaceao7talgkskaw6eax4l5c3kkpr3v6kvxg4ta3nn5j25ljwbeumiik"), - "init": MustParseCid("bafk2bzaceckpb6a4g5wgqcooc5nd7rxbaziylv43yvvpgas4giwfzdpexh66a"), + "eam": MustParseCid("bafk2bzacectduzxzk23xffgohmsmq4gisl4etaguq2xe6h52y7aiaaibmi2pg"), + "ethaccount": MustParseCid("bafk2bzacecqoxzy2p3i46ncuvw6wzlesaw5iobqpp7nmjtkbxyiwblg4frzmg"), + "evm": MustParseCid("bafk2bzacecgz6klga2lwjp3d3iyzkzm4td5aefeaymmn3rmixgg7a4vwoewcu"), + "init": MustParseCid("bafk2bzacebzrlucqk23kkjv26srpzjgztx7qjm23suqbyzu2qdto5jbpifm7y"), "multisig": MustParseCid("bafk2bzacedls4tgmkfkasgcsfrtnkjoi6yoze5yq4cafqzbjvbty5gfeut4n4"), "paymentchannel": MustParseCid("bafk2bzaceazuokt65n3hqjgmwmgoi6gpcvete2b46nlecnynjkgrzp4wnl4ii"), + "placeholder": MustParseCid("bafk2bzacedv773z6clfjh7wxvlqd6ki7bncztt73org7apnnt2acjigrjdg4a"), "reward": MustParseCid("bafk2bzacecqjpnbxravwqb7liwxowb5bdml4x2qboo5vqxk7slprq3eo4ujp2"), "storagemarket": MustParseCid("bafk2bzacecuedinzm256nup2pbsdrnxerfk33hqxhakupb3c26fwk576ehgiw"), "storageminer": MustParseCid("bafk2bzaceb4c7iqlmk4lgnkccpdvzdv6kbwqz2leyluuehh2ino2m6e5cd7d6"), "storagepower": MustParseCid("bafk2bzacedkwcuzvlx43nbwdwms5smerdaeja45rh7d646k4nc4s5toyryuxi"), "system": MustParseCid("bafk2bzacedexhpixywvxk37jyp3sehcqmomyq4kpxu3wjhrehawyjhv6grav2"), - "verifiedregistry": MustParseCid("bafk2bzacebgqhqcunonbvtxbb23x6vg7p34qs223es4e4vmbklcyzllp5f2o2"), + "verifiedregistry": MustParseCid("bafk2bzacebsnm343frbrfted3vbia4to7iiav4qm3tvpkcbsgkd5fynop3q7s"), }, }, { Network: "testing", @@ -329,24 +351,24 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet }, { Network: "testing", Version: 10, - ManifestCid: MustParseCid("bafy2bzacedj5yryqieqalnh5qcvy2nv4zh5urd55i5iiq5wbxurpcxjjkutem"), + ManifestCid: MustParseCid("bafy2bzacececfnvx4hay5b6yhtkxdqgkauupeqpwnlgainug6blp2isihwtww"), Actors: map[string]cid.Cid{ "account": MustParseCid("bafk2bzaceb56iceglbwg3s2skdjj5vhak7j6srlaxvd7v6hzvxpccwsrvfaxi"), "cron": MustParseCid("bafk2bzacearjb3buxy4jwhcn4jeqbof3dinsh52zyj74djkfghmjdoxbsvjkq"), "datacap": MustParseCid("bafk2bzacec2dghsnwhyhquwkbsfcct53pgglxzgmw7j66y3keniklbiq4q7ti"), - "eam": MustParseCid("bafk2bzacecncvb5hhwgippbtl7ievmt4mqxzsainjzouebzcqgdrfdrppav64"), - "embryo": MustParseCid("bafk2bzacecrloi3xb6bwxsiwtl2chxlgisv5742nkcksahcax3fkrso5wiqrk"), - "ethaccount": MustParseCid("bafk2bzacedce5fgwvgu4znffugbnh3rsokd6hwd4slhs7m7p4u7myu4ok2o4g"), - "evm": MustParseCid("bafk2bzacedn2kvhglsk6ke7cpkvgiez7a5sqild6rehnmfve2f7i3xwinx4lm"), - "init": MustParseCid("bafk2bzaceaefevckb5rgaldbty6yjce6e6ehtouriz3mvfvrrllm33r663iea"), + "eam": MustParseCid("bafk2bzacedojoymbgz275lzvtlpaf2thoydz7fb274mhvadbpk2thbgpye72s"), + "ethaccount": MustParseCid("bafk2bzaceddhvqqkwc4p7exdgv2bwefkk3lnq2rw6chvar7hdeowahtjdmznw"), + "evm": MustParseCid("bafk2bzacecgzk3ompisq5n7oualijioce6nhsm6zwil7p5p57nojuyrdckti2"), + "init": MustParseCid("bafk2bzaceacdto7l5qp65ukclc3qqlfpv3tdio7u5lxufg2uc3hrx5hpqt2x2"), "multisig": MustParseCid("bafk2bzacebw6ujt54gyhxvo5jmimg3z54crmfzbbcr677ljqmmb2ejh6srlsm"), "paymentchannel": MustParseCid("bafk2bzacebfht4drwm5aagcx4kvuiwclldd6rnosce42474u4asnurjqyxhna"), + "placeholder": MustParseCid("bafk2bzacedv773z6clfjh7wxvlqd6ki7bncztt73org7apnnt2acjigrjdg4a"), "reward": MustParseCid("bafk2bzacedqmiebckz7xqs7f7gcj67wzzpko2q3jhom6rwtopogv7iz5bnwlu"), "storagemarket": MustParseCid("bafk2bzaceam3n2xjbvkyyifw7jvkc4z4lxvblnbmx4ruzr5lpesgmpuhbmb2w"), "storageminer": MustParseCid("bafk2bzacebcbyuzniiqksk47v7zyfc56noblbsmlqblv3n6s7l5un3heigdwk"), "storagepower": MustParseCid("bafk2bzacechzbqmunxv6o2zgp4uicswapmgexc3uejco2n2r7cirbijrbgewc"), "system": MustParseCid("bafk2bzaceb6obdybgoyjvdfxvxg5uxhrpnoixtbof663dllo2eelcuvsfycew"), - "verifiedregistry": MustParseCid("bafk2bzacecnaegov5i37jdpr6rwgviwompt23sghlqjhyseoylxoyzvckvehw"), + "verifiedregistry": MustParseCid("bafk2bzacedlogwaofqaqou4pckoatwei2ulbz3ucjmbsm3lfwuw3tr7g5opjc"), }, }, { Network: "testing-fake-proofs", @@ -386,23 +408,23 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet }, { Network: "testing-fake-proofs", Version: 10, - ManifestCid: MustParseCid("bafy2bzaceaio32mih77334abeikzq7cgx75i7ylvxq3imifeohkvgiex4tg6k"), + ManifestCid: MustParseCid("bafy2bzacec4yawvg2rbdvzlez4lyf4e7ysjfjdrg5mpclvvwxt7texyeeletg"), Actors: map[string]cid.Cid{ "account": MustParseCid("bafk2bzaceb56iceglbwg3s2skdjj5vhak7j6srlaxvd7v6hzvxpccwsrvfaxi"), "cron": MustParseCid("bafk2bzacearjb3buxy4jwhcn4jeqbof3dinsh52zyj74djkfghmjdoxbsvjkq"), "datacap": MustParseCid("bafk2bzacec2dghsnwhyhquwkbsfcct53pgglxzgmw7j66y3keniklbiq4q7ti"), - "eam": MustParseCid("bafk2bzacecncvb5hhwgippbtl7ievmt4mqxzsainjzouebzcqgdrfdrppav64"), - "embryo": MustParseCid("bafk2bzacecrloi3xb6bwxsiwtl2chxlgisv5742nkcksahcax3fkrso5wiqrk"), - "ethaccount": MustParseCid("bafk2bzacedce5fgwvgu4znffugbnh3rsokd6hwd4slhs7m7p4u7myu4ok2o4g"), - "evm": MustParseCid("bafk2bzacedn2kvhglsk6ke7cpkvgiez7a5sqild6rehnmfve2f7i3xwinx4lm"), - "init": MustParseCid("bafk2bzaceaefevckb5rgaldbty6yjce6e6ehtouriz3mvfvrrllm33r663iea"), + "eam": MustParseCid("bafk2bzacedojoymbgz275lzvtlpaf2thoydz7fb274mhvadbpk2thbgpye72s"), + "ethaccount": MustParseCid("bafk2bzaceddhvqqkwc4p7exdgv2bwefkk3lnq2rw6chvar7hdeowahtjdmznw"), + "evm": MustParseCid("bafk2bzacecgzk3ompisq5n7oualijioce6nhsm6zwil7p5p57nojuyrdckti2"), + "init": MustParseCid("bafk2bzaceacdto7l5qp65ukclc3qqlfpv3tdio7u5lxufg2uc3hrx5hpqt2x2"), "multisig": MustParseCid("bafk2bzacebw6ujt54gyhxvo5jmimg3z54crmfzbbcr677ljqmmb2ejh6srlsm"), "paymentchannel": MustParseCid("bafk2bzacebfht4drwm5aagcx4kvuiwclldd6rnosce42474u4asnurjqyxhna"), + "placeholder": MustParseCid("bafk2bzacedv773z6clfjh7wxvlqd6ki7bncztt73org7apnnt2acjigrjdg4a"), "reward": MustParseCid("bafk2bzacedqmiebckz7xqs7f7gcj67wzzpko2q3jhom6rwtopogv7iz5bnwlu"), "storagemarket": MustParseCid("bafk2bzaceam3n2xjbvkyyifw7jvkc4z4lxvblnbmx4ruzr5lpesgmpuhbmb2w"), "storageminer": MustParseCid("bafk2bzaceataoi4vlifq2roanrfjt2f2cql2dq4osjs5i3nt4v76462mtrcm2"), "storagepower": MustParseCid("bafk2bzacede4nq6cbym2z7p5vc2gwbxhnd34qxtd7sy4rmwula3kk6yhbqtve"), "system": MustParseCid("bafk2bzaceb6obdybgoyjvdfxvxg5uxhrpnoixtbof663dllo2eelcuvsfycew"), - "verifiedregistry": MustParseCid("bafk2bzacecnaegov5i37jdpr6rwgviwompt23sghlqjhyseoylxoyzvckvehw"), + "verifiedregistry": MustParseCid("bafk2bzacedlogwaofqaqou4pckoatwei2ulbz3ucjmbsm3lfwuw3tr7g5opjc"), }, }} diff --git a/build/params_hyperspace.go b/build/params_hyperspace.go new file mode 100644 index 000000000..e1f082f41 --- /dev/null +++ b/build/params_hyperspace.go @@ -0,0 +1,98 @@ +//go:build hyperspace +// +build hyperspace + +package build + +import ( + "github.com/ipfs/go-cid" + + "github.com/filecoin-project/go-address" + "github.com/filecoin-project/go-state-types/abi" + actorstypes "github.com/filecoin-project/go-state-types/actors" + "github.com/filecoin-project/go-state-types/network" + builtin2 "github.com/filecoin-project/specs-actors/v2/actors/builtin" + + "github.com/filecoin-project/lotus/chain/actors/policy" +) + +var NetworkBundle = "hyperspace" +var BundleOverrides map[actorstypes.Version]string +var ActorDebugging = true + +const BootstrappersFile = "hyperspace.pi" +const GenesisFile = "hyperspace.car" + +const GenesisNetworkVersion = network.Version18 + +var NetworkBundle = "hyperspacenet" +var BundleOverrides map[actorstypes.Version]string +var ActorDebugging = false + +var UpgradeBreezeHeight = abi.ChainEpoch(-1) + +const BreezeGasTampingDuration = 120 + +var UpgradeSmokeHeight = abi.ChainEpoch(-1) +var UpgradeIgnitionHeight = abi.ChainEpoch(-2) +var UpgradeRefuelHeight = abi.ChainEpoch(-3) +var UpgradeTapeHeight = abi.ChainEpoch(-4) + +var UpgradeAssemblyHeight = abi.ChainEpoch(-5) +var UpgradeLiftoffHeight = abi.ChainEpoch(-6) + +var UpgradeKumquatHeight = abi.ChainEpoch(-7) +var UpgradeCalicoHeight = abi.ChainEpoch(-9) +var UpgradePersianHeight = abi.ChainEpoch(-10) +var UpgradeOrangeHeight = abi.ChainEpoch(-11) +var UpgradeClausHeight = abi.ChainEpoch(-12) + +var UpgradeTrustHeight = abi.ChainEpoch(-13) + +var UpgradeNorwegianHeight = abi.ChainEpoch(-14) + +var UpgradeTurboHeight = abi.ChainEpoch(-15) + +var UpgradeHyperdriveHeight = abi.ChainEpoch(-16) +var UpgradeChocolateHeight = abi.ChainEpoch(-17) +var UpgradeOhSnapHeight = abi.ChainEpoch(-18) +var UpgradeSkyrHeight = abi.ChainEpoch(-19) +var UpgradeSharkHeight = abi.ChainEpoch(-20) +var UpgradeHyggeHeight = abi.ChainEpoch(-21) + +var DrandSchedule = map[abi.ChainEpoch]DrandEnum{ + 0: DrandMainnet, +} + +var SupportedProofTypes = []abi.RegisteredSealProof{ + abi.RegisteredSealProof_StackedDrg512MiBV1, + abi.RegisteredSealProof_StackedDrg32GiBV1, + abi.RegisteredSealProof_StackedDrg64GiBV1, +} +var ConsensusMinerMinPower = abi.NewStoragePower(16 << 30) +var MinVerifiedDealSize = abi.NewStoragePower(1 << 20) +var PreCommitChallengeDelay = abi.ChainEpoch(10) + +func init() { + policy.SetSupportedProofTypes(SupportedProofTypes...) + policy.SetConsensusMinerMinPower(ConsensusMinerMinPower) + policy.SetMinVerifiedDealSize(MinVerifiedDealSize) + policy.SetPreCommitChallengeDelay(PreCommitChallengeDelay) + + BuildType = BuildHyperspacenet + SetAddressNetwork(address.Testnet) + Devnet = true + +} + +const BlockDelaySecs = uint64(builtin2.EpochDurationSeconds) + +const PropagationDelaySecs = uint64(6) + +// BootstrapPeerThreshold is the minimum number peers we need to track for a sync worker to start +const BootstrapPeerThreshold = 2 + +// ChainId defines the chain ID used in the Ethereum JSON-RPC endpoint. +// As per https://github.com/ethereum-lists/chains +const Eip155ChainId = 3141 + +var WhitelistedBlock = cid.Undef diff --git a/build/params_mainnet.go b/build/params_mainnet.go index c65c5d19a..f95525dbc 100644 --- a/build/params_mainnet.go +++ b/build/params_mainnet.go @@ -1,5 +1,5 @@ -//go:build !debug && !2k && !testground && !calibnet && !butterflynet && !interopnet && !wallabynet -// +build !debug,!2k,!testground,!calibnet,!butterflynet,!interopnet,!wallabynet +//go:build !debug && !2k && !testground && !calibnet && !butterflynet && !interopnet && !wallabynet && !hyperspacenet +// +build !debug,!2k,!testground,!calibnet,!butterflynet,!interopnet,!wallabynet,!hyperspacenet package build diff --git a/build/version.go b/build/version.go index fcb412c94..4946059e2 100644 --- a/build/version.go +++ b/build/version.go @@ -6,14 +6,15 @@ var CurrentCommit string var BuildType int const ( - BuildDefault = 0 - BuildMainnet = 0x1 - Build2k = 0x2 - BuildDebug = 0x3 - BuildCalibnet = 0x4 - BuildInteropnet = 0x5 - BuildButterflynet = 0x7 - BuildWallabynet = 0x8 + BuildDefault = 0 + BuildMainnet = 0x1 + Build2k = 0x2 + BuildDebug = 0x3 + BuildCalibnet = 0x4 + BuildInteropnet = 0x5 + BuildButterflynet = 0x7 + BuildWallabynet = 0x8 + BuildHyperspacenet = 0x9 ) func BuildTypeString() string { @@ -34,6 +35,8 @@ func BuildTypeString() string { return "+butterflynet" case BuildWallabynet: return "+wallabynet" + case BuildHyperspacenet: + return "+hyperspacenet" default: return "+huh?" } diff --git a/chain/actors/builtin/builtin.go b/chain/actors/builtin/builtin.go index 093940b7c..116ed35d0 100644 --- a/chain/actors/builtin/builtin.go +++ b/chain/actors/builtin/builtin.go @@ -274,10 +274,10 @@ func IsPaymentChannelActor(c cid.Cid) bool { return false } -func IsEmbryoActor(c cid.Cid) bool { +func IsPlaceholderActor(c cid.Cid) bool { name, _, ok := actors.GetActorMetaByCode(c) if ok { - return name == manifest.EmbryoKey + return name == manifest.PlaceholderKey } return false diff --git a/chain/actors/builtin/builtin.go.template b/chain/actors/builtin/builtin.go.template index 8b2b67645..977217b1a 100644 --- a/chain/actors/builtin/builtin.go.template +++ b/chain/actors/builtin/builtin.go.template @@ -153,10 +153,10 @@ func IsPaymentChannelActor(c cid.Cid) bool { return false } -func IsEmbryoActor(c cid.Cid) bool { +func IsPlaceholderActor(c cid.Cid) bool { name, _, ok := actors.GetActorMetaByCode(c) if ok { - return name == manifest.EmbryoKey + return name == manifest.PlaceholderKey } return false diff --git a/chain/actors/builtin/registry.go b/chain/actors/builtin/registry.go index e309d8cc7..4ce48098d 100644 --- a/chain/actors/builtin/registry.go +++ b/chain/actors/builtin/registry.go @@ -14,7 +14,6 @@ import ( cron10 "github.com/filecoin-project/go-state-types/builtin/v10/cron" datacap10 "github.com/filecoin-project/go-state-types/builtin/v10/datacap" eam10 "github.com/filecoin-project/go-state-types/builtin/v10/eam" - embryo10 "github.com/filecoin-project/go-state-types/builtin/v10/embryo" ethaccount10 "github.com/filecoin-project/go-state-types/builtin/v10/ethaccount" evm10 "github.com/filecoin-project/go-state-types/builtin/v10/evm" _init10 "github.com/filecoin-project/go-state-types/builtin/v10/init" @@ -22,6 +21,7 @@ import ( miner10 "github.com/filecoin-project/go-state-types/builtin/v10/miner" multisig10 "github.com/filecoin-project/go-state-types/builtin/v10/multisig" paych10 "github.com/filecoin-project/go-state-types/builtin/v10/paych" + placeholder10 "github.com/filecoin-project/go-state-types/builtin/v10/placeholder" power10 "github.com/filecoin-project/go-state-types/builtin/v10/power" reward10 "github.com/filecoin-project/go-state-types/builtin/v10/reward" system10 "github.com/filecoin-project/go-state-types/builtin/v10/system" @@ -361,10 +361,10 @@ func MakeRegistry(av actorstypes.Version) []RegistryEntry { methods: eam10.Methods, state: nil, }) - case manifest.EmbryoKey: + case manifest.PlaceholderKey: registry = append(registry, RegistryEntry{ code: codeID, - methods: embryo10.Methods, + methods: placeholder10.Methods, state: nil, }) case manifest.EthAccountKey: diff --git a/chain/actors/builtin/registry.go.template b/chain/actors/builtin/registry.go.template index 359e615d1..a63b00917 100644 --- a/chain/actors/builtin/registry.go.template +++ b/chain/actors/builtin/registry.go.template @@ -28,7 +28,7 @@ import ( {{if (ge . 10)}} evm{{.}} "github.com/filecoin-project/go-state-types/builtin/v{{.}}/evm" eam{{.}} "github.com/filecoin-project/go-state-types/builtin/v{{.}}/eam" - embryo{{.}} "github.com/filecoin-project/go-state-types/builtin/v{{.}}/embryo" + placeholder{{.}} "github.com/filecoin-project/go-state-types/builtin/v{{.}}/placeholder" ethaccount{{.}} "github.com/filecoin-project/go-state-types/builtin/v{{.}}/ethaccount" {{end}} {{end}} @@ -193,10 +193,10 @@ func MakeRegistry(av actorstypes.Version) []RegistryEntry { methods: eam{{.}}.Methods, state: nil, }) - case manifest.EmbryoKey: + case manifest.PlaceholderKey: registry = append(registry, RegistryEntry{ code: codeID, - methods: embryo{{.}}.Methods, + methods: placeholder{{.}}.Methods, state: nil, }) case manifest.EthAccountKey: diff --git a/chain/consensus/filcns/filecoin.go b/chain/consensus/filcns/filecoin.go index 49bd0fa2c..ec801ea85 100644 --- a/chain/consensus/filcns/filecoin.go +++ b/chain/consensus/filcns/filecoin.go @@ -441,7 +441,7 @@ func IsValidForSending(act *types.Actor) bool { return true } - if !builtin.IsEmbryoActor(act.Code) || act.Nonce != 0 || act.Address == nil || act.Address.Protocol() != address.Delegated { + if !builtin.IsPlaceholderActor(act.Code) || act.Nonce != 0 || act.Address == nil || act.Address.Protocol() != address.Delegated { return false } diff --git a/extern/filecoin-ffi b/extern/filecoin-ffi index 9f2ccf7d8..c4adeb453 160000 --- a/extern/filecoin-ffi +++ b/extern/filecoin-ffi @@ -1 +1 @@ -Subproject commit 9f2ccf7d8c50737a06c1bd5dbe72c088d143cf37 +Subproject commit c4adeb4532719acf7b1c182cb98a3cca7b955a14 diff --git a/go.mod b/go.mod index 0648497c6..f75bbcae4 100644 --- a/go.mod +++ b/go.mod @@ -44,7 +44,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.10.0-alpha-8 + github.com/filecoin-project/go-state-types v0.10.0-alpha-9 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 c86c999b0..419810695 100644 --- a/go.sum +++ b/go.sum @@ -356,8 +356,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.8/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.10.0-alpha-8 h1:BPUEnjs4eBjhX+WCeG/Mfpoc7umYVgXENur73PJ1cNc= -github.com/filecoin-project/go-state-types v0.10.0-alpha-8/go.mod h1:FPgQE05BFwZxKw/vCuIaIrzfJKo4RPQQMMPGd43dAFI= +github.com/filecoin-project/go-state-types v0.10.0-alpha-9 h1:Rriwh/Fs/hV15QqHuL47PkJMz4e8kLGRwgsdh+G+S5I= +github.com/filecoin-project/go-state-types v0.10.0-alpha-9/go.mod h1:FPgQE05BFwZxKw/vCuIaIrzfJKo4RPQQMMPGd43dAFI= 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/eth_account_abstraction_test.go b/itests/eth_account_abstraction_test.go index a9230cc52..b6ad48720 100644 --- a/itests/eth_account_abstraction_test.go +++ b/itests/eth_account_abstraction_test.go @@ -20,8 +20,8 @@ import ( ) // TestEthAccountAbstraction goes over the account abstraction workflow: -// - an embryo is created when it receives a message -// - the embryo turns into an EOA when it sends a message +// - an placeholder is created when it receives a message +// - the placeholder turns into an EOA when it sends a message func TestEthAccountAbstraction(t *testing.T) { kit.QuietMiningLogs() @@ -35,97 +35,97 @@ func TestEthAccountAbstraction(t *testing.T) { secpKey, err := key.GenerateKey(types.KTDelegated) require.NoError(t, err) - embryoAddress, err := client.WalletImport(ctx, &secpKey.KeyInfo) + placeholderAddress, err := client.WalletImport(ctx, &secpKey.KeyInfo) require.NoError(t, err) - fmt.Println(embryoAddress) + fmt.Println(placeholderAddress) - // create an embryo actor at the target address - msgCreateEmbryo := &types.Message{ + // create an placeholder actor at the target address + msgCreatePlaceholder := &types.Message{ From: client.DefaultKey.Address, - To: embryoAddress, + To: placeholderAddress, Value: abi.TokenAmount(types.MustParseFIL("100")), } - smCreateEmbryo, err := client.MpoolPushMessage(ctx, msgCreateEmbryo, nil) + smCreatePlaceholder, err := client.MpoolPushMessage(ctx, msgCreatePlaceholder, nil) require.NoError(t, err) - mLookup, err := client.StateWaitMsg(ctx, smCreateEmbryo.Cid(), 3, api.LookbackNoLimit, true) + mLookup, err := client.StateWaitMsg(ctx, smCreatePlaceholder.Cid(), 3, api.LookbackNoLimit, true) require.NoError(t, err) require.Equal(t, exitcode.Ok, mLookup.Receipt.ExitCode) - // confirm the embryo is an embryo - embryoActor, err := client.StateGetActor(ctx, embryoAddress, types.EmptyTSK) + // confirm the placeholder is an placeholder + placeholderActor, err := client.StateGetActor(ctx, placeholderAddress, types.EmptyTSK) require.NoError(t, err) - require.Equal(t, uint64(0), embryoActor.Nonce) - require.True(t, builtin.IsEmbryoActor(embryoActor.Code)) + require.Equal(t, uint64(0), placeholderActor.Nonce) + require.True(t, builtin.IsPlaceholderActor(placeholderActor.Code)) - // send a message from the embryo address - msgFromEmbryo := &types.Message{ - From: embryoAddress, + // send a message from the placeholder address + msgFromPlaceholder := &types.Message{ + From: placeholderAddress, // self-send because an "eth tx payload" can't be to a filecoin address? - To: embryoAddress, + To: placeholderAddress, } - msgFromEmbryo, err = client.GasEstimateMessageGas(ctx, msgFromEmbryo, nil, types.EmptyTSK) + msgFromPlaceholder, err = client.GasEstimateMessageGas(ctx, msgFromPlaceholder, nil, types.EmptyTSK) require.NoError(t, err) - txArgs, err := ethtypes.NewEthTxArgsFromMessage(msgFromEmbryo) + txArgs, err := ethtypes.NewEthTxArgsFromMessage(msgFromPlaceholder) require.NoError(t, err) digest, err := txArgs.ToRlpUnsignedMsg() require.NoError(t, err) - siggy, err := client.WalletSign(ctx, embryoAddress, digest) + siggy, err := client.WalletSign(ctx, placeholderAddress, digest) require.NoError(t, err) - smFromEmbryoCid, err := client.MpoolPush(ctx, &types.SignedMessage{Message: *msgFromEmbryo, Signature: *siggy}) + smFromPlaceholderCid, err := client.MpoolPush(ctx, &types.SignedMessage{Message: *msgFromPlaceholder, Signature: *siggy}) require.NoError(t, err) - mLookup, err = client.StateWaitMsg(ctx, smFromEmbryoCid, 3, api.LookbackNoLimit, true) + mLookup, err = client.StateWaitMsg(ctx, smFromPlaceholderCid, 3, api.LookbackNoLimit, true) require.NoError(t, err) require.Equal(t, exitcode.Ok, mLookup.Receipt.ExitCode) - // confirm ugly Embryo duckling has turned into a beautiful EthAccount swan + // confirm ugly Placeholder duckling has turned into a beautiful EthAccount swan - eoaActor, err := client.StateGetActor(ctx, embryoAddress, types.EmptyTSK) + eoaActor, err := client.StateGetActor(ctx, placeholderAddress, types.EmptyTSK) require.NoError(t, err) - require.False(t, builtin.IsEmbryoActor(eoaActor.Code)) + require.False(t, builtin.IsPlaceholderActor(eoaActor.Code)) require.True(t, builtin.IsEthAccountActor(eoaActor.Code)) require.Equal(t, uint64(1), eoaActor.Nonce) // Send another message, it should succeed without any code CID changes - msgFromEmbryo = &types.Message{ - From: embryoAddress, - To: embryoAddress, + msgFromPlaceholder = &types.Message{ + From: placeholderAddress, + To: placeholderAddress, Nonce: 1, } - msgFromEmbryo, err = client.GasEstimateMessageGas(ctx, msgFromEmbryo, nil, types.EmptyTSK) + msgFromPlaceholder, err = client.GasEstimateMessageGas(ctx, msgFromPlaceholder, nil, types.EmptyTSK) require.NoError(t, err) - txArgs, err = ethtypes.NewEthTxArgsFromMessage(msgFromEmbryo) + txArgs, err = ethtypes.NewEthTxArgsFromMessage(msgFromPlaceholder) require.NoError(t, err) digest, err = txArgs.ToRlpUnsignedMsg() require.NoError(t, err) - siggy, err = client.WalletSign(ctx, embryoAddress, digest) + siggy, err = client.WalletSign(ctx, placeholderAddress, digest) require.NoError(t, err) - smFromEmbryoCid, err = client.MpoolPush(ctx, &types.SignedMessage{Message: *msgFromEmbryo, Signature: *siggy}) + smFromPlaceholderCid, err = client.MpoolPush(ctx, &types.SignedMessage{Message: *msgFromPlaceholder, Signature: *siggy}) require.NoError(t, err) - mLookup, err = client.StateWaitMsg(ctx, smFromEmbryoCid, 3, api.LookbackNoLimit, true) + mLookup, err = client.StateWaitMsg(ctx, smFromPlaceholderCid, 3, api.LookbackNoLimit, true) require.NoError(t, err) require.Equal(t, exitcode.Ok, mLookup.Receipt.ExitCode) // confirm no changes in code CID - eoaActor, err = client.StateGetActor(ctx, embryoAddress, types.EmptyTSK) + eoaActor, err = client.StateGetActor(ctx, placeholderAddress, types.EmptyTSK) require.NoError(t, err) require.Equal(t, uint64(2), eoaActor.Nonce) - require.False(t, builtin.IsEmbryoActor(eoaActor.Code)) + require.False(t, builtin.IsPlaceholderActor(eoaActor.Code)) require.True(t, builtin.IsEthAccountActor(eoaActor.Code)) } diff --git a/itests/eth_deploy_test.go b/itests/eth_deploy_test.go index 1f242eeb3..8d36fa15c 100644 --- a/itests/eth_deploy_test.go +++ b/itests/eth_deploy_test.go @@ -65,8 +65,8 @@ func TestDeployment(t *testing.T) { bal := client.EVM().AssertAddressBalanceConsistent(ctx, deployer) require.Equal(t, types.FromFil(10), bal) - // verify the deployer address is an embryo. - client.AssertActorType(ctx, deployer, manifest.EmbryoKey) + // verify the deployer address is an Placeholder. + client.AssertActorType(ctx, deployer, manifest.PlaceholderKey) gaslimit, err := client.EthEstimateGas(ctx, ethtypes.EthCall{ From: ðAddr, @@ -77,7 +77,7 @@ func TestDeployment(t *testing.T) { maxPriorityFeePerGas, err := client.EthMaxPriorityFeePerGas(ctx) require.NoError(t, err) - // now deploy a contract from the embryo, and validate it went well + // now deploy a contract from the placeholder, and validate it went well tx := ethtypes.EthTxArgs{ ChainID: build.Eip155ChainId, Value: big.Zero(), diff --git a/itests/fevm_address_test.go b/itests/fevm_address_test.go index 356328bef..41f4373c2 100644 --- a/itests/fevm_address_test.go +++ b/itests/fevm_address_test.go @@ -76,10 +76,10 @@ func TestAddressCreationBeforeDeploy(t *testing.T) { require.NoError(t, err) require.Equal(t, exitcode.Ok, mLookup.Receipt.ExitCode) - // Check if actor at new address is an embryo actor + // Check if actor at new address is an placeholder actor actor, err := client.StateGetActor(ctx, contractFilAddr, types.EmptyTSK) require.NoError(t, err) - require.True(t, builtin.IsEmbryoActor(actor.Code)) + require.True(t, builtin.IsPlaceholderActor(actor.Code)) // Create and deploy evm actor diff --git a/itests/kit/state.go b/itests/kit/state.go index 771ef84b0..e66576be3 100644 --- a/itests/kit/state.go +++ b/itests/kit/state.go @@ -15,7 +15,7 @@ import ( // AssertActorType verifies that the supplied address is an actor of the // specified type (as per its manifest key). func (f *TestFullNode) AssertActorType(ctx context.Context, addr address.Address, actorType string) { - // validate that an embryo was created + // validate that an placeholder was created act, err := f.StateGetActor(ctx, addr, types.EmptyTSK) require.NoError(f.t, err) diff --git a/itests/multisig_test.go b/itests/multisig_test.go index b20dcf16b..92d9afca7 100644 --- a/itests/multisig_test.go +++ b/itests/multisig_test.go @@ -133,7 +133,7 @@ func TestMultisigReentrant(t *testing.T) { sl, err := client.StateReplay(ctx, types.EmptyTSK, pm.Cid()) require.NoError(t, err, "failed to replay reentrant propose message (StateWaitMsg)") - require.Equal(t, 1025, countDepth(sl.ExecutionTrace), "failed: %s", sl.Error) + require.Equal(t, 1024, countDepth(sl.ExecutionTrace), "failed: %s", sl.Error) } func countDepth(trace types.ExecutionTrace) int { diff --git a/node/impl/full/eth.go b/node/impl/full/eth.go index 606c07314..798fda040 100644 --- a/node/impl/full/eth.go +++ b/node/impl/full/eth.go @@ -636,7 +636,7 @@ func (a *EthModule) EthSendRawTransaction(ctx context.Context, rawTx ethtypes.Et _, err = a.StateAPI.StateGetActor(ctx, smsg.Message.To, types.EmptyTSK) if err != nil { // if actor does not exist on chain yet, set the method to 0 because - // embryos only implement method 0 + // placeholders only implement method 0 smsg.Message.Method = builtinactors.MethodSend }