Commit graph

863 commits

Author SHA1 Message Date
Marius G
6e33dbf96a
p2p: fix flaky test TestServerPortMapping (#30241)
The test specifies `ListenAddr: ":0"`, which means a random ephemeral
port will be chosen for the TCP listener by the OS. Additionally, since
no `DiscAddr` was specified, the same port that is chosen automatically
by the OS will also be used for the UDP listener in the discovery UDP
setup. This sometimes leads to test failures if the TCP listener picks a
free TCP port that is already taken for UDP. By specifying `DiscAddr:
":0"`, the UDP port will be chosen independently from the TCP port,
fixing the random failure.

See issue #29830.

Verified using
```
cd p2p
go test -c -race
stress ./p2p.test -test.run=TestServerPortMapping
...
5m0s: 4556 runs so far, 0 failures
```

The issue described above can technically lead to sporadic failures on
systems that specify a listen address via the `--port` flag of 0 while
not setting `--discovery.port`. Since the default is using port `30303`
and using a random ephemeral port is likely not used much to begin with,
not addressing the root cause might be acceptable.
2024-07-30 07:31:27 -06:00
Chen Kai
5e49d18f43
Merge branch 'ethereum:master' into portal 2024-07-27 18:51:29 +08:00
dknopik
b0f66e34ca
p2p/nat: return correct port for ExtIP NAT (#30234)
Return the actually requested external port instead of 0 in the
AddMapping implementation for `--nat extip:<IP>`.
2024-07-27 10:18:05 +02:00
Chen Kai
7b8ce855f7
Merge branch 'ethereum:master' into portal 2024-07-25 13:23:02 +08:00
yukionfire
4dfc75deef
beacon/types, cmd/devp2p, p2p/enr: clean up uses of fmt.Errorf (#30182) 2024-07-25 00:32:58 +02:00
thinkAfCod
f96f5d753d fix format 2024-07-23 18:55:43 +08:00
thinkAfCod
2c5d6c257f add logs 2024-07-23 13:34:56 +08:00
thinkAfCod
26114068ee add logs 2024-07-20 16:08:35 +08:00
Chen Kai
458839f483
Merge branch 'ethereum:master' into portal 2024-07-18 23:47:59 +08:00
Felix Lange
ad49c708f5
p2p/discover: remove type encPubkey (#30172)
The pubkey type was moved to package v4wire a long time ago. Remaining uses of
encPubkey were probably left in due to laziness.
2024-07-18 11:09:02 +02:00
thinkAfCod
8de928c004 add log 2024-07-17 21:47:26 +08:00
Chen Kai
839a7877a8
Merge branch 'ethereum:master' into portal 2024-07-16 18:05:47 +08:00
Nathan Jo
4bbe993252
p2p: fix ip change log parameter (#30158) 2024-07-15 10:15:35 +02:00
Chen Kai
0f8632ed9b
Merge branch 'ethereum:master' into portal 2024-06-22 11:39:03 +08:00
Halimao
a71f6f91fd
p2p/discover: improve flaky revalidation tests (#30023) 2024-06-21 15:29:07 +02:00
David Theodore
27654d3022
p2p/rlpx: 2KB maximum size for handshake messages (#30029)
Co-authored-by: Felix Lange <fjl@twurst.com>
2024-06-20 14:08:54 +02:00
Chen Kai
1189e67f12 fix:make add enr
Signed-off-by: Chen Kai <281165273grape@gmail.com>
2024-06-20 16:31:52 +08:00
Chen Kai
792b4746b8 fix:add lock in addenr
Signed-off-by: Chen Kai <281165273grape@gmail.com>
2024-06-19 21:46:22 +08:00
Chen Kai
9918abaaa1 fix:add lock when del enr
Signed-off-by: Chen Kai <281165273grape@gmail.com>
2024-06-19 09:29:39 +08:00
Chen Kai
af02291ad4 fix:add enr should add node immediately
Signed-off-by: Chen Kai <281165273grape@gmail.com>
2024-06-18 21:12:43 +08:00
Chen Kai
13e8f62b34 fix:fix delete no lock
Signed-off-by: Chen Kai <281165273grape@gmail.com>
2024-06-18 08:28:24 +08:00
Chen Kai
6088495691 fix:merge geth p2p change
Signed-off-by: Chen Kai <281165273grape@gmail.com>
2024-06-17 20:28:49 +08:00
fearlessfe
703e97781a feat: change node radius 2024-06-12 11:02:05 +08:00
bugmaker9371
b6f2bbd417
p2p/simulations: update doc of HTTP endpoints (#29894) 2024-06-11 19:41:17 +02:00
thinkAfCod
0d4f0732f8 fix: close conn in defer 2024-06-10 14:55:47 +08:00
Gealber Morales
8bda642963
p2p: use package slices to sort in PeersInfo (#29957) 2024-06-09 22:50:22 +02:00
Gealber Morales
349fcdd22d
p2p/discover: add missing lock when calling tab.handleAddNode (#29960) 2024-06-09 22:47:51 +02:00
Felix Lange
85459e1439
p2p/discover: unwrap 4-in-6 UDP source addresses (#29944)
Fixes an issue where discovery responses were not recognized.
2024-06-06 16:15:22 +03:00
Hteev Oli
0750cb0c8f
p2p/netutil: fix comments (#29942) 2024-06-06 10:56:41 +03:00
Felix Lange
bc6569462d
p2p: use netip.Addr where possible (#29891)
enode.Node was recently changed to store a cache of endpoint information. The IP address in the cache is a netip.Addr. I chose that type over net.IP because it is just better. netip.Addr is meant to be used as a value type. Copying it does not allocate, it can be compared with ==, and can be used as a map key.

This PR changes most uses of Node.IP() into Node.IPAddr(), which returns the cached value directly without allocating.
While there are still some public APIs left where net.IP is used, I have converted all code used internally by p2p/discover to the new types. So this does change some public Go API, but hopefully not APIs any external code actually uses.

There weren't supposed to be any semantic differences resulting from this refactoring, however it does introduce one: In package p2p/netutil we treated the 0.0.0.0/8 network (addresses 0.x.y.z) as LAN, but netip.Addr.IsPrivate() doesn't. The treatment of this particular IP address range is controversial, with some software supporting it and others not. IANA lists it as special-purpose and invalid as a destination for a long time, so I don't know why I put it into the LAN list. It has now been marked as special in p2p/netutil as well.
2024-06-05 19:31:04 +02:00
fearlessfe
1ed713ad1e feat: nat 2024-06-05 12:53:19 +08:00
qcloud
04c50486b8 refactor: contentLookup and traceContentLookup 2024-06-03 23:17:55 +08:00
thinkAfCod
1ae723db49 fix: fix test case 2024-06-03 14:30:21 +08:00
thinkAfCod
ba87b9da66 fix: fix memory leak 2024-06-03 14:30:21 +08:00
Chen Kai
7b4b081ff4 Revert "fix: close conn after read"
This reverts commit c6766840d4.
2024-06-01 08:21:17 +08:00
Chen Kai
3a133719f8 Revert "fix: upgrade utp version for using sync pool to get buffer"
This reverts commit 210a81d4b3.
2024-06-01 08:21:17 +08:00
Chen Kai
2826476c80 Revert "fix: test case and upgrade utp-go version"
This reverts commit 02b87d96e4.
2024-06-01 08:21:17 +08:00
thinkAfCod
02b87d96e4 fix: test case and upgrade utp-go version 2024-05-31 14:02:18 +08:00
thinkAfCod
210a81d4b3 fix: upgrade utp version for using sync pool to get buffer 2024-05-31 14:02:18 +08:00
thinkAfCod
c6766840d4 fix: close conn after read 2024-05-31 14:02:18 +08:00
Felix Lange
94a8b296e4
p2p/discover: refactor node and endpoint representation (#29844)
Here we clean up internal uses of type discover.node, converting most code to use
enode.Node instead. The discover.node type used to be the canonical representation of
network hosts before ENR was introduced. Most code worked with *node to avoid conversions
when interacting with Table methods. Since *node also contains internal state of Table and
is a mutable type, using *node outside of Table code is prone to data races. It's also
cleaner not having to wrap/unwrap *enode.Node all the time.

discover.node has been renamed to tableNode to clarify its purpose.

While here, we also change most uses of net.UDPAddr into netip.AddrPort. While this is
technically a separate refactoring from the *node -> *enode.Node change, it is more
convenient because *enode.Node handles IP addresses as netip.Addr. The switch to package
netip in discovery would've happened very soon anyway.

The change to netip.AddrPort stops at certain interface points. For example, since package
p2p/netutil has not been converted to use netip.Addr yet, we still have to convert to
net.IP/net.UDPAddr in a few places.
2024-05-29 15:02:26 +02:00
thinkAfCod
c7e93e70cc fix: find node info 2024-05-29 20:26:30 +08:00
lilasxie
153f8da887
p2p/nodestate: remove unused package (#29872) 2024-05-29 12:11:18 +02:00
bugmaker9371
daf4f72077
p2p/simulations: remove stale information about docker adapter (#29874) 2024-05-29 12:09:58 +02:00
lightclient
cc22e0cdf0
p2p/discover: fix update logic in handleAddNode (#29836)
It seems the semantic differences between addFoundNode and addInboundNode were lost in
#29572. My understanding is addFoundNode is for a node you have not contacted directly
(and are unsure if is available) whereas addInboundNode is for adding nodes that have
contacted the local node and we can verify they are active.

handleAddNode seems to be the consolidation of those two methods, yet it bumps the node in
the bucket (updating it's IP addr) even if the node was not an inbound. This PR fixes
this. It wasn't originally caught in tests like TestTable_addSeenNode because the
manipulation of the node object actually modified the node value used by the test.

New logic is added to reject non-inbound updates unless the sequence number of the
(signed) ENR increases. Inbound updates, which are published by the updated node itself,
are always accepted. If an inbound update changes the endpoint, the node will be
revalidated on an expedited schedule.

Co-authored-by: Felix Lange <fjl@twurst.com>
2024-05-28 21:30:17 +02:00
Felix Lange
af0a3274be
p2p/discover: fix crash when revalidated node is removed (#29864)
In #29572, I assumed the revalidation list that the node is contained in could only ever
be changed by the outcome of a revalidation request. But turns out that's not true: if the
node gets removed due to FINDNODE failure, it will also be removed from the list it is in.
This causes a crash.

The invariant is: while node is in table, it is always in exactly one of the two lists. So
it seems best to store a pointer to the current list within the node itself.
2024-05-28 18:13:03 +02:00
Chen Kai
5361160fd7 use id to send
Signed-off-by: Chen Kai <281165273grape@gmail.com>
2024-05-27 15:16:48 +08:00
Chen Kai
526ee8ad9e revert
Signed-off-by: Chen Kai <281165273grape@gmail.com>
2024-05-27 14:48:30 +08:00
Chen Kai
3ab51ce84f revert utp async
Signed-off-by: Chen Kai <281165273grape@gmail.com>
2024-05-27 09:32:04 +08:00
gitglorythegreat
64b1cd8aaf
p2p: fix typos (#29828) 2024-05-24 11:33:19 +02:00
Aaron Chen
61b3d93bb0
p2p/enode: fix TCPEndpoint (#29827) 2024-05-23 23:17:51 +02:00
Felix Lange
cc9e2bd9dd
p2p/enode: fix endpoint determination for IPv6 (#29801)
enode.Node has separate accessor functions for getting the IP, UDP port and TCP port.
These methods performed separate checks for attributes set in the ENR.

With this PR, the accessor methods will now return cached information, and the endpoint is
determined when the node is created. The logic to determine the preferred endpoint is now
more correct, and considers how 'global' each address is when both IPv4 and IPv6 addresses
are present in the ENR.
2024-05-23 14:27:03 +02:00
Felix Lange
6a9158bb1b
p2p/discover: improved node revalidation (#29572)
Node discovery periodically revalidates the nodes in its table by sending PING, checking
if they are still alive. I recently noticed some issues with the implementation of this
process, which can cause strange results such as nodes dropping unexpectedly, certain
nodes not getting revalidated often enough, and bad results being returned to incoming
FINDNODE queries.

In this change, the revalidation process is improved with the following logic:

- We maintain two 'revalidation lists' containing the table nodes, named 'fast' and 'slow'.
- The process chooses random nodes from each list on a randomized interval, the interval being
  faster for the 'fast' list, and performs revalidation for the chosen node.
- Whenever a node is newly inserted into the table, it goes into the 'fast' list.
  Once validation passes, it transfers to the 'slow' list. If a request fails, or the
  node changes endpoint, it transfers back into 'fast'.
- livenessChecks is incremented by one for successful checks. Unlike the old implementation,
  we will not drop the node on the first failing check. We instead quickly decay the
  livenessChecks give it another chance.
- Order of nodes in bucket doesn't matter anymore.

I am also adding a debug API endpoint to dump the node table content.

Co-authored-by: Martin HS <martin@swende.se>
2024-05-23 14:26:09 +02:00
thinkAfCod
0159c17f46 fix: handle utp packet in async 2024-05-20 10:48:58 +08:00
thinkAfCod
b12bed8bde fix: cache node id and add logs
fix: cache node info
2024-05-19 00:07:37 +08:00
thinkAfCod
a5fe113247 fix: connId repeats 2024-05-16 20:41:07 +08:00
qcloud
ec5865f6e3 fix: contentLookup and traceContentLookup 2024-05-16 09:43:16 +08:00
fearlessfe
0819e81eea chore: add more info in err log 2024-05-16 09:43:16 +08:00
Chen Kai
86247e1ea8
Merge branch 'ethereum:master' into portal 2024-05-08 11:32:47 +08:00
fearlessfe
bb0714d9a5 fix: panic 2024-05-06 23:53:09 +08:00
Kiarash Hajian
905e325cd8
p2p/discover/v5wire: add tests for invalid handshake and auth data size (#29708) 2024-05-06 13:17:19 +02:00
Chen Kai
e660629a78
Merge branch 'ethereum:master' into portal 2024-05-03 11:39:35 +08:00
Aaron Chen
8c3fc56d7f
p2p/simulations/adapters: use maps.Clone (#29626) 2024-04-29 19:44:41 +02:00
Chen Kai
a2efff93b1
Merge branch 'ethereum:master' into portal 2024-04-25 17:43:53 +08:00
Undefinedor
a13b92524d
eth/protocols/eth,p2p/discover: remove unnecessary checks (#29590)
fix useless condition
2024-04-25 08:40:29 +02:00
Chen Kai
ab764c159d
Merge branch 'ethereum:master' into portal 2024-04-21 20:26:14 +08:00
bugmaker9371
98f504f69f
p2p/discover: fix test error messages (#29592) 2024-04-21 11:13:36 +02:00
Chen Kai
3014734c46 fix:fix minor warn issues
Signed-off-by: Chen Kai <281165273grape@gmail.com>
2024-04-19 20:19:53 +08:00
fearlseefe
e97bca61ec fix: gossip in hive test 2024-04-18 20:01:03 +08:00
fearlseefe
2e2f44b615 feat: remove unused file 2024-04-17 18:29:33 +08:00
fearlessfe
9c0a5ccb74 feat: beacon start up 2024-04-17 18:29:33 +08:00
Chen Kai
79c769e635
Merge branch 'ethereum:master' into portal 2024-04-16 08:15:57 +08:00
Seungbae Yu
67422e2a56
p2p/nat: fix typos in comments (#29536) 2024-04-15 14:58:17 +02:00
Chen Kai
56462f1df9
Merge branch 'ethereum:master' into portal 2024-04-15 15:20:58 +08:00
Abirdcfly
b179b7b8e7
all: remove duplicate word in comments (#29531)
This change removes some duplicate words in in comments
2024-04-15 08:34:31 +02:00
Chen Kai
eb3206b1e1 feat:beacon network test
Signed-off-by: Chen Kai <281165273grape@gmail.com>
2024-04-15 09:37:39 +08:00
Chen Kai
c203f9ac8e
Merge branch 'ethereum:master' into portal 2024-04-09 20:02:33 +08:00
Bin
0bbd88bda0
all: use timer instead of time.After in loops, to avoid memleaks (#29241)
time.After is equivalent to NewTimer(d).C, and does not call Stop if the timer is no longer needed. This can cause memory leaks. This change changes many such occations to use NewTimer instead, and calling Stop once the timer is no longer needed.
2024-04-09 08:51:54 +02:00
Chen Kai
6edb2a29b3 feat:add lc bootstrap and update range
Signed-off-by: Chen Kai <281165273grape@gmail.com>
2024-04-07 15:28:59 +08:00
Chen Kai
f82ef2e241
Merge branch 'ethereum:master' into portal 2024-04-05 19:24:51 +08:00
cui
9dfe728909
p2p/discover: using slices.Contains (#29395) 2024-04-04 12:24:49 +02:00
cui
2e0c5e05ba
p2p/dnsdisc: using clear builtin func (#29418)
Co-authored-by: Felix Lange <fjl@twurst.com>
2024-04-04 12:19:48 +02:00
Chen Kai
bc7987bd91
Merge branch 'ethereum:master' into portal 2024-04-03 10:37:51 +08:00
Ng Wei Han
dfb3d46098
p2p: add inbound and outbound peers metric (#29424) 2024-04-02 21:18:28 +02:00
Chen Kai
5122e5a826 fix:resume udp timeout
Signed-off-by: Chen Kai <281165273grape@gmail.com>
2024-03-30 10:59:31 +08:00
Chen Kai
766d2d8ece
Merge branch 'ethereum:master' into portal 2024-03-29 10:09:47 +08:00
cui
3754a6cc92
p2p/dnsdisc: using maps.Copy (#29377) 2024-03-28 12:07:38 +01:00
Chen Kai
66de3b2898
Merge branch 'ethereum:master' into portal 2024-03-27 09:46:17 +08:00
fearlessfe
923ec257b4 feat: change method params
ContentLookup and TraceContentLookup method
2024-03-27 09:46:03 +08:00
Aaron Chen
723b1e36ad
all: fix mismatched names in comments (#29348)
* all: fix mismatched names in comments

* metrics: fix mismatched name in UpdateIfGt
2024-03-26 21:01:28 +01:00
Chen Kai
021ce2ece9 Merge branch 'master' into portal1 2024-03-25 17:14:10 +08:00
fearlessfe
6e23955304 feat: refactor storage interface 2024-03-25 17:09:04 +08:00
Martin HS
14cc967d19
all: remove dependency on golang.org/exp (#29314)
This change includes a leftovers from https://github.com/ethereum/go-ethereum/pull/29307
- using the [new `slices` package](https://go.dev/doc/go1.21#slices) and
- using the [new `cmp.Ordered`](https://go.dev/doc/go1.21#cmp) instead of exp `constraints.Ordered`
2024-03-25 07:50:18 +01:00
Chen Kai
7d720104d3
Merge branch 'ethereum:master' into portal 2024-03-22 21:19:56 +08:00
Martin HS
d9bde37ac3
log: use native log/slog instead of golang/exp (#29302) 2024-03-22 13:17:59 +01:00
Chen Kai
7c6d0d318d
Merge branch 'ethereum:master' into portal 2024-03-22 10:21:00 +08:00
Chen Kai
317997f25f feat:beacon rpc
Signed-off-by: Chen Kai <281165273grape@gmail.com>
2024-03-22 10:20:49 +08:00
Martin HS
14eb8967be
all: use min/max/clear from go1.21 (#29307) 2024-03-21 13:50:13 +01:00
Martin HS
33a2d825f7 all: update to go version 1.22.1 (#28946)
Since Go 1.22 has deprecated certain elliptic curve operations, this PR removes
references to the affected functions and replaces them with a custom implementation
in package crypto. This causes backwards-incompatible changes in some places.

---------

Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de>
Co-authored-by: Felix Lange <fjl@twurst.com>
2024-03-20 15:37:23 +08:00
fearlessfe
2b6c5eb292 feat: add cli and fix typ error 2024-03-19 19:40:32 +08:00