diff --git a/CHANGELOG.md b/CHANGELOG.md index af005bbac..5c3c630ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - 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)). +- Add Universal Wallet 2020 context file ([#383](https://github.com/spruceid/ssi/pull/383)). +- Update context files ([#375](https://github.com/spruceid/ssi/pull/375)). +- Add script to update context files ([#376](https://github.com/spruceid/ssi/pull/376)). ### Changed - Use Error types in bbs code ([#338](https://github.com/spruceid/ssi/pull/#338)). diff --git a/Cargo.toml b/Cargo.toml index 71b2d3e64..fa7a80712 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -72,7 +72,7 @@ ecdsa = "0.11.1" digest = "0.9" k256 = { version = "0.9.6", optional = true, features = ["zeroize", "ecdsa"] } p256 = { version = "0.9.0", optional = true, features = ["zeroize", "ecdsa"] } -ssi-contexts = { version = "0.1.2", path = "contexts/" } +ssi-contexts = { version = "0.1.3", path = "contexts/" } ripemd160 = { version = "0.9", optional = true } sshkeys = "0.3" reqwest = { version = "0.11", features = ["json"] } diff --git a/contexts/Cargo.toml b/contexts/Cargo.toml index 27d2ee851..a82217684 100644 --- a/contexts/Cargo.toml +++ b/contexts/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ssi-contexts" -version = "0.1.2" +version = "0.1.3" authors = ["Spruce Systems, Inc."] edition = "2018" license = "Apache-2.0 AND W3C-20150513 AND CC-BY-SA-3.0" diff --git a/contexts/lds-jws2020-v1.jsonld b/contexts/lds-jws2020-v1.jsonld index 183e65b35..17186cd20 100644 --- a/contexts/lds-jws2020-v1.jsonld +++ b/contexts/lds-jws2020-v1.jsonld @@ -1,6 +1,21 @@ { "@context": { - "JsonWebKey2020": "https://w3id.org/security#JsonWebKey2020", + "privateKeyJwk": { + "@id": "https://w3id.org/security#privateKeyJwk", + "@type": "@json" + }, + "JsonWebKey2020": { + "@id": "https://w3id.org/security#JsonWebKey2020", + "@context": { + "@protected": true, + "id": "@id", + "type": "@type", + "publicKeyJwk": { + "@id": "https://w3id.org/security#publicKeyJwk", + "@type": "@json" + } + } + }, "JsonWebSignature2020": { "@id": "https://w3id.org/security#JsonWebSignature2020", "@context": { @@ -39,10 +54,24 @@ "@id": "https://w3id.org/security#authenticationMethod", "@type": "@id", "@container": "@set" + }, + "capabilityInvocation": { + "@id": "https://w3id.org/security#capabilityInvocationMethod", + "@type": "@id", + "@container": "@set" + }, + "capabilityDelegation": { + "@id": "https://w3id.org/security#capabilityDelegationMethod", + "@type": "@id", + "@container": "@set" + }, + "keyAgreement": { + "@id": "https://w3id.org/security#keyAgreementMethod", + "@type": "@id", + "@container": "@set" } } }, - "proofValue": "https://w3id.org/security#proofValue", "verificationMethod": { "@id": "https://w3id.org/security#verificationMethod", "@type": "@id" diff --git a/contexts/w3c-ccg-traceability-v1.jsonld b/contexts/w3c-ccg-traceability-v1.jsonld index 799a32220..0d69c846b 100644 --- a/contexts/w3c-ccg-traceability-v1.jsonld +++ b/contexts/w3c-ccg-traceability-v1.jsonld @@ -218,8 +218,20 @@ "CTPATCertificate": { "@id": "https://w3id.org/traceability#CTPATCertificate", "@context": { - "ctpatCertifiedEntity": { - "@id": "https://w3id.org/traceability#ctpatCertifiedEntity" + "sviNumber": { + "@id": "https://w3id.org/traceability#sviNumber" + }, + "ctpatAccountNumber": { + "@id": "https://w3id.org/traceability#ctpatAccountNumber" + }, + "tradeSector": { + "@id": "https://schema.org/industry" + }, + "dateOfLastValidation": { + "@id": "https://schema.org/Date" + }, + "issuingCountry": { + "@id": "https://schema.org/addressCountry" } } }, @@ -508,6 +520,10 @@ } } }, + "DCSAShippingInstructionCertificate": { + "@id": "https://w3id.org/traceability#DCSAShippingInstructionCertificate", + "@context": {} + }, "DCSATransportDocument": { "@id": "https://api.swaggerhub.com/domains/dcsaorg/DCSA_DOMAIN/1.0.1#/components/schemas/transportDocument", "@context": { @@ -567,6 +583,10 @@ } } }, + "DCSATransportDocumentCertificate": { + "@id": "https://w3id.org/traceability#DCSATransportDocumentCertificate", + "@context": {} + }, "DocumentVerificationEvidence": { "@id": "https://w3id.org/traceability#DocumentVerificationEvidence", "@context": { @@ -894,6 +914,33 @@ } } }, + "FreightManifest": { + "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#manifestRelatedDocument", + "@context": { + "carrier": { + "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#carrierParty" + }, + "carrierCode": { + "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncl1153/#Standard_Carrier_Alpha_Code_(SCAC)_number" + }, + "transportMeans": { + "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#transportMeans" + }, + "transportMeansId": { + "@id": "https://schema.org/identifier" + }, + "voyage": { + "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#TransportMovement" + }, + "relatedDocuments": { + "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#manifestRelatedDocument" + } + } + }, + "FreightManifestCertificate": { + "@id": "https://w3id.org/traceability#FreightManifestCertificate", + "@context": {} + }, "GeoCoordinates": { "@id": "https://schema.org/GeoCoordinates", "@context": { @@ -960,10 +1007,7 @@ "@id": "https://schema.org/Flight" }, "requestedDate": { - "@id": "https://schema.org/Date" - }, - "executedOn": { - "@id": "https://schema.org/Date" + "@id": "https://w3id.org/traceability#requestDate" }, "accountingInformation": { "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#typeCode" @@ -1031,6 +1075,9 @@ "shippersCertificationBox": { "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#Certification" }, + "executedOn": { + "@id": "https://w3id.org/traceability#executionTime" + }, "executedAt": { "@id": "https://schema.org/Place" } @@ -1969,6 +2016,14 @@ } } }, + "SIMASteelImportLicenseCertificate": { + "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#importLicenceDocument", + "@context": { + "expectedDateOfImport": { + "@id": "https://schema.org/validThrough" + } + } + }, "Seal": { "@id": "https://service.unece.org/trade/uncefact/vocabulary/uncefact/#Seal", "@context": { @@ -2021,6 +2076,12 @@ "size": { "@id": "https://schema.org/size" }, + "weight": { + "@id": "https://schema.org/weight" + }, + "weightUnit": { + "@id": "http://qudt.org/schema/qudt/Unit" + }, "originalCountryOfMeltAndPour": { "@id": "https://schema.org/addressCountry" }, @@ -2032,6 +2093,9 @@ }, "shipment": { "@id": "https://schema.org/ParcelDelivery" + }, + "commodity": { + "@id": "https://w3id.org/traceability#Commodity" } } }, @@ -2104,9 +2168,6 @@ "USMCACertificateOfOrigin": { "@id": "https://w3id.org/traceability#USMCACertificateOfOrigin", "@context": { - "importer": { - "@id": "https://w3id.org/traceability#certifier" - }, "exporterDetails": { "@id": "https://w3id.org/traceability#importerUnknown" }, @@ -2116,9 +2177,6 @@ "importerDetails": { "@id": "https://w3id.org/traceability#importerDetails" }, - "goods": { - "@id": "https://schema.org/itemShipped" - }, "blanketPeriodFrom": { "@id": "https://schema.org/validFrom" }, @@ -2127,6 +2185,31 @@ } } }, + "USMCACertifier": { + "@id": "https://w3id.org/traceability/USMCACertifier", + "@context": { + "certifierRole": { + "@id": "https://w3id.org/traceability#certifierRole" + }, + "certifierDetails": { + "@id": "https://w3id.org/traceability#certifierDetails" + } + } + }, + "USMCAProductSpecifier": { + "@id": "https://w3id.org/traceability/USMCAProductSpecifier", + "@context": { + "product": { + "@id": "https://schema.org/Product" + }, + "originCriterion": { + "@id": "https://w3id.org/traceability#originCriterion" + }, + "countryOfOrigin": { + "@id": "https://w3id.org/traceability#countryOfOrigin" + } + } + }, "UsdaSc6": { "@id": "https://w3id.org/traceability#UsdaSc6", "@context": { @@ -2177,17 +2260,6 @@ } } }, - "usmcaProductSpecifier": { - "@id": "https://w3id.org/traceability/UsmcaProductSpecifier", - "@context": { - "product": { - "@id": "https://schema.org/Product" - }, - "importer": { - "@id": "https://w3id.org/traceability#countryOfOrigin" - } - } - }, "VerifiableBusinessCard": { "@id": "https://w3id.org/traceability#VerifiableBusinessCard", "@context": {}