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

Merge pull request #11291 from filecoin-project/asr/updates

Browse Source 
chore: deps: update bulitin-actors, FVM, and go-state-types
This commit is contained in:
Aayush Rajasekaran 2023-09-23 18:23:51 -04:00 committed by GitHub
commit 527cba8922
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
28 changed files with 1100 additions and 491 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
api/cbor_gen.go
View File

@ -42,7 +42,7 @@ func (t *PaymentInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Channel"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Channel"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("Channel")); err != nil { if _, err := cw.WriteString(string("Channel")); err != nil {
return err return err
} }
@ -58,7 +58,7 @@ func (t *PaymentInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Vouchers"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Vouchers"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("Vouchers")); err != nil { if _, err := cw.WriteString(string("Vouchers")); err != nil {
return err return err
} }
@ -83,7 +83,7 @@ func (t *PaymentInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("WaitSentinel"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("WaitSentinel"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("WaitSentinel")); err != nil { if _, err := cw.WriteString(string("WaitSentinel")); err != nil {
return err return err
} }
@ -163,13 +163,32 @@ func (t *PaymentInfo) UnmarshalCBOR(r io.Reader) (err error) {
} }
for i := 0; i < int(extra); i++ { for i := 0; i < int(extra); i++ {
{
var maj byte
var extra uint64
var err error
_ = maj
_ = extra
_ = err
var v paych.SignedVoucher {
if err := v.UnmarshalCBOR(cr); err != nil {
return err b, err := cr.ReadByte()
if err != nil {
return err
}
if b != cbg.CborNull[0] {
if err := cr.UnreadByte(); err != nil {
return err
}
t.Vouchers[i] = new(paych.SignedVoucher)
if err := t.Vouchers[i].UnmarshalCBOR(cr); err != nil {
return xerrors.Errorf("unmarshaling t.Vouchers[i] pointer: %w", err)
}
}
}
} }
t.Vouchers[i] = &v
} }
// t.WaitSentinel (cid.Cid) (struct) // t.WaitSentinel (cid.Cid) (struct)
@ -214,7 +233,7 @@ func (t *SealedRef) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Size"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Size"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("Size")); err != nil { if _, err := cw.WriteString(string("Size")); err != nil {
return err return err
} }
@ -230,7 +249,7 @@ func (t *SealedRef) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Offset"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Offset"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("Offset")); err != nil { if _, err := cw.WriteString(string("Offset")); err != nil {
return err return err
} }
@ -246,7 +265,7 @@ func (t *SealedRef) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("SectorID"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("SectorID"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("SectorID")); err != nil { if _, err := cw.WriteString(string("SectorID")); err != nil {
return err return err
} }
@ -369,7 +388,7 @@ func (t *SealedRefs) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Refs"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Refs"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("Refs")); err != nil { if _, err := cw.WriteString(string("Refs")); err != nil {
return err return err
} }
@ -447,13 +466,22 @@ func (t *SealedRefs) UnmarshalCBOR(r io.Reader) (err error) {
} }
for i := 0; i < int(extra); i++ { for i := 0; i < int(extra); i++ {
{
var maj byte
var extra uint64
var err error
_ = maj
_ = extra
_ = err
var v SealedRef {
if err := v.UnmarshalCBOR(cr); err != nil {
return err if err := t.Refs[i].UnmarshalCBOR(cr); err != nil {
return xerrors.Errorf("unmarshaling t.Refs[i]: %w", err)
}
}
} }
t.Refs[i] = v
} }
default: default:
@ -484,7 +512,7 @@ func (t *SealTicket) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Epoch"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Epoch"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("Epoch")); err != nil { if _, err := cw.WriteString(string("Epoch")); err != nil {
return err return err
} }
@ -506,7 +534,7 @@ func (t *SealTicket) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Value"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Value"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("Value")); err != nil { if _, err := cw.WriteString(string("Value")); err != nil {
return err return err
} }
@ -639,7 +667,7 @@ func (t *SealSeed) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Epoch"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Epoch"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("Epoch")); err != nil { if _, err := cw.WriteString(string("Epoch")); err != nil {
return err return err
} }
@ -661,7 +689,7 @@ func (t *SealSeed) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Value"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Value"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("Value")); err != nil { if _, err := cw.WriteString(string("Value")); err != nil {
return err return err
} }
@ -794,7 +822,7 @@ func (t *PieceDealInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("DealID"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("DealID"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("DealID")); err != nil { if _, err := cw.WriteString(string("DealID")); err != nil {
return err return err
} }
@ -810,7 +838,7 @@ func (t *PieceDealInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("PublishCid"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("PublishCid"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("PublishCid")); err != nil { if _, err := cw.WriteString(string("PublishCid")); err != nil {
return err return err
} }
@ -832,7 +860,7 @@ func (t *PieceDealInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("DealProposal"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("DealProposal"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("DealProposal")); err != nil { if _, err := cw.WriteString(string("DealProposal")); err != nil {
return err return err
} }
@ -848,7 +876,7 @@ func (t *PieceDealInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("DealSchedule"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("DealSchedule"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("DealSchedule")); err != nil { if _, err := cw.WriteString(string("DealSchedule")); err != nil {
return err return err
} }
@ -864,7 +892,7 @@ func (t *PieceDealInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("KeepUnsealed"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("KeepUnsealed"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("KeepUnsealed")); err != nil { if _, err := cw.WriteString(string("KeepUnsealed")); err != nil {
return err return err
} }
@ -1027,7 +1055,7 @@ func (t *SectorPiece) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Piece"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Piece"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("Piece")); err != nil { if _, err := cw.WriteString(string("Piece")); err != nil {
return err return err
} }
@ -1043,7 +1071,7 @@ func (t *SectorPiece) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("DealInfo"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("DealInfo"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("DealInfo")); err != nil { if _, err := cw.WriteString(string("DealInfo")); err != nil {
return err return err
} }
@ -1150,7 +1178,7 @@ func (t *DealSchedule) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("EndEpoch"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("EndEpoch"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("EndEpoch")); err != nil { if _, err := cw.WriteString(string("EndEpoch")); err != nil {
return err return err
} }
@ -1172,7 +1200,7 @@ func (t *DealSchedule) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("StartEpoch"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("StartEpoch"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("StartEpoch")); err != nil { if _, err := cw.WriteString(string("StartEpoch")); err != nil {
return err return err
} }

32
blockstore/cbor_gen.go
View File

@ -52,9 +52,11 @@ func (t *NetRpcReq) MarshalCBOR(w io.Writer) error {
return err return err
} }
for _, v := range t.Cid { for _, v := range t.Cid {
if err := cbg.WriteCid(w, v); err != nil {
return xerrors.Errorf("failed writing cid field t.Cid: %w", err) if err := cbg.WriteCid(cw, v); err != nil {
return xerrors.Errorf("failed to write cid field v: %w", err)
} }
} }
// t.Data ([][]uint8) (slice) // t.Data ([][]uint8) (slice)
@ -151,12 +153,25 @@ func (t *NetRpcReq) UnmarshalCBOR(r io.Reader) (err error) {
} }
for i := 0; i < int(extra); i++ { for i := 0; i < int(extra); i++ {
{
var maj byte
var extra uint64
var err error
_ = maj
_ = extra
_ = err
c, err := cbg.ReadCid(cr) {
if err != nil {
return xerrors.Errorf("reading cid field t.Cid failed: %w", err) c, err := cbg.ReadCid(cr)
if err != nil {
return xerrors.Errorf("failed to read cid field t.Cid[i]: %w", err)
}
t.Cid[i] = c
}
} }
t.Cid[i] = c
} }
// t.Data ([][]uint8) (slice) // t.Data ([][]uint8) (slice)
@ -183,6 +198,9 @@ func (t *NetRpcReq) UnmarshalCBOR(r io.Reader) (err error) {
var maj byte var maj byte
var extra uint64 var extra uint64
var err error var err error
_ = maj
_ = extra
_ = err
maj, extra, err = cr.ReadHeader() maj, extra, err = cr.ReadHeader()
if err != nil { if err != nil {
@ -350,7 +368,7 @@ func (t *NetRpcErr) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Msg))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Msg))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string(t.Msg)); err != nil { if _, err := cw.WriteString(string(t.Msg)); err != nil {
return err return err
} }

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

Binary file not shown.

266
build/builtin_actors_gen.go
View File

@ -95,27 +95,27 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
"verifiedregistry": MustParseCid("bafk2bzaceb37hxeuoo5rgf6ansrdl2ykm5v5zp6kireubn4orcopr67jbxv6k"), "verifiedregistry": MustParseCid("bafk2bzaceb37hxeuoo5rgf6ansrdl2ykm5v5zp6kireubn4orcopr67jbxv6k"),
}, },
}, { }, {
Network: "butterflynet", Network: "butterflynet",
Version: 12, Version: 12,
BundleGitTag: "v12.0.0-dev.2",
ManifestCid: MustParseCid("bafy2bzacebwfbz63adpfgjtub2tg7yrosmxtyc4cmi55lvrv6rqnurzviuzlg"), ManifestCid: MustParseCid("bafy2bzacebheb3qrt45gl2mrugnys5rm56xerarnjcvulf55rgdc2ejyp3v24"),
Actors: map[string]cid.Cid{ Actors: map[string]cid.Cid{
"account": MustParseCid("bafk2bzacea55xtffuyilgsriwilzkezlddbjb5yqsoy7ejjx5lhuvwniev2zs"), "account": MustParseCid("bafk2bzaceaax3tggwg2eaqsydltyzvrk4xsgxwpxos73lrqmsbgutv67ht7sm"),
"cron": MustParseCid("bafk2bzacebp4sc3finb4tz7imuw7qkk7gvyaprs5rohpuomu3f4x4sub7zy4e"), "cron": MustParseCid("bafk2bzacedyltatovipojuyijrm4unqwjayb5kwtzvrog55igtbgpn66ogk56"),
"datacap": MustParseCid("bafk2bzacea5occ7omwxfrqohsage677sift7vn5ogcyxn3g7e6rmz3wcnfbj4"), "datacap": MustParseCid("bafk2bzacec73alnbszpcf5tu7llh4mvsjhsyrtbw75sp35loan55t22b6meda"),
"eam": MustParseCid("bafk2bzacebogeqkimibpwigydinqrn4j7vd23pscs4de5yfrpf2ltppcqrtec"), "eam": MustParseCid("bafk2bzacedodqunug2sa22ne5uy3vmjcjz5va7vqojcekpd5ijingir65ukfg"),
"ethaccount": MustParseCid("bafk2bzacecs3afxqq4fzrvycqvpgdqcvqbojoa3nihokqox4f6dv6jmz23dpg"), "ethaccount": MustParseCid("bafk2bzaceawhkdswuxsp32mwujvwheiybpepfv2ngfioeh7ho2ruzgp3olwsq"),
"evm": MustParseCid("bafk2bzacebbsfhhwiv6n4k5buz2xdu3yff4qs43hxlibb335jmdx5xc44wv6g"), "evm": MustParseCid("bafk2bzacebhpftearnnb3qtxygwgvedrxuazznwyhd3wpbrc2zoytj3ewg3ia"),
"init": MustParseCid("bafk2bzacecuog2pnpc6r55suclspolpnrrnxykcgc33lhlz7n3fgjy22vn7de"), "init": MustParseCid("bafk2bzaceasfksgh65pulxgg5uhl5e72euac25kizfzouppssmw3zreo6t64s"),
"multisig": MustParseCid("bafk2bzaceczgigux7xwsfpg2e5zyjpvpay32hn47gpn7l4jhbofii7rqgxteg"), "multisig": MustParseCid("bafk2bzacecaeld3tux6vqzndc5b4igc4k3db3wjkyzrxgobb3fshir65vzdfi"),
"paymentchannel": MustParseCid("bafk2bzacect2psbtgvrvasxef46lvk7kitpdcbfkg5u3nac72pobqcmfilhh4"), "paymentchannel": MustParseCid("bafk2bzaceao2tiixjrlvnewl5q6dr6krpehdob6kk2hga6tyrz4wbwpsmutg6"),
"placeholder": MustParseCid("bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"), "placeholder": MustParseCid("bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"),
"reward": MustParseCid("bafk2bzacecwudnigxo45gd6khqqeowquzlguj4fkkstccnmnziovutav4fey6"), "reward": MustParseCid("bafk2bzaceahzrkoebsaa4gezbzyabqpuf7fhw5gnn7o6s6uvdat4mscb2mgcs"),
"storagemarket": MustParseCid("bafk2bzacecfmp3jh6i3csrtyr2zyzhzpkmgelyykznin6lmyagicwf7gjpk5y"), "storagemarket": MustParseCid("bafk2bzacebmwd5brgj5fn3b7qqxsvxs4cbjerznib6gqk4etdyibyj2q5jexi"),
"storageminer": MustParseCid("bafk2bzacea7esq47iaiu6ecukvmtlgmv7oforo4f456p2gerumapbykh4cjf4"), "storageminer": MustParseCid("bafk2bzacebouts42ha42nngelbgnhvsry4k7b3jojphhovl7xtwf3t243c22o"),
"storagepower": MustParseCid("bafk2bzacec6eyeyvmh5hnb6aqhmpns3ry4isxxmtqfcdlfhgatbandlfh3tzu"), "storagepower": MustParseCid("bafk2bzacebtljpw53z4feru2oggywxlv6b47qxceeazg7rlrkvlo2tjdyhqku"),
"system": MustParseCid("bafk2bzacecs7cbnk4rd2qke4jrag5evyq4a4qlp4h5mbycgoiunqrgtnz7bnk"), "system": MustParseCid("bafk2bzacebhmn5wuaylovcuathhjbvgbi7zwk7eg6jtgttymwqemk4adrtvkq"),
"verifiedregistry": MustParseCid("bafk2bzacebwqzbqvaxyr4wlrwj7l4zg7ymu6pcqaoltnodmgjgynuizc56y4m"), "verifiedregistry": MustParseCid("bafk2bzacedw7zfs5tb6jrp2za3mcdkpi5xicxbvfgu4v3ycrshbelvlpjr7nq"),
}, },
}, { }, {
Network: "calibrationnet", Network: "calibrationnet",
@ -201,27 +201,27 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
"verifiedregistry": MustParseCid("bafk2bzaceceoo5jlom2zweh7kpye2vkj33wgqnkjshlsw2neemqkfg5g2rmvg"), "verifiedregistry": MustParseCid("bafk2bzaceceoo5jlom2zweh7kpye2vkj33wgqnkjshlsw2neemqkfg5g2rmvg"),
}, },
}, { }, {
Network: "calibrationnet", Network: "calibrationnet",
Version: 12, Version: 12,
BundleGitTag: "v12.0.0-dev.2",
ManifestCid: MustParseCid("bafy2bzaceaipkdiplb5geo2plfrpaxisen46lqbzn4lt7ffmsdwdps4zb6424"), ManifestCid: MustParseCid("bafy2bzacec46zrw3audq7bcubljpjxabibpa6oxxi2bi6mx7dexzef6corc42"),
Actors: map[string]cid.Cid{ Actors: map[string]cid.Cid{
"account": MustParseCid("bafk2bzacedgtgdr2oj2jwdp6kapxvqvuec5s5awvbcjre3npygezasdl5yb52"), "account": MustParseCid("bafk2bzaceazknqujefijifwqjt5bp6osspbuvkxl2fqzdgqkbco3jseuzcpmm"),
"cron": MustParseCid("bafk2bzacea4k2cgqv2aefs2rz3xd2ky25wlqoo6r3fdytlmhsf4emzqpvid2s"), "cron": MustParseCid("bafk2bzaceatqs5ypt4b5fnnqtvbkjbmgbm4kvpjoow7xt4wdvv4tcuhsl3rh4"),
"datacap": MustParseCid("bafk2bzaceab4367hss5dd4a2q5oodmtpml5nnrnybtmf52wgxfb4cw7voxu62"), "datacap": MustParseCid("bafk2bzacebgicoy4uc5yt4iaefdg63fbfaocqda3hkidhjepjyx5ybzg6gd5q"),
"eam": MustParseCid("bafk2bzaceac3qbafk2ucohhurwqmoolanf33tiwtyicukiecboj3zshbd7ao2"), "eam": MustParseCid("bafk2bzacebfiy2lmycixi2lm2gzm7laqwmq6ljwwzrrdzlg5sjd5av2mxhyza"),
"ethaccount": MustParseCid("bafk2bzacedy2lbg6qrr5z3vzyuz3qeaids7t4pvdu7ohk34e7a56xtijmhj4u"), "ethaccount": MustParseCid("bafk2bzacecqf4tnx7h3b5yv6mmqwip2tpwv5apoi5fu7r5xcsggg62aopmbh6"),
"evm": MustParseCid("bafk2bzacebqx3jxucwtjo5j7b5mupuybrzamq2gzd5t6lohwxzga7vuc6zhag"), "evm": MustParseCid("bafk2bzacebhmpzjmeqitktlrxeqgv5t3k4jx6adpdgul5nbgjtl42sz6qydci"),
"init": MustParseCid("bafk2bzacebvqeg7ka4ogomupjnikaziqf37huz4jgvoctqwiobffdad3e2d3y"), "init": MustParseCid("bafk2bzacecvr75cexy7pavybgpbqnr6qikugz4oqmon5plt642uce5djpkw7u"),
"multisig": MustParseCid("bafk2bzacechwpp2kvsjvrj4ry5ploj2ejkfo2zvzq4umxy7tberjaregp6kdo"), "multisig": MustParseCid("bafk2bzacea57gzxplsk2aqvmoqltvf3b2mep67fy2xs6acrlglphetrw2sn2g"),
"paymentchannel": MustParseCid("bafk2bzacedfhhvzjzhrpokf2jt7es4jq25ryagzf4qy3txyffvje23vih75i4"), "paymentchannel": MustParseCid("bafk2bzacecsc63ffhhkwwo4gadbt6mviynjx7pstb76fqbbxk34m56cwmz3go"),
"placeholder": MustParseCid("bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"), "placeholder": MustParseCid("bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"),
"reward": MustParseCid("bafk2bzaceby3y6qhaunjqmwrvegqh7ouj4ua7advg6eyzxcj43spaypeomjgg"), "reward": MustParseCid("bafk2bzacec4nr5wns7zcokbrmtubqhahqzr2dn32cokzoughuqpibvbd7bcdi"),
"storagemarket": MustParseCid("bafk2bzacedgdck3s5asnn5di5ijg22gpqnxj7bynekbycvydwqgemqwzzmere"), "storagemarket": MustParseCid("bafk2bzacedu6ztca5cca656hp5vci2jdd6amnr4qng6zmhsoxjpiw3rvdoozw"),
"storageminer": MustParseCid("bafk2bzacebwecbrksabe5w25iop6ysgwk57etueo67vnwsyny3nkzbnk6xshq"), "storageminer": MustParseCid("bafk2bzacedes62nulops6p46n7uys4wsidss3nne4wt3m37l5jnu2jfgbttww"),
"storagepower": MustParseCid("bafk2bzacedam2fr6yyo5qhief6mxkxz7b53xgflntwgch6ujbc3wp35h4g4sa"), "storagepower": MustParseCid("bafk2bzacedvyxyw2gdqili4t6px4ggl5faxk25aihbm7culeqjzqixrsrsw42"),
"system": MustParseCid("bafk2bzacecfs5d6ktybdq6jeqiomte6tewufptk72qc6gstn6hb3gzkyedn3a"), "system": MustParseCid("bafk2bzaceaqc4ckrlttyyq4shkog4ymeulli5drxwvnxxwi5lcx5t4mdelgw6"),
"verifiedregistry": MustParseCid("bafk2bzaceamkpusx5yglkb5oghqeihugs6zyouzxz6jjmk5s4qs4bovnpldgg"), "verifiedregistry": MustParseCid("bafk2bzaceb7hrconkdpbzrsnu3hhblxuum7jrlrswj7dafhnl5xutblnl4kci"),
}, },
}, { }, {
Network: "caterpillarnet", Network: "caterpillarnet",
@ -316,27 +316,27 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
"verifiedregistry": MustParseCid("bafk2bzacedaws3or3twy45ltcxucgvqijsje4x675ph6vup2w35smlfneamno"), "verifiedregistry": MustParseCid("bafk2bzacedaws3or3twy45ltcxucgvqijsje4x675ph6vup2w35smlfneamno"),
}, },
}, { }, {
Network: "caterpillarnet", Network: "caterpillarnet",
Version: 12, Version: 12,
BundleGitTag: "v12.0.0-dev.2",
ManifestCid: MustParseCid("bafy2bzaceaq2fun5mrdea6zrpbctybhbmjnhfwb42xryabxchdyjewdlembu4"), ManifestCid: MustParseCid("bafy2bzaceb3dwdchw7pc7vkqfo3pscy6gcxplilisjrzg4pzsa7rbbe3xrdn4"),
Actors: map[string]cid.Cid{ Actors: map[string]cid.Cid{
"account": MustParseCid("bafk2bzacecvsfyecyerrkhb4wtdahiwltc47abn2an5bxktkef2wxzevuh2vg"), "account": MustParseCid("bafk2bzaceaxcwzahxj6i6hoyurmdes3tnx7japxy7lwhfc7e6l5nyrq6gev2e"),
"cron": MustParseCid("bafk2bzacedgofnfgnlrcsihb2dvjacekhlz6k4txc4wof3wm2n3yj2wv2exii"), "cron": MustParseCid("bafk2bzaceaeiof4orsftdo75kfdnhk26yshedda2wx77fozhvecvln42e5vgm"),
"datacap": MustParseCid("bafk2bzacedd7j6fmon4k4pepohsm5nsvdr52xagbkbroeouid2fkgkpwug32e"), "datacap": MustParseCid("bafk2bzaced36kvsmpx3j4bu63b4xfadmh4xk6htlz4rqzut3f5areqtsztdn6"),
"eam": MustParseCid("bafk2bzacecbita45luvxs7v4lmwqj3pv2z5qbjeugt7vl6ct46kvd3zl53fzo"), "eam": MustParseCid("bafk2bzacedjrkr4wxkfqxdbi5y3hegnuls3jnhq22hm4rqtfgwtv4vikdouue"),
"ethaccount": MustParseCid("bafk2bzaceaz7esfh3itqdxiraogqtair3jlxevb2quuxfhgm3bxyers5s2mgw"), "ethaccount": MustParseCid("bafk2bzacedb5nc4ahq4gi7kcc6vw377zv6mj2ych6mbefw7r5ts5hg5ayfssm"),
"evm": MustParseCid("bafk2bzaceacl3yet4pmuyzzfu6bnqtcslqjbinpjlhgwltu6iklqqmytkxjro"), "evm": MustParseCid("bafk2bzacebchr2p5shvmj56mggikjlzc4kwwgvinw7jarxy7xliyf2kukkmqs"),
"init": MustParseCid("bafk2bzaceb2iuaasrij2232x4a35glhisddmmlykqwao723urapgacqyrcixk"), "init": MustParseCid("bafk2bzaceas2x7zp23xidychzaiddirum62gszcatksy5372ymaxjhlgfsl4w"),
"multisig": MustParseCid("bafk2bzacedqjjgilxkqjupkwppmolav5757ngdv4vdg4hitth4kamsv272m6k"), "multisig": MustParseCid("bafk2bzacebmj5lueub6rffjb3jfmf4spf5rtilfeyqjkwwrr4s3fx357dzsv4"),
"paymentchannel": MustParseCid("bafk2bzaced67dmxjymwype5ugx3i2kdugh56eyew6s3rgn5uc7fhjr5tq4dwg"), "paymentchannel": MustParseCid("bafk2bzacebejg54jpzbd3swpe4brxfxxml76np2iqa25drmomz2xnqhybti4c"),
"placeholder": MustParseCid("bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"), "placeholder": MustParseCid("bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"),
"reward": MustParseCid("bafk2bzacedqwx7ntb2lz4l6oorvlv732oxt6ots7wfzkjeyn6wmfmasr3opvu"), "reward": MustParseCid("bafk2bzaceduxa6lkazdaabrofo63qq56uoctrgfamuvqkxri5vb36b6zlyg62"),
"storagemarket": MustParseCid("bafk2bzacecprrqtbvrxrbviv4x5iu7xcbf4vm3jkftsauh7dfx5lab3z4z4es"), "storagemarket": MustParseCid("bafk2bzacec577tsgcmvoz5errtc5hlgesw52jjk3l72ey6zbkowntssxcjvys"),
"storageminer": MustParseCid("bafk2bzacecesuudr3q3do4semhdtrj3j4tjaxheqz3hrqtkja42ceszxzubwe"), "storageminer": MustParseCid("bafk2bzacedgltxtcdxqq6rea7zi45y25b4tsvufaumlhi3d6wsjk7knobbfew"),
"storagepower": MustParseCid("bafk2bzacednsnvf6hrjoagqnvdoa74hu7m4fbrvezqhfsq6r7n3vmv5kjoc5a"), "storagepower": MustParseCid("bafk2bzacedcjabfskycamxgzlkpupztnp5cbwebhirho3x5ntykye5gvl4c7m"),
"system": MustParseCid("bafk2bzaceczxdboh4nwcou4lkfnxzaixqhhlpq2ypyql73p55l2qlkeeuliei"), "system": MustParseCid("bafk2bzacear2j7rlfgirczggjejukdib4gmryyumknbfekgq6nqmaadds2ayc"),
"verifiedregistry": MustParseCid("bafk2bzacebr3pjfzmpkauu3qs2c2ow53frjux564zjawb5tclacll23omulzk"), "verifiedregistry": MustParseCid("bafk2bzacebxfct6htl2zqutzifxbzv7esuzdyaebuxforkucskbxqa5qle5q6"),
}, },
}, { }, {
Network: "devnet", Network: "devnet",
@ -422,27 +422,27 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
"verifiedregistry": MustParseCid("bafk2bzacebdqi5tr5pjnem5nylg2zbqcugvi7oxi35bhnrfudx4y4ufhlit2k"), "verifiedregistry": MustParseCid("bafk2bzacebdqi5tr5pjnem5nylg2zbqcugvi7oxi35bhnrfudx4y4ufhlit2k"),
}, },
}, { }, {
Network: "devnet", Network: "devnet",
Version: 12, Version: 12,
BundleGitTag: "v12.0.0-dev.2",
ManifestCid: MustParseCid("bafy2bzaceagonf7bxmnyf7hdkw6hktywrc4qachnpocas2mhayuyucdpsi6de"), ManifestCid: MustParseCid("bafy2bzacebie7spydnd3nbx2e3muo6qqex2d7zsttphf7gamx7iog7tmfgsru"),
Actors: map[string]cid.Cid{ Actors: map[string]cid.Cid{
"account": MustParseCid("bafk2bzacebzxft7ljumqlwrj6kbwaiblwftfigvde6zpk2jlfy6kfab3eivvw"), "account": MustParseCid("bafk2bzacebwcirmvgh4exhmud7ov57amc26r5udwcpidgyq3dl7w4bhwqqbqw"),
"cron": MustParseCid("bafk2bzacedzx7dxt2vj27gc7rzi73qshakdjd4r4h7rjlft573kql6uuuoxze"), "cron": MustParseCid("bafk2bzaced2dapvep3tdbghg2mcnypfumo5qsnwnmyzo7s64vnpffgm3osose"),
"datacap": MustParseCid("bafk2bzacecut7lxz2bbfq5r2izmhbnbebdivwkfr45lfy262oiaqietmxow54"), "datacap": MustParseCid("bafk2bzaceac3vs2l2yivsygafquxkx24muyelbtx7nlemyxnq2rzrzgr747q4"),
"eam": MustParseCid("bafk2bzaceadhudlti25kcsiuxvpjtipjh6p7wr66m76q25lcha56vxhe7iio6"), "eam": MustParseCid("bafk2bzacebcqukj4p5eciomzalofmei6n66ac2ykqjsqzfxjirnhgihtwiwp6"),
"ethaccount": MustParseCid("bafk2bzacec2a4fcnhgvnei2eeafevcanbtmzxndprejlgigesmoyyq3vxjrta"), "ethaccount": MustParseCid("bafk2bzaceahyfc5gkr62imqypew3u56svyauwihz3xau33iy2vvfqknri7zoo"),
"evm": MustParseCid("bafk2bzaceaikthq6wlk47covv55ddwjupvomcj6nmj6gfdpqemri2ymimtgeq"), "evm": MustParseCid("bafk2bzacedm3y7djcc3a2dplb27qdzv4pqd42qelsqjpb4ouop5m7sc4rnsge"),
"init": MustParseCid("bafk2bzaceaka7tbqwgi3ogp2kcu5r7meo4l7zflycyezlck7lv5yp32ttxqyo"), "init": MustParseCid("bafk2bzacecytopo2myozwqwdic5r6j7awzqcwp6jo3psyinm5sjutkiap5oxa"),
"multisig": MustParseCid("bafk2bzacebrhrgjid4mi2ch6fm7aqgwlqqt22vk54dv3o4a3iqg6scp2a6irs"), "multisig": MustParseCid("bafk2bzacebydlta5mzpqmulee2zz36c7knkkh2auu5zpqvh6auyd4ymywja6k"),
"paymentchannel": MustParseCid("bafk2bzacecpiztcznkmreklw4kmfcydiwbnmb3pkptrr47dy6vwa6awecodzq"), "paymentchannel": MustParseCid("bafk2bzaceafk4hkecxh3crczmwv2bcx62hucz6zunma6l6re6f5boxq67psv4"),
"placeholder": MustParseCid("bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"), "placeholder": MustParseCid("bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"),
"reward": MustParseCid("bafk2bzaceag34lek46iifugz7bqx5pjoszasp2ldkqnbfesvpwczhlnl2giiu"), "reward": MustParseCid("bafk2bzacedfqmdaop5e2hpg7jwj65d5wvvzox7qoilbzvruenosdshiyjfbke"),
"storagemarket": MustParseCid("bafk2bzacea7574mwdfgpsgucvgmpg6upblalqh4dgk6lurzxugj7vrygmbiga"), "storagemarket": MustParseCid("bafk2bzacedbxsezacrv3nmwmlksmuvtlg4gpru5fz4pajkm6dogkohae5aarg"),
"storageminer": MustParseCid("bafk2bzaceclulipufdxs46niodn7peetgd7uhrxenw7sjiilsutquj5ac3rjs"), "storageminer": MustParseCid("bafk2bzacea3encig7orwntdkry64mlillvejonxzuczxj4tamtpi3rcmnbr5m"),
"storagepower": MustParseCid("bafk2bzacednqafym2q3o3t63dirrrlurtiyau5vxlup7anc4k7nxkyxdayegm"), "storagepower": MustParseCid("bafk2bzacedctrzu4b3a6tmaech5cmhoifobqx4eqhbbjt3yu4dmh25i7f5z6y"),
"system": MustParseCid("bafk2bzacea4bi63eonaqh3ol2dx5neiw245gh3h4bc5nyourvsqfwo32go3bc"), "system": MustParseCid("bafk2bzacecvw2nad46yz37uex3apkovcfnbo47a3bevwlelrbrgsebrxsr24y"),
"verifiedregistry": MustParseCid("bafk2bzacebxo7xv4gruof2p36pvdt4nqlrjypewemz35m5rvkta2unfjkhfgg"), "verifiedregistry": MustParseCid("bafk2bzacebxqyfj7ewxm4xxewe5jj4ry7n6gttzzj6wsznm7kcecskqdqskzw"),
}, },
}, { }, {
Network: "hyperspace", Network: "hyperspace",
@ -551,27 +551,27 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
"verifiedregistry": MustParseCid("bafk2bzacedej3dnr62g2je2abmyjg3xqv4otvh6e26du5fcrhvw7zgcaaez3a"), "verifiedregistry": MustParseCid("bafk2bzacedej3dnr62g2je2abmyjg3xqv4otvh6e26du5fcrhvw7zgcaaez3a"),
}, },
}, { }, {
Network: "mainnet", Network: "mainnet",
Version: 12, Version: 12,
BundleGitTag: "v12.0.0-dev.2",
ManifestCid: MustParseCid("bafy2bzacedowjygm2fy5yryyyjcww6znqngoz4rildgouuj6uk35z7a2u5gmc"), ManifestCid: MustParseCid("bafy2bzacebo7pbwl7oifbj2vavy6qbpbwyqruhkhtqswibc6yr2iruepupzpo"),
Actors: map[string]cid.Cid{ Actors: map[string]cid.Cid{
"account": MustParseCid("bafk2bzacedzaf3mtu57zkzg64druer5yyckyjxcqzp6j7d5aub3bhtukocges"), "account": MustParseCid("bafk2bzacedpb57hg3k3qxrozhl4gm7exxy6dmmseqkkdptme42f3nznnilx4g"),
"cron": MustParseCid("bafk2bzaceadfvanqrxocz4meefl45p7gwf37oboufk3ek54qdpnlz3vkpecw2"), "cron": MustParseCid("bafk2bzaced4f33wsbenjj3u323vm5hkkssto4jccjzytsnigmulg3vsxxmzca"),
"datacap": MustParseCid("bafk2bzacecvy53fceivrvl3zks37y5nx5a6u24h72toebefrnwcl4nxkla6j2"), "datacap": MustParseCid("bafk2bzacedu3pigkb7wqyw4lulidtuj4ubnyitxog2ynp2av2bkhghbmleni4"),
"eam": MustParseCid("bafk2bzacedpxcqfmommw6yvqmdqryb2lloyou72ga6b3daph56gntgbrachdg"), "eam": MustParseCid("bafk2bzacebjqrptl6263twwlvibojfg2m4prvuzb23olztnsxfzkhpkbrwoig"),
"ethaccount": MustParseCid("bafk2bzaceaqqvv22w5664fbktnzo2pqlli3mwr6sqsm6bn2tmcrecyudclz66"), "ethaccount": MustParseCid("bafk2bzacearkzkdgfm367yykho3i5nttjocdg4w3zgfxolt53bln4rvj4qzhi"),
"evm": MustParseCid("bafk2bzaceb3aktnl7hgsr7nr2murlyqzecmxcs5t3wiatdsxfgmctxh44uzcg"), "evm": MustParseCid("bafk2bzaceczvko7yucqm2gf2hobkio2s47ln4oczfx3ly2q624xdoumotcyhw"),
"init": MustParseCid("bafk2bzaceb4dichby4a2dilbzspkxpklbittslnnuhfe32ouotcydbaxjkyoc"), "init": MustParseCid("bafk2bzacedvak3dp6sugmtgd6kdg3acxtlrm7zs3petcb323bs52tmpypjlqk"),
"multisig": MustParseCid("bafk2bzaced2dvtci3pemxonxkfnyeew2fxsmzqcaun2kqkcf7eyot7k6k23zq"), "multisig": MustParseCid("bafk2bzacedcx4o6qm7uyge6uoddfhva5oumcr3isbbbqmxycr7zvf3rrxndtm"),
"paymentchannel": MustParseCid("bafk2bzacec64pr3ekvcokfx4z6nyl7ge4gk6ddlnv6vcpfnw3llsfxlukqbbi"), "paymentchannel": MustParseCid("bafk2bzacebuacnyucqmpi5mgtzw2twdvtf4dyvawqjxlowxrbfm4kgqmp7tly"),
"placeholder": MustParseCid("bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"), "placeholder": MustParseCid("bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"),
"reward": MustParseCid("bafk2bzacedwhowydy4bzqvixahs3dfofzuxgdmgtmbbsymgn7ml5vcx4noyb6"), "reward": MustParseCid("bafk2bzacecyrtaxq3y4fyb4oxj2yo2eiyoji3myvicxk5bnwcornmtl6ro7by"),
"storagemarket": MustParseCid("bafk2bzaceczbmzpnucj4jtk3i5pcygf4cnl3sd4yfpvlpwed2vte25q7crevw"), "storagemarket": MustParseCid("bafk2bzacecj43gwtjlbuacou3zgo4g4milgzm4dgrammttlz3y5plyjubsu5c"),
"storageminer": MustParseCid("bafk2bzaceddf5eoidcxj3ujktarujfgvujy2ry2uhr56ah4cl5ppyonx4mib6"), "storageminer": MustParseCid("bafk2bzacebyoi7zwm7qukjlbjox3urbbgjvsnwm3fnepa643p3oawxjauekjw"),
"storagepower": MustParseCid("bafk2bzacebm7akrycbzyzlkophliwlemt72qhald2f67yfzzmcjzrz4vyanpa"), "storagepower": MustParseCid("bafk2bzacecm36o2vdwqiueyqnnlwh5q7pfctpcockqathrnjy47iotgshmxrc"),
"system": MustParseCid("bafk2bzacedksemrry4htnpmlx2wxp7e6qm733zqkfxiqpm4g34g7cqkqm55tg"), "system": MustParseCid("bafk2bzacecsyyjhphhjaateyabzkubunv76yy2au4srs2ia35davww4tjxr7k"),
"verifiedregistry": MustParseCid("bafk2bzacea4rrffnjxdqtdluf2jgawvcksx7yhilru4bzsbdxafyxuxpbtous"), "verifiedregistry": MustParseCid("bafk2bzacecscdqn3dcs74mawfjijeqs73q2irjg7phzec52h4wcu6s3ma7smi"),
}, },
}, { }, {
Network: "testing", Network: "testing",
@ -657,27 +657,27 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
"verifiedregistry": MustParseCid("bafk2bzacebp2r56wxadvfzpfbmqwfi3dlnwpmoc5u4tau2hfftbkuafkhye64"), "verifiedregistry": MustParseCid("bafk2bzacebp2r56wxadvfzpfbmqwfi3dlnwpmoc5u4tau2hfftbkuafkhye64"),
}, },
}, { }, {
Network: "testing", Network: "testing",
Version: 12, Version: 12,
BundleGitTag: "v12.0.0-dev.2",
ManifestCid: MustParseCid("bafy2bzacea2qiia5hnmpryp4oxeijq4rxex2wbutksvlnfqqic3ioeh3hk4wk"), ManifestCid: MustParseCid("bafy2bzacebfy4wz5kxtblv33vs25jkuqoxmdhy2wm7jzk6jvno4wz22nkzyeu"),
Actors: map[string]cid.Cid{ Actors: map[string]cid.Cid{
"account": MustParseCid("bafk2bzaceb432jqlwz2tfafqbmyrowojd6lhevcyg6i2gkot2a4742n4vld3c"), "account": MustParseCid("bafk2bzacec2mxouocy7h3ohahbexu6pbzencarfm2q423y5glxyaclgso52qk"),
"cron": MustParseCid("bafk2bzacedl5w6nowgjzrul5mllwtfhoxqr7mmovu74egitkx5v5gqunmeyrk"), "cron": MustParseCid("bafk2bzaceas5abq2a4zayl54xvo4o7mzzsao6kjixoztcrrv3rrt4tbrde2um"),
"datacap": MustParseCid("bafk2bzaceb3763jtueduhikfakm5uu7lglom5yd3kyqtjxdrgmbtmjdk3utyy"), "datacap": MustParseCid("bafk2bzacedfmgyuognrzp3ul3h6czmhr3aunj5da25uhpwbutxaona6shz34g"),
"eam": MustParseCid("bafk2bzaceb3fijyw3y7jcqojsos4nmhj2n5kg7jpmyh74pqic7vowvyevyrfe"), "eam": MustParseCid("bafk2bzacecez7diadkz54aqsvxaixjq2n4ekxkuswfawywx6rbzo5h6z7i54q"),
"ethaccount": MustParseCid("bafk2bzaceb6je4q53fuvnsbubr2ozpow6jphugjfafcrdtrycpoe3742erldq"), "ethaccount": MustParseCid("bafk2bzacedxkhuauw3tlh7aezjyi2n7ufs2ai5dho6levo4d7dj2wqz2lp5re"),
"evm": MustParseCid("bafk2bzaceawy7ntpzraa7zpb3jn3ins5v7z2a2bafdg6hfijme3pzeibmqudo"), "evm": MustParseCid("bafk2bzacectw2lb73ukdtqwmep6c77ejlkx2gkxqizugzufavzosdgde5pv3i"),
"init": MustParseCid("bafk2bzacecjnj4dupkeg6vfa4d5abhwzlgti5lxj62d76ebxuwi72qfswzsxe"), "init": MustParseCid("bafk2bzacecfqtx6xoapxan5n2r6krkx5fj6dnrzb57hhcg4p4v7nbuxf2kdjk"),
"multisig": MustParseCid("bafk2bzacebrasao55cae4t6ss7lkmybglsbc5ep23k2xemyw4tmkklf47xah4"), "multisig": MustParseCid("bafk2bzacea5zddhue64kkj7iev75lvf3i2n5qvjnku7unq2psjnsgbjkv2aee"),
"paymentchannel": MustParseCid("bafk2bzacebfse3hrno6joffqhr7m3lqqxkbcm4h35b53zxfa7u7vuuq7avhde"), "paymentchannel": MustParseCid("bafk2bzaceap4nhkt224mhekarcyr5ehs4bjhkc62oezumxheveucph6wgx5ok"),
"placeholder": MustParseCid("bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"), "placeholder": MustParseCid("bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"),
"reward": MustParseCid("bafk2bzacedbx7lduyouqad2r32kugdfvornk25zvwhgua5u3b3qr44mcafxgm"), "reward": MustParseCid("bafk2bzacecuyuetbjfmcbg5x6o2rbb7q3jy2baxmuzvvtobvpcudaou44zp2c"),
"storagemarket": MustParseCid("bafk2bzacebvnjqvwqbvdrv47ti4fqjada4qynnph7i3dcg7pwcq44kksxiqr4"), "storagemarket": MustParseCid("bafk2bzacedm3wtouilvpjlx4xbsp2ktakb53muvt5dhvzwx2vycxmsrcckjh4"),
"storageminer": MustParseCid("bafk2bzacednlenhzjjxgue7z2vsjbnwt2pplyvh3t3ok2a6vimjdqiq4hnnkc"), "storageminer": MustParseCid("bafk2bzacea4j45eonhbk7tho4oztrsz5skkracyuuten6oebfxevbiilp7lms"),
"storagepower": MustParseCid("bafk2bzacedizg46rjo3os6mopuvnyftlecfixsf5eijz2u4os3zzsepoqhrqw"), "storagepower": MustParseCid("bafk2bzacecx7kmxkac6qr3amf4pihmps3lbknypqwqbqeao3ccjhuoathlvbi"),
"system": MustParseCid("bafk2bzacedvnvuuxvaednmoqtm7vo2rzdwjkwmn46oheck5xqy7i2txrwsjci"), "system": MustParseCid("bafk2bzaceconbwh6sfqtfuxbx2at2lcdallils5yowfov3sbganufyegih4ns"),
"verifiedregistry": MustParseCid("bafk2bzacedisnzlqdxpuopf22ya77n54jto6vi3lf7fxfcdqnchmhemlychca"), "verifiedregistry": MustParseCid("bafk2bzacealytv5rsiozhcbpscuvigur6s2wlexkec55pzitudji2iy3kaofy"),
}, },
}, { }, {
Network: "testing-fake-proofs", Network: "testing-fake-proofs",
@ -763,26 +763,26 @@ var EmbeddedBuiltinActorsMetadata []*BuiltinActorsMetadata = []*BuiltinActorsMet
"verifiedregistry": MustParseCid("bafk2bzacebp2r56wxadvfzpfbmqwfi3dlnwpmoc5u4tau2hfftbkuafkhye64"), "verifiedregistry": MustParseCid("bafk2bzacebp2r56wxadvfzpfbmqwfi3dlnwpmoc5u4tau2hfftbkuafkhye64"),
}, },
}, { }, {
Network: "testing-fake-proofs", Network: "testing-fake-proofs",
Version: 12, Version: 12,
BundleGitTag: "v12.0.0-dev.2",
ManifestCid: MustParseCid("bafy2bzacebejjwowoaa3kkss27eksvehslp7khhrtl33dr6fz2v3tznkne25c"), ManifestCid: MustParseCid("bafy2bzacedury3anneawcx2mj27e6k4kacib3gtkm3q6xg6mf7wz3drlm4vpo"),
Actors: map[string]cid.Cid{ Actors: map[string]cid.Cid{
"account": MustParseCid("bafk2bzaceb432jqlwz2tfafqbmyrowojd6lhevcyg6i2gkot2a4742n4vld3c"), "account": MustParseCid("bafk2bzacec2mxouocy7h3ohahbexu6pbzencarfm2q423y5glxyaclgso52qk"),
"cron": MustParseCid("bafk2bzacedl5w6nowgjzrul5mllwtfhoxqr7mmovu74egitkx5v5gqunmeyrk"), "cron": MustParseCid("bafk2bzaceas5abq2a4zayl54xvo4o7mzzsao6kjixoztcrrv3rrt4tbrde2um"),
"datacap": MustParseCid("bafk2bzaceb3763jtueduhikfakm5uu7lglom5yd3kyqtjxdrgmbtmjdk3utyy"), "datacap": MustParseCid("bafk2bzacedfmgyuognrzp3ul3h6czmhr3aunj5da25uhpwbutxaona6shz34g"),
"eam": MustParseCid("bafk2bzaceb3fijyw3y7jcqojsos4nmhj2n5kg7jpmyh74pqic7vowvyevyrfe"), "eam": MustParseCid("bafk2bzacecez7diadkz54aqsvxaixjq2n4ekxkuswfawywx6rbzo5h6z7i54q"),
"ethaccount": MustParseCid("bafk2bzaceb6je4q53fuvnsbubr2ozpow6jphugjfafcrdtrycpoe3742erldq"), "ethaccount": MustParseCid("bafk2bzacedxkhuauw3tlh7aezjyi2n7ufs2ai5dho6levo4d7dj2wqz2lp5re"),
"evm": MustParseCid("bafk2bzaceawy7ntpzraa7zpb3jn3ins5v7z2a2bafdg6hfijme3pzeibmqudo"), "evm": MustParseCid("bafk2bzacectw2lb73ukdtqwmep6c77ejlkx2gkxqizugzufavzosdgde5pv3i"),
"init": MustParseCid("bafk2bzacecjnj4dupkeg6vfa4d5abhwzlgti5lxj62d76ebxuwi72qfswzsxe"), "init": MustParseCid("bafk2bzacecfqtx6xoapxan5n2r6krkx5fj6dnrzb57hhcg4p4v7nbuxf2kdjk"),
"multisig": MustParseCid("bafk2bzacebrasao55cae4t6ss7lkmybglsbc5ep23k2xemyw4tmkklf47xah4"), "multisig": MustParseCid("bafk2bzacea5zddhue64kkj7iev75lvf3i2n5qvjnku7unq2psjnsgbjkv2aee"),
"paymentchannel": MustParseCid("bafk2bzacebfse3hrno6joffqhr7m3lqqxkbcm4h35b53zxfa7u7vuuq7avhde"), "paymentchannel": MustParseCid("bafk2bzaceap4nhkt224mhekarcyr5ehs4bjhkc62oezumxheveucph6wgx5ok"),
"placeholder": MustParseCid("bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"), "placeholder": MustParseCid("bafk2bzacedfvut2myeleyq67fljcrw4kkmn5pb5dpyozovj7jpoez5irnc3ro"),
"reward": MustParseCid("bafk2bzacedbx7lduyouqad2r32kugdfvornk25zvwhgua5u3b3qr44mcafxgm"), "reward": MustParseCid("bafk2bzacecuyuetbjfmcbg5x6o2rbb7q3jy2baxmuzvvtobvpcudaou44zp2c"),
"storagemarket": MustParseCid("bafk2bzacebvnjqvwqbvdrv47ti4fqjada4qynnph7i3dcg7pwcq44kksxiqr4"), "storagemarket": MustParseCid("bafk2bzacedm3wtouilvpjlx4xbsp2ktakb53muvt5dhvzwx2vycxmsrcckjh4"),
"storageminer": MustParseCid("bafk2bzacebhb4prwkgqzcdvq3vziuk4n4t74fnedgpok44cakkzc47a774oou"), "storageminer": MustParseCid("bafk2bzacebfmhawnn6ms2phshtxusa5vjv4vfhz47oaxjnu3sop5eyrm3okho"),
"storagepower": MustParseCid("bafk2bzacebzijogcuowc7bgwb76vqhq5hkpczianyeg6bqspd4isajn66w6mu"), "storagepower": MustParseCid("bafk2bzacebz3ez3uzhmxfeb7mstwfbdstawwcfkxby77co66fvkjyedwv7fle"),
"system": MustParseCid("bafk2bzacedvnvuuxvaednmoqtm7vo2rzdwjkwmn46oheck5xqy7i2txrwsjci"), "system": MustParseCid("bafk2bzaceconbwh6sfqtfuxbx2at2lcdallils5yowfov3sbganufyegih4ns"),
"verifiedregistry": MustParseCid("bafk2bzacedisnzlqdxpuopf22ya77n54jto6vi3lf7fxfcdqnchmhemlychca"), "verifiedregistry": MustParseCid("bafk2bzacealytv5rsiozhcbpscuvigur6s2wlexkec55pzitudji2iy3kaofy"),
}, },
}} }}

