Merge remote-tracking branch 'origin/main' into fix/mul-924

Author: montelaidev

.depcheckrc.yml

@@ -96,6 +96,8 @@ ignores:
   - '@metamask/bitcoin-wallet-snap'
   - '@metamask/solana-wallet-snap'
   - '@metamask/institutional-wallet-snap'
+  - '@metamask/gator-permissions-snap'
+  - '@metamask/permissions-kernel-snap'
 
 # files depcheck should not parse
 ignorePatterns:

.github/scripts/push-firefox-bundle-script.sh

@@ -9,7 +9,16 @@ fi
 
 git config --global user.name "MetaMask Bot"
 git config --global user.email [email protected]
-version=$(git show -s --format='%s' HEAD | grep -Eo 'v[0-9]+\.[0-9]+\.[0-9]+')
+rawVersion=$(git show -s --format='%s' HEAD | grep -Eo 'release/[0-9]+\.[0-9]+\.[0-9]+' | sed 's|release/||')
+version="v${rawVersion}"
+
+# Validate that the version was successfully extracted
+if [[ -z "${rawVersion}" ]]; then
+    echo "::error:: Failed to extract version from commit message. Ensure it follows the 'release/x.y.z' format."
+    exit 1
+fi
+
+echo "Version extracted: ${version}"
 
 git clone "https://${FIREFOX_BUNDLE_SCRIPT_TOKEN}@github.com/MetaMask/firefox-bundle-script.git"
 cd firefox-bundle-script

.github/scripts/release-create-gh-release.sh

