p2p: EIP-8 changes

BMFKR · Feb 19, 2016 · 7d81557 · 7d81557
1 parent ee1debd
commit 7d81557
Show file tree

Hide file tree

Showing 4 changed files with 443 additions and 149 deletions.
diff --git a/p2p/message_test.go b/p2p/message_test.go
@@ -143,7 +143,8 @@ func TestEOFSignal(t *testing.T) {
 }
 
 func unhex(str string) []byte {
-	b, err := hex.DecodeString(strings.Replace(str, "\n", "", -1))
+	r := strings.NewReplacer("\t", "", " ", "", "\n", "")
+	b, err := hex.DecodeString(r.Replace(str))
 	if err != nil {
 		panic(fmt.Sprintf("invalid hex string: %q", str))
 	}

diff --git a/p2p/peer.go b/p2p/peer.go
@@ -56,6 +56,9 @@ type protoHandshake struct {
 	Caps       []Cap
 	ListenPort uint64
 	ID         discover.NodeID
+
+	// Ignore additional fields (for forward compatibility).
+	Rest []rlp.RawValue `rlp:"tail"`
 }
 
 // Peer represents a connected remote node.