Merge 34e0c13 into 99ed0b9

.changelog/unreleased/features/1401-ed25519-consensus-from-impls.md

@@ -0,0 +1,6 @@
+- `[tendermint]` Add the following impls for `ed25519-consensus`:
+  * `From<ed25519_consensus::SigningKey` for `tendermint::PrivateKey`
+  * `From<ed25519_consensus::SigningKey>` for `tendermint::SigningKey`
+  * `From<ed25519_consensus::VerificationKey>` for `tendermint::PublicKey`
+  * `From<ed25519_consensus::VerificationKey>` for `tendermint::VerificationKey`
+  ([\#1401](https://github.com/informalsystems/tendermint-rs/pull/1401))

tendermint/src/crypto/ed25519/signing_key.rs

@@ -7,6 +7,11 @@ use crate::Error;
 pub struct SigningKey([u8; 32]);
 
 impl SigningKey {
+    #[allow(dead_code)]
+    pub(super) fn new(bytes: [u8; 32]) -> Self {
+        Self(bytes)
+    }
+
     pub fn as_bytes(&self) -> &[u8] {
         &self.0
     }
@@ -41,3 +46,10 @@ impl TryFrom<SigningKey> for ed25519_consensus::SigningKey {
         Ok(ed25519_consensus::SigningKey::from(src.0))
     }
 }
+
+#[cfg(feature = "rust-crypto")]
+impl From<ed25519_consensus::SigningKey> for SigningKey {
+    fn from(sk: ed25519_consensus::SigningKey) -> Self {
+        Self::new(sk.to_bytes())
+    }
+}

tendermint/src/crypto/ed25519/verification_key.rs

@@ -51,3 +51,10 @@ impl TryFrom<VerificationKey> for ed25519_consensus::VerificationKey {
             .map_err(|_| Error::invalid_key("malformed Ed25519 public key".into()))
     }
 }
+
+#[cfg(feature = "rust-crypto")]
+impl From<ed25519_consensus::VerificationKey> for VerificationKey {
+    fn from(vk: ed25519_consensus::VerificationKey) -> Self {
+        Self::new(vk.to_bytes())
+    }
+}

tendermint/src/private_key.rs

@@ -68,6 +68,19 @@ impl PrivateKey {
             PrivateKey::Secp256k1(_signing_key) => None,
         }
     }
+
+    /// From an [`ed25519_consensus::SigningKey`]
+    #[cfg(feature = "rust-crypto")]
+    pub fn from_ed25519_consensus(sk: ed25519_consensus::SigningKey) -> Self {
+        Self::Ed25519(sk.into())
+    }
+}
+
+#[cfg(feature = "rust-crypto")]
+impl From<ed25519_consensus::SigningKey> for PrivateKey {
+    fn from(sk: ed25519_consensus::SigningKey) -> Self {
+        Self::Ed25519(sk.into())
+    }
 }
 
 /// Serialize a Secp256k1 privkey as Base64

tendermint/src/public_key.rs

@@ -175,6 +175,12 @@ impl PublicKey {
         Ed25519::try_from(bytes).map(PublicKey::Ed25519).ok()
     }
 
+    /// From an [`ed25519_consensus::VerificationKey`]
+    #[cfg(feature = "rust-crypto")]
+    pub fn from_ed25519_consensus(vk: ed25519_consensus::VerificationKey) -> Self {
+        Self::from(vk)
+    }
+
     /// Get Ed25519 public key
     pub fn ed25519(self) -> Option<Ed25519> {
         #[allow(unreachable_patterns)]
@@ -240,6 +246,13 @@ impl From<Secp256k1> for PublicKey {
     }
 }
 
+#[cfg(feature = "rust-crypto")]
+impl From<ed25519_consensus::VerificationKey> for PublicKey {
+    fn from(vk: ed25519_consensus::VerificationKey) -> PublicKey {
+        PublicKey::Ed25519(vk.into())
+    }
+}
+
 impl PartialOrd for PublicKey {
     fn partial_cmp(&self, other: &PublicKey) -> Option<Ordering> {
         Some(self.cmp(other))