From 4d504221cbc0e91215fef6af221b108e7f87d726 Mon Sep 17 00:00:00 2001 From: Daniel Bluhm Date: Mon, 27 Jan 2025 11:59:17 -0600 Subject: [PATCH 1/4] fix: ensure profile names are unique Signed-off-by: Daniel Bluhm --- acapy_agent/askar/profile.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/acapy_agent/askar/profile.py b/acapy_agent/askar/profile.py index 2b5c8bfe62..e562ff88ff 100644 --- a/acapy_agent/askar/profile.py +++ b/acapy_agent/askar/profile.py @@ -42,7 +42,9 @@ def __init__( profile_id: Optional[str] = None, ): """Create a new AskarProfile instance.""" - super().__init__(context=context, name=opened.name, created=opened.created) + super().__init__( + context=context, name=profile_id or opened.name, created=opened.created + ) self.opened = opened self.ledger_pool: Optional[IndyVdrLedgerPool] = None self.profile_id = profile_id @@ -52,7 +54,7 @@ def __init__( @property def name(self) -> str: """Accessor for the profile name.""" - return self.opened.name + return self.profile_id or self.opened.name @property def store(self) -> Store: From d3cb5ee375f6cfe77f2846745a90950bab1fc74f Mon Sep 17 00:00:00 2001 From: Daniel Bluhm Date: Mon, 27 Jan 2025 16:06:18 -0600 Subject: [PATCH 2/4] fix: same fix for anon profile Signed-off-by: Daniel Bluhm --- acapy_agent/askar/profile_anon.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/acapy_agent/askar/profile_anon.py b/acapy_agent/askar/profile_anon.py index 9a3cb3e622..90c6e7a09d 100644 --- a/acapy_agent/askar/profile_anon.py +++ b/acapy_agent/askar/profile_anon.py @@ -44,7 +44,9 @@ def __init__( profile_id: Optional[str] = None, ): """Create a new AskarProfile instance.""" - super().__init__(context=context, name=opened.name, created=opened.created) + super().__init__( + context=context, name=profile_id or opened.name, created=opened.created + ) self.opened = opened self.ledger_pool: Optional[IndyVdrLedgerPool] = None self.profile_id = profile_id @@ -54,7 +56,7 @@ def __init__( @property def name(self) -> str: """Accessor for the profile name.""" - return self.opened.name + return self.profile_id or self.opened.name @property def store(self) -> Store: From bfccf38619d254b8c13ed6eb76e9bb9841c2e895 Mon Sep 17 00:00:00 2001 From: jamshale Date: Tue, 28 Jan 2025 19:21:07 +0000 Subject: [PATCH 3/4] Upgrade askar and did_webvh Signed-off-by: jamshale --- poetry.lock | 50 +++++++++++--------------------------------------- pyproject.toml | 4 ++-- 2 files changed, 13 insertions(+), 41 deletions(-) diff --git a/poetry.lock b/poetry.lock index 65fc4b0e53..f30d17d3e8 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,17 +1,5 @@ # This file is automatically @generated by Poetry 2.0.1 and should not be changed by hand. -[[package]] -name = "aiofiles" -version = "24.1.0" -description = "File support for asyncio." -optional = false -python-versions = ">=3.8" -groups = ["main"] -files = [ - {file = "aiofiles-24.1.0-py3-none-any.whl", hash = "sha256:b4ec55f4195e3eb5d7abd1bf7e061763e864dd4954231fb8539a0ef8bb8260e5"}, - {file = "aiofiles-24.1.0.tar.gz", hash = "sha256:22a075c9e5a3810f0c2e48f3008c94d68c65d763b9b03857924c99e57355166c"}, -] - [[package]] name = "aiohappyeyeballs" version = "2.4.4" @@ -232,21 +220,18 @@ yaml = ["PyYAML (>=3.10)"] [[package]] name = "aries-askar" -version = "0.3.2" +version = "0.4.2" description = "" optional = false python-versions = ">=3.6.3" groups = ["main"] files = [ - {file = "aries_askar-0.3.2-py3-none-macosx_10_9_universal2.whl", hash = "sha256:02ddbe1773ce72c57edafff5777a1337d4a678da7484596712949170fb3ca1dc"}, - {file = "aries_askar-0.3.2-py3-none-manylinux2014_aarch64.whl", hash = "sha256:176eebcf833bb9974a162fd931c8d67669e4f0145b351ce9cb1289fd2d5a345c"}, - {file = "aries_askar-0.3.2-py3-none-manylinux2014_x86_64.whl", hash = "sha256:63f9ab97db4778ced830a6d1135e1f8bd1ca564de27218bd114f1cffbd31b04c"}, - {file = "aries_askar-0.3.2-py3-none-win_amd64.whl", hash = "sha256:6b4253377d5ed167ed94790e49c58584b68f897d2541ac4bb18fd37e9264164b"}, + {file = "aries_askar-0.4.2-py3-none-macosx_10_9_universal2.whl", hash = "sha256:bd2dd4a3f9c25724de5685fc06e72d246acedb0e611201d1a21739ff83c0a5fa"}, + {file = "aries_askar-0.4.2-py3-none-manylinux2014_aarch64.whl", hash = "sha256:38df09770913ba21a23f6dc5848529cb3ccdf21a4ad2602f1d028f29ffe3e83a"}, + {file = "aries_askar-0.4.2-py3-none-manylinux2014_x86_64.whl", hash = "sha256:1ef586e6c68d54e983b0adc17c3e6c686494583984cb84b211e328bd934c0ed7"}, + {file = "aries_askar-0.4.2-py3-none-win_amd64.whl", hash = "sha256:f9f86568c107e5c37719ffd7f698c8a0c1bee0c937e9d053f1edd02a6e3f8590"}, ] -[package.dependencies] -cached-property = ">=1.5.2,<1.6.0" - [[package]] name = "async-timeout" version = "4.0.3" @@ -328,18 +313,6 @@ typing-validation = ">=1.1.0" [package.extras] dev = ["base58", "mypy", "pylint", "pytest", "pytest-cov"] -[[package]] -name = "cached-property" -version = "1.5.2" -description = "A decorator for caching properties in classes." -optional = false -python-versions = "*" -groups = ["main"] -files = [ - {file = "cached-property-1.5.2.tar.gz", hash = "sha256:9fa5755838eecbb2d234c3aa390bd80fbd3ac6b6869109bfc1b499f7bd89a130"}, - {file = "cached_property-1.5.2-py2.py3-none-any.whl", hash = "sha256:df4f613cf7ad9a588cc381aaf4a512d26265ecebd5eb9e1ba12f1319eb85a6a0"}, -] - [[package]] name = "cachetools" version = "5.5.0" @@ -921,20 +894,19 @@ base58 = ">=2.1.1" [[package]] name = "did-webvh" -version = "0.2.1" +version = "0.3.0" description = "This repository includes Python libraries for working with `did:webvh` (did:web + Verified History) DID documents and the underlying log format." optional = false -python-versions = "<4.0,>=3.10" +python-versions = "<4,>=3.10" groups = ["main"] files = [ - {file = "did_webvh-0.2.1-py3-none-any.whl", hash = "sha256:4c4a84d3c7bda8d82eed1cb181dea1fc0fe4c23d6fe65e3622ff7f61dd7688a3"}, - {file = "did_webvh-0.2.1.tar.gz", hash = "sha256:2e731a594d9b7ff509f70d2595f1435873985b29ce2a489e98ead1a872264892"}, + {file = "did_webvh-0.3.0-py3-none-any.whl", hash = "sha256:30a6b80e27a47631efc1ebd8b1731dce72230a279499f235a4d53ae72ac06d7c"}, + {file = "did_webvh-0.3.0.tar.gz", hash = "sha256:e71390280f2276651a40f18bb2a3cd8939de30a1d53f247536c539f80eb64fb5"}, ] [package.dependencies] -aiofiles = ">=24.1.0,<25.0.0" aiohttp = ">=3.10.5,<4.0.0" -aries-askar = ">=0.3.2,<0.4.0" +aries-askar = ">=0.3.2" base58 = ">=2.1.0,<2.2.0" jsoncanon = ">=0.2.3,<0.3.0" multiformats = ">=0.3.1,<0.4.0" @@ -3231,4 +3203,4 @@ didcommv2 = ["didcomm-messaging"] [metadata] lock-version = "2.1" python-versions = "^3.12" -content-hash = "6746da380149ae13b17400170c5a84a7481fe66bc809ae8edb075eddd1723abb" +content-hash = "77b8a72d0520fefe02941d3ae3633c089d8f5b79e0456e7b21e51c6effee477e" diff --git a/pyproject.toml b/pyproject.toml index 5b10c80fc2..c13174b366 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -50,14 +50,14 @@ uuid_utils = "^0.10.0" # did libraries did-peer-2 = "^0.1.2" did-peer-4 = "^0.1.4" -did-webvh = "^0.2.1" +did-webvh = ">=0.3.0" # Verifiable Credentials indy-credx = "~1.1.1" anoncreds = "0.2.0" # askar -aries-askar = "~0.3.2" +aries-askar = ">=0.4.2" # indy indy-vdr = "~0.4.0" From 6a7de75f5e8de242fec9ff8c804c92d907380770 Mon Sep 17 00:00:00 2001 From: jamshale Date: Wed, 29 Jan 2025 19:53:17 +0000 Subject: [PATCH 4/4] Update aries-askar to 0.4.3 Signed-off-by: jamshale --- poetry.lock | 12 ++++++------ pyproject.toml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/poetry.lock b/poetry.lock index f30d17d3e8..a03ae9106a 100644 --- a/poetry.lock +++ b/poetry.lock @@ -220,16 +220,16 @@ yaml = ["PyYAML (>=3.10)"] [[package]] name = "aries-askar" -version = "0.4.2" +version = "0.4.3" description = "" optional = false python-versions = ">=3.6.3" groups = ["main"] files = [ - {file = "aries_askar-0.4.2-py3-none-macosx_10_9_universal2.whl", hash = "sha256:bd2dd4a3f9c25724de5685fc06e72d246acedb0e611201d1a21739ff83c0a5fa"}, - {file = "aries_askar-0.4.2-py3-none-manylinux2014_aarch64.whl", hash = "sha256:38df09770913ba21a23f6dc5848529cb3ccdf21a4ad2602f1d028f29ffe3e83a"}, - {file = "aries_askar-0.4.2-py3-none-manylinux2014_x86_64.whl", hash = "sha256:1ef586e6c68d54e983b0adc17c3e6c686494583984cb84b211e328bd934c0ed7"}, - {file = "aries_askar-0.4.2-py3-none-win_amd64.whl", hash = "sha256:f9f86568c107e5c37719ffd7f698c8a0c1bee0c937e9d053f1edd02a6e3f8590"}, + {file = "aries_askar-0.4.3-py3-none-macosx_10_9_universal2.whl", hash = "sha256:fd4073f4abc7bfe423f3a637cb0d2e5fb1b96cfd0e798ee69e26eb5b9528c3e4"}, + {file = "aries_askar-0.4.3-py3-none-manylinux2014_aarch64.whl", hash = "sha256:a787fdbf343efcdb9f26ce75ed934c2d48378cef08ae5ce69e997cba7c3f1992"}, + {file = "aries_askar-0.4.3-py3-none-manylinux2014_x86_64.whl", hash = "sha256:e21025d841c861c20dbae6201863cb1fe76b395c2eec231835bf8703356bb157"}, + {file = "aries_askar-0.4.3-py3-none-win_amd64.whl", hash = "sha256:ea25cc6bed206a8df9c55b09ebead18edcb669740d1868d884ba88699dc95f67"}, ] [[package]] @@ -3203,4 +3203,4 @@ didcommv2 = ["didcomm-messaging"] [metadata] lock-version = "2.1" python-versions = "^3.12" -content-hash = "77b8a72d0520fefe02941d3ae3633c089d8f5b79e0456e7b21e51c6effee477e" +content-hash = "f507d1c1073d6c7a057d141aa7aab1ddfbc1cb1be69d0661fbd495b3bd81eda5" diff --git a/pyproject.toml b/pyproject.toml index c13174b366..fb2e01a94d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -57,7 +57,7 @@ indy-credx = "~1.1.1" anoncreds = "0.2.0" # askar -aries-askar = ">=0.4.2" +aries-askar = ">=0.4.3" # indy indy-vdr = "~0.4.0"