fix: update append announce addresses

We allow transports to update announce addresses to add certhashes
and other data but updating append announce addresses was missed.

Fixes #3080

Author: achingbrain

packages/libp2p/src/address-manager/index.ts

@@ -404,16 +404,25 @@ export class AddressManager implements AddressManagerInterface {
         .map(multiaddr => this.transportAddresses.get(multiaddr, this.addressVerificationTTL))
     )
 
+    const appendAnnounceMultiaddrs = this.getAppendAnnounceAddrs()
+
     // add append announce addresses
-    addresses = addresses.concat(
-      this.getAppendAnnounceAddrs().map(multiaddr => ({
-        multiaddr,
-        verified: true,
-        type: 'announce',
-        expires: Date.now() + this.addressVerificationTTL,
-        lastVerified: Date.now()
-      }))
-    )
+    if (appendAnnounceMultiaddrs.length > 0) {
+      // allow transports to add certhashes and other runtime information
+      this.components.transportManager.getListeners().forEach(listener => {
+        listener.updateAnnounceAddrs(appendAnnounceMultiaddrs)
+      })
+
+      addresses = addresses.concat(
+        appendAnnounceMultiaddrs.map(multiaddr => ({
+          multiaddr,
+          verified: true,
+          type: 'announce',
+          expires: Date.now() + this.addressVerificationTTL,
+          lastVerified: Date.now()
+        }))
+      )
+    }
 
     // add observed addresses
     addresses = addresses.concat(

packages/libp2p/test/addresses/address-manager.spec.ts

@@ -86,7 +86,9 @@ describe('Address Manager', () => {
   })
 
   it('should add appendAnnounce multiaddrs on get', () => {
-    const transportManager = stubInterface<TransportManager>()
+    const transportManager = stubInterface<TransportManager>({
+      getListeners: Sinon.stub().returns([])
+    })
     const am = new AddressManager({
       peerId,
       transportManager,
@@ -810,6 +812,60 @@ describe('Address Manager', () => {
       type: 'observed'
     }])
   })
+
+  it('should allow updating announce addresses', async () => {
+    const listener = stubInterface<Listener>({
+      updateAnnounceAddrs: Sinon.stub().returnsArg(0)
+    })
+
+    const am = new AddressManager({
+      peerId,
+      transportManager: stubInterface<TransportManager>({
+        getListeners: Sinon.stub().returns([
+          listener
+        ])
+      }),
+      peerStore,
+      events,
+      logger: defaultLogger()
+    }, {
+      announce: [
+        '/ip4/123.123.123.123/tcp/1234'
+      ]
+    })
+
+    expect(am.getAddresses()).to.have.lengthOf(1)
+    expect(listener.updateAnnounceAddrs.called).to.be.true()
+  })
+
+  it('should allow updating appendAnnounce addresses', async () => {
+    const listener = stubInterface<Listener>({
+      updateAnnounceAddrs: Sinon.stub().returnsArg(0)
+    })
+
+    const am = new AddressManager({
+      peerId,
+      transportManager: stubInterface<TransportManager>({
+        getAddrs: Sinon.stub().returns([
+          multiaddr('/ip4/127.0.0.1/tcp/1234'),
+          multiaddr('/ip4/192.168.1.123/tcp/1234')
+        ]),
+        getListeners: Sinon.stub().returns([
+          listener
+        ])
+      }),
+      peerStore,
+      events,
+      logger: defaultLogger()
+    }, {
+      appendAnnounce: [
+        '/ip4/123.123.123.123/tcp/1234'
+      ]
+    })
+
+    expect(am.getAddresses()).to.have.lengthOf(3)
+    expect(listener.updateAnnounceAddrs.called).to.be.true()
+  })
 })
 
 function mapAddress (addr: NodeAddress): Pick<NodeAddress, 'multiaddr' | 'verified' | 'type'> {