Implement support for signed-ietf-json-patch

Cargo.toml

@@ -28,6 +28,7 @@ base64 = "0.13"
 libsecp256k1 = "0.5.0"
 signature_bls = "0.30.0"
 bls12_381_plus = "0.6"
+json-patch = "0.2.6"
 
 [dependencies.p256]
 version = "0.9.0"

src/bls12381.rs

@@ -6,7 +6,7 @@ use crate::{
     didcore::{Config, KeyFormat, JWK},
     generate_seed,
     traits::{CoreSign, DIDCore, Fingerprint, Generate, ECDH},
-    Document, Error, KeyMaterial, KeyPair, VerificationMethod,
+    Document, Error, KeyMaterial, BaseKeyPair, VerificationMethod,
 };
 
 pub struct Bls12381KeyPairs {
@@ -196,9 +196,9 @@ impl ECDH for Bls12381KeyPairs {
     }
 }
 
-impl From<Bls12381KeyPairs> for KeyPair {
+impl From<Bls12381KeyPairs> for BaseKeyPair {
     fn from(key_pair: Bls12381KeyPairs) -> Self {
-        KeyPair::Bls12381G1G2(key_pair)
+        BaseKeyPair::Bls12381G1G2(key_pair)
     }
 }
 

src/didcore.rs

@@ -23,7 +23,7 @@ pub const CONFIG_LD_PRIVATE: Config = Config {
     serialize_secrets: true,
 };
 
-#[derive(Serialize, Deserialize, PartialEq, Debug)]
+#[derive(Serialize, Deserialize, PartialEq, Debug, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct Document {
     #[serde(rename = "@context")]
@@ -42,16 +42,30 @@ pub struct Document {
     pub verification_method: Vec<VerificationMethod>,
 }
 
-#[derive(Deserialize, Debug, Clone, PartialEq, Default)]
+#[derive(Serialize, Deserialize, Debug)]
+pub struct IetfJsonPatch {
+    #[serde(rename = "ietf-json-patch")]
+    pub value: serde_json::Value,
+}
+
+#[derive(Debug, Clone, PartialEq, Default, Deserialize)]
 pub struct VerificationMethod {
     pub id: String,
+    #[serde(rename = "type")]
     pub key_type: String,
     pub controller: String,
+    #[serde(alias = "publicKeyBase58")]
+    #[serde(alias = "publicKeyMultibase")]
+    #[serde(alias = "publicKeyJwk")]
     pub public_key: Option<KeyFormat>,
+    #[serde(alias = "privateKeyBase58")]
+    #[serde(alias = "privateKeyMultibase")]
+    #[serde(alias = "privateKeyJwk")]
     pub private_key: Option<KeyFormat>,
 }
 
 #[derive(Serialize, Debug, Clone, PartialEq, Deserialize)]
+#[serde(untagged)]
 pub enum KeyFormat {
     Base58(String),
     Multibase(Vec<u8>),
@@ -74,6 +88,21 @@ pub struct JWK {
     pub d: Option<String>,
 }
 
+#[derive(Serialize, Deserialize, PartialEq, Debug)]
+pub struct JWSHeader {
+    #[serde(rename = "alg")]
+    pub algorithm: String,
+    #[serde(rename = "kid", default, skip_serializing_if = "Option::is_none")]
+    pub key_id: Option<String>,
+}
+
+#[derive(Serialize, Deserialize, PartialEq, Debug)]
+pub struct JWS {
+    pub header: JWSHeader,
+    pub payload: Vec<u8>,
+    pub signature: Vec<u8>,
+}
+
 impl Serialize for VerificationMethod {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where

src/ed25519.rs

@@ -3,7 +3,7 @@ use crate::{
     didcore::{Config, Document, KeyFormat, VerificationMethod, JWK},
     traits::{DIDCore, Fingerprint, Generate, ECDH},
     x25519::X25519KeyPair,
-    AsymmetricKey, Error, KeyMaterial, KeyPair,
+    AsymmetricKey, Error, KeyMaterial, BaseKeyPair,
 };
 use curve25519_dalek::edwards::CompressedEdwardsY;
 use ed25519_dalek::*;
@@ -192,9 +192,9 @@ impl ECDH for Ed25519KeyPair {
     }
 }
 
-impl From<Ed25519KeyPair> for KeyPair {
+impl From<Ed25519KeyPair> for BaseKeyPair {
     fn from(key_pair: Ed25519KeyPair) -> Self {
-        KeyPair::Ed25519(key_pair)
+        BaseKeyPair::Ed25519(key_pair)
     }
 }