chore: Configure Iroh with net feature

Author: samuelburnham

Cargo.lock

@@ -13,13 +13,13 @@ rayon = "1"
 rustc-hash = "2"
 indexmap = { version = "2", features = ["rayon"] }
 tiny-keccak = { version = "2", features = ["keccak"] }
-
-# bytes = "1.10.1"
-# [target.'cfg(not(all(target_os = "macos", target_arch = "aarch64")))'.dependencies]
-# iroh = "0.34.0"
-# tokio = "1.44.1"
-# iroh-base = "0.34.0"
-# iroh-blobs = { version = "0.34.0", features = ["rpc"] }
+# Iroh dependencies
+bytes = { version = "1.10.1", optional = true }
+tokio = { version = "1.44.1", optional = true }
+iroh = { version = "0.34.0", optional = true }
+iroh-base = { version = "0.34.0", optional = true }
+iroh-blobs = { version = "0.34.0", features = ["rpc"], optional = true }
 
 [features]
 parallel = ["multi-stark/parallel"]
+net = ["bytes", "tokio", "iroh", "iroh-base", "iroh-blobs"]

Cargo.toml

@@ -1,7 +1,7 @@
 import Ix.Cli.ProveCmd
 import Ix.Cli.StoreCmd
--- import Ix.Cli.SendCmd
--- import Ix.Cli.RecvCmd
+import Ix.Cli.SendCmd
+import Ix.Cli.RecvCmd
 import Ix
 
 def VERSION : String :=
