@unicitylabs/sphere-sdk 0.5.2 → 0.5.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1227,6 +1227,9 @@ function mergeTxfData(local, remote) {
1227
1227
  const localNametags = local._nametags ?? [];
1228
1228
  const remoteNametags = remote._nametags ?? [];
1229
1229
  const mergedNametags = mergeNametagsByName(localNametags, remoteNametags);
1230
+ const localHistory = local._history ?? [];
1231
+ const remoteHistory = remote._history ?? [];
1232
+ const mergedHistory = mergeArrayById(localHistory, remoteHistory, "dedupKey");
1230
1233
  const merged = {
1231
1234
  _meta: mergedMeta,
1232
1235
  _tombstones: mergedTombstones.length > 0 ? mergedTombstones : void 0,
@@ -1234,6 +1237,7 @@ function mergeTxfData(local, remote) {
1234
1237
  _outbox: mergedOutbox.length > 0 ? mergedOutbox : void 0,
1235
1238
  _sent: mergedSent.length > 0 ? mergedSent : void 0,
1236
1239
  _invalid: mergedInvalid.length > 0 ? mergedInvalid : void 0,
1240
+ _history: mergedHistory.length > 0 ? mergedHistory : void 0,
1237
1241
  ...mergedTokens
1238
1242
  };
1239
1243
  return { merged, added, removed, conflicts };
@@ -1260,7 +1264,8 @@ function getTokenKeys(data) {
1260
1264
  "_nametags",
1261
1265
  "_mintOutbox",
1262
1266
  "_invalidatedNametags",
1263
- "_integrity"
1267
+ "_integrity",
1268
+ "_history"
1264
1269
  ]);
1265
1270
  const keys = /* @__PURE__ */ new Set();
1266
1271
  for (const key of Object.keys(data)) {