Merge pull request #3094 from autonomys/improve-pot-seed-handling

Treat `potExternalEntropy: null` in chain spec as missing value
autonomys · Oct 3, 2024 · 714f952 · 714f952
2 parents ab8384a + 041378f
commit 714f952
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/crates/subspace-node/src/main.rs b/crates/subspace-node/src/main.rs
@@ -106,13 +106,14 @@ fn derive_pot_external_entropy(
         .properties()
         .get("potExternalEntropy")
         .map(|d| match d.clone() {
-            Value::String(s) => Ok(s),
-            Value::Null => Ok(String::new()),
+            Value::String(s) => Ok(Some(s)),
+            Value::Null => Ok(None),
             _ => Err(sc_service::Error::Other(
                 "Failed to decode PoT initial key".to_string(),
             )),
         })
-        .transpose()?;
+        .transpose()?
+        .flatten();
     if maybe_chain_spec_pot_external_entropy.is_some()
         && maybe_pot_external_entropy.is_some()
         && maybe_chain_spec_pot_external_entropy != maybe_pot_external_entropy