@@ -47,8 +47,8 @@ function publish_tag() {
 
 current_commit_msg=$(git show -s --format='%s' HEAD)
 
-if [[ "${current_commit_msg}" =~ Version[-[:space:]](v[[:digit:]]+.[[:digit:]]+.[[:digit:]]+) ]]; then
-    tag="${BASH_REMATCH[1]}"
+if [[ "${current_commit_msg}" =~ release/([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+) ]]; then
+    tag="v${BASH_REMATCH[1]}"
     flask_version="$(print_build_version 'flask')"
 
     printf '%s\n' 'Creating GitHub Release'

.yarn/patches/@metamask-assets-controllers-npm-75.2.0-26c7526112.patch renamed to .yarn/patches/@metamask-assets-controllers-npm-76.0.0-95e99a2835.patch

@@ -1,5 +1,5 @@
 diff --git a/dist/assetsUtil.cjs b/dist/assetsUtil.cjs
-index b3db76c39d78362273ff081d8c8efe30040ffc28..e2437a3a8f6e027d86849d2e597791c3fc4ce7b0 100644
+index b3db76c39d78362273ff081d8c8efe30040ffc28..cab60d3a8541ad0459112638f027c7e303b68b1e 100644
 --- a/dist/assetsUtil.cjs
 +++ b/dist/assetsUtil.cjs
 @@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
@@ -10,12 +10,11 @@ index b3db76c39d78362273ff081d8c8efe30040ffc28..e2437a3a8f6e027d86849d2e597791c3
  exports.accountAddressToCaipReference = exports.getKeyByValue = exports.fetchTokenContractExchangeRates = exports.reduceInBatchesSerially = exports.divideIntoBatches = exports.ethersBigNumberToBN = exports.addUrlProtocolPrefix = exports.getFormattedIpfsUrl = exports.getIpfsCIDv1AndPath = exports.removeIpfsProtocolPrefix = exports.isTokenListSupportedForNetwork = exports.isTokenDetectionSupportedForNetwork = exports.SupportedStakedBalanceNetworks = exports.SupportedTokenDetectionNetworks = exports.formatIconUrlWithProxy = exports.formatAggregatorNames = exports.hasNewCollectionFields = exports.compareNftMetadata = exports.TOKEN_PRICES_BATCH_SIZE = void 0;
  const controller_utils_1 = require("@metamask/controller-utils");
  const utils_1 = require("@metamask/utils");
-@@ -240,7 +241,13 @@ async function getIpfsCIDv1AndPath(ipfsUrl) {
+@@ -240,7 +241,12 @@ async function getIpfsCIDv1AndPath(ipfsUrl) {
      const index = url.indexOf('/');
      const cid = index !== -1 ? url.substring(0, index) : url;
      const path = index !== -1 ? url.substring(index) : undefined;
 -    const { CID } = await import("multiformats");
-+    // Use CJS require to allow Jest to parse without ESM transform
 +    // Dynamic import is used here in `core` for CJS compatbility, because 'multiformats' is ESM-
 +    // only. However, dynamic import is not supported by LavaMoat.
 +    // See here for details: https://github.com/MetaMask/metamask-extension/pull/27629#discussion_r1791797810

CHANGELOG.md

@@ -7,6 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [13.3.1]
+
+### Fixed
+
+- fix: fixes issues with balances not updating on Solana (#36129)
+- fix: improves Solana account synchronization and WebSocket subscriptions (#36129)
+- fix: adds multichain asset prices polling to ensure Solana chart always displays up-to-date price data (#36175)
+- fix: adds support for signing transactions where the fee payer differs from the user's account (#36251)
+
 ## [13.3.0]
 
 ### Added
@@ -587,7 +596,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - 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.3.0...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v13.3.1...HEAD
+[13.3.1]: https://github.com/MetaMask/metamask-extension/compare/v13.3.0...v13.3.1
 [13.3.0]: https://github.com/MetaMask/metamask-extension/compare/v13.2.3...v13.3.0
 [13.2.3]: https://github.com/MetaMask/metamask-extension/compare/v13.2.2...v13.2.3
 [13.2.2]: https://github.com/MetaMask/metamask-extension/compare/v13.2.1...v13.2.2

app/_locales/en/messages.json

@@ -50,6 +50,7 @@ import { isStateCorruptionError } from '../../shared/constants/errors';
 import getFirstPreferredLangCode from '../../shared/lib/get-first-preferred-lang-code';
 import { getManifestFlags } from '../../shared/lib/manifestFlags';
 import { DISPLAY_GENERAL_STARTUP_ERROR } from '../../shared/constants/start-up-errors';
+import { HYPERLIQUID_ORIGIN } from '../../shared/constants/referrals';
 import {
   CorruptionHandler,
   hasVault,
@@ -91,6 +92,7 @@ import { createEvent } from './lib/deep-links/metrics';
 import { getRequestSafeReload } from './lib/safe-reload';
 import { tryPostMessage } from './lib/start-up-errors/start-up-errors';
 import { CronjobControllerStorageManager } from './lib/CronjobControllerStorageManager';
+import { HyperliquidPermissionTriggerType } from './lib/createHyperliquidReferralMiddleware';
 
 /**
  * @typedef {import('./lib/stores/persistence-manager').Backup} Backup
@@ -145,6 +147,7 @@ let uiIsTriggering = false;
 const openMetamaskTabsIDs = {};
 const requestAccountTabIds = {};
 let controller;
+const senderOriginMapping = {};
 const tabOriginMapping = {};
 
 if (inTest || process.env.METAMASK_DEBUG) {
@@ -935,16 +938,26 @@ function emitDappViewedMetricEvent(origin) {
  * @param {chrome.runtime.Port} remotePort - The port provided by a new context.
  */
 function trackDappView(remotePort) {
-  if (!remotePort.sender || !remotePort.sender.tab || !remotePort.sender.url) {
+  if (
+    !remotePort.sender?.tab ||
+    !remotePort.sender?.url ||
+    !remotePort.sender?.tab?.url
+  ) {
     return;
   }
   const tabId = remotePort.sender.tab.id;
   const url = new URL(remotePort.sender.url);
   const { origin } = url;
+  const tabUrl = new URL(remotePort.sender.tab.url);
+  const { origin: tabOrigin } = tabUrl;
 
-  // store the orgin to corresponding tab so it can provide infor for onActivated listener
-  if (!Object.keys(tabOriginMapping).includes(tabId)) {
-    tabOriginMapping[tabId] = origin;
+  // store the origin to corresponding tab so it can provide info for onActivated listener
+  if (!Object.keys(senderOriginMapping).includes(tabId)) {
+    senderOriginMapping[tabId] = origin;
+  }
+  // do the same for tab origin, which can be different to sender origin
+  if (!(tabId in tabOriginMapping)) {
+    tabOriginMapping[tabId] = tabOrigin;
   }
 
   const isConnectedToDapp = controller.controllerMessenger.call(
@@ -1579,7 +1592,8 @@ function onNavigateToTab() {
   browser.tabs.onActivated.addListener((onActivatedTab) => {
     if (controller) {
       const { tabId } = onActivatedTab;
-      const currentOrigin = tabOriginMapping[tabId];
+      const currentOrigin = senderOriginMapping[tabId];
+      const currentTabOrigin = tabOriginMapping[tabId];
       // *** Emit DappViewed metric event when ***
       // - navigate to a connected dapp
       if (currentOrigin) {
@@ -1591,6 +1605,27 @@ function onNavigateToTab() {
           emitDappViewedMetricEvent(currentOrigin);
         }
       }
+
+      // If the connected dApp is Hyperliquid, trigger the referral flow
+      if (currentTabOrigin === HYPERLIQUID_ORIGIN) {
+        const connectSitePermissions =
+          controller.permissionController.state.subjects[currentTabOrigin];
+        // when the dapp is not connected, connectSitePermissions is undefined
+        const isConnectedToDapp = connectSitePermissions !== undefined;
+        if (isConnectedToDapp) {
+          controller
+            .handleHyperliquidReferral(
+              tabId,
+              HyperliquidPermissionTriggerType.OnNavigateConnectedTab,
+            )
+            .catch((error) => {
+              log.error(
+                'Failed to handle Hyperliquid referral after navigation to connected tab: ',
+                error,
+              );
+            });
+        }
+      }
     }
   });
 }

app/_locales/en_GB/messages.json

@@ -39,4 +39,16 @@ export const PREINSTALLED_SNAPS_URLS = [
     // @ts-expect-error TS1470: 'import.meta' is not allowed in CommonJS
     import.meta.url,
   ),
+  ///: BEGIN:ONLY_INCLUDE_IF(gator-permissions)
+  new URL(
+    '@metamask/permissions-kernel-snap/dist/preinstalled-snap.json',
+    // @ts-expect-error TS1470: 'import.meta' is not allowed in CommonJS
+    import.meta.url,
+  ),
+  new URL(
+    '@metamask/gator-permissions-snap/dist/preinstalled-snap.json',
+    // @ts-expect-error TS1470: 'import.meta' is not allowed in CommonJS
+    import.meta.url,
+  ),
+  ///: END:ONLY_INCLUDE_IF
 ];