Merge branch 'master' into improve-cred-already-issued-error-msg

.github/workflows/continuous-deploy.yml

@@ -540,7 +540,7 @@ jobs:
       - name: Helmfile Destroy
         id: destroy_deployments
         if: github.event.inputs.run-reset-deployments == 'true'
-        uses: helmfile/[email protected].0
+        uses: helmfile/[email protected].2
         with:
           helmfile-args: |
             destroy \
@@ -625,7 +625,7 @@ jobs:
 
       - name: Helmfile Apply # Apply default Helmfile (without RDS proxy) when resetting deployments.
         if: github.event.inputs.run-reset-deployments == 'true'
-        uses: helmfile/[email protected].0
+        uses: helmfile/[email protected].2
         with:
           helmfile-args: |
             apply \
@@ -642,7 +642,7 @@ jobs:
 
       - name: Helmfile Apply (RDS Proxy)
         if: github.event.inputs.run-reset-deployments != 'true'
-        uses: helmfile/[email protected].0
+        uses: helmfile/[email protected].2
         with:
           helmfile-args: |
             apply \
@@ -745,7 +745,7 @@ jobs:
       - name: Helmfile init regression pytest
         if: github.event.inputs.run-reset-deployments == 'true' && github.event.inputs.run-regression-tests == 'true'
         id: pytest-init-regression
-        uses: helmfile/[email protected].0
+        uses: helmfile/[email protected].2
         with:
           helmfile-args: |
             apply \
@@ -768,7 +768,7 @@ jobs:
       - name: Helmfile run regression pytest
         if: ${{ github.event_name != 'workflow_dispatch' || (github.event_name == 'workflow_dispatch' && github.event.inputs.run-reset-deployments == 'false' && github.event.inputs.run-regression-tests == 'true') }}
         id: pytest-run-regression
-        uses: helmfile/[email protected].0
+        uses: helmfile/[email protected].2
         with:
           helmfile-args: |
             apply \
@@ -792,7 +792,7 @@ jobs:
       - name: Helmfile run pytest
         if: ${{ github.event_name != 'workflow_dispatch' || (github.event_name == 'workflow_dispatch' && github.event.inputs.run-tests != 'false') }}
         id: pytest
-        uses: helmfile/[email protected].0
+        uses: helmfile/[email protected].2
         with:
           helmfile-args: |
             apply \
@@ -977,7 +977,7 @@ jobs:
           hide-comment: ${{ github.event_name != 'pull_request' }}
 
       - name: Helmfile destroy pytest
-        uses: helmfile/[email protected].0
+        uses: helmfile/[email protected].2
         if: always()
         with:
           helmfile-args: |
@@ -993,7 +993,7 @@ jobs:
           IMAGE_TAG: ${{ needs.build.outputs.image_version }}
 
       - name: Helmfile destroy pytest regression
-        uses: helmfile/[email protected].0
+        uses: helmfile/[email protected].2
         if: always()
         with:
           helmfile-args: |

app/pyproject.toml

@@ -12,11 +12,11 @@ aiohttp = "~3.11.7"
 aries-cloudcontroller = "==1.1.1b3"
 base58 = "~2.1.1"
 fastapi = "~0.115.0"
-httpx = "~0.27.0"
+httpx = "~0.28.0"
 loguru = "~0.7.2"
 orjson = "~3.10.7"
-pydantic = "~2.9.0"
-pyjwt = "~2.9.0"
+pydantic = "~2.10.1"
+pyjwt = "~2.10.0"
 PyYAML = "~6.0.2"
 typing-extensions = "~4.12.0"
 uvicorn = "~0.32.1"

app/routes/wallet/credentials.py

