Remove direct dependency on flatbuffers in hyperlight-host and hyperlight-guest

Signed-off-by: Ludvig Liljenberg <[email protected]>

Author: ludfjig

Cargo.lock

@@ -36,3 +36,6 @@ pub mod flatbuffer_wrappers;
 mod flatbuffers;
 /// cbindgen:ignore
 pub mod mem;
+
+extern crate flatbuffers as fb;
+pub use fb::FlatBufferBuilder;

src/hyperlight_common/src/lib.rs

@@ -24,7 +24,6 @@ buddy_system_allocator = "0.11.0"
 hyperlight-common = { workspace = true }
 spin = "0.10.0"
 log = { version = "0.4", default-features = false }
-flatbuffers = { version= "25.2.10", default-features = false }
 
 [build-dependencies]
 cc = "1.2"

src/hyperlight_guest/Cargo.toml

@@ -18,7 +18,6 @@ use alloc::format;
 use alloc::string::ToString;
 use alloc::vec::Vec;
 use core::arch::global_asm;
-use flatbuffers::FlatBufferBuilder;
 
 use hyperlight_common::flatbuffer_wrappers::function_call::{FunctionCall, FunctionCallType};
 use hyperlight_common::flatbuffer_wrappers::function_types::{
@@ -27,6 +26,7 @@ use hyperlight_common::flatbuffer_wrappers::function_types::{
 use hyperlight_common::flatbuffer_wrappers::guest_error::ErrorCode;
 use hyperlight_common::flatbuffer_wrappers::util::get_flatbuffer_result;
 use hyperlight_common::mem::RunMode;
+use hyperlight_common::FlatBufferBuilder;
 
 use crate::error::{HyperlightGuestError, Result};
 use crate::host_error::check_for_host_error;

src/hyperlight_guest/src/host_function_call.rs

@@ -26,7 +26,6 @@ rand = { version = "0.9" }
 cfg-if = { version = "1.0.0" }
 libc = { version = "0.2.172" }
 paste = "1.0"
-flatbuffers = "25.2.10"
 page_size = "0.6.0"
 termcolor = "1.2.0"
 bitflags = "2.9.0"

src/hyperlight_host/Cargo.toml

@@ -32,7 +32,6 @@ use std::time::SystemTimeError;
 
 #[cfg(target_os = "windows")]
 use crossbeam_channel::{RecvError, SendError};
-use flatbuffers::InvalidFlatbuffer;
 use hyperlight_common::flatbuffer_wrappers::function_types::{ParameterValue, ReturnValue};
 use hyperlight_common::flatbuffer_wrappers::guest_error::ErrorCode;
 use serde::{Deserialize, Serialize};
@@ -167,10 +166,6 @@ pub enum HyperlightError {
     #[error("Failed To Convert Size to usize")]
     IntConversionFailure(#[from] TryFromIntError),
 
-    /// The flatbuffer is invalid
-    #[error("The flatbuffer is invalid")]
-    InvalidFlatBuffer(#[from] InvalidFlatbuffer),
-
     /// Conversion of str to Json failed
     #[error("Conversion of str data to json failed")]
     JsonConversionFailure(#[from] serde_json::Error),

src/hyperlight_host/src/error.rs

@@ -19,12 +19,12 @@ use std::cmp::Ordering;
 use std::str::from_utf8;
 use std::sync::{Arc, Mutex};
 
-use flatbuffers::FlatBufferBuilder;
 use hyperlight_common::flatbuffer_wrappers::function_call::{FunctionCall, FunctionCallType};
 use hyperlight_common::flatbuffer_wrappers::function_types::ReturnValue;
 use hyperlight_common::flatbuffer_wrappers::guest_error::{ErrorCode, GuestError};
 use hyperlight_common::flatbuffer_wrappers::guest_log_data::GuestLogData;
 use hyperlight_common::flatbuffer_wrappers::host_function_details::HostFunctionDetails;
+use hyperlight_common::FlatBufferBuilder;
 use serde_json::from_str;
 use tracing::{instrument, Span};