Use consistent initialization in DataView

ChainSafe · Jan 17, 2022 · 41b27c4 · 41b27c4
1 parent a579ae3
commit 41b27c4
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/packages/ssz/src/type/abstract.ts b/packages/ssz/src/type/abstract.ts
@@ -109,15 +109,15 @@ export abstract class Type<V> {
   // Un-performant path but useful for testing and prototyping
   value_toTree(value: V): Node {
     const uint8Array = new Uint8Array(this.value_serializedSize(value));
-    const dataView = new DataView(uint8Array.buffer);
+    const dataView = new DataView(uint8Array.buffer, uint8Array.byteOffset, uint8Array.byteLength);
     this.value_serializeToBytes({uint8Array, dataView}, 0, value);
     return this.tree_deserializeFromBytes({uint8Array, dataView}, 0, uint8Array.length);
   }
 
   // Un-performant path but useful for testing and prototyping
   tree_toValue(node: Node): V {
     const uint8Array = new Uint8Array(this.tree_serializedSize(node));
-    const dataView = new DataView(uint8Array.buffer);
+    const dataView = new DataView(uint8Array.buffer, uint8Array.byteOffset, uint8Array.byteLength);
     this.tree_serializeToBytes({uint8Array, dataView}, 0, node);
     return this.value_deserializeFromBytes({uint8Array, dataView}, 0, uint8Array.length);
   }
@@ -126,13 +126,13 @@ export abstract class Type<V> {
 
   serialize(value: V): Uint8Array {
     const uint8Array = new Uint8Array(this.value_serializedSize(value));
-    const dataView = new DataView(uint8Array.buffer);
+    const dataView = new DataView(uint8Array.buffer, uint8Array.byteOffset, uint8Array.byteLength);
     this.value_serializeToBytes({uint8Array, dataView}, 0, value);
     return uint8Array;
   }
 
   deserialize(uint8Array: Uint8Array): V {
-    const dataView = new DataView(uint8Array.buffer);
+    const dataView = new DataView(uint8Array.buffer, uint8Array.byteOffset, uint8Array.byteLength);
     return this.value_deserializeFromBytes({uint8Array, dataView}, 0, uint8Array.length);
   }
 
@@ -167,7 +167,7 @@ export abstract class BasicType<V> extends Type<V> {
 
   hashTreeRoot(value: V): Uint8Array {
     const uint8Array = new Uint8Array(32);
-    const dataView = new DataView(uint8Array.buffer);
+    const dataView = new DataView(uint8Array.buffer, uint8Array.byteOffset, uint8Array.byteLength);
     this.value_serializeToBytes({uint8Array, dataView}, 0, value);
     return uint8Array;
   }

diff --git a/packages/ssz/src/type/bitList.ts b/packages/ssz/src/type/bitList.ts
@@ -134,7 +134,7 @@ export class BitListType extends CompositeType<BitArray, BitArrayTreeView, BitAr
   fromJson(json: unknown): BitArray {
     // TODO: Validate
     const uint8Array = fromHexString(json as string);
-    const dataView = new DataView(uint8Array.buffer);
+    const dataView = new DataView(uint8Array.buffer, uint8Array.byteOffset, uint8Array.byteLength);
     return this.value_deserializeFromBytes({uint8Array, dataView}, 0, uint8Array.length);
   }
 

diff --git a/packages/ssz/src/type/bitVector.ts b/packages/ssz/src/type/bitVector.ts
@@ -86,7 +86,7 @@ export class BitVectorType extends CompositeType<BitArray, BitArrayTreeView, Bit
 
   commitViewDU(view: BitArray): Node {
     const uint8Array = new Uint8Array(this.fixedSize);
-    const dataView = new DataView(uint8Array.buffer);
+    const dataView = new DataView(uint8Array.buffer, uint8Array.byteOffset, uint8Array.byteLength);
     this.value_serializeToBytes({uint8Array, dataView}, 0, view);
     return this.tree_deserializeFromBytes({uint8Array, dataView}, 0, this.fixedSize);
   }
@@ -141,7 +141,7 @@ export class BitVectorType extends CompositeType<BitArray, BitArrayTreeView, Bit
   fromJson(json: unknown): BitArray {
     // TODO: Validate
     const uint8Array = fromHexString(json as string);
-    const dataView = new DataView(uint8Array.buffer);
+    const dataView = new DataView(uint8Array.buffer, uint8Array.byteOffset, uint8Array.byteLength);
     return this.value_deserializeFromBytes({uint8Array, dataView}, 0, this.fixedSize);
   }
 

diff --git a/packages/ssz/src/type/byteList.ts b/packages/ssz/src/type/byteList.ts
@@ -53,7 +53,7 @@ export class ByteListType extends CompositeType<ByteList, ByteList, ByteList> {
 
   commitViewDU(view: Uint8Array): Node {
     const uint8Array = new Uint8Array(this.value_serializedSize(view));
-    const dataView = new DataView(uint8Array.buffer);
+    const dataView = new DataView(uint8Array.buffer, uint8Array.byteOffset, uint8Array.byteLength);
     this.value_serializeToBytes({uint8Array, dataView}, 0, view);
     return this.tree_deserializeFromBytes({uint8Array, dataView}, 0, uint8Array.length);
   }

diff --git a/packages/ssz/src/type/byteVector.ts b/packages/ssz/src/type/byteVector.ts
@@ -53,7 +53,7 @@ export class ByteVectorType extends CompositeType<ByteVector, ByteVector, ByteVe
 
   commitViewDU(view: Uint8Array): Node {
     const uint8Array = new Uint8Array(this.fixedSize);
-    const dataView = new DataView(uint8Array.buffer);
+    const dataView = new DataView(uint8Array.buffer, uint8Array.byteOffset, uint8Array.byteLength);
     this.value_serializeToBytes({uint8Array, dataView}, 0, view);
     return this.tree_deserializeFromBytes({uint8Array, dataView}, 0, this.fixedSize);
   }

diff --git a/packages/ssz/src/type/containerNodeStruct.ts b/packages/ssz/src/type/containerNodeStruct.ts
@@ -42,7 +42,7 @@ export class ContainerNodeStructType<Fields extends Record<string, Type<unknown>
   // TODO: Optimize conversion
   private valueToTree(value: ValueOfFields<Fields>): Node {
     const uint8Array = new Uint8Array(this.value_serializedSize(value));
-    const dataView = new DataView(uint8Array.buffer);
+    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);
   }