WIP

Cargo.toml

@@ -87,7 +87,8 @@ fuel-core-xtask = { version = "0.0.0", path = "./xtask" }
 fuel-gas-price-algorithm = { version = "0.40.0", path = "crates/fuel-gas-price-algorithm" }
 
 # Fuel dependencies
-fuel-vm-private = { git = "https://github.com/FuelLabs/fuel-vm", branch = "dento/execution-trace", package = "fuel-vm", default-features = false }
+fuel-vm-private = { path = "../fuel-vm/fuel-vm", package = "fuel-vm", default-features = false }
+# fuel-vm-private = { git = "https://github.com/FuelLabs/fuel-vm", branch = "dento/execution-trace", package = "fuel-vm", default-features = false }
 # fuel-vm-private = { version = "0.58.2", package = "fuel-vm", default-features = false }
 
 # Common dependencies
@@ -115,6 +116,7 @@ postcard = "1.0"
 tracing-attributes = "0.1"
 tracing-subscriber = "0.3"
 serde = "1.0"
+serde-big-array = { version = "0.5", default-features = false }
 serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
 serde_with = { version = "3.4", default-features = false }
 strum = { version = "0.25" }

crates/client/src/client.rs

@@ -49,19 +49,25 @@ use fuel_core_types::{
     fuel_asm::{
         Instruction,
         Word,
-    }, fuel_tx::{
+    },
+    fuel_tx::{
         BlobId,
         Bytes32,
         ConsensusParameters,
         Receipt,
         Transaction,
         TxId,
-    }, fuel_types::{
+    },
+    fuel_types::{
         self,
         canonical::Serialize,
         BlockHeight,
         Nonce,
-    }, fuel_vm::interpreter::trace::Trigger, services::executor::TransactionExecutionStatus
+    },
+    services::executor::{
+        TraceTrigger,
+        TransactionExecutionStatus,
+    },
 };
 #[cfg(feature = "subscriptions")]
 use futures::{
@@ -503,11 +509,11 @@ impl FuelClient {
             .collect()
     }
 
-    /// Exectuion trace for a block
+    /// Execution trace for a block
     pub async fn execution_trace_block(
         &self,
         height: &BlockHeight,
-        trigger: Trigger
+        trigger: TraceTrigger,
     ) -> io::Result<Vec<TransactionExecutionStatus>> {
         let query: Operation<
             schema::execution_trace::ExectionTraceBlock,

crates/client/src/client/schema/execution_trace.rs

@@ -12,19 +12,18 @@ use crate::client::{
     PaginationRequest,
 };
 use fuel_core_types::{
-    fuel_tx, fuel_vm::interpreter::trace::Trigger, services::executor::{
+    fuel_tx,
+    services::executor::{
         TransactionExecutionResult,
         TransactionExecutionStatus,
-    }
+    },
 };
 use std::convert::{
     TryFrom,
     TryInto,
 };
 
-use super::tx::{
-    ProgramState,
-};
+use super::tx::ProgramState;
 
 #[allow(clippy::enum_variant_names)]
 #[derive(cynic::InlineFragments, Clone, Debug)]
@@ -150,24 +149,24 @@ impl From<(Address, PaginationRequest<String>)> for TransactionsByOwnerConnectio
 
 // mutations
 
-
 /// When to record a trace frames during execution
 #[derive(cynic::Enum, Debug, Copy, Clone, Eq, PartialEq)]
-#[cynic(
-    schema_path = "./assets/schema.sdl",
-    graphql_type = "TraceTrigger",
-)]
+#[cynic(schema_path = "./assets/schema.sdl", graphql_type = "TraceTrigger")]
 pub enum TraceTrigger {
     /// After each instruction
     OnInstruction,
     /// After an instruction has created a receipt
     OnReceipt,
 }
-impl From<Trigger> for TraceTrigger {
-    fn from(value: Trigger) -> Self {
-        match value {
-            Trigger::OnInstruction => TraceTrigger::OnInstruction,
-            Trigger::OnReceipt => TraceTrigger::OnReceipt,
+impl From<fuel_core_types::services::executor::TraceTrigger> for TraceTrigger {
+    fn from(trigger: fuel_core_types::services::executor::TraceTrigger) -> Self {
+        match trigger {
+            fuel_core_types::services::executor::TraceTrigger::OnInstruction => {
+                TraceTrigger::OnInstruction
+            }
+            fuel_core_types::services::executor::TraceTrigger::OnReceipt => {
+                TraceTrigger::OnReceipt
+            }
         }
     }
 }

crates/fuel-core/src/graphql_api/ports.rs

@@ -53,10 +53,7 @@ use fuel_core_types::{
         ContractId,
         Nonce,
     },
-    fuel_vm::interpreter::{
-        trace::Trigger,
-        Memory,
-    },
+    fuel_vm::interpreter::Memory,
     services::{
         executor::TransactionExecutionStatus,
         graphql_api::ContractBalance,

crates/fuel-core/src/schema/tx/types.rs

@@ -80,10 +80,6 @@ use fuel_core_types::{
     fuel_types::canonical::Serialize,
     fuel_vm::{
         consts::VM_REGISTER_COUNT,
-        interpreter::trace::{
-            Frame,
-            Trigger,
-        },
         ProgramState as VmProgramState,
     },
     services::{
@@ -902,14 +898,6 @@ pub enum TraceTrigger {
     /// After an instruction has created a receipt
     OnReceipt,
 }
-impl From<TraceTrigger> for Trigger {
-    fn from(value: TraceTrigger) -> Self {
-        match value {
-            TraceTrigger::OnInstruction => Trigger::OnInstruction,
-            TraceTrigger::OnReceipt => Trigger::OnReceipt,
-        }
-    }
-}
 
 #[derive(Union, Debug)]
 pub enum TraceTransactionStatus {

crates/fuel-core/src/service/adapters/graphql_api.rs

@@ -41,7 +41,6 @@ use fuel_core_types::{
         TxId,
     },
     fuel_types::BlockHeight,
-    fuel_vm::interpreter::trace::Trigger,
     services::{
         block_importer::SharedImportResult,
         executor::TransactionExecutionStatus,

crates/fuel-core/src/service/adapters/producer.rs

@@ -60,7 +60,6 @@ use fuel_core_types::{
         BlockHeight,
         Bytes32,
     },
-    fuel_vm::interpreter::trace::Trigger,
     services::{
         block_producer::Components,
         executor::{