@breeztech/breez-sdk-spark-react-native 0.2.4 → 0.2.5-dev2

package/cpp/generated/breez_sdk_spark.cpp

@@ -101,8 +101,9 @@ typedef struct UniffiForeignFutureStructVoid {
 typedef void (*UniffiForeignFutureCompleteVoid)(
     uint64_t callback_data, UniffiForeignFutureStructVoid result);
 typedef void (*UniffiCallbackInterfaceEventListenerMethod0)(
-    uint64_t uniffi_handle, RustBuffer event, void *uniffi_out_return,
-    RustCallStatus *rust_call_status);
+    uint64_t uniffi_handle, RustBuffer event,
+    UniffiForeignFutureCompleteVoid uniffi_future_callback,
+    uint64_t uniffi_callback_data, UniffiForeignFuture *uniffi_out_return);
 typedef void (*UniffiCallbackInterfaceLoggerMethod0)(
     uint64_t uniffi_handle, RustBuffer l, void *uniffi_out_return,
     RustCallStatus *rust_call_status);
@@ -218,8 +219,9 @@ void *uniffi_breez_sdk_spark_fn_clone_breezsdk(void *ptr,
                                                RustCallStatus *uniffi_out_err);
 void uniffi_breez_sdk_spark_fn_free_breezsdk(void *ptr,
                                              RustCallStatus *uniffi_out_err);
-RustBuffer uniffi_breez_sdk_spark_fn_method_breezsdk_add_event_listener(
-    void *ptr, uint64_t listener, RustCallStatus *uniffi_out_err);
+/*handle*/ uint64_t
+uniffi_breez_sdk_spark_fn_method_breezsdk_add_event_listener(void *ptr,
+                                                             uint64_t listener);
 /*handle*/ uint64_t
 uniffi_breez_sdk_spark_fn_method_breezsdk_check_lightning_address_available(
     void *ptr, RustBuffer req);
