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

Merge pull request #9072 from zl03jsj/fix/zl/cli/list-miner-control-addresses-fail-if-have-robust-address

Browse Source 
fix: cli: `./lotus-miner actor control list`, if the `owner` is not account
This commit is contained in:
Łukasz Magiera 2022-08-05 09:29:23 +02:00 committed by GitHub
commit e51904555b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/lotus-miner/actor.go
View File

@ -27,6 +27,7 @@ import (
"github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/build"
"github.com/filecoin-project/lotus/chain/actors" "github.com/filecoin-project/lotus/chain/actors"
"github.com/filecoin-project/lotus/chain/actors/adt" "github.com/filecoin-project/lotus/chain/actors/adt"
builtin2 "github.com/filecoin-project/lotus/chain/actors/builtin"
lminer "github.com/filecoin-project/lotus/chain/actors/builtin/miner" lminer "github.com/filecoin-project/lotus/chain/actors/builtin/miner"
"github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/types"
lcli "github.com/filecoin-project/lotus/cli" lcli "github.com/filecoin-project/lotus/cli"
@ -411,7 +412,7 @@ var actorControlList = &cli.Command{
} }
defer closer() defer closer()
api, acloser, err := lcli.GetFullNodeAPI(cctx) api, acloser, err := lcli.GetFullNodeAPIV1(cctx)
if err != nil { if err != nil {
return err return err
} }
@ -493,18 +494,21 @@ var actorControlList = &cli.Command{
} }
printKey := func(name string, a address.Address) { printKey := func(name string, a address.Address) {
b, err := api.WalletBalance(ctx, a) var actor *types.Actor
if err != nil { if actor, err = api.StateGetActor(ctx, a, types.EmptyTSK); err != nil {
fmt.Printf("%s\t%s: error getting balance: %s\n", name, a, err) fmt.Printf("%s\t%s: error getting actor: %s\n", name, a, err)
return return
} }
b := actor.Balance
k, err := api.StateAccountKey(ctx, a, types.EmptyTSK) var k = a
if err != nil { // 'a' maybe a 'robust', in that case, 'StateAccountKey' returns an error.
if builtin2.IsAccountActor(actor.Code) {
if k, err = api.StateAccountKey(ctx, a, types.EmptyTSK); err != nil {
fmt.Printf("%s\t%s: error getting account key: %s\n", name, a, err) fmt.Printf("%s\t%s: error getting account key: %s\n", name, a, err)
return return
} }
}
kstr := k.String() kstr := k.String()
if !cctx.Bool("verbose") { if !cctx.Bool("verbose") {
kstr = kstr[:9] + "..." kstr = kstr[:9] + "..."