Fix an issue with detecting Uint8Array

CHANGELOG.md

@@ -2287,7 +2287,7 @@ If there are any bugs, improvements, optimizations or any new feature proposal f
 
 #### web3-utils
 
--   Fix unecessary array copy when pack encoding (#6553)
+-   Fix unnecessary array copy when pack encoding (#6553)
 
 ## [Unreleased]
 
@@ -2322,4 +2322,4 @@ If there are any bugs, improvements, optimizations or any new feature proposal f
 
 #### web3-utils
 
--   Fix unecessary array copy when pack encoding (#6553)
+-   Fix unnecessary array copy when pack encoding (#6553)

packages/web3-eth-abi/CHANGELOG.md

@@ -159,3 +159,7 @@ Documentation:
 ### Changed
 
 -   Use `AbiError` instead of `Error` for errors at web3-eth-abi (#6641).
+
+### Fixed
+
+-   Fixed an issue with detecting Uint8Array (#6486)

packages/web3-eth-abi/src/utils.ts

@@ -16,7 +16,7 @@
 */
 
 import { AbiError } from 'web3-errors';
-import { isNullish, leftPad, rightPad, toHex } from 'web3-utils';
+import { isNullish, isUint8Array, leftPad, rightPad, toHex } from 'web3-utils';
 import {
 	AbiInput,
 	AbiCoderStruct,
@@ -189,7 +189,7 @@
 	// Format correct length for bytes[0-9]+
 	match = paramTypeBytes.exec(type);
 	if (match) {
-		const hexParam = param instanceof Uint8Array ? toHex(param) : param;
+		const hexParam = isUint8Array(param) ? toHex(param) : param;
 
 		// format to correct length
 		const size = parseInt(match[1], 10);

packages/web3-eth-accounts/CHANGELOG.md

@@ -154,3 +154,4 @@ Documentation:
 ### Fixed
 
 -   Send Transaction config used to be ignored if the passed `common` did not have a `copy()` and the `chainId` was not provided (#6663)
+-   Fixed an issue with detecting Uint8Array (#6486)

packages/web3-eth-accounts/src/account.ts

@@ -76,6 +76,7 @@ import {
 	bytesToHex,
 	fromUtf8,
 	hexToBytes,
+	isUint8Array,
 	numberToHex,
 	randomBytes,
 	sha3Raw,
@@ -126,7 +127,7 @@ export const parseAndValidatePrivateKey = (data: Bytes, ignoreLength?: boolean):
 	}
 
 	try {
-		privateKeyUint8Array = data instanceof Uint8Array ? data : bytesToUint8Array(data);
+		privateKeyUint8Array = isUint8Array(data) ? (data ) : bytesToUint8Array(data);
 	} catch {
 		throw new InvalidPrivateKeyError();
 	}
@@ -406,7 +407,7 @@ export const recover = (
 	const V_INDEX = 130; // r = first 32 bytes, s = second 32 bytes, v = last byte of signature
 	const hashedMessage = prefixedOrR ? data : hashMessage(data);
 
-	let v = parseInt(signatureOrV.substring(V_INDEX),16); // 0x + r + s + v
+	let v = parseInt(signatureOrV.substring(V_INDEX), 16); // 0x + r + s + v
 	if (v > 26) {
 		v -= 27;
 	}
@@ -421,7 +422,7 @@ export const recover = (
 	const address = toChecksumAddress(`0x${publicHash.slice(-40)}`);
 
 	return address;
-};
+};;
 
 /**
  * Get the ethereum Address from a private key
@@ -456,7 +457,7 @@ export const privateKeyToAddress = (privateKey: Bytes): string => {
  * Get the public key from a private key
  *
  * @param privateKey - String or Uint8Array of 32 bytes
- * @param isCompressed - if true, will generate a 33 byte compressed public key instead of a 65 byte public key 
+ * @param isCompressed - if true, will generate a 33 byte compressed public key instead of a 65 byte public key
  * @returns The public key
  * @example
  * ```ts
@@ -465,7 +466,7 @@ export const privateKeyToAddress = (privateKey: Bytes): string => {
  * > "0x42beb65f179720abaa3ec9a70a539629cbbc5ec65bb57e7fc78977796837e537662dd17042e6449dc843c281067a4d6d8d1a1775a13c41901670d5de7ee6503a" // uncompressed public key
  * ```
  */
- export const privateKeyToPublicKey = (privateKey: Bytes, isCompressed: boolean): string => {
+export const privateKeyToPublicKey = (privateKey: Bytes, isCompressed: boolean): string => {
 	const privateKeyUint8Array = parseAndValidatePrivateKey(privateKey);
 
 	// Get public key from private key in compressed format
@@ -562,7 +563,7 @@ export const encrypt = async (
 		salt = randomBytes(32);
 	}
 
-	if (!(isString(password) || password instanceof Uint8Array)) {
+	if (!(isString(password) || isUint8Array(password))) {
 		throw new InvalidPasswordError();
 	}
 

packages/web3-eth-accounts/src/common/utils.ts

@@ -15,7 +15,7 @@
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
 import { isHexPrefixed, isHexString } from 'web3-validator';
-import { bytesToHex, hexToBytes, numberToHex } from 'web3-utils';
+import { bytesToHex, hexToBytes, isUint8Array, numberToHex } from 'web3-utils';
 import { secp256k1 } from '../tx/constants.js';
 import { Hardfork } from './enums.js';
 import { ToBytesInputTypes, TypeOutput, TypeOutputReturnType } from './types.js';
@@ -331,6 +331,10 @@
 		return v;
 	}
 
+	if (v?.constructor?.name === 'Uint8Array') {
+		return Uint8Array.from(v as unknown as Uint8Array);
+	}
+
 	if (Array.isArray(v)) {
 		return Uint8Array.from(v);
 	}
@@ -420,7 +424,7 @@
  * @param {Uint8Array} input value to check
  */
 export function assertIsUint8Array(input: unknown): asserts input is Uint8Array {
-	if (!(input instanceof Uint8Array)) {
+	if (!isUint8Array(input)) {
 		// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 		const msg = `This method only supports Uint8Array but input was: ${input}`;
 		throw new Error(msg);

packages/web3-eth-accounts/src/tx/transactionFactory.ts

@@ -14,7 +14,9 @@ GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License
 along with web3.js.  If not, see <http://www.gnu.org/licenses/>.
 */
+
 import { Numbers } from 'web3-types';
+import { isUint8Array } from 'web3-utils';
 import { toUint8Array, uint8ArrayToBigInt } from '../common/utils.js';
 import { FeeMarketEIP1559Transaction } from './eip1559Transaction.js';
 import { AccessListEIP2930Transaction } from './eip2930Transaction.js';
@@ -134,8 +136,8 @@ export class TransactionFactory {
 	 * @param txOptions - The transaction options
 	 */
 	public static fromBlockBodyData(data: Uint8Array | Uint8Array[], txOptions: TxOptions = {}) {
-		if (data instanceof Uint8Array) {
-			return this.fromSerializedData(data, txOptions);
+		if (isUint8Array(data)) {
+			return this.fromSerializedData(data , txOptions);
 		}
 		if (Array.isArray(data)) {
 			// It is a legacy transaction