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

wallet cli: rename withdraw-market-funds -> market withdraw

Browse Source
This commit is contained in:
Łukasz Magiera 2020-10-23 11:16:29 +02:00
parent 7bdc7aa527
commit 6842c03399
1 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
cli/wallet.go
View File

@ -38,7 +38,7 @@ var walletCmd = &cli.Command{
walletSign, walletSign,
walletVerify, walletVerify,
walletDelete, walletDelete,
walletWithdrawMarketFunds, walletMarket,
}, },
} }
@ -477,15 +477,23 @@ var walletDelete = &cli.Command{
}, },
} }
var walletWithdrawMarketFunds = &cli.Command{ var walletMarket = &cli.Command{
Name: "withdraw-market-funds", Name: "market",
Usage: "Interact with market balances",
Subcommands: []*cli.Command{
walletMarketWithdraw,
},
}
var walletMarketWithdraw = &cli.Command{
Name: "withdraw",
Usage: "Withdraw funds from the Storage Market Actor", Usage: "Withdraw funds from the Storage Market Actor",
ArgsUsage: "[amount (FIL) optional, otherwise will withdraw max available]", ArgsUsage: "[amount (FIL) optional, otherwise will withdraw max available]",
Flags: []cli.Flag{ Flags: []cli.Flag{
&cli.StringFlag{ &cli.StringFlag{
Name: "address", Name: "from",
Usage: "Specify address to withdraw funds from, otherwise it will use the default wallet address", Usage: "Specify address to withdraw funds from, otherwise it will use the default wallet address",
Aliases: []string{"a"}, Aliases: []string{"f"},
}, },
}, },
Action: func(cctx *cli.Context) error { Action: func(cctx *cli.Context) error {
@ -496,25 +504,20 @@ var walletWithdrawMarketFunds = &cli.Command{
defer closer() defer closer()
ctx := ReqContext(cctx) ctx := ReqContext(cctx)
defAddr, err := api.WalletDefaultAddress(ctx) var addr address.Address
if cctx.String("from") != "" {
addr, err = address.NewFromString(cctx.String("from"))
if err != nil {
return xerrors.Errorf("parsing from address: %w", err)
}
} else {
addr, err = api.WalletDefaultAddress(ctx)
if err != nil { if err != nil {
return xerrors.Errorf("getting default wallet address: %w", err) return xerrors.Errorf("getting default wallet address: %w", err)
} }
addr := defAddr
if cctx.String("address") != "" {
addr, err = address.NewFromString(cctx.String("address"))
if err != nil {
return xerrors.Errorf("parsing address: %w", err)
}
} }
ts, err := api.ChainHead(ctx) bal, err := api.StateMarketBalance(ctx, addr, types.EmptyTSK)
if err != nil {
return xerrors.Errorf("getting chain head: %w", err)
}
bal, err := api.StateMarketBalance(ctx, addr, ts.Key())
if err != nil { if err != nil {
return xerrors.Errorf("getting market balance for address %s: %w", addr.String(), err) return xerrors.Errorf("getting market balance for address %s: %w", addr.String(), err)
} }
@ -550,7 +553,7 @@ var walletWithdrawMarketFunds = &cli.Command{
fmt.Printf("Submitting WithdrawBalance message for amount %s for address %s\n", types.FIL(amt), addr.String()) fmt.Printf("Submitting WithdrawBalance message for amount %s for address %s\n", types.FIL(amt), addr.String())
smsg, err := api.MpoolPushMessage(ctx, &types.Message{ smsg, err := api.MpoolPushMessage(ctx, &types.Message{
To: builtin.StorageMarketActorAddr, To: builtin.StorageMarketActorAddr,
From: defAddr, From: addr,
Value: types.NewInt(0), Value: types.NewInt(0),
Method: builtin.MethodsMarket.WithdrawBalance, Method: builtin.MethodsMarket.WithdrawBalance,
Params: params, Params: params,