49
chain/actors/policy/policy.go
View File

@ -560,8 +560,53 @@ func GetWinningPoStSectorSetLookback(nwVer network.Version) abi.ChainEpoch {
return ChainFinality return ChainFinality
} }
func GetMaxSectorExpirationExtension() abi.ChainEpoch { func GetMaxSectorExpirationExtension(nv network.Version) (abi.ChainEpoch, error) {
return miner12.MaxSectorExpirationExtension v, err := actorstypes.VersionForNetwork(nv)
if err != nil {
return 0, xerrors.Errorf("failed to get actors version: %w", err)
}
switch v {
case actorstypes.Version0:
return miner0.MaxSectorExpirationExtension, nil
case actorstypes.Version2:
return miner2.MaxSectorExpirationExtension, nil
case actorstypes.Version3:
return miner3.MaxSectorExpirationExtension, nil
case actorstypes.Version4:
return miner4.MaxSectorExpirationExtension, nil
case actorstypes.Version5:
return miner5.MaxSectorExpirationExtension, nil
case actorstypes.Version6:
return miner6.MaxSectorExpirationExtension, nil
case actorstypes.Version7:
return miner7.MaxSectorExpirationExtension, nil
case actorstypes.Version8:
return miner8.MaxSectorExpirationExtension, nil
case actorstypes.Version9:
return miner9.MaxSectorExpirationExtension, nil
case actorstypes.Version10:
return miner10.MaxSectorExpirationExtension, nil
case actorstypes.Version11:
return miner11.MaxSectorExpirationExtension, nil
case actorstypes.Version12:
return miner12.MaxSectorExpirationExtension, nil
default:
return 0, xerrors.Errorf("unsupported network version")
}
} }
func GetMinSectorExpiration() abi.ChainEpoch { func GetMinSectorExpiration() abi.ChainEpoch {

16
chain/actors/policy/policy.go.template
View File

@ -223,8 +223,20 @@ func GetWinningPoStSectorSetLookback(nwVer network.Version) abi.ChainEpoch {
return ChainFinality return ChainFinality
} }
func GetMaxSectorExpirationExtension() abi.ChainEpoch { func GetMaxSectorExpirationExtension(nv network.Version) (abi.ChainEpoch, error) {
return miner{{.latestVersion}}.MaxSectorExpirationExtension v, err := actorstypes.VersionForNetwork(nv)
if err != nil {
return 0, xerrors.Errorf("failed to get actors version: %w", err)
}
switch v {
{{range .versions}}
case actorstypes.Version{{.}}:
return miner{{.}}.MaxSectorExpirationExtension, nil
{{end}}
default:
return 0, xerrors.Errorf("unsupported network version")
}
} }
func GetMinSectorExpiration() abi.ChainEpoch { func GetMinSectorExpiration() abi.ChainEpoch {

215
chain/exchange/cbor_gen.go
View File

@ -43,9 +43,11 @@ func (t *Request) MarshalCBOR(w io.Writer) error {
return err return err
} }
for _, v := range t.Head { for _, v := range t.Head {
if err := cbg.WriteCid(w, v); err != nil {
return xerrors.Errorf("failed writing cid field t.Head: %w", err) if err := cbg.WriteCid(cw, v); err != nil {
return xerrors.Errorf("failed to write cid field v: %w", err)
} }
} }
// t.Length (uint64) (uint64) // t.Length (uint64) (uint64)
@ -106,12 +108,25 @@ func (t *Request) UnmarshalCBOR(r io.Reader) (err error) {
} }
for i := 0; i < int(extra); i++ { for i := 0; i < int(extra); i++ {
{
var maj byte
var extra uint64
var err error
_ = maj
_ = extra
_ = err
c, err := cbg.ReadCid(cr) {
if err != nil {
return xerrors.Errorf("reading cid field t.Head failed: %w", err) c, err := cbg.ReadCid(cr)
if err != nil {
return xerrors.Errorf("failed to read cid field t.Head[i]: %w", err)
}
t.Head[i] = c
}
} }
t.Head[i] = c
} }
// t.Length (uint64) (uint64) // t.Length (uint64) (uint64)
@ -173,7 +188,7 @@ func (t *Response) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.ErrorMessage))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.ErrorMessage))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string(t.ErrorMessage)); err != nil { if _, err := cw.WriteString(string(t.ErrorMessage)); err != nil {
return err return err
} }
@ -260,13 +275,32 @@ func (t *Response) UnmarshalCBOR(r io.Reader) (err error) {
} }
for i := 0; i < int(extra); i++ { for i := 0; i < int(extra); i++ {
{
var maj byte
var extra uint64
var err error
_ = maj
_ = extra
_ = err
var v BSTipSet {
if err := v.UnmarshalCBOR(cr); err != nil {
return err b, err := cr.ReadByte()
if err != nil {
return err
}
if b != cbg.CborNull[0] {
if err := cr.UnreadByte(); err != nil {
return err
}
t.Chain[i] = new(BSTipSet)
if err := t.Chain[i].UnmarshalCBOR(cr); err != nil {
return xerrors.Errorf("unmarshaling t.Chain[i] pointer: %w", err)
}
}
}
} }
t.Chain[i] = &v
} }
return nil return nil
@ -317,9 +351,11 @@ func (t *CompactedMessages) MarshalCBOR(w io.Writer) error {
return err return err
} }
for _, v := range v { for _, v := range v {
if err := cw.CborWriteHeader(cbg.MajUnsignedInt, uint64(v)); err != nil {
if err := cw.WriteMajorTypeHeader(cbg.MajUnsignedInt, uint64(v)); err != nil {
return err return err
} }
} }
} }
@ -354,9 +390,11 @@ func (t *CompactedMessages) MarshalCBOR(w io.Writer) error {
return err return err
} }
for _, v := range v { for _, v := range v {
if err := cw.CborWriteHeader(cbg.MajUnsignedInt, uint64(v)); err != nil {
if err := cw.WriteMajorTypeHeader(cbg.MajUnsignedInt, uint64(v)); err != nil {
return err return err
} }
} }
} }
return nil return nil
@ -405,13 +443,32 @@ func (t *CompactedMessages) UnmarshalCBOR(r io.Reader) (err error) {
} }
for i := 0; i < int(extra); i++ { for i := 0; i < int(extra); i++ {
{
var maj byte
var extra uint64
var err error
_ = maj
_ = extra
_ = err
var v types.Message {
if err := v.UnmarshalCBOR(cr); err != nil {
return err b, err := cr.ReadByte()
if err != nil {
return err
}
if b != cbg.CborNull[0] {
if err := cr.UnreadByte(); err != nil {
return err
}
t.Bls[i] = new(types.Message)
if err := t.Bls[i].UnmarshalCBOR(cr); err != nil {
return xerrors.Errorf("unmarshaling t.Bls[i] pointer: %w", err)
}
}
}
} }
t.Bls[i] = &v
} }
// t.BlsIncludes ([][]uint64) (slice) // t.BlsIncludes ([][]uint64) (slice)
@ -438,6 +495,9 @@ func (t *CompactedMessages) UnmarshalCBOR(r io.Reader) (err error) {
var maj byte var maj byte
var extra uint64 var extra uint64
var err error var err error
_ = maj
_ = extra
_ = err
maj, extra, err = cr.ReadHeader() maj, extra, err = cr.ReadHeader()
if err != nil { if err != nil {
@ -457,17 +517,27 @@ func (t *CompactedMessages) UnmarshalCBOR(r io.Reader) (err error) {
} }
for j := 0; j < int(extra); j++ { for j := 0; j < int(extra); j++ {
{
var maj byte
var extra uint64
var err error
_ = maj
_ = extra
_ = err
maj, val, err := cr.ReadHeader() {
if err != nil {
return xerrors.Errorf("failed to read uint64 for t.BlsIncludes[i] slice: %w", err) maj, extra, err = cr.ReadHeader()
if err != nil {
return err
}
if maj != cbg.MajUnsignedInt {
return fmt.Errorf("wrong type for uint64 field")
}
t.BlsIncludes[i][j] = uint64(extra)
}
} }
if maj != cbg.MajUnsignedInt {
return xerrors.Errorf("value read for array t.BlsIncludes[i] was not a uint, instead got %d", maj)
}
t.BlsIncludes[i][j] = uint64(val)
} }
} }
@ -493,13 +563,32 @@ func (t *CompactedMessages) UnmarshalCBOR(r io.Reader) (err error) {
} }
for i := 0; i < int(extra); i++ { for i := 0; i < int(extra); i++ {
{
var maj byte
var extra uint64
var err error
_ = maj
_ = extra
_ = err
var v types.SignedMessage {
if err := v.UnmarshalCBOR(cr); err != nil {
return err b, err := cr.ReadByte()
if err != nil {
return err
}
if b != cbg.CborNull[0] {
if err := cr.UnreadByte(); err != nil {
return err
}
t.Secpk[i] = new(types.SignedMessage)
if err := t.Secpk[i].UnmarshalCBOR(cr); err != nil {
return xerrors.Errorf("unmarshaling t.Secpk[i] pointer: %w", err)
}
}
}
} }
t.Secpk[i] = &v
} }
// t.SecpkIncludes ([][]uint64) (slice) // t.SecpkIncludes ([][]uint64) (slice)
@ -526,6 +615,9 @@ func (t *CompactedMessages) UnmarshalCBOR(r io.Reader) (err error) {
var maj byte var maj byte
var extra uint64 var extra uint64
var err error var err error
_ = maj
_ = extra
_ = err
maj, extra, err = cr.ReadHeader() maj, extra, err = cr.ReadHeader()
if err != nil { if err != nil {
@ -545,17 +637,27 @@ func (t *CompactedMessages) UnmarshalCBOR(r io.Reader) (err error) {
} }
for j := 0; j < int(extra); j++ { for j := 0; j < int(extra); j++ {
{
var maj byte
var extra uint64
var err error
_ = maj
_ = extra
_ = err
maj, val, err := cr.ReadHeader() {
if err != nil {
return xerrors.Errorf("failed to read uint64 for t.SecpkIncludes[i] slice: %w", err) maj, extra, err = cr.ReadHeader()
if err != nil {
return err
}
if maj != cbg.MajUnsignedInt {
return fmt.Errorf("wrong type for uint64 field")
}
t.SecpkIncludes[i][j] = uint64(extra)
}
} }
if maj != cbg.MajUnsignedInt {
return xerrors.Errorf("value read for array t.SecpkIncludes[i] was not a uint, instead got %d", maj)
}
t.SecpkIncludes[i][j] = uint64(val)
} }
} }
@ -642,13 +744,32 @@ func (t *BSTipSet) UnmarshalCBOR(r io.Reader) (err error) {
} }
for i := 0; i < int(extra); i++ { for i := 0; i < int(extra); i++ {
{
var maj byte
var extra uint64
var err error
_ = maj
_ = extra
_ = err
var v types.BlockHeader {
if err := v.UnmarshalCBOR(cr); err != nil {
return err b, err := cr.ReadByte()
if err != nil {
return err
}
if b != cbg.CborNull[0] {
if err := cr.UnreadByte(); err != nil {
return err
}
t.Blocks[i] = new(types.BlockHeader)
if err := t.Blocks[i].UnmarshalCBOR(cr); err != nil {
return xerrors.Errorf("unmarshaling t.Blocks[i] pointer: %w", err)
}
}
}
} }
t.Blocks[i] = &v
} }
// t.Messages (exchange.CompactedMessages) (struct) // t.Messages (exchange.CompactedMessages) (struct)

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

