From b7107989d3745d95b1188dcb042587183415ab1a Mon Sep 17 00:00:00 2001
From: Derrick Hammer <derrick@derrickhammer.com>
Date: Tue, 9 Jan 2024 15:50:14 -0500
Subject: [PATCH] fix: rewrite StorageLocationMap DecodeMsgpack as it only
 works with a temporary map

---
 storage/storage.go | 38 ++++++++++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/storage/storage.go b/storage/storage.go
index 07eb4e3..c31d8db 100644
--- a/storage/storage.go
+++ b/storage/storage.go
@@ -127,21 +127,37 @@ func (ssl *SignedStorageLocationImpl) Location() interfaces.StorageLocation {
 }
 
 func (s *StorageLocationMap) DecodeMsgpack(dec *msgpack.Decoder) error {
-	temp, err := dec.DecodeUntypedMap()
-	if err != nil {
-		return err
-	}
-
 	if *s == nil {
-		*s = make(map[int]NodeStorage)
+		*s = make(StorageLocationMap)
 	}
 
-	tempMap, ok := interface{}(temp).(StorageLocationMap)
-	if !ok {
-		return fmt.Errorf("unexpected data format from msgpack decoding")
+	// Decode directly into a temp map
+	temp := make(map[int]map[string]map[int]interface{})
+	err := dec.Decode(&temp)
+	if err != nil {
+		return fmt.Errorf("error decoding msgpack: %w", err)
 	}
 
-	*s = tempMap
+	// Convert temp map to StorageLocationMap
+	for k, v := range temp {
+		nodeStorage, exists := (*s)[k]
+		if !exists {
+			nodeStorage = make(NodeStorage, len(v)) // preallocate if size is known
+			(*s)[k] = nodeStorage
+		}
+
+		for nk, nv := range v {
+			nodeDetailsStorage, exists := nodeStorage[nk]
+			if !exists {
+				nodeDetailsStorage = make(NodeDetailsStorage, len(nv)) // preallocate if size is known
+				nodeStorage[nk] = nodeDetailsStorage
+			}
+
+			for ndk, ndv := range nv {
+				nodeDetailsStorage[ndk] = ndv
+			}
+		}
+	}
 
 	return nil
 }
@@ -225,7 +241,9 @@ func (s *StorageLocationProviderImpl) Start() error {
 				break
 			}
 
+			//s.node.Logger().Debug("New URIs", zap.Any("uris", newUris), zap.Any("availableNodes", s.availableNodes), zap.Any("timeout", s.timeout), zap.Any("isTimedOut", s.isTimedOut), zap.Any("isWaitingForUri", s.isWaitingForUri), zap.Any("requestSent", requestSent))
 			if len(s.availableNodes) == 0 && len(newUris) < 2 && !requestSent {
+				s.node.Logger().Debug("Sending hash request")
 				err := s.node.Services().P2P().SendHashRequest(s.hash, s.types)
 				if err != nil {
 					s.node.Logger().Error("Error sending hash request", zap.Error(err))