Storage chains sync (#9171)

* Sync storage chains

* Test

* Apply suggestions from code review

Co-authored-by: cheme <emericchevalier.pro@gmail.com>

* Separate block body and indexed body

* Update client/db/src/lib.rs

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

Co-authored-by: cheme <emericchevalier.pro@gmail.com>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

substrate/client/api/src/backend.rs

@@ -149,6 +149,7 @@ pub trait BlockImportOperation<Block: BlockT> {
 		&mut self,
 		header: Block::Header,
 		body: Option<Vec<Block::Extrinsic>>,
+		indexed_body: Option<Vec<Vec<u8>>>,
 		justifications: Option<Justifications>,
 		state: NewBlockState,
 	) -> sp_blockchain::Result<()>;

substrate/client/api/src/in_mem.rs

@@ -572,6 +572,7 @@ impl<Block: BlockT> backend::BlockImportOperation<Block> for BlockImportOperatio
 		&mut self,
 		header: <Block as BlockT>::Header,
 		body: Option<Vec<<Block as BlockT>::Extrinsic>>,
+		_indexed_body: Option<Vec<Vec<u8>>>,
 		justifications: Option<Justifications>,
 		state: NewBlockState,
 	) -> sp_blockchain::Result<()> {

substrate/client/cli/src/arg_enums.rs

@@ -250,8 +250,14 @@ impl Into<sc_network::config::SyncMode> for SyncMode {
 	fn into(self) -> sc_network::config::SyncMode {
 		match self {
 			SyncMode::Full => sc_network::config::SyncMode::Full,
-			SyncMode::Fast => sc_network::config::SyncMode::Fast { skip_proofs: false },
+			SyncMode::Fast => sc_network::config::SyncMode::Fast {
-			SyncMode::FastUnsafe => sc_network::config::SyncMode::Fast { skip_proofs: true },
+				skip_proofs: false,
+				storage_chain_mode: false,
+			},
+			SyncMode::FastUnsafe => sc_network::config::SyncMode::Fast {
+				skip_proofs: true,
+				storage_chain_mode: false,
+			},
 		}
 	}
 }

substrate/client/db/src/changes_tries_storage.rs

@@ -572,7 +572,7 @@ mod tests {
 		};
 		let mut op = backend.begin_operation().unwrap();
 		backend.begin_state_operation(&mut op, block_id).unwrap();
-		op.set_block_data(header, None, None, NewBlockState::Best).unwrap();
+		op.set_block_data(header, None, None, None, NewBlockState::Best).unwrap();
 		op.update_changes_trie((changes_trie_update, ChangesTrieCacheAction::Clear)).unwrap();
 		backend.commit_operation(op).unwrap();
 
@@ -916,7 +916,7 @@ mod tests {
 		backend.begin_state_operation(&mut op, BlockId::Hash(block2)).unwrap();
 		op.mark_finalized(BlockId::Hash(block1), None).unwrap();
 		op.mark_finalized(BlockId::Hash(block2), None).unwrap();
-		op.set_block_data(header3, None, None, NewBlockState::Final).unwrap();
+		op.set_block_data(header3, None, None, None, NewBlockState::Final).unwrap();
 		backend.commit_operation(op).unwrap();
 
 		// insert more unfinalized headers
@@ -941,7 +941,7 @@ mod tests {
 		op.mark_finalized(BlockId::Hash(block4), None).unwrap();
 		op.mark_finalized(BlockId::Hash(block5), None).unwrap();
 		op.mark_finalized(BlockId::Hash(block6), None).unwrap();
-		op.set_block_data(header7, None, None, NewBlockState::Final).unwrap();
+		op.set_block_data(header7, None, None, None, NewBlockState::Final).unwrap();
 		backend.commit_operation(op).unwrap();
 	}
 

substrate/client/db/src/lib.rs

@@ -74,6 +74,7 @@ use sp_arithmetic::traits::Saturating;
 use sp_runtime::{generic::{DigestItem, BlockId}, Justification, Justifications, Storage};
 use sp_runtime::traits::{
 	Block as BlockT, Header as HeaderT, NumberFor, Zero, One, SaturatedConversion, HashFor,
+	Hash,
 };
 use sp_state_machine::{
 	DBValue, ChangesTrieTransaction, ChangesTrieCacheAction, UsageInfo as StateUsageInfo,
@@ -384,6 +385,7 @@ struct PendingBlock<Block: BlockT> {
 	header: Block::Header,
 	justifications: Option<Justifications>,
 	body: Option<Vec<Block::Extrinsic>>,
+	indexed_body: Option<Vec<Vec<u8>>>,
 	leaf_state: NewBlockState,
 }
 
@@ -824,6 +826,7 @@ impl<Block: BlockT> sc_client_api::backend::BlockImportOperation<Block> for Bloc
 		&mut self,
 		header: Block::Header,
 		body: Option<Vec<Block::Extrinsic>>,
+		indexed_body: Option<Vec<Vec<u8>>>,
 		justifications: Option<Justifications>,
 		leaf_state: NewBlockState,
 	) -> ClientResult<()> {
@@ -834,6 +837,7 @@ impl<Block: BlockT> sc_client_api::backend::BlockImportOperation<Block> for Bloc
 		self.pending_block = Some(PendingBlock {
 			header,
 			body,
+			indexed_body,
 			justifications,
 			leaf_state,
 		});
@@ -1068,7 +1072,7 @@ impl<Block: BlockT> Backend<Block> {
 
 	/// Create new memory-backed client backend for tests.
 	#[cfg(any(test, feature = "test-helpers"))]
-	fn new_test_with_tx_storage(
+	pub fn new_test_with_tx_storage(
 		keep_blocks: u32,
 		canonicalization_delay: u64,
 		transaction_storage: TransactionStorageMode,
@@ -1393,6 +1397,16 @@ impl<Block: BlockT> Backend<Block> {
 					},
 				}
 			}
+			if let Some(body) = pending_block.indexed_body {
+				match self.transaction_storage {
+					TransactionStorageMode::BlockBody => {
+						debug!(target: "db", "Commit: ignored indexed block body");
+					},
+					TransactionStorageMode::StorageChain => {
+						apply_indexed_body::<Block>(&mut transaction, body);
+					},
+				}
+			}
 			if let Some(justifications) = pending_block.justifications {
 				transaction.set_from_vec(columns::JUSTIFICATIONS, &lookup_key, justifications.encode());
 			}
@@ -1881,6 +1895,20 @@ fn apply_index_ops<Block: BlockT>(
 	extrinsic_headers.encode()
 }
 
+fn apply_indexed_body<Block: BlockT>(
+	transaction: &mut Transaction<DbHash>,
+	body: Vec<Vec<u8>>,
+) {
+	for extrinsic in body {
+		let hash = sp_runtime::traits::BlakeTwo256::hash(&extrinsic);
+		transaction.store(
+			columns::TRANSACTION,
+			DbHash::from_slice(hash.as_ref()),
+			extrinsic,
+		);
+	}
+}
+
 impl<Block> sc_client_api::backend::AuxStore for Backend<Block> where Block: BlockT {
 	fn insert_aux<
 		'a,
@@ -2439,7 +2467,7 @@ pub(crate) mod tests {
 		};
 		let mut op = backend.begin_operation().unwrap();
 		backend.begin_state_operation(&mut op, block_id).unwrap();
-		op.set_block_data(header, Some(body), None, NewBlockState::Best).unwrap();
+		op.set_block_data(header, Some(body), None, None, NewBlockState::Best).unwrap();
 		if let Some(index) = transaction_index {
 			op.update_transaction_index(index).unwrap();
 		}
@@ -2481,6 +2509,7 @@ pub(crate) mod tests {
 						header,
 						Some(vec![]),
 						None,
+						None,
 						NewBlockState::Best,
 					).unwrap();
 					db.commit_operation(op).unwrap();
@@ -2537,6 +2566,7 @@ pub(crate) mod tests {
 				header.clone(),
 				Some(vec![]),
 				None,
+				None,
 				NewBlockState::Best,
 			).unwrap();
 
@@ -2579,6 +2609,7 @@ pub(crate) mod tests {
 				header,
 				Some(vec![]),
 				None,
+				None,
 				NewBlockState::Best,
 			).unwrap();
 
@@ -2622,6 +2653,7 @@ pub(crate) mod tests {
 				header,
 				Some(vec![]),
 				None,
+				None,
 				NewBlockState::Best,
 			).unwrap();
 
@@ -2659,6 +2691,7 @@ pub(crate) mod tests {
 				header,
 				Some(vec![]),
 				None,
+				None,
 				NewBlockState::Best,
 			).unwrap();
 
@@ -2695,6 +2728,7 @@ pub(crate) mod tests {
 				header,
 				Some(vec![]),
 				None,
+				None,
 				NewBlockState::Best,
 			).unwrap();
 
@@ -2730,6 +2764,7 @@ pub(crate) mod tests {
 				header,
 				Some(vec![]),
 				None,
+				None,
 				NewBlockState::Best,
 			).unwrap();
 
@@ -3067,6 +3102,7 @@ pub(crate) mod tests {
 				header.clone(),
 				Some(vec![]),
 				None,
+				None,
 				NewBlockState::Best,
 			).unwrap();
 
@@ -3106,6 +3142,7 @@ pub(crate) mod tests {
 				header,
 				Some(vec![]),
 				None,
+				None,
 				NewBlockState::Normal,
 			).unwrap();
 
@@ -3118,7 +3155,7 @@ pub(crate) mod tests {
 			let header = backend.blockchain().header(BlockId::Hash(hash1)).unwrap().unwrap();
 			let mut op = backend.begin_operation().unwrap();
 			backend.begin_state_operation(&mut op, BlockId::Hash(hash0)).unwrap();
-			op.set_block_data(header, None, None, NewBlockState::Best).unwrap();
+			op.set_block_data(header, None, None, None, NewBlockState::Best).unwrap();
 			backend.commit_operation(op).unwrap();
 		}
 

substrate/client/light/src/backend.rs

@@ -293,6 +293,7 @@ impl<S, Block> BlockImportOperation<Block> for ImportOperation<Block, S>
 		&mut self,
 		header: Block::Header,
 		_body: Option<Vec<Block::Extrinsic>>,
+		_indexed_body: Option<Vec<Vec<u8>>>,
 		_justifications: Option<Justifications>,
 		state: NewBlockState,
 	) -> ClientResult<()> {

substrate/client/network/src/block_request_handler.rs

@@ -264,6 +264,7 @@ impl<B: BlockT> BlockRequestHandler<B> {
 	) -> Result<BlockResponse, HandleRequestError> {
 		let get_header = attributes.contains(BlockAttributes::HEADER);
 		let get_body = attributes.contains(BlockAttributes::BODY);
+		let get_indexed_body = attributes.contains(BlockAttributes::INDEXED_BODY);
 		let get_justification = attributes.contains(BlockAttributes::JUSTIFICATION);
 
 		let mut blocks = Vec::new();
@@ -321,6 +322,18 @@ impl<B: BlockT> BlockRequestHandler<B> {
 				Vec::new()
 			};
 
+			let indexed_body =  if get_indexed_body {
+				match self.client.block_indexed_body(&BlockId::Hash(hash))? {
+					Some(transactions) => transactions,
+					None => {
+						log::trace!(target: LOG_TARGET, "Missing indexed block data for block request.");
+						break;
+					}
+				}
+			} else {
+				Vec::new()
+			};
+
 			let block_data = crate::schema::v1::BlockData {
 				hash: hash.encode(),
 				header: if get_header {
@@ -334,6 +347,7 @@ impl<B: BlockT> BlockRequestHandler<B> {
 				justification,
 				is_empty_justification,
 				justifications,
+				indexed_body,
 			};
 
 			total_size += block_data.body.len();

substrate/client/network/src/config.rs

@@ -390,7 +390,9 @@ pub enum SyncMode {
 	/// Download blocks and the latest state.
 	Fast {
 		/// Skip state proof download and verification.
-		skip_proofs: bool
+		skip_proofs: bool,
+		/// Download indexed transactions for recent blocks.
+		storage_chain_mode: bool,
 	},
 }
 

substrate/client/network/src/lib.rs

@@ -263,7 +263,6 @@ pub mod light_client_requests;
 pub mod state_request_handler;
 pub mod config;
 pub mod error;
-pub mod gossip;
 pub mod network_state;
 pub mod transactions;
 

substrate/client/network/src/protocol.rs

@@ -228,7 +228,13 @@ impl ProtocolConfig {
 		} else {
 			match self.sync_mode {
 				config::SyncMode::Full => sync::SyncMode::Full,
-				config::SyncMode::Fast { skip_proofs } => sync::SyncMode::LightState { skip_proofs },
+				config::SyncMode::Fast {
+					skip_proofs,
+					storage_chain_mode,
+				} => sync::SyncMode::LightState {
+					skip_proofs,
+					storage_chain_mode
+				},
 			}
 		}
 	}
@@ -597,6 +603,11 @@ impl<B: BlockT> Protocol<B> {
 				} else {
 					None
 				},
+				indexed_body: if request.fields.contains(message::BlockAttributes::INDEXED_BODY) {
+					Some(block_data.indexed_body)
+				} else {
+					None
+				},
 				receipt: if !block_data.message_queue.is_empty() {
 					Some(block_data.receipt)
 				} else {
@@ -965,6 +976,7 @@ impl<B: BlockT> Protocol<B> {
 						hash: header.hash(),
 						header: Some(header),
 						body: None,
+						indexed_body: None,
 						receipt: None,
 						message_queue: None,
 						justification: None,

substrate/client/network/src/protocol/message.rs

@@ -77,6 +77,8 @@ bitflags! {
 		const MESSAGE_QUEUE = 0b00001000;
 		/// Include a justification for the block.
 		const JUSTIFICATION = 0b00010000;
+		/// Include indexed transactions for a block.
+		const INDEXED_BODY = 0b00100000;
 	}
 }
 
@@ -248,6 +250,8 @@ pub mod generic {
 		pub header: Option<Header>,
 		/// Block body if requested.
 		pub body: Option<Vec<Extrinsic>>,
+		/// Block body indexed transactions if requested.
+		pub indexed_body: Option<Vec<Vec<u8>>>,
 		/// Block receipt if requested.
 		pub receipt: Option<Vec<u8>>,
 		/// Block message queue if requested.

substrate/client/network/src/protocol/sync.rs

@@ -469,7 +469,8 @@ pub enum SyncMode {
 	Full,
 	// Sync headers and the last finalied state
 	LightState {
-		skip_proofs: bool
+		storage_chain_mode: bool,
+		skip_proofs: bool,
 	},
 }
 
@@ -518,8 +519,10 @@ impl<B: BlockT> ChainSync<B> {
 		match self.mode {
 			SyncMode::Full => BlockAttributes::HEADER | BlockAttributes::JUSTIFICATION | BlockAttributes::BODY,
 			SyncMode::Light => BlockAttributes::HEADER | BlockAttributes::JUSTIFICATION,
-			SyncMode::LightState { .. } =>
+			SyncMode::LightState { storage_chain_mode: false, .. } =>
 				BlockAttributes::HEADER | BlockAttributes::JUSTIFICATION | BlockAttributes::BODY,
+			SyncMode::LightState { storage_chain_mode: true, .. } =>
+				BlockAttributes::HEADER | BlockAttributes::JUSTIFICATION | BlockAttributes::INDEXED_BODY,
 		}
 	}
 
@@ -914,25 +917,7 @@ impl<B: BlockT> ChainSync<B> {
 							peer.state = PeerSyncState::Available;
 							validate_blocks::<B>(&blocks, who, Some(request))?;
 							self.blocks.insert(start_block, blocks, who.clone());
-							self.blocks
+							self.drain_blocks()
-								.drain(self.best_queued_number + One::one())
-								.into_iter()
-								.map(|block_data| {
-									let justifications = block_data.block.justifications.or(
-										legacy_justification_mapping(block_data.block.justification)
-									);
-									IncomingBlock {
-										hash: block_data.block.hash,
-										header: block_data.block.header,
-										body: block_data.block.body,
-										justifications,
-										origin: block_data.origin,
-										allow_missing_state: true,
-										import_existing: self.import_existing,
-										skip_execution: self.skip_execution(),
-										state: None,
-									}
-								}).collect()
 						}
 						PeerSyncState::DownloadingStale(_) => {
 							peer.state = PeerSyncState::Available;
@@ -949,6 +934,7 @@ impl<B: BlockT> ChainSync<B> {
 									hash: b.hash,
 									header: b.header,
 									body: b.body,
+									indexed_body: None,
 									justifications,
 									origin: Some(who.clone()),
 									allow_missing_state: true,
@@ -1064,6 +1050,7 @@ impl<B: BlockT> ChainSync<B> {
 							hash: b.hash,
 							header: b.header,
 							body: b.body,
+							indexed_body: None,
 							justifications,
 							origin: Some(who.clone()),
 							allow_missing_state: true,
@@ -1115,6 +1102,7 @@ impl<B: BlockT> ChainSync<B> {
 					hash,
 					header: Some(header),
 					body: None,
+					indexed_body: None,
 					justifications: None,
 					origin: None,
 					allow_missing_state: true,
@@ -1367,7 +1355,7 @@ impl<B: BlockT> ChainSync<B> {
 			is_descendent_of(&**client, base, block)
 		});
 
-		if let SyncMode::LightState { skip_proofs } = &self.mode {
+		if let SyncMode::LightState { skip_proofs, .. } = &self.mode {
 			if self.state_sync.is_none()
 				&& !self.peers.is_empty()
 				&& self.queue_blocks.is_empty()
@@ -1757,24 +1745,7 @@ impl<B: BlockT> ChainSync<B> {
 			target.peers.remove(who);
 			!target.peers.is_empty()
 		});
-		let blocks: Vec<_> = self.blocks
+		let blocks = self.drain_blocks();
-			.drain(self.best_queued_number + One::one())
-			.into_iter()
-			.map(|block_data| {
-				let justifications =
-					legacy_justification_mapping(block_data.block.justification);
-				IncomingBlock {
-					hash: block_data.block.hash,
-					header: block_data.block.header,
-					body: block_data.block.body,
-					justifications,
-					origin: block_data.origin,
-					allow_missing_state: true,
-					import_existing: false,
-					skip_execution: self.skip_execution(),
-					state: None,
-				}
-			}).collect();
 		if !blocks.is_empty() {
 			Some(self.validate_and_queue_blocks(blocks))
 		} else {
@@ -1878,6 +1849,31 @@ impl<B: BlockT> ChainSync<B> {
 			_priv: ()
 		}
 	}
+
+	/// Drain the downloaded block set up to the first gap.
+	fn drain_blocks(&mut self) -> Vec<IncomingBlock<B>> {
+		self.blocks
+			.drain(self.best_queued_number + One::one())
+			.into_iter()
+			.map(|block_data| {
+				let justifications = block_data.block.justifications.or(
+					legacy_justification_mapping(block_data.block.justification)
+				);
+				IncomingBlock {
+					hash: block_data.block.hash,
+					header: block_data.block.header,
+					body: block_data.block.body,
+					indexed_body: block_data.block.indexed_body,
+					justifications,
+					origin: block_data.origin,
+					allow_missing_state: true,
+					import_existing: self.import_existing,
+					skip_execution: self.skip_execution(),
+					state: None,
+				}
+			}).collect()
+	}
+
 }
 
 // This is purely during a backwards compatible transitionary period and should be removed
@@ -2383,6 +2379,7 @@ mod test {
 					hash: b.hash(),
 					header: Some(b.header().clone()),
 					body: Some(b.deconstruct().1),
+					indexed_body: None,
 					receipt: None,
 					message_queue: None,
 					justification: None,

substrate/client/network/src/protocol/sync/blocks.rs

@@ -225,6 +225,7 @@ mod test {
 			hash: H256::random(),
 			header: None,
 			body: None,
+			indexed_body: None,
 			message_queue: None,
 			receipt: None,
 			justification: None,

substrate/client/network/src/schema/api.v1.proto

@@ -66,6 +66,8 @@ message BlockData {
 	// is because empty justifications, like all justifications, are paired with a non-empty
 	// consensus engine ID.
 	bytes justifications = 8; // optional
+	// Indexed block body if requestd.
+	repeated bytes indexed_body = 9; // optional
 }
 
 // Request storage data from a peer.

substrate/client/network/test/src/block_import.rs

@@ -42,6 +42,7 @@ fn prepare_good_block() -> (TestClient, Hash, u64, PeerId, IncomingBlock<Block>)
 		hash,
 		header,
 		body: Some(Vec::new()),
+		indexed_body: None,
 		justifications,
 		origin: Some(peer_id.clone()),
 		allow_missing_state: false,

substrate/client/network/test/src/lib.rs

@@ -660,6 +660,8 @@ pub struct FullPeerConfig {
 	pub is_authority: bool,
 	/// Syncing mode
 	pub sync_mode: SyncMode,
+	/// Enable transaction indexing.
+	pub storage_chain: bool,
 }
 
 pub trait TestNetFactory: Sized where <Self::BlockImport as BlockImport<Block>>::Transaction: Send {
@@ -715,9 +717,11 @@ pub trait TestNetFactory: Sized where <Self::BlockImport as BlockImport<Block>>:
 
 	/// Add a full peer.
 	fn add_full_peer_with_config(&mut self, config: FullPeerConfig) {
-		let mut test_client_builder = match config.keep_blocks {
+		let mut test_client_builder = match (config.keep_blocks, config.storage_chain) {
-			Some(keep_blocks) => TestClientBuilder::with_pruning_window(keep_blocks),
+			(Some(keep_blocks), true) => TestClientBuilder::with_tx_storage(keep_blocks),
-			None => TestClientBuilder::with_default_backend(),
+			(None, true) => TestClientBuilder::with_tx_storage(u32::MAX),
+			(Some(keep_blocks), false) => TestClientBuilder::with_pruning_window(keep_blocks),
+			(None, false) => TestClientBuilder::with_default_backend(),
 		};
 		if matches!(config.sync_mode, SyncMode::Fast{..}) {
 			test_client_builder = test_client_builder.set_no_genesis();

substrate/client/network/test/src/sync.rs

@@ -1095,7 +1095,7 @@ fn syncs_state() {
 		let mut net = TestNet::new(0);
 		net.add_full_peer_with_config(Default::default());
 		net.add_full_peer_with_config(FullPeerConfig {
-			sync_mode: SyncMode::Fast { skip_proofs: *skip_proofs },
+			sync_mode: SyncMode::Fast { skip_proofs: *skip_proofs, storage_chain_mode: false },
 			..Default::default()
 		});
 		net.peer(0).push_blocks(64, false);
@@ -1127,3 +1127,39 @@ fn syncs_state() {
 	}
 }
 
+#[test]
+fn syncs_indexed_blocks() {
+	use sp_runtime::traits::Hash;
+	sp_tracing::try_init_simple();
+	let mut net = TestNet::new(0);
+	let mut n: u64 = 0;
+	net.add_full_peer_with_config(FullPeerConfig {
+		storage_chain: true,
+		..Default::default()
+	});
+	net.add_full_peer_with_config(FullPeerConfig {
+		storage_chain: true,
+		sync_mode: SyncMode::Fast { skip_proofs: false, storage_chain_mode: true },
+		..Default::default()
+	});
+	net.peer(0).generate_blocks_at(
+		BlockId::number(0),
+		64,
+		BlockOrigin::Own, |mut builder| {
+			let ex = Extrinsic::Store(n.to_le_bytes().to_vec());
+			n += 1;
+			builder.push(ex).unwrap();
+			builder.build().unwrap().block
+		},
+		false,
+		true,
+		true,
+	);
+	let indexed_key = sp_runtime::traits::BlakeTwo256::hash(&42u64.to_le_bytes());
+	assert!(net.peer(0).client().as_full().unwrap().indexed_transaction(&indexed_key).unwrap().is_some());
+	assert!(net.peer(1).client().as_full().unwrap().indexed_transaction(&indexed_key).unwrap().is_none());
+
+	net.block_until_sync();
+	assert!(net.peer(1).client().as_full().unwrap().indexed_transaction(&indexed_key).unwrap().is_some());
+}
+

substrate/client/service/src/builder.rs

@@ -21,7 +21,7 @@ use crate::{
 	start_rpc_servers, build_network_future, TransactionPoolAdapter, TaskManager, SpawnTaskHandle,
 	metrics::MetricsService,
 	client::{light, Client, ClientConfig},
-	config::{Configuration, KeystoreConfig, PrometheusConfig},
+	config::{Configuration, KeystoreConfig, PrometheusConfig, TransactionStorageMode},
 };
 use sc_client_api::{
 	light::RemoteBlockchain, ForkBlocks, BadBlocks, UsageProvider, ExecutorProvider,
@@ -40,7 +40,7 @@ use futures::{
 };
 use sc_keystore::LocalKeystore;
 use log::info;
-use sc_network::config::{Role, OnDemand};
+use sc_network::config::{Role, OnDemand, SyncMode};
 use sc_network::NetworkService;
 use sc_network::block_request_handler::{self, BlockRequestHandler};
 use sc_network::state_request_handler::{self, StateRequestHandler};
@@ -946,7 +946,7 @@ pub fn build_network<TBl, TExPool, TImpQu, TCl>(
 		}
 	};
 
-	let network_params = sc_network::config::Params {
+	let mut network_params = sc_network::config::Params {
 		role: config.role.clone(),
 		executor: {
 			let spawn_handle = Clone::clone(&spawn_handle);
@@ -973,6 +973,15 @@ pub fn build_network<TBl, TExPool, TImpQu, TCl>(
 		light_client_request_protocol_config,
 	};
 
+	// Storage chains don't keep full block history and can't be synced in full mode.
+	// Force fast sync when storage chain mode is enabled.
+	if matches!(config.transaction_storage, TransactionStorageMode::StorageChain) {
+		network_params.network_config.sync_mode = SyncMode::Fast {
+			storage_chain_mode: true,
+			skip_proofs: false,
+		};
+	}
+
 	let has_bootnodes = !network_params.network_config.boot_nodes.is_empty();
 	let network_mut = sc_network::NetworkWorker::new(network_params)?;
 	let network = network_mut.service().clone();

substrate/client/service/src/chain_ops/import_blocks.rs

@@ -168,6 +168,7 @@ fn import_block_to_queue<TBl, TImpQu>(
 			hash,
 			header: Some(header),
 			body: Some(extrinsics),
+			indexed_body: None,
 			justifications: signed_block.justifications,
 			origin: None,
 			allow_missing_state: false,

substrate/client/service/src/client/client.rs

@@ -355,6 +355,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 				genesis_block.deconstruct().0,
 				Some(vec![]),
 				None,
+				None,
 				block_state,
 			)?;
 			backend.commit_operation(op)?;
@@ -657,6 +658,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 			justifications,
 			post_digests,
 			body,
+			indexed_body,
 			finalized,
 			auxiliary,
 			fork_choice,
@@ -695,6 +697,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 			import_headers,
 			justifications,
 			body,
+			indexed_body,
 			storage_changes,
 			new_cache,
 			finalized,
@@ -734,6 +737,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 		import_headers: PrePostHeader<Block::Header>,
 		justifications: Option<Justifications>,
 		body: Option<Vec<Block::Extrinsic>>,
+		indexed_body: Option<Vec<Vec<u8>>>,
 		storage_changes: Option<sp_consensus::StorageChanges<Block, backend::TransactionFor<B, Block>>>,
 		new_cache: HashMap<CacheKeyId, Vec<u8>>,
 		finalized: bool,
@@ -871,6 +875,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 		operation.op.set_block_data(
 			import_headers.post().clone(),
 			body,
+			indexed_body,
 			justifications,
 			leaf_state,
 		)?;

substrate/client/service/test/src/client/light.rs

@@ -266,7 +266,7 @@ fn local_state_is_created_when_genesis_state_is_available() {
 		Arc::new(DummyBlockchain::new(DummyStorage::new())),
 	);
 	let mut op = backend.begin_operation().unwrap();
-	op.set_block_data(header0, None, None, NewBlockState::Final).unwrap();
+	op.set_block_data(header0, None, None, None, NewBlockState::Final).unwrap();
 	op.set_genesis_state(Default::default(), true).unwrap();
 	backend.commit_operation(op).unwrap();
 

substrate/primitives/consensus/common/src/block_import.rs

@@ -196,6 +196,8 @@ pub struct BlockImportParams<Block: BlockT, Transaction> {
 	pub post_digests: Vec<DigestItemFor<Block>>,
 	/// The body of the block.
 	pub body: Option<Vec<Block::Extrinsic>>,
+	/// Indexed transaction body of the block.
+	pub indexed_body: Option<Vec<Vec<u8>>>,
 	/// Specify how the new state is computed.
 	pub state_action: StateAction<Block, Transaction>,
 	/// Is this block finalized already?
@@ -233,6 +235,7 @@ impl<Block: BlockT, Transaction> BlockImportParams<Block, Transaction> {
 			justifications: None,
 			post_digests: Vec::new(),
 			body: None,
+			indexed_body: None,
 			state_action: StateAction::Execute,
 			finalized: false,
 			intermediates: HashMap::new(),
@@ -286,6 +289,7 @@ impl<Block: BlockT, Transaction> BlockImportParams<Block, Transaction> {
 			justifications: self.justifications,
 			post_digests: self.post_digests,
 			body: self.body,
+			indexed_body: self.indexed_body,
 			state_action,
 			finalized: self.finalized,
 			auxiliary: self.auxiliary,

substrate/primitives/consensus/common/src/import_queue.rs

@@ -68,6 +68,8 @@ pub struct IncomingBlock<B: BlockT> {
 	pub header: Option<<B as BlockT>::Header>,
 	/// Block body if requested.
 	pub body: Option<Vec<<B as BlockT>::Extrinsic>>,
+	/// Indexed block body if requested.
+	pub indexed_body: Option<Vec<Vec<u8>>>,
 	/// Justification(s) if requested.
 	pub justifications: Option<Justifications>,
 	/// The peer, we received this from
@@ -269,6 +271,7 @@ pub(crate) async fn import_single_block_metered<B: BlockT, V: Verifier<B>, Trans
 		cache.extend(keys.into_iter());
 	}
 	import_block.import_existing = block.import_existing;
+	import_block.indexed_body = block.indexed_body;
 	let mut import_block = import_block.clear_storage_changes_and_mutate();
 	if let Some(state) = block.state {
 		import_block.state_action = StateAction::ApplyChanges(crate::StorageChanges::Import(state));

substrate/primitives/consensus/common/src/import_queue/basic_queue.rs

@@ -560,6 +560,7 @@ mod tests {
 					hash,
 					header: Some(header),
 					body: None,
+					indexed_body: None,
 					justifications: None,
 					origin: None,
 					allow_missing_state: false,

substrate/test-utils/client/src/lib.rs

@@ -102,6 +102,16 @@ impl<Block: BlockT, Executor, G: GenesisInit> TestClientBuilder<Block, Executor,
 		let backend = Arc::new(Backend::new_test(keep_blocks, 0));
 		Self::with_backend(backend)
 	}
+
+	/// Create new `TestClientBuilder` with default backend and storage chain mode
+	pub fn with_tx_storage(keep_blocks: u32) -> Self {
+		let backend = Arc::new(Backend::new_test_with_tx_storage(
+			keep_blocks,
+			0,
+			sc_client_db::TransactionStorageMode::StorageChain,
+		));
+		Self::with_backend(backend)
+	}
 }
 
 impl<Block: BlockT, Executor, Backend, G: GenesisInit> TestClientBuilder<Block, Executor, Backend, G> {

substrate/test-utils/runtime/src/lib.rs

@@ -167,6 +167,7 @@ pub enum Extrinsic {
 	ChangesTrieConfigUpdate(Option<ChangesTrieConfiguration>),
 	OffchainIndexSet(Vec<u8>, Vec<u8>),
 	OffchainIndexClear(Vec<u8>),
+	Store(Vec<u8>),
 }
 
 parity_util_mem::malloc_size_of_is_0!(Extrinsic); // non-opaque extrinsic does not need this
@@ -199,6 +200,7 @@ impl BlindCheckable for Extrinsic {
 				Ok(Extrinsic::OffchainIndexSet(key, value)),
 			Extrinsic::OffchainIndexClear(key) =>
 				Ok(Extrinsic::OffchainIndexClear(key)),
+			Extrinsic::Store(data) => Ok(Extrinsic::Store(data)),
 		}
 	}
 }

substrate/test-utils/runtime/src/system.rs

@@ -272,6 +272,8 @@ fn execute_transaction_backend(utx: &Extrinsic, extrinsic_index: u32) -> ApplyEx
 			sp_io::offchain_index::clear(&key);
 			Ok(Ok(()))
 		}
+		Extrinsic::Store(data) =>
+			execute_store(data.clone()),
 	}
 }
 
@@ -301,6 +303,13 @@ fn execute_transfer_backend(tx: &Transfer) -> ApplyExtrinsicResult {
 	Ok(Ok(()))
 }
 
+fn execute_store(data: Vec<u8>) -> ApplyExtrinsicResult {
+	let content_hash = sp_io::hashing::blake2_256(&data);
+	let extrinsic_index: u32 = storage::unhashed::get(well_known_keys::EXTRINSIC_INDEX).unwrap();
+	sp_io::transaction_index::index(extrinsic_index, data.len() as u32, content_hash);
+	Ok(Ok(()))
+}
+
 fn execute_new_authorities_backend(new_authorities: &[AuthorityId]) -> ApplyExtrinsicResult {
 	NewAuthorities::put(new_authorities.to_vec());
 	Ok(Ok(()))