@ -125,7 +125,11 @@ func SetupStorageMiners(ctx context.Context, cs *store.ChainStore, sys vm.Syscal
sectorWeight []abi.StoragePower sectorWeight []abi.StoragePower
}, len(miners)) }, len(miners))
maxPeriods := policy.GetMaxSectorExpirationExtension() / minertypes.WPoStProvingPeriod maxLifetime, err := policy.GetMaxSectorExpirationExtension(nv)
if err != nil {
return cid.Undef, xerrors.Errorf("failed to get max extension: %w", err)
}
maxPeriods := maxLifetime / minertypes.WPoStProvingPeriod
rawPow, qaPow := big.NewInt(0), big.NewInt(0) rawPow, qaPow := big.NewInt(0), big.NewInt(0)
for i, m := range miners { for i, m := range miners {
// Create miner through power actor // Create miner through power actor

246
chain/types/cbor_gen.go
View File

@ -91,9 +91,11 @@ func (t *BlockHeader) MarshalCBOR(w io.Writer) error {
return err return err
} }
for _, v := range t.Parents { for _, v := range t.Parents {
if err := cbg.WriteCid(w, v); err != nil {
return xerrors.Errorf("failed writing cid field t.Parents: %w", err) if err := cbg.WriteCid(cw, v); err != nil {
return xerrors.Errorf("failed to write cid field v: %w", err)
} }
} }
// t.ParentWeight (big.Int) (struct) // t.ParentWeight (big.Int) (struct)
@ -249,13 +251,22 @@ func (t *BlockHeader) UnmarshalCBOR(r io.Reader) (err error) {
} }
for i := 0; i < int(extra); i++ { for i := 0; i < int(extra); i++ {
{
var maj byte
var extra uint64
var err error
_ = maj
_ = extra
_ = err
var v BeaconEntry {
if err := v.UnmarshalCBOR(cr); err != nil {
return err if err := t.BeaconEntries[i].UnmarshalCBOR(cr); err != nil {
return xerrors.Errorf("unmarshaling t.BeaconEntries[i]: %w", err)
}
}
} }
t.BeaconEntries[i] = v
} }
// t.WinPoStProof ([]proof.PoStProof) (slice) // t.WinPoStProof ([]proof.PoStProof) (slice)
@ -278,13 +289,22 @@ func (t *BlockHeader) UnmarshalCBOR(r io.Reader) (err error) {
} }
for i := 0; i < int(extra); i++ { for i := 0; i < int(extra); i++ {
{
var maj byte
var extra uint64
var err error
_ = maj
_ = extra
_ = err
var v proof.PoStProof {
if err := v.UnmarshalCBOR(cr); err != nil {
return err if err := t.WinPoStProof[i].UnmarshalCBOR(cr); err != nil {
return xerrors.Errorf("unmarshaling t.WinPoStProof[i]: %w", err)
}
}
} }
t.WinPoStProof[i] = v
} }
// t.Parents ([]cid.Cid) (slice) // t.Parents ([]cid.Cid) (slice)
@ -307,12 +327,25 @@ func (t *BlockHeader) UnmarshalCBOR(r io.Reader) (err error) {
} }
for i := 0; i < int(extra); i++ { for i := 0; i < int(extra); i++ {
{
var maj byte
var extra uint64
var err error
_ = maj
_ = extra
_ = err
c, err := cbg.ReadCid(cr) {
if err != nil {
return xerrors.Errorf("reading cid field t.Parents failed: %w", err) c, err := cbg.ReadCid(cr)
if err != nil {
return xerrors.Errorf("failed to read cid field t.Parents[i]: %w", err)
}
t.Parents[i] = c
}
} }
t.Parents[i] = c
} }
// t.ParentWeight (big.Int) (struct) // t.ParentWeight (big.Int) (struct)
@ -1318,9 +1351,11 @@ func (t *BlockMsg) MarshalCBOR(w io.Writer) error {
return err return err
} }
for _, v := range t.BlsMessages { for _, v := range t.BlsMessages {
if err := cbg.WriteCid(w, v); err != nil {
return xerrors.Errorf("failed writing cid field t.BlsMessages: %w", err) if err := cbg.WriteCid(cw, v); err != nil {
return xerrors.Errorf("failed to write cid field v: %w", err)
} }
} }
// t.SecpkMessages ([]cid.Cid) (slice) // t.SecpkMessages ([]cid.Cid) (slice)
@ -1332,9 +1367,11 @@ func (t *BlockMsg) MarshalCBOR(w io.Writer) error {
return err return err
} }
for _, v := range t.SecpkMessages { for _, v := range t.SecpkMessages {
if err := cbg.WriteCid(w, v); err != nil {
return xerrors.Errorf("failed writing cid field t.SecpkMessages: %w", err) if err := cbg.WriteCid(cw, v); err != nil {
return xerrors.Errorf("failed to write cid field v: %w", err)
} }
} }
return nil return nil
} }
@ -1401,12 +1438,25 @@ func (t *BlockMsg) UnmarshalCBOR(r io.Reader) (err error) {
} }
for i := 0; i < int(extra); i++ { for i := 0; i < int(extra); i++ {
{
var maj byte
var extra uint64
var err error
_ = maj
_ = extra
_ = err
c, err := cbg.ReadCid(cr) {
if err != nil {
return xerrors.Errorf("reading cid field t.BlsMessages failed: %w", err) c, err := cbg.ReadCid(cr)
if err != nil {
return xerrors.Errorf("failed to read cid field t.BlsMessages[i]: %w", err)
}
t.BlsMessages[i] = c
}
} }
t.BlsMessages[i] = c
} }
// t.SecpkMessages ([]cid.Cid) (slice) // t.SecpkMessages ([]cid.Cid) (slice)
@ -1429,12 +1479,25 @@ func (t *BlockMsg) UnmarshalCBOR(r io.Reader) (err error) {
} }
for i := 0; i < int(extra); i++ { for i := 0; i < int(extra); i++ {
{
var maj byte
var extra uint64
var err error
_ = maj
_ = extra
_ = err
c, err := cbg.ReadCid(cr) {
if err != nil {
return xerrors.Errorf("reading cid field t.SecpkMessages failed: %w", err) c, err := cbg.ReadCid(cr)
if err != nil {
return xerrors.Errorf("failed to read cid field t.SecpkMessages[i]: %w", err)
}
t.SecpkMessages[i] = c
}
} }
t.SecpkMessages[i] = c
} }
return nil return nil
@ -1463,9 +1526,11 @@ func (t *ExpTipSet) MarshalCBOR(w io.Writer) error {
return err return err
} }
for _, v := range t.Cids { for _, v := range t.Cids {
if err := cbg.WriteCid(w, v); err != nil {
return xerrors.Errorf("failed writing cid field t.Cids: %w", err) if err := cbg.WriteCid(cw, v); err != nil {
return xerrors.Errorf("failed to write cid field v: %w", err)
} }
} }
// t.Blocks ([]*types.BlockHeader) (slice) // t.Blocks ([]*types.BlockHeader) (slice)
@ -1538,12 +1603,25 @@ func (t *ExpTipSet) UnmarshalCBOR(r io.Reader) (err error) {
} }
for i := 0; i < int(extra); i++ { for i := 0; i < int(extra); i++ {
{
var maj byte
var extra uint64
var err error
_ = maj
_ = extra
_ = err
c, err := cbg.ReadCid(cr) {
if err != nil {
return xerrors.Errorf("reading cid field t.Cids failed: %w", err) c, err := cbg.ReadCid(cr)
if err != nil {
return xerrors.Errorf("failed to read cid field t.Cids[i]: %w", err)
}
t.Cids[i] = c
}
} }
t.Cids[i] = c
} }
// t.Blocks ([]*types.BlockHeader) (slice) // t.Blocks ([]*types.BlockHeader) (slice)
@ -1566,13 +1644,32 @@ func (t *ExpTipSet) UnmarshalCBOR(r io.Reader) (err error) {
} }
for i := 0; i < int(extra); i++ { for i := 0; i < int(extra); i++ {
{
var maj byte
var extra uint64
var err error
_ = maj
_ = extra
_ = err
var v BlockHeader {
if err := v.UnmarshalCBOR(cr); err != nil {
return err b, err := cr.ReadByte()
if err != nil {
return err
}
if b != cbg.CborNull[0] {
if err := cr.UnreadByte(); err != nil {
return err
}
t.Blocks[i] = new(BlockHeader)
if err := t.Blocks[i].UnmarshalCBOR(cr); err != nil {
return xerrors.Errorf("unmarshaling t.Blocks[i] pointer: %w", err)
}
}
}
} }
t.Blocks[i] = &v
} }
// t.Height (abi.ChainEpoch) (int64) // t.Height (abi.ChainEpoch) (int64)
@ -1933,13 +2030,22 @@ func (t *Event) UnmarshalCBOR(r io.Reader) (err error) {
} }
for i := 0; i < int(extra); i++ { for i := 0; i < int(extra); i++ {
{
var maj byte
var extra uint64
var err error
_ = maj
_ = extra
_ = err
var v EventEntry {
if err := v.UnmarshalCBOR(cr); err != nil {
return err if err := t.Entries[i].UnmarshalCBOR(cr); err != nil {
return xerrors.Errorf("unmarshaling t.Entries[i]: %w", err)
}
}
} }
t.Entries[i] = v
} }
return nil return nil
@ -1972,7 +2078,7 @@ func (t *EventEntry) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Key))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Key))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string(t.Key)); err != nil { if _, err := cw.WriteString(string(t.Key)); err != nil {
return err return err
} }
@ -2103,7 +2209,7 @@ func (t *GasTrace) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Name))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Name))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string(t.Name)); err != nil { if _, err := cw.WriteString(string(t.Name)); err != nil {
return err return err
} }
@ -2756,13 +2862,32 @@ func (t *ExecutionTrace) UnmarshalCBOR(r io.Reader) (err error) {
} }
for i := 0; i < int(extra); i++ { for i := 0; i < int(extra); i++ {
{
var maj byte
var extra uint64
var err error
_ = maj
_ = extra
_ = err
var v GasTrace {
if err := v.UnmarshalCBOR(cr); err != nil {
return err b, err := cr.ReadByte()
if err != nil {
return err
}
if b != cbg.CborNull[0] {
if err := cr.UnreadByte(); err != nil {
return err
}
t.GasCharges[i] = new(GasTrace)
if err := t.GasCharges[i].UnmarshalCBOR(cr); err != nil {
return xerrors.Errorf("unmarshaling t.GasCharges[i] pointer: %w", err)
}
}
}
} }
t.GasCharges[i] = &v
} }
// t.Subcalls ([]types.ExecutionTrace) (slice) // t.Subcalls ([]types.ExecutionTrace) (slice)
@ -2785,13 +2910,22 @@ func (t *ExecutionTrace) UnmarshalCBOR(r io.Reader) (err error) {
} }
for i := 0; i < int(extra); i++ { for i := 0; i < int(extra); i++ {
{
var maj byte
var extra uint64
var err error
_ = maj
_ = extra
_ = err
var v ExecutionTrace {
if err := v.UnmarshalCBOR(cr); err != nil {
return err if err := t.Subcalls[i].UnmarshalCBOR(cr); err != nil {
return xerrors.Errorf("unmarshaling t.Subcalls[i]: %w", err)
}
}
} }
t.Subcalls[i] = v
} }
return nil return nil

