Merge pull request #534 from subspace/fix-bootnodes-override

Fix override for bootnodes

Author: nazar-pc

crates/sc-subspace-chain-specs/src/utils.rs

@@ -15,6 +15,8 @@ use std::fmt;
 use std::marker::PhantomData;
 use std::path::PathBuf;
 
+/// Serializes chain spec to a string, note that when serialized with `serde_json` it'll end up
+/// being serialized twice, hence it will be JSON-encoded string.
 pub struct SerializableChainSpec<GenesisConfig, Extensions = NoExtension> {
     chain_spec: GenericChainSpec<GenesisConfig, Extensions>,
 }

crates/subspace-node/src/lib.rs

@@ -29,6 +29,7 @@ use sc_executor::{NativeExecutionDispatch, RuntimeVersion};
 use sc_service::ChainSpec;
 use sc_subspace_chain_specs::ConsensusChainSpec;
 use sc_telemetry::serde_json;
+use serde_json::Value;
 use std::io::Write;
 use std::{fs, io};
 
@@ -229,15 +230,18 @@ impl SubstrateCli for Cli {
         // In case there are bootstrap nodes specified explicitly, ignore those that are in the
         // chain spec
         if !self.run.network_params.bootnodes.is_empty() {
-            let mut chain_spec_value =
-                serde_json::to_value(&chain_spec).map_err(|error| error.to_string())?;
+            let mut chain_spec_value: Value = serde_json::from_str(&chain_spec.as_json(true)?)
+                .map_err(|error| error.to_string())?;
             if let Some(boot_nodes) = chain_spec_value.get_mut("bootNodes") {
                 if let Some(boot_nodes) = boot_nodes.as_array_mut() {
                     boot_nodes.clear();
                 }
             }
-            chain_spec =
-                serde_json::from_value(chain_spec_value).map_err(|error| error.to_string())?;
+            // Such mess because native serialization of the chain spec serializes it twice, see
+            // docs on `sc_subspace_chain_specs::utils::SerializableChainSpec`.
+            chain_spec = serde_json::to_string(&chain_spec_value.to_string())
+                .and_then(|chain_spec_string| serde_json::from_str(&chain_spec_string))
+                .map_err(|error| error.to_string())?;
         }
         Ok(Box::new(chain_spec))
     }

crates/subspace-node/src/secondary_chain/cli.rs

@@ -23,6 +23,7 @@ use sc_cli::{
 use sc_service::config::PrometheusConfig;
 use sc_service::BasePath;
 use sc_subspace_chain_specs::ExecutionChainSpec;
+use serde_json::Value;
 use std::net::SocketAddr;
 use std::path::PathBuf;
 
@@ -105,15 +106,18 @@ impl SubstrateCli for SecondaryChainCli {
         // In case there are bootstrap nodes specified explicitly, ignore those that are in the
         // chain spec
         if !self.run.network_params.bootnodes.is_empty() {
-            let mut chain_spec_value =
-                serde_json::to_value(&chain_spec).map_err(|error| error.to_string())?;
+            let mut chain_spec_value: Value = serde_json::from_str(&chain_spec.as_json(true)?)
+                .map_err(|error| error.to_string())?;
             if let Some(boot_nodes) = chain_spec_value.get_mut("bootNodes") {
                 if let Some(boot_nodes) = boot_nodes.as_array_mut() {
                     boot_nodes.clear();
                 }
             }
-            chain_spec =
-                serde_json::from_value(chain_spec_value).map_err(|error| error.to_string())?;
+            // Such mess because native serialization of the chain spec serializes it twice, see
+            // docs on `sc_subspace_chain_specs::utils::SerializableChainSpec`.
+            chain_spec = serde_json::to_string(&chain_spec_value.to_string())
+                .and_then(|chain_spec_string| serde_json::from_str(&chain_spec_string))
+                .map_err(|error| error.to_string())?;
         }
 
         Ok(Box::new(chain_spec))