Merge branch 'main' into ogp/enable-max-withdraw-to-ma

Author: OGPoyraz

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/core-monorepo",
-  "version": "1119.0.0",
+  "version": "1120.0.0",
   "private": true,
   "description": "Monorepo for packages shared between MetaMask clients",
   "repository": {

packages/transaction-pay-controller/CHANGELOG.md

@@ -7,14 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [24.1.0]
+
 ### Added
 
 - Enable max-amount Relay bridge flows to deposit settled mUSD into the Money Account vault via a post-Relay sponsored deposit ([#9497](https://github.com/MetaMask/core/pull/9497))
+- Add `getStablecoins` feature flag reader that resolves the stablecoin list from the `stable-tokens` LaunchDarkly flag, falling back to the hardcoded constant when absent ([#9495](https://github.com/MetaMask/core/pull/9495))
 - Add generic signature steps to the server pay strategy, supporting EIP-712 sign-then-POST flows ([#9051](https://github.com/MetaMask/core/pull/9051))
   - Trigger quote refresh when `txParams.to` or `requiredAssets` changes on a transaction, in addition to the existing `txParams.data` trigger
 
 ### Changed
 
+- Replace hardcoded `STABLECOINS` usage in `token.ts` and `relay-quotes.ts` with the remotely configurable `getStablecoins(messenger)` lookup ([#9495](https://github.com/MetaMask/core/pull/9495))
 - Bump `@metamask/assets-controller` from `^10.2.1` to `^11.0.0` ([#9485](https://github.com/MetaMask/core/pull/9485))
 - Bump `@metamask/ramps-controller` from `^16.0.0` to `^17.0.0` ([#9491](https://github.com/MetaMask/core/pull/9491))
 
@@ -1286,7 +1290,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Initial release ([#6820](https://github.com/MetaMask/core/pull/6820))
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/transaction-pay-controller@24.0.3...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/transaction-pay-controller@24.1.0...HEAD
+[24.1.0]: https://github.com/MetaMask/core/compare/@metamask/transaction-pay-controller@24.0.3...@metamask/transaction-pay-controller@24.1.0
 [24.0.3]: https://github.com/MetaMask/core/compare/@metamask/transaction-pay-controller@24.0.2...@metamask/transaction-pay-controller@24.0.3
 [24.0.2]: https://github.com/MetaMask/core/compare/@metamask/transaction-pay-controller@24.0.1...@metamask/transaction-pay-controller@24.0.2
 [24.0.1]: https://github.com/MetaMask/core/compare/@metamask/transaction-pay-controller@24.0.0...@metamask/transaction-pay-controller@24.0.1

packages/transaction-pay-controller/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/transaction-pay-controller",
-  "version": "24.0.3",
+  "version": "24.1.0",
   "description": "Manages alternate payment strategies to provide required funds for transactions in MetaMask",
   "keywords": [
     "Ethereum",

packages/transaction-pay-controller/src/strategy/relay/relay-quotes.ts

@@ -21,7 +21,6 @@ import {
   NATIVE_TOKEN_ADDRESS,
   PERPS_DEPOSIT_TYPES,
   USDC_DECIMALS,
-  STABLECOINS,
   PaymentOverride,
 } from '../../constants';
 import { projectLogger } from '../../logger';
@@ -38,6 +37,7 @@ import {
   getFeatureFlags,
   getRelayOriginGasOverhead,
   getSlippage,
+  getStablecoins,
   isEIP7702Chain,
   isRelayExecuteEnabled,
 } from '../../utils/feature-flags';
@@ -626,7 +626,7 @@ async function normalizeQuote(
     usdToFiatRate,
   );
 
-  const subsidizedFeeUsd = getSubsidizedFeeAmountUsd(quote);
+  const subsidizedFeeUsd = getSubsidizedFeeAmountUsd(messenger, quote);
 
   const appFeeUsd = new BigNumber(quote.fees?.app?.amountUsd ?? '0');
   const metaMaskFee = getFiatValueFromUsd(appFeeUsd, usdToFiatRate);
@@ -667,6 +667,7 @@ async function normalizeQuote(
   };
 
   const isTargetStablecoin = isStablecoin(
+    messenger,
     request.targetChainId,
     request.targetTokenAddress,
   );
@@ -1243,7 +1244,10 @@ function getTransferRecipient(data: Hex): Hex {
     .decodeFunctionData('transfer', data)
     .to.toLowerCase();
 }
-function getSubsidizedFeeAmountUsd(quote: RelayQuote): BigNumber {
+function getSubsidizedFeeAmountUsd(
+  messenger: TransactionPayControllerMessenger,
+  quote: RelayQuote,
+): BigNumber {
   const subsidizedFee = quote.fees?.subsidized;
   const amountUsd = new BigNumber(subsidizedFee?.amountUsd ?? '0');
   const amountFormatted = new BigNumber(subsidizedFee?.amountFormatted ?? '0');
@@ -1253,15 +1257,22 @@ function getSubsidizedFeeAmountUsd(quote: RelayQuote): BigNumber {
   }
 
   const isSubsidizedStablecoin = isStablecoin(
+    messenger,
     toHex(subsidizedFee.currency.chainId),
     subsidizedFee.currency.address,
   );
 
   return isSubsidizedStablecoin ? amountFormatted : amountUsd;
 }
 
-function isStablecoin(chainId: string, tokenAddress: string): boolean {
+function isStablecoin(
+  messenger: TransactionPayControllerMessenger,
+  chainId: string,
+  tokenAddress: string,
+): boolean {
   return Boolean(
-    STABLECOINS[chainId as Hex]?.includes(tokenAddress.toLowerCase() as Hex),
+    getStablecoins(messenger)[chainId as Hex]?.includes(
+      tokenAddress.toLowerCase() as Hex,
+    ),
   );
 }

packages/transaction-pay-controller/src/utils/feature-flags.test.ts

@@ -31,6 +31,7 @@ import {
   getRelayOriginGasOverhead,
   getRelayPollingInterval,
   getRelayPollingTimeout,
+  getStablecoins,
   isChainExcludedFromInfura,
   isEIP7702Chain,
   isRelayExecuteEnabled,
@@ -1943,4 +1944,85 @@ describe('Feature Flags Utils', () => {
       ).toBe(DEFAULT_HYPERLIQUID_ACTIVATION_FEE_USD);
     });
   });
+
+  describe('getStablecoins', () => {
+    it('returns hardcoded fallback when flag is absent', () => {
+      const result = getStablecoins(messenger);
+      expect(result).toHaveProperty('0x1');
+      expect(result['0x1' as Hex]).toContain(
+        '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+      );
+    });
+
+    it('returns flag value when stable-tokens is a valid object', () => {
+      const flagValue = {
+        '0x1': ['0xaaa', '0xbbb'],
+        '0xa4b1': ['0xccc'],
+      };
+
+      getRemoteFeatureFlagControllerStateMock.mockReturnValue({
+        ...getDefaultRemoteFeatureFlagControllerState(),
+        remoteFeatureFlags: {
+          'stable-tokens': flagValue,
+        },
+      });
+
+      expect(getStablecoins(messenger)).toStrictEqual(flagValue);
+    });
+
+    it('normalizes addresses and chain IDs to lowercase', () => {
+      getRemoteFeatureFlagControllerStateMock.mockReturnValue({
+        ...getDefaultRemoteFeatureFlagControllerState(),
+        remoteFeatureFlags: {
+          'stable-tokens': {
+            '0xA4B1': ['0xAf88d065e77c8cC2239327C5EDb3A432268e5831'],
+          },
+        },
+      });
+
+      const result = getStablecoins(messenger);
+      expect(result).toStrictEqual({
+        '0xa4b1': ['0xaf88d065e77c8cc2239327c5edb3a432268e5831'],
+      });
+    });
+
+    it('skips non-array entries in flag value', () => {
+      getRemoteFeatureFlagControllerStateMock.mockReturnValue({
+        ...getDefaultRemoteFeatureFlagControllerState(),
+        remoteFeatureFlags: {
+          'stable-tokens': {
+            '0x1': ['0xaaa'],
+            '0xa4b1': 'not-an-array',
+          },
+        },
+      });
+
+      const result = getStablecoins(messenger);
+      expect(result).toStrictEqual({ '0x1': ['0xaaa'] });
+    });
+
+    it('returns fallback when flag is an array', () => {
+      getRemoteFeatureFlagControllerStateMock.mockReturnValue({
+        ...getDefaultRemoteFeatureFlagControllerState(),
+        remoteFeatureFlags: {
+          'stable-tokens': ['not', 'an', 'object'],
+        },
+      });
+
+      const result = getStablecoins(messenger);
+      expect(result).toHaveProperty('0x1');
+    });
+
+    it('returns fallback when flag is a primitive', () => {
+      getRemoteFeatureFlagControllerStateMock.mockReturnValue({
+        ...getDefaultRemoteFeatureFlagControllerState(),
+        remoteFeatureFlags: {
+          'stable-tokens': true,
+        },
+      });
+
+      const result = getStablecoins(messenger);
+      expect(result).toHaveProperty('0x1');
+    });
+  });
 });

packages/transaction-pay-controller/src/utils/feature-flags.ts

@@ -4,7 +4,11 @@ import { createModuleLogger } from '@metamask/utils';
 import { BigNumber } from 'bignumber.js';
 import { uniq } from 'lodash';
 
-import { isTransactionPayStrategy, TransactionPayStrategy } from '../constants';
+import {
+  isTransactionPayStrategy,
+  STABLECOINS,
+  TransactionPayStrategy,
+} from '../constants';
 import { projectLogger } from '../logger';
 import type { TransactionPayFiatAsset } from '../strategy/fiat/constants';
 import {
@@ -524,6 +528,38 @@ export function getFeatureFlags(
   return result;
 }
 
+/**
+ * Get the stablecoins map from the `stable-tokens` feature flag.
+ * Falls back to the hardcoded {@link STABLECOINS} constant when the flag is
+ * absent or not a valid object.
+ *
+ * @param messenger - Controller messenger.
+ * @returns Stablecoins keyed by chain ID.
+ */
+export function getStablecoins(
+  messenger: TransactionPayControllerMessenger,
+): Record<Hex, Hex[]> {
+  const state = messenger.call('RemoteFeatureFlagController:getState');
+  const flag = state.remoteFeatureFlags?.['stable-tokens'];
+
+  if (flag && typeof flag === 'object' && !Array.isArray(flag)) {
+    const raw = flag as Record<string, string[]>;
+    return Object.entries(raw).reduce<Record<Hex, Hex[]>>(
+      (acc, [chainId, addresses]) => {
+        if (Array.isArray(addresses)) {
+          acc[chainId.toLowerCase() as Hex] = addresses.map(
+            (a) => a.toLowerCase() as Hex,
+          );
+        }
+        return acc;
+      },
+      {},
+    );
+  }
+
+  return STABLECOINS;
+}
+
 /**
  * Get Pay Strategies configuration.
  *

packages/transaction-pay-controller/src/utils/token.ts

@@ -10,11 +10,11 @@ import {
   CHAIN_ID_POLYGON,
   NATIVE_TOKEN_ADDRESS,
   SLIP44_COIN_TYPE_BY_CHAIN,
-  STABLECOINS,
 } from '../constants';
 import type { FiatRates, TransactionPayControllerMessenger } from '../types';
 import {
   getAssetsUnifyStateFeature,
+  getStablecoins,
   isChainExcludedFromInfura,
 } from './feature-flags';
 import { getNetworkClientId, rpcRequest } from './provider';
@@ -209,7 +209,7 @@ export function getTokenFiatRate(
   if (nativeToFiatRate === null || nativeToUsdRate === null) {
     return undefined;
   }
-  const isStablecoin = STABLECOINS[chainId]?.includes(
+  const isStablecoin = getStablecoins(messenger)[chainId]?.includes(
     tokenAddress.toLowerCase() as Hex,
   );