21
cmd/lotus-miner/sectors.go
View File

@ -846,7 +846,12 @@ var sectorsCheckExpireCmd = &cli.Command{
for _, sector := range sectors { for _, sector := range sectors {
MaxExpiration := sector.Activation + policy.GetSectorMaxLifetime(sector.SealProof, nv) MaxExpiration := sector.Activation + policy.GetSectorMaxLifetime(sector.SealProof, nv)
MaxExtendNow := currEpoch + policy.GetMaxSectorExpirationExtension() maxExtension, err := policy.GetMaxSectorExpirationExtension(nv)
if err != nil {
return xerrors.Errorf("failed to get max extension: %w", err)
}
MaxExtendNow := currEpoch + maxExtension
if MaxExtendNow > MaxExpiration { if MaxExtendNow > MaxExpiration {
MaxExtendNow = MaxExpiration MaxExtendNow = MaxExpiration
@ -1185,7 +1190,12 @@ var sectorsExtendCmd = &cli.Command{
newExp = abi.ChainEpoch(cctx.Int64("new-expiration")) newExp = abi.ChainEpoch(cctx.Int64("new-expiration"))
} }
maxExtendNow := currEpoch + policy.GetMaxSectorExpirationExtension() maxExtension, err := policy.GetMaxSectorExpirationExtension(nv)
if err != nil {
return xerrors.Errorf("failed to get max extension: %w", err)
}
maxExtendNow := currEpoch + maxExtension
if newExp > maxExtendNow { if newExp > maxExtendNow {
newExp = maxExtendNow newExp = maxExtendNow
} }
@ -1755,7 +1765,12 @@ var sectorsCapacityCollateralCmd = &cli.Command{
return err return err
} }
pci.Expiration = policy.GetMaxSectorExpirationExtension() + h.Height() maxExtension, err := policy.GetMaxSectorExpirationExtension(nv)
if err != nil {
return xerrors.Errorf("failed to get max extension: %w", err)
}
pci.Expiration = maxExtension + h.Height()
} }
pc, err := nApi.StateMinerInitialPledgeCollateral(ctx, maddr, pci, types.EmptyTSK) pc, err := nApi.StateMinerInitialPledgeCollateral(ctx, maddr, pci, types.EmptyTSK)

29
cmd/lotus-shed/shedgen/cbor_gen.go
View File

@ -38,7 +38,7 @@ func (t *CarbNode) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Sub"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Sub"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("Sub")); err != nil { if _, err := cw.WriteString(string("Sub")); err != nil {
return err return err
} }
@ -50,9 +50,11 @@ func (t *CarbNode) MarshalCBOR(w io.Writer) error {
return err return err
} }
for _, v := range t.Sub { for _, v := range t.Sub {
if err := cbg.WriteCid(w, v); err != nil {
return xerrors.Errorf("failed writing cid field t.Sub: %w", err) if err := cbg.WriteCid(cw, v); err != nil {
return xerrors.Errorf("failed to write cid field v: %w", err)
} }
} }
return nil return nil
} }
@ -116,12 +118,25 @@ func (t *CarbNode) UnmarshalCBOR(r io.Reader) (err error) {
} }
for i := 0; i < int(extra); i++ { for i := 0; i < int(extra); i++ {
{
var maj byte
var extra uint64
var err error
_ = maj
_ = extra
_ = err
c, err := cbg.ReadCid(cr) {
if err != nil {
return xerrors.Errorf("reading cid field t.Sub failed: %w", err) c, err := cbg.ReadCid(cr)
if err != nil {
return xerrors.Errorf("failed to read cid field t.Sub[i]: %w", err)
}
t.Sub[i] = c
}
} }
t.Sub[i] = c
} }
default: default:

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

