summaryrefslogtreecommitdiff
path: root/impls/monero.rs/src
diff options
context:
space:
mode:
authorCzarek Nakamoto <cyjan@mrcyjanek.net>2025-01-05 13:56:28 +0100
committerCzarek Nakamoto <cyjan@mrcyjanek.net>2025-01-05 13:56:36 +0100
commit64d5d9b6f8d8bfc9b6b7781860bd2f7d042e247a (patch)
treeb504fb99017176075294252f0b00fd8d8ab4593f /impls/monero.rs/src
parent085d74b37b478be77bc873d66876247a751aa957 (diff)
enable logging
fix build
Diffstat (limited to 'impls/monero.rs/src')
-rw-r--r--impls/monero.rs/src/bindings.rs21
-rw-r--r--impls/monero.rs/src/lib.rs20
2 files changed, 24 insertions, 17 deletions
diff --git a/impls/monero.rs/src/bindings.rs b/impls/monero.rs/src/bindings.rs
index 30a03cd..ebd0d47 100644
--- a/impls/monero.rs/src/bindings.rs
+++ b/impls/monero.rs/src/bindings.rs
@@ -3,10 +3,10 @@
/* automatically generated by rust-bindgen 0.70.1 */
pub const MONERO_wallet2_api_c_h_sha256: &[u8; 65] =
- b"e8db0ef0324a153f5e3ecca4c0db23c54f4576e84988f04bd4f11c1142f9d7ad\0";
-pub const MONERO_wallet2_api_c_cpp_sha256 : & [u8 ; 106] = b"dca52ac9ee009fda9fb5726543a454885e61d8eb74fb33112288029ed625bec5-b089f9ee69924882c5d14dd1a6991deb05d9d1cd\0" ;
+ b"6c1ba9b57cb185c6dad030b15bcffe8a4772f33930e7f1d62d23b33514ba6f62\0";
+pub const MONERO_wallet2_api_c_cpp_sha256 : & [u8 ; 106] = b"1d1deff340408541f5755b4838d06345f63dcdfffe26b14dbdce32a5de839c55-b089f9ee69924882c5d14dd1a6991deb05d9d1cd\0" ;
pub const MONERO_wallet2_api_c_exp_sha256: &[u8; 65] =
- b"c8913ac41068f67b57c9b0a3c7dd8973e3c1273b66c2ff0aadb0003931da748c\0";
+ b"d0f95f1f3bc49f1f59fe4eb0b61826128d7d3bb75405d5a01a252d02db03097d\0";
pub const NetworkType_MAINNET: ::std::os::raw::c_int = 0;
pub const NetworkType_TESTNET: ::std::os::raw::c_int = 1;
pub const NetworkType_STAGENET: ::std::os::raw::c_int = 2;
@@ -844,17 +844,6 @@ extern "C" {
pub fn MONERO_Wallet_daemonBlockChainHeight(wallet_ptr: *mut ::std::os::raw::c_void) -> u64;
}
extern "C" {
- pub fn MONERO_Wallet_daemonBlockChainHeight_cached(
- wallet_ptr: *mut ::std::os::raw::c_void,
- ) -> u64;
-}
-extern "C" {
- pub fn MONERO_Wallet_daemonBlockChainHeight_runThread(
- wallet_ptr: *mut ::std::os::raw::c_void,
- seconds: ::std::os::raw::c_int,
- );
-}
-extern "C" {
pub fn MONERO_Wallet_daemonBlockChainTargetHeight(
wallet_ptr: *mut ::std::os::raw::c_void,
) -> u64;
@@ -1477,11 +1466,11 @@ extern "C" {
}
extern "C" {
pub fn MONERO_WalletManager_queryWalletDevice(
- device_type: ::std::os::raw::c_int,
+ wm_ptr: *mut ::std::os::raw::c_void,
keys_file_name: *const ::std::os::raw::c_char,
password: *const ::std::os::raw::c_char,
kdf_rounds: u64,
- ) -> bool;
+ ) -> ::std::os::raw::c_int;
}
extern "C" {
pub fn MONERO_WalletManager_findWallets(
diff --git a/impls/monero.rs/src/lib.rs b/impls/monero.rs/src/lib.rs
index 56373da..b40cb94 100644
--- a/impls/monero.rs/src/lib.rs
+++ b/impls/monero.rs/src/lib.rs
@@ -136,6 +136,7 @@ impl WalletManager {
/// ```
pub fn new() -> WalletResult<Arc<Self>> {
unsafe {
+ bindings::MONERO_WalletManagerFactory_setLogLevel(4);
let ptr = bindings::MONERO_WalletManagerFactory_getWalletManager();
let ptr = NonNull::new(ptr).ok_or(WalletError::NullPointer)?;
Ok(Arc::new(WalletManager { ptr }))
@@ -1032,6 +1033,16 @@ impl Wallet {
.map_err(|_| WalletError::FfiError("Invalid proxy address".to_string()))?;
unsafe {
+ let c_empty = CString::new("").unwrap();
+ let c_log_tag = CString::new("moneroc").unwrap();
+ bindings::MONERO_Wallet_init3(
+ self.ptr.as_ptr(),
+ c_empty.as_ptr(),
+ c_log_tag.as_ptr(),
+ c_empty.as_ptr(),
+ true,
+ );
+
let result = bindings::MONERO_Wallet_init(
self.ptr.as_ptr(),
c_daemon_address.as_ptr(),
@@ -1042,7 +1053,7 @@ impl Wallet {
config.light_wallet,
c_proxy_address.as_ptr(),
);
-
+
if result {
Ok(())
} else {
@@ -1117,6 +1128,13 @@ impl Wallet {
}
}
+ pub fn refresh_async(&self) -> WalletResult<Refreshed> {
+ unsafe {
+ bindings::MONERO_Wallet_refreshAsync(self.ptr.as_ptr());
+ return Ok(Refreshed)
+ }
+ }
+
/// Initiates a transfer from the wallet to the specified destinations.
///
/// # Returns