Revert "Add vcdm 2.0 model and context (openwallet-foundation#3436)"

This reverts commit d736a48.

acapy_agent/messaging/valid.py

@@ -898,25 +898,19 @@ class CredentialContext(Validator):
     """Credential Context."""
 
     FIRST_CONTEXT = "https://www.w3.org/2018/credentials/v1"
-    VALID_CONTEXTS = [
-        "https://www.w3.org/2018/credentials/v1",
-        "https://www.w3.org/ns/credentials/v2",
-    ]
-    EXAMPLE = [VALID_CONTEXTS[0], "https://www.w3.org/2018/credentials/examples/v1"]
+    EXAMPLE = [FIRST_CONTEXT, "https://www.w3.org/2018/credentials/examples/v1"]
 
     def __init__(self) -> None:
         """Initialize the instance."""
         super().__init__()
 
     def __call__(self, value):
         """Validate input value."""
+        length = len(value)
 
-        if not isinstance(value, list):
-            raise ValidationError("Value must be a non-empty list.")
-
-        if not value or value[0] not in CredentialContext.VALID_CONTEXTS:
+        if length < 1 or value[0] != CredentialContext.FIRST_CONTEXT:
             raise ValidationError(
-                f"First context must be one of {CredentialContext.VALID_CONTEXTS}"
+                f"First context must be {CredentialContext.FIRST_CONTEXT}"
             )
 
         return value

acapy_agent/protocols/issue_credential/v2_0/formats/ld_proof/tests/test_handler.py

@@ -43,12 +43,75 @@
 from ..handler import LOGGER as LD_PROOF_LOGGER
 from ..handler import LDProofCredFormatHandler
 from ..models.cred_detail import LDProofVCDetail
-from .fixtures import (
-    LD_PROOF_VC_DETAIL,
-    LD_PROOF_VC_DETAIL_BBS,
-    LD_PROOF_VC_DETAIL_ED25519_2020,
-    LD_PROOF_VC,
-)
+
+TEST_DID_SOV = "did:sov:LjgpST2rjsoxYegQDRm7EL"
+TEST_DID_KEY = "did:key:z6Mkgg342Ycpuk263R9d8Aq6MUaxPn1DDeHyGo38EefXmgDL"
+
+LD_PROOF_VC_DETAIL = {
+    "credential": {
+        "@context": [
+            "https://www.w3.org/2018/credentials/v1",
+            "https://www.w3.org/2018/credentials/examples/v1",
+        ],
+        "type": ["VerifiableCredential", "UniversityDegreeCredential"],
+        "credentialSubject": {"test": "key"},
+        "issuanceDate": "2021-04-12",
+        "issuer": TEST_DID_KEY,
+    },
+    "options": {
+        "proofType": "Ed25519Signature2018",
+        "created": "2019-12-11T03:50:55",
+    },
+}
+LD_PROOF_VC_DETAIL_BBS = {
+    "credential": {
+        "@context": [
+            "https://www.w3.org/2018/credentials/v1",
+            "https://www.w3.org/2018/credentials/examples/v1",
+        ],
+        "type": ["VerifiableCredential", "UniversityDegreeCredential"],
+        "credentialSubject": {"test": "key"},
+        "issuanceDate": "2021-04-12",
+        "issuer": TEST_DID_KEY,
+    },
+    "options": {
+        "proofType": "BbsBlsSignature2020",
+        "created": "2019-12-11T03:50:55",
+    },
+}
+LD_PROOF_VC_DETAIL_ED25519_2020 = {
+    "credential": {
+        "@context": [
+            "https://www.w3.org/2018/credentials/v1",
+            "https://www.w3.org/2018/credentials/examples/v1",
+        ],
+        "type": ["VerifiableCredential", "UniversityDegreeCredential"],
+        "credentialSubject": {"test": "key"},
+        "issuanceDate": "2021-04-12",
+        "issuer": TEST_DID_KEY,
+    },
+    "options": {
+        "proofType": "Ed25519Signature2020",
+        "created": "2019-12-11T03:50:55",
+    },
+}
+LD_PROOF_VC = {
+    "@context": [
+        "https://www.w3.org/2018/credentials/v1",
+        "https://www.w3.org/2018/credentials/examples/v1",
+    ],
+    "type": ["VerifiableCredential", "UniversityDegreeCredential"],
+    "credentialSubject": {"test": "key"},
+    "issuanceDate": "2021-04-12",
+    "issuer": TEST_DID_KEY,
+    "proof": {
+        "proofPurpose": "assertionMethod",
+        "created": "2019-12-11T03:50:55",
+        "type": "Ed25519Signature2018",
+        "verificationMethod": "did:key:z6Mkgg342Ycpuk263R9d8Aq6MUaxPn1DDeHyGo38EefXmgDL#z6Mkgg342Ycpuk263R9d8Aq6MUaxPn1DDeHyGo38EefXmgDL",
+        "jws": "eyJhbGciOiAiRWREU0EiLCAiYjY0IjogZmFsc2UsICJjcml0IjogWyJiNjQiXX0..Q6amIrxGiSbM7Ce6DxlfwLCjVcYyclas8fMxaecspXFUcFW9DAAxKzgHx93FWktnlZjM_biitkMgZdStgvivAQ",
+    },
+}
 
 
 class TestV20LDProofCredFormatHandler(IsolatedAsyncioTestCase):