@ -176,7 +176,12 @@ func (stage *PreCommitStage) packMiner(
return 0, false, err return 0, false, err
} }
expiration := epoch + policy.GetMaxSectorExpirationExtension() maxExtension, err := policy.GetMaxSectorExpirationExtension(nv)
if err != nil {
return 0, false, xerrors.Errorf("failed to get max extension: %w", err)
}
expiration := epoch + maxExtension
infos := make([]minertypes.PreCommitSectorParams, len(sectorNos)) infos := make([]minertypes.PreCommitSectorParams, len(sectorNos))
for i, sno := range sectorNos { for i, sno := range sectorNos {
infos[i] = minertypes.PreCommitSectorParams{ infos[i] = minertypes.PreCommitSectorParams{

81
conformance/chaos/cbor_gen.go
View File

@ -44,7 +44,7 @@ func (t *State) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Value))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Value))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string(t.Value)); err != nil { if _, err := cw.WriteString(string(t.Value)); err != nil {
return err return err
} }
@ -117,13 +117,32 @@ func (t *State) UnmarshalCBOR(r io.Reader) (err error) {
} }
for i := 0; i < int(extra); i++ { for i := 0; i < int(extra); i++ {
{
var maj byte
var extra uint64
var err error
_ = maj
_ = extra
_ = err
var v UnmarshallableCBOR {
if err := v.UnmarshalCBOR(cr); err != nil {
return err b, err := cr.ReadByte()
if err != nil {
return err
}
if b != cbg.CborNull[0] {
if err := cr.UnreadByte(); err != nil {
return err
}
t.Unmarshallable[i] = new(UnmarshallableCBOR)
if err := t.Unmarshallable[i].UnmarshalCBOR(cr); err != nil {
return xerrors.Errorf("unmarshaling t.Unmarshallable[i] pointer: %w", err)
}
}
}
} }
t.Unmarshallable[i] = &v
} }
return nil return nil
@ -177,9 +196,11 @@ func (t *CallerValidationArgs) MarshalCBOR(w io.Writer) error {
return err return err
} }
for _, v := range t.Types { for _, v := range t.Types {
if err := cbg.WriteCid(w, v); err != nil {
return xerrors.Errorf("failed writing cid field t.Types: %w", err) if err := cbg.WriteCid(cw, v); err != nil {
return xerrors.Errorf("failed to write cid field v: %w", err)
} }
} }
return nil return nil
} }
@ -252,13 +273,22 @@ func (t *CallerValidationArgs) UnmarshalCBOR(r io.Reader) (err error) {
} }
for i := 0; i < int(extra); i++ { for i := 0; i < int(extra); i++ {
{
var maj byte
var extra uint64
var err error
_ = maj
_ = extra
_ = err
var v address.Address {
if err := v.UnmarshalCBOR(cr); err != nil {
return err if err := t.Addrs[i].UnmarshalCBOR(cr); err != nil {
return xerrors.Errorf("unmarshaling t.Addrs[i]: %w", err)
}
}
} }
t.Addrs[i] = v
} }
// t.Types ([]cid.Cid) (slice) // t.Types ([]cid.Cid) (slice)
@ -281,12 +311,25 @@ func (t *CallerValidationArgs) UnmarshalCBOR(r io.Reader) (err error) {
} }
for i := 0; i < int(extra); i++ { for i := 0; i < int(extra); i++ {
{
var maj byte
var extra uint64
var err error
_ = maj
_ = extra
_ = err
c, err := cbg.ReadCid(cr) {
if err != nil {
return xerrors.Errorf("reading cid field t.Types failed: %w", err) c, err := cbg.ReadCid(cr)
if err != nil {
return xerrors.Errorf("failed to read cid field t.Types[i]: %w", err)
}
t.Types[i] = c
}
} }
t.Types[i] = c
} }
return nil return nil
@ -746,7 +789,7 @@ func (t *MutateStateArgs) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Value))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Value))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string(t.Value)); err != nil { if _, err := cw.WriteString(string(t.Value)); err != nil {
return err return err
} }
@ -857,7 +900,7 @@ func (t *AbortWithArgs) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Message))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Message))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string(t.Message)); err != nil { if _, err := cw.WriteString(string(t.Message)); err != nil {
return err return err
} }

2
extern/filecoin-ffi vendored

@ -1 +1 @@
Subproject commit 310f0ccd42760f8db567d2fa10959e3ef8b6186f Subproject commit b53241344bcba6ad12e91a00aa0e61e20e85ef0a

4
go.mod
View File

