Merge pull request #37 from openSVM/develop

Develop

Author: larp0

manage-local-rpc.sh

@@ -0,0 +1,49 @@
+#!/bin/bash
+
+# Script to manage local Solana RPC node
+
+case "$1" in
+    start)
+        if pgrep -f "solana-test-validator" > /dev/null; then
+            echo "❌ Solana test validator is already running"
+            exit 1
+        fi
+        echo "🚀 Starting Solana test validator..."
+        nohup solana-test-validator --reset > /tmp/solana-test-validator.log 2>&1 &
+        echo "✅ Started with PID: $!"
+        echo "📍 RPC URL: http://127.0.0.1:8899"
+        echo "🔌 WebSocket URL: ws://127.0.0.1:8900"
+        echo "📄 Log file: /tmp/solana-test-validator.log"
+        ;;
+    stop)
+        echo "🛑 Stopping Solana test validator..."
+        pkill -f solana-test-validator
+        echo "✅ Stopped"
+        ;;
+    status)
+        if pgrep -f "solana-test-validator" > /dev/null; then
+            echo "✅ Solana test validator is running"
+            echo "📍 RPC URL: http://127.0.0.1:8899"
+            echo "🔌 WebSocket URL: ws://127.0.0.1:8900"
+            # Check health
+            if curl -s -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","id":1,"method":"getHealth"}' http://127.0.0.1:8899 | grep -q '"result":"ok"'; then
+                echo "💚 Health: OK"
+            else
+                echo "❌ Health: Not responding"
+            fi
+        else
+            echo "❌ Solana test validator is not running"
+        fi
+        ;;
+    logs)
+        if [ -f /tmp/solana-test-validator.log ]; then
+            tail -f /tmp/solana-test-validator.log
+        else
+            echo "❌ No log file found"
+        fi
+        ;;
+    *)
+        echo "Usage: $0 {start|stop|status|logs}"
+        exit 1
+        ;;
+esac

src/clparse.rs

@@ -913,7 +913,8 @@ pub fn parse_command_line() -> clap::ArgMatches {
                                 .action(ArgAction::SetTrue)
                                 .help("Enable transaction history (increases storage requirements)")
                         )
-                  )
+                )
+        )
         .subcommand(
             Command::new("doctor")
                 .about("Comprehensive system health check and repair")

src/utils/log_monitor.rs

@@ -288,14 +288,30 @@ async fn setup_ngrok_tunnels(ports: &[u16]) -> Result<HashMap<u16, String>> {
     for &port in ports {
         println!("🔗 Creating ngrok tunnel for port {}", port);
 
-        // Start ngrok in background
-        let mut child = Command::new("ngrok")
-            .arg("tcp")
-            .arg(port.to_string())
-            .arg("--log")
-            .arg("stdout")
-            .spawn()
-            .context("Failed to start ngrok")?;
+        // Use HTTP tunnel with custom domain for RPC ports (8899), TCP for others
+        let mut child = if port == 8899 {
+            // HTTP tunnel for RPC endpoint with custom domain
+            Command::new("ngrok")
+                .arg("http")
+                .arg(format!("localhost:{}", port))
+                .arg("--domain")
+                .arg(format!("osvm.dev"))
+                .arg("--log")
+                .arg("stdout")
+                .spawn()
+                .context("Failed to start ngrok")?
+        } else {
+            // TCP tunnel with custom remote address for gossip/other ports
+            Command::new("ngrok")
+                .arg("tcp")
+                .arg(port.to_string())
+                .arg("--remote-addr")
+                .arg(format!("{}.osvm.dev:{}", port, port))
+                .arg("--log")
+                .arg("stdout")
+                .spawn()
+                .context("Failed to start ngrok")?
+        };
 
         // Give ngrok time to start
         tokio::time::sleep(tokio::time::Duration::from_secs(3)).await;

src/utils/ssh_deploy/deployments/solana.rs

@@ -194,12 +194,9 @@ fn install_solana_cli(
         Some("firedancer") => {
             // Install Firedancer client
             let temp_dir = "/tmp/firedancer";
-            let cleanup = || {
-                let _ = client.execute_command(&format!("rm -rf {}", temp_dir));
-            };
 
             // Wrap installation steps in error handling
-            if let Err(e) = (|| -> Result<(), DeploymentError> {
+            let result = (|| -> Result<(), DeploymentError> {
                 // First install dependencies
                 client.execute_command("sudo apt-get update && sudo apt-get install -y build-essential cmake pkg-config libssl-dev")?;
 
@@ -216,13 +213,13 @@ fn install_solana_cli(
                 client.execute_command("sudo ln -sf /opt/firedancer/bin/fd_keygen /usr/local/bin/solana-keygen")?;
 
                 Ok(())
-            })() {
-                cleanup();
-                return Err(e);
-            }
+            })();
 
-            // Clean up
-            cleanup();
+            // Clean up regardless of success or failure
+            let _ = client.execute_command(&format!("rm -rf {}", temp_dir));
+            
+            // Return result after cleanup
+            result?;
         }
         Some("sig") => {
             // Install Sig (Solana Zig Validator)