diff --git a/demo/README.md b/demo/README.md index 9791504592..15128bdcb9 100644 --- a/demo/README.md +++ b/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,7 +404,7 @@ 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: @@ -412,6 +412,12 @@ An example full set of options is: ./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: diff --git a/demo/alice-local.sh b/demo/alice-local.sh index d24e50945e..babc85b491 100755 --- a/demo/alice-local.sh +++ b/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 \ diff --git a/demo/docker/docker-compose.yml b/demo/docker/docker-compose.yml index ed2c993854..bcec777fd0 100644 --- a/demo/docker/docker-compose.yml +++ b/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' \ diff --git a/demo/faber-local.sh b/demo/faber-local.sh index fcedc69bbf..7471c31b67 100755 --- a/demo/faber-local.sh +++ b/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 \ diff --git a/demo/features/0453-issue-credential.feature b/demo/features/0453-issue-credential.feature index 5e069862ec..0c74f53645 100644 --- a/demo/features/0453-issue-credential.feature +++ b/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 | | + | Bob | holder | | + And "Acme" and "Bob" have an existing connection + And "Bob" has an issued credential 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 | diff --git a/demo/features/0454-present-proof.feature b/demo/features/0454-present-proof.feature index a95686da00..9abece8cd1 100644 --- a/demo/features/0454-present-proof.feature +++ b/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 | diff --git a/demo/local-indy-args.yaml b/demo/local-indy-args.yaml index 204b04e3ea..60b0e4a91f 100644 --- a/demo/local-indy-args.yaml +++ b/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: diff --git a/demo/runners/support/agent.py b/demo/runners/support/agent.py index 74db9995af..07da797d0a 100644 --- a/demo/runners/support/agent.py +++ b/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 ) diff --git a/demo/runners/support/utils.py b/demo/runners/support/utils.py index 5f908a883e..63982d4437 100644 --- a/demo/runners/support/utils.py +++ b/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: