Merge branch 'pg/add-tracing-support-2' into pg/evm-debug

substrate/frame/revive/rpc/src/client.rs

@@ -699,8 +699,8 @@ impl Client {
 				log::error!(target: LOG_TARGET, "state_debugBlock failed with: {err:?}");
 			})?;
 
-		let traces = CallTrace::decode(&mut &bytes.0[..])?;
-		Ok(traces)
+		let trace = Option::<CallTrace>::decode(&mut &bytes.0[..])?;
+		Ok(trace.ok_or(ClientError::EthExtrinsicNotFound)?)
 	}
 
 	/// Get the EVM block for the given hash.

substrate/frame/revive/src/evm/api/debug_rpc_types.rs

@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::evm::Bytes;
+use crate::evm::{Bytes, CallTracer};
 use alloc::{fmt, string::String, vec::Vec};
 use codec::{Decode, Encode};
 use scale_info::TypeInfo;
@@ -38,6 +38,15 @@ pub enum TracerConfig {
 	},
 }
 
+impl TracerConfig {
+	/// Build the tracer associated to this config.
+	pub fn build<G>(self, gas_mapper: G) -> CallTracer<U256, G> {
+		match self {
+			Self::CallTracer { with_logs } => CallTracer::new(with_logs, gas_mapper),
+		}
+	}
+}
+
 /// Custom deserializer to support the following JSON format:
 ///
 /// ```json

substrate/frame/revive/src/lib.rs

@@ -1481,7 +1481,7 @@ sp_api::decl_runtime_apis! {
 		fn trace_block(
 			block: Block,
 			config: TracerConfig
-		) -> Vec<(u32, Vec<CallTrace>)>;
+		) -> Vec<(u32, CallTrace)>;
 
 		/// Replay the block with the given hash.
 		/// This is intended to called through `state_debugBlock` RPC. Using [`using_tracer`]
@@ -1490,7 +1490,6 @@ sp_api::decl_runtime_apis! {
 			block: Block,
 			tx_index: u32,
 			config: TracerConfig
-		) -> CallTrace;
-
+		) -> Option<CallTrace>;
 	}
 }