From 618559ee75332929f3c7a354b4d9d23ca85f5023 Mon Sep 17 00:00:00 2001 From: Chen Kai <281165273grape@gmail.com> Date: Sun, 2 Feb 2025 22:31:49 +0800 Subject: [PATCH] revert seq num to time Signed-off-by: Chen Kai <281165273grape@gmail.com> --- p2p/enode/localnode_test.go | 1 - p2p/enode/node.go | 41 ------------------------------------- p2p/enode/nodedb.go | 2 +- 3 files changed, 1 insertion(+), 43 deletions(-) diff --git a/p2p/enode/localnode_test.go b/p2p/enode/localnode_test.go index 5d33789f0c..86b962a74e 100644 --- a/p2p/enode/localnode_test.go +++ b/p2p/enode/localnode_test.go @@ -53,7 +53,6 @@ func TestLocalNode(t *testing.T) { // This test checks that the sequence number is persisted between restarts. func TestLocalNodeSeqPersist(t *testing.T) { - t.Skip("Skipping this test") timestamp := nowMilliseconds() ln, db := newLocalNodeForTesting() diff --git a/p2p/enode/node.go b/p2p/enode/node.go index 577d29e6a9..d6f2ac7ff5 100644 --- a/p2p/enode/node.go +++ b/p2p/enode/node.go @@ -159,47 +159,6 @@ func Parse(validSchemes enr.IdentityScheme, input string) (*Node, error) { return New(validSchemes, &r) } -// Portal network not filter multicast address, any other way to support this? -func ParseForAddEnr(validSchemes enr.IdentityScheme, input string) (*Node, error) { - if strings.HasPrefix(input, "enode://") { - return ParseV4(input) - } - if !strings.HasPrefix(input, "enr:") { - return nil, errMissingPrefix - } - bin, err := base64.RawURLEncoding.DecodeString(input[4:]) - if err != nil { - return nil, err - } - var r enr.Record - if err := rlp.DecodeBytes(bin, &r); err != nil { - return nil, err - } - var n *Node - if n, err = New(validSchemes, &r); err != nil { - return nil, err - } - var ip4 netip.Addr - var ip6 netip.Addr - n.Load((*enr.IPv4Addr)(&ip4)) - n.Load((*enr.IPv6Addr)(&ip6)) - valid4 := ip4.IsValid() - valid6 := ip6.IsValid() - switch { - case valid4 && valid6: - if localityScore(ip4) >= localityScore(ip6) { - n.setIP4(ip4) - } else { - n.setIP6(ip6) - } - case valid4: - n.setIP4(ip4) - case valid6: - n.setIP6(ip6) - } - return n, nil -} - // ID returns the node identifier. func (n *Node) ID() ID { return n.id diff --git a/p2p/enode/nodedb.go b/p2p/enode/nodedb.go index 9e213da9ee..51e554e68a 100644 --- a/p2p/enode/nodedb.go +++ b/p2p/enode/nodedb.go @@ -434,7 +434,7 @@ func (db *DB) localSeq(id ID) uint64 { if seq := db.fetchUint64(localItemKey(id, dbLocalSeq)); seq > 0 { return seq } - return 1 + return nowMilliseconds() } // storeLocalSeq stores the local record sequence counter.