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

more fixes

Browse Source
This commit is contained in:
Aayush 2022-09-07 21:25:28 -04:00
parent 642555d0fb
commit e9a3235291
26 changed files with 981 additions and 894 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
build/actors/v9.tar.zst Normal file
View File

Binary file not shown.

119
build/builtin_actors_gen.go
View File

@ -23,6 +23,23 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
"system": MustParseCid("bafk2bzacec6xctjxybp7r3kkhase56o6jsaiua7ure5ttu2xfuojt4jhlsoa6"),
"verifiedregistry": MustParseCid("bafk2bzacec2hcqlqcfacylfcrhhliwkisvh4y3adwt47xkf2gdvodwu6ccepc"),
},
}, {
Network: "butterflynet",
Version: 9,
ManifestCid: MustParseCid("bafy2bzacebor5miojgkvov7gtiirg7hqxgm54x3hxytbho3qloqryg2r67qaq"),
Actors: map[string]cid.Cid{
"account": MustParseCid("bafk2bzacecd7kgfzbyu4sylskgf7wjqabo43y3d7xqgvz7r67pzr3ovn3sj7y"),
"cron": MustParseCid("bafk2bzacea6dc2a6skmp7saa43dcofp7zvtklvya75bai2k4k6qnkpcfzklug"),
"init": MustParseCid("bafk2bzacean5v7lbsspxmdkcwhac44sk332uwyfteibtxyhgoeabwbzbh736c"),
"multisig": MustParseCid("bafk2bzacea43lypvbof5kwnk2flzrwdrqqvzypom5xyheeuaab6dmuiafngae"),
"paymentchannel": MustParseCid("bafk2bzacecsdimcgztl4tfodnqc35jojoy4mzaqqidubialqmqaa3zpv4h3rw"),
"reward": MustParseCid("bafk2bzacedy3utj67mewe7rpieaex3sf7qxfkgiwtlgg4wlqyl74la65njbn2"),
"storagemarket": MustParseCid("bafk2bzacec4xpazf3l2p5qkknjsku2sd3skqevk7gxryumbelwhfbs7mgjnpa"),
"storageminer": MustParseCid("bafk2bzaceb5scwcdcou56vyhxq3c7vcefjau44v2h6nvsus45wqopt3hadzae"),
"storagepower": MustParseCid("bafk2bzacebxl4ssugntkckifkq6sydczcas463bmonwi2m5hddurzzcukdzyg"),
"system": MustParseCid("bafk2bzacedtw2ebtl3uccbqfcm6jd7teinlpktcglopuaxa6ev334jhs46hso"),
"verifiedregistry": MustParseCid("bafk2bzaceds62ys6rpbtjjsemohalxnkr3jtqhflifabn3xlhpi45mvi757po"),
},
}, {
Network: "calibrationnet",
Version: 8,
@ -40,6 +57,23 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
"system": MustParseCid("bafk2bzaceaqrkllksxv2jsfgjvmuewx5vbzrammw5mdscod6gkdr3ijih2q64"),
"verifiedregistry": MustParseCid("bafk2bzaceaihibfu625lbtzdp3tcftscshrmbgghgrc7kzqhxn4455pycpdkm"),
},
}, {
Network: "calibrationnet",
Version: 9,
ManifestCid: MustParseCid("bafy2bzacectdlm3f5m252s6ken3ncnndvwj4a7hqyev2m7iba4lubkt72r2rm"),
Actors: map[string]cid.Cid{
"account": MustParseCid("bafk2bzaceag3pkyy5youg2i4qyrhqms2jobycddkhd4eebtlkeqj4wu4sw7ji"),
"cron": MustParseCid("bafk2bzaceaii7ryi4sjqqrrwyqaxulzqgiigkjqfa3f3ghhisleaqrinyal4o"),
"init": MustParseCid("bafk2bzacebpi37hcleu7cpqgs5zdg4zsw7qpydt5w25jny2dyyscsyidquvcw"),
"multisig": MustParseCid("bafk2bzacebt522zme5n3q25mecukjvomfyyzduxormgnprl73mdb5ekda2ywy"),
"paymentchannel": MustParseCid("bafk2bzacebdxmtmloxfyhxkoj4p4ze5gojqohvqjmdmv2t54xyrgfnjs52p26"),
"reward": MustParseCid("bafk2bzacebt7vup2pdxie67goc5ourij32z4ofejlrbv7styzm47ytvmmxx5a"),
"storagemarket": MustParseCid("bafk2bzacebeohybortft5jiihfvfly5oiygvf2hulnuif7vivklind32hbr3c"),
"storageminer": MustParseCid("bafk2bzaceallhekg5fhibexjurqcwrx6uzacbyq5eofic6jbdiu3vhepq6xsw"),
"storagepower": MustParseCid("bafk2bzaceassqqdljvblivbcrkv62a36gxjwf7dmkgez6ezq2oydx3dv2b3z2"),
"system": MustParseCid("bafk2bzacebxsecqifqvqxavnmsuwigmnc5rcuxoezspmykeqinkbgrkfukmgs"),
"verifiedregistry": MustParseCid("bafk2bzacedrmxfk5qifi7ujcb7mm73mwoy5e7nbndxhbqauuyol6cunf6popm"),
},
}, {
Network: "caterpillarnet",
Version: 8,
@ -57,6 +91,23 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
"system": MustParseCid("bafk2bzacebu47th3xerlngqavlipb6cfu2utljkxxzgadc3totogto2tmx2jc"),
"verifiedregistry": MustParseCid("bafk2bzaceci3niq3rmbcmepgn27zvlgci6d5t4dvthx3pbmmx3wcu5elova6i"),
},
}, {
Network: "caterpillarnet",
Version: 9,
ManifestCid: MustParseCid("bafy2bzaceaknnblpmv3qqeqlgdycpps2vkgbgkflugbqz47k6zwrqte54hqy2"),
Actors: map[string]cid.Cid{
"account": MustParseCid("bafk2bzaceckajm6tcdpvfsrvagduv6cuefuo3modkpfupum6ibspulgvporrw"),
"cron": MustParseCid("bafk2bzacea74zhlldpihms2ohp3wvefojifvudbblmeju3izwrpcpxemp43fo"),
"init": MustParseCid("bafk2bzacea5nqh4l76vm4ys6vgrqyt77tquk66il3w5ho3zxugka22fipdkdw"),
"multisig": MustParseCid("bafk2bzacea3ftmx2roav4psh63r5n2sol6x3kwpmfwe473pexhj6lg7pruu2k"),
"paymentchannel": MustParseCid("bafk2bzacea2gqhnycejjfuinywoz4j7pmsvxn3i2y5epdx5vqpo23phx6jeac"),
"reward": MustParseCid("bafk2bzaceamdxogvus7zawqtju3vesmj6ffpf3ta6dlwvvstyfbf23sow2tes"),
"storagemarket": MustParseCid("bafk2bzacecvh6qhfe3ityehpibxmmw43l7recwtru3l4n3yrdj5bmnv4efnrc"),
"storageminer": MustParseCid("bafk2bzaced6ya5wlvplkvnvmhuc2uh5zq7oft6pyyoouwouuoreuk6grn6vsw"),
"storagepower": MustParseCid("bafk2bzacedbfoblr65vbqwx37cym6v3zhbgrau46vma4c2lbh6toz6q5dyrtc"),
"system": MustParseCid("bafk2bzaced7z2lu5hp4qpsesbmubq3chrad3sl6kgveldafksh4w252ijjaw2"),
"verifiedregistry": MustParseCid("bafk2bzacec6fdlcvlnaiktdptogae3bgofhzo24lhn4hs6rsa2zbnknfpsct6"),
},
}, {
Network: "devnet",
Version: 8,
@ -74,6 +125,23 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
"system": MustParseCid("bafk2bzacecf7eta2stfd3cnuxzervd33imbvlaqq6b5tsho7pxmhifrybreru"),
"verifiedregistry": MustParseCid("bafk2bzaceaajgtglewgitshgdi2nzrvq7eihjtyqj5yiamesqun2hujl3xev2"),
},
}, {
Network: "devnet",
Version: 9,
ManifestCid: MustParseCid("bafy2bzacecogd7hb3dap7d4abyikdgt6b2zs46s4qyilsgxk4rsienbvvstp4"),
Actors: map[string]cid.Cid{
"account": MustParseCid("bafk2bzacecrgqcwn2j6c44tnfx32om4upg56b7gdwslfgeuyfsm6iwkiuhm2w"),
"cron": MustParseCid("bafk2bzaceblepwha5i5cpac37arpcxjcebm5k7p4e5ed7bwcq7ie6fryxgno4"),
"init": MustParseCid("bafk2bzacebjr3xwsdzfie47rtffibt3irr7a5qqstt7fsbwnolzz3z6oy5frw"),
"multisig": MustParseCid("bafk2bzacec66uf5u7o7q3u3pufrtufya6ntwrreysrwwlzqdjbtj36ajuamz4"),
"paymentchannel": MustParseCid("bafk2bzacebouukxeahifxfoymmvibngg6abftd7luiq5x2c7zxulvqyerwoeg"),
"reward": MustParseCid("bafk2bzacecj4pry2xb6w4kd4xxvs3dqd2endfynnwrkf66zakmt376tafy6ym"),
"storagemarket": MustParseCid("bafk2bzacecmij6fgaasgu7zm354fltmvhwmepzwadhl4euxhb64yg4pgfkxgw"),
"storageminer": MustParseCid("bafk2bzaceb5qyhchlvqvcq5cvrc5tuyjrrz6qkgbbxx4vr4wxhtoa4bfp56bg"),
"storagepower": MustParseCid("bafk2bzaced377v52henedhmudi2isuxe73mp2lrv2zyyxfp4r4uppz3sy2ipw"),
"system": MustParseCid("bafk2bzacebb3gdmg2fqexijivo7dkxj6g6gu7ou2jsw6opszr5gfmwt4fvorw"),
"verifiedregistry": MustParseCid("bafk2bzacec5xfb3a56mlclymhvs2br3qzx7sagqda4dvl4xz3fgiymkkbz5tk"),
},
}, {
Network: "mainnet",
Version: 8,
@ -91,6 +159,23 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
"system": MustParseCid("bafk2bzacedwq5uppsw7vp55zpj7jdieizirmldceehu6wvombw3ixq2tcq57w"),
"verifiedregistry": MustParseCid("bafk2bzaceb3zbkjz3auizmoln2unmxep7dyfcmsre64vnqfhdyh7rkqfoxlw4"),
},
}, {
Network: "mainnet",
Version: 9,
ManifestCid: MustParseCid("bafy2bzaceb7nrn4icde3yt7s2kpllliodblq2i3iuslh3l6swgjqyusual72u"),
Actors: map[string]cid.Cid{
"account": MustParseCid("bafk2bzacedchhykcbvptlrnts62xa2h7fewsyvb4imktudll7tbogkwj4ccpy"),
"cron": MustParseCid("bafk2bzaced2e2ivtglevf5tnqay6eqdl3m5ilx4az766ojbhmy2kbxmkogbni"),
"init": MustParseCid("bafk2bzaceapzqn6e3cfpf4ntln4dkyrqe5egygmjczefduy7fuabxh2npqq6o"),
"multisig": MustParseCid("bafk2bzacebxihi4x4lzelmmdtxiz5gub3cjgthrgxuj5mxl2ihxaz6qhp5qbu"),
"paymentchannel": MustParseCid("bafk2bzacecv34ahs6k552won2vj4r62gur5i7inqnycg7y4dg27ktlq76stlk"),
"reward": MustParseCid("bafk2bzacea4er76nlnzz3muuvdxs4dbygejztezanpafi42idj57n75sumu7o"),
"storagemarket": MustParseCid("bafk2bzacedd3pjxcwgxfli4a5udw3ebbo4gom43epizbldvto7ovduqk6udj6"),
"storageminer": MustParseCid("bafk2bzacebtuopxp2464fxulzfyr4iw7bj4pelfxlatudaf6q5qtahokeo3lo"),
"storagepower": MustParseCid("bafk2bzacec3dmcwtizgy6qhxg6fgb4ykc2pamxxh2n5oyeqvebjf3ikzd2sui"),
"system": MustParseCid("bafk2bzacecrm36gf2gusruvhfc6ukf36qflsr5pdbquvfyysprdyudsatoufm"),
"verifiedregistry": MustParseCid("bafk2bzaceah3mwu6tb4jmffohpoz6nyoxpgno2hmxz455rycw4o2hrat3yg3u"),
},
}, {
Network: "testing",
Version: 8,
@ -108,6 +193,23 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
"system": MustParseCid("bafk2bzaced6kjkbv7lrb2qwq5we2hqaxc6ztch5p52g27qtjy45zdemsk4b7m"),
"verifiedregistry": MustParseCid("bafk2bzacectzxvtoselhnzsair5nv6k5vokvegnht6z2lfee4p3xexo4kg4m6"),
},
}, {
Network: "testing",
Version: 9,
ManifestCid: MustParseCid("bafy2bzaceas5fka4rtyvnqwvvwdi2qqhbnu7hnyz37chhpflh4rdbwnoupols"),
Actors: map[string]cid.Cid{
"account": MustParseCid("bafk2bzacecsmbmd42fsg33wd3u5vxyp4n4a4mac423fduauishjhiyv2bqz7w"),
"cron": MustParseCid("bafk2bzacedajlwnkefucjxzasudkfojrz3bnhnnirebvacxrtly5y2kfb7qiu"),
"init": MustParseCid("bafk2bzaceat7cvf7s2vnmqoldzafkpjygi6wv3sfnclenfbahk4htsgu4aqsa"),
"multisig": MustParseCid("bafk2bzacebh7pwb7eoyigwgjs2r32ebtxwbwgxqd4cvou4katq4axmhd7lxsq"),
"paymentchannel": MustParseCid("bafk2bzaceb6nbmyo2girdpnwywby7yzelx7g6s4snbq3kb3mmd2pp33qefkww"),
"reward": MustParseCid("bafk2bzacedttgmuddtlrp2ie4i2vzuueury455knof5muqtqlslscxrk7ucl6"),
"storagemarket": MustParseCid("bafk2bzacebjtz7fg5n2sm4wg464fyg5vcvux5hqrsdwki675hsquhh3rpe5rg"),
"storageminer": MustParseCid("bafk2bzacea2c2genvtsktr3f6yjlny57gwqyt5dbqrfws56wn5ssyl2tevjjg"),
"storagepower": MustParseCid("bafk2bzaceasmr5xc3c7jgihqcb5pdv557kfor72wlmzmh4syvedknelebhsve"),
"system": MustParseCid("bafk2bzaceabj3whuno364pjqn7sphwquiqpl2w5le6aa6quwytgyxshvelcwq"),
"verifiedregistry": MustParseCid("bafk2bzaceamn6gzihkytyqym4dqs7wqmo2fz6kpge4tphumvutsp2ys4bwaha"),
},
}, {
Network: "testing-fake-proofs",
Version: 8,
@ -125,4 +227,21 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
"system": MustParseCid("bafk2bzaced6kjkbv7lrb2qwq5we2hqaxc6ztch5p52g27qtjy45zdemsk4b7m"),
"verifiedregistry": MustParseCid("bafk2bzacectzxvtoselhnzsair5nv6k5vokvegnht6z2lfee4p3xexo4kg4m6"),
},
}, {
Network: "testing-fake-proofs",
Version: 9,
ManifestCid: MustParseCid("bafy2bzacebr7bo4shotwq4cct3ablt6hlcozg4h2e52av2q3md5di7sibrqj2"),
Actors: map[string]cid.Cid{
"account": MustParseCid("bafk2bzacecsmbmd42fsg33wd3u5vxyp4n4a4mac423fduauishjhiyv2bqz7w"),
"cron": MustParseCid("bafk2bzacedajlwnkefucjxzasudkfojrz3bnhnnirebvacxrtly5y2kfb7qiu"),
"init": MustParseCid("bafk2bzaceat7cvf7s2vnmqoldzafkpjygi6wv3sfnclenfbahk4htsgu4aqsa"),
"multisig": MustParseCid("bafk2bzacebh7pwb7eoyigwgjs2r32ebtxwbwgxqd4cvou4katq4axmhd7lxsq"),
"paymentchannel": MustParseCid("bafk2bzaceb6nbmyo2girdpnwywby7yzelx7g6s4snbq3kb3mmd2pp33qefkww"),
"reward": MustParseCid("bafk2bzacedttgmuddtlrp2ie4i2vzuueury455knof5muqtqlslscxrk7ucl6"),
"storagemarket": MustParseCid("bafk2bzacebjtz7fg5n2sm4wg464fyg5vcvux5hqrsdwki675hsquhh3rpe5rg"),
"storageminer": MustParseCid("bafk2bzacedaxvye4reegpy2fecjuzwt4nly2myhplnvkzhssquo2jjw7vfmuy"),
"storagepower": MustParseCid("bafk2bzaceaoteuuvld3bzy3t3kzjp5iabgkvxjc5cxq2ziwankpxqqixkqqjw"),
"system": MustParseCid("bafk2bzaceabj3whuno364pjqn7sphwquiqpl2w5le6aa6quwytgyxshvelcwq"),
"verifiedregistry": MustParseCid("bafk2bzaceamn6gzihkytyqym4dqs7wqmo2fz6kpge4tphumvutsp2ys4bwaha"),
},
}}

