allow '' to pass hex check

web3 · Nov 28, 2022 · c0eff62 · c0eff62
1 parent 1d1a15d
commit c0eff62
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/packages/web3-validator/src/validation/string.ts b/packages/web3-validator/src/validation/string.ts
@@ -23,12 +23,12 @@ import { ValidInputTypes } from '../types';
 export const isString = (value: ValidInputTypes) => typeof value === 'string';
 
 export const isHexStrict = (hex: ValidInputTypes) =>
-	typeof hex === 'string' && /^((-)?0x[0-9a-f]+|(0x)?)$/i.test(hex);
+	typeof hex === 'string' && /^((-)?0x[0-9a-f]+|(0x))$/i.test(hex);
 
 export const isHex = (hex: ValidInputTypes): boolean =>
 	typeof hex === 'number' ||
 	typeof hex === 'bigint' ||
-	(typeof hex === 'string' && /^((-0x|0x|-)?[0-9a-f]+|(0x)?)$/i.test(hex));
+	(typeof hex === 'string' && /^((-0x|0x|-)?[0-9a-f]+|(0x))$/i.test(hex));
 
 export const isHexString8Bytes = (value: string, prefixed = true) =>
 	prefixed ? isHexStrict(value) && value.length === 18 : isHex(value) && value.length === 16;

diff --git a/packages/web3-validator/test/fixtures/validation.ts b/packages/web3-validator/test/fixtures/validation.ts
@@ -133,11 +133,11 @@ export const validHexStrictData: any[] = [
 	...validHexStrictDataWithNumber.map(tuple => tuple[0]),
 	'-0xdec0518fa672a70027b04c286582e543ab17319fbdd384fa7bc8f3d5a542c0b',
 	'0x',
-	'',
 ];
 
 export const invalidHexData: any[] = [
 	'Heeäööä👅D34ɝɣ24Єͽ',
+	'',
 	'-',
 	'-0x',
 	'x',

diff --git a/packages/web3-validator/test/unit/utils.test.ts b/packages/web3-validator/test/unit/utils.test.ts
@@ -93,7 +93,8 @@ describe('utils', () => {
 
 		it.each(validHexStrictData)('valid hex strings', input => {
 			expect(numberToHex(input)).toEqual(
-				(input === '' ? '0x' : (input as string)).toLowerCase(),
+				// if input is '' then numberToHex would return "0x0"
+				(input === '' ? '0x0' : (input as string)).toLowerCase(),
 			);
 		});