Kanon Storage

.devcontainer/post-install.sh

@@ -31,4 +31,5 @@ markers = [
     "postgres: Tests relating to the postgres storage plugin for Indy"]
 junit_family = "xunit1"
 asyncio_mode = auto
+asyncio_default_fixture_loop_scope = module
 EOF

.gitignore

@@ -193,4 +193,7 @@ _build/
 open-api/.build
 
 # devcontainer
-.pytest.ini
+.pytest.ini
+
+# test lock files
+acatest.lock

acapy_agent/anoncreds/error_messages.py

@@ -1,3 +1,5 @@
 """Error messages for anoncreds."""
 
-ANONCREDS_PROFILE_REQUIRED_MSG = "AnonCreds interface requires AskarAnonCreds profile"
+ANONCREDS_PROFILE_REQUIRED_MSG = (
+    "AnonCreds interface requires AskarAnonCreds or KanonAnonCreds profile"
+)

acapy_agent/anoncreds/holder.py

@@ -16,15 +16,14 @@
     W3cPresentation,
     create_link_secret,
 )
-from aries_askar import AskarError, AskarErrorCode
 from marshmallow import INCLUDE
 from pyld import jsonld
 from pyld.jsonld import JsonLdProcessor
 from uuid_utils import uuid4
 
-from ..askar.profile_anon import AskarAnonCredsProfile
 from ..core.error import BaseError
 from ..core.profile import Profile
+from ..database_manager.db_errors import DBCode, DBError
 from ..storage.vc_holder.base import VCHolder
 from ..storage.vc_holder.vc_record import VCRecord
 from ..vc.ld_proofs import DocumentLoader
@@ -78,11 +77,28 @@ def __init__(self, profile: Profile):
         self._profile = profile
 
     @property
-    def profile(self) -> AskarAnonCredsProfile:
+    def profile(self) -> Profile:
         """Accessor for the profile instance."""
-        if not isinstance(self._profile, AskarAnonCredsProfile):
+        # Check if profile is AskarAnonCredsProfile or KanonAnonCredsProfile
+        # by checking the backend attribute
+        if not isinstance(self._profile, Profile):
             raise ValueError(ANONCREDS_PROFILE_REQUIRED_MSG)
 
+        # Check if it's a supported anoncreds profile type
+        if hasattr(self._profile, "backend"):
+            backend = (
+                self._profile.backend.lower()
+                if isinstance(self._profile.backend, str)
+                else ""
+            )
+            if "anoncreds" not in backend and "kanon" not in backend:
+                raise ValueError(ANONCREDS_PROFILE_REQUIRED_MSG)
+        else:
+            # For AskarAnonCredsProfile, check the class name
+            class_name = self._profile.__class__.__name__
+            if "AnonCreds" not in class_name and "Kanon" not in class_name:
+                raise ValueError(ANONCREDS_PROFILE_REQUIRED_MSG)
+
         return self._profile
 
     async def get_master_secret(self) -> str:
@@ -93,7 +109,7 @@ async def get_master_secret(self) -> str:
                     record = await session.handle.fetch(
                         CATEGORY_MASTER_SECRET, AnonCredsHolder.MASTER_SECRET_ID
                     )
-                except AskarError as err:
+                except DBError as err:
                     raise AnonCredsHolderError("Error fetching master secret") from err
                 if record:
                     try:
@@ -116,8 +132,8 @@ async def get_master_secret(self) -> str:
                             AnonCredsHolder.MASTER_SECRET_ID,
                             secret,
                         )
-                    except AskarError as err:
-                        if err.code != AskarErrorCode.DUPLICATE:
+                    except DBError as err:
+                        if err.code not in DBCode.DUPLICATE:
                             raise AnonCredsHolderError(
                                 "Error saving master secret"
                             ) from err
@@ -270,7 +286,7 @@ async def _finish_store_credential(
                         value_json=mime_types,
                     )
                 await txn.commit()
-        except AskarError as err:
+        except DBError as err:
             raise AnonCredsHolderError("Error storing credential") from err
 
         return credential_id
@@ -393,7 +409,7 @@ async def get_credentials(self, *, offset: int, limit: int, wql: dict) -> list[d
             async for row in rows:
                 cred = Credential.load(row.raw_value)
                 result.append(_make_cred_info(row.name, cred))
-        except AskarError as err:
+        except DBError as err:
             raise AnonCredsHolderError("Error retrieving credentials") from err
         except AnoncredsError as err:
             raise AnonCredsHolderError("Error loading stored credential") from err
@@ -493,7 +509,7 @@ async def _get_credential(self, credential_id: str) -> Credential:
         try:
             async with self.profile.session() as session:
                 cred = await session.handle.fetch(CATEGORY_CREDENTIAL, credential_id)
-        except AskarError as err:
+        except DBError as err:
             raise AnonCredsHolderError("Error retrieving credential") from err
 
         if not cred:
@@ -555,7 +571,7 @@ async def delete_credential(self, credential_id: str) -> None:
                 await session.handle.remove(
                     AnonCredsHolder.RECORD_TYPE_MIME_TYPES, credential_id
                 )
-        except AskarError as err:
+        except DBError as err:
             raise AnonCredsHolderError(
                 "Error deleting credential", error_code=err.code
             ) from err
@@ -579,7 +595,7 @@ async def get_mime_type(
                     AnonCredsHolder.RECORD_TYPE_MIME_TYPES,
                     credential_id,
                 )
-        except AskarError as err:
+        except DBError as err:
             raise AnonCredsHolderError("Error retrieving credential mime types") from err
         values = mime_types_record and mime_types_record.value_json
         if values:

acapy_agent/anoncreds/issuer.py

@@ -15,12 +15,11 @@
     Schema,
     W3cCredential,
 )
