logos-blockchain/lssa
1
0
Fork 0
mirror of https://github.com/logos-blockchain/lssa.git synced 2026-02-17 20:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #319 from logos-blockchain/dsq/wallet-ffi-runtime-fix

Browse Source 
fix(wallet-ffi): Initialize runtime automatically when needed
This commit is contained in:
Sergio Chouhy 2026-02-03 08:54:33 -03:00 committed by GitHub
commit ec1424cd8e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
wallet-ffi/src/lib.rs
View File

@ -28,6 +28,8 @@ pub mod transfer;
pub mod types;
pub mod wallet;
use std::sync::OnceLock;
// Re-export public types for cbindgen
pub use error::WalletFfiError as FfiError;
use tokio::runtime::Handle;
@ -35,9 +37,23 @@ pub use types::*;
use crate::error::{print_error, WalletFfiError};
static TOKIO_RUNTIME: OnceLock<tokio::runtime::Runtime> = OnceLock::new();
/// Get a reference to the global runtime.
pub(crate) fn get_runtime() -> Result<Handle, WalletFfiError> {
Handle::try_current().map_err(|_| WalletFfiError::RuntimeError)
pub(crate) fn get_runtime() -> Result<&'static Handle, WalletFfiError> {
let runtime = TOKIO_RUNTIME.get_or_init(|| {
match tokio::runtime::Builder::new_multi_thread()
.enable_all()
.build()
{
Ok(runtime) => runtime,
Err(e) => {
print_error(format!("{e}"));
panic!("Error initializing tokio runtime");
}
}
});
Ok(runtime.handle())
}
/// Run an async future on the global runtime, blocking until completion.
@ -45,26 +61,3 @@ pub(crate) fn block_on<F: std::future::Future>(future: F) -> Result<F::Output, W
let runtime = get_runtime()?;
Ok(runtime.block_on(future))
}
/// Initialize the global Tokio runtime.
///
/// This must be called before any async operations (like network calls).
/// Safe to call multiple times - subsequent calls are no-ops.
///
/// # Returns
/// - `Success` if the runtime was initialized or already exists
/// - `RuntimeError` if runtime creation failed
#[no_mangle]
pub extern "C" fn wallet_ffi_init_runtime() -> WalletFfiError {
let result = tokio::runtime::Builder::new_multi_thread()
.enable_all()
.build();
match result {
Ok(_) => WalletFfiError::Success,
Err(e) => {
print_error(format!("Failed to initialize runtime: {}", e));
WalletFfiError::RuntimeError
}
}
}

12
wallet-ffi/wallet_ffi.h
View File

@ -206,18 +206,6 @@ typedef struct FfiTransferResult {
bool success;
} FfiTransferResult;
/**
* Initialize the global Tokio runtime.
*
* This must be called before any async operations (like network calls).
* Safe to call multiple times - subsequent calls are no-ops.
*
* # Returns
* - `Success` if the runtime was initialized or already exists
* - `RuntimeError` if runtime creation failed
*/
enum WalletFfiError wallet_ffi_init_runtime(void);
/**
* Create a new public account.
*