Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/examples/packages/bip32/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/examples/packages/bip44/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
},
"dependencies": {
"@metamask/snaps-sdk": "workspace:^",
"@metamask/utils": "^11.8.1"
"@metamask/utils": "^11.9.0"
},
"devDependencies": {
"@jest/globals": "^29.5.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/examples/packages/file-upload/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
},
"dependencies": {
"@metamask/snaps-sdk": "workspace:^",
"@metamask/utils": "^11.8.1"
"@metamask/utils": "^11.9.0"
},
"devDependencies": {
"@jest/globals": "^29.5.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/examples/packages/get-entropy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/examples/packages/interactive-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
},
"dependencies": {
"@metamask/snaps-sdk": "workspace:^",
"@metamask/utils": "^11.8.1"
"@metamask/utils": "^11.9.0"
},
"devDependencies": {
"@jest/globals": "^29.5.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/examples/packages/jsx/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/examples/packages/manage-state/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
},
"dependencies": {
"@metamask/snaps-sdk": "workspace:^",
"@metamask/utils": "^11.8.1"
"@metamask/utils": "^11.9.0"
},
"devDependencies": {
"@jest/globals": "^29.5.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/examples/packages/network-access/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
},
"dependencies": {
"@metamask/snaps-sdk": "workspace:^",
"@metamask/utils": "^11.8.1"
"@metamask/utils": "^11.9.0"
},
"devDependencies": {
"@jest/globals": "^29.5.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/examples/packages/preinstalled/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/examples/packages/protocol/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
},
"dependencies": {
"@metamask/snaps-sdk": "workspace:^",
"@metamask/utils": "^11.8.1"
"@metamask/utils": "^11.9.0"
},
"devDependencies": {
"@jest/globals": "^29.5.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/examples/packages/send-flow/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"dependencies": {
"@metamask/rpc-errors": "^7.0.3",
"@metamask/snaps-sdk": "workspace:^",
"@metamask/utils": "^11.8.1"
"@metamask/utils": "^11.9.0"
},
"devDependencies": {
"@jest/globals": "^29.5.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
},
"dependencies": {
"@metamask/snaps-sdk": "workspace:^",
"@metamask/utils": "^11.8.1"
"@metamask/utils": "^11.9.0"
},
"devDependencies": {
"@jest/globals": "^29.5.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/snaps-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/snaps-controllers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
"@metamask/snaps-sdk": "workspace:^",
"@metamask/snaps-utils": "workspace:^",
"@metamask/superstruct": "^3.2.1",
"@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",
Expand Down
2 changes: 1 addition & 1 deletion packages/snaps-execution-environments/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/snaps-jest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/snaps-rpc-methods/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/snaps-sandbox/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/snaps-sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/snaps-simulation/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 1 addition & 2 deletions packages/snaps-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
26 changes: 0 additions & 26 deletions packages/snaps-utils/src/checksum.test.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -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', () => {
Expand Down
14 changes: 2 additions & 12 deletions packages/snaps-utils/src/checksum.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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));
}

/**
Expand Down
2 changes: 1 addition & 1 deletion packages/snaps-webpack-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion packages/test-snaps/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading
Loading