Expose the overlay from ApiExt

client/api/src/call_executor.rs

@@ -105,5 +105,6 @@ pub trait CallExecutor<B: BlockT>: RuntimeVersionOf {
 		at: &BlockId<B>,
 		method: &str,
 		call_data: &[u8],
+		overlay: Option<sp_api::OverlayedChanges>,
 	) -> Result<(Vec<u8>, StorageProof), sp_blockchain::Error>;
 }

client/api/src/proof_provider.rs

@@ -49,6 +49,7 @@ pub trait ProofProvider<Block: BlockT> {
 		id: &BlockId<Block>,
 		method: &str,
 		call_data: &[u8],
+		overlay: Option<sp_api::OverlayedChanges>,
 	) -> sp_blockchain::Result<(Vec<u8>, StorageProof)>;
 
 	/// Given a `BlockId` iterate over all storage values starting at `start_keys`.

client/network/src/light_client_requests/handler.rs

@@ -159,23 +159,24 @@ impl<B: Block> LightClientRequestHandler<B> {
 
 		let block = Decode::decode(&mut request.block.as_ref())?;
 
-		let proof =
-			match self
-				.client
-				.execution_proof(&BlockId::Hash(block), &request.method, &request.data)
-			{
-				Ok((_, proof)) => proof,
-				Err(e) => {
-					trace!(
-						"remote call request from {} ({} at {:?}) failed with: {}",
-						peer,
-						request.method,
-						request.block,
-						e,
-					);
-					StorageProof::empty()
-				},
-			};
+		let proof = match self.client.execution_proof(
+			&BlockId::Hash(block),
+			&request.method,
+			&request.data,
+			None,
+		) {
+			Ok((_, proof)) => proof,
+			Err(e) => {
+				trace!(
+					"remote call request from {} ({} at {:?}) failed with: {}",
+					peer,
+					request.method,
+					request.block,
+					e,
+				);
+				StorageProof::empty()
+			},
+		};
 
 		let response = {
 			let r = schema::v1::light::RemoteCallResponse { proof: proof.encode() };

client/service/src/client/call_executor.rs

@@ -293,6 +293,7 @@ where
 		at: &BlockId<Block>,
 		method: &str,
 		call_data: &[u8],
+		overlay: Option<sp_api::OverlayedChanges>,
 	) -> sp_blockchain::Result<(Vec<u8>, StorageProof)> {
 		let state = self.backend.state_at(*at)?;
 
@@ -308,7 +309,7 @@ where
 
 		sp_state_machine::prove_execution_on_trie_backend(
 			&trie_backend,
-			&mut Default::default(),
+			&mut overlay.unwrap_or_default(),
 			&self.executor,
 			self.spawn_handle.clone(),
 			method,

client/service/src/client/client.rs

@@ -1189,8 +1189,9 @@ where
 		id: &BlockId<Block>,
 		method: &str,
 		call_data: &[u8],
+		overlay: Option<sp_api::OverlayedChanges>,
 	) -> sp_blockchain::Result<(Vec<u8>, StorageProof)> {
-		self.executor.prove_execution(id, method, call_data)
+		self.executor.prove_execution(id, method, call_data, overlay)
 	}
 
 	fn read_proof_collection(

primitives/api/proc-macro/src/impl_runtime_apis.rs

@@ -306,6 +306,10 @@ fn generate_runtime_api_base_structures() -> Result<TokenStream> {
 					state_version,
 				)
 			}
+
+			fn overlay(&self) -> std::cell::RefCell<#crate_::OverlayedChanges> {
+				self.changes.clone()
+			}
 		}
 
 		#[cfg(any(feature = "std", test))]

primitives/api/proc-macro/src/mock_impl_runtime_apis.rs

@@ -123,6 +123,10 @@ fn implement_common_api_traits(block_type: TypePath, self_ty: Type) -> Result<To
 			> where Self: Sized {
 				unimplemented!("`into_storage_changes` not implemented for runtime api mocks")
 			}
+
+			fn overlay(&self) -> std::cell::RefCell<#crate_::OverlayedChanges> {
+				unimplemented!("`overlay` not implemented for runtime api mocks")
+			}
 		}
 
 		impl #crate_::Core<#block_type> for #self_ty {

primitives/api/src/lib.rs

@@ -519,6 +519,9 @@ pub trait ApiExt<Block: BlockT> {
 	) -> Result<StorageChanges<Self::StateBackend, Block>, String>
 	where
 		Self: Sized;
+
+	/// TODO
+	fn overlay(&self) -> RefCell<OverlayedChanges>;
 }
 
 /// Parameters for [`CallApiAt::call_api_at`].