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

paych: Reserve flag for add-funds cli

Browse Source
This commit is contained in:
Łukasz Magiera 2022-01-04 23:31:22 +01:00
parent 8f6f21c94c
commit ff8b95df93
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cli/paych.go
View File

@ -39,12 +39,15 @@ var paychAddFundsCmd = &cli.Command{
Usage: "Add funds to the payment channel between fromAddress and toAddress. Creates the payment channel if it doesn't already exist.", Usage: "Add funds to the payment channel between fromAddress and toAddress. Creates the payment channel if it doesn't already exist.",
ArgsUsage: "[fromAddress toAddress amount]", ArgsUsage: "[fromAddress toAddress amount]",
Flags: []cli.Flag{ Flags: []cli.Flag{
&cli.BoolFlag{ &cli.BoolFlag{
Name: "restart-retrievals", Name: "restart-retrievals",
Usage: "restart stalled retrieval deals on this payment channel", Usage: "restart stalled retrieval deals on this payment channel",
Value: true, Value: true,
}, },
&cli.BoolFlag{
Name: "reserve",
Usage: "mark funds as reserved",
},
}, },
Action: func(cctx *cli.Context) error { Action: func(cctx *cli.Context) error {
if cctx.Args().Len() != 3 { if cctx.Args().Len() != 3 {
@ -66,7 +69,7 @@ var paychAddFundsCmd = &cli.Command{
return ShowHelp(cctx, fmt.Errorf("parsing amount failed: %s", err)) return ShowHelp(cctx, fmt.Errorf("parsing amount failed: %s", err))
} }
api, closer, err := GetFullNodeAPI(cctx) api, closer, err := GetFullNodeAPIV1(cctx)
if err != nil { if err != nil {
return err return err
} }
@ -76,7 +79,7 @@ var paychAddFundsCmd = &cli.Command{
// Send a message to chain to create channel / add funds to existing // Send a message to chain to create channel / add funds to existing
// channel // channel
info, err := api.PaychGet(ctx, from, to, types.BigInt(amt)) info, err := api.PaychGet(ctx, from, to, types.BigInt(amt), cctx.Bool("reserve"))
if err != nil { if err != nil {
return err return err
} }

6
paychmgr/store.go
View File

@ -502,5 +502,11 @@ func unmarshallChannelInfo(stored *ChannelInfo, value []byte) (*ChannelInfo, err
stored.Channel = nil stored.Channel = nil
} }
// backwards compat
if stored.AvailableAmount.Int == nil {
stored.AvailableAmount = types.NewInt(0)
stored.PendingAvailableAmount = types.NewInt(0)
}
return stored, nil return stored, nil
} }