Add prev ship hash to telos EVM block

telosnetwork · Oct 2, 2024 · d411d32 · d411d32
1 parent a4ed288
commit d411d32
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 1 deletion.
diff --git a/translator/src/block.rs b/translator/src/block.rs
@@ -87,7 +87,8 @@ pub enum DecodedRow {
 #[derive(Clone)]
 pub struct ProcessingEVMBlock {
     pub block_num: u32,
-    block_hash: Checksum256,
+    pub block_hash: Checksum256,
+    pub prev_block_hash: Option<Checksum256>,
     chain_id: u64,
     result: GetBlocksResultV0,
     signed_block: Option<SignedBlock>,
@@ -108,6 +109,8 @@ pub struct ProcessingEVMBlock {
 pub struct TelosEVMBlock {
     pub block_num: u32,
     pub block_hash: B256,
+    pub ship_hash: String,
+    pub prev_ship_hash: Option<String>,
     pub lib_num: u32,
     pub lib_hash: String,
     pub header: Header,
@@ -145,13 +148,15 @@ impl ProcessingEVMBlock {
         chain_id: u64,
         block_num: u32,
         block_hash: Checksum256,
+        prev_block_hash: Option<Checksum256>,
         lib_num: u32,
         lib_hash: Checksum256,
         result: GetBlocksResultV0,
     ) -> Self {
         Self {
             block_num,
             block_hash,
+            prev_block_hash,
             lib_num,
             lib_hash,
             chain_id,

diff --git a/translator/src/tasks/final_processor.rs b/translator/src/tasks/final_processor.rs
@@ -160,9 +160,12 @@ pub async fn final_processor(
                 .collect(),
         );
 
+	let prev_ship_hash = block.prev_block_hash.map(|hash| hash.as_string());
         let completed_block = TelosEVMBlock {
             block_num: evm_block_num,
             block_hash,
+	    ship_hash: block.block_hash.as_string(),
+            prev_ship_hash,
             lib_num: block.lib_num,
             lib_hash: block.lib_hash.as_string(),
             transactions: block.transactions,

diff --git a/translator/src/tasks/raw_deserializer.rs b/translator/src/tasks/raw_deserializer.rs
@@ -87,6 +87,7 @@ pub async fn raw_deserializer(
                         config.chain_id.0,
                         b.block_num,
                         b.block_id,
+                        r.prev_block.as_ref().map(|b| b.block_id),
                         r.last_irreversible.block_num,
                         r.last_irreversible.block_id,
                         r.clone(),

diff --git a/translator/tests/block_headers.rs b/translator/tests/block_headers.rs
@@ -64,6 +64,7 @@ async fn generate_block(
         chain_id,
         block_num,
         block_pos.block_id,
+        None,
         // Block is always final
         block_num,
         block_pos.block_id,

diff --git a/translator/tests/decode_block.rs b/translator/tests/decode_block.rs
@@ -21,6 +21,7 @@ fn decode_block() {
                     1,
                     b.block_num,
                     Checksum256::default(),
+                    None,
                     b.block_num,
                     Checksum256::default(),
                     r.clone(),