Upgrade to signatory v0.17

tendermint/Cargo.toml

@@ -42,16 +42,16 @@ prost-amino-derive = { version = "0.4.0" }
 rand_os = { version = "0.1" }
 serde = { version = "1", features = ["derive"] }
 serde_json = { version = "1" }
-signatory = { version = "0.12", features = ["ed25519", "ecdsa"] }
-signatory-dalek = { version = "0.12" }
+signatory = { version = "0.17", features = ["ed25519", "ecdsa"] }
+signatory-dalek = "0.17"
+signatory-secp256k1 = "0.17"
 sha2 = { version = "0.8", default-features = false }
 subtle = "2"
 subtle-encoding = { version = "0.3", features = ["bech32-preview"] }
 tai64 = { version = "3", features = ["chrono"] }
 toml = { version = "0.5" }
 uuid = { version = "0.7", default-features = false }
-zeroize = { version = "1.0", features = ["zeroize_derive"] }
-ed25519-dalek = {version = "1.0.0-pre.3", features = ["rand"]}
+zeroize = { version = "1.1", features = ["zeroize_derive"] }
 
 [dev-dependencies]
 serde_json = "1"

tendermint/src/amino_types/proposal.rs

@@ -12,7 +12,7 @@ use crate::{
 };
 use bytes::BufMut;
 use prost::{EncodeError, Message};
-use signatory::{ed25519, Signature};
+use signatory::ed25519;
 use std::convert::TryFrom;
 
 #[derive(Clone, PartialEq, Message)]
@@ -125,7 +125,7 @@ impl SignableMsg for SignProposalRequest {
     }
     fn set_signature(&mut self, sig: &ed25519::Signature) {
         if let Some(ref mut prop) = self.proposal {
-            prop.signature = sig.clone().into_vec();
+            prop.signature = sig.as_ref().to_vec();
         }
     }
     fn validate(&self) -> Result<(), ValidationError> {

tendermint/src/amino_types/vote.rs

@@ -15,7 +15,7 @@ use crate::{
 };
 use bytes::BufMut;
 use prost::{error::EncodeError, Message};
-use signatory::{ed25519, Signature};
+use signatory::ed25519;
 use std::convert::TryFrom;
 
 const VALIDATOR_ADDR_SIZE: usize = 20;
@@ -177,7 +177,7 @@ impl SignableMsg for SignVoteRequest {
     }
     fn set_signature(&mut self, sig: &ed25519::Signature) {
         if let Some(ref mut vt) = self.vote {
-            vt.signature = sig.clone().into_vec();
+            vt.signature = sig.as_ref().to_vec();
         }
     }
     fn validate(&self) -> Result<(), ValidationError> {

tendermint/src/error.rs

@@ -107,10 +107,15 @@ impl From<serde_json::error::Error> for Error {
     }
 }
 
-impl From<signatory::Error> for Error {
-    fn from(_err: signatory::Error) -> Self {
-        // `signatory::Error` is opaque
-        err!(ErrorKind::Crypto, "signature error")
+impl From<signatory::signature::Error> for Error {
+    fn from(err: signatory::signature::Error) -> Self {
+        use std::error::Error as _;
+
+        if let Some(source) = err.source() {
+            err!(ErrorKind::Crypto, "signature error: {}", source)
+        } else {
+            err!(ErrorKind::Crypto, "signature error")
+        }
     }
 }
 

tendermint/src/private_key.rs

@@ -3,7 +3,7 @@
 use crate::public_key::PublicKey;
 use serde::{de, de::Error as _, ser, Deserialize, Serialize};
 use signatory::ed25519;
-use signatory::PublicKeyed;
+use signatory::public_key::PublicKeyed;
 use signatory_dalek::Ed25519Signer;
 use subtle_encoding::{Base64, Encoding};
 use zeroize::{Zeroize, Zeroizing};

tendermint/src/public_key.rs

@@ -14,7 +14,7 @@ use subtle_encoding::{bech32, hex};
 /// Public keys allowed in Tendermint protocols
 #[derive(Serialize, Deserialize)]
 #[serde(tag = "type", content = "value")]
-#[derive(Copy, Clone, Debug, Hash, Eq, PartialEq, PartialOrd, Ord)]
+#[derive(Copy, Clone, Debug, Eq, PartialEq, PartialOrd, Ord)]
 pub enum PublicKey {
     /// Ed25519 keys
     #[serde(
@@ -104,7 +104,7 @@ impl From<secp256k1::PublicKey> for PublicKey {
 }
 
 /// Public key roles used in Tendermint networks
-#[derive(Copy, Clone, Debug, Hash, Eq, PartialEq, PartialOrd, Ord)]
+#[derive(Copy, Clone, Debug, Eq, PartialEq, PartialOrd, Ord)]
 pub enum TendermintKey {
     /// User signing keys used for interacting with accounts in the state machine
     AccountKey(PublicKey),

tendermint/src/signature.rs

@@ -1,7 +1,7 @@
 //! Cryptographic (a.k.a. digital) signatures
 
 use serde::{de::Error as _, Deserialize, Deserializer, Serialize, Serializer};
-use signatory::Signature as SignatureTrait;
+use signatory::signature::Signature as _;
 use subtle_encoding::base64;
 
 /// Signatures
@@ -21,8 +21,14 @@ impl Signature {
 
     /// Return the raw bytes of this signature
     pub fn as_bytes(&self) -> &[u8] {
+        self.as_ref()
+    }
+}
+
+impl AsRef<[u8]> for Signature {
+    fn as_ref(&self) -> &[u8] {
         match self {
-            Signature::Ed25519(sig) => sig.as_bytes(),
+            Signature::Ed25519(sig) => sig.as_ref(),
         }
     }
 }
@@ -41,11 +47,7 @@ impl<'de> Deserialize<'de> for Signature {
 
 impl Serialize for Signature {
     fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
-        let sig_bytes = match self {
-            Signature::Ed25519(sig) => sig.as_bytes(),
-        };
-
-        String::from_utf8(base64::encode(&sig_bytes[..]))
+        String::from_utf8(base64::encode(self.as_ref()))
             .unwrap()
             .serialize(serializer)
     }

tendermint/src/validator.rs

@@ -1,12 +1,12 @@
 //! Tendermint validators
 
-use crate::validator::signatory::{Signature, Verifier};
 use crate::{account, lite, merkle, vote, Hash, PublicKey};
 use prost::Message;
 use serde::{de::Error as _, Deserialize, Deserializer, Serialize, Serializer};
-use signatory;
-use signatory::ed25519;
-use signatory_dalek;
+use signatory::{
+    ed25519,
+    signature::{Signature, Verifier},
+};
 use signatory_dalek::Ed25519Verifier;
 use subtle_encoding::base64;
 

tendermint/src/vote.rs

@@ -103,10 +103,9 @@ impl lite::Vote for SignedVote {
         self.vote.encode(&mut sign_bytes).unwrap();
         sign_bytes
     }
+
     fn signature(&self) -> &[u8] {
-        match &self.signature {
-            Signature::Ed25519(sig) => sig.as_bytes(),
-        }
+        self.signature.as_ref()
     }
 }