BIN
build/openrpc/full.json.gz
View File

Binary file not shown.

BIN
build/openrpc/gateway.json.gz
View File

Binary file not shown.

BIN
build/openrpc/miner.json.gz
View File

Binary file not shown.

1
chain/actors/builtin/system/actor.go.template
View File

@ -62,4 +62,5 @@ func MakeState(store adt.Store, av actorstypes.Version, builtinActors cid.Cid) (
type State interface {
GetState() interface{}
GetBuiltinActors() cid.Cid
SetBuiltinActors(cid.Cid) error
}

10
chain/actors/builtin/system/state.go.template
View File

@ -7,6 +7,7 @@ import (
{{if (le .v 7)}}
system{{.v}} "github.com/filecoin-project/specs-actors{{.import}}actors/builtin/system"
"golang.org/x/xerrors"
{{else}}
system{{.v}} "github.com/filecoin-project/go-state-types/builtin{{.import}}system"
{{end}}
@ -47,3 +48,12 @@ func (s *state{{.v}}) GetBuiltinActors() cid.Cid {
return s.State.BuiltinActors
{{end}}
}
func (s *state{{.v}}) SetBuiltinActors(c cid.Cid) error {
{{if (le .v 7)}}
return xerrors.New("cannot set manifest cid before v8")
{{else}}
s.State.BuiltinActors = c
return nil
{{end}}
}

1
chain/actors/builtin/system/system.go
View File

@ -105,4 +105,5 @@ func MakeState(store adt.Store, av actorstypes.Version, builtinActors cid.Cid) (
type State interface {
GetState() interface{}
GetBuiltinActors() cid.Cid
SetBuiltinActors(cid.Cid) error
}

7
chain/actors/builtin/system/v0.go
View File

@ -2,6 +2,7 @@ package system
import (
"github.com/ipfs/go-cid"
"golang.org/x/xerrors"
system0 "github.com/filecoin-project/specs-actors/actors/builtin/system"
@ -39,3 +40,9 @@ func (s *state0) GetBuiltinActors() cid.Cid {
return cid.Undef
}
func (s *state0) SetBuiltinActors(c cid.Cid) error {
return xerrors.New("cannot set manifest cid before v8")
}

7
chain/actors/builtin/system/v2.go
View File

@ -2,6 +2,7 @@ package system
import (
"github.com/ipfs/go-cid"
"golang.org/x/xerrors"
system2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/system"
@ -39,3 +40,9 @@ func (s *state2) GetBuiltinActors() cid.Cid {
return cid.Undef
}
func (s *state2) SetBuiltinActors(c cid.Cid) error {
return xerrors.New("cannot set manifest cid before v8")
}

7
chain/actors/builtin/system/v3.go
View File

@ -2,6 +2,7 @@ package system
import (
"github.com/ipfs/go-cid"
"golang.org/x/xerrors"
system3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/system"
@ -39,3 +40,9 @@ func (s *state3) GetBuiltinActors() cid.Cid {
return cid.Undef
}
func (s *state3) SetBuiltinActors(c cid.Cid) error {
return xerrors.New("cannot set manifest cid before v8")
}

7
chain/actors/builtin/system/v4.go
View File

@ -2,6 +2,7 @@ package system
import (
"github.com/ipfs/go-cid"
"golang.org/x/xerrors"
system4 "github.com/filecoin-project/specs-actors/v4/actors/builtin/system"
@ -39,3 +40,9 @@ func (s *state4) GetBuiltinActors() cid.Cid {
return cid.Undef
}
func (s *state4) SetBuiltinActors(c cid.Cid) error {
return xerrors.New("cannot set manifest cid before v8")
}

7
chain/actors/builtin/system/v5.go
View File

@ -2,6 +2,7 @@ package system
import (
"github.com/ipfs/go-cid"
"golang.org/x/xerrors"
system5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/system"
@ -39,3 +40,9 @@ func (s *state5) GetBuiltinActors() cid.Cid {
return cid.Undef
}
func (s *state5) SetBuiltinActors(c cid.Cid) error {
return xerrors.New("cannot set manifest cid before v8")
}

7
chain/actors/builtin/system/v6.go
View File

@ -2,6 +2,7 @@ package system
import (
"github.com/ipfs/go-cid"
"golang.org/x/xerrors"
system6 "github.com/filecoin-project/specs-actors/v6/actors/builtin/system"
@ -39,3 +40,9 @@ func (s *state6) GetBuiltinActors() cid.Cid {
return cid.Undef
}
func (s *state6) SetBuiltinActors(c cid.Cid) error {
return xerrors.New("cannot set manifest cid before v8")
}

7
chain/actors/builtin/system/v7.go
View File

@ -2,6 +2,7 @@ package system
import (
"github.com/ipfs/go-cid"
"golang.org/x/xerrors"
system7 "github.com/filecoin-project/specs-actors/v7/actors/builtin/system"
@ -39,3 +40,9 @@ func (s *state7) GetBuiltinActors() cid.Cid {
return cid.Undef
}
func (s *state7) SetBuiltinActors(c cid.Cid) error {
return xerrors.New("cannot set manifest cid before v8")
}

7
chain/actors/builtin/system/v8.go
View File

@ -41,3 +41,10 @@ func (s *state8) GetBuiltinActors() cid.Cid {
return s.State.BuiltinActors
}
func (s *state8) SetBuiltinActors(c cid.Cid) error {
s.State.BuiltinActors = c
return nil
}

7
chain/actors/builtin/system/v9.go
View File

@ -41,3 +41,10 @@ func (s *state9) GetBuiltinActors() cid.Cid {
return s.State.BuiltinActors
}
func (s *state9) SetBuiltinActors(c cid.Cid) error {
s.State.BuiltinActors = c
return nil
}

6
chain/gen/genesis/f00_system.go
View File

@ -9,7 +9,6 @@ import (
actorstypes "github.com/filecoin-project/go-state-types/actors"
"github.com/filecoin-project/go-state-types/big"
systemtypes "github.com/filecoin-project/go-state-types/builtin/v8/system"
"github.com/filecoin-project/go-state-types/manifest"
bstore "github.com/filecoin-project/lotus/blockstore"
@ -39,8 +38,9 @@ func SetupSystemActor(ctx context.Context, bs bstore.Blockstore, av actorstypes.
return nil, xerrors.Errorf("loading manifest for actors version %d: %w", av, err)
}
st8 := st.GetState().(*systemtypes.State)
st8.BuiltinActors = mf.Data
if err := st.SetBuiltinActors(mf.Data); err != nil {
return nil, xerrors.Errorf("failed to set manifest data: %w", err)
}
}
statecid, err := cst.Put(ctx, st.GetState())

2
chain/vm/fvm.go
View File

@ -312,7 +312,7 @@ func NewFVM(ctx context.Context, opts *VMOpts) (*FVM, error) {
fvm, err := ffi.CreateFVM(fvmOpts)
if err != nil {
return nil, err
return nil, xerrors.Errorf("failed to create FVM: %w", err)
}
return &FVM{

20
cmd/lotus-sim/simulation/stages/precommit_stage.go
View File

@ -177,9 +177,9 @@ func (stage *PreCommitStage) packMiner(
}
expiration := epoch + policy.GetMaxSectorExpirationExtension()
infos := make([]minertypes.SectorPreCommitInfo, len(sectorNos))
infos := make([]minertypes.PreCommitSectorParams, len(sectorNos))
for i, sno := range sectorNos {
infos[i] = minertypes.SectorPreCommitInfo{
infos[i] = minertypes.PreCommitSectorParams{
SealProof: sealType,
SectorNumber: sno,
SealedCID: mock.MockCommR(minerAddr, sno),
@ -228,7 +228,7 @@ func (stage *PreCommitStage) packMiner(
}
for _, info := range batch {
if err := stage.committer.EnqueueProveCommit(minerAddr, epoch, info); err != nil {
if err := stage.committer.EnqueueProveCommit(minerAddr, epoch, toSectorPreCommitInfo(info)); err != nil {
return added, false, err
}
added++
@ -253,7 +253,7 @@ func (stage *PreCommitStage) packMiner(
return added, false, err
}
if err := stage.committer.EnqueueProveCommit(minerAddr, epoch, info); err != nil {
if err := stage.committer.EnqueueProveCommit(minerAddr, epoch, toSectorPreCommitInfo(info)); err != nil {
return added, false, err
}
added++
@ -346,3 +346,15 @@ func (stage *PreCommitStage) load(ctx context.Context, bb *blockbuilder.BlockBui
stage.initialized = true
return nil
}
func toSectorPreCommitInfo(param minertypes.PreCommitSectorParams) minertypes.SectorPreCommitInfo {
return minertypes.SectorPreCommitInfo{
SealProof: param.SealProof,
SectorNumber: param.SectorNumber,
SealedCID: param.SealedCID,
SealRandEpoch: param.SealRandEpoch,
DealIDs: param.DealIDs,
Expiration: param.Expiration,
UnsealedCid: nil,
}
}

2
documentation/en/api-v0-methods-miner.md
View File

@ -442,7 +442,7 @@ Inputs:
],
"Bw==",
10101,
16
17
]
```

25
documentation/en/api-v0-methods.md
View File

@ -4653,7 +4653,7 @@ Perms: read
Inputs:
```json
[
16
17
]
```
@ -4668,7 +4668,7 @@ Perms: read
Inputs:
```json
[
16
17
]
```
@ -5836,10 +5836,7 @@ Inputs:
5432
],
"Expiration": 10101,
"ReplaceCapacity": true,
"ReplaceSectorDeadline": 42,
"ReplaceSectorPartition": 42,
"ReplaceSectorNumber": 9
"UnsealedCid": null
},
[
{
@ -5961,10 +5958,7 @@ Inputs:
5432
],
"Expiration": 10101,
"ReplaceCapacity": true,
"ReplaceSectorDeadline": 42,
"ReplaceSectorPartition": 42,
"ReplaceSectorNumber": 9
"UnsealedCid": null
},
[
{
@ -6182,7 +6176,7 @@ Inputs:
]
```
Response: `16`
Response: `17`
### StateReadState
StateReadState returns the indicated actor's state.
@ -6640,15 +6634,10 @@ Response:
5432
],
"Expiration": 10101,
"ReplaceCapacity": true,
"ReplaceSectorDeadline": 42,
"ReplaceSectorPartition": 42,
"ReplaceSectorNumber": 9
"UnsealedCid": null
},
"PreCommitDeposit": "0",
"PreCommitEpoch": 10101,
"DealWeight": "0",
"VerifiedDealWeight": "0"
"PreCommitEpoch": 10101
}
```

25
documentation/en/api-v1-unstable-methods.md
View File

@ -5085,7 +5085,7 @@ Perms: read
Inputs:
```json
[
16
17
]
```
@ -5100,7 +5100,7 @@ Perms: read
Inputs:
```json
[
16
17
]
```
@ -6353,10 +6353,7 @@ Inputs:
5432
],
"Expiration": 10101,
"ReplaceCapacity": true,
"ReplaceSectorDeadline": 42,
"ReplaceSectorPartition": 42,
"ReplaceSectorNumber": 9
"UnsealedCid": null
},
[
{
@ -6478,10 +6475,7 @@ Inputs:
5432
],
"Expiration": 10101,
"ReplaceCapacity": true,
"ReplaceSectorDeadline": 42,
"ReplaceSectorPartition": 42,
"ReplaceSectorNumber": 9
"UnsealedCid": null
},
[
{
@ -6699,7 +6693,7 @@ Inputs:
]
```
Response: `16`
Response: `17`
### StateReadState
StateReadState returns the indicated actor's state.
@ -7119,15 +7113,10 @@ Response:
5432
],
"Expiration": 10101,
"ReplaceCapacity": true,
"ReplaceSectorDeadline": 42,
"ReplaceSectorPartition": 42,
"ReplaceSectorNumber": 9
"UnsealedCid": null
},
"PreCommitDeposit": "0",
"PreCommitEpoch": 10101,
"DealWeight": "0",
"VerifiedDealWeight": "0"
"PreCommitEpoch": 10101
}
```

1269
lotuspond/front/src/chain/methods.json
View File

File diff suppressed because it is too large Load Diff

326
node/config/doc_gen.go
View File

File diff suppressed because it is too large Load Diff

6
node/config/doc_util.go
View File

@ -16,7 +16,7 @@ func findDoc(root interface{}, section, name string) *DocField {
return findDocSect("Common", section, name)
}
func findDocSect(root, section, name string) *DocField {
func findDocSect(root, section, num string) *DocField {
path := strings.Split(section, ".")
docSection := Doc[root]
@ -26,7 +26,7 @@ func findDocSect(root, section, name string) *DocField {
}
for _, field := range docSection {
if field.Name == e {
if field.Num == e {
docSection = Doc[field.Type]
break
}
@ -35,7 +35,7 @@ func findDocSect(root, section, name string) *DocField {
}
for _, df := range docSection {
if df.Name == name {
if df.Num == num {
return &df
}
}