chore: release 0.9.6

Author: lgalabru

Cargo.lock

@@ -1,5 +1,5 @@
 [workspace.package]
-version = "0.9.5"
+version = "0.9.6"
 edition = "2024"
 description = "Surfpool is the best place to train before surfing Solana."
 license = "Apache-2.0"
@@ -52,7 +52,7 @@ serde_derive = "1.0.217" # must match the serde version, see https://github.com/
 serde_json = "1.0.135"
 serde_with = "3"
 solana-account = "2.2.1"
-solana-account-decoder = "2.2.1"
+solana-account-decoder = "=2.2.2"
 solana-account-decoder-client-types = { version = "2.2.1" }
 solana-address-lookup-table-interface = "2.2.1"
 solana-blake3-hasher = { version = "2.2.1", features = ["serde"]}
@@ -68,7 +68,6 @@ solana-keypair = "2.2.1"
 solana-message = { version = "2.2.1", features = ["serde"]}
 solana-native-token = "2.2.1"
 solana-packet = "2.2.1"
-solana-program = "2.2.1"
 solana-program-runtime = "2.2.1"
 solana-pubkey = { version = "2.2.1", features = ["serde"]}
 solana-rpc-client = "2.2.1"

Cargo.toml

@@ -184,8 +184,8 @@ pub struct StartSimnet {
     #[arg(long = "subgraph-database-path", short = 'd')]
     pub subgraph_database_path: Option<String>,
     /// Disable Studio (default: false)
-    #[clap(long = "no-studio")]
-    pub no_studio: bool,
+    #[clap(long = "studio", action=ArgAction::SetFalse)]
+    pub studio: bool,
     /// Set the Studio port
     #[arg(long = "studio-port", short = 's', default_value_t = CHANGE_TO_DEFAULT_STUDIO_PORT_ONCE_SUPERVISOR_MERGED)]
     pub studio_port: u16,

crates/cli/src/cli/mod.rs

@@ -137,7 +137,7 @@ pub async fn handle_start_local_surfnet_command(
         match simnet_events_rx.recv() {
             Ok(SimnetEvent::Aborted(error)) => return Err(error),
             Ok(SimnetEvent::Shutdown) => return Ok(()),
-            Ok(SimnetEvent::Connected(_)) | Ok(SimnetEvent::Ready) => break,
+            Ok(SimnetEvent::Connected(_)) => break,
             _other => continue,
         }
     }
@@ -173,7 +173,7 @@ pub async fn handle_start_local_surfnet_command(
         }
     }
 
-    let displayed_url = if cmd.no_studio {
+    let displayed_url = if cmd.studio {
         DisplayedUrl::Datasource(sanitized_config)
     } else {
         DisplayedUrl::Studio(sanitized_config)

crates/cli/src/cli/simnet/mod.rs

@@ -257,7 +257,7 @@ fn start_subgraph_runloop(
                                 collections_map.add_collection(metadata);
                                 gql_schema.replace(new_dynamic_schema(collections_map.clone()));
 
-                                let console_url = format!("{}/data", config.studio_url.clone());
+                                let console_url = format!("{}/subgraphs", config.studio_url.clone());
                                 let _ = sender.send(console_url);
                             }
                             SubgraphCommand::ObserveCollection(subgraph_observer_rx) => {

crates/cli/src/http/mod.rs

@@ -104,9 +104,28 @@ impl App {
     ) -> App {
         let palette = palette::tailwind::EMERALD;
 
+        let mut events = vec![];
+        let (rpc_url, ws_url, datasource) = match &displayed_url {
+            DisplayedUrl::Datasource(config) | DisplayedUrl::Studio(config) => (
+                config.rpc_url.clone(),
+                config.ws_url.clone(),
+                config.rpc_datasource_url.clone(),
+            ),
+        };
+        events.push((
+            EventType::Success,
+            Local::now(),
+            format!("Surfnet up and running, emulating local Solana validator (RPC: {rpc_url}, WS: {ws_url})"),
+        ));
+        events.push((
+            EventType::Info,
+            Local::now(),
+            format!("Connecting surfnet to datasource {datasource}..."),
+        ));
+
         App {
-            state: TableState::default().with_selected(0),
-            scroll_state: ScrollbarState::new(5 * ITEM_HEIGHT),
+            state: TableState::default().with_offset(0),
+            scroll_state: ScrollbarState::new(0),
             colors: ColorTheme::new(&palette),
             simnet_events_rx,
             simnet_commands_tx,
@@ -120,27 +139,7 @@ impl App {
                 transaction_count: None,
             },
             successful_transactions: 0,
-            events: {
-                let mut events = vec![];
-                let (rpc_url, ws_url, datasource) = match &displayed_url {
-                    DisplayedUrl::Datasource(config) | DisplayedUrl::Studio(config) => (
-                        config.rpc_url.clone(),
-                        config.ws_url.clone(),
-                        config.rpc_datasource_url.clone(),
-                    ),
-                };
-                events.push((
-                    EventType::Success,
-                    Local::now(),
-                    format!("Started local validator [RPC: {rpc_url}, WS: {ws_url}]"),
-                ));
-                events.push((
-                    EventType::Success,
-                    Local::now(),
-                    format!("Connected validator to datasource {datasource}"),
-                ));
-                events
-            },
+            events,
             include_debug_logs,
             deploy_progress_rx,
             status_bar_message: None,
@@ -166,6 +165,10 @@ impl App {
         *self.state.offset_mut() = ITEM_HEIGHT;
     }
 
+    pub fn tail(&mut self) {
+        self.state.select_last();
+    }
+
     pub fn previous(&mut self) {
         self.state.select_previous();
         self.scroll_state.prev();
@@ -424,10 +427,10 @@ fn run_app<B: Backend>(terminal: &mut Terminal<B>, mut app: App) -> io::Result<(
 
         for event in new_events {
             app.events.push(event);
-            app.next();
+            app.tail();
         }
 
-        if event::poll(Duration::from_millis(5))? {
+        if event::poll(Duration::from_millis(25))? {
             if let Event::Key(key_event) = event::read()? {
                 if key_event.kind == KeyEventKind::Press {
                     use KeyCode::*;

crates/cli/src/tui/simnet.rs

@@ -14,7 +14,7 @@ crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 agave-geyser-plugin-interface = { workspace = true }
-solana-program = { workspace = true }
+solana-clock = { workspace = true }
 solana-signature = { workspace = true }
 txtx-addon-kit = { workspace = true }
 txtx-addon-network-svm = { workspace = true }

crates/subgraph/Cargo.toml

@@ -5,7 +5,7 @@ use agave_geyser_plugin_interface::geyser_plugin_interface::{
     ReplicaTransactionInfoVersions, Result as PluginResult, SlotStatus,
 };
 use ipc_channel::ipc::IpcSender;
-use solana_program::clock::Slot;
+use solana_clock::Slot;
 use solana_signature::Signature;
 use surfpool_types::{DataIndexingCommand, SubgraphPluginConfig};
 use txtx_addon_kit::types::types::Value as TxtxValue;

crates/subgraph/src/lib.rs

@@ -287,7 +287,7 @@ impl SimnetEvent {
         match self {
             SimnetEvent::EpochInfoUpdate(epoch_info) => {
                 format!(
-                    "Connection established. Epoch {} / Slot index {} / Slot {}.",
+                    "Datasource connection successful. Epoch {} / Slot index {} / Slot {}.",
                     epoch_info.epoch, epoch_info.slot_index, epoch_info.absolute_slot
                 )
             }