Merge branch 'main' into webvh-workshop

Author: PatStLouis

.github/workflows/codeql.yml

@@ -24,9 +24,9 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v3.29.5
+        uses: github/codeql-action/init@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v3.29.5
         with:
           languages: python
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v3.29.5
+        uses: github/codeql-action/analyze@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v3.29.5

.github/workflows/publish-docs.yml

@@ -22,7 +22,7 @@ jobs:
       - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
         with:
           python-version: 3.x
-      - uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
+      - uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
         with:
           key: ${{ github.ref }}
           path: .cache

.github/workflows/scorecard.yml

@@ -71,6 +71,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v3.29.5
+        uses: github/codeql-action/upload-sarif@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v3.29.5
         with:
           sarif_file: results.sarif

.github/workflows/snyk-lts.yml

@@ -52,6 +52,6 @@ jobs:
         sed -i 's/"security-severity": "null"/"security-severity": "0"/g' snyk.sarif
     
     - name: Upload result to GitHub Code Scanning
-      uses: github/codeql-action/upload-sarif@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v3.29.5
+      uses: github/codeql-action/upload-sarif@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v3.29.5
       with:
         sarif_file: snyk.sarif

.github/workflows/snyk.yml

@@ -45,6 +45,6 @@ jobs:
         sed -i 's/"security-severity": "null"/"security-severity": "0"/g' snyk.sarif
     
     - name: Upload result to GitHub Code Scanning
-      uses: github/codeql-action/upload-sarif@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v3.29.5
+      uses: github/codeql-action/upload-sarif@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v3.29.5
       with:
         sarif_file: snyk.sarif

acapy_agent/anoncreds/default/legacy_indy/registry.py

@@ -358,10 +358,25 @@ async def get_credential_definition(
                     {"ledger_id": ledger_id},
                 )
 
+            # Convert seqNo to schema_id if needed
+            schema_id_from_cred_def = cred_def["schemaId"]
+            if schema_id_from_cred_def.isdigit():
+                # schemaId is a seqNo, fetch the actual schema to get its ID
+                try:
+                    schema = await ledger.fetch_schema_by_seq_no(
+                        int(schema_id_from_cred_def)
+                    )
+                    if schema and schema.get("id"):
+                        schema_id_from_cred_def = schema["id"]
+                    # If schema is None or missing id, fall back to seqNo
+                except LedgerError:
+                    # If fetching fails, fall back to using seqNo as schemaId
+                    pass
+
             cred_def_value = CredDefValue.deserialize(cred_def["value"])
             anoncreds_credential_definition = CredDef(
                 issuer_id=cred_def["id"].split(":")[0],
-                schema_id=cred_def["schemaId"],
+                schema_id=schema_id_from_cred_def,
                 type=cred_def["type"],
                 tag=cred_def["tag"],
                 value=cred_def_value,

acapy_agent/anoncreds/events.py

@@ -8,6 +8,9 @@
 FIRST_REGISTRY_TAG = str(0)  # This tag is used to signify it is the first registry
 
 
+# Schema finished event
+SCHEMA_FINISHED_EVENT = "anoncreds::schema::finished"
+
 # Initial credential definition event, kicks off the revocation setup process
 CRED_DEF_FINISHED_EVENT = "anoncreds::credential-definition::finished"
 
@@ -102,6 +105,7 @@ class CredDefFinishedPayload(NamedTuple):
     issuer_id: str
     support_revocation: bool
     max_cred_num: int
+    tag: str
     options: dict
 
 
@@ -131,6 +135,7 @@ def with_payload(
         issuer_id: str,
         support_revocation: bool,
         max_cred_num: int,
+        tag: str,
         options: Optional[dict] = None,
     ):
         """With payload."""
@@ -140,6 +145,7 @@ def with_payload(
             issuer_id=issuer_id,
             support_revocation=support_revocation,
             max_cred_num=max_cred_num,
+            tag=tag,
             options=options or {},
         )
         return cls(payload)
@@ -150,6 +156,62 @@ def payload(self) -> CredDefFinishedPayload:
         return self._payload
 
 
+class SchemaFinishedPayload(NamedTuple):
+    """Payload of schema finished event."""
+
+    schema_id: str
+    issuer_id: str
+    name: str
+    version: str
+    attr_names: list
+    options: dict
+
+
+class SchemaFinishedEvent(Event):
+    """Event for schema finished."""
+
+    event_topic = SCHEMA_FINISHED_EVENT
+
+    def __init__(
+        self,
+        payload: SchemaFinishedPayload,
+    ):
+        """Initialize an instance.
+
+        Args:
+            payload: SchemaFinishedPayload
+
+        """
+        self._topic = self.event_topic
+        self._payload = payload
+
+    @classmethod
+    def with_payload(
+        cls,
+        schema_id: str,
+        issuer_id: str,
+        name: str,
+        version: str,
+        attr_names: list,
+        options: Optional[dict] = None,
+    ):
+        """With payload."""
+        payload = SchemaFinishedPayload(
+            schema_id=schema_id,
+            issuer_id=issuer_id,
+            name=name,
+            version=version,
+            attr_names=attr_names,
+            options=options or {},
+        )
+        return cls(payload)
+
+    @property
+    def payload(self) -> SchemaFinishedPayload:
+        """Return payload."""
+        return self._payload
+
+
 class RevRegDefFinishedPayload(NamedTuple):
     """Payload of rev reg def finished event."""
 

acapy_agent/anoncreds/issuer.py

@@ -33,7 +33,7 @@
     STATE_FINISHED,
 )
 from .error_messages import ANONCREDS_PROFILE_REQUIRED_MSG
