move ensureIfUint8Array to web3-validator

Author: Muhammad-Altabba

packages/web3-utils/src/converters.ts

@@ -42,7 +42,7 @@ import {
 	InvalidNumberError,
 	InvalidUnitError,
 } from 'web3-errors';
-import { ensureIfUint8Array, isUint8Array } from './uint8array.js';
+import { isUint8Array } from './uint8array.js';
 
 // Ref: https://ethdocs.org/en/latest/ether.html
 // Note: this could be simplified using ** operator, but babel does not handle it well (https://github.com/babel/babel/issues/13109)
@@ -596,7 +596,7 @@ export const toChecksumAddress = (address: Address): string => {
 	// calling `Uint8Array.from` because `noble-hashes` checks with `instanceof Uint8Array` that fails in some edge cases:
 	// 	https://github.com/paulmillr/noble-hashes/issues/25#issuecomment-1750106284
 	const hash = utils.uint8ArrayToHexString(
-		keccak256(ensureIfUint8Array(utf8ToBytes(lowerCaseAddress))),
+		keccak256(validatorUtils.ensureIfUint8Array(utf8ToBytes(lowerCaseAddress))),
 	);
 
 	if (

packages/web3-utils/src/hash.ts

@@ -59,7 +59,7 @@ import {
 	TypedObject,
 	TypedObjectAbbreviated,
 } from 'web3-types';
-import { isAddress, isNullish, isHexStrict } from 'web3-validator';
+import { utils as validatorUtils, isAddress, isNullish, isHexStrict } from 'web3-validator';
 import {
 	bytesToUint8Array,
 	bytesToHex,
@@ -71,7 +71,6 @@ import {
 } from './converters.js';
 import { leftPad, rightPad, toTwosComplement } from './string_manipulation.js';
 
-
 const SHA3_EMPTY_BYTES = '0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470';
 
 /**
@@ -100,7 +99,7 @@ export const sha3 = (data: Bytes): string | undefined => {
 	} else {
 		updatedData = data;
 	}
-	const hash = bytesToHex(keccak256(updatedData));
+	const hash = bytesToHex(keccak256(validatorUtils.ensureIfUint8Array(updatedData)));
 
 	// EIP-1052 if hash is equal to c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470, keccak was given empty data
 	return hash === SHA3_EMPTY_BYTES ? undefined : hash;
@@ -159,7 +158,7 @@ export const keccak256Wrapper = (
 	} else {
 		processedData = bytesToUint8Array(data as Bytes);
 	}
-	return bytesToHex(keccak256(processedData));
+	return bytesToHex(keccak256(validatorUtils.ensureIfUint8Array(processedData)));
 };
 
 export { keccak256Wrapper as keccak256 };

packages/web3-utils/src/uint8array.ts

@@ -22,17 +22,6 @@ export function isUint8Array(data: unknown | Uint8Array): data is Uint8Array {
 	);
 }
 
-// @TODO: Remove this function and its usages once all sub dependencies uses version 1.3.3 or above of @noble/hashes
-export function ensureIfUint8Array<T = any>(data: T) {
-	if (
-		!(data instanceof Uint8Array) &&
-		(data as { constructor: { name: string } })?.constructor?.name === 'Uint8Array'
-	) {
-		return Uint8Array.from(data as unknown as Uint8Array);
-	}
-	return data;
-}
-
 export function uint8ArrayConcat(...parts: Uint8Array[]): Uint8Array {
 	const length = parts.reduce((prev, part) => {
 		const agg = prev + part.length;

packages/web3-validator/src/utils.ts

@@ -495,3 +495,14 @@ export function hexToUint8Array(hex: string): Uint8Array {
 	}
 	return bytes
 }
+
+// @TODO: Remove this function and its usages once all sub dependencies uses version 1.3.3 or above of @noble/hashes
+export function ensureIfUint8Array<T = any>(data: T) {
+	if (
+		!(data instanceof Uint8Array) &&
+		(data as { constructor: { name: string } })?.constructor?.name === 'Uint8Array'
+	) {
+		return Uint8Array.from(data as unknown as Uint8Array);
+	}
+	return data;
+}

packages/web3-validator/src/validation/address.ts

@@ -18,7 +18,7 @@ along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 import { keccak256 } from 'ethereum-cryptography/keccak.js';
 import { utf8ToBytes } from 'ethereum-cryptography/utils.js';
 import { ValidInputTypes } from '../types.js';
-import { uint8ArrayToHexString } from '../utils.js';
+import { ensureIfUint8Array, uint8ArrayToHexString } from '../utils.js';
 import { isHexStrict } from './string.js';
 import { isUint8Array } from './bytes.js';
 
@@ -30,7 +30,7 @@ export const checkAddressCheckSum = (data: string): boolean => {
 	const address = data.slice(2);
 	const updatedData = utf8ToBytes(address.toLowerCase());
 
-	const addressHash = uint8ArrayToHexString(keccak256(updatedData)).slice(2);
+	const addressHash = uint8ArrayToHexString(keccak256(ensureIfUint8Array(updatedData))).slice(2);
 
 	for (let i = 0; i < 40; i += 1) {
 		// the nth letter should be uppercase if the nth digit of casemap is 1