chore: Use SHA-256 utility

FrederikBolding · FrederikBolding · commit 0515c84e5ff7 · 2025-12-18T10:03:03.000+01:00
diff --git a/package.json b/package.json
@@ -81,7 +81,7 @@
     "@metamask/eslint-config-jest": "^14.0.0",
     "@metamask/eslint-config-nodejs": "^14.0.0",
     "@metamask/eslint-config-typescript": "^14.0.0",
-    "@metamask/utils": "^11.8.1",
+    "@metamask/utils": "^11.9.0",
     "@swc/core": "1.11.31",
     "@ts-bridge/cli": "^0.6.1",
     "@types/jest": "^27.5.1",
diff --git a/packages/examples/packages/bip32/package.json b/packages/examples/packages/bip32/package.json
@@ -45,7 +45,7 @@
   "dependencies": {
     "@metamask/key-tree": "^10.1.1",
     "@metamask/snaps-sdk": "workspace:^",
-    "@metamask/utils": "^11.8.1",
+    "@metamask/utils": "^11.9.0",
     "@noble/ed25519": "^1.6.0",
     "@noble/secp256k1": "^1.7.1"
   },
diff --git a/packages/examples/packages/bip44/package.json b/packages/examples/packages/bip44/package.json
@@ -45,7 +45,7 @@
   "dependencies": {
     "@metamask/key-tree": "^10.1.1",
     "@metamask/snaps-sdk": "workspace:^",
-    "@metamask/utils": "^11.8.1",
+    "@metamask/utils": "^11.9.0",
     "@noble/bls12-381": "^1.2.0"
   },
   "devDependencies": {
diff --git a/packages/examples/packages/get-entropy/package.json b/packages/examples/packages/get-entropy/package.json
@@ -44,7 +44,7 @@
   },
   "dependencies": {
     "@metamask/snaps-sdk": "workspace:^",
-    "@metamask/utils": "^11.8.1",
+    "@metamask/utils": "^11.9.0",
     "@noble/bls12-381": "^1.2.0"
   },
   "devDependencies": {
diff --git a/packages/examples/packages/invoke-snap/packages/consumer-signer/package.json b/packages/examples/packages/invoke-snap/packages/consumer-signer/package.json
@@ -45,7 +45,7 @@
   "dependencies": {
     "@metamask/key-tree": "^10.1.1",
     "@metamask/snaps-sdk": "workspace:^",
-    "@metamask/utils": "^11.8.1",
+    "@metamask/utils": "^11.9.0",
     "@noble/hashes": "^1.7.1"
   },
   "devDependencies": {
diff --git a/packages/examples/packages/invoke-snap/packages/core-signer/package.json b/packages/examples/packages/invoke-snap/packages/core-signer/package.json
@@ -45,7 +45,7 @@
   "dependencies": {
     "@metamask/key-tree": "^10.1.1",
     "@metamask/snaps-sdk": "workspace:^",
-    "@metamask/utils": "^11.8.1",
+    "@metamask/utils": "^11.9.0",
     "@noble/curves": "^1.1.0",
     "async-mutex": "^0.5.0"
   },
diff --git a/packages/examples/packages/jsx/package.json b/packages/examples/packages/jsx/package.json
@@ -52,7 +52,7 @@
     "@metamask/auto-changelog": "^5.0.2",
     "@metamask/snaps-cli": "workspace:^",
     "@metamask/snaps-jest": "workspace:^",
-    "@metamask/utils": "^11.8.1",
+    "@metamask/utils": "^11.9.0",
     "@swc/core": "1.11.31",
     "@swc/jest": "^0.2.38",
     "@types/node": "18.14.2",
diff --git a/packages/examples/packages/preinstalled/package.json b/packages/examples/packages/preinstalled/package.json
@@ -53,7 +53,7 @@
     "@metamask/snaps-cli": "workspace:^",
     "@metamask/snaps-controllers": "workspace:^",
     "@metamask/snaps-jest": "workspace:^",
-    "@metamask/utils": "^11.8.1",
+    "@metamask/utils": "^11.9.0",
     "@swc/core": "1.11.31",
     "@swc/jest": "^0.2.38",
     "@types/node": "18.14.2",
diff --git a/packages/snaps-cli/package.json b/packages/snaps-cli/package.json
@@ -70,7 +70,7 @@
     "@metamask/snaps-utils": "workspace:^",
     "@metamask/snaps-webpack-plugin": "workspace:^",
     "@metamask/superstruct": "^3.2.1",
-    "@metamask/utils": "^11.8.1",
+    "@metamask/utils": "^11.9.0",
     "@swc/core": "1.11.31",
     "assert": "^2.0.0",
     "browserify-zlib": "^0.2.0",
diff --git a/packages/snaps-controllers/package.json b/packages/snaps-controllers/package.json
@@ -94,7 +94,7 @@
     "@metamask/snaps-rpc-methods": "workspace:^",
     "@metamask/snaps-sdk": "workspace:^",
     "@metamask/snaps-utils": "workspace:^",
-    "@metamask/utils": "^11.8.1",
+    "@metamask/utils": "^11.9.0",
     "@xstate/fsm": "^2.0.0",
     "async-mutex": "^0.5.0",
     "concat-stream": "^2.0.0",
diff --git a/packages/snaps-execution-environments/package.json b/packages/snaps-execution-environments/package.json
@@ -74,7 +74,7 @@
     "@metamask/snaps-sdk": "workspace:^",
     "@metamask/snaps-utils": "workspace:^",
     "@metamask/superstruct": "^3.2.1",
-    "@metamask/utils": "^11.8.1",
+    "@metamask/utils": "^11.9.0",
     "readable-stream": "^3.6.2"
   },
   "devDependencies": {
diff --git a/packages/snaps-jest/package.json b/packages/snaps-jest/package.json
@@ -64,7 +64,7 @@
     "@metamask/snaps-sdk": "workspace:^",
     "@metamask/snaps-simulation": "workspace:^",
     "@metamask/superstruct": "^3.2.1",
-    "@metamask/utils": "^11.8.1",
+    "@metamask/utils": "^11.9.0",
     "express": "^5.1.0",
     "jest-environment-node": "^29.5.0",
     "jest-matcher-utils": "^29.5.0",
diff --git a/packages/snaps-rpc-methods/package.json b/packages/snaps-rpc-methods/package.json
@@ -61,7 +61,7 @@
     "@metamask/snaps-sdk": "workspace:^",
     "@metamask/snaps-utils": "workspace:^",
     "@metamask/superstruct": "^3.2.1",
-    "@metamask/utils": "^11.8.1",
+    "@metamask/utils": "^11.9.0",
     "@noble/hashes": "^1.7.1",
     "async-mutex": "^0.5.0"
   },
diff --git a/packages/snaps-sandbox/package.json b/packages/snaps-sandbox/package.json
@@ -47,7 +47,7 @@
     "@emotion/react": "^11.14.0",
     "@metamask/auto-changelog": "^5.0.2",
     "@metamask/providers": "^22.1.1",
-    "@metamask/utils": "^11.8.1",
+    "@metamask/utils": "^11.9.0",
     "@monaco-editor/react": "^4.7.0",
     "@tanstack/react-query": "^5.71.5",
     "@testing-library/dom": "^10.4.0",
diff --git a/packages/snaps-sdk/package.json b/packages/snaps-sdk/package.json
@@ -95,7 +95,7 @@
     "@metamask/providers": "^22.1.1",
     "@metamask/rpc-errors": "^7.0.3",
     "@metamask/superstruct": "^3.2.1",
-    "@metamask/utils": "^11.8.1",
+    "@metamask/utils": "^11.9.0",
     "luxon": "^3.5.0"
   },
   "devDependencies": {
diff --git a/packages/snaps-simulation/package.json b/packages/snaps-simulation/package.json
@@ -68,7 +68,7 @@
     "@metamask/snaps-sdk": "workspace:^",
     "@metamask/snaps-utils": "workspace:^",
     "@metamask/superstruct": "^3.2.1",
-    "@metamask/utils": "^11.8.1",
+    "@metamask/utils": "^11.9.0",
     "@reduxjs/toolkit": "^1.9.5",
     "fast-deep-equal": "^3.1.3",
     "immer": "^9.0.21",
diff --git a/packages/snaps-utils/package.json b/packages/snaps-utils/package.json
@@ -88,8 +88,7 @@
     "@metamask/snaps-registry": "^4.0.0",
     "@metamask/snaps-sdk": "workspace:^",
     "@metamask/superstruct": "^3.2.1",
-    "@metamask/utils": "^11.8.1",
-    "@noble/hashes": "^1.7.1",
+    "@metamask/utils": "^11.9.0",
     "@scure/base": "^1.1.1",
     "chalk": "^4.1.2",
     "cron-parser": "^4.5.0",
@@ -107,6 +106,7 @@
     "@lavamoat/allow-scripts": "^3.4.0",
     "@metamask/auto-changelog": "^5.0.2",
     "@metamask/post-message-stream": "^10.0.0",
+    "@noble/hashes": "^1.7.1",
     "@swc/core": "1.11.31",
     "@swc/jest": "^0.2.38",
     "@testing-library/dom": "^10.4.0",
diff --git a/packages/snaps-utils/src/checksum.test.ts b/packages/snaps-utils/src/checksum.test.ts
@@ -1,6 +1,4 @@
-import * as nobleHashes from '@noble/hashes/sha256';
 import { base64 } from '@scure/base';
-import { webcrypto } from 'crypto';
 
 import { checksum, checksumFiles } from './checksum';
 import { VirtualFile } from './virtual-file';
@@ -37,30 +35,6 @@ describe('checksum', () => {
     expect(base64.encode(await checksum(''))).toBe(EMPTY_SHA256);
     expect(base64.encode(await checksum(new Uint8Array()))).toBe(EMPTY_SHA256);
   });
-
-  it('uses crypto.subtle when it is available', async () => {
-    const cryptoSpy = jest.spyOn(webcrypto.subtle, 'digest');
-
-    Object.defineProperty(globalThis, 'crypto', {
-      value: webcrypto,
-      writable: true,
-    });
-
-    expect(base64.encode(await checksum(FOO_BAR_UINT8))).toBe(FOO_BAR_SHA256);
-    expect(cryptoSpy).toHaveBeenCalled();
-  });
-
-  it('uses noble-hashes when crypto.subtle is unavailable', async () => {
-    const nobleSpy = jest.spyOn(nobleHashes, 'sha256');
-
-    Object.defineProperty(globalThis, 'crypto', {
-      value: undefined,
-      writable: true,
-    });
-
-    expect(base64.encode(await checksum(FOO_BAR_UINT8))).toBe(FOO_BAR_SHA256);
-    expect(nobleSpy).toHaveBeenCalled();
-  });
 });
 
 describe('checkumFiles', () => {
diff --git a/packages/snaps-utils/src/checksum.ts b/packages/snaps-utils/src/checksum.ts
@@ -1,5 +1,4 @@
-import { assert, concatBytes } from '@metamask/utils';
-import { sha256 } from '@noble/hashes/sha256';
+import { assert, concatBytes, sha256 } from '@metamask/utils';
 
 import { getBytes } from './bytes';
 import type { VirtualFile } from './virtual-file';
@@ -13,16 +12,7 @@ import type { VirtualFile } from './virtual-file';
 export async function checksum(
   bytes: VirtualFile | Uint8Array | string,
 ): Promise<Uint8Array> {
-  const value = getBytes(bytes);
-  // Use crypto.subtle.digest whenever possible as it is faster.
-  if (
-    'crypto' in globalThis &&
-    typeof globalThis.crypto === 'object' &&
-    crypto.subtle?.digest
-  ) {
-    return new Uint8Array(await crypto.subtle.digest('SHA-256', value));
-  }
-  return sha256(value);
+  return await sha256(getBytes(bytes));
 }
 
 /**
diff --git a/packages/snaps-webpack-plugin/package.json b/packages/snaps-webpack-plugin/package.json
@@ -60,7 +60,7 @@
     "@metamask/snaps-rpc-methods": "workspace:^",
     "@metamask/snaps-sdk": "workspace:^",
     "@metamask/snaps-utils": "workspace:^",
-    "@metamask/utils": "^11.8.1",
+    "@metamask/utils": "^11.9.0",
     "chalk": "^4.1.2",
     "prettier": "^3.3.3",
     "webpack-sources": "^3.2.3"
diff --git a/packages/test-snaps/package.json b/packages/test-snaps/package.json
@@ -77,7 +77,7 @@
     "@metamask/signature-insights-example-snap": "workspace:^",
     "@metamask/snaps-sdk": "workspace:^",
     "@metamask/snaps-utils": "workspace:^",
-    "@metamask/utils": "^11.8.1",
+    "@metamask/utils": "^11.9.0",
     "@metamask/wasm-example-snap": "workspace:^",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.10",
     "@popperjs/core": "^2.11.8",
diff --git a/yarn.lock b/yarn.lock