-from .events import CredDefFinishedEvent
+from .events import CredDefFinishedEvent, SchemaFinishedEvent
 from .models.credential_definition import CredDef, CredDefResult
 from .models.schema import AnonCredsSchema, GetSchemaResult, SchemaResult, SchemaState
 from .registry import AnonCredsRegistry
@@ -156,6 +156,18 @@ async def store_schema(
                         "state": result.schema_state.state,
                     },
                 )
+
+            if result.schema_state.state == STATE_FINISHED:
+                await self.notify(
+                    SchemaFinishedEvent.with_payload(
+                        schema_id=result.schema_state.schema_id,
+                        issuer_id=result.schema_state.schema.issuer_id,
+                        name=result.schema_state.schema.name,
+                        version=result.schema_state.schema.version,
+                        attr_names=result.schema_state.schema.attr_names,
+                        options={},
+                    )
+                )
         except DBError as err:
             raise AnonCredsIssuerError("Error storing schema") from err
 
@@ -240,9 +252,25 @@ async def create_and_register_schema(
     async def finish_schema(self, job_id: str, schema_id: str) -> None:
         """Mark a schema as finished."""
         async with self.profile.transaction() as txn:
-            await self._finish_registration(txn, CATEGORY_SCHEMA, job_id, schema_id)
+            entry = await self._finish_registration(
+                txn, CATEGORY_SCHEMA, job_id, schema_id
+            )
             await txn.commit()
 
+        from .models.schema import AnonCredsSchema
+
+        schema = AnonCredsSchema.from_json(entry.value)
+        await self.notify(
+            SchemaFinishedEvent.with_payload(
+                schema_id=schema_id,
+                issuer_id=schema.issuer_id,
+                name=schema.name,
+                version=schema.version,
+                attr_names=schema.attr_names,
+                options={},
+            )
+        )
+
     async def get_created_schemas(
         self,
         name: Optional[str] = None,
@@ -434,13 +462,17 @@ async def store_credential_definition(
                 await txn.commit()
 
             if cred_def_result.credential_definition_state.state == STATE_FINISHED:
+                cred_def = (
+                    cred_def_result.credential_definition_state.credential_definition
+                )
                 await self.notify(
                     CredDefFinishedEvent.with_payload(
                         schema_id=schema_result.schema_id,
                         cred_def_id=identifier,
-                        issuer_id=cred_def_result.credential_definition_state.credential_definition.issuer_id,
+                        issuer_id=cred_def.issuer_id,
                         support_revocation=support_revocation,
                         max_cred_num=max_cred_num,
+                        tag=cred_def.tag,
                         options=options,
                     )
                 )
@@ -477,6 +509,7 @@ async def finish_cred_def(
                 issuer_id=cred_def.issuer_id,
                 support_revocation=support_revocation,
                 max_cred_num=max_cred_num,
+                tag=cred_def.tag,
                 options=options,
             )
         )