diff --git a/CHANGELOG.md b/CHANGELOG.md index c4b3335f1..bd3ca5da1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # CHANGELOG +## master + +Changes: + +- Update `xxhash*` to only use `Uint8Array` internally, no `Buffer` + + ## 7.5.1 Oct 16, 2021 Contributed: diff --git a/packages/util-crypto/src/xxhash/asU8a.ts b/packages/util-crypto/src/xxhash/asU8a.ts index ed550c290..52a848bef 100644 --- a/packages/util-crypto/src/xxhash/asU8a.ts +++ b/packages/util-crypto/src/xxhash/asU8a.ts @@ -24,16 +24,17 @@ import xxhash64AsBn from './xxhash64/asBn'; */ export function xxhashAsU8a (data: HexString | Buffer | Uint8Array | string, bitLength = 64, onlyJs = false): Uint8Array { const iterations = Math.ceil(bitLength / 64); + const u8a = u8aToU8a(data); if (isReady() && !onlyJs) { - return twox(u8aToU8a(data), iterations); + return twox(u8a, iterations); } - const u8a = new Uint8Array(Math.ceil(bitLength / 8)); + const result = new Uint8Array(Math.ceil(bitLength / 8)); for (let seed = 0; seed < iterations; seed++) { - u8a.set(xxhash64AsBn(data, seed).toArray('le', 8), seed * 8); + result.set(xxhash64AsBn(u8a, seed).toArray('le', 8), seed * 8); } - return u8a; + return result; } diff --git a/packages/util-crypto/src/xxhash/xxhash64/asValue.ts b/packages/util-crypto/src/xxhash/xxhash64/asValue.ts index 444228391..b62ee5041 100644 --- a/packages/util-crypto/src/xxhash/xxhash64/asValue.ts +++ b/packages/util-crypto/src/xxhash/xxhash64/asValue.ts @@ -3,15 +3,11 @@ import xx from 'xxhashjs'; -import { isBuffer, isString, u8aToBuffer } from '@polkadot/util'; +import { u8aToU8a } from '@polkadot/util'; export default function xxhash64AsValue (data: Buffer | Uint8Array | string, seed: number): number { - if (isBuffer(data) || isString(data)) { - return xx.h64(data, seed); - } - return xx.h64( - u8aToBuffer(data), + u8aToU8a(data).buffer, seed ); } diff --git a/packages/util-crypto/src/xxhash/xxhash64/xxhash64.d.ts b/packages/util-crypto/src/xxhash/xxhash64/xxhash64.d.ts index 3e86c4a7e..ead64834f 100644 --- a/packages/util-crypto/src/xxhash/xxhash64/xxhash64.d.ts +++ b/packages/util-crypto/src/xxhash/xxhash64/xxhash64.d.ts @@ -3,7 +3,7 @@ declare module 'xxhashjs' { export interface HashInterface { - (data: string | Buffer, seed: number): number; + (data: string | Buffer | ArrayBuffer, seed: number): number; } const h64: HashInterface;