@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.
@@ -4592,6 +4592,9 @@ function mergeTxfData(local, remote) {
4592
4592
  const localNametags = local._nametags ?? [];
4593
4593
  const remoteNametags = remote._nametags ?? [];
4594
4594
  const mergedNametags = mergeNametagsByName(localNametags, remoteNametags);
4595
+ const localHistory = local._history ?? [];
4596
+ const remoteHistory = remote._history ?? [];
4597
+ const mergedHistory = mergeArrayById(localHistory, remoteHistory, "dedupKey");
4595
4598
  const merged = {
4596
4599
  _meta: mergedMeta,
4597
4600
  _tombstones: mergedTombstones.length > 0 ? mergedTombstones : void 0,
@@ -4599,6 +4602,7 @@ function mergeTxfData(local, remote) {
4599
4602
  _outbox: mergedOutbox.length > 0 ? mergedOutbox : void 0,
4600
4603
  _sent: mergedSent.length > 0 ? mergedSent : void 0,
4601
4604
  _invalid: mergedInvalid.length > 0 ? mergedInvalid : void 0,
4605
+ _history: mergedHistory.length > 0 ? mergedHistory : void 0,
4602
4606
  ...mergedTokens
4603
4607
  };
4604
4608
  return { merged, added, removed, conflicts };
@@ -4625,7 +4629,8 @@ function getTokenKeys(data) {
4625
4629
  "_nametags",
4626
4630
  "_mintOutbox",
4627
4631
  "_invalidatedNametags",
4628
- "_integrity"
4632
+ "_integrity",
4633
+ "_history"
4629
4634
  ]);
4630
4635
  const keys = /* @__PURE__ */ new Set();
4631
4636
  for (const key of Object.keys(data)) {