Merge branch 'main' into romac/allow-misformed-block

.changelog/unreleased/breaking-changes/1389-blockidflag-to-primitive.md

@@ -0,0 +1,2 @@
+- `[tendermint-proto]` Remove redundant impl of `num_traits::ToPrimitive` for `BlockIDFlag`
+  ([\#1389](https://github.com/informalsystems/tendermint-rs/pull/1389))

.changelog/unreleased/features/1389-missing-serde-derives.md

@@ -0,0 +1,2 @@
+- `[tendermint-proto]` Add missing `serde` derives on Protobuf definitions
+  ([\#1389](https://github.com/informalsystems/tendermint-rs/pull/1389))

.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))

proto/Cargo.toml

@@ -28,8 +28,6 @@ bytes = { version = "1.0", default-features = false, features = ["serde"]}
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 serde_bytes = { version = "0.11", default-features = false, features = ["alloc"] }
 subtle-encoding = { version = "0.5", default-features = false, features = ["hex", "base64", "alloc"] }
-num-traits = { version = "0.2", default-features = false }
-num-derive = { version = "0.4", default-features = false }
 time = { version = "0.3", default-features = false, features = ["macros", "parsing"] }
 flex-error = { version = "0.4.4", default-features = false }
 tonic = { version = "0.10", optional = true }

proto/src/lib.rs

@@ -7,32 +7,29 @@
 
 extern crate alloc;
 
-mod prelude;
-
-/// Built-in prost_types with slight customization to enable JSON-encoding
-#[allow(warnings)]
-pub mod google {
-    pub mod protobuf {
-        // custom Timeout and Duration types that have valid doctest documentation texts
-        include!("protobuf.rs");
-    }
-}
-
 mod error;
-#[allow(warnings)]
+mod prelude;
 mod tendermint;
 
+use bytes::{Buf, BufMut};
 use core::fmt::Display;
+use prost::Message;
 
-use bytes::{Buf, BufMut};
 pub use error::Error;
-use prost::Message;
 pub use tendermint::*;
 
 pub mod serializers;
 
 use prelude::*;
 
+/// Built-in prost_types with slight customization to enable JSON-encoding
+pub mod google {
+    pub mod protobuf {
+        // custom Timeout and Duration types that have valid doctest documentation texts
+        include!("protobuf.rs");
+    }
+}
+
 /// Allows for easy Google Protocol Buffers encoding and decoding of domain
 /// types with validation.
 ///

proto/src/prelude.rs

@@ -1,11 +1,12 @@
 // Re-export according to alloc::prelude::v1 because it is not yet stabilized
 // https://doc.rust-lang.org/src/alloc/prelude/v1.rs.html
 
-#[allow(unused_imports)]
-pub use alloc::vec;
+#![allow(unused_imports)]
+
 pub use alloc::{
     format,
     string::{String, ToString},
+    vec,
     vec::Vec,
 };
 pub use core::prelude::v1::*;