Merge pull request #122 from Indicio-tech/fix/anoncreds-build-adjustm…

…ents Fix/anoncreds build adjustments
Indicio-tech · May 5, 2023 · 56640e0 · 56640e0
2 parents 40f065b + c45170b
commit 56640e0
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 39 deletions.
diff --git a/anoncreds_test.py b/anoncreds_test.py
@@ -65,7 +65,7 @@ async def main():
             },
         )
         rev_status_list = await alice.post(
-            "/anoncreds/revocation-status-list",
+            "/anoncreds/revocation-list",
             json={
                 "revRegDefId": rev_reg_def["revocation_registry_definition_state"][
                     "revocation_registry_definition_id"

diff --git a/aries_cloudagent/anoncreds/default/legacy_indy/registry.py b/aries_cloudagent/anoncreds/default/legacy_indy/registry.py
@@ -383,8 +383,6 @@ async def register_revocation_registry_definition(
         rev_reg_def_id = self.make_rev_reg_def_id(revocation_registry_definition)
 
         try:
-            self._check_url(revocation_registry_definition.value.tails_location)
-
             # Translate anoncreds object to indy object
             indy_rev_reg_def = {
                 "ver": "1.0",

diff --git a/aries_cloudagent/anoncreds/holder.py b/aries_cloudagent/anoncreds/holder.py
@@ -12,10 +12,11 @@
     Credential,
     CredentialRequest,
     CredentialRevocationState,
-    MasterSecret,
     Presentation,
     PresentCredentials,
 )
+from anoncreds.bindings import create_link_secret
+
 from aries_askar import AskarError, AskarErrorCode
 
 from ..askar.profile import AskarProfile
@@ -71,7 +72,7 @@ def profile(self):
         """Accessor for the profile instance."""
         return self._profile
 
-    async def get_master_secret(self) -> MasterSecret:
+    async def get_master_secret(self) -> str:
         """Get or create the default master secret."""
 
         while True:
@@ -84,15 +85,15 @@ async def get_master_secret(self) -> MasterSecret:
                     raise AnonCredsHolderError("Error fetching master secret") from err
                 if record:
                     try:
-                        secret = MasterSecret.load(record.raw_value)
+                        secret = record.raw_value
                     except AnoncredsError as err:
                         raise AnonCredsHolderError(
                             "Error loading master secret"
                         ) from err
                     break
                 else:
                     try:
-                        secret = MasterSecret.create()
+                        secret = create_link_secret()
                     except AnoncredsError as err:
                         raise AnonCredsHolderError(
                             "Error creating master secret"
@@ -101,7 +102,7 @@ async def get_master_secret(self) -> MasterSecret:
                         await session.handle.insert(
                             CATEGORY_MASTER_SECRET,
                             AnonCredsHolder.MASTER_SECRET_ID,
-                            secret.to_json_buffer(),
+                            secret,
                         )
                     except AskarError as err:
                         if err.code != AskarErrorCode.DUPLICATE:

diff --git a/aries_cloudagent/anoncreds/issuer.py b/aries_cloudagent/anoncreds/issuer.py
@@ -15,7 +15,6 @@
     CredentialOffer,
     CredentialRevocationConfig,
     RevocationRegistryDefinition,
-    RevocationRegistryDelta,
     RevocationStatusList,
     Schema,
 )
@@ -1023,32 +1022,3 @@ async def revoke_credentials(
             curr=updated_list,
             failed=[str(rev_id) for rev_id in sorted(failed_crids)],
         )
-
-    async def merge_revocation_registry_deltas(
-        self, fro_delta: str, to_delta: str
-    ) -> str:
-        """
-        Merge revocation registry deltas.
-
-        Args:
-            fro_delta: original delta in JSON format
-            to_delta: incoming delta in JSON format
-
-        Returns:
-            Merged delta in JSON format
-
-        """
-
-        def update(d1, d2):
-            try:
-                delta = RevocationRegistryDelta.load(d1)
-                delta.update_with(d2)
-                return delta.to_json()
-            except AnoncredsError as err:
-                raise AnonCredsIssuerError(
-                    "Error merging revocation registry deltas"
-                ) from err
-
-        return await asyncio.get_event_loop().run_in_executor(
-            None, update, fro_delta, to_delta
-        )
diff --git a/aries_cloudagent/revocation/anoncreds.py b/aries_cloudagent/revocation/anoncreds.py
@@ -166,7 +166,9 @@ async def get_or_create_active_registry(
                 session, cred_def_id, {"$neq": IssuerRevRegRecord.STATE_FULL}
             )
             if not rev_reg_recs:
+                issuer_id = cred_def_id.split(":")[0]
                 await self.init_issuer_registry(
+                    issuer_id,
                     cred_def_id,
                     max_cred_num=max_cred_num,
                 )

diff --git a/aries_cloudagent/revocation/routes.py b/aries_cloudagent/revocation/routes.py
@@ -568,8 +568,9 @@ async def create_rev_reg(request: web.BaseRequest):
 
     try:
         revoc = AnonCredsRevocation(profile)
+        issuer_id = credential_definition_id.split(":")[0]
         issuer_rev_reg_rec = await revoc.init_issuer_registry(
-            # TODO: pass in issuer_id
+            issuer_id,
             credential_definition_id,
             max_cred_num=max_cred_num,
             notify=False,