Merge pull request #2884 from yegorzaremba/hotfix-hexToNumberString-p…

…refix fix(utils): hexToNumberString prefix validation
web3 · Jun 11, 2019 · aaf26c8 · aaf26c8
2 parents 7a8b1fc + 9062ddd
commit aaf26c8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/packages/web3-utils/src/Utils.js b/packages/web3-utils/src/Utils.js
@@ -300,6 +300,10 @@ export const hexToNumber = (value) => {
 export const hexToNumberString = (value) => {
     if (!value) return value;
 
+    if (isString(value)) {
+        if (!isHexStrict(value)) throw new Error(`Given value "${value}" is not a valid hex string.`);
+    }
+
     return toBN(value).toString(10);
 };
 

diff --git a/packages/web3-utils/tests/src/UtilsTest.js b/packages/web3-utils/tests/src/UtilsTest.js
@@ -444,7 +444,10 @@ describe('UtilsTest', () => {
         // allow compatiblity
         expect(hexToNumberString(100000)).toEqual('100000');
 
-        expect(hexToNumberString('100000')).toEqual('100000');
+        // throw error if the hex string doesn't contain '0x' prefix
+        expect(() => {
+            hexToNumberString('100000');
+        }).toThrow('Given value "100000" is not a valid hex string.');
     });
 
     it('calls toTwosComplement and returns the expected results', () => {