Merge branch 'main' into hm/add-address-input

hmalik88 · hmalik88 · commit 0fa24442f186 · 2025-03-11T14:34:27.000-04:00
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -14,3 +14,11 @@ updates:
     target-branch: 'main'
     versioning-strategy: 'increase'
     open-pull-requests-limit: 10
+    groups:
+      metamask:
+        applies-to: version-updates
+        patterns:
+          - '@metamask/*'
+        update-types:
+          - 'minor'
+          - 'patch'
diff --git a/.github/workflows/update-pull-request.yml b/.github/workflows/update-pull-request.yml
@@ -223,7 +223,9 @@ jobs:
   commit-result:
     name: Commit result
     runs-on: ubuntu-latest
+    if: ${{ !failure() && !cancelled() && needs.is-fork-pull-request.outputs.IS_FORK == 'false' }}
     needs:
+      - is-fork-pull-request
       - prepare
       - dedupe-yarn-lock
       - regenerate-lavamoat-policies
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "root",
-  "version": "92.0.0",
+  "version": "93.0.0",
   "private": true,
   "repository": {
     "type": "git",
@@ -23,7 +23,6 @@
     "child-workspace-package-names-as-json": "ts-node scripts/child-workspace-package-names-as-json.ts",
     "clean": "yarn workspaces foreach --all --parallel --verbose run clean",
     "get-release-tag": "ts-node --swc scripts/get-release-tag.ts",
-    "postinstall": "simple-git-hooks",
     "install-chrome": "./scripts/install-chrome.sh",
     "lint": "yarn lint:eslint && yarn lint:misc --check && yarn lint:tsconfig && yarn constraints && yarn lint:dependencies",
     "lint:dependencies": "yarn workspaces foreach --all --parallel --verbose run lint:dependencies && yarn dedupe --check",
@@ -33,6 +32,7 @@
     "lint:tsconfig": "node scripts/verify-tsconfig.mjs",
     "prepare-preview-builds": "./scripts/prepare-preview-builds.sh",
     "publish-previews": "yarn workspaces foreach --all --parallel --verbose run publish:preview",
+    "setup": "simple-git-hooks",
     "test": "yarn workspaces foreach --all --parallel --verbose run test",
     "test:browser": "yarn workspaces foreach --all --verbose run test:browser",
     "test:clean": "yarn workspaces foreach --all --parallel --verbose run test:clean",
@@ -79,7 +79,7 @@
   "devDependencies": {
     "@lavamoat/allow-scripts": "^3.0.4",
     "@metamask/auto-changelog": "^4.1.0",
-    "@metamask/create-release-branch": "^4.0.0",
+    "@metamask/create-release-branch": "^4.1.0",
     "@metamask/eslint-config": "^14.0.0",
     "@metamask/eslint-config-browser": "^14.0.0",
     "@metamask/eslint-config-jest": "^14.0.0",
@@ -92,7 +92,7 @@
     "@types/lodash": "^4",
     "@types/node": "18.14.2",
     "@yarnpkg/types": "^4.0.0",
-    "chromedriver": "^133.0.3",
+    "chromedriver": "^134.0.0",
     "depcheck": "^1.4.7",
     "eslint": "^9.11.0",
     "eslint-config-prettier": "^9.1.0",
diff --git a/packages/examples/packages/bip32/snap.manifest.json b/packages/examples/packages/bip32/snap.manifest.json
@@ -7,7 +7,7 @@
     "url": "https://github.com/MetaMask/snaps.git"
   },
   "source": {
-    "shasum": "EYj8a1CyBIrzcSGQ6EY9Ny6Q+azLzobzU7agR7CKisA=",
+    "shasum": "nS48OH2I7YacX70E4rPCF+870ZdKRaJb66DwFU6zu8M=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",
diff --git a/packages/examples/packages/bip44/snap.manifest.json b/packages/examples/packages/bip44/snap.manifest.json
@@ -7,7 +7,7 @@
     "url": "https://github.com/MetaMask/snaps.git"
   },
   "source": {
-    "shasum": "7ITCfMBWovBJmXIqrHSIsO+DvhSI52fO07JRevLMIkw=",
+    "shasum": "AeCVkpJQuy7JZHh5vQioQzJIbeR2H9hjYWmuGH8rww0=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",
diff --git a/packages/examples/packages/ethers-js/snap.manifest.json b/packages/examples/packages/ethers-js/snap.manifest.json
@@ -7,7 +7,7 @@
     "url": "https://github.com/MetaMask/snaps.git"
   },
   "source": {
-    "shasum": "6fsBdxadF/YFFYsfFEiiyiN3aBjtg9POe0gtYjuv0Ow=",
+    "shasum": "sByCEI9g09UGbwHBxK89BKRiVFRIAIlSJLw1880fqQo=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",
diff --git a/packages/examples/packages/file-upload/snap.manifest.json b/packages/examples/packages/file-upload/snap.manifest.json
@@ -7,7 +7,7 @@
     "url": "https://github.com/MetaMask/snaps.git"
   },
   "source": {
-    "shasum": "vUHKqC4T7pQFvQVukvzLCxxmt9UTINvDhe6eElkocSQ=",
+    "shasum": "A9BecIJvmVZFc4oelZQaqvCCHTyr/VjZkSzOlGcO2Ps=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",
diff --git a/packages/examples/packages/images/snap.manifest.json b/packages/examples/packages/images/snap.manifest.json
@@ -7,7 +7,7 @@
     "url": "https://github.com/MetaMask/snaps.git"
   },
   "source": {
-    "shasum": "qDSGnw6+RCCzacNV3QaY4oyEpz9sDLXIDcJ+oPiiWx0=",
+    "shasum": "PWwMdyhcSaDJ5jd4YWbzKiLmDaSu6YIWYLmPdEGRdjY=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",
diff --git a/packages/examples/packages/invoke-snap/packages/core-signer/snap.manifest.json b/packages/examples/packages/invoke-snap/packages/core-signer/snap.manifest.json
@@ -7,7 +7,7 @@
     "url": "https://github.com/MetaMask/snaps.git"
   },
   "source": {
-    "shasum": "lQBujvMoHepdX+E8O5UH8R4CUMMw2Gi3juOJicuyHPA=",
+    "shasum": "uJbZD9CQgbJNvLk1lKmtfeWJNKAUf+vjZSNr+YK0Pak=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",
diff --git a/packages/snaps-jest/package.json b/packages/snaps-jest/package.json
@@ -65,7 +65,7 @@
     "@metamask/snaps-simulation": "workspace:^",
     "@metamask/superstruct": "^3.1.0",
     "@metamask/utils": "^11.2.0",
-    "express": "^4.18.2",
+    "express": "^4.21.2",
     "jest-environment-node": "^29.5.0",
     "jest-matcher-utils": "^29.5.0",
     "redux": "^4.2.1"
diff --git a/packages/snaps-rpc-methods/CHANGELOG.md b/packages/snaps-rpc-methods/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [11.13.1]
+
+### Fixed
+
+- Unlock client before calling `getEntropySources` in `snap_listEntropySources` method ([#3194](https://github.com/MetaMask/snaps/pull/3194))
+
 ## [11.13.0]
 
 ### Added
@@ -400,7 +406,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - The version of the package no longer needs to match the version of all other
     MetaMask Snaps packages.
 
-[Unreleased]: https://github.com/MetaMask/snaps/compare/@metamask/snaps-rpc-methods@11.13.0...HEAD
+[Unreleased]: https://github.com/MetaMask/snaps/compare/@metamask/snaps-rpc-methods@11.13.1...HEAD
+[11.13.1]: https://github.com/MetaMask/snaps/compare/@metamask/snaps-rpc-methods@11.13.0...@metamask/snaps-rpc-methods@11.13.1
 [11.13.0]: https://github.com/MetaMask/snaps/compare/@metamask/snaps-rpc-methods@11.12.0...@metamask/snaps-rpc-methods@11.13.0
 [11.12.0]: https://github.com/MetaMask/snaps/compare/@metamask/snaps-rpc-methods@11.11.0...@metamask/snaps-rpc-methods@11.12.0
 [11.11.0]: https://github.com/MetaMask/snaps/compare/@metamask/snaps-rpc-methods@11.10.0...@metamask/snaps-rpc-methods@11.11.0
diff --git a/packages/snaps-rpc-methods/package.json b/packages/snaps-rpc-methods/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@metamask/snaps-rpc-methods",
-  "version": "11.13.0",
+  "version": "11.13.1",
   "description": "MetaMask Snaps JSON-RPC method implementations",
   "keywords": [
     "MetaMask",
diff --git a/packages/snaps-rpc-methods/src/permitted/listEntropySources.test.ts b/packages/snaps-rpc-methods/src/permitted/listEntropySources.test.ts
@@ -16,6 +16,7 @@ describe('snap_listEntropySources', () => {
         hookNames: {
           hasPermission: true,
           getEntropySources: true,
+          getUnlockPromise: true,
         },
       });
     });
@@ -25,6 +26,7 @@ describe('snap_listEntropySources', () => {
     it('returns the result from the `getEntropySources` hook', async () => {
       const { implementation } = listEntropySourcesHandler;
 
+      const getUnlockPromise = jest.fn();
       const getEntropySources = jest.fn().mockReturnValue([
         {
           name: 'Secret recovery phrase 1',
@@ -49,6 +51,7 @@ describe('snap_listEntropySources', () => {
       const hooks = {
         hasPermission: jest.fn().mockReturnValue(true),
         getEntropySources,
+        getUnlockPromise,
       };
 
       const engine = new JsonRpcEngine();
@@ -71,6 +74,7 @@ describe('snap_listEntropySources', () => {
         method: 'snap_listEntropySources',
       });
 
+      expect(getUnlockPromise).toHaveBeenCalledWith(true);
       expect(response).toStrictEqual({
         jsonrpc: '2.0',
         id: 1,
@@ -100,9 +104,11 @@ describe('snap_listEntropySources', () => {
     it('returns an unauthorized error if the requesting origin does not have the required permission', async () => {
       const { implementation } = listEntropySourcesHandler;
 
+      const getUnlockPromise = jest.fn();
       const hooks = {
         hasPermission: jest.fn().mockReturnValue(false),
         getEntropySources: jest.fn(),
+        getUnlockPromise,
       };
 
       const engine = new JsonRpcEngine();
@@ -125,6 +131,7 @@ describe('snap_listEntropySources', () => {
         method: 'snap_listEntropySources',
       });
 
+      expect(getUnlockPromise).not.toHaveBeenCalled();
       expect(response).toStrictEqual({
         jsonrpc: '2.0',
         id: 1,
diff --git a/packages/snaps-rpc-methods/src/permitted/listEntropySources.ts b/packages/snaps-rpc-methods/src/permitted/listEntropySources.ts
@@ -29,6 +29,7 @@ const REQUIRED_PERMISSIONS = [
 const hookNames: MethodHooksObject<ListEntropySourcesHooks> = {
   hasPermission: true,
   getEntropySources: true,
+  getUnlockPromise: true,
 };
 
 export type ListEntropySourcesHooks = {
@@ -46,6 +47,13 @@ export type ListEntropySourcesHooks = {
    * @returns The entropy sources.
    */
   getEntropySources: () => EntropySource[];
+
+  /**
+   * Wait for the extension to be unlocked.
+   *
+   * @returns A promise that resolves once the extension is unlocked.
+   */
+  getUnlockPromise: (shouldShowUnlockRequest: boolean) => Promise<void>;
 };
 
 export const listEntropySourcesHandler: PermittedHandlerExport<
@@ -59,7 +67,7 @@ export const listEntropySourcesHandler: PermittedHandlerExport<
 };
 
 /**
- * The `snap_getInterfaceContext` method implementation.
+ * The `snap_listEntropySources` method implementation.
  *
  * @param _request - The JSON-RPC request object. Not used by this function.
  * @param response - The JSON-RPC response object.
@@ -70,20 +78,27 @@ export const listEntropySourcesHandler: PermittedHandlerExport<
  * @param hooks.hasPermission - The function to check if the origin has a
  * permission.
  * @param hooks.getEntropySources - The function to get the entropy sources.
+ * @param hooks.getUnlockPromise - The function to get the unlock promise.
  * @returns Noting.
  */
-function listEntropySourcesImplementation(
+async function listEntropySourcesImplementation(
   _request: JsonRpcRequest<ListEntropySourcesParams>,
   response: PendingJsonRpcResponse<ListEntropySourcesResult>,
   _next: unknown,
   end: JsonRpcEngineEndCallback,
-  { hasPermission, getEntropySources }: ListEntropySourcesHooks,
-): void {
+  {
+    hasPermission,
+    getEntropySources,
+    getUnlockPromise,
+  }: ListEntropySourcesHooks,
+): Promise<void> {
   const isPermitted = REQUIRED_PERMISSIONS.some(hasPermission);
   if (!isPermitted) {
     return end(providerErrors.unauthorized());
   }
 
+  await getUnlockPromise(true);
+
   response.result = getEntropySources();
   return end();
 }
diff --git a/packages/snaps-simulation/package.json b/packages/snaps-simulation/package.json
@@ -86,7 +86,7 @@
     "deepmerge": "^4.2.2",
     "depcheck": "^1.4.7",
     "eslint": "^9.11.0",
-    "express": "^4.18.2",
+    "express": "^4.21.2",
     "jest": "^29.0.2",
     "jest-it-up": "^2.0.0",
     "jest-silent-reporter": "^0.6.0",
diff --git a/packages/snaps-simulator/package.json b/packages/snaps-simulator/package.json
@@ -104,7 +104,7 @@
     "deepmerge": "^4.2.2",
     "depcheck": "^1.4.7",
     "eslint": "^9.11.0",
-    "express": "^4.18.2",
+    "express": "^4.21.2",
     "favicons": "^7.1.2",
     "favicons-webpack-plugin": "^6.0.0",
     "html-webpack-plugin": "^5.5.0",
diff --git a/scripts/install-chrome.sh b/scripts/install-chrome.sh
@@ -5,12 +5,12 @@ set -u
 set -o pipefail
 
 # To get the latest version, run `yarn update-chrome`
-CHROME_VERSION='133.0.6943.141-1'
+CHROME_VERSION='134.0.6998.35-1'
 CHROME_BINARY="google-chrome-stable_${CHROME_VERSION}_amd64.deb"
 CHROME_BINARY_URL="https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/${CHROME_BINARY}"
 
 # To retrieve this checksum, run the `wget` and `shasum` commands below
-CHROME_BINARY_SHA512SUM='84aad5d0f5ebd717ed8baf781e19be3c956503c0c13c4ed7b9e6e86194b2d682b8de8a1dbdb62c09b59d22b626655242046167f51a73dd40ac771e2db3aa26c7'
+CHROME_BINARY_SHA512SUM='acb6ce4a2c02e5c3db6ef067d2aab62b8097f05370c96897c9b2605e344afba6dc3f35e8def5e7370eeb9d866139c25bdd6e541256aa9b1cf679e46d58033cb6'
 
 wget -O "${CHROME_BINARY}" -t 5 "${CHROME_BINARY_URL}"
 
diff --git a/yarn.lock b/yarn.lock
