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

shed ledger: Some UX improvements

Browse Source 
Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>
This commit is contained in:
Łukasz Magiera 2020-10-10 13:41:19 +02:00 committed by Jakub Sztandera
parent 66d6113340
commit 2c92157233
No known key found for this signature in database
GPG Key ID: 9A9AF56F8B3879BA
1 changed files with 50 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,11 +7,15 @@ import (
"strings" "strings"
"github.com/filecoin-project/go-address" "github.com/filecoin-project/go-address"
"github.com/urfave/cli/v2"
ledgerfil "github.com/whyrusleeping/ledger-filecoin-go"
"golang.org/x/xerrors"
"github.com/filecoin-project/lotus/api"
"github.com/filecoin-project/lotus/chain/types" "github.com/filecoin-project/lotus/chain/types"
"github.com/filecoin-project/lotus/chain/wallet" "github.com/filecoin-project/lotus/chain/wallet"
ledgerwallet "github.com/filecoin-project/lotus/chain/wallet/ledger" ledgerwallet "github.com/filecoin-project/lotus/chain/wallet/ledger"
"github.com/urfave/cli/v2" lcli "github.com/filecoin-project/lotus/cli"
ledgerfil "github.com/whyrusleeping/ledger-filecoin-go"
) )
var ledgerCmd = &cli.Command{ var ledgerCmd = &cli.Command{
@ -27,7 +31,26 @@ var ledgerCmd = &cli.Command{
var ledgerListAddressesCmd = &cli.Command{ var ledgerListAddressesCmd = &cli.Command{
Name: "list", Name: "list",
Flags: []cli.Flag{
&cli.BoolFlag{
Name: "print-balances",
Usage: "print balances",
Aliases: []string{"b"},
},
},
Action: func(cctx *cli.Context) error { Action: func(cctx *cli.Context) error {
var api api.FullNode
if cctx.Bool("print-balances") {
a, closer, err := lcli.GetFullNodeAPI(cctx)
if err != nil {
return err
}
api = a
defer closer()
}
ctx := lcli.ReqContext(cctx)
fl, err := ledgerfil.FindLedgerFilecoinApp() fl, err := ledgerfil.FindLedgerFilecoinApp()
if err != nil { if err != nil {
@ -35,6 +58,10 @@ var ledgerListAddressesCmd = &cli.Command{
} }
for i := 0; i < 20; i++ { for i := 0; i < 20; i++ {
if err := ctx.Err(); err != nil {
return err
}
p := []uint32{0x80000000 + 44, 0x80000000 + 461, 0x80000000, 0, uint32(i)} p := []uint32{0x80000000 + 44, 0x80000000 + 461, 0x80000000, 0, uint32(i)}
pubk, err := fl.GetPublicKeySECP256K1(p) pubk, err := fl.GetPublicKeySECP256K1(p)
if err != nil { if err != nil {
@ -46,7 +73,17 @@ var ledgerListAddressesCmd = &cli.Command{
return err return err
} }
fmt.Printf("%s: %s\n", addr, printHDPath(p)) if cctx.Bool("print-balances") && api != nil { // api check makes linter happier
b, err := api.WalletBalance(ctx, addr)
if err != nil {
return xerrors.Errorf("getting balance: %w", err)
}
fmt.Printf("%s %s %s\n", addr, printHDPath(p), types.FIL(b))
} else {
fmt.Printf("%s %s\n", addr, printHDPath(p))
}
} }
return nil return nil
@ -110,6 +147,12 @@ func numlist(p []uint32) string {
var ledgerKeyInfoCmd = &cli.Command{ var ledgerKeyInfoCmd = &cli.Command{
Name: "key-info", Name: "key-info",
Flags: []cli.Flag{
&cli.BoolFlag{
Name: "verbose",
Aliases: []string{"v"},
},
},
Action: func(cctx *cli.Context) error { Action: func(cctx *cli.Context) error {
if !cctx.Args().Present() { if !cctx.Args().Present() {
return cli.ShowCommandHelp(cctx, cctx.Command.Name) return cli.ShowCommandHelp(cctx, cctx.Command.Name)
@ -129,8 +172,10 @@ var ledgerKeyInfoCmd = &cli.Command{
if err != nil { if err != nil {
return err return err
} }
fmt.Println(addr) if cctx.Bool("verbose") {
fmt.Println(pubk) fmt.Println(addr)
fmt.Println(pubk)
}
a, err := address.NewFromString(addr) a, err := address.NewFromString(addr)
if err != nil { if err != nil {