Merge branch 'arjentix/fix-sequencer-msg-id' into Pravdyvy/indexer-state-management

common/src/block.rs

@@ -6,6 +6,16 @@ use sha2::{Digest, Sha256, digest::FixedOutput};
 use crate::{HashType, transaction::NSSATransaction};
 
 pub type MantleMsgId = [u8; 32];
+pub type BlockHash = HashType;
+pub type BlockId = u64;
+pub type TimeStamp = u64;
+
+#[derive(Debug, Clone, BorshSerialize, BorshDeserialize)]
+pub struct BlockMeta {
+    pub id: BlockId,
+    pub hash: BlockHash,
+    pub msg_id: MantleMsgId,
+}
 
 #[derive(Debug, Clone)]
 /// Our own hasher.
@@ -21,10 +31,6 @@ impl OwnHasher {
     }
 }
 
-pub type BlockHash = HashType;
-pub type BlockId = u64;
-pub type TimeStamp = u64;
-
 #[derive(Debug, Clone, BorshSerialize, BorshDeserialize)]
 pub struct BlockHeader {
     pub block_id: BlockId,

common/src/error.rs

@@ -13,25 +13,13 @@ pub struct SequencerRpcError {
 #[derive(thiserror::Error, Debug)]
 pub enum SequencerClientError {
     #[error("HTTP error")]
-    HTTPError(reqwest::Error),
+    HTTPError(#[from] reqwest::Error),
     #[error("Serde error")]
-    SerdeError(serde_json::Error),
-    #[error("Internal error")]
+    SerdeError(#[from] serde_json::Error),
+    #[error("Internal error: {0:?}")]
     InternalError(SequencerRpcError),
 }
 
-impl From<reqwest::Error> for SequencerClientError {
-    fn from(value: reqwest::Error) -> Self {
-        SequencerClientError::HTTPError(value)
-    }
-}
-
-impl From<serde_json::Error> for SequencerClientError {
-    fn from(value: serde_json::Error) -> Self {
-        SequencerClientError::SerdeError(value)
-    }
-}
-
 impl From<SequencerRpcError> for SequencerClientError {
     fn from(value: SequencerRpcError) -> Self {
         SequencerClientError::InternalError(value)