roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

cmd/devp2p: print enode:// URL in enrdump (#21270)

Browse Source 
Co-authored-by: Felix Lange <fjl@twurst.com>
This commit is contained in:
Adam Schmideg 2020-08-04 11:33:07 +02:00 committed by GitHub
parent 90dedea40f
commit e24e05dd01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cmd/devp2p/enrcmd.go
View File

@ -21,6 +21,7 @@ import (
"encoding/base64" "encoding/base64"
"encoding/hex" "encoding/hex"
"fmt" "fmt"
"io"
"io/ioutil" "io/ioutil"
"net" "net"
"os" "os"
@ -69,22 +70,30 @@ func enrdump(ctx *cli.Context) error {
if err != nil { if err != nil {
return fmt.Errorf("INVALID: %v", err) return fmt.Errorf("INVALID: %v", err)
} }
fmt.Print(dumpRecord(r)) dumpRecord(os.Stdout, r)
return nil return nil
} }
// dumpRecord creates a human-readable description of the given node record. // dumpRecord creates a human-readable description of the given node record.
func dumpRecord(r *enr.Record) string { func dumpRecord(out io.Writer, r *enr.Record) {
out := new(bytes.Buffer) n, err := enode.New(enode.ValidSchemes, r)
if n, err := enode.New(enode.ValidSchemes, r); err != nil { if err != nil {
fmt.Fprintf(out, "INVALID: %v\n", err) fmt.Fprintf(out, "INVALID: %v\n", err)
} else { } else {
fmt.Fprintf(out, "Node ID: %v\n", n.ID()) fmt.Fprintf(out, "Node ID: %v\n", n.ID())
dumpNodeURL(out, n)
} }
kv := r.AppendElements(nil)[1:] kv := r.AppendElements(nil)[1:]
fmt.Fprintf(out, "Record has sequence number %d and %d key/value pairs.\n", r.Seq(), len(kv)/2) fmt.Fprintf(out, "Record has sequence number %d and %d key/value pairs.\n", r.Seq(), len(kv)/2)
fmt.Fprint(out, dumpRecordKV(kv, 2)) fmt.Fprint(out, dumpRecordKV(kv, 2))
return out.String() }
func dumpNodeURL(out io.Writer, n *enode.Node) {
var key enode.Secp256k1
if n.Load(&key) != nil {
return // no secp256k1 public key
}
fmt.Fprintf(out, "URLv4: %s\n", n.URLv4())
} }
func dumpRecordKV(kv []interface{}, indent int) string { func dumpRecordKV(kv []interface{}, indent int) string {