feat: hash methods accept string type

Author: qianbin

src/lib/crypto.ts

@@ -6,21 +6,31 @@ const blake = require('blakejs')
 
 /**
  * computes blake2b 256bit hash of given data
- * @param data one or more Buffer
+ * @param data one or more Buffer | string
  */
-export function blake2b256(...data: Buffer[]) {
+export function blake2b256(...data: (Buffer | string)[]) {
     let ctx = blake.blake2bInit(32, null)
-    data.forEach(d => blake.blake2bUpdate(ctx, d))
+    data.forEach(d => {
+        if (Buffer.isBuffer(d))
+            blake.blake2bUpdate(ctx, d)
+        else
+            blake.blake2bUpdate(ctx, Buffer.from(d, 'utf8'))
+    })
     return new Bytes32(Buffer.from(blake.blake2bFinal(ctx)))
 }
 
 /**
  * computes keccak256 hash of given data
- * @param data one or more Buffer
+ * @param data one or more Buffer | string
  */
-export function keccak256(...data: Buffer[]) {
+export function keccak256(...data: (Buffer | string)[]) {
     let h = keccak('keccak256')
-    data.forEach(d => h.update(d))
+    data.forEach(d => {
+        if (Buffer.isBuffer(d))
+            h.update(d)
+        else
+            h.update(Buffer.from(d, 'utf8'))
+    })
     return new Bytes32(h.digest())
 }
 

test/crypto.test.ts

@@ -4,23 +4,22 @@ import { Bytes32, Address, blake2b256, keccak256, Secp256k1 } from '../src'
 describe('hash', () => {
     it('blake2b256', () => {
         expect(blake2b256(Buffer.alloc(0)).toString()).equal('0x0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8')
-        expect(blake2b256(Buffer.from('hello world')).toString()).equal('0x256c83b297114d201b30179f3f0ef0cace9783622da5974326b436178aeef610')
-        expect(blake2b256(Buffer.from('hello'), Buffer.from(' world')).toString()).equal('0x256c83b297114d201b30179f3f0ef0cace9783622da5974326b436178aeef610')
+        expect(blake2b256('hello world').toString()).equal('0x256c83b297114d201b30179f3f0ef0cace9783622da5974326b436178aeef610')
+        expect(blake2b256('hello', ' world').toString()).equal('0x256c83b297114d201b30179f3f0ef0cace9783622da5974326b436178aeef610')
     })
 
     it('keccak', () => {
         expect(keccak256(Buffer.alloc(0)).toString()).equal('0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470')
-        expect(keccak256(Buffer.from('hello world')).toString()).equal('0x47173285a8d7341e5e972fc677286384f802f8ef42a5ec5f03bbfa254cb01fad')
-        expect(keccak256(Buffer.from('hello'), Buffer.from(' world')).toString()).equal('0x47173285a8d7341e5e972fc677286384f802f8ef42a5ec5f03bbfa254cb01fad')
+        expect(keccak256('hello world').toString()).equal('0x47173285a8d7341e5e972fc677286384f802f8ef42a5ec5f03bbfa254cb01fad')
+        expect(keccak256('hello', ' world').toString()).equal('0x47173285a8d7341e5e972fc677286384f802f8ef42a5ec5f03bbfa254cb01fad')
     })
 })
 
 describe('secp256k1', () => {
     let privKey = Bytes32.fromHex('7582be841ca040aa940fff6c05773129e135623e41acce3e0b8ba520dc1ae26a', '')
     let pubKey = Buffer.from('04b90e9bb2617387eba4502c730de65a33878ef384a46f1096d86f2da19043304afa67d0ad09cf2bea0c6f2d1767a9e62a7a7ecc41facf18f2fa505d92243a658f', 'hex')
     let addr = Address.fromHex('d989829d88b0ed1b06edf5c50174ecfa64f14a64', '')
-    let msg = Buffer.from('hello world', 'utf8')
-    let msgHash = keccak256(msg)
+    let msgHash = keccak256('hello world')
     let sig = Buffer.from('f8fe82c74f9e1f5bf443f8a7f8eb968140f554968fdcab0a6ffe904e451c8b9244be44bccb1feb34dd20d9d8943f8c131227e55861736907b02d32c06b934d7200', 'hex')
 
     it('derive', () => {