react-native-nitro-ark 0.0.108 → 0.0.109

package/nitrogen/generated/shared/c++/ExitVtxoResult.hpp

@@ -28,9 +28,11 @@
 #error NitroModules cannot be found! Are you sure you installed NitroModules properly?
 #endif
 
-
+// Forward declaration of `ExitStateDetailsResult` to properly resolve imports.
+namespace margelo::nitro::nitroark { struct ExitStateDetailsResult; }
 
 #include <string>
+#include "ExitStateDetailsResult.hpp"
 #include <vector>
 
 namespace margelo::nitro::nitroark {
@@ -43,14 +45,16 @@ namespace margelo::nitro::nitroark {
     std::string vtxo_id     SWIFT_PRIVATE;
     double amount_sat     SWIFT_PRIVATE;
     std::string state     SWIFT_PRIVATE;
+    ExitStateDetailsResult state_details     SWIFT_PRIVATE;
     std::vector<std::string> history     SWIFT_PRIVATE;
+    std::vector<ExitStateDetailsResult> history_details     SWIFT_PRIVATE;
     std::vector<std::string> txids     SWIFT_PRIVATE;
     bool is_claimable     SWIFT_PRIVATE;
     bool is_initialized     SWIFT_PRIVATE;
 
   public:
     ExitVtxoResult() = default;
-    explicit ExitVtxoResult(std::string vtxo_id, double amount_sat, std::string state, std::vector<std::string> history, std::vector<std::string> txids, bool is_claimable, bool is_initialized): vtxo_id(vtxo_id), amount_sat(amount_sat), state(state), history(history), txids(txids), is_claimable(is_claimable), is_initialized(is_initialized) {}
+    explicit ExitVtxoResult(std::string vtxo_id, double amount_sat, std::string state, ExitStateDetailsResult state_details, std::vector<std::string> history, std::vector<ExitStateDetailsResult> history_details, std::vector<std::string> txids, bool is_claimable, bool is_initialized): vtxo_id(vtxo_id), amount_sat(amount_sat), state(state), state_details(state_details), history(history), history_details(history_details), txids(txids), is_claimable(is_claimable), is_initialized(is_initialized) {}
 
   public:
     friend bool operator==(const ExitVtxoResult& lhs, const ExitVtxoResult& rhs) = default;
@@ -69,7 +73,9 @@ namespace margelo::nitro {
         JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "vtxo_id"))),
         JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "amount_sat"))),
         JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "state"))),
+        JSIConverter<margelo::nitro::nitroark::ExitStateDetailsResult>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "state_details"))),
         JSIConverter<std::vector<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "history"))),
+        JSIConverter<std::vector<margelo::nitro::nitroark::ExitStateDetailsResult>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "history_details"))),
         JSIConverter<std::vector<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "txids"))),
         JSIConverter<bool>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "is_claimable"))),
         JSIConverter<bool>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "is_initialized")))
@@ -80,7 +86,9 @@ namespace margelo::nitro {
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "vtxo_id"), JSIConverter<std::string>::toJSI(runtime, arg.vtxo_id));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "amount_sat"), JSIConverter<double>::toJSI(runtime, arg.amount_sat));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "state"), JSIConverter<std::string>::toJSI(runtime, arg.state));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "state_details"), JSIConverter<margelo::nitro::nitroark::ExitStateDetailsResult>::toJSI(runtime, arg.state_details));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "history"), JSIConverter<std::vector<std::string>>::toJSI(runtime, arg.history));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "history_details"), JSIConverter<std::vector<margelo::nitro::nitroark::ExitStateDetailsResult>>::toJSI(runtime, arg.history_details));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "txids"), JSIConverter<std::vector<std::string>>::toJSI(runtime, arg.txids));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "is_claimable"), JSIConverter<bool>::toJSI(runtime, arg.is_claimable));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "is_initialized"), JSIConverter<bool>::toJSI(runtime, arg.is_initialized));
@@ -97,7 +105,9 @@ namespace margelo::nitro {
       if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "vtxo_id")))) return false;
       if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "amount_sat")))) return false;
       if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "state")))) return false;
+      if (!JSIConverter<margelo::nitro::nitroark::ExitStateDetailsResult>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "state_details")))) return false;
       if (!JSIConverter<std::vector<std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "history")))) return false;
+      if (!JSIConverter<std::vector<margelo::nitro::nitroark::ExitStateDetailsResult>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "history_details")))) return false;
       if (!JSIConverter<std::vector<std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "txids")))) return false;
       if (!JSIConverter<bool>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "is_claimable")))) return false;
       if (!JSIConverter<bool>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "is_initialized")))) return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nitro-ark",
-  "version": "0.0.108",
+  "version": "0.0.109",
   "description": "Pure C++ Nitro Modules for Ark client",
   "source": "./src/index.tsx",
   "main": "./lib/module/index.js",

package/src/NitroArk.nitro.ts

@@ -83,9 +83,50 @@ export interface BarkFeeEstimate {
   vtxos_spent: string[];
 }
 
