Auto-detect hex encoded bytes in sha3 (#4108)

* Auto-detect hex encoded bytes in sha3

* Using types/isHex

* Removing unused imports

js/src/api/util/sha3.js

@@ -17,9 +17,12 @@
 import { keccak_256 } from 'js-sha3'; // eslint-disable-line
 
 import { hexToBytes } from './format';
+import { isHex } from './types';
 
 export function sha3 (value, options) {
-  if (options && options.encoding === 'hex') {
+  const forceHex = options && options.encoding === 'hex';
+
+  if (forceHex || (!options && isHex(value))) {
     const bytes = hexToBytes(value);
     return sha3(bytes);
   }
@@ -28,3 +31,5 @@ export function sha3 (value, options) {
 
   return `0x${hash}`;
 }
+
+sha3.text = (val) => sha3(val, { encoding: 'raw' });

js/src/api/util/sha3.spec.js

@@ -32,5 +32,14 @@ describe('api/util/sha3', () => {
       expect(sha3('01020304', { encoding: 'hex' })).to.equal('0xa6885b3731702da62e8e4a8f584ac46a7f6822f4e2ba50fba902f67b1588d23b');
       expect(sha3(Uint8Array.from([1, 2, 3, 4]))).to.equal('0xa6885b3731702da62e8e4a8f584ac46a7f6822f4e2ba50fba902f67b1588d23b');
     });
+
+    it('should interpret as bytes by default', () => {
+      expect(sha3('0x01020304')).to.equal('0xa6885b3731702da62e8e4a8f584ac46a7f6822f4e2ba50fba902f67b1588d23b');
+    });
+
+    it('should force text if option is passed', () => {
+      expect(sha3('0x01020304', { encoding: 'raw' })).to.equal('0x16bff43de576d28857dcba65a56fc17c5e93c09bd6a709268eff8e62025ae869');
+      expect(sha3.text('0x01020304')).to.equal('0x16bff43de576d28857dcba65a56fc17c5e93c09bd6a709268eff8e62025ae869');
+    });
   });
 });

js/src/api/util/types.js

@@ -29,6 +29,10 @@ export function isFunction (test) {
 }
 
 export function isHex (_test) {
+  if (!isString(_test)) {
+    return false;
+  }
+
   if (_test.substr(0, 2) === '0x') {
     return isHex(_test.slice(2));
   }

js/src/api/util/types.spec.js

@@ -66,6 +66,12 @@ describe('api/util/types', () => {
     it('correctly identifies non-hex values', () => {
       expect(isHex('123j')).to.be.false;
     });
+
+    it('correctly indentifies non-string values', () => {
+      expect(isHex(false)).to.be.false;
+      expect(isHex()).to.be.false;
+      expect(isHex([1, 2, 3])).to.be.false;
+    });
   });
 
   describe('isInstanceOf', () => {