-from aries_askar import AskarError
 
-from ..askar.profile_anon import AskarAnonCredsProfile, AskarAnonCredsProfileSession
 from ..core.error import BaseError
 from ..core.event_bus import Event, EventBus
-from ..core.profile import Profile
+from ..core.profile import Profile, ProfileSession
+from ..database_manager.db_errors import DBError
 from ..protocols.endorse_transaction.v1_0.util import is_author_role
 from .base import AnonCredsSchemaAlreadyExists, BaseAnonCredsError
 from .error_messages import ANONCREDS_PROFILE_REQUIRED_MSG
@@ -91,11 +90,28 @@ def __init__(self, profile: Profile):
         self._profile = profile
 
     @property
-    def profile(self) -> AskarAnonCredsProfile:
+    def profile(self) -> Profile:
         """Accessor for the profile instance."""
-        if not isinstance(self._profile, AskarAnonCredsProfile):
+        # Check if profile is AskarAnonCredsProfile or KanonAnonCredsProfile
+        # by checking the backend attribute
+        if not isinstance(self._profile, Profile):
             raise ValueError(ANONCREDS_PROFILE_REQUIRED_MSG)
 
+        # Check if it's a supported anoncreds profile type
+        if hasattr(self._profile, "backend"):
+            backend = (
+                self._profile.backend.lower()
+                if isinstance(self._profile.backend, str)
+                else ""
+            )
+            if "anoncreds" not in backend and "kanon" not in backend:
+                raise ValueError(ANONCREDS_PROFILE_REQUIRED_MSG)
+        else:
+            # For AskarAnonCredsProfile, check the class name
+            class_name = self._profile.__class__.__name__
+            if "AnonCreds" not in class_name and "Kanon" not in class_name:
+                raise ValueError(ANONCREDS_PROFILE_REQUIRED_MSG)
+
         return self._profile
 
     async def notify(self, event: Event) -> None:
@@ -105,7 +121,7 @@ async def notify(self, event: Event) -> None:
 
     async def _finish_registration(
         self,
-        txn: AskarAnonCredsProfileSession,
+        txn: ProfileSession,
         category: str,
         job_id: str,
         registered_id: str,
@@ -153,7 +169,7 @@ async def store_schema(
                         "state": result.schema_state.state,
                     },
                 )
-        except AskarError as err:
+        except DBError as err:
             raise AnonCredsIssuerError("Error storing schema") from err
 
     async def create_and_register_schema(
@@ -281,7 +297,7 @@ async def credential_definition_in_wallet(
                         CATEGORY_CRED_DEF_PRIVATE, credential_definition_id
                     )
                 ) is not None
-        except AskarError as err:
+        except DBError as err:
             raise AnonCredsIssuerError(
                 "Error checking for credential definition"
             ) from err
@@ -439,7 +455,8 @@ async def store_credential_definition(
                         options=options,
                     )
                 )
-        except AskarError as err:
+
+        except DBError as err:
             raise AnonCredsIssuerError("Error storing credential definition") from err
 
     async def finish_cred_def(
@@ -574,7 +591,7 @@ async def create_credential_offer(self, credential_definition_id: str) -> str:
                 key_proof = await session.handle.fetch(
                     CATEGORY_CRED_DEF_KEY_PROOF, credential_definition_id
                 )
-        except AskarError as err:
+        except DBError as err:
             raise AnonCredsIssuerError("Error retrieving credential definition") from err
         if not cred_def or not key_proof:
             raise AnonCredsIssuerError(
@@ -615,7 +632,7 @@ async def create_credential(
                 cred_def_private = await session.handle.fetch(
                     CATEGORY_CRED_DEF_PRIVATE, cred_def_id
                 )
-        except AskarError as err:
+        except DBError as err:
             raise AnonCredsIssuerError("Error retrieving credential definition") from err
 
         if not cred_def or not cred_def_private:
@@ -672,7 +689,7 @@ async def create_credential_w3c(
                 cred_def_private = await session.handle.fetch(
                     CATEGORY_CRED_DEF_PRIVATE, cred_def_id
                 )
-        except AskarError as err:
+        except DBError as err:
             raise AnonCredsIssuerError("Error retrieving credential definition") from err
 
         if not cred_def or not cred_def_private: