Skip to content

Commit b25da7c

Browse files
fjlobscuren
fjl
authored and
obscuren
committed
[release/1.3.4] p2p/discover: EIP-8 changes
Conflicts: p2p/discover/udp_test.go
1 parent 9307794 commit b25da7c

File tree

2 files changed

+123
-1
lines changed

2 files changed

+123
-1
lines changed

‎p2p/discover/udp.go

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ type (
6767
Version uint
6868
From, To rpcEndpoint
6969
Expiration uint64
70+
// Ignore additional fields (for forward compatibility).
71+
Rest []rlp.RawValue `rlp:"tail"`
7072
}
7173

7274
// pong is the reply to ping.
@@ -78,18 +80,24 @@ type (
7880

7981
ReplyTok []byte // This contains the hash of the ping packet.
8082
Expiration uint64 // Absolute timestamp at which the packet becomes invalid.
83+
// Ignore additional fields (for forward compatibility).
84+
Rest []rlp.RawValue `rlp:"tail"`
8185
}
8286

8387
// findnode is a query for nodes close to the given target.
8488
findnode struct {
8589
Target NodeID // doesn't need to be an actual public key
8690
Expiration uint64
91+
// Ignore additional fields (for forward compatibility).
92+
Rest []rlp.RawValue `rlp:"tail"`
8793
}
8894

8995
// reply to findnode
9096
neighbors struct {
9197
Nodes []rpcNode
9298
Expiration uint64
99+
// Ignore additional fields (for forward compatibility).
100+
Rest []rlp.RawValue `rlp:"tail"`
93101
}
94102

95103
rpcNode struct {
@@ -513,7 +521,8 @@ func decodePacket(buf []byte) (packet, NodeID, []byte, error) {
513521
default:
514522
return nil, fromID, hash, fmt.Errorf("unknown type: %d", ptype)
515523
}
516-
err = rlp.DecodeBytes(sigdata[1:], req)
524+
s := rlp.NewStream(bytes.NewReader(sigdata[1:]), 0)
525+
err = s.Decode(req)
517526
return req, fromID, hash, err
518527
}
519528

‎p2p/discover/udp_test.go

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"bytes"
2121
"crypto/ecdsa"
2222
"encoding/binary"
23+
"encoding/hex"
2324
"errors"
2425
"fmt"
2526
"io"
@@ -34,8 +35,11 @@ import (
3435
"testing"
3536
"time"
3637

38+
"github.com/davecgh/go-spew/spew"
39+
"github.com/ethereum/go-ethereum/common"
3740
"github.com/ethereum/go-ethereum/crypto"
3841
"github.com/ethereum/go-ethereum/logger"
42+
"github.com/ethereum/go-ethereum/rlp"
3943
)
4044

4145
func init() {
@@ -385,6 +389,115 @@ func TestUDP_successfulPing(t *testing.T) {
385389
}
386390
}
387391