@@ -13,9 +13,9 @@ def ixCmd : Cli.Cmd := `[Cli|
 
   SUBCOMMANDS:
     proveCmd;
-    storeCmd
-    -- sendCmd;
-    -- recvCmd
+    storeCmd;
+    sendCmd;
+    recvCmd
 ]
 
 def main (args : List String) : IO UInt32 := do

Main.lean

@@ -1,35 +1,35 @@
-// #include "lean/lean.h"
-// #include "rust.h"
-
-// extern lean_obj_res c_rs_iroh_send(b_lean_obj_arg bytes) {
-//     c_result *result = rs_iroh_send(bytes);
-//     lean_object *io_result;
-//     if (result->is_ok) {
-//         io_result = lean_io_result_mk_ok(lean_box(0));
-//     }
-//     else {
-//         io_result = lean_mk_io_user_error(lean_mk_string(result->data));
-//     }
-//     rs__c_result_unit_string_free(result);
-
-//     return io_result;
-// }
-
-// extern lean_obj_res c_rs_iroh_recv(b_lean_obj_arg ticket, size_t buffer_capacity) {
-//     char const *ticket_str = lean_string_cstr(ticket);
-//     // Buffer is allocated optimistically, but if the download fails it must be freed explicitly
-//     lean_object *buffer = lean_alloc_sarray(1, 0, buffer_capacity);
-//     c_result *result = rs_iroh_recv(ticket_str, buffer, buffer_capacity);
-
-//     lean_object *io_result;
-//     if (result->is_ok) {
-//         io_result = lean_io_result_mk_ok(buffer);
-//     }
-//     else {
-//         io_result = lean_mk_io_user_error(lean_mk_string(result->data));
-//         free(buffer);
-//     }
-//     rs__c_result_unit_string_free(result);
-
-//     return io_result;
-// }
+#include "lean/lean.h"
+#include "rust.h"
+ 
+extern lean_obj_res c_rs_iroh_send(b_lean_obj_arg bytes) {
+    c_result *result = rs_iroh_send(bytes);
+    lean_object *io_result;
+    if (result->is_ok) {
+        io_result = lean_io_result_mk_ok(lean_box(0));
+    }
+    else {
+        io_result = lean_mk_io_user_error(lean_mk_string(result->data));
+    }
+    rs__c_result_unit_string_free(result);
+ 
+    return io_result;
+}
+ 
+extern lean_obj_res c_rs_iroh_recv(b_lean_obj_arg ticket, size_t buffer_capacity) {
+    char const *ticket_str = lean_string_cstr(ticket);
+    // Buffer is allocated optimistically, but if the download fails it must be freed explicitly
+    lean_object *buffer = lean_alloc_sarray(1, 0, buffer_capacity);
+    c_result *result = rs_iroh_recv(ticket_str, buffer, buffer_capacity);
+ 
+    lean_object *io_result;
+    if (result->is_ok) {
+        io_result = lean_io_result_mk_ok(buffer);
+    }
+    else {
+        io_result = lean_mk_io_user_error(lean_mk_string(result->data));
+        free(buffer);
+    }
+    rs__c_result_unit_string_free(result);
+ 
+    return io_result;
+}

c/iroh.c

@@ -55,11 +55,15 @@ section FFI
 
 /-- Build the static lib for the Rust crate -/
 extern_lib ix_rs pkg := do
+  -- Default to `--features parallel`, configured via env var
   let ixNoPar ← IO.getEnv "IX_NO_PAR"
+  let ixNet ← IO.getEnv "IX_NET"
   let buildArgs := #["build", "--release"]
-  let args := if ixNoPar == some "1"
-    then buildArgs
-    else buildArgs ++ #["--features", "parallel"]
+  let args := match (ixNoPar, ixNet) with
+  | (some "1", some "1") => buildArgs ++ ["--features", "net"]
+  | (some "1", _) => buildArgs
+  | (_, some "1") => buildArgs ++ ["--features", "parallel,net"]
+  | _ => buildArgs ++ ["--features", "parallel"]
   proc { cmd := "cargo", args, cwd := pkg.dir } (quiet := true)
   let libName := nameToStaticLib "ix_rs"
   inputBinFile $ pkg.dir / "target" / "release" / libName

lakefile.lean

@@ -0,0 +1,32 @@
+use std::ffi::CString;
+
+use crate::lean::{
+    ffi::{CResult, c_char, to_raw},
+    sarray::LeanSArrayObject,
+};
+
+#[unsafe(no_mangle)]
+extern "C" fn rs_iroh_send(_bytes: &LeanSArrayObject) -> *const CResult {
+    let msg = CString::new("Iroh functions not supported MacOS aarch64-darwin or when the Rust `net` feature is disabled")
+        .expect("CString::new failure");
+    let c_result = CResult {
+        is_ok: true,
+        data: msg.into_raw().cast(),
+    };
+    to_raw(c_result)
+}
+
+#[unsafe(no_mangle)]
+extern "C" fn rs_iroh_recv(
+    _ticket: *const c_char,
+    _buffer: &mut LeanSArrayObject,
+    _buffer_capacity: usize,
+) -> *const CResult {
+    let msg = CString::new("Iroh functions not supported on MacOS aarch64-darwin or when the Rust `net` feature is disabled")
+        .expect("CString::new failure");
+    let c_result = CResult {
+        is_ok: true,
+        data: msg.into_raw().cast(),
+    };
+    to_raw(c_result)
+}

src/lean/ffi/_iroh.rs

@@ -1,23 +1,16 @@
-#[cfg(not(all(target_os = "macos", target_arch = "aarch64")))]
 use anyhow::Result;
-#[cfg(not(all(target_os = "macos", target_arch = "aarch64")))]
 use bytes::Bytes;
-#[cfg(not(all(target_os = "macos", target_arch = "aarch64")))]
 use iroh::{Endpoint, protocol::Router};
-#[cfg(not(all(target_os = "macos", target_arch = "aarch64")))]
 use iroh_blobs::{net_protocol::Blobs, ticket::BlobTicket};
-#[cfg(not(all(target_os = "macos", target_arch = "aarch64")))]
 use std::error::Error;
 use std::ffi::CString;
 
-#[cfg(not(all(target_os = "macos", target_arch = "aarch64")))]
 use crate::lean::ffi::raw_to_str;
 use crate::lean::{
     ffi::{CResult, c_char, to_raw},
     sarray::LeanSArrayObject,
 };
 
-#[cfg(not(all(target_os = "macos", target_arch = "aarch64")))]
 #[unsafe(no_mangle)]
 extern "C" fn rs_iroh_send(bytes: &LeanSArrayObject) -> *const CResult {
     // Create a Tokio runtime to block on the async function
@@ -41,19 +34,6 @@ extern "C" fn rs_iroh_send(bytes: &LeanSArrayObject) -> *const CResult {
     to_raw(c_result)
 }
 
-#[cfg(all(target_os = "macos", target_arch = "aarch64"))]
-#[unsafe(no_mangle)]
-extern "C" fn rs_iroh_send(_bytes: &LeanSArrayObject) -> *const CResult {
-    let msg = CString::new("Iroh functions not supported on MacOS aarch64-darwin")
-        .expect("CString::new failure");
-    let c_result = CResult {
-        is_ok: false,
-        data: msg.into_raw().cast(),
-    };
-    to_raw(c_result)
-}
-
-#[cfg(not(all(target_os = "macos", target_arch = "aarch64")))]
 async fn iroh_send(bytes: &[u8]) -> Result<(), Box<dyn Error>> {
     // Create an endpoint, it allows creating and accepting
     // connections in the iroh p2p world
@@ -91,7 +71,6 @@ async fn iroh_send(bytes: &[u8]) -> Result<(), Box<dyn Error>> {
     Ok(())
 }
 
-#[cfg(not(all(target_os = "macos", target_arch = "aarch64")))]
 #[unsafe(no_mangle)]
 extern "C" fn rs_iroh_recv(
     ticket: *const c_char,
@@ -125,23 +104,6 @@ extern "C" fn rs_iroh_recv(
     to_raw(c_result)
 }
 
-#[cfg(all(target_os = "macos", target_arch = "aarch64"))]
-#[unsafe(no_mangle)]
-extern "C" fn rs_iroh_recv(
-    _ticket: *const c_char,
-    _buffer: &mut LeanSArrayObject,
-    _buffer_capacity: usize,
-) -> *const CResult {
-    let msg = CString::new("Iroh functions not supported on MacOS aarch64-darwin")
-        .expect("CString::new failure");
-    let c_result = CResult {
-        is_ok: false,
-        data: msg.into_raw().cast(),
-    };
-    to_raw(c_result)
-}
-
-#[cfg(not(all(target_os = "macos", target_arch = "aarch64")))]
 async fn iroh_recv(ticket: &str, buffer_capacity: usize) -> Result<Bytes, Box<dyn Error>> {
     // Create an endpoint, it allows creating and accepting
     // connections in the iroh p2p world

src/lean/ffi/iroh.rs

@@ -1,6 +1,9 @@
 pub mod aiur;
 pub mod byte_array;
-// pub mod iroh;
+#[cfg(all(feature = "net", not(all(target_os = "macos", target_arch = "aarch64"))))]
+pub mod iroh;
+#[cfg(not(feature = "net"))]
+pub mod _iroh;
 pub mod keccak;
 
 use std::ffi::{CStr, CString, c_char, c_void};