@breeztech/breez-sdk-spark 0.8.0-dev1 → 0.8.2

package/bundler/breez_sdk_spark_wasm.d.ts

@@ -371,7 +371,7 @@ export interface RecordChange {
     id: RecordId;
     schemaVersion: string;
     updatedFields: Map<string, string>;
-    revision: number;
+    localRevision: number;
 }
 
 export type TokenTransactionType = "transfer" | "mint" | "burn";
@@ -1019,7 +1019,6 @@ export interface Storage {
     syncGetLastRevision: () => Promise<number>;
     syncInsertIncomingRecords: (records: Record[]) => Promise<void>;
     syncDeleteIncomingRecord: (record: Record) => Promise<void>;
-    syncRebasePendingOutgoingRecords: (revision: number) => Promise<void>;
     syncGetIncomingRecords: (limit: number) => Promise<IncomingChange[]>;
     syncGetLatestOutgoingChange: () => Promise<OutgoingChange | null>;
     syncUpdateRecordFromIncoming: (record: Record) => Promise<void>;

package/bundler/breez_sdk_spark_wasm_bg.js

@@ -321,11 +321,11 @@ function __wbg_adapter_64(arg0, arg1) {
 }
 
 function __wbg_adapter_67(arg0, arg1, arg2) {
-    wasm.closure1078_externref_shim(arg0, arg1, arg2);
+    wasm.closure1081_externref_shim(arg0, arg1, arg2);
 }
 
-function __wbg_adapter_287(arg0, arg1, arg2, arg3) {
-    wasm.closure671_externref_shim(arg0, arg1, arg2, arg3);
+function __wbg_adapter_285(arg0, arg1, arg2, arg3) {
+    wasm.closure674_externref_shim(arg0, arg1, arg2, arg3);
 }
 
 const __wbindgen_enum_ReadableStreamType = ["bytes"];
@@ -1876,7 +1876,7 @@ export function __wbg_new_23a2665fac83c611(arg0, arg1) {
             const a = state0.a;
             state0.a = 0;
             try {
-                return __wbg_adapter_287(a, state0.b, arg0, arg1);
+                return __wbg_adapter_285(a, state0.b, arg0, arg1);
             } finally {
                 state0.a = a;
             }
@@ -2288,11 +2288,6 @@ export function __wbg_syncInsertIncomingRecords_dde4039dbc9cb38f() { return hand
     return ret;
 }, arguments) };
 
-export function __wbg_syncRebasePendingOutgoingRecords_b3441ced5dee0c8e() { return handleError(function (arg0, arg1) {
-    const ret = arg0.syncRebasePendingOutgoingRecords(BigInt.asUintN(64, arg1));
-    return ret;
-}, arguments) };
-
 export function __wbg_syncUpdateRecordFromIncoming_a76ad82592bfdcb3() { return handleError(function (arg0, arg1) {
     const ret = arg0.syncUpdateRecordFromIncoming(arg1);
     return ret;
@@ -2406,13 +2401,13 @@ export function __wbindgen_cb_drop(arg0) {
     return ret;
 };
 
-export function __wbindgen_closure_wrapper11759(arg0, arg1, arg2) {
-    const ret = makeMutClosure(arg0, arg1, 848, __wbg_adapter_64);
+export function __wbindgen_closure_wrapper11757(arg0, arg1, arg2) {
+    const ret = makeMutClosure(arg0, arg1, 851, __wbg_adapter_64);
     return ret;
 };
 
-export function __wbindgen_closure_wrapper13708(arg0, arg1, arg2) {
-    const ret = makeMutClosure(arg0, arg1, 1079, __wbg_adapter_67);
+export function __wbindgen_closure_wrapper13706(arg0, arg1, arg2) {
+    const ret = makeMutClosure(arg0, arg1, 1082, __wbg_adapter_67);
     return ret;
 };
 

package/bundler/breez_sdk_spark_wasm_bg.wasm.d.ts

@@ -114,6 +114,6 @@ 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 _dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hf2ef52c8a8b47594: (a: number, b: number) => void;
-export const closure1078_externref_shim: (a: number, b: number, c: any) => void;
-export const closure671_externref_shim: (a: number, b: number, c: any, d: any) => void;
+export const closure1081_externref_shim: (a: number, b: number, c: any) => void;
+export const closure674_externref_shim: (a: number, b: number, c: any, d: any) => void;
 export const __wbindgen_start: () => void;

package/bundler/storage/index.js

@@ -1280,30 +1280,24 @@ class IndexedDBStorage {
     }
 
     return new Promise((resolve, reject) => {
-      const transaction = this.db.transaction(
-        ["sync_outgoing", "sync_revision"],
-        "readwrite"
-      );
+      const transaction = this.db.transaction(["sync_outgoing"], "readwrite");
 
-      // Compute next revision as max(committed, max outgoing) + 1, without updating sync_revision
-      const revisionStore = transaction.objectStore("sync_revision");
+      // This revision is a local queue id for pending rows, not a server revision.
       const outgoingStore = transaction.objectStore("sync_outgoing");
-
-      const getRevisionRequest = revisionStore.get(1);
       const getAllOutgoingRequest = outgoingStore.getAll();
 
-      let committedRevision = null;
-      let maxOutgoingRevision = null;
-      let resultsReady = 0;
-
-      const onBothReady = () => {
-        resultsReady++;
-        if (resultsReady < 2) return;
-
-        const base = committedRevision > maxOutgoingRevision
-          ? committedRevision
-          : maxOutgoingRevision;
-        const nextRevision = base + BigInt(1);
+      getAllOutgoingRequest.onsuccess = () => {
+        const records = getAllOutgoingRequest.result;
+        let maxOutgoingRevision = BigInt(0);
+        for (const storeRecord of records) {
+          const rev = BigInt(
+            storeRecord.record.localRevision ?? storeRecord.record.revision
+          );
+          if (rev > maxOutgoingRevision) {
+            maxOutgoingRevision = rev;
+          }
+        }
+        const nextRevision = maxOutgoingRevision + BigInt(1);
 
         const storeRecord = {
           type: record.id.type,
@@ -1311,7 +1305,7 @@ class IndexedDBStorage {
           revision: Number(nextRevision),
           record: {
             ...record,
-            revision: nextRevision,
+            localRevision: nextRevision,
           },
         };
 
@@ -1332,35 +1326,6 @@ class IndexedDBStorage {
         };
       };
 
-      getRevisionRequest.onsuccess = () => {
-        const revisionData = getRevisionRequest.result || {
-          id: 1,
-          revision: "0",
-        };
-        committedRevision = BigInt(revisionData.revision);
-        onBothReady();
-      };
-
-      getAllOutgoingRequest.onsuccess = () => {
-        const records = getAllOutgoingRequest.result;
-        maxOutgoingRevision = BigInt(0);
-        for (const storeRecord of records) {
-          const rev = BigInt(storeRecord.record.revision);
-          if (rev > maxOutgoingRevision) {
-            maxOutgoingRevision = rev;
-          }
-        }
-        onBothReady();
-      };
-
-      getRevisionRequest.onerror = (event) => {
-        reject(
-          new StorageError(
-            `Failed to get revision: ${event.target.error.message}`
-          )
-        );
-      };
-
       getAllOutgoingRequest.onerror = (event) => {
         reject(
           new StorageError(
@@ -1459,7 +1424,11 @@ class IndexedDBStorage {
         const cursor = event.target.result;
         if (cursor && count < limit) {
           const storeRecord = cursor.value;
-          const change = storeRecord.record;
+          const change = {
+            ...storeRecord.record,
+            localRevision:
+              storeRecord.record.localRevision ?? storeRecord.record.revision,
+          };
 
           // Look up parent record if it exists
           const stateRequest = stateStore.get([
@@ -1599,120 +1568,6 @@ class IndexedDBStorage {
     });
   }
 
-  async syncRebasePendingOutgoingRecords(revision) {
-    if (!this.db) {
-      throw new StorageError("Database not initialized");
-    }
-
-    return new Promise((resolve, reject) => {
-      const transaction = this.db.transaction(
-        ["sync_outgoing", "sync_revision"],
-        "readwrite"
-      );
-      const outgoingStore = transaction.objectStore("sync_outgoing");
-      const revisionStore = transaction.objectStore("sync_revision");
-
-      // Get the last committed revision from sync_revision
-      const getRevisionRequest = revisionStore.get(1);
-
-      getRevisionRequest.onsuccess = () => {
-        const revisionData = getRevisionRequest.result || {
-          id: 1,
-          revision: "0",
-        };
-        const lastRevision = BigInt(revisionData.revision);
-
-        // Calculate the difference
-        const diff = revision > lastRevision ? revision - lastRevision : BigInt(0);
-
-        // Helper to update sync_revision within the same transaction so retries are idempotent
-        const updateSyncRevision = () => {
-          if (revision > lastRevision) {
-            revisionStore.put({ id: 1, revision: revision.toString() });
-          }
-        };
-
-        if (diff <= BigInt(0)) {
-          updateSyncRevision();
-          resolve();
-          return;
-        }
-
-        // Get all records from sync_outgoing and update their revisions
-        const getAllRequest = outgoingStore.getAll();
-
-        getAllRequest.onsuccess = () => {
-          const records = getAllRequest.result;
-
-          if (records.length === 0) {
-            updateSyncRevision();
-            resolve();
-            return;
-          }
-
-          let updatesCompleted = 0;
-
-          for (const storeRecord of records) {
-            // Delete the old record
-            const oldKey = [
-              storeRecord.type,
-              storeRecord.dataId,
-              storeRecord.revision,
-            ];
-            outgoingStore.delete(oldKey);
-
-            // Update revision in both the key and the nested record
-            const newRevision = storeRecord.record.revision + diff;
-            const updatedRecord = {
-              type: storeRecord.type,
-              dataId: storeRecord.dataId,
-              revision: Number(newRevision),
-              record: {
-                ...storeRecord.record,
-                revision: newRevision,
-              },
-            };
-
-            // Add the updated record
-            const putRequest = outgoingStore.put(updatedRecord);
-
-            putRequest.onsuccess = () => {
-              updatesCompleted++;
-              if (updatesCompleted === records.length) {
-                updateSyncRevision();
-                resolve();
-              }
-            };
-
-            putRequest.onerror = (event) => {
-              reject(
-                new StorageError(
-                  `Failed to rebase outgoing record: ${event.target.error.message}`
-                )
-              );
-            };
-          }
-        };
-
-        getAllRequest.onerror = (event) => {
-          reject(
-            new StorageError(
-              `Failed to get outgoing records for rebase: ${event.target.error.message}`
-            )
-          );
-        };
-      };
-
-      getRevisionRequest.onerror = (event) => {
-        reject(
-          new StorageError(
-            `Failed to get last revision: ${event.target.error.message}`
-          )
-        );
-      };
-    });
-  }
-
   async syncGetIncomingRecords(limit) {
     if (!this.db) {
       throw new StorageError("Database not initialized");
@@ -1802,7 +1657,11 @@ class IndexedDBStorage {
         const cursor = event.target.result;
         if (cursor) {
           const storeRecord = cursor.value;
-          const change = storeRecord.record;
+          const change = {
+            ...storeRecord.record,
+            localRevision:
+              storeRecord.record.localRevision ?? storeRecord.record.revision,
+          };
 
           // Get the parent record
           const stateRequest = stateStore.get([

package/deno/breez_sdk_spark_wasm.d.ts

@@ -371,7 +371,7 @@ export interface RecordChange {
     id: RecordId;
     schemaVersion: string;
     updatedFields: Map<string, string>;
-    revision: number;
+    localRevision: number;
 }
 
 export type TokenTransactionType = "transfer" | "mint" | "burn";
@@ -1019,7 +1019,6 @@ export interface Storage {
     syncGetLastRevision: () => Promise<number>;
     syncInsertIncomingRecords: (records: Record[]) => Promise<void>;
     syncDeleteIncomingRecord: (record: Record) => Promise<void>;
-    syncRebasePendingOutgoingRecords: (revision: number) => Promise<void>;
     syncGetIncomingRecords: (limit: number) => Promise<IncomingChange[]>;
     syncGetLatestOutgoingChange: () => Promise<OutgoingChange | null>;
     syncUpdateRecordFromIncoming: (record: Record) => Promise<void>;

package/deno/breez_sdk_spark_wasm.js

@@ -304,11 +304,11 @@ function __wbg_adapter_64(arg0, arg1) {
 }
 
 function __wbg_adapter_67(arg0, arg1, arg2) {
-    wasm.closure1078_externref_shim(arg0, arg1, arg2);
+    wasm.closure1081_externref_shim(arg0, arg1, arg2);
 }
 
-function __wbg_adapter_287(arg0, arg1, arg2, arg3) {
-    wasm.closure671_externref_shim(arg0, arg1, arg2, arg3);
+function __wbg_adapter_285(arg0, arg1, arg2, arg3) {
+    wasm.closure674_externref_shim(arg0, arg1, arg2, arg3);
 }
 
 const __wbindgen_enum_ReadableStreamType = ["bytes"];
@@ -1768,7 +1768,7 @@ const imports = {
                     const a = state0.a;
                     state0.a = 0;
                     try {
-                        return __wbg_adapter_287(a, state0.b, arg0, arg1);
+                        return __wbg_adapter_285(a, state0.b, arg0, arg1);
                     } finally {
                         state0.a = a;
                     }
@@ -2106,10 +2106,6 @@ const imports = {
             const ret = arg0.syncInsertIncomingRecords(v0);
             return ret;
         }, arguments) },
-        __wbg_syncRebasePendingOutgoingRecords_b3441ced5dee0c8e: function() { return handleError(function (arg0, arg1) {
-            const ret = arg0.syncRebasePendingOutgoingRecords(BigInt.asUintN(64, arg1));
-            return ret;
-        }, arguments) },
         __wbg_syncUpdateRecordFromIncoming_a76ad82592bfdcb3: function() { return handleError(function (arg0, arg1) {
             const ret = arg0.syncUpdateRecordFromIncoming(arg1);
             return ret;
@@ -2204,12 +2200,12 @@ const imports = {
             const ret = false;
             return ret;
         },
-        __wbindgen_closure_wrapper11759: function(arg0, arg1, arg2) {
-            const ret = makeMutClosure(arg0, arg1, 848, __wbg_adapter_64);
+        __wbindgen_closure_wrapper11757: function(arg0, arg1, arg2) {
+            const ret = makeMutClosure(arg0, arg1, 851, __wbg_adapter_64);
             return ret;
         },
-        __wbindgen_closure_wrapper13708: function(arg0, arg1, arg2) {
-            const ret = makeMutClosure(arg0, arg1, 1079, __wbg_adapter_67);
+        __wbindgen_closure_wrapper13706: function(arg0, arg1, arg2) {
+            const ret = makeMutClosure(arg0, arg1, 1082, __wbg_adapter_67);
             return ret;
         },
         __wbindgen_debug_string: function(arg0, arg1) {

package/deno/breez_sdk_spark_wasm_bg.wasm.d.ts

@@ -114,6 +114,6 @@ 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 _dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hf2ef52c8a8b47594: (a: number, b: number) => void;
-export const closure1078_externref_shim: (a: number, b: number, c: any) => void;
-export const closure671_externref_shim: (a: number, b: number, c: any, d: any) => void;
+export const closure1081_externref_shim: (a: number, b: number, c: any) => void;
+export const closure674_externref_shim: (a: number, b: number, c: any, d: any) => void;
 export const __wbindgen_start: () => void;

package/nodejs/breez_sdk_spark_wasm.d.ts

@@ -371,7 +371,7 @@ export interface RecordChange {
     id: RecordId;
     schemaVersion: string;
     updatedFields: Map<string, string>;
-    revision: number;
+    localRevision: number;
 }
 
 export type TokenTransactionType = "transfer" | "mint" | "burn";
@@ -1019,7 +1019,6 @@ export interface Storage {
     syncGetLastRevision: () => Promise<number>;
     syncInsertIncomingRecords: (records: Record[]) => Promise<void>;
     syncDeleteIncomingRecord: (record: Record) => Promise<void>;
-    syncRebasePendingOutgoingRecords: (revision: number) => Promise<void>;
     syncGetIncomingRecords: (limit: number) => Promise<IncomingChange[]>;
     syncGetLatestOutgoingChange: () => Promise<OutgoingChange | null>;
     syncUpdateRecordFromIncoming: (record: Record) => Promise<void>;

package/nodejs/breez_sdk_spark_wasm.js

@@ -317,11 +317,11 @@ function __wbg_adapter_64(arg0, arg1) {
 }
 
 function __wbg_adapter_67(arg0, arg1, arg2) {
-    wasm.closure1078_externref_shim(arg0, arg1, arg2);
+    wasm.closure1081_externref_shim(arg0, arg1, arg2);
 }
 
-function __wbg_adapter_287(arg0, arg1, arg2, arg3) {
-    wasm.closure671_externref_shim(arg0, arg1, arg2, arg3);
+function __wbg_adapter_285(arg0, arg1, arg2, arg3) {
+    wasm.closure674_externref_shim(arg0, arg1, arg2, arg3);
 }
 
 const __wbindgen_enum_ReadableStreamType = ["bytes"];
@@ -1879,7 +1879,7 @@ module.exports.__wbg_new_23a2665fac83c611 = function(arg0, arg1) {
             const a = state0.a;
             state0.a = 0;
             try {
-                return __wbg_adapter_287(a, state0.b, arg0, arg1);
+                return __wbg_adapter_285(a, state0.b, arg0, arg1);
             } finally {
                 state0.a = a;
             }
@@ -2291,11 +2291,6 @@ module.exports.__wbg_syncInsertIncomingRecords_dde4039dbc9cb38f = function() { r
     return ret;
 }, arguments) };
 
-module.exports.__wbg_syncRebasePendingOutgoingRecords_b3441ced5dee0c8e = function() { return handleError(function (arg0, arg1) {
-    const ret = arg0.syncRebasePendingOutgoingRecords(BigInt.asUintN(64, arg1));
-    return ret;
-}, arguments) };
-
 module.exports.__wbg_syncUpdateRecordFromIncoming_a76ad82592bfdcb3 = function() { return handleError(function (arg0, arg1) {
     const ret = arg0.syncUpdateRecordFromIncoming(arg1);
     return ret;
@@ -2409,13 +2404,13 @@ module.exports.__wbindgen_cb_drop = function(arg0) {
     return ret;
 };
 
-module.exports.__wbindgen_closure_wrapper11759 = function(arg0, arg1, arg2) {
-    const ret = makeMutClosure(arg0, arg1, 848, __wbg_adapter_64);
+module.exports.__wbindgen_closure_wrapper11757 = function(arg0, arg1, arg2) {
+    const ret = makeMutClosure(arg0, arg1, 851, __wbg_adapter_64);
     return ret;
 };
 
-module.exports.__wbindgen_closure_wrapper13708 = function(arg0, arg1, arg2) {
-    const ret = makeMutClosure(arg0, arg1, 1079, __wbg_adapter_67);
+module.exports.__wbindgen_closure_wrapper13706 = function(arg0, arg1, arg2) {
+    const ret = makeMutClosure(arg0, arg1, 1082, __wbg_adapter_67);
     return ret;
 };
 

package/nodejs/breez_sdk_spark_wasm_bg.wasm.d.ts

@@ -114,6 +114,6 @@ 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 _dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hf2ef52c8a8b47594: (a: number, b: number) => void;
-export const closure1078_externref_shim: (a: number, b: number, c: any) => void;
-export const closure671_externref_shim: (a: number, b: number, c: any, d: any) => void;
+export const closure1081_externref_shim: (a: number, b: number, c: any) => void;
+export const closure674_externref_shim: (a: number, b: number, c: any, d: any) => void;
 export const __wbindgen_start: () => void;

package/nodejs/storage/index.cjs

@@ -798,14 +798,10 @@ class SqliteStorage {
   syncAddOutgoingChange(record) {
     try {
       const transaction = this.db.transaction(() => {
-        // Compute next revision as max(committed, max outgoing) + 1, without updating sync_revision
+        // This revision is a local queue id for pending rows, not a server revision.
         const revisionQuery = this.db.prepare(`
-          SELECT CAST(
-            MAX(
-              (SELECT revision FROM sync_revision),
-              COALESCE((SELECT MAX(revision) FROM sync_outgoing), 0)
-            ) + 1
-          AS TEXT) AS revision
+          SELECT CAST(COALESCE(MAX(revision), 0) + 1 AS TEXT) AS revision
+          FROM sync_outgoing
         `);
         const revision = BigInt(revisionQuery.get().revision);
 
@@ -931,7 +927,7 @@ class SqliteStorage {
           },
           schemaVersion: row.schema_version,
           updatedFields: JSON.parse(row.updated_fields_json),
-          revision: BigInt(row.revision),
+          localRevision: BigInt(row.revision),
         };
 
         let parent = null;
@@ -1042,50 +1038,6 @@ class SqliteStorage {
     }
   }
 
-  syncRebasePendingOutgoingRecords(revision) {
-    try {
-      const transaction = this.db.transaction(() => {
-        // Get current committed revision from sync_revision table
-        const getLastRevisionStmt = this.db.prepare(`
-          SELECT CAST(revision AS TEXT) as last_revision FROM sync_revision
-        `);
-        const revisionRow = getLastRevisionStmt.get();
-        const lastRevision = revisionRow
-          ? BigInt(revisionRow.last_revision)
-          : BigInt(0);
-
-        // Calculate the difference to add to all revision numbers
-        const diff =
-          revision > lastRevision ? revision - lastRevision : BigInt(0);
-
-        if (diff > BigInt(0)) {
-          // Update all pending outgoing records
-          const updateRecordsStmt = this.db.prepare(`
-            UPDATE sync_outgoing
-            SET revision = revision + CAST(? AS INTEGER)
-          `);
-          updateRecordsStmt.run(diff.toString());
-        }
-
-        // Update sync_revision within the same transaction so retries are idempotent
-        const updateRevisionStmt = this.db.prepare(`
-          UPDATE sync_revision SET revision = MAX(revision, CAST(? AS INTEGER))
-        `);
-        updateRevisionStmt.run(revision.toString());
-      });
-
-      transaction();
-      return Promise.resolve();
-    } catch (error) {
-      return Promise.reject(
-        new StorageError(
-          `Failed to rebase pending outgoing records: ${error.message}`,
-          error
-        )
-      );
-    }
-  }
-
   syncGetIncomingRecords(limit) {
     try {
       const transaction = this.db.transaction(() => {
@@ -1191,7 +1143,7 @@ class SqliteStorage {
         },
         schemaVersion: row.schema_version,
         updatedFields: JSON.parse(row.updated_fields_json),
-        revision: BigInt(row.revision),
+        localRevision: BigInt(row.revision),
       };
 
       let parent = null;

package/package.json

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

package/web/breez_sdk_spark_wasm.d.ts

@@ -371,7 +371,7 @@ export interface RecordChange {
     id: RecordId;
     schemaVersion: string;
     updatedFields: Map<string, string>;
-    revision: number;
+    localRevision: number;
 }
 
 export type TokenTransactionType = "transfer" | "mint" | "burn";
@@ -1019,7 +1019,6 @@ export interface Storage {
     syncGetLastRevision: () => Promise<number>;
     syncInsertIncomingRecords: (records: Record[]) => Promise<void>;
     syncDeleteIncomingRecord: (record: Record) => Promise<void>;
-    syncRebasePendingOutgoingRecords: (revision: number) => Promise<void>;
     syncGetIncomingRecords: (limit: number) => Promise<IncomingChange[]>;
     syncGetLatestOutgoingChange: () => Promise<OutgoingChange | null>;
     syncUpdateRecordFromIncoming: (record: Record) => Promise<void>;
@@ -1260,8 +1259,8 @@ export interface InitOutput {
   readonly __wbindgen_export_7: WebAssembly.Table;
   readonly __externref_table_dealloc: (a: number) => void;
   readonly _dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hf2ef52c8a8b47594: (a: number, b: number) => void;
-  readonly closure1078_externref_shim: (a: number, b: number, c: any) => void;
-  readonly closure671_externref_shim: (a: number, b: number, c: any, d: any) => void;
+  readonly closure1081_externref_shim: (a: number, b: number, c: any) => void;
+  readonly closure674_externref_shim: (a: number, b: number, c: any, d: any) => void;
   readonly __wbindgen_start: () => void;
 }
 

package/web/breez_sdk_spark_wasm.js

@@ -313,11 +313,11 @@ function __wbg_adapter_64(arg0, arg1) {
 }
 
 function __wbg_adapter_67(arg0, arg1, arg2) {
-    wasm.closure1078_externref_shim(arg0, arg1, arg2);
+    wasm.closure1081_externref_shim(arg0, arg1, arg2);
 }
 
-function __wbg_adapter_287(arg0, arg1, arg2, arg3) {
-    wasm.closure671_externref_shim(arg0, arg1, arg2, arg3);
+function __wbg_adapter_285(arg0, arg1, arg2, arg3) {
+    wasm.closure674_externref_shim(arg0, arg1, arg2, arg3);
 }
 
 const __wbindgen_enum_ReadableStreamType = ["bytes"];
@@ -1809,7 +1809,7 @@ function __wbg_get_imports() {
                 const a = state0.a;
                 state0.a = 0;
                 try {
-                    return __wbg_adapter_287(a, state0.b, arg0, arg1);
+                    return __wbg_adapter_285(a, state0.b, arg0, arg1);
                 } finally {
                     state0.a = a;
                 }
@@ -2147,10 +2147,6 @@ function __wbg_get_imports() {
         const ret = arg0.syncInsertIncomingRecords(v0);
         return ret;
     }, arguments) };
-    imports.wbg.__wbg_syncRebasePendingOutgoingRecords_b3441ced5dee0c8e = function() { return handleError(function (arg0, arg1) {
-        const ret = arg0.syncRebasePendingOutgoingRecords(BigInt.asUintN(64, arg1));
-        return ret;
-    }, arguments) };
     imports.wbg.__wbg_syncUpdateRecordFromIncoming_a76ad82592bfdcb3 = function() { return handleError(function (arg0, arg1) {
         const ret = arg0.syncUpdateRecordFromIncoming(arg1);
         return ret;
@@ -2245,12 +2241,12 @@ function __wbg_get_imports() {
         const ret = false;
         return ret;
     };
-    imports.wbg.__wbindgen_closure_wrapper11759 = function(arg0, arg1, arg2) {
-        const ret = makeMutClosure(arg0, arg1, 848, __wbg_adapter_64);
+    imports.wbg.__wbindgen_closure_wrapper11757 = function(arg0, arg1, arg2) {
+        const ret = makeMutClosure(arg0, arg1, 851, __wbg_adapter_64);
         return ret;
     };
-    imports.wbg.__wbindgen_closure_wrapper13708 = function(arg0, arg1, arg2) {
-        const ret = makeMutClosure(arg0, arg1, 1079, __wbg_adapter_67);
+    imports.wbg.__wbindgen_closure_wrapper13706 = function(arg0, arg1, arg2) {
+        const ret = makeMutClosure(arg0, arg1, 1082, __wbg_adapter_67);
         return ret;
     };
     imports.wbg.__wbindgen_debug_string = function(arg0, arg1) {

package/web/breez_sdk_spark_wasm_bg.wasm.d.ts

@@ -114,6 +114,6 @@ 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 _dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hf2ef52c8a8b47594: (a: number, b: number) => void;
-export const closure1078_externref_shim: (a: number, b: number, c: any) => void;
-export const closure671_externref_shim: (a: number, b: number, c: any, d: any) => void;
+export const closure1081_externref_shim: (a: number, b: number, c: any) => void;
+export const closure674_externref_shim: (a: number, b: number, c: any, d: any) => void;
 export const __wbindgen_start: () => void;

package/web/storage/index.js

@@ -1280,30 +1280,24 @@ class IndexedDBStorage {
     }
 
     return new Promise((resolve, reject) => {
-      const transaction = this.db.transaction(
-        ["sync_outgoing", "sync_revision"],
-        "readwrite"
-      );
+      const transaction = this.db.transaction(["sync_outgoing"], "readwrite");
 
-      // Compute next revision as max(committed, max outgoing) + 1, without updating sync_revision
-      const revisionStore = transaction.objectStore("sync_revision");
+      // This revision is a local queue id for pending rows, not a server revision.
       const outgoingStore = transaction.objectStore("sync_outgoing");
-
-      const getRevisionRequest = revisionStore.get(1);
       const getAllOutgoingRequest = outgoingStore.getAll();
 
-      let committedRevision = null;
-      let maxOutgoingRevision = null;
-      let resultsReady = 0;
-
-      const onBothReady = () => {
-        resultsReady++;
-        if (resultsReady < 2) return;
-
-        const base = committedRevision > maxOutgoingRevision
-          ? committedRevision
-          : maxOutgoingRevision;
-        const nextRevision = base + BigInt(1);
+      getAllOutgoingRequest.onsuccess = () => {
+        const records = getAllOutgoingRequest.result;
+        let maxOutgoingRevision = BigInt(0);
+        for (const storeRecord of records) {
+          const rev = BigInt(
+            storeRecord.record.localRevision ?? storeRecord.record.revision
+          );
+          if (rev > maxOutgoingRevision) {
+            maxOutgoingRevision = rev;
+          }
+        }
+        const nextRevision = maxOutgoingRevision + BigInt(1);
 
         const storeRecord = {
           type: record.id.type,
@@ -1311,7 +1305,7 @@ class IndexedDBStorage {
           revision: Number(nextRevision),
           record: {
             ...record,
-            revision: nextRevision,
+            localRevision: nextRevision,
           },
         };
 
@@ -1332,35 +1326,6 @@ class IndexedDBStorage {
         };
       };
 
-      getRevisionRequest.onsuccess = () => {
-        const revisionData = getRevisionRequest.result || {
-          id: 1,
-          revision: "0",
-        };
-        committedRevision = BigInt(revisionData.revision);
-        onBothReady();
-      };
-
-      getAllOutgoingRequest.onsuccess = () => {
-        const records = getAllOutgoingRequest.result;
-        maxOutgoingRevision = BigInt(0);
-        for (const storeRecord of records) {
-          const rev = BigInt(storeRecord.record.revision);
-          if (rev > maxOutgoingRevision) {
-            maxOutgoingRevision = rev;
-          }
-        }
-        onBothReady();
-      };
-
-      getRevisionRequest.onerror = (event) => {
-        reject(
-          new StorageError(
-            `Failed to get revision: ${event.target.error.message}`
-          )
-        );
-      };
-
       getAllOutgoingRequest.onerror = (event) => {
         reject(
           new StorageError(
@@ -1459,7 +1424,11 @@ class IndexedDBStorage {
         const cursor = event.target.result;
         if (cursor && count < limit) {
           const storeRecord = cursor.value;
-          const change = storeRecord.record;
+          const change = {
+            ...storeRecord.record,
+            localRevision:
+              storeRecord.record.localRevision ?? storeRecord.record.revision,
+          };
 
           // Look up parent record if it exists
           const stateRequest = stateStore.get([
@@ -1599,120 +1568,6 @@ class IndexedDBStorage {
     });
   }
 
-  async syncRebasePendingOutgoingRecords(revision) {
-    if (!this.db) {
-      throw new StorageError("Database not initialized");
-    }
-
-    return new Promise((resolve, reject) => {
-      const transaction = this.db.transaction(
-        ["sync_outgoing", "sync_revision"],
-        "readwrite"
-      );
-      const outgoingStore = transaction.objectStore("sync_outgoing");
-      const revisionStore = transaction.objectStore("sync_revision");
-
-      // Get the last committed revision from sync_revision
-      const getRevisionRequest = revisionStore.get(1);
-
-      getRevisionRequest.onsuccess = () => {
-        const revisionData = getRevisionRequest.result || {
-          id: 1,
-          revision: "0",
-        };
-        const lastRevision = BigInt(revisionData.revision);
-
-        // Calculate the difference
-        const diff = revision > lastRevision ? revision - lastRevision : BigInt(0);
-
-        // Helper to update sync_revision within the same transaction so retries are idempotent
-        const updateSyncRevision = () => {
-          if (revision > lastRevision) {
-            revisionStore.put({ id: 1, revision: revision.toString() });
-          }
-        };
-
-        if (diff <= BigInt(0)) {
-          updateSyncRevision();
-          resolve();
-          return;
-        }
-
-        // Get all records from sync_outgoing and update their revisions
-        const getAllRequest = outgoingStore.getAll();
-
-        getAllRequest.onsuccess = () => {
-          const records = getAllRequest.result;
-
-          if (records.length === 0) {
-            updateSyncRevision();
-            resolve();
-            return;
-          }
-
-          let updatesCompleted = 0;
-
-          for (const storeRecord of records) {
-            // Delete the old record
-            const oldKey = [
-              storeRecord.type,
-              storeRecord.dataId,
-              storeRecord.revision,
-            ];
-            outgoingStore.delete(oldKey);
-
-            // Update revision in both the key and the nested record
-            const newRevision = storeRecord.record.revision + diff;
-            const updatedRecord = {
-              type: storeRecord.type,
-              dataId: storeRecord.dataId,
-              revision: Number(newRevision),
-              record: {
-                ...storeRecord.record,
-                revision: newRevision,
-              },
-            };
-
-            // Add the updated record
-            const putRequest = outgoingStore.put(updatedRecord);
-
-            putRequest.onsuccess = () => {
-              updatesCompleted++;
-              if (updatesCompleted === records.length) {
-                updateSyncRevision();
-                resolve();
-              }
-            };
-
-            putRequest.onerror = (event) => {
-              reject(
-                new StorageError(
-                  `Failed to rebase outgoing record: ${event.target.error.message}`
-                )
-              );
-            };
-          }
-        };
-
-        getAllRequest.onerror = (event) => {
-          reject(
-            new StorageError(
-              `Failed to get outgoing records for rebase: ${event.target.error.message}`
-            )
-          );
-        };
-      };
-
-      getRevisionRequest.onerror = (event) => {
-        reject(
-          new StorageError(
-            `Failed to get last revision: ${event.target.error.message}`
-          )
-        );
-      };
-    });
-  }
-
   async syncGetIncomingRecords(limit) {
     if (!this.db) {
       throw new StorageError("Database not initialized");
@@ -1802,7 +1657,11 @@ class IndexedDBStorage {
         const cursor = event.target.result;
         if (cursor) {
           const storeRecord = cursor.value;
-          const change = storeRecord.record;
+          const change = {
+            ...storeRecord.record,
+            localRevision:
+              storeRecord.record.localRevision ?? storeRecord.record.revision,
+          };
 
           // Get the parent record
           const stateRequest = stateStore.get([