fix: do not expire self multiaddrs (#3053)

Do not apply address/record expiry to the peer store entry for the
self peer.

Fixes #3051

Author: achingbrain

packages/peer-store/src/store.ts

@@ -100,12 +100,12 @@ export class PersistentStore {
     const buf = await this.datastore.get(key)
     const peer = PeerPB.decode(buf)
 
-    if (this.#peerIsExpired(peer)) {
+    if (this.#peerIsExpired(peerId, peer)) {
       await this.datastore.delete(key)
       throw new NotFoundError()
     }
 
-    return pbToPeer(peerId, peer, this.maxAddressAge)
+    return pbToPeer(peerId, peer, this.peerId.equals(peerId) ? Infinity : this.maxAddressAge)
   }
 
   async save (peerId: PeerId, data: PeerData): Promise<PeerUpdate> {
@@ -152,12 +152,12 @@ export class PersistentStore {
       const peer = PeerPB.decode(value)
 
       // remove expired peer
-      if (this.#peerIsExpired(peer)) {
+      if (this.#peerIsExpired(peerId, peer)) {
         await this.datastore.delete(key)
         continue
       }
 
-      yield pbToPeer(peerId, peer, this.maxAddressAge)
+      yield pbToPeer(peerId, peer, this.peerId.equals(peerId) ? Infinity : this.maxAddressAge)
     }
   }
 
@@ -168,7 +168,7 @@ export class PersistentStore {
       const peerPB = PeerPB.decode(buf)
 
       // remove expired peer
-      if (this.#peerIsExpired(peerPB)) {
+      if (this.#peerIsExpired(peerId, peerPB)) {
         await this.datastore.delete(key)
         throw new NotFoundError()
       }
@@ -198,11 +198,15 @@ export class PersistentStore {
     }
   }
 
-  #peerIsExpired (peer: PeerPB): boolean {
+  #peerIsExpired (peerId: PeerId, peer: PeerPB): boolean {
     if (peer.updated == null) {
       return true
     }
 
+    if (this.peerId.equals(peerId)) {
+      return false
+    }
+
     const expired = peer.updated < (Date.now() - this.maxPeerAge)
     const minAddressObserved = Date.now() - this.maxAddressAge
     const addrs = peer.addresses.filter(addr => {

packages/peer-store/test/index.spec.ts

@@ -315,6 +315,26 @@ describe('PersistentPeerStore', () => {
         .with.lengthOf(0, 'did not expire multiaddrs')
     })
 
+    it('should not expire self peer multiaddrs', async () => {
+      const peerStore = persistentPeerStore(components, {
+        maxAddressAge: 100
+      })
+
+      await peerStore.patch(components.peerId, {
+        multiaddrs: [
+          multiaddr('/ip4/123.123.123.123/tcp/1234')
+        ]
+      })
+
+      await expect(peerStore.get(components.peerId)).to.eventually.have.property('addresses')
+        .with.lengthOf(1)
+
+      await delay(500)
+
+      await expect(peerStore.get(components.peerId)).to.eventually.have.property('addresses')
+        .with.lengthOf(1, 'deleted own multiaddrs')
+    })
+
     it('should evict expired peers from .has', async () => {
       const peerStore = persistentPeerStore(components, {
         maxAddressAge: 50,