Merge branch 'main' into mikesposito/update-keyring-controller

Author: mikesposito

.github/CODEOWNERS

@@ -13,7 +13,7 @@
 # audit these changes on their own, and leave their analysis in a comment.
 # These codeowners will review this analysis, and review the policy changes in
 # further detail if warranted.
-lavamoat/                            @MetaMask/extension-devs @MetaMask/policy-reviewers @MetaMask/supply-chain
+lavamoat/                            @MetaMask/policy-reviewers
 
 # The offscreen.ts script file that is included in the offscreen document html
 # file is responsible, at present, for loading the snaps execution environment

.github/scripts/check-template-and-add-labels.ts

@@ -409,7 +409,19 @@ async function userBelongsToMetaMaskOrg(
 // This function checks if the PR description has a changelog entry
 function hasChangelogEntry(body: string): boolean {
   // Remove HTML comments (including multiline)
-  const uncommentedBody = body.replace(/<!--[\s\S]*?-->/g, "");
+  let uncommentedBody = body;
+  let prevBody;
+  let iterationCount = 0;
+  const MAX_ITERATIONS = 100;
+  do {
+    prevBody = uncommentedBody;
+    uncommentedBody = uncommentedBody.replace(/<!--[\s\S]*?-->/g, "");
+    iterationCount++;
+    if (iterationCount >= MAX_ITERATIONS) {
+      console.warn(`Reached maximum HTML comment removal iterations (${MAX_ITERATIONS}). Input may be malformed or malicious.`);
+      break;
+    }
+  } while (uncommentedBody !== prevBody);
 
   // Split body into lines
   const lines = uncommentedBody.split(/\r?\n/);

.github/workflows/create-release-pr.yml

@@ -76,20 +76,21 @@ jobs:
   create-release-pr:
     needs: [resolve-bases, resolve-previous-ref]
     name: Create Release Pull Request using Github Tools
-    uses: MetaMask/github-tools/.github/workflows/create-release-pr.yml@6a04e4d0c8c25680a7543cfcd2e2fb7125b6759c
-    with:
-      platform: extension
-      checkout-base-branch: ${{ needs.resolve-bases.outputs.checkout_base }}
-      release-pr-base-branch: ${{ needs.resolve-bases.outputs.release_base }}
-      semver-version: ${{ inputs.semver-version }}
-      previous-version-ref: ${{ needs.resolve-previous-ref.outputs.previous_ref }}
-      github-tools-version: 6a04e4d0c8c25680a7543cfcd2e2fb7125b6759c
-    secrets:
-      # This token needs write permissions to metamask-extension & read permissions to metamask-planning
-      # If called from auto-create-release-pr use the PR_TOKEN passed in as an input, if called manually use github secret token values
-      # (this is due to github limitations on fetching secrets from called workflows).
-      github-token: ${{ github.event_name == 'workflow_dispatch' && secrets.PR_TOKEN || secrets.github-token }}
-      google-application-creds-base64: ${{ github.event_name == 'workflow_dispatch' && secrets.GCP_RLS_SHEET_ACCOUNT_BASE64 || secrets.google-application-creds-base64 }}
+    runs-on: ubuntu-latest
     permissions:
       contents: write
       pull-requests: write
+    steps:
+      - name: Create Release PR
+        uses: MetaMask/github-tools/.github/actions/[email protected]
+        with:
+          platform: extension
+          checkout-base-branch: ${{ needs.resolve-bases.outputs.checkout_base }}
+          release-pr-base-branch: ${{ needs.resolve-bases.outputs.release_base }}
+          semver-version: ${{ inputs.semver-version }}
+          previous-version-ref: ${{ needs.resolve-previous-ref.outputs.previous_ref }}
+          # This token needs write permissions to metamask-extension & read permissions to metamask-planning
+          # If called from auto-create-release-pr use the PR_TOKEN passed in as an input, if called manually use github secret token values
+          # (this is due to github limitations on fetching secrets from called workflows).
+          github-token: ${{ github.event_name == 'workflow_dispatch' && secrets.PR_TOKEN || secrets.github-token }}
+          google-application-creds-base64: ${{ github.event_name == 'workflow_dispatch' && secrets.GCP_RLS_SHEET_ACCOUNT_BASE64 || secrets.google-application-creds-base64 }}

.github/workflows/merge-approved-pr.yml

@@ -0,0 +1,22 @@
+name: Merge Approved PR
+
+on:
+  # Trigger the workflow when a comment is created on an issue or pull request
+  issue_comment:
+    types: [created]
+
+jobs:
+  merge-pr:
+    # Only run if the comment is on a PR and the comment body matches exactly "Merge my PR"
+    if: >-
+      github.event.issue.pull_request &&
+      github.event.comment.body == 'Merge my PR' &&
+      (
+        github.event.comment.author_association == 'MEMBER' ||
+        github.event.comment.author_association == 'OWNER'
+      )
+    uses: MetaMask/github-tools/.github/workflows/merge-approved-pr.yml@30baa9da0b80d94dd8bdf0b6a932c46506664857
+    with:
+      pr-number: ${{ github.event.issue.number }}
+    secrets:
+      github-token: ${{ secrets.METAMASK_EXTENSION_BRANCH_SYNC_TOKEN }}

.github/workflows/update-release-changelog.yml

@@ -42,15 +42,17 @@ jobs:
     name: Update changelog
     needs: validate-branch
     if: needs.validate-branch.outputs.is-valid-release == 'true'
+    runs-on: ubuntu-latest
     permissions:
       contents: write
       pull-requests: write
-    uses: MetaMask/github-tools/.github/workflows/update-release-changelog.yml@36dc168896c1b496f35fc880ee8a3625b4b837ba
-    with:
-      release-branch: ${{ github.ref_name }}
-      repository-url: ${{ github.server_url }}/${{ github.repository }}
-      platform: extension
-      github-tools-version: 36dc168896c1b496f35fc880ee8a3625b4b837ba
-      previous-version-ref: null
-    secrets:
-      github-token: ${{ secrets.PR_TOKEN }}
+    steps:
+      - name: Update Release Changelog
+        uses: MetaMask/github-tools/.github/actions/[email protected]
+        with:
+          release-branch: ${{ github.ref_name }}
+          repository-url: ${{ github.server_url }}/${{ github.repository }}
+          platform: extension
+          previous-version-ref: 'null'
+          github-tools-version: v1.1.0
+          github-token: ${{ secrets.PR_TOKEN }}

…-controllers-npm-91.0.0-ea998cb0bd.patch …-controllers-npm-92.0.0-ea998cb0bd.patch.yarn/patches/@metamask-assets-controllers-npm-91.0.0-ea998cb0bd.patch renamed to .yarn/patches/@metamask-assets-controllers-npm-92.0.0-ea998cb0bd.patch .yarn/patches/@metamask-assets-controllers-npm-91.0.0-ea998cb0bd.patch renamed to .yarn/patches/@metamask-assets-controllers-npm-92.0.0-ea998cb0bd.patch

@@ -1,64 +1,7 @@
-diff --git a/dist/TokenBalancesController.cjs b/dist/TokenBalancesController.cjs
-index 4918812dde60b8d0e24a7bded27d88f233968858..4e8018bce92b9e5d47fc40784409e16db22be615 100644
---- a/dist/TokenBalancesController.cjs
-+++ b/dist/TokenBalancesController.cjs
-@@ -535,14 +535,16 @@ class TokenBalancesController extends (0, polling_controller_1.StaticIntervalPol
-             }
-             // Update with actual fetched balances only if the value has changed
-             aggregated.forEach(({ success, value, account, token, chainId }) => {
--                var _a, _b, _c;
-+                var _a, _b;
-                 if (success && value !== undefined) {
-+                    // Ensure all accounts we add/update are in lower-case
-+                    const lowerCaseAccount = account.toLowerCase();
-                     const newBalance = (0, controller_utils_1.toHex)(value);
-                     const tokenAddress = checksum(token);
--                    const currentBalance = d.tokenBalances[account]?.[chainId]?.[tokenAddress];
-+                    const currentBalance = d.tokenBalances[lowerCaseAccount]?.[chainId]?.[tokenAddress];
-                     // Only update if the balance has actually changed
-                     if (currentBalance !== newBalance) {
--                        ((_c = ((_a = d.tokenBalances)[_b = account] ?? (_a[_b] = {})))[chainId] ?? (_c[chainId] = {}))[tokenAddress] = newBalance;
-+                        ((_b = ((_a = d.tokenBalances)[lowerCaseAccount] ?? (_a[lowerCaseAccount] = {})))[chainId] ?? (_b[chainId] = {}))[tokenAddress] = newBalance;
-                     }
-                 }
-             });
-diff --git a/dist/TokenBalancesController.mjs b/dist/TokenBalancesController.mjs
-index f64d13f8de56631345a44e6ebb025e62e03f51bc..99aa7f27c574c94b26daa56091ac50d15281dd30 100644
---- a/dist/TokenBalancesController.mjs
-+++ b/dist/TokenBalancesController.mjs
-@@ -531,14 +531,16 @@ export class TokenBalancesController extends StaticIntervalPollingController() {
-             }
-             // Update with actual fetched balances only if the value has changed
-             aggregated.forEach(({ success, value, account, token, chainId }) => {
--                var _a, _b, _c;
-+                var _a, _b;
-                 if (success && value !== undefined) {
-+                    // Ensure all accounts we add/update are in lower-case
-+                    const lowerCaseAccount = account.toLowerCase();
-                     const newBalance = toHex(value);
-                     const tokenAddress = checksum(token);
--                    const currentBalance = d.tokenBalances[account]?.[chainId]?.[tokenAddress];
-+                    const currentBalance = d.tokenBalances[lowerCaseAccount]?.[chainId]?.[tokenAddress];
-                     // Only update if the balance has actually changed
-                     if (currentBalance !== newBalance) {
--                        ((_c = ((_a = d.tokenBalances)[_b = account] ?? (_a[_b] = {})))[chainId] ?? (_c[chainId] = {}))[tokenAddress] = newBalance;
-+                        ((_b = ((_a = d.tokenBalances)[lowerCaseAccount] ?? (_a[lowerCaseAccount] = {})))[chainId] ?? (_b[chainId] = {}))[tokenAddress] = newBalance;
-                     }
-                 }
-             });
 diff --git a/dist/token-prices-service/codefi-v2.cjs b/dist/token-prices-service/codefi-v2.cjs
 index ba0f0c1bcbf0f231549b1ca9d3be2d1137a0d732..49af7c70a2f05d6587d960a227a724084333a942 100644
 --- a/dist/token-prices-service/codefi-v2.cjs
 +++ b/dist/token-prices-service/codefi-v2.cjs
-@@ -100,6 +100,8 @@ exports.SUPPORTED_CURRENCIES = [
-     'mxn',
-     // Malaysian Ringgit
-     'myr',
-+    // Monad
-+    'mon',
-     // Nigerian Naira
-     'ngn',
-     // Norwegian Krone
 @@ -220,43 +222,43 @@ exports.getNativeTokenAddress = getNativeTokenAddress;
  // Source: https://github.com/consensys-vertical-apps/va-mmcx-price-api/blob/main/src/constants/slip44.ts
  // We can only support PricesAPI V3 for EVM chains that have a CAIP-19 native asset mapping.
@@ -150,15 +93,6 @@ diff --git a/dist/token-prices-service/codefi-v2.mjs b/dist/token-prices-service
 index f8e7c25451281ffea43fd0425f9c2a7950ce1214..e9ef4e4a6a8f0156f8280621654c1098bf942063 100644
 --- a/dist/token-prices-service/codefi-v2.mjs
 +++ b/dist/token-prices-service/codefi-v2.mjs
-@@ -97,6 +97,8 @@ export const SUPPORTED_CURRENCIES = [
-     'mxn',
-     // Malaysian Ringgit
-     'myr',
-+    // Monad
-+    'mon',
-     // Nigerian Naira
-     'ngn',
-     // Norwegian Krone
 @@ -216,43 +218,43 @@ export const getNativeTokenAddress = (chainId) => chainIdToNativeTokenAddress[ch
  // Source: https://github.com/consensys-vertical-apps/va-mmcx-price-api/blob/main/src/constants/slip44.ts
  // We can only support PricesAPI V3 for EVM chains that have a CAIP-19 native asset mapping.

CHANGELOG.md

@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [13.11.2]
+
+### Fixed
+
+- fix: upgrade bitcoin snap (#38437)
+
+## [13.11.1]
+
+### Fixed
+
+- Fixes a crash when updating Flask (#38382)
+
 ## [13.11.0]
 
 ### Added
@@ -1328,7 +1340,9 @@ authorized by the user.` error until the user fully revoked dapp
 - This changelog was split off with 12.22.0
 - All older changes can be found in [docs/CHANGELOG_older.md](https://github.com/MetaMask/metamask-extension/blob/main/docs/CHANGELOG_older.md)
 
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v13.11.0...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v13.11.2...HEAD
+[13.11.2]: https://github.com/MetaMask/metamask-extension/compare/v13.11.1...v13.11.2
+[13.11.1]: https://github.com/MetaMask/metamask-extension/compare/v13.11.0...v13.11.1
 [13.11.0]: https://github.com/MetaMask/metamask-extension/compare/v13.10.4...v13.11.0
 [13.10.4]: https://github.com/MetaMask/metamask-extension/compare/v13.10.3...v13.10.4
 [13.10.3]: https://github.com/MetaMask/metamask-extension/compare/v13.10.2...v13.10.3