feat: no indy

.github/workflows/tests.yml

@@ -5,15 +5,15 @@ on:
   pull_request:
 
 env:
-  POETRY_VERSION: 1.1.11
+  POETRY_VERSION: 1.3.2
 
 jobs:
   test:
     name: Tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.7, 3.8, 3.9]
 
     steps:
     - uses: actions/checkout@v2
@@ -52,7 +52,7 @@ jobs:
 
   int:
     name: Integration Tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
     - name: Run integration tests

acapy_plugin_toolbox/holder/v0_1/messages/cred_delete.py

@@ -1,7 +1,6 @@
 from typing import cast
 
 from aries_cloudagent.indy.holder import IndyHolder
-from aries_cloudagent.indy.sdk.holder import IndySdkHolder
 from aries_cloudagent.messaging.base_handler import BaseResponder, RequestContext
 from aries_cloudagent.messaging.models.base import BaseModelError
 from aries_cloudagent.messaging.valid import UUIDFour
@@ -41,7 +40,7 @@ def __init__(self, credential_exchange_id: str, **kwargs):
     async def handle(self, context: RequestContext, responder: BaseResponder):
         """Handle delete credential message."""
 
-        holder = cast(IndySdkHolder, context.inject(IndyHolder))
+        holder = context.inject(IndyHolder)
         async with context.session() as session:
             async with ExceptionReporter(
                 responder,

acapy_plugin_toolbox/holder/v0_1/messages/pres_get_matching_credentials.py

@@ -1,7 +1,6 @@
 from typing import cast
 
 from aries_cloudagent.indy.holder import IndyHolder
-from aries_cloudagent.indy.sdk.holder import IndySdkHolder
 from aries_cloudagent.messaging.base_handler import BaseResponder, RequestContext
 from aries_cloudagent.messaging.valid import UUIDFour
 from marshmallow import fields
@@ -44,7 +43,7 @@ def __init__(
     @log_handling
     @admin_only
     async def handle(self, context: RequestContext, responder: BaseResponder):
-        holder = cast(IndySdkHolder, context.inject(IndyHolder))
+        holder = context.inject(IndyHolder)
         async with context.session() as session:
             async with ExceptionReporter(
                 responder, InvalidPresentationExchange, context.message

demo/configs/alice.yml

@@ -46,7 +46,7 @@ auto-verify-presentation: true
 tails-server-base-url: http://tails-server:6543
 
 # Wallet
-wallet-type: indy
+wallet-type: askar
 wallet-key: "insecure, for use in demo only"
 auto-provision: true
 

demo/configs/bob.yml

@@ -46,7 +46,7 @@ auto-verify-presentation: true
 tails-server-base-url: http://tails-server:6543
 
 # Wallet
-wallet-type: indy
+wallet-type: askar
 wallet-key: "insecure, for use in demo only"
 auto-provision: true
 

demo/configs/common.yml

@@ -33,7 +33,7 @@ auto-respond-presentation-request: true
 auto-verify-presentation: true
 
 # Wallet
-wallet-type: indy
+wallet-type: askar
 wallet-key: "insecure, for use in demo only"
 auto-provision: true
 

demo/configs/default.yml

@@ -46,7 +46,7 @@ auto-verify-presentation: true
 
 # Wallet
 wallet-name: default
-wallet-type: indy
+wallet-type: askar
 wallet-key: "insecure, for use in demo only"
 auto-provision: true
 

demo/configs/mediator.yml

@@ -30,6 +30,6 @@ auto-ping-connection: true
 # Mediation
 open-mediation: true
 enable-undelivered-queue: true
-wallet-type: indy
+wallet-type: askar
 wallet-key: "insecure, for use in demo only"
-auto-provision: true
+auto-provision: true

docker/Dockerfile

@@ -1,8 +1,10 @@
-FROM bcgovimages/von-image:py36-1.16-0 AS base
+FROM python:3.7-slim AS base
+WORKDIR /usr/src/app
+
+RUN apt-get update && apt-get install -y curl
 
 # Install and Configure Poetry
-USER root
-ENV POETRY_VERSION=1.1.11
+ENV POETRY_VERSION=1.3.2
 ENV POETRY_HOME=/opt/poetry
 RUN curl -sSL https://install.python-poetry.org | python -
 
@@ -11,12 +13,13 @@ RUN poetry config virtualenvs.in-project true
 
 # Setup project
 RUN mkdir acapy_plugin_toolbox && touch acapy_plugin_toolbox/__init__.py
-COPY --chown=indy:indy pyproject.toml poetry.lock README.md ./
+COPY pyproject.toml poetry.lock README.md ./
 RUN poetry install --no-dev
 
-FROM bcgovimages/von-image:py36-1.16-0
-COPY --from=base --chown=indy:indy /home/indy/.venv /home/indy/.venv
-ENV PATH="/home/indy/.venv/bin:$PATH"
+FROM python:3.7-slim
+WORKDIR /usr/src/app
+COPY --from=base /usr/src/app/.venv /usr/src/app/.venv
+ENV PATH="/usr/src/app/.venv/bin:$PATH"
 
 COPY docker/default.yml ./
 COPY acapy_plugin_toolbox acapy_plugin_toolbox

int/docker-compose.yml

@@ -25,7 +25,7 @@ services:
       --admin 0.0.0.0 3001 --admin-insecure-mode
       --plugin acapy_plugin_toolbox
       --genesis-url https://raw.githubusercontent.com/Indicio-tech/indicio-network/master/genesis_files/pool_transactions_testnet_genesis
-      --wallet-type indy
+      --wallet-type askar
       --wallet-name default
       --wallet-key "insecure, for use in testing only"
       --auto-provision
@@ -35,7 +35,7 @@ services:
       --preserve-exchange-records
       --public-invites
     healthcheck:
-      test: curl -s -o /dev/null -w '%{http_code}' "http://localhost:3001/status/live" | grep "200" > /dev/null
+      test: python -c 'import sys; import urllib.request; sys.exit(0 if urllib.request.urlopen("http://localhost:3001/status/live").getcode() == 200 else 1)'
       start_period: 30s
       interval: 7s
       timeout: 5s
@@ -47,7 +47,7 @@ services:
       - "3002:3002"
     command: --host 0.0.0.0 --port 3002 --log-level debug
     healthcheck:
-      test: nc -z localhost 3002
+      test: nc -z 0.0.0.0 3002
       start_period: 5s
       interval: 1s
       timeout: 5s