From 809050dbb0a3483e0a5c1137f6a918315d4132e7 Mon Sep 17 00:00:00 2001 From: Jason Syrotuck Date: Tue, 25 Jul 2023 09:29:49 -0700 Subject: [PATCH 1/9] update pydid Signed-off-by: Jason Syrotuck --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 36cd286..7da10ff 100644 --- a/setup.py +++ b/setup.py @@ -2,6 +2,6 @@ # TODO move remaining things setup( - install_requires=["base58~=2.1.0", "pydid~=0.3.5", "varint~=1.0.2"], + install_requires=["base58~=2.1.0", "pydid~=0.3.8", "varint~=1.0.2"], extras_require={"tests": ["pytest==6.2.5", "pytest-xdist==2.3.0"]}, ) From fb7c8f79627a8e446c31380e0e5dc483d02574f1 Mon Sep 17 00:00:00 2001 From: Jason Syrotuck Date: Tue, 25 Jul 2023 09:37:57 -0700 Subject: [PATCH 2/9] update pydid Signed-off-by: Jason Syrotuck --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 7da10ff..8418468 100644 --- a/setup.py +++ b/setup.py @@ -2,6 +2,6 @@ # TODO move remaining things setup( - install_requires=["base58~=2.1.0", "pydid~=0.3.8", "varint~=1.0.2"], + install_requires=["base58~=2.1.0", "pydid~=0.4", "varint~=1.0.2"], extras_require={"tests": ["pytest==6.2.5", "pytest-xdist==2.3.0"]}, ) From 510a0a03d59fbb2c9b27d5c57a340f317269a601 Mon Sep 17 00:00:00 2001 From: Jason Syrotuck Date: Tue, 25 Jul 2023 09:40:20 -0700 Subject: [PATCH 3/9] version Signed-off-by: Jason Syrotuck --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 8418468..fdd8e88 100644 --- a/setup.py +++ b/setup.py @@ -2,6 +2,6 @@ # TODO move remaining things setup( - install_requires=["base58~=2.1.0", "pydid~=0.4", "varint~=1.0.2"], + install_requires=["base58~=2.1.0", "pydid=0.4.0a0", "varint~=1.0.2"], extras_require={"tests": ["pytest==6.2.5", "pytest-xdist==2.3.0"]}, ) From d778bd00f6cf74ba614aff23a6126c2ef49a053c Mon Sep 17 00:00:00 2001 From: Jason Syrotuck Date: Tue, 25 Jul 2023 09:41:33 -0700 Subject: [PATCH 4/9] idk Signed-off-by: Jason Syrotuck --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index fdd8e88..9f1658b 100644 --- a/setup.py +++ b/setup.py @@ -2,6 +2,6 @@ # TODO move remaining things setup( - install_requires=["base58~=2.1.0", "pydid=0.4.0a0", "varint~=1.0.2"], + install_requires=["base58~=2.1.0", "pydid~==0.4.0a0", "varint~=1.0.2"], extras_require={"tests": ["pytest==6.2.5", "pytest-xdist==2.3.0"]}, ) From 653dda1e7bfd28b07529eeb55e16869dcbced1d0 Mon Sep 17 00:00:00 2001 From: Jason Syrotuck Date: Tue, 25 Jul 2023 09:42:55 -0700 Subject: [PATCH 5/9] syntax Signed-off-by: Jason Syrotuck --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 9f1658b..9ed3a4a 100644 --- a/setup.py +++ b/setup.py @@ -2,6 +2,6 @@ # TODO move remaining things setup( - install_requires=["base58~=2.1.0", "pydid~==0.4.0a0", "varint~=1.0.2"], + install_requires=["base58~=2.1.0", "pydid~=0.4.0a0", "varint~=1.0.2"], extras_require={"tests": ["pytest==6.2.5", "pytest-xdist==2.3.0"]}, ) From 43d92b4851d6e4c6ea383fb7a94d9a56bf47b599 Mon Sep 17 00:00:00 2001 From: Jason Syrotuck Date: Tue, 25 Jul 2023 09:46:30 -0700 Subject: [PATCH 6/9] remove version requirement Signed-off-by: Jason Syrotuck --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 9ed3a4a..1fc8010 100644 --- a/setup.py +++ b/setup.py @@ -2,6 +2,6 @@ # TODO move remaining things setup( - install_requires=["base58~=2.1.0", "pydid~=0.4.0a0", "varint~=1.0.2"], + install_requires=["base58~=2.1.0", "pydid", "varint~=1.0.2"], extras_require={"tests": ["pytest==6.2.5", "pytest-xdist==2.3.0"]}, ) From 6a3ca96d80b35afac16e88ed08847983ec5aaf1c Mon Sep 17 00:00:00 2001 From: Jason Syrotuck Date: Tue, 25 Jul 2023 09:49:21 -0700 Subject: [PATCH 7/9] no idea Signed-off-by: Jason Syrotuck --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 1fc8010..7da10ff 100644 --- a/setup.py +++ b/setup.py @@ -2,6 +2,6 @@ # TODO move remaining things setup( - install_requires=["base58~=2.1.0", "pydid", "varint~=1.0.2"], + install_requires=["base58~=2.1.0", "pydid~=0.3.8", "varint~=1.0.2"], extras_require={"tests": ["pytest==6.2.5", "pytest-xdist==2.3.0"]}, ) From 1da9b11e2c96c4ec86642cabc140825b34c53118 Mon Sep 17 00:00:00 2001 From: Jason Syrotuck Date: Tue, 25 Jul 2023 09:58:05 -0700 Subject: [PATCH 8/9] try this tag Signed-off-by: Jason Syrotuck --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 7da10ff..35c90c6 100644 --- a/setup.py +++ b/setup.py @@ -2,6 +2,6 @@ # TODO move remaining things setup( - install_requires=["base58~=2.1.0", "pydid~=0.3.8", "varint~=1.0.2"], + install_requires=["base58~=2.1.0", "pydid~=0.3.9a0", "varint~=1.0.2"], extras_require={"tests": ["pytest==6.2.5", "pytest-xdist==2.3.0"]}, ) From 278d878e928a6edac2e6700f0fba834e42f151e6 Mon Sep 17 00:00:00 2001 From: Jason Syrotuck Date: Wed, 16 Aug 2023 14:26:34 -0700 Subject: [PATCH 9/9] add did_peer_3 method Signed-off-by: Jason Syrotuck --- peerdid/dids.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/peerdid/dids.py b/peerdid/dids.py index 4e54099..5987f63 100644 --- a/peerdid/dids.py +++ b/peerdid/dids.py @@ -1,11 +1,10 @@ """Peer DID document generation and resolution.""" import re - +from hashlib import sha256 from typing import Optional, Sequence, Union from pydid import DID, DIDDocument, DIDDocumentBuilder, DIDUrl, InvalidDIDError - from .core.peer_did_helper import ( Numalgo2Prefix, ServiceJson, @@ -14,7 +13,8 @@ decode_service, ) from .errors import MalformedPeerDIDError -from .keys import KeyFormat, KeyRelationshipType, BaseKey + +from .keys import KeyFormat, KeyRelationshipType, BaseKey, to_multibase, MultibaseFormat PEER_DID_PATTERN = re.compile( r"^did:peer:(([0](z)([1-9a-km-zA-HJ-NP-Z]+))|(2((\.[AEVID](z)([1-9a-km-zA-HJ-NP-Z]+))+" @@ -187,3 +187,12 @@ def _build_did_doc_numalgo_2( raise MalformedPeerDIDError("Unknown prefix: {}.".format(prefix)) return builder.build() + + + +def gen_did_peer_3(peer_did_2 : Union[str,DID]) -> DID: + if not peer_did_2.startswith("did:peer:2"): + raise MalformedPeerDIDError("did:peer:2 expected") + + content = to_multibase(sha256(peer_did_2.lstrip("did:peer:2")),MultibaseFormat.BASE58) + return "did:peer:3"+content