feat: Blueprint Manager Updates (#986)

Author: shekohex

node/src/blueprint_service.rs

@@ -13,15 +13,20 @@ pub fn create_blueprint_manager_service<P: AsRef<Path>>(
 	rpc_port: u16,
 	data_dir: P,
 	local_keystore: Arc<LocalKeystore>,
+	test_mode: bool,
 ) -> Result<BlueprintManagerHandle, ServiceError> {
+	let data_dir = data_dir.as_ref().to_path_buf();
+	let base_dir = data_dir.parent().ok_or_else(|| {
+		ServiceError::Application("Failed to get parent directory for keystore".into())
+	})?;
 	let config = BlueprintManagerConfig {
 		gadget_config: None,
-		keystore_uri: data_dir.as_ref().display().to_string(),
-		data_dir: data_dir.as_ref().to_path_buf(),
+		keystore_uri: base_dir.join("keystore").to_path_buf().to_string_lossy().into(),
+		data_dir,
 		verbose: 2,
 		pretty: false,
 		instance_id: None,
-		test_mode: false,
+		test_mode,
 	};
 	let mut env = BlueprintEnvironment::default();
 

node/src/manual_seal.rs

@@ -527,6 +527,8 @@ pub async fn new_full<Network: sc_network::NetworkBackend<Block, <Block as Block
 	let config_data_path = config.data_path.clone();
 	#[cfg(feature = "blueprint-manager")]
 	let rpc_port = config.rpc_port;
+	#[cfg(feature = "blueprint-manager")]
+	let chain_type = config.chain_spec.chain_type();
 	let params = sc_service::SpawnTasksParams {
 		network: network.clone(),
 		client: client.clone(),
@@ -625,10 +627,12 @@ pub async fn new_full<Network: sc_network::NetworkBackend<Block, <Block as Block
 		#[cfg(feature = "blueprint-manager")]
 		{
 			log::info!("Blueprint Manager is enabled.");
+			let test_mode = chain_type == ChainType::Development || chain_type == ChainType::Local;
 			let bp_mngr = crate::blueprint_service::create_blueprint_manager_service(
 				rpc_port,
 				config_data_path.join("blueprints"),
 				keystore_container.local_keystore(),
+				test_mode,
 			)?;
 
 			task_manager
@@ -689,10 +693,12 @@ pub async fn new_full<Network: sc_network::NetworkBackend<Block, <Block as Block
 	#[cfg(feature = "blueprint-manager")]
 	{
 		log::info!("Blueprint Manager is enabled.");
+		let test_mode = chain_type == ChainType::Development || chain_type == ChainType::Local;
 		let bp_mngr = crate::blueprint_service::create_blueprint_manager_service(
 			rpc_port,
 			config_data_path.join("blueprints"),
 			keystore_container.local_keystore(),
+			test_mode,
 		)?;
 
 		task_manager

node/src/service.rs

@@ -530,6 +530,8 @@ pub async fn new_full<Network: sc_network::NetworkBackend<Block, <Block as Block
 	let config_data_path = config.data_path.clone();
 	#[cfg(feature = "blueprint-manager")]
 	let rpc_port = config.rpc_port;
+	#[cfg(feature = "blueprint-manager")]
+	let chain_type = config.chain_spec.chain_type();
 	let params = sc_service::SpawnTasksParams {
 		network: network.clone(),
 		client: client.clone(),
@@ -653,10 +655,12 @@ pub async fn new_full<Network: sc_network::NetworkBackend<Block, <Block as Block
 
 	#[cfg(feature = "blueprint-manager")]
 	{
+		let test_mode = chain_type == ChainType::Development || chain_type == ChainType::Local;
 		let bp_mngr = crate::blueprint_service::create_blueprint_manager_service(
 			rpc_port,
 			config_data_path.join("blueprints"),
 			keystore_container.local_keystore(),
+			test_mode,
 		)?;
 
 		task_manager