@ -45,7 +45,7 @@ require (
github.com/filecoin-project/go-jsonrpc v0.3.1 github.com/filecoin-project/go-jsonrpc v0.3.1
github.com/filecoin-project/go-padreader v0.0.1 github.com/filecoin-project/go-padreader v0.0.1
github.com/filecoin-project/go-paramfetch v0.0.4 github.com/filecoin-project/go-paramfetch v0.0.4
github.com/filecoin-project/go-state-types v0.12.1 github.com/filecoin-project/go-state-types v0.12.3
github.com/filecoin-project/go-statemachine v1.0.3 github.com/filecoin-project/go-statemachine v1.0.3
github.com/filecoin-project/go-statestore v0.2.0 github.com/filecoin-project/go-statestore v0.2.0
github.com/filecoin-project/go-storedcounter v0.1.0 github.com/filecoin-project/go-storedcounter v0.1.0
@ -135,7 +135,7 @@ require (
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
github.com/urfave/cli/v2 v2.25.5 github.com/urfave/cli/v2 v2.25.5
github.com/whyrusleeping/bencher v0.0.0-20190829221104-bb6607aa8bba github.com/whyrusleeping/bencher v0.0.0-20190829221104-bb6607aa8bba
github.com/whyrusleeping/cbor-gen v0.0.0-20230126041949-52956bd4c9aa github.com/whyrusleeping/cbor-gen v0.0.0-20230923211252-36a87e1ba72f
github.com/whyrusleeping/ledger-filecoin-go v0.9.1-0.20201010031517-c3dcc1bddce4 github.com/whyrusleeping/ledger-filecoin-go v0.9.1-0.20201010031517-c3dcc1bddce4
github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7 github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7
github.com/xeipuuv/gojsonschema v1.2.0 github.com/xeipuuv/gojsonschema v1.2.0

8
go.sum
View File

@ -338,8 +338,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.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.1.10/go.mod h1:UwGVoMsULoCK+bWjEdd/xLCvLAQFBC7EDT477SKml+Q=
github.com/filecoin-project/go-state-types v0.11.2-0.20230712101859-8f37624fa540/go.mod h1:SyNPwTsU7I22gL2r0OAPcImvLoTVfgRwdK/Y5rR1zz8= github.com/filecoin-project/go-state-types v0.11.2-0.20230712101859-8f37624fa540/go.mod h1:SyNPwTsU7I22gL2r0OAPcImvLoTVfgRwdK/Y5rR1zz8=
github.com/filecoin-project/go-state-types v0.12.1 h1:/1ip/jXIP4QzWd3hlaQ7RGp1DHKKYG3+NOhd/r08UJY= github.com/filecoin-project/go-state-types v0.12.3 h1:tPljjwrmLUT+b/H0R0yWZQVjVEso7ld9JBh4mpF6c8c=
github.com/filecoin-project/go-state-types v0.12.1/go.mod h1:KOBGyvCalT8uHBS7KSKOVbjsilD90bBZHgLAqrzz6gU= github.com/filecoin-project/go-state-types v0.12.3/go.mod h1:iJTqGdWDvzXhuVf64Lw0hzt4TIoitMo0VgHdxdjNDZI=
github.com/filecoin-project/go-statemachine v0.0.0-20200925024713-05bd7c71fbfe/go.mod h1:FGwQgZAt2Gh5mjlwJUlVB62JeYdo+if0xWxSEfBD9ig= github.com/filecoin-project/go-statemachine v0.0.0-20200925024713-05bd7c71fbfe/go.mod h1:FGwQgZAt2Gh5mjlwJUlVB62JeYdo+if0xWxSEfBD9ig=
github.com/filecoin-project/go-statemachine v1.0.3 h1:N07o6alys+V1tNoSTi4WuuoeNC4erS/6jE74+NsgQuk= github.com/filecoin-project/go-statemachine v1.0.3 h1:N07o6alys+V1tNoSTi4WuuoeNC4erS/6jE74+NsgQuk=
github.com/filecoin-project/go-statemachine v1.0.3/go.mod h1:jZdXXiHa61n4NmgWFG4w8tnqgvZVHYbJ3yW7+y8bF54= github.com/filecoin-project/go-statemachine v1.0.3/go.mod h1:jZdXXiHa61n4NmgWFG4w8tnqgvZVHYbJ3yW7+y8bF54=
@ -1659,8 +1659,8 @@ github.com/whyrusleeping/cbor-gen v0.0.0-20200826160007-0b9f6c5fb163/go.mod h1:f
github.com/whyrusleeping/cbor-gen v0.0.0-20210118024343-169e9d70c0c2/go.mod h1:fgkXqYy7bV2cFeIEOkVTZS/WjXARfBqSH6Q2qHL33hQ= github.com/whyrusleeping/cbor-gen v0.0.0-20210118024343-169e9d70c0c2/go.mod h1:fgkXqYy7bV2cFeIEOkVTZS/WjXARfBqSH6Q2qHL33hQ=
github.com/whyrusleeping/cbor-gen v0.0.0-20210303213153-67a261a1d291/go.mod h1:fgkXqYy7bV2cFeIEOkVTZS/WjXARfBqSH6Q2qHL33hQ= github.com/whyrusleeping/cbor-gen v0.0.0-20210303213153-67a261a1d291/go.mod h1:fgkXqYy7bV2cFeIEOkVTZS/WjXARfBqSH6Q2qHL33hQ=
github.com/whyrusleeping/cbor-gen v0.0.0-20220323183124-98fa8256a799/go.mod h1:fgkXqYy7bV2cFeIEOkVTZS/WjXARfBqSH6Q2qHL33hQ= github.com/whyrusleeping/cbor-gen v0.0.0-20220323183124-98fa8256a799/go.mod h1:fgkXqYy7bV2cFeIEOkVTZS/WjXARfBqSH6Q2qHL33hQ=
github.com/whyrusleeping/cbor-gen v0.0.0-20230126041949-52956bd4c9aa h1:EyA027ZAkuaCLoxVX4r1TZMPy1d31fM6hbfQ4OU4I5o= github.com/whyrusleeping/cbor-gen v0.0.0-20230923211252-36a87e1ba72f h1:SBuSxXJL0/ZJMtTxbXZgHZkThl9dNrzyaNhlyaqscRo=
github.com/whyrusleeping/cbor-gen v0.0.0-20230126041949-52956bd4c9aa/go.mod h1:fgkXqYy7bV2cFeIEOkVTZS/WjXARfBqSH6Q2qHL33hQ= github.com/whyrusleeping/cbor-gen v0.0.0-20230923211252-36a87e1ba72f/go.mod h1:fgkXqYy7bV2cFeIEOkVTZS/WjXARfBqSH6Q2qHL33hQ=
github.com/whyrusleeping/chunker v0.0.0-20181014151217-fe64bd25879f h1:jQa4QT2UP9WYv2nzyawpKMOCl+Z/jW7djv2/J50lj9E= github.com/whyrusleeping/chunker v0.0.0-20181014151217-fe64bd25879f h1:jQa4QT2UP9WYv2nzyawpKMOCl+Z/jW7djv2/J50lj9E=
github.com/whyrusleeping/chunker v0.0.0-20181014151217-fe64bd25879f/go.mod h1:p9UJB6dDgdPgMJZs7UjUOdulKyRr9fqkS+6JKAInPy8= github.com/whyrusleeping/chunker v0.0.0-20181014151217-fe64bd25879f/go.mod h1:p9UJB6dDgdPgMJZs7UjUOdulKyRr9fqkS+6JKAInPy8=
github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 h1:EKhdznlJHPMoKr0XTrX+IlJs1LH3lyx2nfr1dOlZ79k= github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 h1:EKhdznlJHPMoKr0XTrX+IlJs1LH3lyx2nfr1dOlZ79k=

4
itests/fevm_test.go
View File

@ -620,8 +620,8 @@ func TestFEVMRecursiveActorCall(t *testing.T) {
t.Run("n=0,r=252", testN(0, 252, exitcode.Ok)) t.Run("n=0,r=252", testN(0, 252, exitcode.Ok))
t.Run("n=251,r=164", testN(251, 164, exitcode.Ok)) t.Run("n=251,r=164", testN(251, 164, exitcode.Ok))
t.Run("n=0,r=253-fails", testN(0, 254, exitcode.ExitCode(33))) // 33 means transaction reverted t.Run("n=0,r=255-fails", testN(0, 255, exitcode.ExitCode(33))) // 33 means transaction reverted
t.Run("n=251,r=167-fails", testN(251, 165, exitcode.ExitCode(33))) t.Run("n=251,r=167-fails", testN(251, 167, exitcode.ExitCode(33)))
} }
// TestFEVMRecursiveActorCallEstimate // TestFEVMRecursiveActorCallEstimate

5
node/config/def.go
View File

@ -10,6 +10,7 @@ import (
"github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/abi"
"github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/big"
"github.com/filecoin-project/go-state-types/network"
miner5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/miner" miner5 "github.com/filecoin-project/specs-actors/v5/actors/builtin/miner"
"github.com/filecoin-project/lotus/chain/actors/builtin" "github.com/filecoin-project/lotus/chain/actors/builtin"
@ -122,6 +123,8 @@ func DefaultFullNode() *FullNode {
} }
func DefaultStorageMiner() *StorageMiner { func DefaultStorageMiner() *StorageMiner {
// TODO: Should we increase this to nv21, which would push it to 3.5 years?
maxSectorExtentsion, _ := policy.GetMaxSectorExpirationExtension(network.Version20)
cfg := &StorageMiner{ cfg := &StorageMiner{
Common: defCommon(), Common: defCommon(),
@ -143,7 +146,7 @@ func DefaultStorageMiner() *StorageMiner {
// XXX snap deals wait deals slack if first // XXX snap deals wait deals slack if first
PreCommitBatchSlack: Duration(3 * time.Hour), // time buffer for forceful batch submission before sectors/deals in batch would start expiring, higher value will lower the chances for message fail due to expiration PreCommitBatchSlack: Duration(3 * time.Hour), // time buffer for forceful batch submission before sectors/deals in batch would start expiring, higher value will lower the chances for message fail due to expiration
CommittedCapacitySectorLifetime: Duration(builtin.EpochDurationSeconds * uint64(policy.GetMaxSectorExpirationExtension()) * uint64(time.Second)), CommittedCapacitySectorLifetime: Duration(builtin.EpochDurationSeconds * uint64(maxSectorExtentsion) * uint64(time.Second)),
AggregateCommits: true, AggregateCommits: true,
MinCommitBatch: miner5.MinAggregatedSectors, // per FIP13, we must have at least four proofs to aggregate, where 4 is the cross over point where aggregation wins out on single provecommit gas costs MinCommitBatch: miner5.MinAggregatedSectors, // per FIP13, we must have at least four proofs to aggregate, where 4 is the cross over point where aggregation wins out on single provecommit gas costs

27
node/hello/cbor_gen.go
View File

@ -43,9 +43,11 @@ func (t *HelloMessage) MarshalCBOR(w io.Writer) error {
return err return err
} }
for _, v := range t.HeaviestTipSet { for _, v := range t.HeaviestTipSet {
if err := cbg.WriteCid(w, v); err != nil {
return xerrors.Errorf("failed writing cid field t.HeaviestTipSet: %w", err) if err := cbg.WriteCid(cw, v); err != nil {
return xerrors.Errorf("failed to write cid field v: %w", err)
} }
} }
// t.HeaviestTipSetHeight (abi.ChainEpoch) (int64) // t.HeaviestTipSetHeight (abi.ChainEpoch) (int64)
@ -116,12 +118,25 @@ func (t *HelloMessage) UnmarshalCBOR(r io.Reader) (err error) {
} }
for i := 0; i < int(extra); i++ { for i := 0; i < int(extra); i++ {
{
var maj byte
var extra uint64
var err error
_ = maj
_ = extra
_ = err
c, err := cbg.ReadCid(cr) {
if err != nil {
return xerrors.Errorf("reading cid field t.HeaviestTipSet failed: %w", err) c, err := cbg.ReadCid(cr)
if err != nil {
return xerrors.Errorf("failed to read cid field t.HeaviestTipSet[i]: %w", err)
}
t.HeaviestTipSet[i] = c
}
} }
t.HeaviestTipSet[i] = c
} }
// t.HeaviestTipSetHeight (abi.ChainEpoch) (int64) // t.HeaviestTipSetHeight (abi.ChainEpoch) (int64)

114
node/impl/full/state.go
View File

@ -6,6 +6,7 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
"math"
"strconv" "strconv"
"github.com/ipfs/go-cid" "github.com/ipfs/go-cid"
@ -19,6 +20,7 @@ import (
"github.com/filecoin-project/go-state-types/abi" "github.com/filecoin-project/go-state-types/abi"
actorstypes "github.com/filecoin-project/go-state-types/actors" actorstypes "github.com/filecoin-project/go-state-types/actors"
"github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/big"
market12 "github.com/filecoin-project/go-state-types/builtin/v12/market"
"github.com/filecoin-project/go-state-types/cbor" "github.com/filecoin-project/go-state-types/cbor"
"github.com/filecoin-project/go-state-types/crypto" "github.com/filecoin-project/go-state-types/crypto"
"github.com/filecoin-project/go-state-types/dline" "github.com/filecoin-project/go-state-types/dline"
@ -912,27 +914,25 @@ func (a *StateAPI) StateComputeDataCID(ctx context.Context, maddr address.Addres
return cid.Cid{}, err return cid.Cid{}, err
} }
var ccparams []byte
if nv < network.Version13 { if nv < network.Version13 {
ccparams, err = actors.SerializeParams(&market2.ComputeDataCommitmentParams{ return a.stateComputeDataCIDv1(ctx, maddr, sectorType, deals, tsk)
DealIDs: deals, } else if nv < network.Version21 {
SectorType: sectorType, return a.stateComputeDataCIDv2(ctx, maddr, sectorType, deals, tsk)
})
} else { } else {
ccparams, err = actors.SerializeParams(&market5.ComputeDataCommitmentParams{ return a.stateComputeDataCIDv3(ctx, maddr, sectorType, deals, tsk)
Inputs: []*market5.SectorDataSpec{
{
DealIDs: deals,
SectorType: sectorType,
},
},
})
} }
}
func (a *StateAPI) stateComputeDataCIDv1(ctx context.Context, maddr address.Address, sectorType abi.RegisteredSealProof, deals []abi.DealID, tsk types.TipSetKey) (cid.Cid, error) {
var err error
ccparams, err := actors.SerializeParams(&market2.ComputeDataCommitmentParams{
DealIDs: deals,
SectorType: sectorType,
})
if err != nil { if err != nil {
return cid.Undef, xerrors.Errorf("computing params for ComputeDataCommitment: %w", err) return cid.Undef, xerrors.Errorf("computing params for ComputeDataCommitment: %w", err)
} }
ccmt := &types.Message{ ccmt := &types.Message{
To: market.Address, To: market.Address,
From: maddr, From: maddr,
@ -948,13 +948,41 @@ func (a *StateAPI) StateComputeDataCID(ctx context.Context, maddr address.Addres
return cid.Undef, xerrors.Errorf("receipt for ComputeDataCommitment had exit code %d", r.MsgRct.ExitCode) return cid.Undef, xerrors.Errorf("receipt for ComputeDataCommitment had exit code %d", r.MsgRct.ExitCode)
} }
if nv < network.Version13 { var c cbg.CborCid
var c cbg.CborCid if err := c.UnmarshalCBOR(bytes.NewReader(r.MsgRct.Return)); err != nil {
if err := c.UnmarshalCBOR(bytes.NewReader(r.MsgRct.Return)); err != nil { return cid.Undef, xerrors.Errorf("failed to unmarshal CBOR to CborCid: %w", err)
return cid.Undef, xerrors.Errorf("failed to unmarshal CBOR to CborCid: %w", err) }
}
return cid.Cid(c), nil return cid.Cid(c), nil
}
func (a *StateAPI) stateComputeDataCIDv2(ctx context.Context, maddr address.Address, sectorType abi.RegisteredSealProof, deals []abi.DealID, tsk types.TipSetKey) (cid.Cid, error) {
var err error
ccparams, err := actors.SerializeParams(&market5.ComputeDataCommitmentParams{
Inputs: []*market5.SectorDataSpec{
{
DealIDs: deals,
SectorType: sectorType,
},
},
})
if err != nil {
return cid.Undef, xerrors.Errorf("computing params for ComputeDataCommitment: %w", err)
}
ccmt := &types.Message{
To: market.Address,
From: maddr,
Value: types.NewInt(0),
Method: market.Methods.ComputeDataCommitment,
Params: ccparams,
}
r, err := a.StateCall(ctx, ccmt, tsk)
if err != nil {
return cid.Undef, xerrors.Errorf("calling ComputeDataCommitment: %w", err)
}
if r.MsgRct.ExitCode != 0 {
return cid.Undef, xerrors.Errorf("receipt for ComputeDataCommitment had exit code %d", r.MsgRct.ExitCode)
} }
var cr market5.ComputeDataCommitmentReturn var cr market5.ComputeDataCommitmentReturn
@ -969,6 +997,52 @@ func (a *StateAPI) StateComputeDataCID(ctx context.Context, maddr address.Addres
return cid.Cid(cr.CommDs[0]), nil return cid.Cid(cr.CommDs[0]), nil
} }
func (a *StateAPI) stateComputeDataCIDv3(ctx context.Context, maddr address.Address, sectorType abi.RegisteredSealProof, deals []abi.DealID, tsk types.TipSetKey) (cid.Cid, error) {
if len(deals) == 0 {
return cid.Undef, nil
}
var err error
ccparams, err := actors.SerializeParams(&market12.VerifyDealsForActivationParams{
Sectors: []market12.SectorDeals{{
SectorType: sectorType,
SectorExpiry: math.MaxInt64,
DealIDs: deals,
}},
})
if err != nil {
return cid.Undef, xerrors.Errorf("computing params for VerifyDealsForActivation: %w", err)
}
ccmt := &types.Message{
To: market.Address,
From: maddr,
Value: types.NewInt(0),
Method: market.Methods.VerifyDealsForActivation,
Params: ccparams,
}
r, err := a.StateCall(ctx, ccmt, tsk)
if err != nil {
return cid.Undef, xerrors.Errorf("calling VerifyDealsForActivation: %w", err)
}
if r.MsgRct.ExitCode != 0 {
return cid.Undef, xerrors.Errorf("receipt for VerifyDealsForActivation had exit code %d", r.MsgRct.ExitCode)
}
var cr market12.VerifyDealsForActivationReturn
if err := cr.UnmarshalCBOR(bytes.NewReader(r.MsgRct.Return)); err != nil {
return cid.Undef, xerrors.Errorf("failed to unmarshal CBOR to VerifyDealsForActivationReturn: %w", err)
}
if len(cr.UnsealedCIDs) != 1 {
return cid.Undef, xerrors.Errorf("Sectors output must have 1 entry")
}
ucid := cr.UnsealedCIDs[0]
if ucid == nil {
return cid.Undef, xerrors.Errorf("computed data CID is nil")
}
return *ucid, nil
}
func (a *StateAPI) StateChangedActors(ctx context.Context, old cid.Cid, new cid.Cid) (map[string]types.Actor, error) { func (a *StateAPI) StateChangedActors(ctx context.Context, old cid.Cid, new cid.Cid) (map[string]types.Actor, error) {
store := a.Chain.ActorStore(ctx) store := a.Chain.ActorStore(ctx)

77
paychmgr/cbor_gen.go
View File

@ -41,7 +41,7 @@ func (t *VoucherInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Proof"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Proof"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("Proof")); err != nil { if _, err := cw.WriteString(string("Proof")); err != nil {
return err return err
} }
@ -65,7 +65,7 @@ func (t *VoucherInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Voucher"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Voucher"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("Voucher")); err != nil { if _, err := cw.WriteString(string("Voucher")); err != nil {
return err return err
} }
@ -81,7 +81,7 @@ func (t *VoucherInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Submitted"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Submitted"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("Submitted")); err != nil { if _, err := cw.WriteString(string("Submitted")); err != nil {
return err return err
} }
@ -218,7 +218,7 @@ func (t *ChannelInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Amount"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Amount"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("Amount")); err != nil { if _, err := cw.WriteString(string("Amount")); err != nil {
return err return err
} }
@ -234,7 +234,7 @@ func (t *ChannelInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Target"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Target"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("Target")); err != nil { if _, err := cw.WriteString(string("Target")); err != nil {
return err return err
} }
@ -250,7 +250,7 @@ func (t *ChannelInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Channel"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Channel"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("Channel")); err != nil { if _, err := cw.WriteString(string("Channel")); err != nil {
return err return err
} }
@ -266,7 +266,7 @@ func (t *ChannelInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Control"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Control"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("Control")); err != nil { if _, err := cw.WriteString(string("Control")); err != nil {
return err return err
} }
@ -282,7 +282,7 @@ func (t *ChannelInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("NextLane"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("NextLane"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("NextLane")); err != nil { if _, err := cw.WriteString(string("NextLane")); err != nil {
return err return err
} }
@ -298,7 +298,7 @@ func (t *ChannelInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Settling"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Settling"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("Settling")); err != nil { if _, err := cw.WriteString(string("Settling")); err != nil {
return err return err
} }
@ -314,7 +314,7 @@ func (t *ChannelInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Vouchers"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Vouchers"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("Vouchers")); err != nil { if _, err := cw.WriteString(string("Vouchers")); err != nil {
return err return err
} }
@ -339,7 +339,7 @@ func (t *ChannelInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("ChannelID"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("ChannelID"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("ChannelID")); err != nil { if _, err := cw.WriteString(string("ChannelID")); err != nil {
return err return err
} }
@ -350,7 +350,7 @@ func (t *ChannelInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.ChannelID))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.ChannelID))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string(t.ChannelID)); err != nil { if _, err := cw.WriteString(string(t.ChannelID)); err != nil {
return err return err
} }
@ -362,7 +362,7 @@ func (t *ChannelInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("CreateMsg"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("CreateMsg"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("CreateMsg")); err != nil { if _, err := cw.WriteString(string("CreateMsg")); err != nil {
return err return err
} }
@ -384,7 +384,7 @@ func (t *ChannelInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Direction"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Direction"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("Direction")); err != nil { if _, err := cw.WriteString(string("Direction")); err != nil {
return err return err
} }
@ -400,7 +400,7 @@ func (t *ChannelInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("AddFundsMsg"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("AddFundsMsg"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("AddFundsMsg")); err != nil { if _, err := cw.WriteString(string("AddFundsMsg")); err != nil {
return err return err
} }
@ -422,7 +422,7 @@ func (t *ChannelInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("PendingAmount"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("PendingAmount"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("PendingAmount")); err != nil { if _, err := cw.WriteString(string("PendingAmount")); err != nil {
return err return err
} }
@ -438,7 +438,7 @@ func (t *ChannelInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("AvailableAmount"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("AvailableAmount"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("AvailableAmount")); err != nil { if _, err := cw.WriteString(string("AvailableAmount")); err != nil {
return err return err
} }
@ -454,7 +454,7 @@ func (t *ChannelInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("PendingAvailableAmount"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("PendingAvailableAmount"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("PendingAvailableAmount")); err != nil { if _, err := cw.WriteString(string("PendingAvailableAmount")); err != nil {
return err return err
} }
@ -606,13 +606,32 @@ func (t *ChannelInfo) UnmarshalCBOR(r io.Reader) (err error) {
} }
for i := 0; i < int(extra); i++ { for i := 0; i < int(extra); i++ {
{
var maj byte
var extra uint64
var err error
_ = maj
_ = extra
_ = err
var v VoucherInfo {
if err := v.UnmarshalCBOR(cr); err != nil {
return err b, err := cr.ReadByte()
if err != nil {
return err
}
if b != cbg.CborNull[0] {
if err := cr.UnreadByte(); err != nil {
return err
}
t.Vouchers[i] = new(VoucherInfo)
if err := t.Vouchers[i].UnmarshalCBOR(cr); err != nil {
return xerrors.Errorf("unmarshaling t.Vouchers[i] pointer: %w", err)
}
}
}
} }
t.Vouchers[i] = &v
} }
// t.ChannelID (string) (string) // t.ChannelID (string) (string)
@ -746,7 +765,7 @@ func (t *MsgInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Err"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Err"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("Err")); err != nil { if _, err := cw.WriteString(string("Err")); err != nil {
return err return err
} }
@ -757,7 +776,7 @@ func (t *MsgInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Err))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Err))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string(t.Err)); err != nil { if _, err := cw.WriteString(string(t.Err)); err != nil {
return err return err
} }
@ -769,7 +788,7 @@ func (t *MsgInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("MsgCid"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("MsgCid"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("MsgCid")); err != nil { if _, err := cw.WriteString(string("MsgCid")); err != nil {
return err return err
} }
@ -785,7 +804,7 @@ func (t *MsgInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Received"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Received"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("Received")); err != nil { if _, err := cw.WriteString(string("Received")); err != nil {
return err return err
} }
@ -801,7 +820,7 @@ func (t *MsgInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("ChannelID"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("ChannelID"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("ChannelID")); err != nil { if _, err := cw.WriteString(string("ChannelID")); err != nil {
return err return err
} }
@ -812,7 +831,7 @@ func (t *MsgInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.ChannelID))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.ChannelID))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string(t.ChannelID)); err != nil { if _, err := cw.WriteString(string(t.ChannelID)); err != nil {
return err return err
} }
return nil return nil

159
storage/pipeline/cbor_gen.go
View File

@ -43,7 +43,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Log"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Log"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("Log")); err != nil { if _, err := cw.WriteString(string("Log")); err != nil {
return err return err
} }
@ -68,7 +68,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("CommD"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("CommD"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("CommD")); err != nil { if _, err := cw.WriteString(string("CommD")); err != nil {
return err return err
} }
@ -90,7 +90,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("CommR"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("CommR"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("CommR")); err != nil { if _, err := cw.WriteString(string("CommR")); err != nil {
return err return err
} }
@ -112,7 +112,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Proof"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Proof"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("Proof")); err != nil { if _, err := cw.WriteString(string("Proof")); err != nil {
return err return err
} }
@ -136,7 +136,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("State"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("State"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("State")); err != nil { if _, err := cw.WriteString(string("State")); err != nil {
return err return err
} }
@ -147,7 +147,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.State))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.State))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string(t.State)); err != nil { if _, err := cw.WriteString(string(t.State)); err != nil {
return err return err
} }
@ -159,7 +159,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Pieces"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Pieces"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("Pieces")); err != nil { if _, err := cw.WriteString(string("Pieces")); err != nil {
return err return err
} }
@ -184,7 +184,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Return"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Return"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("Return")); err != nil { if _, err := cw.WriteString(string("Return")); err != nil {
return err return err
} }
@ -195,7 +195,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Return))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Return))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string(t.Return)); err != nil { if _, err := cw.WriteString(string(t.Return)); err != nil {
return err return err
} }
@ -207,7 +207,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("LastErr"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("LastErr"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("LastErr")); err != nil { if _, err := cw.WriteString(string("LastErr")); err != nil {
return err return err
} }
@ -218,7 +218,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.LastErr))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.LastErr))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string(t.LastErr)); err != nil { if _, err := cw.WriteString(string(t.LastErr)); err != nil {
return err return err
} }
@ -230,7 +230,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("CCPieces"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("CCPieces"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("CCPieces")); err != nil { if _, err := cw.WriteString(string("CCPieces")); err != nil {
return err return err
} }
@ -255,7 +255,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("CCUpdate"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("CCUpdate"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("CCUpdate")); err != nil { if _, err := cw.WriteString(string("CCUpdate")); err != nil {
return err return err
} }
@ -271,7 +271,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("SeedEpoch"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("SeedEpoch"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("SeedEpoch")); err != nil { if _, err := cw.WriteString(string("SeedEpoch")); err != nil {
return err return err
} }
@ -293,7 +293,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("SeedValue"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("SeedValue"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("SeedValue")); err != nil { if _, err := cw.WriteString(string("SeedValue")); err != nil {
return err return err
} }
@ -317,7 +317,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("SectorType"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("SectorType"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("SectorType")); err != nil { if _, err := cw.WriteString(string("SectorType")); err != nil {
return err return err
} }
@ -339,7 +339,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("TicketEpoch"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("TicketEpoch"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("TicketEpoch")); err != nil { if _, err := cw.WriteString(string("TicketEpoch")); err != nil {
return err return err
} }
@ -361,7 +361,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("TicketValue"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("TicketValue"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("TicketValue")); err != nil { if _, err := cw.WriteString(string("TicketValue")); err != nil {
return err return err
} }
@ -385,7 +385,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("CreationTime"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("CreationTime"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("CreationTime")); err != nil { if _, err := cw.WriteString(string("CreationTime")); err != nil {
return err return err
} }
@ -407,7 +407,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("SectorNumber"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("SectorNumber"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("SectorNumber")); err != nil { if _, err := cw.WriteString(string("SectorNumber")); err != nil {
return err return err
} }
@ -423,7 +423,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("TerminatedAt"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("TerminatedAt"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("TerminatedAt")); err != nil { if _, err := cw.WriteString(string("TerminatedAt")); err != nil {
return err return err
} }
@ -445,7 +445,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("UpdateSealed"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("UpdateSealed"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("UpdateSealed")); err != nil { if _, err := cw.WriteString(string("UpdateSealed")); err != nil {
return err return err
} }
@ -467,7 +467,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("CommitMessage"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("CommitMessage"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("CommitMessage")); err != nil { if _, err := cw.WriteString(string("CommitMessage")); err != nil {
return err return err
} }
@ -489,7 +489,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("InvalidProofs"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("InvalidProofs"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("InvalidProofs")); err != nil { if _, err := cw.WriteString(string("InvalidProofs")); err != nil {
return err return err
} }
@ -505,7 +505,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("PreCommit1Out"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("PreCommit1Out"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("PreCommit1Out")); err != nil { if _, err := cw.WriteString(string("PreCommit1Out")); err != nil {
return err return err
} }
@ -529,7 +529,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("FaultReportMsg"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("FaultReportMsg"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("FaultReportMsg")); err != nil { if _, err := cw.WriteString(string("FaultReportMsg")); err != nil {
return err return err
} }
@ -551,7 +551,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("UpdateUnsealed"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("UpdateUnsealed"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("UpdateUnsealed")); err != nil { if _, err := cw.WriteString(string("UpdateUnsealed")); err != nil {
return err return err
} }
@ -573,7 +573,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("PreCommit2Fails"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("PreCommit2Fails"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("PreCommit2Fails")); err != nil { if _, err := cw.WriteString(string("PreCommit2Fails")); err != nil {
return err return err
} }
@ -589,7 +589,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("PreCommitTipSet"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("PreCommitTipSet"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("PreCommitTipSet")); err != nil { if _, err := cw.WriteString(string("PreCommitTipSet")); err != nil {
return err return err
} }
@ -605,7 +605,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("RemoteDataCache"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("RemoteDataCache"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("RemoteDataCache")); err != nil { if _, err := cw.WriteString(string("RemoteDataCache")); err != nil {
return err return err
} }
@ -621,7 +621,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("PreCommitDeposit"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("PreCommitDeposit"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("PreCommitDeposit")); err != nil { if _, err := cw.WriteString(string("PreCommitDeposit")); err != nil {
return err return err
} }
@ -637,7 +637,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("PreCommitMessage"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("PreCommitMessage"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("PreCommitMessage")); err != nil { if _, err := cw.WriteString(string("PreCommitMessage")); err != nil {
return err return err
} }
@ -659,7 +659,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("RemoteDataSealed"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("RemoteDataSealed"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("RemoteDataSealed")); err != nil { if _, err := cw.WriteString(string("RemoteDataSealed")); err != nil {
return err return err
} }
@ -675,7 +675,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("TerminateMessage"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("TerminateMessage"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("TerminateMessage")); err != nil { if _, err := cw.WriteString(string("TerminateMessage")); err != nil {
return err return err
} }
@ -697,7 +697,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("RemoteDataUnsealed"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("RemoteDataUnsealed"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("RemoteDataUnsealed")); err != nil { if _, err := cw.WriteString(string("RemoteDataUnsealed")); err != nil {
return err return err
} }
@ -713,7 +713,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("ReplicaUpdateProof"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("ReplicaUpdateProof"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("ReplicaUpdateProof")); err != nil { if _, err := cw.WriteString(string("ReplicaUpdateProof")); err != nil {
return err return err
} }
@ -737,7 +737,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("RemoteDataFinalized"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("RemoteDataFinalized"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("RemoteDataFinalized")); err != nil { if _, err := cw.WriteString(string("RemoteDataFinalized")); err != nil {
return err return err
} }
@ -753,7 +753,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("ReplicaUpdateMessage"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("ReplicaUpdateMessage"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("ReplicaUpdateMessage")); err != nil { if _, err := cw.WriteString(string("ReplicaUpdateMessage")); err != nil {
return err return err
} }
@ -775,7 +775,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("RemoteCommit1Endpoint"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("RemoteCommit1Endpoint"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("RemoteCommit1Endpoint")); err != nil { if _, err := cw.WriteString(string("RemoteCommit1Endpoint")); err != nil {
return err return err
} }
@ -786,7 +786,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.RemoteCommit1Endpoint))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.RemoteCommit1Endpoint))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string(t.RemoteCommit1Endpoint)); err != nil { if _, err := cw.WriteString(string(t.RemoteCommit1Endpoint)); err != nil {
return err return err
} }
@ -798,7 +798,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("RemoteCommit2Endpoint"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("RemoteCommit2Endpoint"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("RemoteCommit2Endpoint")); err != nil { if _, err := cw.WriteString(string("RemoteCommit2Endpoint")); err != nil {
return err return err
} }
@ -809,7 +809,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.RemoteCommit2Endpoint))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.RemoteCommit2Endpoint))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string(t.RemoteCommit2Endpoint)); err != nil { if _, err := cw.WriteString(string(t.RemoteCommit2Endpoint)); err != nil {
return err return err
} }
@ -821,7 +821,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("RemoteSealingDoneEndpoint"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("RemoteSealingDoneEndpoint"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("RemoteSealingDoneEndpoint")); err != nil { if _, err := cw.WriteString(string("RemoteSealingDoneEndpoint")); err != nil {
return err return err
} }
@ -832,7 +832,7 @@ func (t *SectorInfo) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.RemoteSealingDoneEndpoint))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.RemoteSealingDoneEndpoint))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string(t.RemoteSealingDoneEndpoint)); err != nil { if _, err := cw.WriteString(string(t.RemoteSealingDoneEndpoint)); err != nil {
return err return err
} }
return nil return nil
@ -897,13 +897,22 @@ func (t *SectorInfo) UnmarshalCBOR(r io.Reader) (err error) {
} }
for i := 0; i < int(extra); i++ { for i := 0; i < int(extra); i++ {
{
var maj byte
var extra uint64
var err error
_ = maj
_ = extra
_ = err
var v Log {
if err := v.UnmarshalCBOR(cr); err != nil {
return err if err := t.Log[i].UnmarshalCBOR(cr); err != nil {
return xerrors.Errorf("unmarshaling t.Log[i]: %w", err)
}
}
} }
t.Log[i] = v
} }
// t.CommD (cid.Cid) (struct) // t.CommD (cid.Cid) (struct)
@ -1006,13 +1015,22 @@ func (t *SectorInfo) UnmarshalCBOR(r io.Reader) (err error) {
} }
for i := 0; i < int(extra); i++ { for i := 0; i < int(extra); i++ {
{
var maj byte
var extra uint64
var err error
_ = maj
_ = extra
_ = err
var v api.SectorPiece {
if err := v.UnmarshalCBOR(cr); err != nil {
return err if err := t.Pieces[i].UnmarshalCBOR(cr); err != nil {
return xerrors.Errorf("unmarshaling t.Pieces[i]: %w", err)
}
}
} }
t.Pieces[i] = v
} }
// t.Return (sealing.ReturnState) (string) // t.Return (sealing.ReturnState) (string)
@ -1058,13 +1076,22 @@ func (t *SectorInfo) UnmarshalCBOR(r io.Reader) (err error) {
} }
for i := 0; i < int(extra); i++ { for i := 0; i < int(extra); i++ {
{
var maj byte
var extra uint64
var err error
_ = maj
_ = extra
_ = err
var v api.SectorPiece {
if err := v.UnmarshalCBOR(cr); err != nil {
return err if err := t.CCPieces[i].UnmarshalCBOR(cr); err != nil {
return xerrors.Errorf("unmarshaling t.CCPieces[i]: %w", err)
}
}
} }
t.CCPieces[i] = v
} }
// t.CCUpdate (bool) (bool) // t.CCUpdate (bool) (bool)
@ -1669,7 +1696,7 @@ func (t *Log) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Kind"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Kind"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("Kind")); err != nil { if _, err := cw.WriteString(string("Kind")); err != nil {
return err return err
} }
@ -1680,7 +1707,7 @@ func (t *Log) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Kind))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Kind))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string(t.Kind)); err != nil { if _, err := cw.WriteString(string(t.Kind)); err != nil {
return err return err
} }
@ -1692,7 +1719,7 @@ func (t *Log) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Trace"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Trace"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("Trace")); err != nil { if _, err := cw.WriteString(string("Trace")); err != nil {
return err return err
} }
@ -1703,7 +1730,7 @@ func (t *Log) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Trace))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Trace))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string(t.Trace)); err != nil { if _, err := cw.WriteString(string(t.Trace)); err != nil {
return err return err
} }
@ -1715,7 +1742,7 @@ func (t *Log) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Message"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Message"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("Message")); err != nil { if _, err := cw.WriteString(string("Message")); err != nil {
return err return err
} }
@ -1726,7 +1753,7 @@ func (t *Log) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Message))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Message))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string(t.Message)); err != nil { if _, err := cw.WriteString(string(t.Message)); err != nil {
return err return err
} }
@ -1738,7 +1765,7 @@ func (t *Log) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Timestamp"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Timestamp"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("Timestamp")); err != nil { if _, err := cw.WriteString(string("Timestamp")); err != nil {
return err return err
} }

