fix: Prevent infinite recursion in crypto.subtle polyfill (#133)

## Explanation

The `ed25519` polyfill in the Solana Snap is broken when anything but
the `ed25519` algorithm is used. This prevents us from using the newest
version of `key-tree` which has a bunch of performance improvements.

This PR corrects the polyfill so it no longer infinitely recurses and
bumps `key-tree` back to the latest version.

Author: FrederikBolding

packages/solana-wallet-snap/CHANGELOG.md

@@ -12,6 +12,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - **BREAKING:** Removed the legacy snap-hosted send dialog (`startSendTransactionFlow` RPC and `features/send` UI). Send is now handled exclusively through the unified send flow client methods (`confirmSend`, `onAmountInput`, `onAddressInput`). ([#130](https://github.com/MetaMask/internal-snaps/pull/130))
 - **BREAKING:** Removed the deprecated `getFeeForTransaction` RPC. Use the `computeFee` client request instead. ([#130](https://github.com/MetaMask/internal-snaps/pull/130))
 
+### Fixed
+
+- Bump `@metamask/key-tree` from `9.1.2` to `^10.1.1` ([#133](https://github.com/MetaMask/internal-snaps/pull/133))
+  - This should make account creation faster.
+
 ## [5.0.1]
 
 ### Fixed

packages/solana-wallet-snap/package.json

@@ -53,7 +53,7 @@
   "devDependencies": {
     "@jest/globals": "^29.5.0",
     "@metamask/auto-changelog": "^6.1.1",
-    "@metamask/key-tree": "9.1.2",
+    "@metamask/key-tree": "^10.1.1",
     "@metamask/keyring-api": "^23.7.0",
     "@metamask/keyring-snap-sdk": "^9.2.1",
     "@metamask/snaps-cli": "^8.4.1",

packages/solana-wallet-snap/snap.manifest.json

@@ -7,7 +7,7 @@
     "url": "https://github.com/MetaMask/internal-snaps.git"
   },
   "source": {
-    "shasum": "EmQFdIbfOGX+rDDiptegsY6jedzz3nsP2O/st22VoDo=",
+    "shasum": "DgyBv5EPBAdrofMhGZPNViHmj/LWVPLw6q25d8fY9jw=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",

packages/solana-wallet-snap/src/polyfills/ed25519/index.ts

@@ -18,6 +18,12 @@ import { isEd25519Algorithm } from './utils/is-ed25519-algorithm';
 export function install() {
   const { subtle } = globalThis.crypto;
 
+  const originalGenerateKey = subtle.generateKey.bind(subtle);
+  const originalExportKey = subtle.exportKey.bind(subtle);
+  const originalSign = subtle.sign.bind(subtle);
+  const originalVerify = subtle.verify.bind(subtle);
+  const originalImportKey = subtle.importKey.bind(subtle);
+
   Object.defineProperty(globalThis, 'isSecureContext', {
     value: true,
     writable: true,
@@ -32,7 +38,7 @@ export function install() {
       const algorithm = args[0];
 
       if (!isEd25519Algorithm(algorithm)) {
-        return await globalThis.crypto.subtle.generateKey(...args);
+        return await originalGenerateKey(...args);
       }
 
       return await generateKeyPolyfill(...args);
@@ -49,7 +55,7 @@ export function install() {
       const key = args[1];
 
       if (!isEd25519Algorithm(key.algorithm)) {
-        return await globalThis.crypto.subtle.exportKey(...args);
+        return await originalExportKey(...args);
       }
 
       return await exportKeyPolyfill(...args);
@@ -69,7 +75,7 @@ export function install() {
         !isEd25519Algorithm(algorithm) ||
         !isEd25519Algorithm(key.algorithm)
       ) {
-        return await globalThis.crypto.subtle.sign(...args);
+        return await originalSign(...args);
       }
 
       return await signPolyfill(...args);
@@ -89,7 +95,7 @@ export function install() {
         !isEd25519Algorithm(algorithm) ||
         !isEd25519Algorithm(key.algorithm)
       ) {
-        return await globalThis.crypto.subtle.verify(...args);
+        return await originalVerify(...args);
       }
 
       return await verifyPolyfill(...args);
@@ -106,7 +112,7 @@ export function install() {
       const algorithm = args[2];
 
       if (!isEd25519Algorithm(algorithm)) {
-        return await globalThis.crypto.subtle.importKey(...args);
+        return await originalImportKey(...args);
       }
 
       return await importKeyPolyfill(...args);

yarn.config.cjs

@@ -23,11 +23,7 @@ const { inspect } = require('util');
  * Only intended as temporary measures to faciliate upgrades and releases.
  * This should trend towards empty.
  */
-const ALLOWED_INCONSISTENT_DEPENDENCIES = {
-  // `@metamask/solana-wallet-snap` remains on 9.1.2 because 10.1.1 changes
-  // key-tree behavior that the Snap currently relies on.
-  '@metamask/key-tree': ['9.1.2', '^10.1.1'],
-};
+const ALLOWED_INCONSISTENT_DEPENDENCIES = {};
 
 /**
  * These packages are allowed as peer dependencies without requiring installation as

yarn.lock

@@ -2758,19 +2758,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/key-tree@npm:9.1.2":
-  version: 9.1.2
-  resolution: "@metamask/key-tree@npm:9.1.2"
-  dependencies:
-    "@metamask/scure-bip39": "npm:^2.1.1"
-    "@metamask/utils": "npm:^9.0.0"
-    "@noble/curves": "npm:^1.2.0"
-    "@noble/hashes": "npm:^1.3.2"
-    "@scure/base": "npm:^1.0.0"
-  checksum: 10/9b178a4156b2f36bf630564dd0530c41c6356492971d2bcc8f979c79c81144945823a5b770e4097e12b89b42133b81f00c95a7b8fe9931ea1dd928989ee3c406
-  languageName: node
-  linkType: hard
-
 "@metamask/key-tree@npm:^10.0.2, @metamask/key-tree@npm:^10.1.1":
   version: 10.1.1
   resolution: "@metamask/key-tree@npm:10.1.1"
@@ -3678,7 +3665,7 @@ __metadata:
   dependencies:
     "@jest/globals": "npm:^29.5.0"
     "@metamask/auto-changelog": "npm:^6.1.1"
-    "@metamask/key-tree": "npm:9.1.2"
+    "@metamask/key-tree": "npm:^10.1.1"
     "@metamask/keyring-api": "npm:^23.7.0"
     "@metamask/keyring-snap-sdk": "npm:^9.2.1"
     "@metamask/snaps-cli": "npm:^8.4.1"