+export interface ExitBlockRefResult {
+  height: number;
+  hash: string;
+}
+
+export interface ExitTxOriginResult {
+  kind: string;
+  confirmed_in?: ExitBlockRefResult;
+  fee_rate_sat_per_kvb?: number;
+  total_fee_sat?: number;
+}
+
+export interface ExitTxStatusResult {
+  kind: string;
+  txids?: string[];
+  min_fee_rate_sat_per_kvb?: number;
+  min_fee_sat?: number;
+  child_txid?: string;
+  origin?: ExitTxOriginResult;
+  block?: ExitBlockRefResult;
+}
+
+export interface ExitTxResult {
+  txid: string;
+  status: ExitTxStatusResult;
+}
+
+export interface ExitStateDetailsResult {
+  kind: string;
+  tip_height: number;
+  transactions?: ExitTxResult[];
+  confirmed_block?: ExitBlockRefResult;
+  claimable_height?: number;
+  claimable_since?: ExitBlockRefResult;
+  last_scanned_block?: ExitBlockRefResult;
+  claim_txid?: string;
+  txid?: string;
+  block?: ExitBlockRefResult;
+}
+
 export interface ExitProgressStatusResult {
   vtxo_id: string;
   state: string;
+  state_details: ExitStateDetailsResult;
   error?: string;
 }
 
@@ -93,7 +134,9 @@ export interface ExitVtxoResult {
   vtxo_id: string;
   amount_sat: number;
   state: string;
+  state_details: ExitStateDetailsResult;
   history: string[];
+  history_details: ExitStateDetailsResult[];
   txids: string[];
   is_claimable: boolean;
   is_initialized: boolean;
@@ -111,7 +154,9 @@ export interface ExitTransactionPackageResult {
 export interface ExitStatusResult {
   vtxo_id: string;
   state: string;
+  state_details: ExitStateDetailsResult;
   history: string[];
+  history_details: ExitStateDetailsResult[];
   transactions: ExitTransactionPackageResult[];
 }
 

package/src/index.tsx

@@ -10,6 +10,11 @@ import type {
   ExitProgressStatusResult as NitroExitProgressStatusResult,
   ExitVtxoResult as NitroExitVtxoResult,
   ExitStatusResult as NitroExitStatusResult,
+  ExitBlockRefResult as NitroExitBlockRefResult,
+  ExitTxOriginResult as NitroExitTxOriginResult,
+  ExitTxStatusResult as NitroExitTxStatusResult,
+  ExitTxResult as NitroExitTxResult,
+  ExitStateDetailsResult as NitroExitStateDetailsResult,
   ExitTransactionPackageResult as NitroExitTransactionPackageResult,
   LightningSendResult,
   OnchainPaymentResult,
@@ -48,6 +53,12 @@ export type ExitProgressState =
   | 'ClaimInProgress'
   | 'Claimed';
 
+export type BlockRef = NitroExitBlockRefResult;
+export type ExitTxOrigin = NitroExitTxOriginResult;
+export type ExitTxStatus = NitroExitTxStatusResult;
+export type ExitTx = NitroExitTxResult;
+export type ExitStateDetails = NitroExitStateDetailsResult;
+
 export type ExitProgressStatusResult = Omit<
   NitroExitProgressStatusResult,
   'state'
@@ -101,10 +112,37 @@ export type BarkNotificationEvent = Omit<
   movement?: BarkMovement;
 };
 
-// Create the hybrid object instance
 export const NitroArkHybridObject =
   NitroModules.createHybridObject<NitroArk>('NitroArk');
 
+function enrichExitProgressStatus(
+  result: NitroExitProgressStatusResult
+): ExitProgressStatusResult {
+  const { state, ...rest } = result;
+  return {
+    ...rest,
+    state: state as ExitProgressState,
+  };
+}
+
+function enrichExitVtxo(result: NitroExitVtxoResult): ExitVtxoResult {
+  const { state, history: stateHistory, ...rest } = result;
+  return {
+    ...rest,
+    state: state as ExitProgressState,
+    history: stateHistory as ExitProgressState[],
+  };
+}
+
+function enrichExitStatus(result: NitroExitStatusResult): ExitStatusResult {
+  const { state, history: stateHistory, ...rest } = result;
+  return {
+    ...rest,
+    state: state as ExitProgressState,
+    history: stateHistory as ExitProgressState[],
+  };
+}
+
 // --- Management ---
 
 /**
@@ -267,9 +305,9 @@ export function syncNoProgress(): Promise<void> {
 export function progressExits(
   feeRateSatPerKvb?: number
 ): Promise<ExitProgressStatusResult[]> {
-  return NitroArkHybridObject.progressExits(feeRateSatPerKvb) as Promise<
-    ExitProgressStatusResult[]
-  >;
+  return NitroArkHybridObject.progressExits(feeRateSatPerKvb).then((results) =>
+    results.map(enrichExitProgressStatus)
+  );
 }
 
 /**
@@ -277,7 +315,9 @@ export function progressExits(
  * @returns A promise resolving to simplified exit entries.
  */
 export function getExitVtxos(): Promise<ExitVtxoResult[]> {
-  return NitroArkHybridObject.getExitVtxos() as Promise<ExitVtxoResult[]>;
+  return NitroArkHybridObject.getExitVtxos().then((results) =>
+    results.map(enrichExitVtxo)
+  );
 }
 
 /**
@@ -285,7 +325,9 @@ export function getExitVtxos(): Promise<ExitVtxoResult[]> {
  * @returns A promise resolving to claimable exit entries.
  */
 export function listClaimable(): Promise<ExitVtxoResult[]> {
-  return NitroArkHybridObject.listClaimable() as Promise<ExitVtxoResult[]>;
+  return NitroArkHybridObject.listClaimable().then((results) =>
+    results.map(enrichExitVtxo)
+  );
 }
 
 /**
@@ -304,7 +346,7 @@ export function getExitStatus(
     vtxoId,
     includeHistory,
     includeTransactions
-  ) as Promise<ExitStatusResult | undefined>;
+  ).then((result) => (result ? enrichExitStatus(result) : undefined));
 }
 
 /**