From 476e578be578346a10f2532931c617726faa58b2 Mon Sep 17 00:00:00 2001 From: Andrew Whitehead Date: Tue, 30 Jan 2024 14:26:07 -0800 Subject: [PATCH 1/3] Revert "Fix black issue" This reverts commit 03e28e5a61877a53571c4bbe0649a90c9705d580. Signed-off-by: Andrew Whitehead --- aries_cloudagent/vc/vc_ld/tests/test_vc_ld.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/aries_cloudagent/vc/vc_ld/tests/test_vc_ld.py b/aries_cloudagent/vc/vc_ld/tests/test_vc_ld.py index 1501eb7297..118b768631 100644 --- a/aries_cloudagent/vc/vc_ld/tests/test_vc_ld.py +++ b/aries_cloudagent/vc/vc_ld/tests/test_vc_ld.py @@ -269,9 +269,7 @@ async def test_sign_presentation_bbsbls(self): ) assert unsigned_presentation == PRESENTATION_UNSIGNED - unsigned_presentation["@context"].append( - "https://w3c.github.io/vc-di-bbs/contexts/v1" - ) + unsigned_presentation["@context"].append("https://w3c.github.io/vc-di-bbs/contexts/v1") _ = await sign_presentation( presentation=unsigned_presentation, suite=suite, From 43d6452050dc5de75a9e49e9251be9e7cce374f3 Mon Sep 17 00:00:00 2001 From: Andrew Whitehead Date: Tue, 30 Jan 2024 14:26:15 -0800 Subject: [PATCH 2/3] Revert "Update BBS+ context to bypass redirections" This reverts commit 8733ef5f59a9cc7173399691e1b114b026c2ed75. Signed-off-by: Andrew Whitehead --- JsonLdCredentials.md | 6 ++-- .../ld_proof/models/tests/test_cred_detail.py | 2 +- .../present_proof/dif/pres_request_schema.py | 2 +- .../present_proof/dif/tests/test_data.py | 36 +++++++++---------- .../present_proof/dif/tests/test_pres_exch.py | 2 +- .../dif/tests/test_pres_exch_handler.py | 14 ++++---- .../v2_0/formats/dif/tests/test_handler.py | 8 ++--- .../v2_0/messages/tests/test_pres.py | 4 +-- aries_cloudagent/vc/ld_proofs/constants.py | 2 +- .../suites/bbs_bls_signature_2020_base.py | 2 +- .../vc/ld_proofs/tests/test_check.py | 6 ++-- .../vc/ld_proofs/tests/test_doc.py | 8 ++--- ...bs_nested_vc_full_reveal_document_mattr.py | 2 +- .../vc/tests/data/bbs_nested_vc_mattr.py | 2 +- .../bbs_nested_vc_reveal_document_mattr.py | 2 +- .../data/bbs_partial_proof_nested_vc_mattr.py | 2 +- .../tests/data/bbs_partial_proof_vc_mattr.py | 2 +- .../tests/data/bbs_proof_nested_vc_mattr.py | 2 +- .../vc/tests/data/bbs_proof_vc_mattr.py | 2 +- .../tests/data/bbs_signed_nested_vc_mattr.py | 2 +- .../vc/tests/data/bbs_signed_vc_mattr.py | 2 +- .../vc/tests/data/bbs_vc_mattr.py | 2 +- .../data/bbs_vc_reveal_document_mattr.py | 2 +- .../vc/tests/data/test_ld_document.py | 2 +- .../data/test_ld_document_bad_signed_bbs.py | 2 +- .../test_ld_document_bad_signed_ed25519.py | 2 +- ...est_ld_document_bad_signed_ed25519_2020.py | 2 +- .../test_ld_document_partial_proof_bbs.py | 2 +- .../vc/tests/data/test_ld_document_reveal.py | 2 +- .../tests/data/test_ld_document_signed_bbs.py | 2 +- .../data/test_ld_document_signed_ed25519.py | 2 +- .../test_ld_document_signed_ed25519_2020.py | 2 +- .../vc/tests/data/test_vc_document.py | 2 +- .../vc/tests/data/test_vc_document_nested.py | 2 +- ...st_vc_document_nested_partial_proof_bbs.py | 2 +- .../data/test_vc_document_nested_proof_bbs.py | 2 +- .../data/test_vc_document_nested_reveal.py | 2 +- .../test_vc_document_nested_signed_bbs.py | 2 +- .../test_vc_document_partial_proof_bbs.py | 2 +- .../vc/tests/data/test_vc_document_reveal.py | 2 +- .../tests/data/test_vc_document_signed_bbs.py | 2 +- .../data/test_vc_document_signed_ed25519.py | 2 +- .../test_vc_document_signed_ed25519_2020.py | 2 +- .../vc/vc_ld/models/tests/test_credential.py | 2 +- .../vc/vc_ld/tests/test_credential.py | 4 +-- aries_cloudagent/vc/vc_ld/tests/test_vc_ld.py | 2 +- demo/AliceWantsAJsonCredential.md | 4 +-- .../cred_data_schema_driverslicense_v2.json | 2 +- demo/runners/faber.py | 2 +- open-api/openapi.json | 2 +- open-api/swagger.json | 2 +- 51 files changed, 87 insertions(+), 87 deletions(-) diff --git a/JsonLdCredentials.md b/JsonLdCredentials.md index e1f13bdc38..728608ee5f 100644 --- a/JsonLdCredentials.md +++ b/JsonLdCredentials.md @@ -45,7 +45,7 @@ It is required that every property key in the document can be mapped to an IRI. > "\ attributes dropped. Provide definitions in context to correct. [\]" -For credentials the `https://www.w3.org/2018/credentials/v1` context MUST always be the first context. In addition, when issuing BBS+ credentials the `https://w3c.github.io/vc-di-bbs/contexts/v1` URL MUST be present in the context. For convenience this URL will be automatically added to the `@context` of the credential if not present. +For credentials the `https://www.w3.org/2018/credentials/v1` context MUST always be the first context. In addition, when issuing BBS+ credentials the `https://w3id.org/security/bbs/v1` URL MUST be present in the context. For convenience this URL will be automatically added to the `@context` of the credential if not present. ```json { @@ -168,7 +168,7 @@ Call the `/credentials/w3c` endpoint to retrieve all JSON-LD credentials in your "contexts": [ "https://www.w3.org/2018/credentials/examples/v1", "https://www.w3.org/2018/credentials/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1" + "https://w3id.org/security/bbs/v1" ], "types": ["UniversityDegreeCredential", "VerifiableCredential"], "schema_ids": [], @@ -179,7 +179,7 @@ Call the `/credentials/w3c` endpoint to retrieve all JSON-LD credentials in your "@context": [ "https://www.w3.org/2018/credentials/v1", "https://www.w3.org/2018/credentials/examples/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1" + "https://w3id.org/security/bbs/v1" ], "type": ["VerifiableCredential", "UniversityDegreeCredential"], "issuer": "did:key:zUC7FsmhhifDTuYXdwYES2UpCpWwYieJRapC6oEWqyt5KfJ3ztfLzYnbWjuXQ5drYaKaho3FjxrfDB81gtAJKjbM4yAmBuNoj3YKDXqW151KkkYarpEoEVWMMcN5zPfjCrQ8Saj", diff --git a/aries_cloudagent/protocols/issue_credential/v2_0/formats/ld_proof/models/tests/test_cred_detail.py b/aries_cloudagent/protocols/issue_credential/v2_0/formats/ld_proof/models/tests/test_cred_detail.py index ba31cda3a0..e50ca43562 100644 --- a/aries_cloudagent/protocols/issue_credential/v2_0/formats/ld_proof/models/tests/test_cred_detail.py +++ b/aries_cloudagent/protocols/issue_credential/v2_0/formats/ld_proof/models/tests/test_cred_detail.py @@ -16,7 +16,7 @@ "@context": [ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/citizenship/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "id": "https://issuer.oidp.uscis.gov/credentials/83627465", "type": ["VerifiableCredential", "PermanentResidentCard"], diff --git a/aries_cloudagent/protocols/present_proof/dif/pres_request_schema.py b/aries_cloudagent/protocols/present_proof/dif/pres_request_schema.py index 17809f6cfd..2f0bec6cf0 100644 --- a/aries_cloudagent/protocols/present_proof/dif/pres_request_schema.py +++ b/aries_cloudagent/protocols/present_proof/dif/pres_request_schema.py @@ -85,7 +85,7 @@ class DIFPresSpecSchema(OpenAPISchema): "example": { "@context": [ "https://www.w3.org/2018/credentials/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "type": ["VerifiableCredential", "LabReport"], "@explicit": True, diff --git a/aries_cloudagent/protocols/present_proof/dif/tests/test_data.py b/aries_cloudagent/protocols/present_proof/dif/tests/test_data.py index 63d9e69221..eaa4661cab 100644 --- a/aries_cloudagent/protocols/present_proof/dif/tests/test_data.py +++ b/aries_cloudagent/protocols/present_proof/dif/tests/test_data.py @@ -326,7 +326,7 @@ def create_vcrecord(cred_dict: dict, expanded_types: list): "@context": [ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/citizenship/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "type": ["VerifiableCredential", "PermanentResidentCard"], "issuer": "did:key:zUC72Q7XD4PE4CrMiDVXuvZng3sBvMmaGgNeTUJuzavH2BS7ThbHL9FhsZM9QYY5fqAQ4MB8M9oudz3tfuaX36Ajr97QRW7LBt6WWmrtESe6Bs5NYzFtLWEmeVtvRYVAgjFcJSa", @@ -365,7 +365,7 @@ def create_vcrecord(cred_dict: dict, expanded_types: list): "@context": [ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/citizenship/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "type": ["VerifiableCredential", "PermanentResidentCard"], "issuer": "did:key:zUC72Q7XD4PE4CrMiDVXuvZng3sBvMmaGgNeTUJuzavH2BS7ThbHL9FhsZM9QYY5fqAQ4MB8M9oudz3tfuaX36Ajr97QRW7LBt6WWmrtESe6Bs5NYzFtLWEmeVtvRYVAgjFcJSa", @@ -407,7 +407,7 @@ def create_vcrecord(cred_dict: dict, expanded_types: list): "@context": [ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/citizenship/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "id": "https://issuer.oidp.uscis.gov/credentials/83627465", "type": ["VerifiableCredential", "PermanentResidentCard"], @@ -448,7 +448,7 @@ def create_vcrecord(cred_dict: dict, expanded_types: list): "@context": [ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/citizenship/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "credentialSubject": { "birthCountry": "Bahamas", @@ -479,7 +479,7 @@ def create_vcrecord(cred_dict: dict, expanded_types: list): "@context": [ "https://www.w3.org/2018/credentials/v1", "https://www.w3.org/2018/credentials/examples/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "id": "https://example.gov/credentials/3732", "type": ["VerifiableCredential", "UniversityDegreeCredential"], @@ -514,7 +514,7 @@ def create_vcrecord(cred_dict: dict, expanded_types: list): "@context": [ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/citizenship/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "id": "https://issuer.oidp.uscis.gov/credentials/83627465", "type": ["VerifiableCredential", "PermanentResidentCard"], @@ -556,7 +556,7 @@ def create_vcrecord(cred_dict: dict, expanded_types: list): "@context": [ "https://www.w3.org/2018/credentials/v1", "https://www.w3.org/2018/credentials/examples/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "id": "https://example.gov/credentials/3732", "type": ["VerifiableCredential", "UniversityDegreeCredential"], @@ -592,7 +592,7 @@ def create_vcrecord(cred_dict: dict, expanded_types: list): "@context": [ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/citizenship/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "id": "https://issuer.oidp.uscis.gov/credentials/83627465", "type": ["VerifiableCredential", "PermanentResidentCard"], @@ -635,7 +635,7 @@ def create_vcrecord(cred_dict: dict, expanded_types: list): "@context": [ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/citizenship/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "id": "https://issuer.oidp.uscis.gov/credentials/83627466", "type": ["VerifiableCredential", "PermanentResidentCard"], @@ -678,7 +678,7 @@ def create_vcrecord(cred_dict: dict, expanded_types: list): "@context": [ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/citizenship/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "id": "https://issuer.oidp.uscis.gov/credentials/83627467", "type": ["VerifiableCredential", "PermanentResidentCard"], @@ -849,7 +849,7 @@ def create_vcrecord(cred_dict: dict, expanded_types: list): "@context": [ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/citizenship/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "id": "https://issuer.oidp.uscis.gov/credentials/83627465", "type": ["VerifiableCredential", "PermanentResidentCard"], @@ -885,7 +885,7 @@ def create_vcrecord(cred_dict: dict, expanded_types: list): "@context": [ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/citizenship/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "id": "https://issuer.oidp.uscis.gov/credentials/83627466", "type": ["VerifiableCredential", "PermanentResidentCard"], @@ -921,7 +921,7 @@ def create_vcrecord(cred_dict: dict, expanded_types: list): "@context": [ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/citizenship/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "id": "https://issuer.oidp.uscis.gov/credentials/83627467", "type": ["VerifiableCredential", "PermanentResidentCard"], @@ -957,7 +957,7 @@ def create_vcrecord(cred_dict: dict, expanded_types: list): "@context": [ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/citizenship/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "id": "https://issuer.oidp.uscis.gov/credentials/83627468", "type": ["VerifiableCredential", "PermanentResidentCard"], @@ -993,7 +993,7 @@ def create_vcrecord(cred_dict: dict, expanded_types: list): "@context": [ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/citizenship/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "id": "https://issuer.oidp.uscis.gov/credentials/83627469", "type": ["VerifiableCredential", "PermanentResidentCard"], @@ -1029,7 +1029,7 @@ def create_vcrecord(cred_dict: dict, expanded_types: list): "@context": [ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/citizenship/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "id": "https://issuer.oidp.uscis.gov/credentials/83627470", "type": ["VerifiableCredential", "PermanentResidentCard"], @@ -1748,7 +1748,7 @@ def create_vcrecord(cred_dict: dict, expanded_types: list): TEST_CRED_DICT = { "@context": [ "https://www.w3.org/2018/credentials/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", { "MedicalPass": { "@id": "https://www.vdel.com/MedicalPass", @@ -1797,7 +1797,7 @@ def create_vcrecord(cred_dict: dict, expanded_types: list): TEST_CRED_WILDCARD = { "@context": [ "https://www.w3.org/2018/credentials/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", { "LabReport": { "@id": "https://www.vdel.com/LabReport", diff --git a/aries_cloudagent/protocols/present_proof/dif/tests/test_pres_exch.py b/aries_cloudagent/protocols/present_proof/dif/tests/test_pres_exch.py index ee1eec2c2c..520f065bc3 100644 --- a/aries_cloudagent/protocols/present_proof/dif/tests/test_pres_exch.py +++ b/aries_cloudagent/protocols/present_proof/dif/tests/test_pres_exch.py @@ -337,7 +337,7 @@ def test_verifiable_presentation_wrapper(self): "@context": [ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/citizenship/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "id": "https://issuer.oidp.uscis.gov/credentials/83627465", "type": ["PermanentResidentCard", "VerifiableCredential"], diff --git a/aries_cloudagent/protocols/present_proof/dif/tests/test_pres_exch_handler.py b/aries_cloudagent/protocols/present_proof/dif/tests/test_pres_exch_handler.py index 6b4f767e69..e7f008b441 100644 --- a/aries_cloudagent/protocols/present_proof/dif/tests/test_pres_exch_handler.py +++ b/aries_cloudagent/protocols/present_proof/dif/tests/test_pres_exch_handler.py @@ -529,7 +529,7 @@ async def test_reveal_doc_with_frame_provided(self, profile): reveal_doc_frame = { "@context": [ "https://www.w3.org/2018/credentials/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "type": ["VerifiableCredential", "LabReport"], "@explicit": True, @@ -619,7 +619,7 @@ async def test_reveal_doc_b(self, profile): "@context": [ "https://www.w3.org/2018/credentials/v1", "https://www.w3.org/2018/credentials/examples/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "id": "https://example.gov/credentials/3732", "issuer": "did:example:489398593", @@ -677,7 +677,7 @@ async def test_reveal_doc_b(self, profile): "@context": [ "https://www.w3.org/2018/credentials/v1", "https://www.w3.org/2018/credentials/examples/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "issuer": {}, "issuanceDate": {}, @@ -1809,7 +1809,7 @@ async def test_reveal_doc_d(self, profile): "@context": [ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/citizenship/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "id": "https://issuer.oidp.uscis.gov/credentials/83627465", "type": ["VerifiableCredential", "PermanentResidentCard"], @@ -1918,7 +1918,7 @@ def test_create_vc_record_with_graph_struct(self, profile): "@context": [ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/citizenship/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "@graph": [ { @@ -1953,7 +1953,7 @@ def test_create_vc_record_with_graph_struct(self, profile): "@context": [ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/citizenship/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "@graph": [ { @@ -3595,7 +3595,7 @@ def test_get_dict_keys_from_path(self, profile): cred_dict = { "@context": [ "https://www.w3.org/2018/credentials/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "id": "urn:bnid:_:c14n4", "type": ["MedicalPass", "VerifiableCredential"], diff --git a/aries_cloudagent/protocols/present_proof/v2_0/formats/dif/tests/test_handler.py b/aries_cloudagent/protocols/present_proof/v2_0/formats/dif/tests/test_handler.py index 761a148ebc..dad7b374b2 100644 --- a/aries_cloudagent/protocols/present_proof/v2_0/formats/dif/tests/test_handler.py +++ b/aries_cloudagent/protocols/present_proof/v2_0/formats/dif/tests/test_handler.py @@ -226,7 +226,7 @@ "@context": [ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/citizenship/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "id": "https://issuer.oidp.uscis.gov/credentials/83627465", "type": ["PermanentResidentCard", "VerifiableCredential"], @@ -278,7 +278,7 @@ "@context": [ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/citizenship/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "id": "https://issuer.oidp.uscis.gov/credentials/83627465", "type": ["PermanentResidentCard", "VerifiableCredential"], @@ -326,7 +326,7 @@ "@context": [ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/citizenship/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "id": "https://issuer.oidp.uscis.gov/credentials/83627465", "type": ["VerifiableCredential", "PermanentResidentCard"], @@ -760,7 +760,7 @@ async def test_create_pres_prover_proof_spec_with_reveal_doc(self): dif_pres_spec["reveal_doc"] = { "@context": [ "https://www.w3.org/2018/credentials/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "type": ["VerifiableCredential", "LabReport"], "@explicit": True, diff --git a/aries_cloudagent/protocols/present_proof/v2_0/messages/tests/test_pres.py b/aries_cloudagent/protocols/present_proof/v2_0/messages/tests/test_pres.py index 89c8ea5bb7..892abd0542 100644 --- a/aries_cloudagent/protocols/present_proof/v2_0/messages/tests/test_pres.py +++ b/aries_cloudagent/protocols/present_proof/v2_0/messages/tests/test_pres.py @@ -1673,7 +1673,7 @@ "@context":[ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/citizenship/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1" + "https://w3id.org/security/bbs/v1" ], "id":"https://issuer.oidp.uscis.gov/credentials/83627465", "type":[ @@ -1732,7 +1732,7 @@ "@context":[ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/citizenship/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1" + "https://w3id.org/security/bbs/v1" ], "id":"https://issuer.oidp.uscis.gov/credentials/83627465", "type":[ diff --git a/aries_cloudagent/vc/ld_proofs/constants.py b/aries_cloudagent/vc/ld_proofs/constants.py index 579787363d..2a4780f484 100644 --- a/aries_cloudagent/vc/ld_proofs/constants.py +++ b/aries_cloudagent/vc/ld_proofs/constants.py @@ -6,7 +6,7 @@ SECURITY_CONTEXT_URL = SECURITY_CONTEXT_V2_URL DID_V1_CONTEXT_URL = "https://www.w3.org/ns/did/v1" CREDENTIALS_CONTEXT_V1_URL = "https://www.w3.org/2018/credentials/v1" -SECURITY_CONTEXT_BBS_URL = "https://w3c.github.io/vc-di-bbs/contexts/v1" +SECURITY_CONTEXT_BBS_URL = "https://w3id.org/security/bbs/v1" SECURITY_CONTEXT_ED25519_2020_URL = "https://w3id.org/security/suites/ed25519-2020/v1" CREDENTIALS_ISSUER_URL = "https://www.w3.org/2018/credentials#issuer" diff --git a/aries_cloudagent/vc/ld_proofs/suites/bbs_bls_signature_2020_base.py b/aries_cloudagent/vc/ld_proofs/suites/bbs_bls_signature_2020_base.py index d7962c0587..4c0a1e8938 100644 --- a/aries_cloudagent/vc/ld_proofs/suites/bbs_bls_signature_2020_base.py +++ b/aries_cloudagent/vc/ld_proofs/suites/bbs_bls_signature_2020_base.py @@ -87,6 +87,6 @@ def _get_verification_method( "sec": "https://w3id.org/security#", "proof": {"@id": "sec:proof", "@type": "@id", "@container": "@graph"}, }, - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], ) diff --git a/aries_cloudagent/vc/ld_proofs/tests/test_check.py b/aries_cloudagent/vc/ld_proofs/tests/test_check.py index 0d665a0276..ca6ee1668b 100644 --- a/aries_cloudagent/vc/ld_proofs/tests/test_check.py +++ b/aries_cloudagent/vc/ld_proofs/tests/test_check.py @@ -7,7 +7,7 @@ "@context": [ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/citizenship/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "id": "https://issuer.oidp.uscis.gov/credentials/83627465", "type": ["PermanentResidentCard", "VerifiableCredential"], @@ -72,7 +72,7 @@ VALID_VACCINATION_DOC = { "@context": [ "https://www.w3.org/2018/credentials/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", "https://w3id.org/vaccination/v1", ], "type": ["VerifiableCredential", "VaccinationCertificate"], @@ -109,7 +109,7 @@ INVALID_VACCINATION_DOC = { "@context": [ "https://www.w3.org/2018/credentials/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", "https://w3id.org/vaccination/v1", ], "type": ["VerifiableCredential", "VaccinationCertificate"], diff --git a/aries_cloudagent/vc/ld_proofs/tests/test_doc.py b/aries_cloudagent/vc/ld_proofs/tests/test_doc.py index 03806b1c65..2d08333806 100644 --- a/aries_cloudagent/vc/ld_proofs/tests/test_doc.py +++ b/aries_cloudagent/vc/ld_proofs/tests/test_doc.py @@ -79,7 +79,7 @@ DOC_TEMPLATE_BBS = { "@context": [ "https://w3id.org/security/v2", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", { "schema": "http://schema.org/", "name": "schema:name", @@ -95,7 +95,7 @@ DOC_FRAME_BBS = { "@context": [ "https://w3id.org/security/v2", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", { "schema": "http://schema.org/", "name": "schema:name", @@ -110,7 +110,7 @@ DOC_SIGNED_BBS = { "@context": [ "https://w3id.org/security/v2", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", { "schema": "http://schema.org/", "name": "schema:name", @@ -133,7 +133,7 @@ DOC_DERIVED_BBS = { "@context": [ "https://w3id.org/security/v2", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", { "schema": "http://schema.org/", "name": "schema:name", diff --git a/aries_cloudagent/vc/tests/data/bbs_nested_vc_full_reveal_document_mattr.py b/aries_cloudagent/vc/tests/data/bbs_nested_vc_full_reveal_document_mattr.py index 47f1634a2e..f0e1300576 100644 --- a/aries_cloudagent/vc/tests/data/bbs_nested_vc_full_reveal_document_mattr.py +++ b/aries_cloudagent/vc/tests/data/bbs_nested_vc_full_reveal_document_mattr.py @@ -2,7 +2,7 @@ "@context": [ "https://www.w3.org/2018/credentials/v1", "https://www.w3.org/2018/credentials/examples/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "type": ["VerifiableCredential", "UniversityDegreeCredential"], } diff --git a/aries_cloudagent/vc/tests/data/bbs_nested_vc_mattr.py b/aries_cloudagent/vc/tests/data/bbs_nested_vc_mattr.py index e94b80be44..72e4ae1e65 100644 --- a/aries_cloudagent/vc/tests/data/bbs_nested_vc_mattr.py +++ b/aries_cloudagent/vc/tests/data/bbs_nested_vc_mattr.py @@ -2,7 +2,7 @@ "@context": [ "https://www.w3.org/2018/credentials/v1", "https://www.w3.org/2018/credentials/examples/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "id": "https://example.gov/credentials/3732", "type": ["VerifiableCredential", "UniversityDegreeCredential"], diff --git a/aries_cloudagent/vc/tests/data/bbs_nested_vc_reveal_document_mattr.py b/aries_cloudagent/vc/tests/data/bbs_nested_vc_reveal_document_mattr.py index 1dfef9e6b0..dc62d1edb8 100644 --- a/aries_cloudagent/vc/tests/data/bbs_nested_vc_reveal_document_mattr.py +++ b/aries_cloudagent/vc/tests/data/bbs_nested_vc_reveal_document_mattr.py @@ -2,7 +2,7 @@ "@context": [ "https://www.w3.org/2018/credentials/v1", "https://www.w3.org/2018/credentials/examples/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "issuer": {}, "issuanceDate": {}, diff --git a/aries_cloudagent/vc/tests/data/bbs_partial_proof_nested_vc_mattr.py b/aries_cloudagent/vc/tests/data/bbs_partial_proof_nested_vc_mattr.py index b6c7411870..ed3afcab53 100644 --- a/aries_cloudagent/vc/tests/data/bbs_partial_proof_nested_vc_mattr.py +++ b/aries_cloudagent/vc/tests/data/bbs_partial_proof_nested_vc_mattr.py @@ -2,7 +2,7 @@ "@context": [ "https://www.w3.org/2018/credentials/v1", "https://www.w3.org/2018/credentials/examples/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "id": "https://example.gov/credentials/3732", "type": ["UniversityDegreeCredential", "VerifiableCredential"], diff --git a/aries_cloudagent/vc/tests/data/bbs_partial_proof_vc_mattr.py b/aries_cloudagent/vc/tests/data/bbs_partial_proof_vc_mattr.py index d678ac390a..7816494dde 100644 --- a/aries_cloudagent/vc/tests/data/bbs_partial_proof_vc_mattr.py +++ b/aries_cloudagent/vc/tests/data/bbs_partial_proof_vc_mattr.py @@ -2,7 +2,7 @@ "@context": [ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/citizenship/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "id": "https://issuer.oidp.uscis.gov/credentials/83627465", "type": ["PermanentResidentCard", "VerifiableCredential"], diff --git a/aries_cloudagent/vc/tests/data/bbs_proof_nested_vc_mattr.py b/aries_cloudagent/vc/tests/data/bbs_proof_nested_vc_mattr.py index 54fb019e1e..ce99ad23f6 100644 --- a/aries_cloudagent/vc/tests/data/bbs_proof_nested_vc_mattr.py +++ b/aries_cloudagent/vc/tests/data/bbs_proof_nested_vc_mattr.py @@ -2,7 +2,7 @@ "@context": [ "https://www.w3.org/2018/credentials/v1", "https://www.w3.org/2018/credentials/examples/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "id": "https://example.gov/credentials/3732", "type": ["UniversityDegreeCredential", "VerifiableCredential"], diff --git a/aries_cloudagent/vc/tests/data/bbs_proof_vc_mattr.py b/aries_cloudagent/vc/tests/data/bbs_proof_vc_mattr.py index dec778d32a..8c05911b18 100644 --- a/aries_cloudagent/vc/tests/data/bbs_proof_vc_mattr.py +++ b/aries_cloudagent/vc/tests/data/bbs_proof_vc_mattr.py @@ -2,7 +2,7 @@ "@context": [ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/citizenship/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "id": "https://issuer.oidp.uscis.gov/credentials/83627465", "type": ["PermanentResidentCard", "VerifiableCredential"], diff --git a/aries_cloudagent/vc/tests/data/bbs_signed_nested_vc_mattr.py b/aries_cloudagent/vc/tests/data/bbs_signed_nested_vc_mattr.py index 036283a3b6..311134196a 100644 --- a/aries_cloudagent/vc/tests/data/bbs_signed_nested_vc_mattr.py +++ b/aries_cloudagent/vc/tests/data/bbs_signed_nested_vc_mattr.py @@ -2,7 +2,7 @@ "@context": [ "https://www.w3.org/2018/credentials/v1", "https://www.w3.org/2018/credentials/examples/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "id": "https://example.gov/credentials/3732", "type": ["VerifiableCredential", "UniversityDegreeCredential"], diff --git a/aries_cloudagent/vc/tests/data/bbs_signed_vc_mattr.py b/aries_cloudagent/vc/tests/data/bbs_signed_vc_mattr.py index 95579436f9..0d63b6f67a 100644 --- a/aries_cloudagent/vc/tests/data/bbs_signed_vc_mattr.py +++ b/aries_cloudagent/vc/tests/data/bbs_signed_vc_mattr.py @@ -2,7 +2,7 @@ "@context": [ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/citizenship/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "id": "https://issuer.oidp.uscis.gov/credentials/83627465", "type": ["VerifiableCredential", "PermanentResidentCard"], diff --git a/aries_cloudagent/vc/tests/data/bbs_vc_mattr.py b/aries_cloudagent/vc/tests/data/bbs_vc_mattr.py index a28b23882f..a37e55aac4 100644 --- a/aries_cloudagent/vc/tests/data/bbs_vc_mattr.py +++ b/aries_cloudagent/vc/tests/data/bbs_vc_mattr.py @@ -2,7 +2,7 @@ "@context": [ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/citizenship/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "id": "https://issuer.oidp.uscis.gov/credentials/83627465", "type": ["VerifiableCredential", "PermanentResidentCard"], diff --git a/aries_cloudagent/vc/tests/data/bbs_vc_reveal_document_mattr.py b/aries_cloudagent/vc/tests/data/bbs_vc_reveal_document_mattr.py index 27d488ee5d..c9094fd972 100644 --- a/aries_cloudagent/vc/tests/data/bbs_vc_reveal_document_mattr.py +++ b/aries_cloudagent/vc/tests/data/bbs_vc_reveal_document_mattr.py @@ -2,7 +2,7 @@ "@context": [ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/citizenship/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "id": "https://issuer.oidp.uscis.gov/credentials/83627465", "type": ["VerifiableCredential", "PermanentResidentCard"], diff --git a/aries_cloudagent/vc/tests/data/test_ld_document.py b/aries_cloudagent/vc/tests/data/test_ld_document.py index 49f2f408bb..eda2fab8d3 100644 --- a/aries_cloudagent/vc/tests/data/test_ld_document.py +++ b/aries_cloudagent/vc/tests/data/test_ld_document.py @@ -1,5 +1,5 @@ TEST_LD_DOCUMENT = { - "@context": ["http://schema.org/", "https://w3c.github.io/vc-di-bbs/contexts/v1"], + "@context": ["http://schema.org/", "https://w3id.org/security/bbs/v1"], "@type": "Person", "firstName": "Jane", "lastName": "Does", diff --git a/aries_cloudagent/vc/tests/data/test_ld_document_bad_signed_bbs.py b/aries_cloudagent/vc/tests/data/test_ld_document_bad_signed_bbs.py index 61a1f20b42..d83b527840 100644 --- a/aries_cloudagent/vc/tests/data/test_ld_document_bad_signed_bbs.py +++ b/aries_cloudagent/vc/tests/data/test_ld_document_bad_signed_bbs.py @@ -6,7 +6,7 @@ "homepage": "schema:url", "image": "schema:image", }, - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "name": "John Doe", "homepage": "https://domain.com/profile", diff --git a/aries_cloudagent/vc/tests/data/test_ld_document_bad_signed_ed25519.py b/aries_cloudagent/vc/tests/data/test_ld_document_bad_signed_ed25519.py index e353366cb0..f21dc7bd8e 100644 --- a/aries_cloudagent/vc/tests/data/test_ld_document_bad_signed_ed25519.py +++ b/aries_cloudagent/vc/tests/data/test_ld_document_bad_signed_ed25519.py @@ -1,5 +1,5 @@ TEST_LD_DOCUMENT_BAD_SIGNED_ED25519 = { - "@context": ["http://schema.org/", "https://w3c.github.io/vc-di-bbs/contexts/v1"], + "@context": ["http://schema.org/", "https://w3id.org/security/bbs/v1"], "@type": "Person", "firstName": "Jane", "lastName": "Does", diff --git a/aries_cloudagent/vc/tests/data/test_ld_document_bad_signed_ed25519_2020.py b/aries_cloudagent/vc/tests/data/test_ld_document_bad_signed_ed25519_2020.py index 773a64018c..11094ab16d 100644 --- a/aries_cloudagent/vc/tests/data/test_ld_document_bad_signed_ed25519_2020.py +++ b/aries_cloudagent/vc/tests/data/test_ld_document_bad_signed_ed25519_2020.py @@ -1,5 +1,5 @@ TEST_LD_DOCUMENT_BAD_SIGNED_ED25519_2020 = { - "@context": ["http://schema.org/", "https://w3c.github.io/vc-di-bbs/contexts/v1"], + "@context": ["http://schema.org/", "https://w3id.org/security/bbs/v1"], "@type": "Person", "firstName": "Jane", "lastName": "Does", diff --git a/aries_cloudagent/vc/tests/data/test_ld_document_partial_proof_bbs.py b/aries_cloudagent/vc/tests/data/test_ld_document_partial_proof_bbs.py index cc70d5ec39..fd504af966 100644 --- a/aries_cloudagent/vc/tests/data/test_ld_document_partial_proof_bbs.py +++ b/aries_cloudagent/vc/tests/data/test_ld_document_partial_proof_bbs.py @@ -1,5 +1,5 @@ TEST_LD_DOCUMENT_PARTIAL_PROOF_BBS = { - "@context": ["http://schema.org/", "https://w3c.github.io/vc-di-bbs/contexts/v1"], + "@context": ["http://schema.org/", "https://w3id.org/security/bbs/v1"], "id": "urn:bnid:_:c14n0", "type": "Person", "firstName": "Jane", diff --git a/aries_cloudagent/vc/tests/data/test_ld_document_reveal.py b/aries_cloudagent/vc/tests/data/test_ld_document_reveal.py index 894211c0e6..db3daa26b4 100644 --- a/aries_cloudagent/vc/tests/data/test_ld_document_reveal.py +++ b/aries_cloudagent/vc/tests/data/test_ld_document_reveal.py @@ -1,5 +1,5 @@ TEST_LD_DOCUMENT_REVEAL = { - "@context": ["http://schema.org/", "https://w3c.github.io/vc-di-bbs/contexts/v1"], + "@context": ["http://schema.org/", "https://w3id.org/security/bbs/v1"], "@type": "Person", "@explicit": True, "firstName": "Jane", diff --git a/aries_cloudagent/vc/tests/data/test_ld_document_signed_bbs.py b/aries_cloudagent/vc/tests/data/test_ld_document_signed_bbs.py index 5ee61ef748..c38644123e 100644 --- a/aries_cloudagent/vc/tests/data/test_ld_document_signed_bbs.py +++ b/aries_cloudagent/vc/tests/data/test_ld_document_signed_bbs.py @@ -1,5 +1,5 @@ TEST_LD_DOCUMENT_SIGNED_BBS = { - "@context": ["http://schema.org/", "https://w3c.github.io/vc-di-bbs/contexts/v1"], + "@context": ["http://schema.org/", "https://w3id.org/security/bbs/v1"], "@type": "Person", "firstName": "Jane", "lastName": "Does", diff --git a/aries_cloudagent/vc/tests/data/test_ld_document_signed_ed25519.py b/aries_cloudagent/vc/tests/data/test_ld_document_signed_ed25519.py index 2635b4e933..132dc2a612 100644 --- a/aries_cloudagent/vc/tests/data/test_ld_document_signed_ed25519.py +++ b/aries_cloudagent/vc/tests/data/test_ld_document_signed_ed25519.py @@ -1,5 +1,5 @@ TEST_LD_DOCUMENT_SIGNED_ED25519 = { - "@context": ["http://schema.org/", "https://w3c.github.io/vc-di-bbs/contexts/v1"], + "@context": ["http://schema.org/", "https://w3id.org/security/bbs/v1"], "@type": "Person", "firstName": "Jane", "lastName": "Does", diff --git a/aries_cloudagent/vc/tests/data/test_ld_document_signed_ed25519_2020.py b/aries_cloudagent/vc/tests/data/test_ld_document_signed_ed25519_2020.py index 3eb4d2b573..da0e3182ae 100644 --- a/aries_cloudagent/vc/tests/data/test_ld_document_signed_ed25519_2020.py +++ b/aries_cloudagent/vc/tests/data/test_ld_document_signed_ed25519_2020.py @@ -1,5 +1,5 @@ TEST_LD_DOCUMENT_SIGNED_ED25519_2020 = { - "@context": ["http://schema.org/", "https://w3c.github.io/vc-di-bbs/contexts/v1"], + "@context": ["http://schema.org/", "https://w3id.org/security/bbs/v1"], "@type": "Person", "firstName": "Jane", "lastName": "Does", diff --git a/aries_cloudagent/vc/tests/data/test_vc_document.py b/aries_cloudagent/vc/tests/data/test_vc_document.py index 7260b09331..208aff027e 100644 --- a/aries_cloudagent/vc/tests/data/test_vc_document.py +++ b/aries_cloudagent/vc/tests/data/test_vc_document.py @@ -2,7 +2,7 @@ "@context": [ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/citizenship/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", "https://w3id.org/security/suites/ed25519-2020/v1", ], "id": "https://issuer.oidp.uscis.gov/credentials/83627465", diff --git a/aries_cloudagent/vc/tests/data/test_vc_document_nested.py b/aries_cloudagent/vc/tests/data/test_vc_document_nested.py index 0635a2a542..c4232c0002 100644 --- a/aries_cloudagent/vc/tests/data/test_vc_document_nested.py +++ b/aries_cloudagent/vc/tests/data/test_vc_document_nested.py @@ -2,7 +2,7 @@ "@context": [ "https://www.w3.org/2018/credentials/v1", "https://www.w3.org/2018/credentials/examples/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "id": "https://example.gov/credentials/3732", "type": ["VerifiableCredential", "UniversityDegreeCredential"], diff --git a/aries_cloudagent/vc/tests/data/test_vc_document_nested_partial_proof_bbs.py b/aries_cloudagent/vc/tests/data/test_vc_document_nested_partial_proof_bbs.py index bcff0cd936..3175ade8d4 100644 --- a/aries_cloudagent/vc/tests/data/test_vc_document_nested_partial_proof_bbs.py +++ b/aries_cloudagent/vc/tests/data/test_vc_document_nested_partial_proof_bbs.py @@ -2,7 +2,7 @@ "@context": [ "https://www.w3.org/2018/credentials/v1", "https://www.w3.org/2018/credentials/examples/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "id": "https://example.gov/credentials/3732", "type": ["UniversityDegreeCredential", "VerifiableCredential"], diff --git a/aries_cloudagent/vc/tests/data/test_vc_document_nested_proof_bbs.py b/aries_cloudagent/vc/tests/data/test_vc_document_nested_proof_bbs.py index ee6f27a767..9d3b4ab08d 100644 --- a/aries_cloudagent/vc/tests/data/test_vc_document_nested_proof_bbs.py +++ b/aries_cloudagent/vc/tests/data/test_vc_document_nested_proof_bbs.py @@ -2,7 +2,7 @@ "@context": [ "https://www.w3.org/2018/credentials/v1", "https://www.w3.org/2018/credentials/examples/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "id": "https://example.gov/credentials/3732", "type": ["UniversityDegreeCredential", "VerifiableCredential"], diff --git a/aries_cloudagent/vc/tests/data/test_vc_document_nested_reveal.py b/aries_cloudagent/vc/tests/data/test_vc_document_nested_reveal.py index 385d89e413..d461be7cab 100644 --- a/aries_cloudagent/vc/tests/data/test_vc_document_nested_reveal.py +++ b/aries_cloudagent/vc/tests/data/test_vc_document_nested_reveal.py @@ -2,7 +2,7 @@ "@context": [ "https://www.w3.org/2018/credentials/v1", "https://www.w3.org/2018/credentials/examples/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "issuer": {}, "issuanceDate": {}, diff --git a/aries_cloudagent/vc/tests/data/test_vc_document_nested_signed_bbs.py b/aries_cloudagent/vc/tests/data/test_vc_document_nested_signed_bbs.py index d9c546cbc4..d1eac75c39 100644 --- a/aries_cloudagent/vc/tests/data/test_vc_document_nested_signed_bbs.py +++ b/aries_cloudagent/vc/tests/data/test_vc_document_nested_signed_bbs.py @@ -2,7 +2,7 @@ "@context": [ "https://www.w3.org/2018/credentials/v1", "https://www.w3.org/2018/credentials/examples/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "id": "https://example.gov/credentials/3732", "type": ["VerifiableCredential", "UniversityDegreeCredential"], diff --git a/aries_cloudagent/vc/tests/data/test_vc_document_partial_proof_bbs.py b/aries_cloudagent/vc/tests/data/test_vc_document_partial_proof_bbs.py index 22986814e3..63e7ca2e76 100644 --- a/aries_cloudagent/vc/tests/data/test_vc_document_partial_proof_bbs.py +++ b/aries_cloudagent/vc/tests/data/test_vc_document_partial_proof_bbs.py @@ -2,7 +2,7 @@ "@context": [ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/citizenship/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "id": "https://issuer.oidp.uscis.gov/credentials/83627465", "type": ["PermanentResidentCard", "VerifiableCredential"], diff --git a/aries_cloudagent/vc/tests/data/test_vc_document_reveal.py b/aries_cloudagent/vc/tests/data/test_vc_document_reveal.py index 14ce2ffbb4..25a7ca8b56 100644 --- a/aries_cloudagent/vc/tests/data/test_vc_document_reveal.py +++ b/aries_cloudagent/vc/tests/data/test_vc_document_reveal.py @@ -2,7 +2,7 @@ "@context": [ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/citizenship/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "id": "https://issuer.oidp.uscis.gov/credentials/83627465", "type": ["VerifiableCredential", "PermanentResidentCard"], diff --git a/aries_cloudagent/vc/tests/data/test_vc_document_signed_bbs.py b/aries_cloudagent/vc/tests/data/test_vc_document_signed_bbs.py index fc24f23db8..9d7660a22a 100644 --- a/aries_cloudagent/vc/tests/data/test_vc_document_signed_bbs.py +++ b/aries_cloudagent/vc/tests/data/test_vc_document_signed_bbs.py @@ -2,7 +2,7 @@ "@context": [ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/citizenship/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "id": "https://issuer.oidp.uscis.gov/credentials/83627465", "type": ["VerifiableCredential", "PermanentResidentCard"], diff --git a/aries_cloudagent/vc/tests/data/test_vc_document_signed_ed25519.py b/aries_cloudagent/vc/tests/data/test_vc_document_signed_ed25519.py index c528130845..686786fc3f 100644 --- a/aries_cloudagent/vc/tests/data/test_vc_document_signed_ed25519.py +++ b/aries_cloudagent/vc/tests/data/test_vc_document_signed_ed25519.py @@ -2,7 +2,7 @@ "@context": [ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/citizenship/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "id": "https://issuer.oidp.uscis.gov/credentials/83627465", "type": ["VerifiableCredential", "PermanentResidentCard"], diff --git a/aries_cloudagent/vc/tests/data/test_vc_document_signed_ed25519_2020.py b/aries_cloudagent/vc/tests/data/test_vc_document_signed_ed25519_2020.py index 4832d2e1f6..7983f8ba81 100644 --- a/aries_cloudagent/vc/tests/data/test_vc_document_signed_ed25519_2020.py +++ b/aries_cloudagent/vc/tests/data/test_vc_document_signed_ed25519_2020.py @@ -2,7 +2,7 @@ "@context": [ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/citizenship/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", "https://w3id.org/security/suites/ed25519-2020/v1", ], "id": "https://issuer.oidp.uscis.gov/credentials/83627465", diff --git a/aries_cloudagent/vc/vc_ld/models/tests/test_credential.py b/aries_cloudagent/vc/vc_ld/models/tests/test_credential.py index 651c05adee..c0eff0d7ba 100644 --- a/aries_cloudagent/vc/vc_ld/models/tests/test_credential.py +++ b/aries_cloudagent/vc/vc_ld/models/tests/test_credential.py @@ -14,7 +14,7 @@ "@context": [ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/citizenship/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "id": "https://issuer.oidp.uscis.gov/credentials/83627465", "type": ["VerifiableCredential", "PermanentResidentCard"], diff --git a/aries_cloudagent/vc/vc_ld/tests/test_credential.py b/aries_cloudagent/vc/vc_ld/tests/test_credential.py index a3871c5b30..9afe04a2e1 100644 --- a/aries_cloudagent/vc/vc_ld/tests/test_credential.py +++ b/aries_cloudagent/vc/vc_ld/tests/test_credential.py @@ -85,7 +85,7 @@ CREDENTIAL_TEMPLATE_BBS = { "@context": [ "https://www.w3.org/2018/credentials/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", "https://www.w3.org/2018/credentials/examples/v1", ], "id": "http://example.gov/credentials/3732", @@ -103,7 +103,7 @@ CREDENTIAL_ISSUED_BBS = { "@context": [ "https://www.w3.org/2018/credentials/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", "https://www.w3.org/2018/credentials/examples/v1", ], "id": "http://example.gov/credentials/3732", diff --git a/aries_cloudagent/vc/vc_ld/tests/test_vc_ld.py b/aries_cloudagent/vc/vc_ld/tests/test_vc_ld.py index 118b768631..9fec151e35 100644 --- a/aries_cloudagent/vc/vc_ld/tests/test_vc_ld.py +++ b/aries_cloudagent/vc/vc_ld/tests/test_vc_ld.py @@ -269,7 +269,7 @@ async def test_sign_presentation_bbsbls(self): ) assert unsigned_presentation == PRESENTATION_UNSIGNED - unsigned_presentation["@context"].append("https://w3c.github.io/vc-di-bbs/contexts/v1") + unsigned_presentation["@context"].append("https://w3id.org/security/bbs/v1") _ = await sign_presentation( presentation=unsigned_presentation, suite=suite, diff --git a/demo/AliceWantsAJsonCredential.md b/demo/AliceWantsAJsonCredential.md index 5f4562151a..f387a130b8 100644 --- a/demo/AliceWantsAJsonCredential.md +++ b/demo/AliceWantsAJsonCredential.md @@ -130,7 +130,7 @@ To see the issued credential, call the `/credentials/w3c` endpoint on Alice's ad "results": [ { "contexts": [ - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", "https://www.w3.org/2018/credentials/examples/v1", "https://www.w3.org/2018/credentials/v1" ], @@ -148,7 +148,7 @@ To see the issued credential, call the `/credentials/w3c` endpoint on Alice's ad "@context": [ "https://www.w3.org/2018/credentials/v1", "https://www.w3.org/2018/credentials/examples/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1" + "https://w3id.org/security/bbs/v1" ], "type": [ "VerifiableCredential", diff --git a/demo/features/data/cred_data_schema_driverslicense_v2.json b/demo/features/data/cred_data_schema_driverslicense_v2.json index 31d129ff08..bb1d194fec 100644 --- a/demo/features/data/cred_data_schema_driverslicense_v2.json +++ b/demo/features/data/cred_data_schema_driverslicense_v2.json @@ -34,7 +34,7 @@ "credential": { "@context": [ "https://www.w3.org/2018/credentials/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", { "dl": "http://example.com/drivers-license", "AATHDriversLicense": "dl:AATHDriversLicense", diff --git a/demo/runners/faber.py b/demo/runners/faber.py index fda08210fd..d8b9e4347f 100644 --- a/demo/runners/faber.py +++ b/demo/runners/faber.py @@ -151,7 +151,7 @@ def generate_credential_offer(self, aip, cred_type, cred_def_id, exchange_tracin "@context": [ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/citizenship/v1", - "https://w3c.github.io/vc-di-bbs/contexts/v1", + "https://w3id.org/security/bbs/v1", ], "type": [ "VerifiableCredential", diff --git a/open-api/openapi.json b/open-api/openapi.json index 3af7ec7850..5840bb0df0 100644 --- a/open-api/openapi.json +++ b/open-api/openapi.json @@ -7745,7 +7745,7 @@ "reveal_doc" : { "description" : "reveal doc [JSON-LD frame] dict used to derive the credential when selective disclosure is required", "example" : { - "@context" : [ "https://www.w3.org/2018/credentials/v1", "https://w3c.github.io/vc-di-bbs/contexts/v1" ], + "@context" : [ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/bbs/v1" ], "@explicit" : true, "@requireAll" : true, "credentialSubject" : { diff --git a/open-api/swagger.json b/open-api/swagger.json index 75348d8fdd..06fe49b5ec 100644 --- a/open-api/swagger.json +++ b/open-api/swagger.json @@ -6596,7 +6596,7 @@ "reveal_doc" : { "type" : "object", "example" : { - "@context" : [ "https://www.w3.org/2018/credentials/v1", "https://w3c.github.io/vc-di-bbs/contexts/v1" ], + "@context" : [ "https://www.w3.org/2018/credentials/v1", "https://w3id.org/security/bbs/v1" ], "@explicit" : true, "@requireAll" : true, "credentialSubject" : { From f3fbbd5335fa1a0b11b00e8613429aee065d0714 Mon Sep 17 00:00:00 2001 From: Andrew Whitehead Date: Tue, 30 Jan 2024 14:30:18 -0800 Subject: [PATCH 3/3] add cached BBS v1 context Signed-off-by: Andrew Whitehead --- .../vc/ld_proofs/document_downloader.py | 1 + .../ld_proofs/resources/bbs-v1-context.jsonld | 129 ++++++++++++++++++ 2 files changed, 130 insertions(+) create mode 100644 aries_cloudagent/vc/ld_proofs/resources/bbs-v1-context.jsonld diff --git a/aries_cloudagent/vc/ld_proofs/document_downloader.py b/aries_cloudagent/vc/ld_proofs/document_downloader.py index 2a4a794a34..a465522eff 100644 --- a/aries_cloudagent/vc/ld_proofs/document_downloader.py +++ b/aries_cloudagent/vc/ld_proofs/document_downloader.py @@ -43,6 +43,7 @@ class StaticCacheJsonLdDownloader: "https://w3id.org/security/v1": "security-v1-context.jsonld", "https://w3id.org/security/v2": "security-v2-context.jsonld", "https://w3id.org/security/suites/ed25519-2020/v1": "ed25519-2020-context.jsonld", + "https://w3id.org/security/bbs/v1": "bbs-v1-context.jsonld", } def __init__( diff --git a/aries_cloudagent/vc/ld_proofs/resources/bbs-v1-context.jsonld b/aries_cloudagent/vc/ld_proofs/resources/bbs-v1-context.jsonld new file mode 100644 index 0000000000..738c2baef8 --- /dev/null +++ b/aries_cloudagent/vc/ld_proofs/resources/bbs-v1-context.jsonld @@ -0,0 +1,129 @@ +{ + "@context": { + "@version": 1.1, + "id": "@id", + "type": "@type", + "BbsBlsSignature2020": { + "@id": "https://w3id.org/security#BbsBlsSignature2020", + "@context": { + "@version": 1.1, + "@protected": true, + "id": "@id", + "type": "@type", + "challenge": "https://w3id.org/security#challenge", + "created": { + "@id": "http://purl.org/dc/terms/created", + "@type": "http://www.w3.org/2001/XMLSchema#dateTime" + }, + "domain": "https://w3id.org/security#domain", + "proofValue": "https://w3id.org/security#proofValue", + "nonce": "https://w3id.org/security#nonce", + "proofPurpose": { + "@id": "https://w3id.org/security#proofPurpose", + "@type": "@vocab", + "@context": { + "@version": 1.1, + "@protected": true, + "id": "@id", + "type": "@type", + "assertionMethod": { + "@id": "https://w3id.org/security#assertionMethod", + "@type": "@id", + "@container": "@set" + }, + "authentication": { + "@id": "https://w3id.org/security#authenticationMethod", + "@type": "@id", + "@container": "@set" + } + } + }, + "verificationMethod": { + "@id": "https://w3id.org/security#verificationMethod", + "@type": "@id" + } + } + }, + "BbsBlsSignatureProof2020": { + "@id": "https://w3id.org/security#BbsBlsSignatureProof2020", + "@context": { + "@version": 1.1, + "@protected": true, + "id": "@id", + "type": "@type", + + "challenge": "https://w3id.org/security#challenge", + "created": { + "@id": "http://purl.org/dc/terms/created", + "@type": "http://www.w3.org/2001/XMLSchema#dateTime" + }, + "domain": "https://w3id.org/security#domain", + "nonce": "https://w3id.org/security#nonce", + "proofPurpose": { + "@id": "https://w3id.org/security#proofPurpose", + "@type": "@vocab", + "@context": { + "@version": 1.1, + "@protected": true, + "id": "@id", + "type": "@type", + "sec": "https://w3id.org/security#", + "assertionMethod": { + "@id": "https://w3id.org/security#assertionMethod", + "@type": "@id", + "@container": "@set" + }, + "authentication": { + "@id": "https://w3id.org/security#authenticationMethod", + "@type": "@id", + "@container": "@set" + } + } + }, + "proofValue": "https://w3id.org/security#proofValue", + "verificationMethod": { + "@id": "https://w3id.org/security#verificationMethod", + "@type": "@id" + } + } + }, + "Bls12381G1Key2020": { + "@id": "https://w3id.org/security#Bls12381G1Key2020", + "@context": { + "@protected": true, + "id": "@id", + "type": "@type", + "controller": { + "@id": "https://w3id.org/security#controller", + "@type": "@id" + }, + "revoked": { + "@id": "https://w3id.org/security#revoked", + "@type": "http://www.w3.org/2001/XMLSchema#dateTime" + }, + "publicKeyBase58": { + "@id": "https://w3id.org/security#publicKeyBase58" + } + } + }, + "Bls12381G2Key2020": { + "@id": "https://w3id.org/security#Bls12381G2Key2020", + "@context": { + "@protected": true, + "id": "@id", + "type": "@type", + "controller": { + "@id": "https://w3id.org/security#controller", + "@type": "@id" + }, + "revoked": { + "@id": "https://w3id.org/security#revoked", + "@type": "http://www.w3.org/2001/XMLSchema#dateTime" + }, + "publicKeyBase58": { + "@id": "https://w3id.org/security#publicKeyBase58" + } + } + } + } +}