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

Merge pull request #4521 from filecoin-project/feat/fix-shed-ledger-list

Browse Source 
Fix lotus-shed ledger list
This commit is contained in:
Łukasz Magiera 2020-10-22 19:59:18 +02:00 committed by GitHub
commit f9723ca3c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cmd/lotus-shed/ledger.go
View File

@ -7,9 +7,9 @@ import (
"strings" "strings"
"github.com/filecoin-project/go-address" "github.com/filecoin-project/go-address"
"github.com/filecoin-project/go-state-types/big"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
ledgerfil "github.com/whyrusleeping/ledger-filecoin-go" ledgerfil "github.com/whyrusleeping/ledger-filecoin-go"
"golang.org/x/xerrors"
"github.com/filecoin-project/lotus/api" "github.com/filecoin-project/lotus/api"
"github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/types"
@ -76,15 +76,22 @@ var ledgerListAddressesCmd = &cli.Command{
} }
if cctx.Bool("print-balances") && api != nil { // api check makes linter happier if cctx.Bool("print-balances") && api != nil { // api check makes linter happier
b, err := api.WalletBalance(ctx, addr) a, err := api.StateGetActor(ctx, addr, types.EmptyTSK)
if err != nil { if err != nil {
return xerrors.Errorf("getting balance: %w", err) if strings.Contains(err.Error(), "actor not found") {
} a = nil
if !b.IsZero() { } else {
end = i + 21 // BIP32 spec, stop after 20 empty addresses return err
}
} }
fmt.Printf("%s %s %s\n", addr, printHDPath(p), types.FIL(b)) balance := big.Zero()
if a != nil {
balance = a.Balance
end = i + 20 + 1
}
fmt.Printf("%s %s %s\n", addr, printHDPath(p), types.FIL(balance))
} else { } else {
fmt.Printf("%s %s\n", addr, printHDPath(p)) fmt.Printf("%s %s\n", addr, printHDPath(p))
} }