@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.
@@ -1188,6 +1188,9 @@ function mergeTxfData(local, remote) {
1188
1188
  const localNametags = local._nametags ?? [];
1189
1189
  const remoteNametags = remote._nametags ?? [];
1190
1190
  const mergedNametags = mergeNametagsByName(localNametags, remoteNametags);
1191
+ const localHistory = local._history ?? [];
1192
+ const remoteHistory = remote._history ?? [];
1193
+ const mergedHistory = mergeArrayById(localHistory, remoteHistory, "dedupKey");
1191
1194
  const merged = {
1192
1195
  _meta: mergedMeta,
1193
1196
  _tombstones: mergedTombstones.length > 0 ? mergedTombstones : void 0,
@@ -1195,6 +1198,7 @@ function mergeTxfData(local, remote) {
1195
1198
  _outbox: mergedOutbox.length > 0 ? mergedOutbox : void 0,
1196
1199
  _sent: mergedSent.length > 0 ? mergedSent : void 0,
1197
1200
  _invalid: mergedInvalid.length > 0 ? mergedInvalid : void 0,
1201
+ _history: mergedHistory.length > 0 ? mergedHistory : void 0,
1198
1202
  ...mergedTokens
1199
1203
  };
1200
1204
  return { merged, added, removed, conflicts };
@@ -1221,7 +1225,8 @@ function getTokenKeys(data) {
1221
1225
  "_nametags",
1222
1226
  "_mintOutbox",
1223
1227
  "_invalidatedNametags",
1224
- "_integrity"
1228
+ "_integrity",
1229
+ "_history"
1225
1230
  ]);
1226
1231
  const keys = /* @__PURE__ */ new Set();
1227
1232
  for (const key of Object.keys(data)) {