@@ -103,7 +166,7 @@ async def test_validate_fields(self):
 
         incorrect_detail = {
             **LD_PROOF_VC_DETAIL,
-            "credential": {**LD_PROOF_VC_DETAIL["credential"], "credentialSubject": None},
+            "credential": {**LD_PROOF_VC_DETAIL["credential"], "issuanceDate": None},
         }
 
         # test incorrect proposal
@@ -121,7 +184,8 @@ async def test_validate_fields(self):
         # test incorrect cred
         with self.assertRaises(ValidationError):
             incorrect_cred = LD_PROOF_VC.copy()
-            incorrect_cred.pop("credentialSubject")
+            incorrect_cred.pop("issuanceDate")
+
             self.handler.validate_fields(CRED_20_ISSUE, incorrect_cred)
 
     async def test_get_ld_proof_detail_record(self):

acapy_agent/storage/vc_holder/askar.py

@@ -3,6 +3,9 @@
 import json
 from typing import Mapping, Optional, Sequence
 
+from dateutil.parser import ParserError
+from dateutil.parser import parse as dateutil_parser
+
 from ...askar.profile import AskarProfile
 from ..askar import AskarStorage, AskarStorageSearch, AskarStorageSearchSession
 from ..record import StorageRecord
@@ -171,7 +174,14 @@ async def fetch(self, max_count: Optional[int] = None) -> Sequence[VCRecord]:
         """
         rows = await self._search.fetch(max_count)
         records = [storage_to_vc_record(r) for r in rows]
-        return records
+        try:
+            records.sort(
+                key=lambda v: dateutil_parser(v.cred_value.get("issuanceDate")),
+                reverse=True,
+            )
+            return records
+        except ParserError:
+            return records
 
 
 def storage_to_vc_record(record: StorageRecord) -> VCRecord:

acapy_agent/storage/vc_holder/tests/test_askar_vc_holder.py

@@ -268,11 +268,11 @@ async def test_sorting_vcrecord(holder: VCHolder):
         },
     )
     await holder.store_credential(record_c)
-    # expected = [record_b, record_a, record_c]
+    expected = [record_b, record_a, record_c]
 
     search = holder.search_credentials()
     rows = await search.fetch()
-    assert rows  # == expected
+    assert rows == expected
 
 
 @pytest.mark.asyncio

acapy_agent/vc/ld_proofs/constants.py

@@ -6,7 +6,6 @@
 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"
-CREDENTIALS_CONTEXT_V2_URL = "https://www.w3.org/ns/credentials/v2"
 SECURITY_CONTEXT_BBS_URL = "https://w3id.org/security/bbs/v1"
 SECURITY_CONTEXT_ED25519_2020_URL = "https://w3id.org/security/suites/ed25519-2020/v1"
 SECURITY_CONTEXT_MULTIKEY_URL = "https://w3id.org/security/multikey/v1"

acapy_agent/vc/ld_proofs/document_downloader.py

@@ -40,7 +40,6 @@ class StaticCacheJsonLdDownloader:
 
     CONTEXT_FILE_MAPPING = {
         "https://www.w3.org/2018/credentials/v1": "credentials_context.jsonld",
-        "https://www.w3.org/ns/credentials/v2": "credentials_v2_context.jsonld",
         "https://w3id.org/vc/status-list/2021/v1": "status_list_context.jsonld",
         "https://www.w3.org/ns/did/v1": "did_documents_context.jsonld",
         "https://w3id.org/security/v1": "security-v1-context.jsonld",