Move TransactionContext from js to tracing

src/tracing/js/bindings.rs

@@ -1,14 +1,12 @@
 //! Type bindings for js tracing inspector
 
 use crate::tracing::{
-    js::{
-        builtins::{
-            address_to_byte_array, address_to_byte_array_value, bytes_to_address, bytes_to_hash,
-            from_buf_value, to_bigint, to_byte_array, to_byte_array_value,
-        },
-        TransactionContext,
+    js::builtins::{
+        address_to_byte_array, address_to_byte_array_value, bytes_to_address, bytes_to_hash,
+        from_buf_value, to_bigint, to_byte_array, to_byte_array_value,
     },
     types::CallKind,
+    TransactionContext,
 };
 use alloy_primitives::{Address, Bytes, B256, U256};
 use boa_engine::{

src/tracing/js/mod.rs

@@ -8,8 +8,9 @@ use crate::tracing::{
         builtins::{register_builtins, to_serde_value, PrecompileList},
     },
     types::CallKind,
+    TransactionContext,
 };
-use alloy_primitives::{Address, Bytes, Log, B256, U256};
+use alloy_primitives::{Address, Bytes, Log, U256};
 pub use boa_engine::vm::RuntimeLimits;
 use boa_engine::{js_string, Context, JsError, JsObject, JsResult, JsValue, Source};
 use revm::{
@@ -572,44 +573,6 @@ where
     }
 }
 
-/// Contains some contextual infos for a transaction execution that is made available to the JS
-/// object.
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
-pub struct TransactionContext {
-    /// Hash of the block the tx is contained within.
-    ///
-    /// `None` if this is a call.
-    pub block_hash: Option<B256>,
-    /// Index of the transaction within a block.
-    ///
-    /// `None` if this is a call.
-    pub tx_index: Option<usize>,
-    /// Hash of the transaction being traced.
-    ///
-    /// `None` if this is a call.
-    pub tx_hash: Option<B256>,
-}
-
-impl TransactionContext {
-    /// Sets the block hash.
-    pub const fn with_block_hash(mut self, block_hash: B256) -> Self {
-        self.block_hash = Some(block_hash);
-        self
-    }
-
-    /// Sets the index of the transaction within a block.
-    pub const fn with_tx_index(mut self, tx_index: usize) -> Self {
-        self.tx_index = Some(tx_index);
-        self
-    }
-
-    /// Sets the hash of the transaction.
-    pub const fn with_tx_hash(mut self, tx_hash: B256) -> Self {
-        self.tx_hash = Some(tx_hash);
-        self
-    }
-}
-
 /// Represents an active call
 #[derive(Debug)]
 struct CallStackItem {

src/tracing/mod.rs

@@ -9,7 +9,7 @@ use crate::{
         utils::gas_used,
     },
 };
-use alloy_primitives::{Address, Bytes, Log, U256};
+use alloy_primitives::{Address, Bytes, Log, B256, U256};
 use revm::{
     interpreter::{
         opcode::{self},
@@ -678,3 +678,41 @@ struct StackStep {
     /// not appear in the steps list.
     step_idx: usize,
 }
+
+/// Contains some contextual infos for a transaction execution that is made available to the JS
+/// object.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
+pub struct TransactionContext {
+    /// Hash of the block the tx is contained within.
+    ///
+    /// `None` if this is a call.
+    pub block_hash: Option<B256>,
+    /// Index of the transaction within a block.
+    ///
+    /// `None` if this is a call.
+    pub tx_index: Option<usize>,
+    /// Hash of the transaction being traced.
+    ///
+    /// `None` if this is a call.
+    pub tx_hash: Option<B256>,
+}
+
+impl TransactionContext {
+    /// Sets the block hash.
+    pub const fn with_block_hash(mut self, block_hash: B256) -> Self {
+        self.block_hash = Some(block_hash);
+        self
+    }
+
+    /// Sets the index of the transaction within a block.
+    pub const fn with_tx_index(mut self, tx_index: usize) -> Self {
+        self.tx_index = Some(tx_index);
+        self
+    }
+
+    /// Sets the hash of the transaction.
+    pub const fn with_tx_hash(mut self, tx_hash: B256) -> Self {
+        self.tx_hash = Some(tx_hash);
+        self
+    }
+}