Substrate companion #9491 (#3568)

* Substrate companion #9491

https://github.com/paritytech/substrate/pull/9491

* update Substrate

* Fix build

Co-authored-by: parity-processbot <>

polkadot/node/service/src/chain_spec.rs

@@ -64,6 +64,10 @@ pub struct Extensions {
 	pub fork_blocks: sc_client_api::ForkBlocks<polkadot_primitives::v1::Block>,
 	/// Known bad block hashes.
 	pub bad_blocks: sc_client_api::BadBlocks<polkadot_primitives::v1::Block>,
+	/// The light sync state.
+	///
+	/// This value will be set by the `sync-state rpc` implementation.
+	pub light_sync_state: sc_sync_state_rpc::LightSyncStateExtension,
 }
 
 /// The `ChainSpec` parameterized for the polkadot runtime.

polkadot/node/service/src/lib.rs

@@ -322,10 +322,7 @@ fn new_partial<RuntimeApi, Executor>(
 		sc_consensus::DefaultImportQueue<Block, FullClient<RuntimeApi, Executor>>,
 		sc_transaction_pool::FullPool<Block, FullClient<RuntimeApi, Executor>>,
 		(
-			impl Fn(
-				polkadot_rpc::DenyUnsafe,
-				polkadot_rpc::SubscriptionTaskExecutor,
-			) -> polkadot_rpc::RpcExtension,
+			impl service::RpcExtensionBuilder,
 			(
 				babe::BabeBlockImport<
 					Block,
@@ -469,7 +466,7 @@ where
 
 		move |deny_unsafe,
 		      subscription_executor: polkadot_rpc::SubscriptionTaskExecutor|
-		      -> polkadot_rpc::RpcExtension {
+		      -> Result<polkadot_rpc::RpcExtension, service::Error> {
 			let deps = polkadot_rpc::FullDeps {
 				client: client.clone(),
 				pool: transaction_pool.clone(),
@@ -494,7 +491,7 @@ where
 				},
 			};
 
-			polkadot_rpc::create_full(deps)
+			polkadot_rpc::create_full(deps).map_err(Into::into)
 		}
 	};