From 041ce1b7b319b2445475de110b3e045811832abf Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Mon, 22 Apr 2024 16:40:59 +0200
Subject: [PATCH] p2p/discover: fix addedAt time

---
 p2p/discover/node.go  | 14 ++++++++------
 p2p/discover/table.go | 17 +++++++++++------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/p2p/discover/node.go b/p2p/discover/node.go
index 99c9ad7abe..fdb85b1c8d 100644
--- a/p2p/discover/node.go
+++ b/p2p/discover/node.go
@@ -30,19 +30,21 @@ import (
 )
 
 type BucketNode struct {
-	Node    *enode.Node `json:"node"`
-	AddedAt time.Time   `json:"added"`
-	Checks  int         `json:"checks"`
-	Live    bool        `json:"live"`
+	Node        *enode.Node `json:"node"`
+	AddedTable  time.Time   `json:"addedToTable"`
+	AddedBucket time.Time   `json:"addedToBucket"`
+	Checks      int         `json:"checks"`
+	Live        bool        `json:"live"`
 }
 
 // node represents a host on the network.
 // The fields of Node may not be modified.
 type node struct {
 	*enode.Node
-	addedAt         time.Time // time when the node was added to the table
+	addedToTable    time.Time // first time node was added to bucket or replacement list
+	addedToBucket   time.Time // time it was added in the actual bucket
 	livenessChecks  uint      // how often liveness was checked
-	isValidatedLive bool
+	isValidatedLive bool      // true if existence of node is considered validated right now
 }
 
 type encPubkey [64]byte
diff --git a/p2p/discover/table.go b/p2p/discover/table.go
index 41b39d1aa8..24b3c7b686 100644
--- a/p2p/discover/table.go
+++ b/p2p/discover/table.go
@@ -164,10 +164,11 @@ func (tab *Table) Nodes() [][]BucketNode {
 		nodes[i] = make([]BucketNode, len(b.entries))
 		for j, n := range b.entries {
 			nodes[i][j] = BucketNode{
-				Node:    n.Node,
-				Checks:  int(n.livenessChecks),
-				Live:    n.isValidatedLive,
-				AddedAt: n.addedAt,
+				Node:        n.Node,
+				Checks:      int(n.livenessChecks),
+				Live:        n.isValidatedLive,
+				AddedTable:  n.addedToTable,
+				AddedBucket: n.addedToBucket,
 			}
 		}
 	}
@@ -511,7 +512,6 @@ func (tab *Table) handleAddNode(req addNodeRequest) {
 	// Add to bucket.
 	b.entries = append(b.entries, req.node)
 	b.replacements = deleteNode(b.replacements, req.node)
-	req.node.addedAt = time.Now()
 	tab.nodeAdded(b, req.node)
 }
 
@@ -524,6 +524,8 @@ func (tab *Table) addReplacement(b *bucket, n *node) {
 	if !tab.addIP(b, n.IP()) {
 		return
 	}
+
+	n.addedToTable = time.Now()
 	var removed *node
 	b.replacements, removed = pushNode(b.replacements, n, maxReplacements)
 	if removed != nil {
@@ -532,6 +534,10 @@ func (tab *Table) addReplacement(b *bucket, n *node) {
 }
 
 func (tab *Table) nodeAdded(b *bucket, n *node) {
+	if n.addedToTable == (time.Time{}) {
+		n.addedToTable = time.Now()
+	}
+	n.addedToBucket = time.Now()
 	tab.revalidation.nodeAdded(tab, n)
 	if tab.nodeAddedHook != nil {
 		tab.nodeAddedHook(b, n)
@@ -576,7 +582,6 @@ func (tab *Table) deleteInBucket(b *bucket, id enode.ID) *node {
 	b.replacements = slices.Delete(b.replacements, rindex, rindex+1)
 	b.entries = append(b.entries, rep)
 	tab.nodeAdded(b, rep)
-
 	tab.log.Debug("Replaced dead node", "b", b.index, "id", n.ID(), "ip", n.IP(), "r", rep.ID(), "rip", rep.IP())
 	return rep
 }