feat: optimize ContainerNodeStruct.valueToTree()

ChainSafe · Jun 10, 2024 · 5dd3f23 · 5dd3f23
1 parent 8d5fcf9
commit 5dd3f23
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 9 deletions.
diff --git a/packages/ssz/src/type/byteArray.ts b/packages/ssz/src/type/byteArray.ts
@@ -37,7 +37,7 @@ export abstract class ByteArrayType extends CompositeType<ByteArray, ByteArray,
     return this.commitViewDU(view);
   }
 
-  // TODO: batch
+  // TODO - batch
   commitViewDU(view: ByteArray, hashComps: HashComputationGroup | null = null): Node {
     const uint8Array = new Uint8Array(this.value_serializedSize(view));
     const dataView = new DataView(uint8Array.buffer, uint8Array.byteOffset, uint8Array.byteLength);
@@ -70,6 +70,12 @@ export abstract class ByteArrayType extends CompositeType<ByteArray, ByteArray,
     return Uint8Array.prototype.slice.call(data.uint8Array, start, end);
   }
 
+  value_toTree(value: ByteArray): Node {
+    // this saves 1 allocation of Uint8Array
+    const dataView = new DataView(value.buffer, value.byteOffset, value.byteLength);
+    return this.tree_deserializeFromBytes({uint8Array: value, dataView}, 0, value.length);
+  }
+
   // Merkleization
 
   protected getRoots(value: ByteArray): Uint8Array[] {

diff --git a/packages/ssz/src/type/containerNodeStruct.ts b/packages/ssz/src/type/containerNodeStruct.ts
@@ -1,4 +1,4 @@
-import {Node} from "@chainsafe/persistent-merkle-tree";
+import {Node, subtreeFillToContents} from "@chainsafe/persistent-merkle-tree";
 import {Type, ByteViews} from "./abstract";
 import {isCompositeType} from "./composite";
 import {ContainerType, ContainerOptions, renderContainerTypeName} from "./container";
@@ -106,11 +106,9 @@ export class ContainerNodeStructType<Fields extends Record<string, Type<unknown>
     return new BranchNodeStruct(this.valueToTree.bind(this), value);
   }
 
-  // TODO: Optimize conversion
   private valueToTree(value: ValueOfFields<Fields>): Node {
-    const uint8Array = new Uint8Array(this.value_serializedSize(value));
-    const dataView = new DataView(uint8Array.buffer, uint8Array.byteOffset, uint8Array.byteLength);
-    this.value_serializeToBytes({uint8Array, dataView}, 0, value);
-    return super.tree_deserializeFromBytes({uint8Array, dataView}, 0, uint8Array.length);
+    // TODO - batch get hash computations while creating tree
+    const nodes = this.fieldsEntries.map(({fieldName, fieldType}) => fieldType.value_toTree(value[fieldName]));
+    return subtreeFillToContents(nodes, this.depth);
   }
 }
diff --git a/packages/ssz/src/type/optional.ts b/packages/ssz/src/type/optional.ts
@@ -75,7 +75,7 @@ export class OptionalType<ElementType extends Type<unknown>> extends CompositeTy
   }
 
   // TODO add an OptionalViewDU
-  // TODO: batch
+  // TODO - batch
   commitViewDU(view: ValueOfType<ElementType>, hashComps: HashComputationGroup | null = null): Node {
     return this.value_toTree(view);
   }

diff --git a/packages/ssz/src/type/uint.ts b/packages/ssz/src/type/uint.ts
@@ -133,6 +133,12 @@ export class UintNumberType extends BasicType<number> {
     }
   }
 
+  value_toTree(value: number): Node {
+    const node = LeafNode.fromZero();
+    node.setUint(this.byteLength, 0, value, this.clipInfinity);
+    return node;
+  }
+
   tree_serializeToBytes(output: ByteViews, offset: number, node: Node): number {
     const value = (node as LeafNode).getUint(this.byteLength, 0, this.clipInfinity);
     this.value_serializeToBytes(output, offset, value);

diff --git a/packages/ssz/src/type/union.ts b/packages/ssz/src/type/union.ts
@@ -106,7 +106,7 @@ export class UnionType<Types extends Type<unknown>[]> extends CompositeType<
     return this.value_toTree(view);
   }
 
-  // TODO: batch
+  // TODO - batch
   commitViewDU(view: ValueOfTypes<Types>, hashComps: HashComputationGroup | null = null): Node {
     return this.value_toTree(view);
   }