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

patch agen to deal with v8 deal proposals

Browse Source
This commit is contained in:
vyzo 2022-04-08 00:36:10 +03:00
parent 45a65c5d9e
commit 8f121ab0ec
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
chain/actors/agen/main.go
View File

@ -110,6 +110,7 @@ func generateState(actDir string) error {
err := tpl.Execute(&b, map[string]interface{}{ err := tpl.Execute(&b, map[string]interface{}{
"v": version, "v": version,
"import": getVersionImports()[version], "import": getVersionImports()[version],
"isv8": version == 8,
}) })
if err != nil { if err != nil {
return err return err

21
chain/actors/builtin/market/state.go.template
View File

@ -231,7 +231,28 @@ func (s *dealProposals{{.v}}) array() adt.Array {
} }
func fromV{{.v}}DealProposal(v{{.v}} market{{.v}}.DealProposal) DealProposal { func fromV{{.v}}DealProposal(v{{.v}} market{{.v}}.DealProposal) DealProposal {
{{if .isv8 }}
label, err := v8.Label.ToString()
if err != nil {
bs, _ := v8.Label.ToBytes()
label = string(bs)
}
return DealProposal{
PieceCID: v8.PieceCID,
PieceSize: v8.PieceSize,
VerifiedDeal: v8.VerifiedDeal,
Client: v8.Client,
Provider: v8.Provider,
Label: label,
StartEpoch: v8.StartEpoch,
EndEpoch: v8.EndEpoch,
StoragePricePerEpoch: v8.StoragePricePerEpoch,
ProviderCollateral: v8.ProviderCollateral,
ClientCollateral: v8.ClientCollateral,
}
{{else}}
return (DealProposal)(v{{.v}}) return (DealProposal)(v{{.v}})
{{end}}
} }
func (s *state{{.v}}) GetState() interface{} { func (s *state{{.v}}) GetState() interface{} {