@@ -271,16 +273,18 @@ uniffi_breez_sdk_spark_fn_method_breezsdk_refund_deposit(void *ptr,
 /*handle*/ uint64_t
 uniffi_breez_sdk_spark_fn_method_breezsdk_register_lightning_address(
     void *ptr, RustBuffer request);
-int8_t uniffi_breez_sdk_spark_fn_method_breezsdk_remove_event_listener(
-    void *ptr, RustBuffer id, RustCallStatus *uniffi_out_err);
+/*handle*/ uint64_t
+uniffi_breez_sdk_spark_fn_method_breezsdk_remove_event_listener(void *ptr,
+                                                                RustBuffer id);
 /*handle*/ uint64_t
 uniffi_breez_sdk_spark_fn_method_breezsdk_send_payment(void *ptr,
                                                        RustBuffer request);
 /*handle*/ uint64_t
 uniffi_breez_sdk_spark_fn_method_breezsdk_send_payment_internal(
     void *ptr, RustBuffer request, int8_t suppress_payment_event);
-RustBuffer uniffi_breez_sdk_spark_fn_method_breezsdk_sync_wallet(
-    void *ptr, RustBuffer request, RustCallStatus *uniffi_out_err);
+/*handle*/ uint64_t
+uniffi_breez_sdk_spark_fn_method_breezsdk_sync_wallet(void *ptr,
+                                                      RustBuffer request);
 void *
 uniffi_breez_sdk_spark_fn_clone_sdkbuilder(void *ptr,
                                            RustCallStatus *uniffi_out_err);
@@ -298,7 +302,8 @@ uniffi_breez_sdk_spark_fn_method_sdkbuilder_with_chain_service(
 uniffi_breez_sdk_spark_fn_method_sdkbuilder_with_fiat_service(
     void *ptr, void *fiat_service);
 /*handle*/ uint64_t uniffi_breez_sdk_spark_fn_method_sdkbuilder_with_key_set(
-    void *ptr, RustBuffer key_set_type, int8_t use_address_index);
+    void *ptr, RustBuffer key_set_type, int8_t use_address_index,
+    RustBuffer account_number);
 /*handle*/ uint64_t
 uniffi_breez_sdk_spark_fn_method_sdkbuilder_with_lnurl_client(
     void *ptr, void *lnurl_client);
@@ -2395,7 +2400,8 @@ using namespace facebook;
 
 // We need to store a lambda in a global so we can call it from
 // a function pointer. The function pointer is passed to Rust.
-static std::function<void(uint64_t, RustBuffer, void *, RustCallStatus *)>
+static std::function<void(uint64_t, RustBuffer, UniffiForeignFutureCompleteVoid,
+                          uint64_t, UniffiForeignFuture *)>
     rsLambda = nullptr;
 
 // This is the main body of the callback. It's called from the lambda,
@@ -2404,7 +2410,9 @@ static void body(jsi::Runtime &rt,
                  std::shared_ptr<uniffi_runtime::UniffiCallInvoker> callInvoker,
                  std::shared_ptr<jsi::Value> callbackValue,
                  uint64_t rs_uniffiHandle, RustBuffer rs_event,
-                 void *rs_uniffiOutReturn, RustCallStatus *uniffi_call_status) {
+                 UniffiForeignFutureCompleteVoid rs_uniffiFutureCallback,
+                 uint64_t rs_uniffiCallbackData,
+                 UniffiForeignFuture *rs_uniffiOutReturn) {
 
   // Convert the arguments from Rust, into jsi::Values.
   // We'll use the Bridging class to do this…
@@ -2412,6 +2420,11 @@ static void body(jsi::Runtime &rt,
       uniffi_jsi::Bridging<uint64_t>::toJs(rt, callInvoker, rs_uniffiHandle);
   auto js_event = uniffi::breez_sdk_spark::Bridging<RustBuffer>::toJs(
       rt, callInvoker, rs_event);
+  auto js_uniffiFutureCallback =
+      uniffi::breez_sdk_spark::Bridging<UniffiForeignFutureCompleteVoid>::toJs(
+          rt, callInvoker, rs_uniffiFutureCallback);
+  auto js_uniffiCallbackData = uniffi_jsi::Bridging<uint64_t>::toJs(
+      rt, callInvoker, rs_uniffiCallbackData);
 
   // Now we are ready to call the callback.
   // We are already on the JS thread, because this `body` function was
@@ -2419,18 +2432,13 @@ static void body(jsi::Runtime &rt,
   try {
     // Getting the callback function
     auto cb = callbackValue->asObject(rt).asFunction(rt);
-    auto uniffiResult = cb.call(rt, js_uniffiHandle, js_event);
-
-    // Now copy the result back from JS into the RustCallStatus object.
-    uniffi::breez_sdk_spark::Bridging<RustCallStatus>::copyFromJs(
-        rt, callInvoker, uniffiResult, uniffi_call_status);
-
-    if (uniffi_call_status->code != UNIFFI_CALL_STATUS_OK) {
-      // The JS callback finished abnormally, so we cannot retrieve the return
-      // value.
-      return;
-    }
+    auto uniffiResult = cb.call(rt, js_uniffiHandle, js_event,
+                                js_uniffiFutureCallback, js_uniffiCallbackData);
 
+    // Finally, we need to copy the return value back into the Rust pointer.
+    *rs_uniffiOutReturn = uniffi::breez_sdk_spark::Bridging<
+        ReferenceHolder<UniffiForeignFuture>>::fromJs(rt, callInvoker,
+                                                      uniffiResult);
   } catch (const jsi::JSError &error) {
     std::cout
         << "Error in callback UniffiCallbackInterfaceEventListenerMethod0: "
@@ -2440,8 +2448,9 @@ static void body(jsi::Runtime &rt,
 }
 
 static void callback(uint64_t rs_uniffiHandle, RustBuffer rs_event,
-                     void *rs_uniffiOutReturn,
-                     RustCallStatus *uniffi_call_status) {
+                     UniffiForeignFutureCompleteVoid rs_uniffiFutureCallback,
+                     uint64_t rs_uniffiCallbackData,
+                     UniffiForeignFuture *rs_uniffiOutReturn) {
   // If the runtime has shutdown, then there is no point in trying to
   // call into Javascript. BUT how do we tell if the runtime has shutdown?
   //
@@ -2457,7 +2466,8 @@ static void callback(uint64_t rs_uniffiHandle, RustBuffer rs_event,
 
   // The runtime, the actual callback jsi::funtion, and the callInvoker
   // are all in the lambda.
-  rsLambda(rs_uniffiHandle, rs_event, rs_uniffiOutReturn, uniffi_call_status);
+  rsLambda(rs_uniffiHandle, rs_event, rs_uniffiFutureCallback,
+           rs_uniffiCallbackData, rs_uniffiOutReturn);
 }
 
 static UniffiCallbackInterfaceEventListenerMethod0
@@ -2481,14 +2491,18 @@ makeCallbackFunction( // uniffi::breez_sdk_spark::cb::callbackinterfaceeventlist
   auto callbackValue = std::make_shared<jsi::Value>(rt, callbackFunction);
   rsLambda = [&rt, callInvoker, callbackValue](
                  uint64_t rs_uniffiHandle, RustBuffer rs_event,
-                 void *rs_uniffiOutReturn, RustCallStatus *uniffi_call_status) {
+                 UniffiForeignFutureCompleteVoid rs_uniffiFutureCallback,
+                 uint64_t rs_uniffiCallbackData,
+                 UniffiForeignFuture *rs_uniffiOutReturn) {
     // We immediately make a lambda which will do the work of transforming the
     // arguments into JSI values and calling the callback.
     uniffi_runtime::UniffiCallFunc jsLambda =
         [callInvoker, callbackValue, rs_uniffiHandle, rs_event,
-         rs_uniffiOutReturn, uniffi_call_status](jsi::Runtime &rt) mutable {
+         rs_uniffiFutureCallback, rs_uniffiCallbackData,
+         rs_uniffiOutReturn](jsi::Runtime &rt) mutable {
           body(rt, callInvoker, callbackValue, rs_uniffiHandle, rs_event,
-               rs_uniffiOutReturn, uniffi_call_status);
+               rs_uniffiFutureCallback, rs_uniffiCallbackData,
+               rs_uniffiOutReturn);
         };
     // We'll then call that lambda from the callInvoker which will
     // look after calling it on the correct thread.
@@ -5493,7 +5507,7 @@ NativeBreezSdkSpark::NativeBreezSdkSpark(
           jsi::PropNameID::forAscii(
               rt,
               "ubrn_uniffi_breez_sdk_spark_fn_method_sdkbuilder_with_key_set"),
-          3,
+          4,
           [this](jsi::Runtime &rt, const jsi::Value &thisVal,
                  const jsi::Value *args, size_t count) -> jsi::Value {
             return this
@@ -7350,17 +7364,12 @@ jsi::Value NativeBreezSdkSpark::
     cpp_uniffi_breez_sdk_spark_fn_method_breezsdk_add_event_listener(
         jsi::Runtime &rt, const jsi::Value &thisVal, const jsi::Value *args,
         size_t count) {
-  RustCallStatus status =
-      uniffi::breez_sdk_spark::Bridging<RustCallStatus>::rustSuccess(rt);
   auto value = uniffi_breez_sdk_spark_fn_method_breezsdk_add_event_listener(
       uniffi_jsi::Bridging<void *>::fromJs(rt, callInvoker, args[0]),
-      uniffi_jsi::Bridging<uint64_t>::fromJs(rt, callInvoker, args[1]),
-      &status);
-  uniffi::breez_sdk_spark::Bridging<RustCallStatus>::copyIntoJs(
-      rt, callInvoker, status, args[count - 1]);
+      uniffi_jsi::Bridging<uint64_t>::fromJs(rt, callInvoker, args[1]));
 
-  return uniffi::breez_sdk_spark::Bridging<RustBuffer>::toJs(rt, callInvoker,
-                                                             value);
+  return uniffi_jsi::Bridging</*handle*/ uint64_t>::toJs(rt, callInvoker,
+                                                         value);
 }
 jsi::Value NativeBreezSdkSpark::
     cpp_uniffi_breez_sdk_spark_fn_method_breezsdk_check_lightning_address_available(
@@ -7596,17 +7605,13 @@ jsi::Value NativeBreezSdkSpark::
     cpp_uniffi_breez_sdk_spark_fn_method_breezsdk_remove_event_listener(
         jsi::Runtime &rt, const jsi::Value &thisVal, const jsi::Value *args,
         size_t count) {
-  RustCallStatus status =
-      uniffi::breez_sdk_spark::Bridging<RustCallStatus>::rustSuccess(rt);
   auto value = uniffi_breez_sdk_spark_fn_method_breezsdk_remove_event_listener(
       uniffi_jsi::Bridging<void *>::fromJs(rt, callInvoker, args[0]),
       uniffi::breez_sdk_spark::Bridging<RustBuffer>::fromJs(rt, callInvoker,
-                                                            args[1]),
-      &status);
-  uniffi::breez_sdk_spark::Bridging<RustCallStatus>::copyIntoJs(
-      rt, callInvoker, status, args[count - 1]);
+                                                            args[1]));
 
-  return uniffi_jsi::Bridging<int8_t>::toJs(rt, callInvoker, value);
+  return uniffi_jsi::Bridging</*handle*/ uint64_t>::toJs(rt, callInvoker,
+                                                         value);
 }
 jsi::Value
 NativeBreezSdkSpark::cpp_uniffi_breez_sdk_spark_fn_method_breezsdk_send_payment(
@@ -7637,18 +7642,13 @@ jsi::Value
 NativeBreezSdkSpark::cpp_uniffi_breez_sdk_spark_fn_method_breezsdk_sync_wallet(
     jsi::Runtime &rt, const jsi::Value &thisVal, const jsi::Value *args,
     size_t count) {
-  RustCallStatus status =
-      uniffi::breez_sdk_spark::Bridging<RustCallStatus>::rustSuccess(rt);
   auto value = uniffi_breez_sdk_spark_fn_method_breezsdk_sync_wallet(
       uniffi_jsi::Bridging<void *>::fromJs(rt, callInvoker, args[0]),
       uniffi::breez_sdk_spark::Bridging<RustBuffer>::fromJs(rt, callInvoker,
-                                                            args[1]),
-      &status);
-  uniffi::breez_sdk_spark::Bridging<RustCallStatus>::copyIntoJs(
-      rt, callInvoker, status, args[count - 1]);
+                                                            args[1]));
 
-  return uniffi::breez_sdk_spark::Bridging<RustBuffer>::toJs(rt, callInvoker,
-                                                             value);
+  return uniffi_jsi::Bridging</*handle*/ uint64_t>::toJs(rt, callInvoker,
+                                                         value);
 }
 jsi::Value NativeBreezSdkSpark::cpp_uniffi_breez_sdk_spark_fn_clone_sdkbuilder(
     jsi::Runtime &rt, const jsi::Value &thisVal, const jsi::Value *args,
@@ -7731,7 +7731,9 @@ jsi::Value NativeBreezSdkSpark::
       uniffi_jsi::Bridging<void *>::fromJs(rt, callInvoker, args[0]),
       uniffi::breez_sdk_spark::Bridging<RustBuffer>::fromJs(rt, callInvoker,
                                                             args[1]),
-      uniffi_jsi::Bridging<int8_t>::fromJs(rt, callInvoker, args[2]));
+      uniffi_jsi::Bridging<int8_t>::fromJs(rt, callInvoker, args[2]),
+      uniffi::breez_sdk_spark::Bridging<RustBuffer>::fromJs(rt, callInvoker,
+                                                            args[3]));
 
   return uniffi_jsi::Bridging</*handle*/ uint64_t>::toJs(rt, callInvoker,
                                                          value);

package/lib/commonjs/generated/breez_sdk_spark-ffi.js.map

@@ -1 +1 @@
-{"version":3,"names":["getter","globalThis","NativeBreezSdkSpark","_default","exports","default","isRustFutureContinuationCallbackTypeCompatible","isUniffiForeignFutureTypeCompatible"],"sourceRoot":"../../../src","sources":["generated/breez_sdk_spark-ffi.ts"],"mappings":";;;;;;AAAA;AACA;;AA4eA;AACA;AACA;AACA;AACA;AACA,MAAMA,MAAmC,GAAGA,CAAA,KACzCC,UAAU,CAASC,mBAAmB;AAAC,IAAAC,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAC3BL,MAAM,EAErB;AAyPA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMM,8CAGL,GAAG,IAAI;AACR,MAAMC,mCAGL,GAAG,IAAI","ignoreList":[]}
+{"version":3,"names":["getter","globalThis","NativeBreezSdkSpark","_default","exports","default","isRustFutureContinuationCallbackTypeCompatible","isUniffiForeignFutureTypeCompatible"],"sourceRoot":"../../../src","sources":["generated/breez_sdk_spark-ffi.ts"],"mappings":";;;;;;AAAA;AACA;;AA0eA;AACA;AACA;AACA;AACA;AACA,MAAMA,MAAmC,GAAGA,CAAA,KACzCC,UAAU,CAASC,mBAAmB;AAAC,IAAAC,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAC3BL,MAAM,EAErB;AA2PA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMM,8CAGL,GAAG,IAAI;AACR,MAAMC,mCAGL,GAAG,IAAI","ignoreList":[]}

package/lib/commonjs/generated/breez_sdk_spark.js

@@ -101,18 +101,29 @@ const uniffiCallbackInterfaceEventListener = {
   // Create the VTable using a series of closures.
   // ts automatically converts these into C callback functions.
   vtable: {
-    onEvent: (uniffiHandle, event) => {
-      const uniffiMakeCall = () => {
+    onEvent: (uniffiHandle, event, uniffiFutureCallback, uniffiCallbackData) => {
+      const uniffiMakeCall = async signal => {
         const jsCallback = FfiConverterTypeEventListener.lift(uniffiHandle);
-        return jsCallback.onEvent(FfiConverterTypeSdkEvent.lift(event));
+        return await jsCallback.onEvent(FfiConverterTypeSdkEvent.lift(event), {
+          signal
+        });
       };
-      const uniffiResult = _uniffiBindgenReactNative.UniffiResult.ready();
-      const uniffiHandleSuccess = obj => {};
-      const uniffiHandleError = (code, errBuf) => {
-        _uniffiBindgenReactNative.UniffiResult.writeError(uniffiResult, code, errBuf);
+      const uniffiHandleSuccess = returnValue => {
+        uniffiFutureCallback(uniffiCallbackData, /* UniffiForeignFutureStructVoid */{
+          callStatus: uniffiCaller.createCallStatus()
+        });
       };
-      (0, _uniffiBindgenReactNative.uniffiTraitInterfaceCall)(/*makeCall:*/uniffiMakeCall, /*handleSuccess:*/uniffiHandleSuccess, /*handleError:*/uniffiHandleError, /*lowerString:*/FfiConverterString.lower);
-      return uniffiResult;
+      const uniffiHandleError = (code, errorBuf) => {
+        uniffiFutureCallback(uniffiCallbackData, /* UniffiForeignFutureStructVoid */{
+          // TODO create callstatus with error.
+          callStatus: {
+            code,
+            errorBuf
+          }
+        });
+      };
+      const uniffiForeignFuture = (0, _uniffiBindgenReactNative.uniffiTraitInterfaceCallAsync)(/*makeCall:*/uniffiMakeCall, /*handleSuccess:*/uniffiHandleSuccess, /*handleError:*/uniffiHandleError, /*lowerString:*/FfiConverterString.lower);
+      return _uniffiBindgenReactNative.UniffiResult.success(uniffiForeignFuture);
     },
     uniffiFree: uniffiHandle => {
       // EventListener: this will throw a stale handle error if the handle isn't found.
@@ -508,11 +519,15 @@ const GetInfoRequest = exports.GetInfoRequest = (() => {
 const FfiConverterTypeGetInfoRequest = (() => {
   class FFIConverter extends _uniffiBindgenReactNative.AbstractFfiConverterByteArray {
     read(from) {
-      return {};
+      return {
+        ensureSynced: FfiConverterOptionalBool.read(from)
+      };
+    }
+    write(value, into) {
+      FfiConverterOptionalBool.write(value.ensureSynced, into);
     }
-    write(value, into) {}
     allocationSize(value) {
-      return 0;
+      return FfiConverterOptionalBool.allocationSize(value.ensureSynced);
     }
   }
   return new FFIConverter();
@@ -4755,10 +4770,18 @@ class BreezSdk extends _uniffiBindgenReactNative.UniffiAbstractObject {
    *
    * A unique identifier for the listener, which can be used to remove it later
    */
-  addEventListener(listener) {
-    return FfiConverterString.lift(uniffiCaller.rustCall(/*caller:*/callStatus => {
-      return (0, _breez_sdk_sparkFfi.default)().ubrn_uniffi_breez_sdk_spark_fn_method_breezsdk_add_event_listener(uniffiTypeBreezSdkObjectFactory.clonePointer(this), FfiConverterTypeEventListener.lower(listener), callStatus);
-    }, /*liftString:*/FfiConverterString.lift));
+  async addEventListener(listener, asyncOpts_) {
+    const __stack = uniffiIsDebug ? new Error().stack : undefined;
+    try {
+      return await (0, _uniffiBindgenReactNative.uniffiRustCallAsync)(/*rustCaller:*/uniffiCaller, /*rustFutureFunc:*/() => {
+        return (0, _breez_sdk_sparkFfi.default)().ubrn_uniffi_breez_sdk_spark_fn_method_breezsdk_add_event_listener(uniffiTypeBreezSdkObjectFactory.clonePointer(this), FfiConverterTypeEventListener.lower(listener));
+      }, /*pollFunc:*/(0, _breez_sdk_sparkFfi.default)().ubrn_ffi_breez_sdk_spark_rust_future_poll_rust_buffer, /*cancelFunc:*/(0, _breez_sdk_sparkFfi.default)().ubrn_ffi_breez_sdk_spark_rust_future_cancel_rust_buffer, /*completeFunc:*/(0, _breez_sdk_sparkFfi.default)().ubrn_ffi_breez_sdk_spark_rust_future_complete_rust_buffer, /*freeFunc:*/(0, _breez_sdk_sparkFfi.default)().ubrn_ffi_breez_sdk_spark_rust_future_free_rust_buffer, /*liftFunc:*/FfiConverterString.lift.bind(FfiConverterString), /*liftString:*/FfiConverterString.lift, /*asyncOpts:*/asyncOpts_);
+    } catch (__error) {
+      if (uniffiIsDebug && __error instanceof Error) {
+        __error.stack = __stack;
+      }
+      throw __error;
+    }
   }
   async checkLightningAddressAvailable(req, asyncOpts_) /*throws*/{
     const __stack = uniffiIsDebug ? new Error().stack : undefined;
@@ -5047,10 +5070,18 @@ class BreezSdk extends _uniffiBindgenReactNative.UniffiAbstractObject {
    *
    * `true` if the listener was found and removed, `false` otherwise
    */
-  removeEventListener(id) {
-    return _uniffiBindgenReactNative.FfiConverterBool.lift(uniffiCaller.rustCall(/*caller:*/callStatus => {
-      return (0, _breez_sdk_sparkFfi.default)().ubrn_uniffi_breez_sdk_spark_fn_method_breezsdk_remove_event_listener(uniffiTypeBreezSdkObjectFactory.clonePointer(this), FfiConverterString.lower(id), callStatus);
-    }, /*liftString:*/FfiConverterString.lift));
+  async removeEventListener(id, asyncOpts_) {
+    const __stack = uniffiIsDebug ? new Error().stack : undefined;
+    try {
+      return await (0, _uniffiBindgenReactNative.uniffiRustCallAsync)(/*rustCaller:*/uniffiCaller, /*rustFutureFunc:*/() => {
+        return (0, _breez_sdk_sparkFfi.default)().ubrn_uniffi_breez_sdk_spark_fn_method_breezsdk_remove_event_listener(uniffiTypeBreezSdkObjectFactory.clonePointer(this), FfiConverterString.lower(id));
+      }, /*pollFunc:*/(0, _breez_sdk_sparkFfi.default)().ubrn_ffi_breez_sdk_spark_rust_future_poll_i8, /*cancelFunc:*/(0, _breez_sdk_sparkFfi.default)().ubrn_ffi_breez_sdk_spark_rust_future_cancel_i8, /*completeFunc:*/(0, _breez_sdk_sparkFfi.default)().ubrn_ffi_breez_sdk_spark_rust_future_complete_i8, /*freeFunc:*/(0, _breez_sdk_sparkFfi.default)().ubrn_ffi_breez_sdk_spark_rust_future_free_i8, /*liftFunc:*/_uniffiBindgenReactNative.FfiConverterBool.lift.bind(_uniffiBindgenReactNative.FfiConverterBool), /*liftString:*/FfiConverterString.lift, /*asyncOpts:*/asyncOpts_);
+    } catch (__error) {
+      if (uniffiIsDebug && __error instanceof Error) {
+        __error.stack = __stack;
+      }
+      throw __error;
+    }
   }
   async sendPayment(request, asyncOpts_) /*throws*/{
     const __stack = uniffiIsDebug ? new Error().stack : undefined;
@@ -5082,10 +5113,18 @@ class BreezSdk extends _uniffiBindgenReactNative.UniffiAbstractObject {
   /**
    * Synchronizes the wallet with the Spark network
    */
-  syncWallet(request) /*throws*/{
-    return FfiConverterTypeSyncWalletResponse.lift(uniffiCaller.rustCallWithError(/*liftError:*/FfiConverterTypeSdkError.lift.bind(FfiConverterTypeSdkError), /*caller:*/callStatus => {
-      return (0, _breez_sdk_sparkFfi.default)().ubrn_uniffi_breez_sdk_spark_fn_method_breezsdk_sync_wallet(uniffiTypeBreezSdkObjectFactory.clonePointer(this), FfiConverterTypeSyncWalletRequest.lower(request), callStatus);
-    }, /*liftString:*/FfiConverterString.lift));
+  async syncWallet(request, asyncOpts_) /*throws*/{
+    const __stack = uniffiIsDebug ? new Error().stack : undefined;
+    try {
+      return await (0, _uniffiBindgenReactNative.uniffiRustCallAsync)(/*rustCaller:*/uniffiCaller, /*rustFutureFunc:*/() => {
+        return (0, _breez_sdk_sparkFfi.default)().ubrn_uniffi_breez_sdk_spark_fn_method_breezsdk_sync_wallet(uniffiTypeBreezSdkObjectFactory.clonePointer(this), FfiConverterTypeSyncWalletRequest.lower(request));
+      }, /*pollFunc:*/(0, _breez_sdk_sparkFfi.default)().ubrn_ffi_breez_sdk_spark_rust_future_poll_rust_buffer, /*cancelFunc:*/(0, _breez_sdk_sparkFfi.default)().ubrn_ffi_breez_sdk_spark_rust_future_cancel_rust_buffer, /*completeFunc:*/(0, _breez_sdk_sparkFfi.default)().ubrn_ffi_breez_sdk_spark_rust_future_complete_rust_buffer, /*freeFunc:*/(0, _breez_sdk_sparkFfi.default)().ubrn_ffi_breez_sdk_spark_rust_future_free_rust_buffer, /*liftFunc:*/FfiConverterTypeSyncWalletResponse.lift.bind(FfiConverterTypeSyncWalletResponse), /*liftString:*/FfiConverterString.lift, /*asyncOpts:*/asyncOpts_, /*errorHandler:*/FfiConverterTypeSdkError.lift.bind(FfiConverterTypeSdkError));
+    } catch (__error) {
+      if (uniffiIsDebug && __error instanceof Error) {
+        __error.stack = __stack;
+      }
+      throw __error;
+    }
   }
 
   /**
@@ -5225,11 +5264,11 @@ class SdkBuilder extends _uniffiBindgenReactNative.UniffiAbstractObject {
    * - `key_set_type`: The key set type which determines the derivation path.
    * - `use_address_index`: Controls the structure of the BIP derivation path.
    */
-  async withKeySet(keySetType, useAddressIndex, asyncOpts_) {
+  async withKeySet(keySetType, useAddressIndex, accountNumber, asyncOpts_) {
     const __stack = uniffiIsDebug ? new Error().stack : undefined;
     try {
       return await (0, _uniffiBindgenReactNative.uniffiRustCallAsync)(/*rustCaller:*/uniffiCaller, /*rustFutureFunc:*/() => {
-        return (0, _breez_sdk_sparkFfi.default)().ubrn_uniffi_breez_sdk_spark_fn_method_sdkbuilder_with_key_set(uniffiTypeSdkBuilderObjectFactory.clonePointer(this), FfiConverterTypeKeySetType.lower(keySetType), _uniffiBindgenReactNative.FfiConverterBool.lower(useAddressIndex));
+        return (0, _breez_sdk_sparkFfi.default)().ubrn_uniffi_breez_sdk_spark_fn_method_sdkbuilder_with_key_set(uniffiTypeSdkBuilderObjectFactory.clonePointer(this), FfiConverterTypeKeySetType.lower(keySetType), _uniffiBindgenReactNative.FfiConverterBool.lower(useAddressIndex), FfiConverterOptionalUInt32.lower(accountNumber));
       }, /*pollFunc:*/(0, _breez_sdk_sparkFfi.default)().ubrn_ffi_breez_sdk_spark_rust_future_poll_void, /*cancelFunc:*/(0, _breez_sdk_sparkFfi.default)().ubrn_ffi_breez_sdk_spark_rust_future_cancel_void, /*completeFunc:*/(0, _breez_sdk_sparkFfi.default)().ubrn_ffi_breez_sdk_spark_rust_future_complete_void, /*freeFunc:*/(0, _breez_sdk_sparkFfi.default)().ubrn_ffi_breez_sdk_spark_rust_future_free_void, /*liftFunc:*/_v => {}, /*liftString:*/FfiConverterString.lift, /*asyncOpts:*/asyncOpts_);
     } catch (__error) {
       if (uniffiIsDebug && __error instanceof Error) {
@@ -6018,7 +6057,7 @@ function uniffiEnsureInitialized() {
   if ((0, _breez_sdk_sparkFfi.default)().ubrn_uniffi_breez_sdk_spark_checksum_method_bitcoinchainservice_broadcast_transaction() !== 65179) {
     throw new _uniffiBindgenReactNative.UniffiInternalError.ApiChecksumMismatch('uniffi_breez_sdk_spark_checksum_method_bitcoinchainservice_broadcast_transaction');
   }
-  if ((0, _breez_sdk_sparkFfi.default)().ubrn_uniffi_breez_sdk_spark_checksum_method_breezsdk_add_event_listener() !== 61844) {
+  if ((0, _breez_sdk_sparkFfi.default)().ubrn_uniffi_breez_sdk_spark_checksum_method_breezsdk_add_event_listener() !== 37737) {
     throw new _uniffiBindgenReactNative.UniffiInternalError.ApiChecksumMismatch('uniffi_breez_sdk_spark_checksum_method_breezsdk_add_event_listener');
   }
   if ((0, _breez_sdk_sparkFfi.default)().ubrn_uniffi_breez_sdk_spark_checksum_method_breezsdk_check_lightning_address_available() !== 31624) {
@@ -6078,7 +6117,7 @@ function uniffiEnsureInitialized() {
   if ((0, _breez_sdk_sparkFfi.default)().ubrn_uniffi_breez_sdk_spark_checksum_method_breezsdk_register_lightning_address() !== 530) {
     throw new _uniffiBindgenReactNative.UniffiInternalError.ApiChecksumMismatch('uniffi_breez_sdk_spark_checksum_method_breezsdk_register_lightning_address');
   }
-  if ((0, _breez_sdk_sparkFfi.default)().ubrn_uniffi_breez_sdk_spark_checksum_method_breezsdk_remove_event_listener() !== 60980) {
+  if ((0, _breez_sdk_sparkFfi.default)().ubrn_uniffi_breez_sdk_spark_checksum_method_breezsdk_remove_event_listener() !== 41066) {
     throw new _uniffiBindgenReactNative.UniffiInternalError.ApiChecksumMismatch('uniffi_breez_sdk_spark_checksum_method_breezsdk_remove_event_listener');
   }
   if ((0, _breez_sdk_sparkFfi.default)().ubrn_uniffi_breez_sdk_spark_checksum_method_breezsdk_send_payment() !== 54349) {
@@ -6087,7 +6126,7 @@ function uniffiEnsureInitialized() {
   if ((0, _breez_sdk_sparkFfi.default)().ubrn_uniffi_breez_sdk_spark_checksum_method_breezsdk_send_payment_internal() !== 37855) {
     throw new _uniffiBindgenReactNative.UniffiInternalError.ApiChecksumMismatch('uniffi_breez_sdk_spark_checksum_method_breezsdk_send_payment_internal');
   }
-  if ((0, _breez_sdk_sparkFfi.default)().ubrn_uniffi_breez_sdk_spark_checksum_method_breezsdk_sync_wallet() !== 36066) {
+  if ((0, _breez_sdk_sparkFfi.default)().ubrn_uniffi_breez_sdk_spark_checksum_method_breezsdk_sync_wallet() !== 30368) {
     throw new _uniffiBindgenReactNative.UniffiInternalError.ApiChecksumMismatch('uniffi_breez_sdk_spark_checksum_method_breezsdk_sync_wallet');
   }
   if ((0, _breez_sdk_sparkFfi.default)().ubrn_uniffi_breez_sdk_spark_checksum_method_sdkbuilder_build() !== 8126) {
@@ -6099,7 +6138,7 @@ function uniffiEnsureInitialized() {
   if ((0, _breez_sdk_sparkFfi.default)().ubrn_uniffi_breez_sdk_spark_checksum_method_sdkbuilder_with_fiat_service() !== 41113) {
     throw new _uniffiBindgenReactNative.UniffiInternalError.ApiChecksumMismatch('uniffi_breez_sdk_spark_checksum_method_sdkbuilder_with_fiat_service');
   }
-  if ((0, _breez_sdk_sparkFfi.default)().ubrn_uniffi_breez_sdk_spark_checksum_method_sdkbuilder_with_key_set() !== 55523) {
+  if ((0, _breez_sdk_sparkFfi.default)().ubrn_uniffi_breez_sdk_spark_checksum_method_sdkbuilder_with_key_set() !== 42926) {
     throw new _uniffiBindgenReactNative.UniffiInternalError.ApiChecksumMismatch('uniffi_breez_sdk_spark_checksum_method_sdkbuilder_with_key_set');
   }
   if ((0, _breez_sdk_sparkFfi.default)().ubrn_uniffi_breez_sdk_spark_checksum_method_sdkbuilder_with_lnurl_client() !== 61720) {
@@ -6144,7 +6183,7 @@ function uniffiEnsureInitialized() {
   if ((0, _breez_sdk_sparkFfi.default)().ubrn_uniffi_breez_sdk_spark_checksum_constructor_sdkbuilder_new() !== 53882) {
     throw new _uniffiBindgenReactNative.UniffiInternalError.ApiChecksumMismatch('uniffi_breez_sdk_spark_checksum_constructor_sdkbuilder_new');
   }
-  if ((0, _breez_sdk_sparkFfi.default)().ubrn_uniffi_breez_sdk_spark_checksum_method_eventlistener_on_event() !== 10824) {
+  if ((0, _breez_sdk_sparkFfi.default)().ubrn_uniffi_breez_sdk_spark_checksum_method_eventlistener_on_event() !== 24807) {
     throw new _uniffiBindgenReactNative.UniffiInternalError.ApiChecksumMismatch('uniffi_breez_sdk_spark_checksum_method_eventlistener_on_event');
   }
   if ((0, _breez_sdk_sparkFfi.default)().ubrn_uniffi_breez_sdk_spark_checksum_method_logger_log() !== 11839) {