Support non-directed address generation offload

bumble/device.py

@@ -1586,6 +1586,16 @@ async def refresh_resolving_list(self) -> None:
         if self.address_resolution_offload:
             await self.send_command(HCI_LE_Clear_Resolving_List_Command())
 
+            # Add an empty entry for non-directed address generation.
+            await self.send_command(
+                HCI_LE_Add_Device_To_Resolving_List_Command(
+                    peer_identity_address_type=Address.ANY.address_type,
+                    peer_identity_address=Address.ANY,
+                    peer_irk=bytes(16),
+                    local_irk=self.irk,
+                )
+            )
+
             for irk, address in resolving_keys:
                 await self.send_command(
                     HCI_LE_Add_Device_To_Resolving_List_Command(

bumble/smp.py

@@ -1991,12 +1991,19 @@ async def on_pairing(
     ) -> None:
         # Store the keys in the key store
         if self.device.keystore and identity_address is not None:
+            # Make sure on_pairing emits after key update.
             self.device.abort_on(
                 'flush', self.device.update_keys(str(identity_address), keys)
+            ).add_done_callback(
+                lambda *_: self.device.on_pairing(
+                    session.connection, identity_address, keys, session.sc
+                )
+            )
+        else:
+            # Notify the device
+            self.device.on_pairing(
+                session.connection, identity_address, keys, session.sc
             )
-
-        # Notify the device
-        self.device.on_pairing(session.connection, identity_address, keys, session.sc)
 
     def on_pairing_failure(self, session: Session, reason: int) -> None:
         self.device.on_pairing_failure(session.connection, reason)

bumble/utils.py

@@ -178,7 +178,7 @@ def close(self) -> None:
 
 
 class AbortableEventEmitter(EventEmitter):
-    def abort_on(self, event: str, awaitable: Awaitable[_T]) -> Awaitable[_T]:
+    def abort_on(self, event: str, awaitable: Awaitable[_T]) -> asyncio.Future[_T]:
         """
         Set a coroutine or future to abort when an event occur.
         """