chore(subgraph): move transaction data parsing logic from surfpool to…

Cargo.toml

@@ -88,8 +88,8 @@ spl-associated-token-account =  "6.0.0"
 spl-token = "6.0.0"
 txtx-addon-kit = { version = "0.4.4", features = ["wasm"] }
 txtx-core = { version = "0.4.7" }
-txtx-addon-network-svm = { version = "0.2.2" }
-txtx-addon-network-svm-types = { version = "0.2.2" }
+txtx-addon-network-svm = { version = "0.2.7" }
+txtx-addon-network-svm-types = { version = "0.2.5" }
 txtx-gql = { version = "0.3.2" }
 txtx-supervisor-ui = { version = "0.2.3", default-features = false, features = ["crates_build"]}
 txtx-cloud = "0.1.9"

crates/core/Cargo.toml

@@ -83,7 +83,6 @@ zstd = "0.13.2"
 libloading = "0.7.4"
 json5 = "0.4.1"
 txtx-addon-network-svm-types = { workspace = true }
-txtx-addon-network-svm = { workspace = true }
 uuid = "1.7.0"
 blake3 = "1.8.2"
 anyhow = "1.0.98"

crates/core/src/rpc/mod.rs

@@ -42,7 +42,7 @@ pub struct SurfpoolRpc;
 
 #[derive(Clone)]
 pub struct RunloopContext {
-    pub id: Option<Hash>,
+    pub id: Option<(Hash, String)>,
     pub svm_locker: SurfnetSvmLocker,
     pub simnet_commands_tx: Sender<SimnetCommand>,
     pub plugin_manager_commands_tx: Sender<PluginManagerCommand>,

crates/core/src/runloops/mod.rs

@@ -99,7 +99,7 @@ pub async fn start_local_surfnet_runloop(
     };
 
     let (clock_event_rx, clock_command_tx) =
-        start_clock_runloop(simnet_config.slot_time, simnet_events_tx_cc.clone());
+        start_clock_runloop(simnet_config.slot_time, Some(simnet_events_tx_cc.clone()));
 
     let _ = simnet_events_tx_cc.send(SimnetEvent::Ready);
 
@@ -223,7 +223,7 @@ pub async fn start_block_production_runloop(
 
 pub fn start_clock_runloop(
     mut slot_time: u64,
-    simnet_events_tx: Sender<SimnetEvent>,
+    simnet_events_tx: Option<Sender<SimnetEvent>>,
 ) -> (Receiver<ClockEvent>, Sender<ClockCommand>) {
     let (clock_event_tx, clock_event_rx) = unbounded::<ClockEvent>();
     let (clock_command_tx, clock_command_rx) = unbounded::<ClockCommand>();
@@ -236,15 +236,24 @@ pub fn start_clock_runloop(
             match clock_command_rx.try_recv() {
                 Ok(ClockCommand::Pause) => {
                     enabled = false;
-                    let _ = simnet_events_tx.send(SimnetEvent::ClockUpdate(ClockCommand::Pause));
+                    if let Some(ref simnet_events_tx) = simnet_events_tx {
+                        let _ =
+                            simnet_events_tx.send(SimnetEvent::ClockUpdate(ClockCommand::Pause));
+                    }
                 }
                 Ok(ClockCommand::Resume) => {
                     enabled = true;
-                    let _ = simnet_events_tx.send(SimnetEvent::ClockUpdate(ClockCommand::Resume));
+                    if let Some(ref simnet_events_tx) = simnet_events_tx {
+                        let _ =
+                            simnet_events_tx.send(SimnetEvent::ClockUpdate(ClockCommand::Resume));
+                    }
                 }
                 Ok(ClockCommand::Toggle) => {
                     enabled = !enabled;
-                    let _ = simnet_events_tx.send(SimnetEvent::ClockUpdate(ClockCommand::Toggle));
+                    if let Some(ref simnet_events_tx) = simnet_events_tx {
+                        let _ =
+                            simnet_events_tx.send(SimnetEvent::ClockUpdate(ClockCommand::Toggle));
+                    }
                 }
                 Ok(ClockCommand::UpdateSlotInterval(updated_slot_time)) => {
                     slot_time = updated_slot_time;

crates/core/src/surfnet/svm.rs

@@ -50,7 +50,7 @@ use surfpool_types::{
     },
 };
 use txtx_addon_kit::{indexmap::IndexMap, types::types::AddonJsonConverter};
-use txtx_addon_network_svm::codec::idl::parse_bytes_to_value_with_expected_idl_type_def_ty;
+use txtx_addon_network_svm_types::subgraph::idl::parse_bytes_to_value_with_expected_idl_type_def_ty;
 use uuid::Uuid;
 
 use super::{
@@ -1516,12 +1516,22 @@ impl SurfnetSvm {
                             if let Some(account_type) =
                                 idl.types.iter().find(|t| t.name == matching_account.name)
                             {
+                                let empty_vec = vec![];
+                                let idl_type_def_generics = idl
+                                    .types
+                                    .iter()
+                                    .find(|t| t.name == account_type.name)
+                                    .map(|t| &t.generics);
+
                                 // If we found a matching account type, we can use it to parse the account data
                                 let rest = data[8..].as_ref();
                                 if let Ok(parsed_value) =
                                     parse_bytes_to_value_with_expected_idl_type_def_ty(
                                         &rest,
                                         &account_type.ty,
+                                        &idl.types,
+                                        &vec![],
+                                        idl_type_def_generics.unwrap_or(&empty_vec),
                                     )
                                 {
                                     return UiAccount {

crates/gql/src/types/collections.rs

@@ -31,6 +31,7 @@ pub struct CollectionMetadata {
 
 impl CollectionMetadata {
     pub fn from_request(uuid: &Uuid, request: &SubgraphRequest) -> Self {
+        let SubgraphRequest::V0(request) = request;
         let name = request.subgraph_name.to_case(Case::Pascal);
         let mut fields: Vec<_> = request
             .intrinsic_fields

crates/gql/src/types/sql.rs

@@ -385,6 +385,7 @@ mod tests {
         anchor::types::{Idl, IdlEvent, IdlMetadata, IdlSerialization, IdlTypeDef, IdlTypeDefTy},
         subgraph::{
             EventSubgraphSource, IndexedSubgraphField, IndexedSubgraphSourceType, SubgraphRequest,
+            SubgraphRequestV0,
         },
     };
     use uuid::Uuid;
@@ -425,7 +426,7 @@ mod tests {
             }],
             errors: vec![],
         };
-        SubgraphRequest {
+        SubgraphRequest::V0(SubgraphRequestV0 {
             program_id: program_id.clone(),
             slot: 0,
             subgraph_name: "TestSubgraph".to_string(),
@@ -443,7 +444,8 @@ mod tests {
                 is_indexed: false,
             }],
             intrinsic_fields: vec![],
-        }
+            idl_types: vec![],
+        })
     }
 
     fn test_entry(_schema: &CollectionMetadata) -> Vec<u8> {