prevent throwing if value is null when checking value.constructor.name

web3 · Oct 6, 2023 · 5f195bb · 5f195bb
1 parent 1eed66d
commit 5f195bb
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/packages/web3-eth-accounts/src/account.ts b/packages/web3-eth-accounts/src/account.ts
@@ -83,7 +83,7 @@ export const parseAndValidatePrivateKey = (data: Bytes, ignoreLength?: boolean):
 
 	try {
 		privateKeyUint8Array =
-			data instanceof Uint8Array || data.constructor.name === 'Uint8Array'
+			data instanceof Uint8Array || data?.constructor?.name === 'Uint8Array'
 				? (data as Uint8Array)
 				: bytesToUint8Array(data);
 	} catch {

diff --git a/packages/web3-eth-accounts/src/tx/transactionFactory.ts b/packages/web3-eth-accounts/src/tx/transactionFactory.ts
@@ -104,7 +104,7 @@ export class TransactionFactory {
 	 * @param txOptions - The transaction options
 	 */
 	public static fromBlockBodyData(data: Uint8Array | Uint8Array[], txOptions: TxOptions = {}) {
-		if (data instanceof Uint8Array || data.constructor.name === 'Uint8Array') {
+		if (data instanceof Uint8Array || data?.constructor?.name === 'Uint8Array') {
 			return this.fromSerializedData(data as Uint8Array, txOptions);
 		}
 		if (Array.isArray(data)) {

diff --git a/packages/web3-utils/src/converters.ts b/packages/web3-utils/src/converters.ts
@@ -88,7 +88,7 @@ export type EtherUnits = keyof typeof ethUnitMap;
 export const bytesToUint8Array = (data: Bytes): Uint8Array | never => {
 	validator.validate(['bytes'], [data]);
 
-	if (data instanceof Uint8Array || data.constructor.name === 'Uint8Array') {
+	if (data instanceof Uint8Array || data?.constructor?.name === 'Uint8Array') {
 		return data as Uint8Array;
 	}
 

diff --git a/packages/web3-validator/src/validation/bytes.ts b/packages/web3-validator/src/validation/bytes.ts
@@ -23,7 +23,7 @@ import { isHexStrict } from './string.js';
  * checks input if typeof data is valid Uint8Array input
  */
 export const isUint8Array = (data: ValidInputTypes) =>
-	data instanceof Uint8Array || data.constructor.name === 'Uint8Array';
+	data instanceof Uint8Array || data?.constructor?.name === 'Uint8Array';
 
 export const isBytes = (
 	value: ValidInputTypes | Uint8Array | number[],
@@ -35,7 +35,7 @@ export const isBytes = (
 		typeof value !== 'string' &&
 		!Array.isArray(value) &&
 		!(value instanceof Uint8Array) &&
-		value.constructor.name !== 'Uint8Array'
+		value?.constructor?.name !== 'Uint8Array'
 	) {
 		return false;
 	}