diff --git a/chain/vm/spec_shim.go b/chain/vm/spec_shim.go index 1b4364494..e6977853a 100644 --- a/chain/vm/spec_shim.go +++ b/chain/vm/spec_shim.go @@ -12,6 +12,7 @@ import ( "github.com/filecoin-project/specs-actors/actors/crypto" vmr "github.com/filecoin-project/specs-actors/actors/runtime" "github.com/filecoin-project/specs-actors/actors/runtime/exitcode" + "github.com/filecoin-project/specs-actors/actors/util/adt" "github.com/ipfs/go-cid" cbg "github.com/whyrusleeping/cbor-gen" @@ -68,6 +69,8 @@ func (rs *runtimeShim) shimCall(f func() interface{}) (rval []byte, aerr aerrors switch ret := ret.(type) { case []byte: return ret, nil + case *adt.EmptyValue: + return nil, nil case cbg.CBORMarshaler: buf := new(bytes.Buffer) if err := ret.MarshalCBOR(buf); err != nil { diff --git a/chain/vm/syscalls.go b/chain/vm/syscalls.go index 8d22d74dd..45c83ec0b 100644 --- a/chain/vm/syscalls.go +++ b/chain/vm/syscalls.go @@ -71,7 +71,7 @@ func (ss *syscallShim) HashBlake2b(data []byte) [32]byte { panic("NYI") } -func (ss *syscallShim) VerifyConsensusFault(a, b []byte) error { +func (ss *syscallShim) VerifyConsensusFault(a, b, extra []byte) (*runtime.ConsensusFault, error) { panic("NYI") } diff --git a/cli/chain.go b/cli/chain.go index b1a5c1b6a..41a01b047 100644 --- a/cli/chain.go +++ b/cli/chain.go @@ -11,7 +11,6 @@ import ( "strings" "time" - "github.com/filecoin-project/go-address" cborutil "github.com/filecoin-project/go-cbor-util" "github.com/filecoin-project/specs-actors/actors/abi" "github.com/filecoin-project/specs-actors/actors/builtin" @@ -66,8 +65,8 @@ var chainHeadCmd = &cli.Command{ } var chainGetBlock = &cli.Command{ - Name: "getblock", - Usage: "Get a block and print its details", + Name: "getblock", + Usage: "Get a block and print its details", ArgsUsage: "[blockCid]", Flags: []cli.Flag{ &cli.BoolFlag{ @@ -157,8 +156,8 @@ func apiMsgCids(in []api.Message) []cid.Cid { } var chainReadObjCmd = &cli.Command{ - Name: "read-obj", - Usage: "Read the raw bytes of an object", + Name: "read-obj", + Usage: "Read the raw bytes of an object", ArgsUsage: "[objectCid]", Action: func(cctx *cli.Context) error { api, closer, err := GetFullNodeAPI(cctx) @@ -184,8 +183,8 @@ var chainReadObjCmd = &cli.Command{ } var chainGetMsgCmd = &cli.Command{ - Name: "getmessage", - Usage: "Get and print a message by its cid", + Name: "getmessage", + Usage: "Get and print a message by its cid", ArgsUsage: "[messageCid]", Action: func(cctx *cli.Context) error { if !cctx.Args().Present() { @@ -232,8 +231,8 @@ var chainGetMsgCmd = &cli.Command{ } var chainSetHeadCmd = &cli.Command{ - Name: "sethead", - Usage: "manually set the local nodes head tipset (Caution: normally only used for recovery)", + Name: "sethead", + Usage: "manually set the local nodes head tipset (Caution: normally only used for recovery)", ArgsUsage: "[tipsetkey]", Flags: []cli.Flag{ &cli.BoolFlag{ @@ -359,8 +358,8 @@ var chainListCmd = &cli.Command{ } var chainGetCmd = &cli.Command{ - Name: "get", - Usage: "Get chain DAG node by path", + Name: "get", + Usage: "Get chain DAG node by path", ArgsUsage: "[path]", Description: `Get ipld node under a specified path: @@ -417,8 +416,8 @@ func printTipSet(format string, ts *types.TipSet) { } var chainBisectCmd = &cli.Command{ - Name: "bisect", - Usage: "bisect chain for an event", + Name: "bisect", + Usage: "bisect chain for an event", ArgsUsage: "[minHeight maxHeight path shellCommand ]", Description: `Bisect the chain state tree: @@ -523,8 +522,8 @@ var chainBisectCmd = &cli.Command{ } var chainExportCmd = &cli.Command{ - Name: "export", - Usage: "export chain to a car file", + Name: "export", + Usage: "export chain to a car file", ArgsUsage: "[outputPath]", Flags: []cli.Flag{ &cli.StringFlag{ @@ -571,8 +570,8 @@ var chainExportCmd = &cli.Command{ } var slashConsensusFault = &cli.Command{ - Name: "slash-consensus", - Usage: "Report consensus fault", + Name: "slash-consensus", + Usage: "Report consensus fault", ArgsUsage: "[blockCid1 blockCid2]", Action: func(cctx *cli.Context) error { api, closer, err := GetFullNodeAPI(cctx) @@ -620,9 +619,6 @@ var slashConsensusFault = &cli.Command{ params, err := actors.SerializeParams(&power.ReportConsensusFaultParams{ BlockHeader1: bh1, BlockHeader2: bh2, - Target: address.Address{}, - FaultEpoch: 0, - FaultType: 0, }) msg := &types.Message{ diff --git a/go.mod b/go.mod index a340978ac..1a53081da 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( github.com/filecoin-project/go-paramfetch v0.0.2-0.20200218225740-47c639bab663 github.com/filecoin-project/go-sectorbuilder v0.0.2-0.20200304050010-2cfac00a93e7 github.com/filecoin-project/go-statestore v0.1.0 - github.com/filecoin-project/specs-actors v0.0.0-20200305205312-53bb01da9aeb + github.com/filecoin-project/specs-actors v0.0.0-20200306001214-5b98d3ed4bc4 github.com/gbrlsnchs/jwt/v3 v3.0.0-beta.1 github.com/go-ole/go-ole v1.2.4 // indirect github.com/google/uuid v1.1.1 diff --git a/go.sum b/go.sum index a23673afe..0561b88ef 100644 --- a/go.sum +++ b/go.sum @@ -130,6 +130,9 @@ github.com/filecoin-project/specs-actors v0.0.0-20200210130641-2d1fbd8672cf/go.m github.com/filecoin-project/specs-actors v0.0.0-20200226200336-94c9b92b2775/go.mod h1:0HAWYrvajFHDgRaKbF0rl+IybVLZL5z4gQ8koCMPhoU= github.com/filecoin-project/specs-actors v0.0.0-20200305205312-53bb01da9aeb h1:9Ch6f/LYCh/BoriHfSp8sRX0OaO+9gQVK6x0vGl9o0s= github.com/filecoin-project/specs-actors v0.0.0-20200305205312-53bb01da9aeb/go.mod h1:0HAWYrvajFHDgRaKbF0rl+IybVLZL5z4gQ8koCMPhoU= +github.com/filecoin-project/specs-actors v0.0.0-20200306000749-99e98e61e2a0 h1:n7Q8UMP2Jsj1dQkM0tRKVWUeAbrz8x2f8l1UVeB4PC4= +github.com/filecoin-project/specs-actors v0.0.0-20200306001214-5b98d3ed4bc4 h1:EFOQ/DA3jOu2r2/r7/vnkGRXoCoDGY5knXb/bVl/X/c= +github.com/filecoin-project/specs-actors v0.0.0-20200306001214-5b98d3ed4bc4/go.mod h1:0HAWYrvajFHDgRaKbF0rl+IybVLZL5z4gQ8koCMPhoU= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/gbrlsnchs/jwt/v3 v3.0.0-beta.1 h1:EzDjxMg43q1tA2c0MV3tNbaontnHLplHyFF6M5KiVP0=