Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add --peerid-base to ipfs id command #7591

Merged
merged 1 commit into from
Aug 18, 2020
Merged

Add --peerid-base to ipfs id command #7591

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions core/commands/id.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"

cmds "github.com/ipfs/go-ipfs-cmds"
ke "github.com/ipfs/go-ipfs/core/commands/keyencode"
ic "github.com/libp2p/go-libp2p-core/crypto"
"github.com/libp2p/go-libp2p-core/host"
peer "github.com/libp2p/go-libp2p-core/peer"
Expand Down Expand Up @@ -41,7 +42,8 @@ type IdOutput struct {
}

const (
formatOptionName = "format"
formatOptionName = "format"
idFormatOptionName = "peerid-base"
)

var IDCmd = &cmds.Command{
Expand All @@ -68,8 +70,14 @@ EXAMPLE:
},
Options: []cmds.Option{
cmds.StringOption(formatOptionName, "f", "Optional output format."),
cmds.StringOption(idFormatOptionName, "", "Encoding used for peer IDs: Can either be a multibase encoded CID or a base58btc encoded multihash. Takes {b58mh|base36|k|base32|b...}.").WithDefault("b58mh"),
},
Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {
keyEnc, err := ke.KeyEncoderFromString(req.Options[idFormatOptionName].(string))
if err != nil {
return err
}

n, err := cmdenv.GetNode(env)
if err != nil {
return err
Expand All @@ -87,7 +95,7 @@ EXAMPLE:
}

if id == n.Identity {
output, err := printSelf(n)
output, err := printSelf(keyEnc, n)
if err != nil {
return err
}
Expand All @@ -109,7 +117,7 @@ EXAMPLE:
return err
}

output, err := printPeer(n.Peerstore, id)
output, err := printPeer(keyEnc, n.Peerstore, id)
if err != nil {
return err
}
Expand Down Expand Up @@ -143,13 +151,13 @@ EXAMPLE:
Type: IdOutput{},
}

func printPeer(ps pstore.Peerstore, p peer.ID) (interface{}, error) {
func printPeer(keyEnc ke.KeyEncoder, ps pstore.Peerstore, p peer.ID) (interface{}, error) {
if p == "" {
return nil, errors.New("attempted to print nil peer")
}

info := new(IdOutput)
info.ID = p.Pretty()
info.ID = keyEnc.FormatID(p)

if pk := ps.PubKey(p); pk != nil {
pkb, err := ic.MarshalPublicKey(pk)
Expand Down Expand Up @@ -191,9 +199,9 @@ func printPeer(ps pstore.Peerstore, p peer.ID) (interface{}, error) {
}

// printing self is special cased as we get values differently.
func printSelf(node *core.IpfsNode) (interface{}, error) {
func printSelf(keyEnc ke.KeyEncoder, node *core.IpfsNode) (interface{}, error) {
info := new(IdOutput)
info.ID = node.Identity.Pretty()
info.ID = keyEnc.FormatID(node.Identity)

pk := node.PrivateKey.GetPublic()
pkb, err := ic.MarshalPublicKey(pk)
Expand Down