fix: genesis hash input is optional, added genesis hash card

src/cards.rs

@@ -522,7 +522,7 @@ impl ParsedData {
             }],
             ParsedData::Era(value) => single_card!(Era, value, indent, info_flat),
             ParsedData::Event(event) => event.card(indent, short_specs, spec_name),
-            ParsedData::GenesisHash(_) => Vec::new(),
+            ParsedData::GenesisHash(value) => single_card!(GenesisHash, value, indent, info_flat),
             ParsedData::H160(value) => single_card!(H160, value, indent, info_flat),
             ParsedData::H256(value) => single_card!(H256, value, indent, info_flat),
             ParsedData::H512(value) => single_card!(H512, value, indent, info_flat),
@@ -983,6 +983,7 @@ pub enum ParserCard {
     EventName(String),
     FieldName(String),
     FieldNumber(usize),
+    GenesisHash(H256),
     H160(H160),
     H256(H256),
     H512(H512),
@@ -1134,6 +1135,7 @@ impl ExtendedCard {
             ParserCard::EventName(a) => readable(self.indent, "Event", a),
             ParserCard::FieldName(a) => readable(self.indent, "Field Name", a),
             ParserCard::FieldNumber(a) => readable(self.indent, "Field Number", &a.to_string()),
+            ParserCard::GenesisHash(a) => readable(self.indent, "Genesis Hash", &hex::encode(a)),
             ParserCard::H160(a) => readable(self.indent, "H160", &hex::encode(a.0)),
             ParserCard::H256(a) => readable(self.indent, "H256", &hex::encode(a.0)),
             ParserCard::H512(a) => readable(self.indent, "H512", &hex::encode(a.0)),

src/decoding_sci_ext.rs

@@ -38,7 +38,7 @@ pub fn decode_extensions<B, E, M>(
     marked_data: &MarkedData<B, E>,
     ext_memory: &mut E,
     meta_v14: &M,
-    genesis_hash: H256,
+    optional_genesis_hash: Option<H256>,
 ) -> Result<Vec<ExtendedData>, SignableError<E>>
 where
     B: AddressableBuffer<E>,
@@ -48,7 +48,13 @@ where
     let mut position = marked_data.extensions_start();
     let data = marked_data.data();
 
-    decode_extensions_unmarked(data, &mut position, ext_memory, meta_v14, genesis_hash)
+    decode_extensions_unmarked(
+        data,
+        &mut position,
+        ext_memory,
+        meta_v14,
+        optional_genesis_hash,
+    )
 }
 
 /// Parse extensions part of the signable transaction using provided metadata.
@@ -68,7 +74,7 @@ pub fn decode_extensions_unmarked<B, E, M>(
     position: &mut usize,
     ext_memory: &mut E,
     meta_v14: &M,
-    genesis_hash: H256,
+    optional_genesis_hash: Option<H256>,
 ) -> Result<Vec<ExtendedData>, SignableError<E>>
 where
     B: AddressableBuffer<E>,
@@ -113,7 +119,7 @@ where
     check_extensions::<E>(
         &extensions,
         &spec_name_version.printed_spec_version,
-        genesis_hash,
+        optional_genesis_hash,
     )?;
     Ok(extensions)
 }
@@ -126,7 +132,7 @@ where
 fn check_extensions<E: ExternalMemory>(
     extensions: &[ExtendedData],
     version: &str,
-    genesis_hash: H256,
+    optional_genesis_hash: Option<H256>,
 ) -> Result<(), SignableError<E>> {
     let mut collected_ext = CollectedExt::new();
     for ext in extensions.iter() {
@@ -156,11 +162,13 @@ fn check_extensions<E: ExternalMemory>(
     }
     match collected_ext.genesis_hash {
         Some(found_genesis_hash) => {
-            if found_genesis_hash != genesis_hash {
-                return Err(SignableError::WrongGenesisHash {
-                    as_decoded: found_genesis_hash,
-                    expected: genesis_hash,
-                });
+            if let Some(genesis_hash) = optional_genesis_hash {
+                if found_genesis_hash != genesis_hash {
+                    return Err(SignableError::WrongGenesisHash {
+                        as_decoded: found_genesis_hash,
+                        expected: genesis_hash,
+                    });
+                }
             }
         }
         None => {
@@ -171,8 +179,10 @@ fn check_extensions<E: ExternalMemory>(
     }
     if let Some(Era::Immortal) = collected_ext.era {
         if let Some(block_hash) = collected_ext.block_hash {
-            if genesis_hash != block_hash {
-                return Err(SignableError::ImmortalHashMismatch);
+            if let Some(genesis_hash) = collected_ext.genesis_hash {
+                if genesis_hash != block_hash {
+                    return Err(SignableError::ImmortalHashMismatch);
+                }
             }
         }
     }

src/lib.rs

@@ -154,7 +154,7 @@
 //!     &signable_data.as_ref(),
 //!     &mut (),
 //!     &metadata_westend9111,
-//!     westend_genesis_hash,
+//!     Some(westend_genesis_hash),
 //! ).unwrap();
 //!
 //! let call_data = parsed.call_result.unwrap();
@@ -620,7 +620,7 @@ pub fn parse_transaction<B, E, M>(
     data: &B,
     ext_memory: &mut E,
     meta_v14: &M,
-    genesis_hash: H256,
+    optional_genesis_hash: Option<H256>,
 ) -> Result<TransactionParsed<E>, SignableError<E>>
 where
     B: AddressableBuffer<E>,
@@ -634,7 +634,7 @@ where
     // try parsing extensions, check that spec version and genesis hash are
     // correct
     let extensions =
-        decode_extensions::<B, E, M>(&marked_data, ext_memory, meta_v14, genesis_hash)?;
+        decode_extensions::<B, E, M>(&marked_data, ext_memory, meta_v14, optional_genesis_hash)?;
 
     // try parsing call data
     let call_result = decode_as_call::<B, E, M>(&marked_data, ext_memory, meta_v14);
@@ -683,7 +683,7 @@ pub fn parse_transaction_unmarked<B, E, M>(
     data: &B,
     ext_memory: &mut E,
     meta_v14: &M,
-    genesis_hash: H256,
+    optional_genesis_hash: Option<H256>,
 ) -> Result<TransactionUnmarkedParsed, SignableError<E>>
 where
     B: AddressableBuffer<E>,
@@ -702,7 +702,7 @@ where
         &mut position,
         ext_memory,
         meta_v14,
-        genesis_hash,
+        optional_genesis_hash,
     )?;
 
     Ok(TransactionUnmarkedParsed { call, extensions })