Patches for gear-tasks

substrate/client/api/src/call_executor.rs

@@ -48,6 +48,8 @@ pub trait CallExecutor<B: BlockT>: RuntimeVersionOf {
 	/// The backend used by the node.
 	type Backend: crate::backend::Backend<B>;
 
+	fn gear_use_native(&mut self) {}
+
 	/// Returns the [`ExecutionExtensions`].
 	fn execution_extensions(&self) -> &ExecutionExtensions<B>;
 

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

@@ -39,6 +39,7 @@ pub struct LocalCallExecutor<Block: BlockT, B, E> {
 	wasm_override: Arc<Option<WasmOverride>>,
 	wasm_substitutes: WasmSubstitutes<Block, E, B>,
 	execution_extensions: Arc<ExecutionExtensions<Block>>,
+	gear_use_native: bool,
 }
 
 impl<Block: BlockT, B, E> LocalCallExecutor<Block, B, E>
@@ -71,6 +72,7 @@ where
 			wasm_override: Arc::new(wasm_override),
 			wasm_substitutes,
 			execution_extensions: Arc::new(execution_extensions),
+			gear_use_native: false,
 		})
 	}
 
@@ -141,6 +143,7 @@ where
 			wasm_override: self.wasm_override.clone(),
 			wasm_substitutes: self.wasm_substitutes.clone(),
 			execution_extensions: self.execution_extensions.clone(),
+			gear_use_native: self.gear_use_native,
 		}
 	}
 }
@@ -155,6 +158,10 @@ where
 
 	type Backend = B;
 
+	fn gear_use_native(&mut self) {
+		self.gear_use_native = true;
+	}
+
 	fn execution_extensions(&self) -> &ExecutionExtensions<Block> {
 		&self.execution_extensions
 	}
@@ -237,6 +244,11 @@ where
 					call_context,
 				)
 				.set_parent_hash(at_hash);
+
+				if self.gear_use_native {
+					state_machine.gear_use_native();
+				}
+
 				state_machine.execute()
 			},
 			None => {
@@ -251,6 +263,11 @@ where
 					call_context,
 				)
 				.set_parent_hash(at_hash);
+
+				if self.gear_use_native {
+					state_machine.gear_use_native();
+				}
+
 				state_machine.execute()
 			},
 		}

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

@@ -452,6 +452,10 @@ where
 		})
 	}
 
+	pub fn gear_use_native(&mut self) {
+		self.executor.gear_use_native();
+	}
+
 	/// returns a reference to the block import notification sinks
 	/// useful for test environments.
 	pub fn import_notification_sinks(&self) -> &NotificationSinks<BlockImportNotification<Block>> {

substrate/primitives/externalities/src/lib.rs

@@ -309,6 +309,11 @@ pub trait Externalities: ExtensionStore {
 	///
 	/// Get all the keys that have been read or written to during the benchmark.
 	fn get_read_and_written_keys(&self) -> Vec<(Vec<u8>, u32, u32, bool)>;
+
+	/// Access to `OverlayChanges<H>` for `gear-tasks`.
+	fn gear_overlayed_changes(&self) -> Option<Box<dyn Any + Send>> {
+		None
+	}
 }
 
 /// Extension for the [`Externalities`] trait.

substrate/primitives/state-machine/src/ext.rs

@@ -159,7 +159,7 @@ where
 
 impl<'a, H, B> Externalities for Ext<'a, H, B>
 where
-	H: Hasher,
+	H: Hasher + 'static,
 	H::Out: Ord + 'static + codec::Codec,
 	B: Backend<H>,
 {
@@ -651,6 +651,10 @@ where
 	fn get_read_and_written_keys(&self) -> Vec<(Vec<u8>, u32, u32, bool)> {
 		self.backend.get_read_and_written_keys()
 	}
+
+	fn gear_overlayed_changes(&self) -> Option<Box<dyn Any + Send>> {
+		Some(Box::new(self.overlay.clone()))
+	}
 }
 
 impl<'a, H, B> Ext<'a, H, B>

substrate/primitives/state-machine/src/lib.rs

@@ -209,6 +209,7 @@ mod execution {
 		/// Used for logging.
 		parent_hash: Option<H::Out>,
 		context: CallContext,
+		gear_use_native: bool,
 	}
 
 	impl<'a, B, H, Exec> Drop for StateMachine<'a, B, H, Exec>
@@ -223,7 +224,7 @@ mod execution {
 
 	impl<'a, B, H, Exec> StateMachine<'a, B, H, Exec>
 	where
-		H: Hasher,
+		H: Hasher + 'static,
 		H::Out: Ord + 'static + codec::Codec,
 		Exec: CodeExecutor + Clone + 'static,
 		B: Backend<H>,
@@ -250,6 +251,7 @@ mod execution {
 				stats: StateMachineStats::default(),
 				parent_hash: None,
 				context,
+				gear_use_native: false,
 			}
 		}
 
@@ -289,7 +291,14 @@ mod execution {
 
 			let result = self
 				.exec
-				.call(&mut ext, self.runtime_code, self.method, self.call_data, false, self.context)
+				.call(
+					&mut ext,
+					self.runtime_code,
+					self.method,
+					self.call_data,
+					self.gear_use_native,
+					self.context,
+				)
 				.0;
 
 			self.overlay
@@ -305,6 +314,10 @@ mod execution {
 
 			result.map_err(|e| Box::new(e) as Box<_>)
 		}
+
+		pub fn gear_use_native(&mut self) {
+			self.gear_use_native = true;
+		}
 	}
 
 	/// Prove execution using the given state backend, overlayed changes, and call executor.
@@ -318,7 +331,7 @@ mod execution {
 	) -> Result<(Vec<u8>, StorageProof), Box<dyn Error>>
 	where
 		B: AsTrieBackend<H>,
-		H: Hasher,
+		H: Hasher + 'static,
 		H::Out: Ord + 'static + codec::Codec,
 		Exec: CodeExecutor + Clone + 'static,
 	{
@@ -354,7 +367,7 @@ mod execution {
 	) -> Result<(Vec<u8>, StorageProof), Box<dyn Error>>
 	where
 		S: trie_backend_essence::TrieBackendStorage<H>,
-		H: Hasher,
+		H: Hasher + 'static,
 		H::Out: Ord + 'static + codec::Codec,
 		Exec: CodeExecutor + 'static + Clone,
 	{
@@ -416,7 +429,7 @@ mod execution {
 		runtime_code: &RuntimeCode,
 	) -> Result<Vec<u8>, Box<dyn Error>>
 	where
-		H: Hasher,
+		H: Hasher + 'static,
 		H::Out: Ord + 'static + codec::Codec,
 		Exec: CodeExecutor + Clone + 'static,
 	{