@@ -233,14 +233,14 @@ async def get_credential_revocation_status(
 
 
 @router.get(
-    "/list/w3c",
+    "/w3c",
     response_model=VCRecordList,
     summary="Fetch a list of W3C credentials from the wallet",
 )
 async def list_w3c_credentials(
-    schema_ids: Optional[List[str]] = None,
-    issuer_did: Optional[str] = None,
     limit: Optional[int] = None,
+    issuer_did: Optional[str] = None,
+    schema_ids: Optional[List[str]] = None,
     auth: AcaPyAuth = Depends(acapy_auth_from_header),
 ) -> VCRecordList:
     """
@@ -251,12 +251,12 @@ async def list_w3c_credentials(
 
     Optional Parameters:
     ---
-        schema_ids: List[str]
-            Schema identifiers to match
-        issuer_did: str
-            Credential issuer did to match
         limit: int
             Maximum number of results to return
+        issuer_did: str
+            Credential issuer did to match
+        schema_ids: List[str]
+            Schema identifiers to match
 
     Returns:
     ---

app/tests/util/client.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict, Optional
+from typing import Any, Dict
 
 from aries_cloudcontroller import AcaPyClient
 from httpx import AsyncHTTPTransport
@@ -16,10 +16,9 @@
 )
 
 
-def get_common_settings(api_key: str, app: Optional[Any] = None) -> Dict[str, Any]:
+def get_common_settings(api_key: str) -> Dict[str, Any]:
     return {
         "timeout": TEST_CLIENT_TIMEOUT,
-        "app": app,
         "headers": {
             "x-api-key": api_key,
             "content-type": "application/json",
@@ -29,8 +28,8 @@ def get_common_settings(api_key: str, app: Optional[Any] = None) -> Dict[str, An
 
 
 # Governance Clients
-def get_governance_client(*, app: Optional[Any] = None) -> RichAsyncClient:
-    settings = get_common_settings(f"governance.{GOVERNANCE_ACAPY_API_KEY}", app)
+def get_governance_client() -> RichAsyncClient:
+    settings = get_common_settings(f"governance.{GOVERNANCE_ACAPY_API_KEY}")
     return RichAsyncClient(
         base_url=GOVERNANCE_FASTAPI_ENDPOINT, name="Governance", **settings
     )
@@ -41,8 +40,8 @@ def get_governance_acapy_client() -> AcaPyClient:
 
 
 # Tenant Admin Clients
-def get_tenant_admin_client(*, app: Optional[Any] = None) -> RichAsyncClient:
-    settings = get_common_settings(f"tenant-admin.{TENANT_ACAPY_API_KEY}", app)
+def get_tenant_admin_client() -> RichAsyncClient:
+    settings = get_common_settings(f"tenant-admin.{TENANT_ACAPY_API_KEY}")
     return RichAsyncClient(
         base_url=TENANT_ADMIN_FASTAPI_ENDPOINT, name="Tenant Admin", **settings
     )
@@ -53,10 +52,8 @@ def get_tenant_admin_acapy_client() -> AcaPyClient:
 
 
 # Tenant Clients
-def get_tenant_client(
-    *, token: str, app: Optional[Any] = None, name: str = ""
-) -> RichAsyncClient:
-    settings = get_common_settings(token, app)
+def get_tenant_client(*, token: str, name: str = "") -> RichAsyncClient:
+    settings = get_common_settings(token)
     return RichAsyncClient(
         base_url=TENANT_FASTAPI_ENDPOINT, name=f"Tenant {name}", **settings
     )

dockerfiles/agents/Dockerfile.agent

@@ -3,7 +3,7 @@ FROM ghcr.io/didx-xyz/acapy-agent-bbs:py3.12-1.1.1-20241115
 USER root
 
 # Install Google Protobuf
-ARG PROTOBUF_VERSION=5.28.3
+ARG PROTOBUF_VERSION=5.29.0
 RUN pip install --no-cache-dir protobuf==${PROTOBUF_VERSION}
 
 # install nats-events plugin

dockerfiles/agents/Dockerfile.author.agent

@@ -3,7 +3,7 @@ FROM ghcr.io/didx-xyz/acapy-agent-bbs:py3.12-1.1.1-20241115
 USER root
 
 # Install Google Protobuf
-ARG PROTOBUF_VERSION=5.28.3
+ARG PROTOBUF_VERSION=5.29.0
 RUN pip install --no-cache-dir protobuf==${PROTOBUF_VERSION}
 
 # Install wallet group id plugin