Merge branch 'main' into feat/rsa-did-key

CHANGELOG.md

@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Allow JWT VC without subject id ([#346](https://github.com/spruceid/ssi/pull/#346)).
 - Add Blockchain Vocabulary v1 2021 context ([#347](https://github.com/spruceid/ssi/pull/#347)).
 - Construct API URLs for known Tezos test networks ([#350](https://github.com/spruceid/ssi/pull/#350)).
+- Add Verifiable Driver's License Vocabulary context file ([#361](https://github.com/spruceid/ssi/pull/361)).
 
 ### Changed
 - Use Error types in bbs code ([#338](https://github.com/spruceid/ssi/pull/#338)).

Cargo.toml

@@ -74,7 +74,7 @@ ecdsa = "0.11.1"
 digest = "0.9"
 k256 = { version = "0.8", optional = true, features = ["zeroize", "ecdsa"] }
 p256 = { version = "0.8", optional = true, features = ["zeroize", "ecdsa"] }
-ssi-contexts = { version = "0.1.0", path = "contexts/" }
+ssi-contexts = { version = "0.1.2", path = "contexts/" }
 ripemd160 = { version = "0.9", optional = true }
 sshkeys = "0.3"
 reqwest = { version = "0.11", features = ["json"] }
@@ -111,3 +111,7 @@ uuid = { version = "0.8", features = ["v4", "serde"] }
 difference = "2.0"
 did-method-key = { path = "./did-key" }
 tokio = { version = "1.0", features = ["macros"] }
+
+[package.metadata.docs.rs]
+features = ["secp256r1", "secp256k1", "ripemd-160", "http-did"]
+rustdoc-args = ["--cfg", "docsrs"]

contexts/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ssi-contexts"
-version = "0.1.1"
+version = "0.1.2"
 authors = ["Spruce Systems, Inc."]
 edition = "2018"
 license = "Apache-2.0 AND W3C-20150513 AND CC-BY-SA-3.0"

contexts/README.md

@@ -7,6 +7,10 @@
 [Decentralized Identifiers]: https://www.w3.org/TR/did-core/
 [Linked Data Proofs]: https://w3c-ccg.github.io/ld-proofs/
 
+## Updating
+
+Sometimes context files change over time. This crate aims to keep up to date with upstream changes in the context files it contains. To manually re-fetch the context files, run the script [update.sh](./update.sh) in the source directory.
+
 ## Licenses
 
 The licenses of the context files are summarized in the following table. For more details, see the [LICENSES.md](./LICENSES.md) file.

contexts/src/lib.rs

@@ -1,3 +1,5 @@
+// Note: update ../update.sh when updating URLs/filenames in this file.
+
 /// <https://www.w3.org/2018/credentials/v1>
 pub const CREDENTIALS_V1: &str = include_str!("../w3c-2018-credentials-v1.jsonld");
 /// <https://www.w3.org/2018/credentials/examples/v1>

contexts/update.sh

@@ -0,0 +1,25 @@
+#!/bin/sh
+# Note: update src/lib.rs when updating URLs/filenames in this file.
+cd "$(dirname "$0")" || exit 1
+exec curl \
+	https://www.w3.org/2018/credentials/v1 -o w3c-2018-credentials-v1.jsonld \
+	https://www.w3.org/2018/credentials/examples/v1 -o w3c-2018-credentials-examples-v1.jsonld \
+	https://www.w3.org/ns/odrl.jsonld -o w3c-odrl.jsonld \
+	https://schema.org/docs/jsonldcontext.jsonld -o schema.org.jsonld \
+	https://w3id.org/security/v1 -o w3id-security-v1.jsonld \
+	https://w3id.org/security/v2 -o w3id-security-v2.jsonld \
+	https://www.w3.org/ns/did/v1 -o w3c-did-v1.jsonld \
+	https://w3id.org/did-resolution/v1 -o w3c-did-resolution-v1.jsonld \
+	https://identity.foundation/EcdsaSecp256k1RecoverySignature2020/lds-ecdsa-secp256k1-recovery2020-0.0.jsonld -o dif-lds-ecdsa-secp256k1-recovery2020-0.0.jsonld \
+	https://w3c-ccg.github.io/lds-jws2020/contexts/lds-jws2020-v1.json -o lds-jws2020-v1.jsonld \
+	https://w3id.org/security/suites/jws-2020/v1 -o w3id-jws2020-v1.jsonld \
+	https://w3id.org/security/suites/ed25519-2020/v1 -o w3id-ed25519-signature-2020-v1.jsonld \
+	https://w3id.org/security/suites/blockchain-2021/v1 -o w3id-blockchain-2021-v1.jsonld \
+	https://w3id.org/citizenship/v1 -o w3c-ccg-citizenship-v1.jsonld \
+	https://w3id.org/vaccination/v1 -o w3c-ccg-vaccination-v1.jsonld \
+	https://w3id.org/traceability/v1 -o w3c-ccg-traceability-v1.jsonld \
+	https://demo.spruceid.com/EcdsaSecp256k1RecoverySignature2020/esrs2020-extra-0.0.jsonld -o esrs2020-extra-0.0.jsonld \
+	https://w3id.org/security/bbs/v1 -o bbs-v1.jsonld \
+	https://identity.foundation/presentation-exchange/submission/v1 -o presentation-submission.jsonld \
+	https://w3id.org/vdl/v1 -o w3id-vdl-v1.jsonld \
+	-L

contexts/w3c-2018-credentials-examples-v1.jsonld

@@ -18,6 +18,9 @@
     "Mother": "ex:Mother",
     "RelationshipCredential": "ex:RelationshipCredential",
     "UniversityDegreeCredential": "ex:UniversityDegreeCredential",
+    "AlumniCredential": "ex:AlumniCredential",
+    "DisputeCredential": "ex:DisputeCredential",
+    "PrescriptionCredential": "ex:PrescriptionCredential",
     "ZkpExampleSchema2018": "ex:ZkpExampleSchema2018",
 
     "issuerData": "ex:issuerData",
@@ -42,6 +45,9 @@
     "evidenceDocument": "ex:evidenceDocument",
     "spouse": "schema:spouse",
     "subjectPresence": "ex:subjectPresence",
-    "verifier": {"@id": "ex:verifier", "@type": "@id"}
+    "verifier": {"@id": "ex:verifier", "@type": "@id"},
+    "currentStatus": "ex:currentStatus",
+    "statusReason": "ex:statusReason",
+    "prescription": "ex:prescription"
   }]
 }