Fix Map and List fromBytes methods

casper-ecosystem · Dec 18, 2024 · 5dcd2d9 · 5dcd2d9
1 parent 782838c
commit 5dcd2d9
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 13 deletions.
diff --git a/src/types/StoredValue.test.ts b/src/types/StoredValue.test.ts
diff --git a/src/types/clvalue/List.ts b/src/types/clvalue/List.ts
@@ -130,7 +130,10 @@ export class CLValueList {
    * @param elements - Optional array of CLValues to initialize the list with.
    * @returns A new CLValue instance containing CLTypeList and a CLValueList.
    */
-  public static newCLList(elementType: CLType, elements: CLValue[] = []): CLValue {
+  public static newCLList(
+    elementType: CLType,
+    elements: CLValue[] = []
+  ): CLValue {
     const listType = new CLTypeList(elementType);
     const clValue = new CLValue(listType);
     clValue.list = new CLValueList(listType, elements);
@@ -154,13 +157,15 @@ export class CLValueList {
     const elements: CLValue[] = [];
 
     for (let i = 0; i < size; i++) {
-      const {
-        result: inner,
-        bytes: innerBytes
-      } = CLValueParser.fromBytesByType(remainder, clType.elementsType);
-
-      elements.push(inner);
-      remainder = innerBytes;
+      if (remainder.length) {
+        const {
+          result: inner,
+          bytes: innerBytes
+        } = CLValueParser.fromBytesByType(remainder, clType.elementsType);
+
+        elements.push(inner);
+        remainder = innerBytes;
+      }
     }
 
     if (elements.length === 0) {

diff --git a/src/types/clvalue/Map.ts b/src/types/clvalue/Map.ts
@@ -183,14 +183,17 @@ export class CLValueMap {
     }
 
     for (let i = 0; i < size; i++) {
-      const keyVal = CLValueParser.fromBytesByType(remainder, mapType.key);
-      remainder = keyVal?.bytes;
+      if (remainder.length) {
+        const keyVal = CLValueParser.fromBytesByType(remainder, mapType.key);
 
-      const valVal = CLValueParser.fromBytesByType(u32.bytes(), mapType.val);
+        remainder = keyVal?.bytes;
 
-      remainder = valVal.bytes;
+        const valVal = CLValueParser.fromBytesByType(u32.bytes(), mapType.val);
 
-      mapResult.append(keyVal?.result, valVal?.result);
+        remainder = valVal.bytes;
+
+        mapResult.append(keyVal?.result, valVal?.result);
+      }
     }
 
     return { result: mapResult, bytes: remainder };