Merge branch 'main' into main

Author: swcurran

aries_cloudagent/indy/credx/holder.py

@@ -6,7 +6,7 @@
 import re
 import uuid
 
-from typing import Sequence, Tuple, Union
+from typing import Dict, Sequence, Tuple, Union
 
 from aries_askar import AskarError, AskarErrorCode
 from indy_credx import (
@@ -471,27 +471,26 @@ async def create_presentation(
 
         """
 
-        creds = {}
-
-        def get_rev_state(cred_id, timestamp):
-            reg_id = creds[cred_id].rev_reg_id
-            if not reg_id:
-                raise IndyHolderError(
-                    f"Cannot prove credential '{cred_id}' for "
-                    "specific timestamp, credential has no rev_reg_id"
-                )
-            if not rev_states or reg_id not in rev_states:
-                raise IndyHolderError(
-                    f"No revocation states provided for credential '{cred_id}'"
-                    f"with rev_reg_id '{reg_id}'"
-                )
-            state = rev_states[reg_id].get(timestamp)
-            if not state:
-                raise IndyHolderError(
-                    f"No revocation states provided for credential '{cred_id}'"
-                    f"with rev_reg_id '{reg_id}' at timestamp {timestamp}"
-                )
-            return state
+        creds: Dict[str, Credential] = {}
+
+        def get_rev_state(cred_id: str, detail: dict):
+            cred = creds[cred_id]
+            rev_reg_id = cred.rev_reg_id
+            timestamp = detail.get("timestamp") if rev_reg_id else None
+            rev_state = None
+            if timestamp:
+                if not rev_states or rev_reg_id not in rev_states:
+                    raise IndyHolderError(
+                        f"No revocation states provided for credential '{cred_id}' "
+                        f"with rev_reg_id '{rev_reg_id}'"
+                    )
+                rev_state = rev_states[rev_reg_id].get(timestamp)
+                if not rev_state:
+                    raise IndyHolderError(
+                        f"No revocation states provided for credential '{cred_id}' "
+                        f"with rev_reg_id '{rev_reg_id}' at timestamp {timestamp}"
+                    )
+            return timestamp, rev_state
 
         self_attest = requested_credentials.get("self_attested_attributes") or {}
         present_creds = PresentCredentials()
@@ -501,25 +500,26 @@ def get_rev_state(cred_id, timestamp):
             if cred_id not in creds:
                 # NOTE: could be optimized if multiple creds are requested
                 creds[cred_id] = await self._get_credential(cred_id)
-            timestamp = detail.get("timestamp")
+            timestamp, rev_state = get_rev_state(cred_id, detail)
             present_creds.add_attributes(
                 creds[cred_id],
                 reft,
                 reveal=detail["revealed"],
                 timestamp=timestamp,
-                rev_state=get_rev_state(cred_id, timestamp) if timestamp else None,
+                rev_state=rev_state,
             )
         req_preds = requested_credentials.get("requested_predicates") or {}
         for reft, detail in req_preds.items():
+            cred_id = detail["cred_id"]
             if cred_id not in creds:
                 # NOTE: could be optimized if multiple creds are requested
                 creds[cred_id] = await self._get_credential(cred_id)
-            timestamp = detail.get("timestamp")
+            timestamp, rev_state = get_rev_state(cred_id, detail)
             present_creds.add_predicates(
                 creds[cred_id],
                 reft,
                 timestamp=timestamp,
-                rev_state=get_rev_state(cred_id, timestamp) if timestamp else None,
+                rev_state=rev_state,
             )
 
         try:

demo/README.md

@@ -25,7 +25,7 @@ There are several demos available for ACA-Py mostly (but not only) aimed at deve
   - [Multi-ledger](#multi-ledger)
   - [DID Exchange](#did-exchange)
   - [Endorser](#endorser)
-  - [Run Askar Backend](#run-askar-backend)
+  - [Run Indy-SDK Backend](#run-indy-sdk-backend)
 - [Learning about the Alice/Faber code](#learning-about-the-alicefaber-code)
 - [OpenAPI (Swagger) Demo](#openapi-swagger-demo)
 - [Performance Demo](#performance-demo)
@@ -247,12 +247,12 @@ Note that you can't (currently) use the DID Exchange protocol to connect with an
 
 This is described in [Endorser.md](Endorser.md)
 
-### Run Askar Backend
+### Run Indy-SDK Backend
 
-This runs using the askar libraries instead of indy-sdk:
+This runs using the indy-sdk libraries instead of askar:
 
 ```bash
-./run_demo faber --wallet-type askar
+./run_demo faber --wallet-type indy
 ```
 
 ### Mediation
@@ -404,14 +404,20 @@ You can also run the demo against a postgres database using the following:
 
 (Obvs you need to be running a postgres database - the command to start postgres is in the yml file provided above.)
 
-You can tweak the number of credentials issued using the `--count` and `--batch` parameters, and you can run against an Askar database using the `--wallet-type askar` option.
+You can tweak the number of credentials issued using the `--count` and `--batch` parameters, and you can run against an Askar database using the `--wallet-type askar` option (or run using indy-sdk using `--wallet-type indy`).
 
 An example full set of options is:
 
 ```bash
 ./run_demo performance --arg-file demo/postgres-indy-args.yml -c 10000 -b 10 --wallet-type askar
 ```
 
+Or:
+
+```bash
+./run_demo performance --arg-file demo/postgres-indy-args.yml -c 10000 -b 10 --wallet-type indy
+```
+
 ## Coding Challenge: Adding ACME
 
 Now that you have a solid foundation in using ACA-Py, time for a coding challenge. In this challenge, we extend the Alice-Faber command line demo by adding in ACME Corp, a place where Alice wants to work. The demo adds:

demo/alice-local.sh

@@ -11,7 +11,7 @@ PYTHONPATH=.. ../bin/aca-py start \
    --outbound-transport http \
    --admin 0.0.0.0 8031 \
    --admin-insecure-mode \
-   --wallet-type indy \
+   --wallet-type askar \
    --wallet-name alice.agent420695 \
    --wallet-key alice.agent420695 \
    --preserve-exchange-records \

demo/docker/docker-compose.yml

@@ -36,7 +36,7 @@ services:
         --tails-server-base-url 'https://tails-test.vonx.io' \
         --notify-revocation \
         --monitor-revocation-notification \
-        --wallet-type 'indy' \
+        --wallet-type 'askar' \
         --wallet-name 'acapy_agent_wallet' \
         --wallet-key 'key' \
         --wallet-storage-type 'postgres_storage' \

demo/faber-local.sh

@@ -11,7 +11,7 @@ PYTHONPATH=.. ../bin/aca-py start \
    --outbound-transport http \
    --admin 0.0.0.0 8021 \
    --admin-insecure-mode \
-   --wallet-type indy \
+   --wallet-type askar \
    --wallet-name faber.agent916333 \
    --wallet-key faber.agent916333 \
    --preserve-exchange-records \

demo/features/0453-issue-credential.feature

@@ -54,5 +54,19 @@ Feature: RFC 0453 Aries agent issue credential
        | Acme_capabilities                        | Bob_capabilities  | Schema_name    | Credential_data          |
        | --revocation --public-did                |                   | driverslicense | Data_DL_NormalizedValues |
        | --revocation --public-did --did-exchange | --did-exchange    | driverslicense | Data_DL_NormalizedValues |
-       | --revocation --public-did --mediation    | --mediation       | driverslicense | Data_DL_NormalizedValues |
        | --revocation --public-did --multitenant  | --multitenant     | driverslicense | Data_DL_NormalizedValues |
+
+  @T004.1-RFC0453
+  Scenario Outline: Issue a credential with revocation, with the Issuer beginning with an offer, and then revoking the credential
+    Given we have "2" agents
+      | name  | role    | capabilities        |
+      | Acme  | issuer  | <Acme_capabilities> |
+      | Bob   | holder  | <Bob_capabilities>  |
+    And "Acme" and "Bob" have an existing connection
+    And "Bob" has an issued <Schema_name> credential <Credential_data> from "Acme"
+    Then "Acme" revokes the credential
+    And "Bob" has the credential issued
+
+    Examples:
+       | Acme_capabilities                        | Bob_capabilities  | Schema_name    | Credential_data          |
+       | --revocation --public-did --mediation    | --mediation       | driverslicense | Data_DL_NormalizedValues |

demo/features/0454-present-proof.feature

@@ -97,7 +97,7 @@ Feature: RFC 0454 Aries agent present proof
          | Acme   | --revocation --public-did --mediation      |                  | driverslicense_v2 | Data_DL_MaxValues | DL_age_over_19_v2 |
          | Acme   | --revocation --public-did --multitenant    | --multitenant    | driverslicense_v2 | Data_DL_MaxValues | DL_age_over_19_v2 |
 
-   @T003-RFC0454.1
+   @T003-RFC0454.1 @GHA
    Scenario Outline: Present Proof for multiple credentials where the one is revocable and one isn't
       Given we have "4" agents
          | name  | role     | capabilities         |
@@ -117,7 +117,7 @@ Feature: RFC 0454 Aries agent present proof
          | issuer1 | Acme1_capabilities        | issuer2 | Acme2_capabilities | Bob_cap | Schema_name_1     | Credential_data_1 | Schema_name_2 | Credential_data_2 | Proof_request                    |
          | Acme1   | --revocation --public-did | Acme2   | --public-did       |         | driverslicense_v2 | Data_DL_MaxValues | health_id     | Data_DL_MaxValues | DL_age_over_19_v2_with_health_id |
 
-   @T003-RFC0454.2
+   @T003-RFC0454.2 @GHA
    Scenario Outline: Present Proof for multiple credentials where the one is revocable and one isn't, and the revocable credential is revoked
       Given we have "4" agents
          | name  | role     | capabilities         |

demo/local-indy-args.yaml

@@ -25,7 +25,7 @@ auto-ping-connection: true
 #    curl -d '{"seed":"my_seed_000000000000000000000000", "role":"TRUST_ANCHOR", "alias":"My Agent"}' -X POST http://localhost:9000/register
 # note that the env var name is configured in argparse.py
 # seed = comes from ACAPY_WALLET_SEED
-wallet-type: indy
+wallet-type: askar
 wallet-name: testwallet
 # wallet-key = comes from ACAPY_WALLET_KEY
 # run a local postgres (docker) like:

demo/runners/support/agent.py

@@ -195,7 +195,7 @@ def __init__(
             else seed
         )
         self.storage_type = params.get("storage_type")
-        self.wallet_type = params.get("wallet_type") or "indy"
+        self.wallet_type = params.get("wallet_type") or "askar"
         self.wallet_name = (
             params.get("wallet_name") or self.ident.lower().replace(" ", "") + rand_name
         )

demo/runners/support/utils.py

@@ -235,7 +235,7 @@ def progress(*args, **kwargs):
 
 
 def check_requires(args):
-    wtype = args.wallet_type or "indy"
+    wtype = args.wallet_type or "askar"
 
     if wtype == "indy":
         try: