Introduce marshalled opcode type

Author: dmitrylavrenov

Cargo.lock

@@ -58,6 +58,7 @@ serde = { version = "1", default-features = false }
 serde_json = { version = "1", default-features = false }
 sha3 = { version = "0.10", default-features = false }
 similar-asserts = { version = "1", default-features = false }
+smallvec = { version = "1.13", default-features = false }
 static_assertions = { version = "1", default-features = false }
 syn = { version = "2", default-features = false }
 thiserror = { version = "1.0.69", default-features = false }

Cargo.toml

@@ -8,7 +8,6 @@ publish = false
 evm-tracing-events = { path = "../evm-tracing-events" }
 
 codec = { workspace = true }
-evm = { workspace = true }
 frame-support = { workspace = true, features = ["std"] }
 hex = { workspace = true, features = ["serde"] }
 serde = { workspace = true, features = ["derive"] }

crates/evm-tracing-client/Cargo.toml

@@ -1,5 +1,6 @@
 //! Call tracer formatter implementation.
 
+use evm_tracing_events::MarshalledOpcode;
 use sp_core::sp_std::cmp::Ordering;
 
 use crate::{
@@ -54,10 +55,12 @@ impl super::ResponseFormatter for Formatter {
                                 call_type,
                             } => CallTracerInner::Call {
                                 call_type: match call_type {
-                                    CallType::Call => evm::Opcode::CALL,
-                                    CallType::CallCode => evm::Opcode::CALLCODE,
-                                    CallType::DelegateCall => evm::Opcode::DELEGATECALL,
-                                    CallType::StaticCall => evm::Opcode::STATICCALL,
+                                    CallType::Call => MarshalledOpcode::call_opcode(),
+                                    CallType::CallCode => MarshalledOpcode::callcode_opcode(),
+                                    CallType::DelegateCall => {
+                                        MarshalledOpcode::delegatecall_opcode()
+                                    }
+                                    CallType::StaticCall => MarshalledOpcode::staticcall_opcode(),
                                 },
                                 to,
                                 input,
@@ -85,13 +88,13 @@ impl super::ResponseFormatter for Formatter {
                                     CreateResult::Error { .. } => None,
                                 },
                                 value,
-                                call_type: evm::Opcode::CREATE,
+                                call_type: MarshalledOpcode::create_opcode(),
                             },
                             BlockscoutCallInner::SelfDestruct { balance, to } => {
                                 CallTracerInner::SelfDestruct {
                                     value: balance,
                                     to,
-                                    call_type: evm::Opcode::SUICIDE,
+                                    call_type: MarshalledOpcode::selfdestruct_opcode(),
                                 }
                             }
                         },

crates/evm-tracing-client/src/formatters/call_tracer.rs

@@ -4,4 +4,3 @@ pub mod formatters;
 pub mod listeners;
 mod serialization;
 pub mod types;
-mod utils;

crates/evm-tracing-client/src/lib.rs

@@ -634,7 +634,7 @@ mod tests {
         evm::CreateScheme,
         gasometer::Snapshot,
         runtime::{Memory, Stack},
-        Context as EvmContext,
+        Context as EvmContext, MarshalledOpcode,
     };
     use sp_core::H256;
 
@@ -757,7 +757,7 @@ mod tests {
         match event_type {
             TestRuntimeEvent::Step => RuntimeEvent::Step {
                 context: test_context(),
-                opcode: evm::Opcode::STOP,
+                opcode: MarshalledOpcode::default(),
                 position: Ok(0u64),
                 stack: test_stack(),
                 memory: test_memory(),

crates/evm-tracing-client/src/listeners/call_list.rs

@@ -2,7 +2,7 @@
 
 use evm_tracing_events::{
     runtime::Capture, runtime::ExitReason, Event, GasometerEvent, Listener as ListenerT,
-    RuntimeEvent, StepEventFilter,
+    MarshalledOpcode, RuntimeEvent, StepEventFilter,
 };
 use sp_core::{sp_std::collections::btree_map::BTreeMap, H160, H256};
 
@@ -48,7 +48,7 @@ struct Context {
 #[derive(Debug)]
 struct Step {
     /// Current opcode.
-    opcode: evm::Opcode,
+    opcode: MarshalledOpcode,
     /// Depth of the context.
     depth: usize,
     /// Remaining gas.
@@ -289,7 +289,7 @@ impl Listener {
                             }
                         }
                     }
-                    Err(Capture::Trap(opcode)) if ContextType::from(opcode).is_some() => {
+                    Err(Capture::Trap(opcode)) if ContextType::from(opcode.clone()).is_some() => {
                         self.new_context = true;
                     }
                     _ => (),

crates/evm-tracing-client/src/listeners/raw.rs

@@ -1,5 +1,6 @@
 //! Serialization functions for various types and formats.
 
+use evm_tracing_events::MarshalledOpcode;
 use serde::{
     ser::{Error, SerializeSeq},
     Serializer,
@@ -50,16 +51,11 @@ where
 }
 
 /// Serializes opcode.
-pub fn opcode_serialize<S>(opcode: &evm::Opcode, serializer: S) -> Result<S::Ok, S::Error>
+pub fn opcode_serialize<S>(opcode: &MarshalledOpcode, serializer: S) -> Result<S::Ok, S::Error>
 where
     S: Serializer,
 {
-    let d = match crate::utils::opcode_known_name(opcode) {
-        Some(s) => s.to_uppercase(),
-        None => format!("UNKNOWN({})", opcode.0),
-    };
-
-    serializer.serialize_str(&d)
+    serializer.serialize_str(&opcode.to_string())
 }
 
 /// Serializes string.

crates/evm-tracing-client/src/serialization.rs

@@ -1,6 +1,7 @@
 //! Call tracer explicitly types.
 
 use codec::{Decode, Encode};
+use evm_tracing_events::MarshalledOpcode;
 use serde::Serialize;
 use sp_core::{H160, U256};
 
@@ -36,7 +37,7 @@ pub enum CallTracerInner {
     Call {
         /// Call type.
         #[serde(rename = "type", serialize_with = "opcode_serialize")]
-        call_type: evm::Opcode,
+        call_type: MarshalledOpcode,
         /// To.
         to: H160,
         /// Input.
@@ -53,7 +54,7 @@ pub enum CallTracerInner {
     Create {
         /// Call type.
         #[serde(rename = "type", serialize_with = "opcode_serialize")]
-        call_type: evm::Opcode,
+        call_type: MarshalledOpcode,
         /// Input.
         #[serde(serialize_with = "bytes_0x_serialize")]
         input: Vec<u8>,
@@ -79,7 +80,7 @@ pub enum CallTracerInner {
     SelfDestruct {
         /// Call type.
         #[serde(rename = "type", serialize_with = "opcode_serialize")]
-        call_type: evm::Opcode,
+        call_type: MarshalledOpcode,
         /// To.
         to: H160,
         /// Value.

crates/evm-tracing-client/src/types/call_tracer.rs

@@ -3,6 +3,7 @@
 extern crate alloc;
 
 use codec::{Decode, Encode};
+use evm_tracing_events::MarshalledOpcode;
 use serde::Serialize;
 use sp_core::{H160, H256};
 
@@ -77,15 +78,19 @@ pub enum ContextType {
 
 impl ContextType {
     /// Obtain context type from opcode.
-    pub fn from(opcode: evm::Opcode) -> Option<Self> {
-        match opcode {
-            evm::Opcode::CREATE | evm::Opcode::CREATE2 => Some(ContextType::Create),
-            evm::Opcode::CALL => Some(ContextType::Call(CallType::Call)),
-            evm::Opcode::CALLCODE => Some(ContextType::Call(CallType::CallCode)),
-            evm::Opcode::DELEGATECALL => Some(ContextType::Call(CallType::DelegateCall)),
-            evm::Opcode::STATICCALL => Some(ContextType::Call(CallType::StaticCall)),
-            _ => None,
+    pub fn from(opcode: MarshalledOpcode) -> Option<Self> {
+        if let Some(opcode_known_name) = opcode.known_name() {
+            return match &opcode_known_name.to_uppercase()[..] {
+                "CREATE" | "CREATE2" => Some(ContextType::Create),
+                "CALL" => Some(ContextType::Call(CallType::Call)),
+                "CALLCODE" => Some(ContextType::Call(CallType::CallCode)),
+                "DELEGATECALL" => Some(ContextType::Call(CallType::DelegateCall)),
+                "STATICCALL" => Some(ContextType::Call(CallType::StaticCall)),
+                _ => None,
+            };
         }
+
+        None
     }
 }