diff --git a/.gitignore b/.gitignore index 96fab4f..a608608 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,5 @@ yarn-error.log* # Misc .DS_Store *.pem + +.idea \ No newline at end of file diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 3fc96c0..4ded2ac 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -83,7 +83,6 @@ "ethers": "^6.12.1", "ffjavascript": "^0.2.63", "idb-keyval": "^6.2.1", - "js-sha3": "^0.8.0", "node-fetch": "^2.7.0", "snarkjs": "^0.7.4" } diff --git a/packages/sdk/src/crypto/hash.ts b/packages/sdk/src/crypto/hash.ts index 3929e5c..3c7db8d 100644 --- a/packages/sdk/src/crypto/hash.ts +++ b/packages/sdk/src/crypto/hash.ts @@ -1,4 +1,4 @@ -import { keccak256 } from "js-sha3"; +import { keccak256, toUtf8Bytes } from "ethers"; import { poseidon, BigInter } from "@/crypto/babyzk/deps"; import { Result, Err, Ok, encase } from "@/errors"; @@ -89,7 +89,7 @@ function poseidonBytesX(msg: Uint8Array, frameSize: number): Result { * @returns a bigint, uint256 hash result. */ export const keccak256Str = (s: string): Result => { - return Ok(BigInt("0x" + keccak256(s))); + return Ok(BigInt(keccak256(toUtf8Bytes(s)))); }; const bytesBEtoBigInt = (bytes: Uint8Array): bigint => { diff --git a/packages/sdk/tsup.config.ts b/packages/sdk/tsup.config.ts index 01e0390..c8d0543 100644 --- a/packages/sdk/tsup.config.ts +++ b/packages/sdk/tsup.config.ts @@ -35,7 +35,7 @@ const COMMON_CONFIG: MandatoryOptions = { // ESM config const ESM_CONFIG: MandatoryOptions = { ...DEFAULT_CONFIG, - entry: ["src/**/*.ts", "!src/**/*.test.*", "!src/testutils"], // Include all files but tests, better tree-shaking + entry: ["src/index.ts", "!src/**/*.test.*", "!src/testutils"], // Include all files but tests, better tree-shaking format: "esm", outDir: "dist/esm", platform: "browser", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f2696e7..af2ea57 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -388,9 +388,6 @@ importers: idb-keyval: specifier: ^6.2.1 version: 6.2.1 - js-sha3: - specifier: ^0.8.0 - version: 0.8.0 node-fetch: specifier: ^2.7.0 version: 2.7.0