cleanup

OpenZeppelin · Nov 2, 2024 · 151be1d · 151be1d
1 parent c25898f
commit 151be1d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/bytes.ts b/src/bytes.ts
@@ -14,10 +14,10 @@ function toBytes(value: BytesLike): Bytes {
   }
 }
 
-function toHex(value: BytesLike): string {
+function toHex(value: BytesLike): HexString {
   if (typeof value === 'string') {
     hexToBytes(value); // assert hex string
-    return value;
+    return value.replace(/^(0x)?/, '0x');
   } else if (value instanceof Uint8Array) {
     return '0x' + bytesToHex(value);
   } else {

diff --git a/src/core.ts b/src/core.ts
@@ -145,7 +145,7 @@ export function isValidMerkleTree(tree: BytesLike[], nodeHash: NodeHash = standa
   return tree.length > 0;
 }
 
-export function renderMerkleTree(tree: BytesLike[]): string {
+export function renderMerkleTree(tree: BytesLike[]): HexString {
   validateArgument(tree.length !== 0, 'Expected non-zero number of nodes');
 
   const stack: [number, number[]][] = [[0, []]];

diff --git a/src/hashes.ts b/src/hashes.ts
@@ -1,5 +1,5 @@
 import { encode } from '@metamask/abi-utils';
-import { keccak256 as _keccak256 } from 'ethereum-cryptography/keccak.js';
+import { keccak256 as _keccak256 } from 'ethereum-cryptography/keccak';
 import { BytesLike, HexString, toHex, toBytes, concat, compare } from './bytes';
 
 export type LeafHash<T> = (leaf: T) => HexString;