Merge branch 'main' into 1.1.1rc0

acapy_agent/ledger/indy_vdr.py

@@ -739,8 +739,11 @@ async def update_endpoint_for_did(
             if all_exist_endpoints
             else None
         )
+        existing_routing_keys = (
+            all_exist_endpoints.get("routingKeys") if all_exist_endpoints else None
+        )
 
-        if exist_endpoint_of_type != endpoint:
+        if exist_endpoint_of_type != endpoint or existing_routing_keys != routing_keys:
             if self.read_only:
                 raise LedgerError(
                     "Error cannot update endpoint when ledger is in read only mode"

docker/Dockerfile

@@ -14,7 +14,7 @@ ARG uid=1001
 ARG user=aries
 ARG acapy_name="aries-cloudagent"
 ARG acapy_version
-ARG acapy_reqs=[askar,didcommv2]
+ARG acapy_reqs=[didcommv2]
 
 ENV HOME="/home/$user" \
     APP_ROOT="$HOME" \

docker/Dockerfile.demo

@@ -15,7 +15,7 @@ RUN pip install --no-cache-dir poetry
 ADD README.md pyproject.toml poetry.lock ./
 
 ARG all_extras=0
-RUN if ! [ -z ${all_extras} ]; then poetry install --no-root --no-directory --all-extras; else poetry install --no-root --no-directory -E "askar didcommv2"; fi
+RUN if ! [ -z ${all_extras} ]; then poetry install --no-root --no-directory --all-extras; else poetry install --no-root --no-directory -E "didcommv2"; fi
 
 ADD acapy_agent ./acapy_agent
 ADD scripts ./scripts

docker/Dockerfile.run

@@ -19,7 +19,7 @@ ADD pyproject.toml poetry.lock README.md ./
 RUN mkdir -p log && chmod -R ug+rw log
 
 ARG all_extras=0
-RUN if ! [ -z ${all_extras} ]; then poetry install --all-extras; else poetry install -E "askar didcommv2"; fi
+RUN if ! [ -z ${all_extras} ]; then poetry install --all-extras; else poetry install -E "didcommv2"; fi
 
 ADD . .
 

docker/Dockerfile.test

@@ -15,7 +15,7 @@ ADD ./README.md pyproject.toml ./poetry.lock ./
 RUN mkdir acapy_agent && touch acapy_agent/__init__.py
 
 ARG all_extras=0
-RUN if ! [ -z ${all_extras} ]; then poetry install --no-directory --all-extras --with=dev; else poetry install --no-directory -E "askar didcommv2" --with=dev; fi
+RUN if ! [ -z ${all_extras} ]; then poetry install --no-directory --all-extras --with=dev; else poetry install --no-directory -E "didcommv2" --with=dev; fi
 
 ADD . .
 

pyproject.toml

@@ -52,12 +52,15 @@ did-peer-2 = "^0.1.2"
 did-peer-4 = "^0.1.4"
 did-tdw = "^0.2.1"
 
+# Verifiable Credentials
+indy-credx = "~1.1.1"
+anoncreds = "0.2.0"
 
 # askar
-aries-askar = { version = "~0.3.2", optional = true }
-indy-credx = { version = "~1.1.1", optional = true }
-indy-vdr = { version = "~0.4.0", optional = true }
-anoncreds = { version = "0.2.0", optional = true }
+aries-askar = "~0.3.2"
+
+# indy 
+indy-vdr = "~0.4.0"
 
 # bbs
 ursa-bbs-signatures = { version = "~1.0.1", optional = true }
@@ -87,7 +90,6 @@ pytest-xdist = "^3.6.1"
 debugpy = "^1.8.9"
 
 [tool.poetry.extras]
-askar = ["aries-askar", "indy-credx", "indy-vdr", "anoncreds"]
 bbs = ["ursa-bbs-signatures"]
 didcommv2 = ["didcomm-messaging"]