From 2414ad34c95734ca0e8c65202a8294bf4639d189 Mon Sep 17 00:00:00 2001
From: Manu Sporny <msporny@digitalbazaar.com>
Date: Fri, 25 Aug 2023 17:11:51 -0400
Subject: [PATCH 1/2] Sync and fix bugs in v2 context.

---
 contexts/credentials/v2 | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/contexts/credentials/v2 b/contexts/credentials/v2
index 01b1c5e4f..03440fc86 100644
--- a/contexts/credentials/v2
+++ b/contexts/credentials/v2
@@ -5,6 +5,7 @@
 
     "id": "@id",
     "type": "@type",
+
     "kid": {
       "@id": "https://www.iana.org/assignments/jose#kid",
       "@type": "@id"
@@ -43,17 +44,20 @@
     },
     "cnf": {
       "@id": "https://www.iana.org/assignments/jwt#cnf",
-      "@context": {
-        "@protected": true,
-        "kid": {
-          "@id": "https://www.iana.org/assignments/jwt#kid",
-          "@type": "@id"
-        },
-        "jwk": {
-          "@id": "https://www.iana.org/assignments/jwt#jwk",
-          "@type": "@json"
+      "@context": [
+        null,
+        {
+          "@protected": true,
+          "kid": {
+            "@id": "https://www.iana.org/assignments/jwt#kid",
+            "@type": "@id"
+          },
+          "jwk": {
+            "@id": "https://www.iana.org/assignments/jwt#jwk",
+            "@type": "@json"
+          }
         }
-      }
+      ]
     },
     "_sd_alg": {
       "@id": "https://www.iana.org/assignments/jwt#_sd_alg"
@@ -146,7 +150,8 @@
         "verifiableCredential": {
           "@id": "https://www.w3.org/2018/credentials#verifiableCredential",
           "@type": "@id",
-          "@container": "@graph"
+          "@container": "@graph",
+          "@context": null
         },
         "termsOfUse": {
           "@id": "https://www.w3.org/2018/credentials#termsOfUse",
@@ -273,7 +278,10 @@
             }
           }
         },
-        "cryptosuite": "https://w3id.org/security#cryptosuite",
+        "cryptosuite": {
+          "@id": "https://w3id.org/security#cryptosuite",
+          "@type": "https://w3id.org/security#cryptosuiteString"
+        },
         "proofValue": {
           "@id": "https://w3id.org/security#proofValue",
           "@type": "https://w3id.org/security#multibase"

From c44da90e4d0be776e8f7dc465bfee1b87fd4d0fc Mon Sep 17 00:00:00 2001
From: Manu Sporny <msporny@digitalbazaar.com>
Date: Mon, 11 Sep 2023 15:41:03 -0400
Subject: [PATCH 2/2] Remove null'ing of context inside `cnf`.

---
 contexts/credentials/v2 | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/contexts/credentials/v2 b/contexts/credentials/v2
index 03440fc86..d799c0940 100644
--- a/contexts/credentials/v2
+++ b/contexts/credentials/v2
@@ -44,20 +44,17 @@
     },
     "cnf": {
       "@id": "https://www.iana.org/assignments/jwt#cnf",
-      "@context": [
-        null,
-        {
-          "@protected": true,
-          "kid": {
-            "@id": "https://www.iana.org/assignments/jwt#kid",
-            "@type": "@id"
-          },
-          "jwk": {
-            "@id": "https://www.iana.org/assignments/jwt#jwk",
-            "@type": "@json"
-          }
+      "@context": {
+        "@protected": true,
+        "kid": {
+          "@id": "https://www.iana.org/assignments/jwt#kid",
+          "@type": "@id"
+        },
+        "jwk": {
+          "@id": "https://www.iana.org/assignments/jwt#jwk",
+          "@type": "@json"
         }
-      ]
+      }
     },
     "_sd_alg": {
       "@id": "https://www.iana.org/assignments/jwt#_sd_alg"