fix: more StableContainer tests

ChainSafe · Sep 22, 2024 · 624f6b4 · 624f6b4
1 parent ded7143
commit 624f6b4
Show file tree

Hide file tree

Showing 3 changed files with 618 additions and 2 deletions.
diff --git a/packages/ssz/src/type/stableContainer.ts b/packages/ssz/src/type/stableContainer.ts
@@ -651,7 +651,7 @@ function readVariableOffsets(
   // the offset indices so we can more easily deserialize the fields in once pass first we get the fixed sizes
   // Note: `fixedSizes[i] = null` if that field has variable length
 
-  const size = end - activeFieldsEnd;
+  const size = end - start;
   const activeFieldsByteLen = activeFieldsEnd - start;
 
   // with the fixed sizes, we can read the offsets, and store for our single pass

diff --git a/packages/ssz/src/viewDU/stableContainer.ts b/packages/ssz/src/viewDU/stableContainer.ts
@@ -1,4 +1,4 @@
-import {getNodeAtDepth, LeafNode, Node, zeroNode} from "@chainsafe/persistent-merkle-tree";
+import {getNodeAtDepth, LeafNode, Node, zeroNode, HashComputationLevel} from "@chainsafe/persistent-merkle-tree";
 import {ByteViews, Type} from "../type/abstract";
 import {BasicType, isBasicType} from "../type/basic";
 import {CompositeType, isCompositeType} from "../type/composite";
@@ -66,6 +66,14 @@ class StableContainerTreeViewDU<Fields extends Record<string, Type<unknown>>> ex
     return {...result, activeFields: this.activeFields};
   }
 
+  commit(hcOffset = 0, hcByLevel: HashComputationLevel[] | null = null): void {
+    super.commit(hcOffset, hcByLevel);
+    this._rootNode = this.type.tree_setActiveFields(this._rootNode, this.activeFields);
+    if (hcByLevel !== null) {
+      hcByLevel[hcOffset].push(this._rootNode.left, this._rootNode.right, this._rootNode);
+    }
+  }
+
   /**
    * Same method to `type/container.ts` that call ViewDU.serializeToBytes() of internal fields.
    */