392+
var testPackets = []struct {
393+
input string
394+
wantPacket interface{}
395+
}{
396+
{
397+
input: "71dbda3a79554728d4f94411e42ee1f8b0d561c10e1e5f5893367948c6a7d70bb87b235fa28a77070271b6c164a2dce8c7e13a5739b53b5e96f2e5acb0e458a02902f5965d55ecbeb2ebb6cabb8b2b232896a36b737666c55265ad0a68412f250001ea04cb847f000001820cfa8215a8d790000000000000000000000000000000018208ae820d058443b9a355",
398+
wantPacket: &ping{
399+
Version: 4,
400+
From: rpcEndpoint{net.ParseIP("127.0.0.1").To4(), 3322, 5544},
401+
To: rpcEndpoint{net.ParseIP("::1"), 2222, 3333},
402+
Expiration: 1136239445,
403+
Rest: []rlp.RawValue{},
404+
},
405+
},
406+
{
407+
input: "e9614ccfd9fc3e74360018522d30e1419a143407ffcce748de3e22116b7e8dc92ff74788c0b6663aaa3d67d641936511c8f8d6ad8698b820a7cf9e1be7155e9a241f556658c55428ec0563514365799a4be2be5a685a80971ddcfa80cb422cdd0101ec04cb847f000001820cfa8215a8d790000000000000000000000000000000018208ae820d058443b9a3550102",
408+
wantPacket: &ping{
409+
Version: 4,
410+
From: rpcEndpoint{net.ParseIP("127.0.0.1").To4(), 3322, 5544},
411+
To: rpcEndpoint{net.ParseIP("::1"), 2222, 3333},
412+
Expiration: 1136239445,
413+
Rest: []rlp.RawValue{{0x01}, {0x02}},
414+
},
415+
},
416+
{
417+
input: "577be4349c4dd26768081f58de4c6f375a7a22f3f7adda654d1428637412c3d7fe917cadc56d4e5e7ffae1dbe3efffb9849feb71b262de37977e7c7a44e677295680e9e38ab26bee2fcbae207fba3ff3d74069a50b902a82c9903ed37cc993c50001f83e82022bd79020010db83c4d001500000000abcdef12820cfa8215a8d79020010db885a308d313198a2e037073488208ae82823a8443b9a355c5010203040531b9019afde696e582a78fa8d95ea13ce3297d4afb8ba6433e4154caa5ac6431af1b80ba76023fa4090c408f6b4bc3701562c031041d4702971d102c9ab7fa5eed4cd6bab8f7af956f7d565ee1917084a95398b6a21eac920fe3dd1345ec0a7ef39367ee69ddf092cbfe5b93e5e568ebc491983c09c76d922dc3",
418+
wantPacket: &ping{
419+
Version: 555,
420+
From: rpcEndpoint{net.ParseIP("2001:db8:3c4d:15::abcd:ef12"), 3322, 5544},
421+
To: rpcEndpoint{net.ParseIP("2001:db8:85a3:8d3:1319:8a2e:370:7348"), 2222, 33338},
422+
Expiration: 1136239445,
423+
Rest: []rlp.RawValue{{0xC5, 0x01, 0x02, 0x03, 0x04, 0x05}},
424+
},
425+
},
426+
{
427+
input: "09b2428d83348d27cdf7064ad9024f526cebc19e4958f0fdad87c15eb598dd61d08423e0bf66b2069869e1724125f820d851c136684082774f870e614d95a2855d000f05d1648b2d5945470bc187c2d2216fbe870f43ed0909009882e176a46b0102f846d79020010db885a308d313198a2e037073488208ae82823aa0fbc914b16819237dcd8801d7e53f69e9719adecb3cc0e790c57e91ca4461c9548443b9a355c6010203c2040506a0c969a58f6f9095004c0177a6b47f451530cab38966a25cca5cb58f055542124e",
428+
wantPacket: &pong{
429+
To: rpcEndpoint{net.ParseIP("2001:db8:85a3:8d3:1319:8a2e:370:7348"), 2222, 33338},
430+
ReplyTok: common.Hex2Bytes("fbc914b16819237dcd8801d7e53f69e9719adecb3cc0e790c57e91ca4461c954"),
431+
Expiration: 1136239445,
432+
Rest: []rlp.RawValue{{0xC6, 0x01, 0x02, 0x03, 0xC2, 0x04, 0x05}, {0x06}},
433+
},
434+
},
435+
{
436+
input: "c7c44041b9f7c7e41934417ebac9a8e1a4c6298f74553f2fcfdcae6ed6fe53163eb3d2b52e39fe91831b8a927bf4fc222c3902202027e5e9eb812195f95d20061ef5cd31d502e47ecb61183f74a504fe04c51e73df81f25c4d506b26db4517490103f84eb840ca634cae0d49acb401d8a4c6b6fe8c55b70d115bf400769cc1400f3258cd31387574077f301b421bc84df7266c44e9e6d569fc56be00812904767bf5ccd1fc7f8443b9a35582999983999999280dc62cc8255c73471e0a61da0c89acdc0e035e260add7fc0c04ad9ebf3919644c91cb247affc82b69bd2ca235c71eab8e49737c937a2c396",
437+
wantPacket: &findnode{
438+
Target: MustHexID("ca634cae0d49acb401d8a4c6b6fe8c55b70d115bf400769cc1400f3258cd31387574077f301b421bc84df7266c44e9e6d569fc56be00812904767bf5ccd1fc7f"),
439+
Expiration: 1136239445,
440+
Rest: []rlp.RawValue{{0x82, 0x99, 0x99}, {0x83, 0x99, 0x99, 0x99}},
441+
},
442+
},
443+
{
444+
input: "c679fc8fe0b8b12f06577f2e802d34f6fa257e6137a995f6f4cbfc9ee50ed3710faf6e66f932c4c8d81d64343f429651328758b47d3dbc02c4042f0fff6946a50f4a49037a72bb550f3a7872363a83e1b9ee6469856c24eb4ef80b7535bcf99c0004f9015bf90150f84d846321163782115c82115db8403155e1427f85f10a5c9a7755877748041af1bcd8d474ec065eb33df57a97babf54bfd2103575fa829115d224c523596b401065a97f74010610fce76382c0bf32f84984010203040101b840312c55512422cf9b8a4097e9a6ad79402e87a15ae909a4bfefa22398f03d20951933beea1e4dfa6f968212385e829f04c2d314fc2d4e255e0d3bc08792b069dbf8599020010db83c4d001500000000abcdef12820d05820d05b84038643200b172dcfef857492156971f0e6aa2c538d8b74010f8e140811d53b98c765dd2d96126051913f44582e8c199ad7c6d6819e9a56483f637feaac9448aacf8599020010db885a308d313198a2e037073488203e78203e8b8408dcab8618c3253b558d459da53bd8fa68935a719aff8b811197101a4b2b47dd2d47295286fc00cc081bb542d760717d1bdd6bec2c37cd72eca367d6dd3b9df738443b9a355010203b525a138aa34383fec3d2719a0",
445+
wantPacket: &neighbors{
446+
Nodes: []rpcNode{
447+
{
448+
ID: MustHexID("3155e1427f85f10a5c9a7755877748041af1bcd8d474ec065eb33df57a97babf54bfd2103575fa829115d224c523596b401065a97f74010610fce76382c0bf32"),
449+
IP: net.ParseIP("99.33.22.55").To4(),
450+
UDP: 4444,
451+
TCP: 4445,
452+
},
453+
{
454+
ID: MustHexID("312c55512422cf9b8a4097e9a6ad79402e87a15ae909a4bfefa22398f03d20951933beea1e4dfa6f968212385e829f04c2d314fc2d4e255e0d3bc08792b069db"),
455+
IP: net.ParseIP("1.2.3.4").To4(),
456+
UDP: 1,
457+
TCP: 1,
458+
},
459+
{
460+
ID: MustHexID("38643200b172dcfef857492156971f0e6aa2c538d8b74010f8e140811d53b98c765dd2d96126051913f44582e8c199ad7c6d6819e9a56483f637feaac9448aac"),
461+
IP: net.ParseIP("2001:db8:3c4d:15::abcd:ef12"),
462+
UDP: 3333,
463+
TCP: 3333,
464+
},
465+
{
466+
ID: MustHexID("8dcab8618c3253b558d459da53bd8fa68935a719aff8b811197101a4b2b47dd2d47295286fc00cc081bb542d760717d1bdd6bec2c37cd72eca367d6dd3b9df73"),
467+
IP: net.ParseIP("2001:db8:85a3:8d3:1319:8a2e:370:7348"),
468+
UDP: 999,
469+
TCP: 1000,
470+
},
471+
},
472+
Expiration: 1136239445,
473+
Rest: []rlp.RawValue{{0x01}, {0x02}, {0x03}},
474+
},
475+
},
476+
}
477+
478+
func TestForwardCompatibility(t *testing.T) {
479+
testkey, _ := crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291")
480+
wantNodeID := PubkeyID(&testkey.PublicKey)
481+
482+
for _, test := range testPackets {
483+
input, err := hex.DecodeString(test.input)
484+
if err != nil {
485+
t.Fatalf("invalid hex: %s", test.input)
486+
}
487+
packet, nodeid, _, err := decodePacket(input)
488+
if err != nil {
489+
t.Errorf("did not accept packet %s\n%v", test.input, err)
490+
continue
491+
}
492+
if !reflect.DeepEqual(packet, test.wantPacket) {
493+
t.Errorf("got %s\nwant %s", spew.Sdump(packet), spew.Sdump(test.wantPacket))
494+
}
495+
if nodeid != wantNodeID {
496+
t.Errorf("got id %v\nwant id %v", nodeid, wantNodeID)
497+
}
498+
}
499+
}
500+
388501
// dgramPipe is a fake UDP socket. It queues all sent datagrams.
389502
type dgramPipe struct {
390503
mu *sync.Mutex

0 commit comments

Comments
 (0)