@breeztech/breez-sdk-spark 0.13.2-dev5 → 0.13.5

package/nodejs/breez_sdk_spark_wasm.js

@@ -234,17 +234,6 @@ module.exports.defaultPostgresStorageConfig = function(connection_string) {
     return ret;
 };
 
-/**
- * Creates a default external signer from a mnemonic phrase.
- *
- * This creates a signer that can be used with `connectWithSigner` or `SdkBuilder.newWithSigner`.
- * @returns {Promise<SparkStatus>}
- */
-module.exports.getSparkStatus = function() {
-    const ret = wasm.getSparkStatus();
-    return ret;
-};
-
 /**
  * @param {Network} network
  * @returns {Config}
@@ -254,18 +243,6 @@ module.exports.defaultConfig = function(network) {
     return ret;
 };
 
-/**
- * @param {Logger} logger
- * @param {string | null} [filter]
- * @returns {Promise<void>}
- */
-module.exports.initLogging = function(logger, filter) {
-    var ptr0 = isLikeNone(filter) ? 0 : passStringToWasm0(filter, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-    var len0 = WASM_VECTOR_LEN;
-    const ret = wasm.initLogging(logger, ptr0, len0);
-    return ret;
-};
-
 /**
  * @param {ConnectRequest} request
  * @returns {Promise<BreezSdk>}
@@ -275,19 +252,6 @@ module.exports.connect = function(request) {
     return ret;
 };
 
-/**
- * @param {Config} config
- * @param {ExternalSigner} signer
- * @param {string} storage_dir
- * @returns {Promise<BreezSdk>}
- */
-module.exports.connectWithSigner = function(config, signer, storage_dir) {
-    const ptr0 = passStringToWasm0(storage_dir, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-    const len0 = WASM_VECTOR_LEN;
-    const ret = wasm.connectWithSigner(config, signer, ptr0, len0);
-    return ret;
-};
-
 function takeFromExternrefTable0(idx) {
     const value = wasm.__wbindgen_export_5.get(idx);
     wasm.__externref_table_dealloc(idx);
@@ -312,6 +276,42 @@ module.exports.defaultExternalSigner = function(mnemonic, passphrase, network, k
     return DefaultSigner.__wrap(ret[0]);
 };
 
+/**
+ * @param {Logger} logger
+ * @param {string | null} [filter]
+ * @returns {Promise<void>}
+ */
+module.exports.initLogging = function(logger, filter) {
+    var ptr0 = isLikeNone(filter) ? 0 : passStringToWasm0(filter, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    var len0 = WASM_VECTOR_LEN;
+    const ret = wasm.initLogging(logger, ptr0, len0);
+    return ret;
+};
+
+/**
+ * Creates a default external signer from a mnemonic phrase.
+ *
+ * This creates a signer that can be used with `connectWithSigner` or `SdkBuilder.newWithSigner`.
+ * @returns {Promise<SparkStatus>}
+ */
+module.exports.getSparkStatus = function() {
+    const ret = wasm.getSparkStatus();
+    return ret;
+};
+
+/**
+ * @param {Config} config
+ * @param {ExternalSigner} signer
+ * @param {string} storage_dir
+ * @returns {Promise<BreezSdk>}
+ */
+module.exports.connectWithSigner = function(config, signer, storage_dir) {
+    const ptr0 = passStringToWasm0(storage_dir, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    const len0 = WASM_VECTOR_LEN;
+    const ret = wasm.connectWithSigner(config, signer, ptr0, len0);
+    return ret;
+};
+
 function passArray8ToWasm0(arg, malloc) {
     const ptr = malloc(arg.length * 1, 1) >>> 0;
     getUint8ArrayMemory0().set(arg, ptr / 1);
@@ -330,15 +330,15 @@ module.exports.task_worker_entry_point = function(ptr) {
 };
 
 function __wbg_adapter_64(arg0, arg1, arg2) {
-    wasm.closure384_externref_shim(arg0, arg1, arg2);
+    wasm.closure385_externref_shim(arg0, arg1, arg2);
 }
 
 function __wbg_adapter_69(arg0, arg1) {
-    wasm._dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h140914a8cfe47e73(arg0, arg1);
+    wasm._dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h1015faeeadd5b26c(arg0, arg1);
 }
 
-function __wbg_adapter_423(arg0, arg1, arg2, arg3) {
-    wasm.closure656_externref_shim(arg0, arg1, arg2, arg3);
+function __wbg_adapter_433(arg0, arg1, arg2, arg3) {
+    wasm.closure665_externref_shim(arg0, arg1, arg2, arg3);
 }
 
 const __wbindgen_enum_BinaryType = ["blob", "arraybuffer"];
@@ -1503,13 +1503,13 @@ module.exports.__wbg_call_7cccdd69e0791ae2 = function() { return handleError(fun
     return ret;
 }, arguments) };
 
-module.exports.__wbg_cancelReservation_d85a13db3e8e3c7b = function() { return handleError(function (arg0, arg1, arg2) {
+module.exports.__wbg_cancelReservation_038a18dbc15a13b5 = function() { return handleError(function (arg0, arg1, arg2, arg3) {
     let deferred0_0;
     let deferred0_1;
     try {
         deferred0_0 = arg1;
         deferred0_1 = arg2;
-        const ret = arg0.cancelReservation(getStringFromWasm0(arg1, arg2));
+        const ret = arg0.cancelReservation(getStringFromWasm0(arg1, arg2), arg3);
         return ret;
     } finally {
         wasm.__wbindgen_free(deferred0_0, deferred0_1, 1);
@@ -2235,7 +2235,7 @@ module.exports.__wbg_new_23a2665fac83c611 = function(arg0, arg1) {
             const a = state0.a;
             state0.a = 0;
             try {
-                return __wbg_adapter_423(a, state0.b, arg0, arg1);
+                return __wbg_adapter_433(a, state0.b, arg0, arg1);
             } finally {
                 state0.a = a;
             }
@@ -2888,28 +2888,28 @@ module.exports.__wbindgen_cb_drop = function(arg0) {
     return ret;
 };
 
-module.exports.__wbindgen_closure_wrapper10276 = function(arg0, arg1, arg2) {
-    const ret = makeMutClosure(arg0, arg1, 385, __wbg_adapter_69);
+module.exports.__wbindgen_closure_wrapper13493 = function(arg0, arg1, arg2) {
+    const ret = makeMutClosure(arg0, arg1, 869, __wbg_adapter_69);
     return ret;
 };
 
-module.exports.__wbindgen_closure_wrapper15432 = function(arg0, arg1, arg2) {
-    const ret = makeMutClosure(arg0, arg1, 385, __wbg_adapter_64);
+module.exports.__wbindgen_closure_wrapper15518 = function(arg0, arg1, arg2) {
+    const ret = makeMutClosure(arg0, arg1, 386, __wbg_adapter_64);
     return ret;
 };
 
-module.exports.__wbindgen_closure_wrapper5935 = function(arg0, arg1, arg2) {
-    const ret = makeMutClosure(arg0, arg1, 385, __wbg_adapter_64);
+module.exports.__wbindgen_closure_wrapper5986 = function(arg0, arg1, arg2) {
+    const ret = makeMutClosure(arg0, arg1, 386, __wbg_adapter_64);
     return ret;
 };
 
-module.exports.__wbindgen_closure_wrapper5941 = function(arg0, arg1, arg2) {
-    const ret = makeMutClosure(arg0, arg1, 385, __wbg_adapter_64);
+module.exports.__wbindgen_closure_wrapper5993 = function(arg0, arg1, arg2) {
+    const ret = makeMutClosure(arg0, arg1, 386, __wbg_adapter_64);
     return ret;
 };
 
-module.exports.__wbindgen_closure_wrapper7576 = function(arg0, arg1, arg2) {
-    const ret = makeMutClosure(arg0, arg1, 865, __wbg_adapter_69);
+module.exports.__wbindgen_closure_wrapper7609 = function(arg0, arg1, arg2) {
+    const ret = makeMutClosure(arg0, arg1, 386, __wbg_adapter_69);
     return ret;
 };
 

package/nodejs/breez_sdk_spark_wasm_bg.wasm.d.ts

@@ -128,7 +128,7 @@ export const __wbindgen_export_5: WebAssembly.Table;
 export const __externref_drop_slice: (a: number, b: number) => void;
 export const __wbindgen_export_7: WebAssembly.Table;
 export const __externref_table_dealloc: (a: number) => void;
-export const closure384_externref_shim: (a: number, b: number, c: any) => void;
-export const _dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h140914a8cfe47e73: (a: number, b: number) => void;
-export const closure656_externref_shim: (a: number, b: number, c: any, d: any) => void;
+export const closure385_externref_shim: (a: number, b: number, c: any) => void;
+export const _dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h1015faeeadd5b26c: (a: number, b: number) => void;
+export const closure665_externref_shim: (a: number, b: number, c: any, d: any) => void;
 export const __wbindgen_start: () => void;

package/nodejs/index.mjs

@@ -5,12 +5,12 @@ import pkg from './index.js';
 
 export const {
   defaultPostgresStorageConfig,
-  getSparkStatus,
   defaultConfig,
-  initLogging,
   connect,
-  connectWithSigner,
   defaultExternalSigner,
+  initLogging,
+  getSparkStatus,
+  connectWithSigner,
   task_worker_entry_point,
   BreezSdk,
   DefaultSigner,

package/nodejs/postgres-tree-store/index.cjs

@@ -205,7 +205,6 @@ class PostgresTreeStore {
         // Clean up old spent markers
         await this._cleanupSpentMarkers(client, refreshTimestamp);
 
-        // Get recent spent leaf IDs (spent_at >= refresh_timestamp)
         const spentResult = await client.query(
           "SELECT leaf_id FROM tree_spent_leaves WHERE spent_at >= $1",
           [refreshTimestamp]
@@ -235,27 +234,43 @@ class PostgresTreeStore {
   }
 
   /**
-   * Cancel a reservation, releasing reserved leaves.
+   * Cancel a reservation. All leaves currently attached to the reservation are
+   * deleted from the store. The reservation row is dropped. The supplied
+   * `leavesToKeep` are inserted into the available pool.
+   *
+   * Callers pass the original reservation leaves to preserve the legacy
+   * "release everything back to the pool" behavior. Callers that have
+   * verified leaf state with the operator pass only the leaves confirmed
+   * safe to make available (e.g. dropping operator-locked leaves).
+   *
    * @param {string} id - Reservation ID
+   * @param {Array} leavesToKeep - Leaves to insert as available
    */
-  async cancelReservation(id) {
+  async cancelReservation(id, leavesToKeep) {
     try {
       await this._withWriteTransaction(async (client) => {
-        // Check if reservation exists
         const res = await client.query(
           "SELECT id FROM tree_reservations WHERE id = $1",
           [id]
         );
 
         if (res.rows.length === 0) {
-          return; // Already cancelled or finalized
+          return;
         }
 
-        // Delete reservation (ON DELETE SET NULL releases leaves)
+        await client.query(
+          "DELETE FROM tree_leaves WHERE reservation_id = $1",
+          [id]
+        );
+
         await client.query(
           "DELETE FROM tree_reservations WHERE id = $1",
           [id]
         );
+
+        if (leavesToKeep && leavesToKeep.length > 0) {
+          await this._batchUpsertLeaves(client, leavesToKeep, false, null);
+        }
       });
     } catch (error) {
       if (error instanceof TreeStoreError) throw error;
@@ -280,32 +295,26 @@ class PostgresTreeStore {
           [id]
         );
 
-        if (res.rows.length === 0) {
-          return; // Already finalized or cancelled
+        let isSwap = false;
+        let reservedLeafIds = [];
+        if (res.rows.length > 0) {
+          isSwap = res.rows[0].purpose === "Swap";
+          const leafResult = await client.query(
+            "SELECT id FROM tree_leaves WHERE reservation_id = $1",
+            [id]
+          );
+          reservedLeafIds = leafResult.rows.map((r) => r.id);
+          await this._batchInsertSpentLeaves(client, reservedLeafIds);
+          await client.query(
+            "DELETE FROM tree_leaves WHERE reservation_id = $1",
+            [id]
+          );
+          await client.query(
+            "DELETE FROM tree_reservations WHERE id = $1",
+            [id]
+          );
         }
 
-        const isSwap = res.rows[0].purpose === "Swap";
-
-        // Get reserved leaf IDs
-        const leafResult = await client.query(
-          "SELECT id FROM tree_leaves WHERE reservation_id = $1",
-          [id]
-        );
-        const reservedLeafIds = leafResult.rows.map((r) => r.id);
-
-        // Mark as spent
-        await this._batchInsertSpentLeaves(client, reservedLeafIds);
-
-        // Delete reserved leaves and reservation
-        await client.query(
-          "DELETE FROM tree_leaves WHERE reservation_id = $1",
-          [id]
-        );
-        await client.query(
-          "DELETE FROM tree_reservations WHERE id = $1",
-          [id]
-        );
-
         // Add new leaves if provided
         if (newLeaves && newLeaves.length > 0) {
           await this._batchUpsertLeaves(client, newLeaves, false, null);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@breeztech/breez-sdk-spark",
-    "version": "0.13.2-dev5",
+    "version": "0.13.5",
     "description": "Breez Spark SDK",
     "repository": "https://github.com/breez/spark-sdk",
     "author": "Breez <contact@breez.technology> (https://github.com/breez)",

package/ssr/index.js

@@ -28,24 +28,29 @@ export function defaultPostgresStorageConfig(...args) {
   return _module.defaultPostgresStorageConfig(...args);
 }
 
-export function getSparkStatus(...args) {
-  if (!_module) _notInitialized('getSparkStatus');
-  return _module.getSparkStatus(...args);
-}
-
 export function defaultConfig(...args) {
   if (!_module) _notInitialized('defaultConfig');
   return _module.defaultConfig(...args);
 }
 
+export function connect(...args) {
+  if (!_module) _notInitialized('connect');
+  return _module.connect(...args);
+}
+
+export function defaultExternalSigner(...args) {
+  if (!_module) _notInitialized('defaultExternalSigner');
+  return _module.defaultExternalSigner(...args);
+}
+
 export function initLogging(...args) {
   if (!_module) _notInitialized('initLogging');
   return _module.initLogging(...args);
 }
 
-export function connect(...args) {
-  if (!_module) _notInitialized('connect');
-  return _module.connect(...args);
+export function getSparkStatus(...args) {
+  if (!_module) _notInitialized('getSparkStatus');
+  return _module.getSparkStatus(...args);
 }
 
 export function connectWithSigner(...args) {
@@ -53,11 +58,6 @@ export function connectWithSigner(...args) {
   return _module.connectWithSigner(...args);
 }
 
-export function defaultExternalSigner(...args) {
-  if (!_module) _notInitialized('defaultExternalSigner');
-  return _module.defaultExternalSigner(...args);
-}
-
 export function task_worker_entry_point(...args) {
   if (!_module) _notInitialized('task_worker_entry_point');
   return _module.task_worker_entry_point(...args);