@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.
@@ -4640,6 +4640,9 @@ function mergeTxfData(local, remote) {
4640
4640
  const localNametags = local._nametags ?? [];
4641
4641
  const remoteNametags = remote._nametags ?? [];
4642
4642
  const mergedNametags = mergeNametagsByName(localNametags, remoteNametags);
4643
+ const localHistory = local._history ?? [];
4644
+ const remoteHistory = remote._history ?? [];
4645
+ const mergedHistory = mergeArrayById(localHistory, remoteHistory, "dedupKey");
4643
4646
  const merged = {
4644
4647
  _meta: mergedMeta,
4645
4648
  _tombstones: mergedTombstones.length > 0 ? mergedTombstones : void 0,
@@ -4647,6 +4650,7 @@ function mergeTxfData(local, remote) {
4647
4650
  _outbox: mergedOutbox.length > 0 ? mergedOutbox : void 0,
4648
4651
  _sent: mergedSent.length > 0 ? mergedSent : void 0,
4649
4652
  _invalid: mergedInvalid.length > 0 ? mergedInvalid : void 0,
4653
+ _history: mergedHistory.length > 0 ? mergedHistory : void 0,
4650
4654
  ...mergedTokens
4651
4655
  };
4652
4656
  return { merged, added, removed, conflicts };
@@ -4673,7 +4677,8 @@ function getTokenKeys(data) {
4673
4677
  "_nametags",
4674
4678
  "_mintOutbox",
4675
4679
  "_invalidatedNametags",
4676
- "_integrity"
4680
+ "_integrity",
4681
+ "_history"
4677
4682
  ]);
4678
4683
  const keys = /* @__PURE__ */ new Set();
4679
4684
  for (const key of Object.keys(data)) {