Add option to enable native execution in LocalCallExecutor

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/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>
@@ -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.