From 06127ee525189d8687f566e0e86adc6c6d805776 Mon Sep 17 00:00:00 2001
From: Adam <f7f376a1fcd0d0e11a10ed1b6577c9@users.noreply.github.com>
Date: Sun, 16 Jun 2024 08:12:19 +0100
Subject: [PATCH] fix: #2 AdditionalData field now sorted into arrays

---
 dag/leaves.go | 40 ++++++++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/dag/leaves.go b/dag/leaves.go
index b10da20..19a8c30 100644
--- a/dag/leaves.go
+++ b/dag/leaves.go
@@ -109,14 +109,14 @@ func (b *DagLeafBuilder) BuildLeaf(additionalData map[string]string) (*DagLeaf,
 		MerkleRoot       []byte
 		CurrentLinkCount int
 		ContentHash      []byte
-		AdditionalData   map[string]string
+		AdditionalData   []keyValue
 	}{
 		ItemName:         b.ItemName,
 		Type:             b.LeafType,
 		MerkleRoot:       merkleRoot,
 		CurrentLinkCount: len(b.Links),
 		ContentHash:      nil,
-		AdditionalData:   additionalData,
+		AdditionalData:   sortMapForVerification(additionalData),
 	}
 
 	if b.Data != nil {
@@ -190,7 +190,7 @@ func (b *DagLeafBuilder) BuildRootLeaf(dag *DagBuilder, additionalData map[strin
 		LatestLabel      string
 		LeafCount        int
 		ContentHash      []byte
-		AdditionalData   map[string]string
+		AdditionalData   []keyValue
 	}{
 		ItemName:         b.ItemName,
 		Type:             b.LeafType,
@@ -199,7 +199,7 @@ func (b *DagLeafBuilder) BuildRootLeaf(dag *DagBuilder, additionalData map[strin
 		LatestLabel:      latestLabel,
 		LeafCount:        len(dag.Leafs),
 		ContentHash:      nil,
-		AdditionalData:   additionalData,
+		AdditionalData:   sortMapForVerification(additionalData),
 	}
 
 	if b.Data != nil {
@@ -293,14 +293,14 @@ func (leaf *DagLeaf) VerifyLeaf() error {
 		MerkleRoot       []byte
 		CurrentLinkCount int
 		ContentHash      []byte
-		AdditionalData   map[string]string
+		AdditionalData   []keyValue
 	}{
 		ItemName:         leaf.ItemName,
 		Type:             leaf.Type,
 		MerkleRoot:       leaf.ClassicMerkleRoot,
 		CurrentLinkCount: leaf.CurrentLinkCount,
 		ContentHash:      leaf.ContentHash,
-		AdditionalData:   additionalData,
+		AdditionalData:   sortMapForVerification(additionalData),
 	}
 
 	serializedLeafData, err := cbor.Marshal(leafData)
@@ -363,7 +363,7 @@ func (leaf *DagLeaf) VerifyRootLeaf() error {
 		LatestLabel      string
 		LeafCount        int
 		ContentHash      []byte
-		AdditionalData   map[string]string
+		AdditionalData   []keyValue
 	}{
 		ItemName:         leaf.ItemName,
 		Type:             leaf.Type,
@@ -372,7 +372,7 @@ func (leaf *DagLeaf) VerifyRootLeaf() error {
 		LatestLabel:      leaf.LatestLabel,
 		LeafCount:        leaf.LeafCount,
 		ContentHash:      leaf.ContentHash,
-		AdditionalData:   additionalData,
+		AdditionalData:   sortMapForVerification(additionalData),
 	}
 
 	serializedLeafData, err := cbor.Marshal(leafData)
@@ -572,3 +572,27 @@ func sortMapByKeys(inputMap map[string]string) map[string]string {
 
 	return sortedMap
 }
+
+type keyValue struct {
+	Key   string
+	Value string
+}
+
+func sortMapForVerification(inputMap map[string]string) []keyValue {
+	if inputMap == nil {
+		return nil
+	}
+
+	keys := make([]string, 0, len(inputMap))
+	for key := range inputMap {
+		keys = append(keys, key)
+	}
+	sort.Strings(keys)
+
+	sortedPairs := make([]keyValue, 0, len(keys))
+	for _, key := range keys {
+		sortedPairs = append(sortedPairs, keyValue{Key: key, Value: inputMap[key]})
+	}
+
+	return sortedPairs
+}