feat: add base wallet route manager

Necessary for actions specific to just the base wallet for route
management tasks

Signed-off-by: Daniel Bluhm <dbluhm@pm.me>

Author: dbluhm

aries_cloudagent/multitenant/route_manager.py

@@ -11,7 +11,11 @@
 from ..protocols.coordinate_mediation.v1_0.models.mediation_record import (
     MediationRecord,
 )
-from ..protocols.coordinate_mediation.v1_0.route_manager import RouteManager
+from ..protocols.coordinate_mediation.v1_0.normalization import normalize_from_did_key
+from ..protocols.coordinate_mediation.v1_0.route_manager import (
+    CoordinateMediationV1RouteManager,
+    RouteManager,
+)
 from ..protocols.routing.v1_0.manager import RoutingManager
 from ..protocols.routing.v1_0.models.route_record import RouteRecord
 from ..storage.error import StorageNotFoundError
@@ -106,6 +110,10 @@ async def routing_info(
 
         return routing_keys, my_endpoint
 
+
+class BaseWalletRouteManager(CoordinateMediationV1RouteManager):
+    """Route manager for operations specific to the base wallet."""
+
     async def connection_from_recipient_key(
         self, profile: Profile, recipient_key: str
     ) -> ConnRecord:
@@ -117,9 +125,13 @@ async def connection_from_recipient_key(
         for sub wallets, we check the sub wallet's connections before the base
         wallet.
         """
-        manager = self.root_profile.inject(BaseMultitenantManager)
+        LOGGER.debug("Retrieving connection for recipient key for multitenant wallet")
+        manager = profile.inject(BaseMultitenantManager)
         profile_to_search = (
-            await manager.get_profile_for_key(profile.context, recipient_key) or profile
+            await manager.get_profile_for_key(
+                profile.context, normalize_from_did_key(recipient_key)
+            )
+            or profile
         )
 
         return await super().connection_from_recipient_key(

aries_cloudagent/multitenant/tests/test_route_manager.py

@@ -13,7 +13,7 @@
 from ...protocols.routing.v1_0.models.route_record import RouteRecord
 from ...storage.error import StorageNotFoundError
 from ..base import BaseMultitenantManager
-from ..route_manager import MultitenantRouteManager
+from ..route_manager import BaseWalletRouteManager, MultitenantRouteManager
 
 TEST_RECORD_VERKEY = "3Dn1SJNPaCXcvvJvSbsFWP2xaCjMom3can8CQNhWrTRx"
 TEST_VERKEY = "did:key:z6Mkgg342Ycpuk263R9d8Aq6MUaxPn1DDeHyGo38EefXmgDL"
@@ -57,6 +57,11 @@ def route_manager(root_profile: Profile, sub_profile: Profile, wallet_id: str):
     yield MultitenantRouteManager(root_profile)
 
 
+@pytest.fixture
+def base_route_manager(root_profile: Profile, sub_profile: Profile, wallet_id: str):
+    yield BaseWalletRouteManager(root_profile)
+
+
 @pytest.mark.asyncio
 async def test_route_for_key_sub_mediator_no_base_mediator(
     route_manager: MultitenantRouteManager,
@@ -366,7 +371,7 @@ async def test_routing_info_with_base_mediator_and_sub_mediator(
 
 @pytest.mark.asyncio
 async def test_connection_from_recipient_key(
-    sub_profile: Profile, route_manager: MultitenantRouteManager
+    sub_profile: Profile, base_route_manager: MultitenantRouteManager
 ):
     manager = mock.MagicMock()
     manager.get_profile_for_key = mock.CoroutineMock(return_value=sub_profile)

aries_cloudagent/protocols/coordinate_mediation/v1_0/handlers/keylist_update_response_handler.py

@@ -37,6 +37,10 @@ async def notify_keylist_updated(
     ):
         """Notify of keylist update response received."""
         route_manager = profile.inject(RouteManager)
+        self._logger.debug(
+            "Retrieving connection ID from route manager of type %s",
+            type(route_manager).__name__,
+        )
         try:
             key_to_connection = {
                 updated.recipient_key: await route_manager.connection_from_recipient_key(

aries_cloudagent/protocols/coordinate_mediation/v1_0/manager.py

@@ -538,6 +538,8 @@ async def store_update_results(
             session: An active profile session
 
         """
+        # TODO The stored recipient keys are did:key!
+
         to_save: Sequence[RouteRecord] = []
         to_remove: Sequence[RouteRecord] = []
 

aries_cloudagent/protocols/coordinate_mediation/v1_0/route_manager.py

@@ -253,8 +253,8 @@ async def connection_from_recipient_key(
         async with profile.session() as session:
             wallet = session.inject(BaseWallet)
             try:
-                conn = await ConnRecord.retrieve_by_invitation_key(
-                    session, invitation_key=normalize_from_did_key(recipient_key)
+                conn = await ConnRecord.retrieve_by_tag_filter(
+                    session, {"invitation_key": normalize_from_did_key(recipient_key)}
                 )
             except StorageNotFoundError:
                 did_info = await wallet.get_local_did_for_verkey(

aries_cloudagent/protocols/coordinate_mediation/v1_0/route_manager_provider.py

@@ -2,7 +2,10 @@
 from ....config.base import BaseInjector, BaseProvider, BaseSettings
 from ....core.profile import Profile
 from ....multitenant.base import BaseMultitenantManager
-from ....multitenant.route_manager import MultitenantRouteManager
+from ....multitenant.route_manager import (
+    MultitenantRouteManager,
+    BaseWalletRouteManager,
+)
 from .route_manager import CoordinateMediationV1RouteManager
 
 
@@ -19,8 +22,11 @@ def __init__(self, root_profile: Profile):
     def provide(self, settings: BaseSettings, injector: BaseInjector):
         """Create the appropriate route manager instance."""
         wallet_id = settings.get("wallet.id")
-        multitenant_mgr = injector.inject_or(BaseMultitenantManager)
-        if multitenant_mgr and wallet_id:
-            return MultitenantRouteManager(self.root_profile)
+        multitenant_mgr = self.root_profile.inject_or(BaseMultitenantManager)
+        if multitenant_mgr:
+            if wallet_id:
+                return MultitenantRouteManager(self.root_profile)
+            else:
+                return BaseWalletRouteManager()
 
         return CoordinateMediationV1RouteManager()