14
storage/pipeline/checks.go
View File

@ -106,13 +106,15 @@ func checkPrecommit(ctx context.Context, maddr address.Address, si SectorInfo, t
return err return err
} }
commD, err := api.StateComputeDataCID(ctx, maddr, si.SectorType, si.dealIDs(), tsk) if si.hasDeals() {
if err != nil { commD, err := api.StateComputeDataCID(ctx, maddr, si.SectorType, si.dealIDs(), tsk)
return &ErrApi{xerrors.Errorf("calling StateComputeDataCommitment: %w", err)} if err != nil {
} return &ErrApi{xerrors.Errorf("calling StateComputeDataCommitment: %w", err)}
}
if si.CommD == nil || !commD.Equals(*si.CommD) { if si.CommD == nil || !commD.Equals(*si.CommD) {
return &ErrBadCommD{xerrors.Errorf("on chain CommD differs from sector: %s != %s", commD, si.CommD)} return &ErrBadCommD{xerrors.Errorf("on chain CommD differs from sector: %s != %s", commD, si.CommD)}
}
} }
pci, err := api.StateSectorPreCommitInfo(ctx, maddr, si.SectorNumber, tsk) pci, err := api.StateSectorPreCommitInfo(ctx, maddr, si.SectorNumber, tsk)

