feat(identity): implement protobuf encoding for all key types

examples/dcutr/src/main.rs

@@ -280,5 +280,7 @@ fn generate_ed25519(secret_key_seed: u8) -> identity::Keypair {
     let mut bytes = [0u8; 32];
     bytes[0] = secret_key_seed;
 
-    identity::Keypair::ed25519_from_bytes(bytes).expect("only errors on wrong length")
+    identity::ed25519::Keypair::try_from_bytes(&mut bytes)
+        .expect("only errors on wrong length")
+        .into()
 }

examples/file-sharing/src/network.rs

@@ -42,7 +42,9 @@ pub(crate) async fn new(
         Some(seed) => {
             let mut bytes = [0u8; 32];
             bytes[0] = seed;
-            identity::Keypair::ed25519_from_bytes(bytes).unwrap()
+            identity::ed25519::Keypair::try_from_bytes(&mut bytes)
+                .unwrap()
+                .into()
         }
         None => identity::Keypair::generate_ed25519(),
     };

examples/relay-server/src/main.rs

@@ -101,8 +101,9 @@ struct Behaviour {
 fn generate_ed25519(secret_key_seed: u8) -> identity::Keypair {
     let mut bytes = [0u8; 32];
     bytes[0] = secret_key_seed;
-
-    identity::Keypair::ed25519_from_bytes(bytes).expect("only errors on wrong length")
+    identity::ed25519::Keypair::try_from_bytes(&mut bytes)
+        .expect("only errors on wrong length")
+        .into()
 }
 
 #[derive(Debug, Parser)]

identity/Cargo.toml

@@ -42,10 +42,10 @@ peerid = [ "dep:multihash", "dep:multiaddr", "dep:bs58", "dep:rand", "dep:thiser
 [dev-dependencies]
 quickcheck = { workspace = true }
 base64 = "0.21.0"
-serde_json = "1.0"
-rmp-serde = "1.0"
 criterion = "0.4"
 hex-literal = "0.4.1"
+rmp-serde = "1.0"
+serde_json = "1.0"
 
 [[bench]]
 name = "peer_id"

identity/src/ecdsa.rs

@@ -111,7 +111,6 @@ impl SecretKey {
 
     /// Decode a secret key from a byte buffer containing raw scalar of the key.
     #[deprecated(
-        since = "0.2.0",
         note = "This method name does not follow Rust naming conventions, use `SecretKey::try_from_bytes` instead"
     )]
     pub fn from_bytes(buf: &[u8]) -> Result<Self, DecodingError> {
@@ -168,7 +167,6 @@ impl PublicKey {
 
     /// Decode a public key from a byte buffer containing raw components of a key with or without compression.
     #[deprecated(
-        since = "0.2.0",
         note = "This method name does not follow Rust naming conventions, use `PublicKey::try_from_bytes` instead."
     )]
     pub fn from_bytes(k: &[u8]) -> Result<PublicKey, DecodingError> {
@@ -198,7 +196,6 @@ impl PublicKey {
 
     /// Decode a public key into a DER encoded byte buffer as defined by SEC1 standard.
     #[deprecated(
-        since = "0.2.0",
         note = "This method name does not follow Rust naming conventions, use `PublicKey::try_decode_der` instead."
     )]
     pub fn decode_der(k: &[u8]) -> Result<PublicKey, DecodingError> {

identity/src/ed25519.rs

@@ -41,7 +41,7 @@ impl Keypair {
     /// Encode the keypair into a byte array by concatenating the bytes
     /// of the secret scalar and the compressed public point,
     /// an informal standard for encoding Ed25519 keypairs.
-    #[deprecated(since = "0.2.0", note = "Renamed to `Keypair::to_bytes`")]
+    #[deprecated(note = "Renamed to `Keypair::to_bytes`")]
     pub fn encode(&self) -> [u8; 64] {
         self.to_bytes()
     }
@@ -58,7 +58,6 @@ impl Keypair {
     ///
     /// Note that this binary format is the same as `ed25519_dalek`'s and `ed25519_zebra`'s.
     #[deprecated(
-        since = "0.2.0",
         note = "This method name does not follow Rust naming conventions, use `Keypair::try_from_bytes` instead."
     )]
     pub fn decode(kp: &mut [u8]) -> Result<Keypair, DecodingError> {
@@ -184,10 +183,7 @@ impl PublicKey {
 
     /// Encode the public key into a byte array in compressed form, i.e.
     /// where one coordinate is represented by a single bit.
-    #[deprecated(
-        since = "0.2.0",
-        note = "Renamed to `PublicKey::to_bytes` to reflect actual behaviour."
-    )]
+    #[deprecated(note = "Renamed to `PublicKey::to_bytes` to reflect actual behaviour.")]
     pub fn encode(&self) -> [u8; 32] {
         self.to_bytes()
     }
@@ -200,7 +196,6 @@ impl PublicKey {
 
     /// Decode a public key from a byte array as produced by `to_bytes`.
     #[deprecated(
-        since = "0.2.0",
         note = "This method name does not follow Rust naming conventions, use `PublicKey::try_from_bytes` instead."
     )]
     pub fn decode(k: &[u8]) -> Result<PublicKey, DecodingError> {
@@ -255,7 +250,6 @@ impl SecretKey {
     /// If the bytes do not constitute a valid Ed25519 secret key, an error is
     /// returned.
     #[deprecated(
-        since = "0.2.0",
         note = "This method name does not follow Rust naming conventions, use `SecretKey::try_from_bytes` instead."
     )]
     #[allow(unused_mut)]

identity/src/error.rs

@@ -46,6 +46,7 @@ impl DecodingError {
         feature = "ed25519",
         feature = "rsa"
     ))]
+    /// Error occurred when parsing one type into another.
     pub(crate) fn failed_to_parse<E, S>(what: &'static str, source: S) -> Self
     where
         E: Error + Send + Sync + 'static,
@@ -76,24 +77,14 @@ impl DecodingError {
         }
     }
 
-    #[cfg(any(
-        feature = "ecdsa",
-        feature = "secp256k1",
-        feature = "ed25519",
-        feature = "rsa"
-    ))]
     pub(crate) fn decoding_unsupported(key_type: &'static str) -> Self {
         Self {
             msg: format!("decoding {key_type} key from Protobuf is unsupported"),
             source: None,
         }
     }
 
-    #[cfg(any(
-        all(feature = "rsa", not(target_arch = "wasm32")),
-        feature = "secp256k1",
-        feature = "ecdsa"
-    ))]
+    #[cfg(all(feature = "rsa", not(target_arch = "wasm32")))]
     pub(crate) fn encoding_unsupported(key_type: &'static str) -> Self {
         Self {
             msg: format!("encoding {key_type} key to Protobuf is unsupported"),
@@ -124,18 +115,10 @@ pub struct SigningError {
 /// An error during encoding of key material.
 impl SigningError {
     #[cfg(any(feature = "secp256k1", feature = "rsa"))]
-    pub(crate) fn new<S: ToString>(msg: S) -> Self {
+    pub(crate) fn new<S: ToString>(msg: S, source: Option<Box<dyn Error + Send + Sync>>) -> Self {
         Self {
             msg: msg.to_string(),
-            source: None,
-        }
-    }
-
-    #[cfg(feature = "rsa")]
-    pub(crate) fn source(self, source: impl Error + Send + Sync + 'static) -> Self {
-        Self {
-            source: Some(Box::new(source)),
-            ..self
+            source,
         }
     }
 }