-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #123 from filecoin-project/feat/tanlang/add-sign-r…
…ecorder Feat/tanlang/add sign recorder
- Loading branch information
Showing
19 changed files
with
642 additions
and
155 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,4 +18,5 @@ var Commands = []*cli.Command{ | |
| walletLock, | ||
| walletLockState, | ||
| supportCmds, | ||
| recordCmd, | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,203 @@ | ||
| package cli | ||
|
|
||
| import ( | ||
| "encoding/hex" | ||
| "encoding/json" | ||
| "fmt" | ||
| "reflect" | ||
| "time" | ||
|
|
||
| "github.com/filecoin-project/go-address" | ||
| "github.com/filecoin-project/venus-wallet/cli/helper" | ||
| "github.com/filecoin-project/venus-wallet/storage/wallet" | ||
| "github.com/filecoin-project/venus/venus-shared/types" | ||
| "github.com/urfave/cli/v2" | ||
| ) | ||
|
|
||
| var recordCmd = &cli.Command{ | ||
| Name: "record", | ||
| Usage: "manipulate sign record", | ||
| Subcommands: []*cli.Command{ | ||
| recordList, | ||
| }, | ||
| } | ||
|
|
||
| var recordList = &cli.Command{ | ||
| Name: "query", | ||
| Usage: "query sign record", | ||
| Flags: []cli.Flag{ | ||
| &cli.StringFlag{ | ||
| Name: "address", | ||
| Usage: "address to query", | ||
| }, | ||
| &cli.StringFlag{ | ||
| Name: "type", | ||
| Usage: "sign type to query", | ||
| }, | ||
| &cli.TimestampFlag{ | ||
| Name: "from", | ||
| Aliases: []string{"after", "f"}, | ||
| Usage: "from time to query", | ||
| Timezone: time.Local, | ||
| Layout: "2006-1-2-15:04:05", | ||
| }, | ||
| &cli.TimestampFlag{ | ||
| Name: "to", | ||
| Aliases: []string{"before"}, | ||
| Timezone: time.Local, | ||
| Usage: "to time to query", | ||
| Layout: "2006-1-2-15:04:05", | ||
| }, | ||
| &cli.IntFlag{ | ||
| Name: "limit", | ||
| Usage: "limit to query", | ||
| }, | ||
| &cli.IntFlag{ | ||
| Name: "offset", | ||
| Aliases: []string{"skip"}, | ||
| Usage: "offset to query", | ||
| }, | ||
| &cli.BoolFlag{ | ||
| Name: "error", | ||
| Usage: "query error record", | ||
| }, | ||
| &cli.StringFlag{ | ||
| Name: "id", | ||
| Usage: "query record by id", | ||
| }, | ||
| &cli.BoolFlag{ | ||
| Name: "verbose", | ||
| Usage: "verbose output", | ||
| Aliases: []string{"v"}, | ||
| }, | ||
| }, | ||
| Action: func(cctx *cli.Context) error { | ||
| api, closer, err := helper.GetAPI(cctx) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| defer closer() | ||
|
|
||
| ctx := helper.ReqContext(cctx) | ||
|
|
||
| QueryParams := types.QuerySignRecordParams{} | ||
|
|
||
| if cctx.IsSet("address") { | ||
| addrStr := cctx.String("address") | ||
| addr, err := address.NewFromString(addrStr) | ||
| if err != nil { | ||
| return fmt.Errorf("parse address %s : %w", addrStr, err) | ||
| } | ||
| QueryParams.Signer = addr | ||
| } | ||
|
|
||
| if cctx.IsSet("type") { | ||
| t := types.MsgType(cctx.String("type")) | ||
| _, ok := wallet.SupportedMsgTypes[t] | ||
| if !ok { | ||
|
|
||
| fmt.Println("supported types:") | ||
| for k := range wallet.SupportedMsgTypes { | ||
| fmt.Println(k) | ||
| } | ||
| return fmt.Errorf("unsupported type %s", t) | ||
| } | ||
| QueryParams.Type = t | ||
| } | ||
| if cctx.IsSet("from") { | ||
| from := cctx.Timestamp("from") | ||
| QueryParams.After = *from | ||
| } | ||
| if cctx.IsSet("to") { | ||
| to := cctx.Timestamp("to") | ||
| QueryParams.Before = *to | ||
| } | ||
| if cctx.IsSet("limit") { | ||
| limit := cctx.Int("limit") | ||
| QueryParams.Limit = limit | ||
| } | ||
| if cctx.IsSet("offset") { | ||
| offset := cctx.Int("offset") | ||
| QueryParams.Skip = offset | ||
| } | ||
| if cctx.IsSet("error") { | ||
| QueryParams.IsError = cctx.Bool("error") | ||
| } | ||
| if cctx.IsSet("id") { | ||
| QueryParams.ID = cctx.String("id") | ||
| } | ||
|
|
||
| records, err := api.ListSignedRecord(ctx, &QueryParams) | ||
| if err != nil { | ||
| return fmt.Errorf("query sign record: %w", err) | ||
| } | ||
|
|
||
| if cctx.Bool("verbose") { | ||
| output := make([]interface{}, len(records)) | ||
| type temp struct { | ||
| types.SignRecord | ||
| Detail json.RawMessage | ||
| } | ||
|
|
||
| for i, r := range records { | ||
| detail, err := GetDetailInJsonRawMessage(&r) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| output[i] = temp{ | ||
| SignRecord: r, | ||
| Detail: detail, | ||
| } | ||
| } | ||
|
|
||
| return helper.PrintJSON(output) | ||
| } else { | ||
| // output in table format | ||
| w := helper.NewTabWriter(cctx.App.Writer) | ||
| fmt.Fprintln(w, "SIGNER\tTYPE\tTIME\tERROR") | ||
| for _, r := range records { | ||
| errStr := "no error" | ||
| if r.Err != nil { | ||
| errStr = r.Err.Error() | ||
| } | ||
| fmt.Fprintf(w, "%s\t%s\t%s\t%s\n", r.Signer, r.Type, r.CreateAt, errStr) | ||
| } | ||
| w.Flush() | ||
| } | ||
|
|
||
| return nil | ||
| }, | ||
| } | ||
|
|
||
| func GetDetailInJsonRawMessage(r *types.SignRecord) (json.RawMessage, error) { | ||
| t, ok := wallet.SupportedMsgTypes[r.Type] | ||
| if !ok { | ||
| return nil, fmt.Errorf("unsupported type %s", r.Type) | ||
| } | ||
|
|
||
| wrap := func(err error) error { | ||
| return fmt.Errorf("get detail: %w", err) | ||
| } | ||
|
|
||
| if r.RawMsg == nil { | ||
| return nil, wrap(fmt.Errorf("msg is nil")) | ||
| } | ||
|
|
||
| if r.Type == types.MTVerifyAddress || r.Type == types.MTUnknown { | ||
| // encode into hex string | ||
| output := struct { | ||
| Hex string | ||
| }{ | ||
| Hex: hex.EncodeToString(r.RawMsg), | ||
| } | ||
|
|
||
| return json.Marshal(output) | ||
| } | ||
|
|
||
| signObj := reflect.New(t.Type).Interface() | ||
| if err := wallet.CborDecodeInto(r.RawMsg, signObj); err != nil { | ||
| return nil, fmt.Errorf("decode msg:%w", err) | ||
| } | ||
| return json.Marshal(signObj) | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.