Merge pull request #58 from datachainlab/update-lcp

Update lcp and compiler versions Signed-off-by: Jun Kimura <[email protected]>
datachainlab · Sep 12, 2024 · 3a92c14 · 3a92c14
2 parents 7d2b271 + c652674
commit 3a92c14
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 358 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/light-client/Cargo.toml b/light-client/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-light-client = { git = "https://github.com/datachainlab/lcp", rev = "v0.2.9", default-features = false, features=["ibc"] }
+light-client = { git = "https://github.com/datachainlab/lcp", rev = "v0.2.10", default-features = false }
 
 rlp = { version = "0.5.2", default-features = false }
 prost = { version = "0.11", default-features = false }
@@ -28,8 +28,8 @@ milagro_bls = { git = "https://github.com/datachainlab/milagro_bls", rev = "bc2b
 hex-literal = "0.4.1"
 
 [dev-dependencies]
-store = { git = "https://github.com/datachainlab/lcp.git", rev = "v0.2.9", default-features = false }
-time = { version = "0.3", default-features = false, features = ["macros", "parsing"] }
+store = { git = "https://github.com/datachainlab/lcp.git", rev = "v0.2.10", default-features = false }
+time = { version = "0.3", default-features = false }
 rstest = "0.18"
 
 [features]

diff --git a/light-client/src/errors.rs b/light-client/src/errors.rs
@@ -68,7 +68,6 @@ pub enum Error {
     UnexpectedDifficulty(BlockNumber, u64),
     UnexpectedNonce(BlockNumber),
     UnexpectedRecoveryId(BlockNumber),
-    UnexpectedEncodedPoint(BlockNumber),
     UnexpectedAddress(BlockNumber),
     UnexpectedCoinbase(BlockNumber),
     MissingSignerInValidator(BlockNumber, Address),
@@ -178,7 +177,6 @@ impl core::fmt::Display for Error {
             Error::UnexpectedDifficulty(e1, e2) => write!(f, "UnexpectedDifficulty: {} {}", e1, e2),
             Error::UnexpectedNonce(e) => write!(f, "UnexpectedNonce: {}", e),
             Error::UnexpectedRecoveryId(e) => write!(f, "UnexpectedRecoveryId: {}", e),
-            Error::UnexpectedEncodedPoint(e) => write!(f, "UnexpectedEncodedPoint: {}", e),
             Error::UnexpectedAddress(e) => write!(f, "UnexpectedAddress: {}", e),
             Error::UnexpectedCoinbase(e) => write!(f, "UnexpectedCoinbase: {}", e),
             Error::MissingSignerInValidator(e1, e2) => {

diff --git a/light-client/src/header/eth_header.rs b/light-client/src/header/eth_header.rs
@@ -83,10 +83,7 @@ impl ETHHeader {
         let signer = VerifyingKey::recover_from_prehash(&seal_hash, &signature, rid)
             .map_err(|e| Error::UnexpectedSignature(self.number, e))?;
         let point = signer.as_affine().to_encoded_point(false);
-        let pubkey: Vec<u8> = point
-            .to_bytes()
-            .try_into()
-            .map_err(|_e| Error::UnexpectedEncodedPoint(self.number))?;
+        let pubkey: Vec<u8> = point.to_bytes().into();
         let address: Address = keccak_256(&pubkey[1..])[12..]
             .try_into()
             .map_err(|_e| Error::UnexpectedAddress(self.number))?;
@@ -670,7 +667,7 @@ pub(crate) mod test {
             };
         }
 
-        for mut block in blocks.iter_mut() {
+        for block in blocks.iter_mut() {
             block.coinbase = vec![];
             let result = block.verify_seal(&prev_epoch, &hp.network());
             match result.unwrap_err() {

diff --git a/light-client/src/lib.rs b/light-client/src/lib.rs
@@ -1,5 +1,5 @@
 #![no_std]
-
+#![allow(clippy::result_large_err)]
 #[cfg_attr(not(test), macro_use)]
 extern crate alloc;
 #[cfg(test)]

diff --git a/proto/Cargo.toml b/proto/Cargo.toml
@@ -14,8 +14,10 @@ all-features = true
 [dependencies]
 prost       = { version = "0.11", default-features = false }
 serde       = { version = "1.0", default-features = false }
+schemars    = { version = "0.8", optional = true }
 ibc-proto   = { version = "0.26.0", default-features = false }
 
 [features]
 default     = ["std"]
-std         = []
+std         = []
+json-schema = ["schemars"]
diff --git a/proto/src/lib.rs b/proto/src/lib.rs
@@ -6,6 +6,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 #![deny(warnings, trivial_casts, trivial_numeric_casts, unused_import_braces)]
 #![allow(clippy::large_enum_variant)]
+#![allow(clippy::too_long_first_doc_paragraph)]
 #![allow(rustdoc::bare_urls)]
 #![forbid(unsafe_code)]
 

diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-nightly-2022-10-22
+nightly-2024-09-05