26
storage/pipeline/precommit_policy.go
View File

@ -85,10 +85,15 @@ func (p *BasicPreCommitPolicy) Expiration(ctx context.Context, ps ...api.SectorP
} }
if end == nil { if end == nil {
// no deal pieces, get expiration for committed capacity sector nv, err := p.api.StateNetworkVersion(ctx, types.EmptyTSK)
expirationDuration, err := p.getCCSectorLifetime()
if err != nil { if err != nil {
return 0, err return 0, xerrors.Errorf("failed to get network version: %w", err)
}
// no deal pieces, get expiration for committed capacity sector
expirationDuration, err := p.getCCSectorLifetime(nv)
if err != nil {
return 0, xerrors.Errorf("failed to get cc sector lifetime: %w", err)
} }
tmp := ts.Height() + expirationDuration tmp := ts.Height() + expirationDuration
@ -105,25 +110,30 @@ func (p *BasicPreCommitPolicy) Expiration(ctx context.Context, ps ...api.SectorP
return *end, nil return *end, nil
} }
func (p *BasicPreCommitPolicy) getCCSectorLifetime() (abi.ChainEpoch, error) { func (p *BasicPreCommitPolicy) getCCSectorLifetime(nv network.Version) (abi.ChainEpoch, error) {
c, err := p.getSealingConfig() c, err := p.getSealingConfig()
if err != nil { if err != nil {
return 0, xerrors.Errorf("sealing config load error: %w", err) return 0, xerrors.Errorf("sealing config load error: %w", err)
} }
maxCommitment, err := policy.GetMaxSectorExpirationExtension(nv)
if err != nil {
return 0, xerrors.Errorf("failed to get max extension: %w", err)
}
var ccLifetimeEpochs = abi.ChainEpoch(uint64(c.CommittedCapacitySectorLifetime.Seconds()) / builtin.EpochDurationSeconds) var ccLifetimeEpochs = abi.ChainEpoch(uint64(c.CommittedCapacitySectorLifetime.Seconds()) / builtin.EpochDurationSeconds)
// if zero value in config, assume default sector extension // if zero value in config, assume default sector extension
if ccLifetimeEpochs == 0 { if ccLifetimeEpochs == 0 {
ccLifetimeEpochs = policy.GetMaxSectorExpirationExtension() ccLifetimeEpochs = maxCommitment
} }
if minExpiration := abi.ChainEpoch(miner.MinSectorExpiration); ccLifetimeEpochs < minExpiration { if minExpiration := abi.ChainEpoch(miner.MinSectorExpiration); ccLifetimeEpochs < minExpiration {
log.Warnf("value for CommittedCapacitySectorLiftime is too short, using default minimum (%d epochs)", minExpiration) log.Warnf("value for CommittedCapacitySectorLiftime is too short, using default minimum (%d epochs)", minExpiration)
return minExpiration, nil return minExpiration, nil
} }
if maxExpiration := policy.GetMaxSectorExpirationExtension(); ccLifetimeEpochs > maxExpiration { if ccLifetimeEpochs > maxCommitment {
log.Warnf("value for CommittedCapacitySectorLiftime is too long, using default maximum (%d epochs)", maxExpiration) log.Warnf("value for CommittedCapacitySectorLiftime is too long, using default maximum (%d epochs)", maxCommitment)
return maxExpiration, nil return maxCommitment, nil
} }
return ccLifetimeEpochs - p.provingBuffer, nil return ccLifetimeEpochs - p.provingBuffer, nil

13
storage/pipeline/precommit_policy_test.go
View File

@ -68,7 +68,9 @@ func TestBasicPolicyEmptySector(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
// as set when there are no deal pieces // as set when there are no deal pieces
expected := h + policy.GetMaxSectorExpirationExtension() - pBuffer maxExtension, err := policy.GetMaxSectorExpirationExtension(build.TestNetworkVersion)
assert.NoError(t, err)
expected := h + maxExtension - pBuffer
assert.Equal(t, int(expected), int(exp)) assert.Equal(t, int(expected), int(exp))
} }
@ -132,7 +134,7 @@ func TestBasicPolicyMostConstrictiveSchedule(t *testing.T) {
func TestBasicPolicyIgnoresExistingScheduleIfExpired(t *testing.T) { func TestBasicPolicyIgnoresExistingScheduleIfExpired(t *testing.T) {
cfg := fakeConfigGetter(nil) cfg := fakeConfigGetter(nil)
policy := pipeline.NewBasicPreCommitPolicy(&fakeChain{ pcp := pipeline.NewBasicPreCommitPolicy(&fakeChain{
h: abi.ChainEpoch(55), h: abi.ChainEpoch(55),
}, cfg, 0) }, cfg, 0)
@ -152,11 +154,14 @@ func TestBasicPolicyIgnoresExistingScheduleIfExpired(t *testing.T) {
}, },
} }
exp, err := policy.Expiration(context.Background(), pieces...) exp, err := pcp.Expiration(context.Background(), pieces...)
require.NoError(t, err)
maxLifetime, err := policy.GetMaxSectorExpirationExtension(build.TestNetworkVersion)
require.NoError(t, err) require.NoError(t, err)
// Treated as a CC sector, so expiration becomes currEpoch + maxLifetime = 55 + 1555200 // Treated as a CC sector, so expiration becomes currEpoch + maxLifetime = 55 + 1555200
assert.Equal(t, 1555255, int(exp)) assert.Equal(t, 55+maxLifetime, exp)
} }
func TestMissingDealIsIgnored(t *testing.T) { func TestMissingDealIsIgnored(t *testing.T) {

7
storage/pipeline/states_sealing.go
View File

@ -353,7 +353,12 @@ func (m *Sealing) preCommitInfo(ctx statemachine.Context, sector SectorInfo) (*m
} }
// Assume: both precommit msg & commit msg land on chain as early as possible // Assume: both precommit msg & commit msg land on chain as early as possible
maxExpiration := ts.Height() + policy.GetPreCommitChallengeDelay() + policy.GetMaxSectorExpirationExtension() maxExtension, err := policy.GetMaxSectorExpirationExtension(nv)
if err != nil {
return nil, big.Zero(), types.EmptyTSK, ctx.Send(SectorSealPreCommit1Failed{xerrors.Errorf("failed to get max extension: %w", err)})
}
maxExpiration := ts.Height() + policy.GetPreCommitChallengeDelay() + maxExtension
if expiration > maxExpiration { if expiration > maxExpiration {
expiration = maxExpiration expiration = maxExpiration
} }

36
storage/sealer/cbor_gen.go
View File

@ -40,7 +40,7 @@ func (t *Call) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("ID"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("ID"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("ID")); err != nil { if _, err := cw.WriteString(string("ID")); err != nil {
return err return err
} }
@ -56,7 +56,7 @@ func (t *Call) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("State"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("State"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("State")); err != nil { if _, err := cw.WriteString(string("State")); err != nil {
return err return err
} }
@ -72,7 +72,7 @@ func (t *Call) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Result"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Result"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("Result")); err != nil { if _, err := cw.WriteString(string("Result")); err != nil {
return err return err
} }
@ -88,7 +88,7 @@ func (t *Call) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("RetType"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("RetType"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("RetType")); err != nil { if _, err := cw.WriteString(string("RetType")); err != nil {
return err return err
} }
@ -99,7 +99,7 @@ func (t *Call) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.RetType))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.RetType))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string(t.RetType)); err != nil { if _, err := cw.WriteString(string(t.RetType)); err != nil {
return err return err
} }
return nil return nil
@ -228,7 +228,7 @@ func (t *WorkState) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("ID"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("ID"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("ID")); err != nil { if _, err := cw.WriteString(string("ID")); err != nil {
return err return err
} }
@ -244,7 +244,7 @@ func (t *WorkState) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Status"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Status"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("Status")); err != nil { if _, err := cw.WriteString(string("Status")); err != nil {
return err return err
} }
@ -255,7 +255,7 @@ func (t *WorkState) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Status))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Status))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string(t.Status)); err != nil { if _, err := cw.WriteString(string(t.Status)); err != nil {
return err return err
} }
@ -267,7 +267,7 @@ func (t *WorkState) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("StartTime"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("StartTime"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("StartTime")); err != nil { if _, err := cw.WriteString(string("StartTime")); err != nil {
return err return err
} }
@ -289,7 +289,7 @@ func (t *WorkState) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("WorkError"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("WorkError"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("WorkError")); err != nil { if _, err := cw.WriteString(string("WorkError")); err != nil {
return err return err
} }
@ -300,7 +300,7 @@ func (t *WorkState) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.WorkError))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.WorkError))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string(t.WorkError)); err != nil { if _, err := cw.WriteString(string(t.WorkError)); err != nil {
return err return err
} }
@ -312,7 +312,7 @@ func (t *WorkState) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("WorkerCall"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("WorkerCall"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("WorkerCall")); err != nil { if _, err := cw.WriteString(string("WorkerCall")); err != nil {
return err return err
} }
@ -328,7 +328,7 @@ func (t *WorkState) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("WorkerHostname"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("WorkerHostname"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("WorkerHostname")); err != nil { if _, err := cw.WriteString(string("WorkerHostname")); err != nil {
return err return err
} }
@ -339,7 +339,7 @@ func (t *WorkState) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.WorkerHostname))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.WorkerHostname))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string(t.WorkerHostname)); err != nil { if _, err := cw.WriteString(string(t.WorkerHostname)); err != nil {
return err return err
} }
return nil return nil
@ -491,7 +491,7 @@ func (t *WorkID) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Method"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Method"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("Method")); err != nil { if _, err := cw.WriteString(string("Method")); err != nil {
return err return err
} }
@ -502,7 +502,7 @@ func (t *WorkID) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Method))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Method))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string(t.Method)); err != nil { if _, err := cw.WriteString(string(t.Method)); err != nil {
return err return err
} }
@ -514,7 +514,7 @@ func (t *WorkID) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Params"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Params"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("Params")); err != nil { if _, err := cw.WriteString(string("Params")); err != nil {
return err return err
} }
@ -525,7 +525,7 @@ func (t *WorkID) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Params))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Params))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string(t.Params)); err != nil { if _, err := cw.WriteString(string(t.Params)); err != nil {
return err return err
} }
return nil return nil

39
storage/sealer/storiface/cbor_gen.go
View File

@ -38,7 +38,7 @@ func (t *CallID) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("ID"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("ID"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("ID")); err != nil { if _, err := cw.WriteString(string("ID")); err != nil {
return err return err
} }
@ -62,7 +62,7 @@ func (t *CallID) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Sector"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Sector"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("Sector")); err != nil { if _, err := cw.WriteString(string("Sector")); err != nil {
return err return err
} }
@ -173,7 +173,7 @@ func (t *SecDataHttpHeader) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Key"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Key"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("Key")); err != nil { if _, err := cw.WriteString(string("Key")); err != nil {
return err return err
} }
@ -184,7 +184,7 @@ func (t *SecDataHttpHeader) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Key))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Key))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string(t.Key)); err != nil { if _, err := cw.WriteString(string(t.Key)); err != nil {
return err return err
} }
@ -196,7 +196,7 @@ func (t *SecDataHttpHeader) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Value"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Value"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("Value")); err != nil { if _, err := cw.WriteString(string("Value")); err != nil {
return err return err
} }
@ -207,7 +207,7 @@ func (t *SecDataHttpHeader) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Value))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Value))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string(t.Value)); err != nil { if _, err := cw.WriteString(string(t.Value)); err != nil {
return err return err
} }
return nil return nil
@ -302,7 +302,7 @@ func (t *SectorLocation) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("URL"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("URL"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("URL")); err != nil { if _, err := cw.WriteString(string("URL")); err != nil {
return err return err
} }
@ -313,7 +313,7 @@ func (t *SectorLocation) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.URL))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.URL))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string(t.URL)); err != nil { if _, err := cw.WriteString(string(t.URL)); err != nil {
return err return err
} }
@ -325,7 +325,7 @@ func (t *SectorLocation) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Local"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Local"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("Local")); err != nil { if _, err := cw.WriteString(string("Local")); err != nil {
return err return err
} }
@ -341,7 +341,7 @@ func (t *SectorLocation) MarshalCBOR(w io.Writer) error {
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Headers"))); err != nil { if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("Headers"))); err != nil {
return err return err
} }
if _, err := io.WriteString(w, string("Headers")); err != nil { if _, err := cw.WriteString(string("Headers")); err != nil {
return err return err
} }
@ -448,13 +448,22 @@ func (t *SectorLocation) UnmarshalCBOR(r io.Reader) (err error) {
} }
for i := 0; i < int(extra); i++ { for i := 0; i < int(extra); i++ {
{
var maj byte
var extra uint64
var err error
_ = maj
_ = extra
_ = err
var v SecDataHttpHeader {
if err := v.UnmarshalCBOR(cr); err != nil {
return err if err := t.Headers[i].UnmarshalCBOR(cr); err != nil {
return xerrors.Errorf("unmarshaling t.Headers[i]: %w", err)
}
}
} }
t.Headers[i] = v
} }
default: default: