From 472fb128a1ab46a76cd76d1e0b8d9cce0762dad8 Mon Sep 17 00:00:00 2001 From: MetaMask Bot Date: Fri, 6 Sep 2024 18:41:26 +0000 Subject: [PATCH 01/43] Version v12.3.0 --- CHANGELOG.md | 361 ++++++++++++++++++++++++++++++++++++++++++++++++++- package.json | 2 +- 2 files changed, 361 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 57c1da0402c6..b755f577c9b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,364 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [12.3.0] +### Uncategorized +- Merge branch 'Version-v12.2.0' into Version-v12.3.0 +- Merge remote-tracking branch 'origin/master' into Version-v12.2.0 +- CherryPick: "fix: issue where `wallet_addEtherumChain` was incorrectly enforcing inclusion of a blockExplorerUrls property which is not required (#26938)" ([#26938](https://github.com/MetaMask/metamask-extension/pull/26938)) +- fix: update notifications events (#26807) ([#26807](https://github.com/MetaMask/metamask-extension/pull/26807)) +- Update v12.2.0 with changes from v12.1.2 ([#26895](https://github.com/MetaMask/metamask-extension/pull/26895)) +- Merge remote-tracking branch 'origin/master' into sync-v12.1.2 +- perf(cherry-pick): use an interstitial page to load `popup.html`; load scripts using `defer`ed script tags (#26555) ([#26555](https://github.com/MetaMask/metamask-extension/pull/26555)) +- v12.2.0 sync v12.1.1 ([#26842](https://github.com/MetaMask/metamask-extension/pull/26842)) +- Merge branch 'Version-v12.2.0' into v12.2.0-sync-v12.1.1 +- ci: Prevent E2E timeouts on release changes (#26846) [cherry-pick] ([#26846](https://github.com/MetaMask/metamask-extension/pull/26846)) +- Fix type error +- Fix changelog merge conflicts +- Update LavaMoat policies +- Run yarn dedupe +- Update LavaMoat policies +- Merge branch 'Version-v12.2.0' into v12.2.0-sync-v12.1.1 +- chore: MMI adds cherry pick for PR 25967 ([#26736](https://github.com/MetaMask/metamask-extension/pull/26736)) +- Merge remote-tracking branch 'origin/Version-v12.2.0' into v12.2.0-sync-v12.1.1 +- Merge remote-tracking branch 'origin/master' into v12.2.0-sync-v12.1.1 +- fix(cherry-pick): remove BTC accounts from send flow (#26271) ([#26271](https://github.com/MetaMask/metamask-extension/pull/26271)) +- feat(cherry-pick): support creation of Bitcoin testnet accounts (#25772) ([#25772](https://github.com/MetaMask/metamask-extension/pull/25772)) +- fix(cherry-pick): remove btc account from permission connect lists (#25980) ([#25980](https://github.com/MetaMask/metamask-extension/pull/25980)) +- fix(cherry-pick): remove submitRequest from dapp permission (#26319) ([#26319](https://github.com/MetaMask/metamask-extension/pull/26319)) +- chore: update @metamask/bitcoin-wallet-snap to 0.5.0 ([#26701](https://github.com/MetaMask/metamask-extension/pull/26701)) +- chore: update @metamask/bitcoin-wallet-snap to 0.4.0 ([#26229](https://github.com/MetaMask/metamask-extension/pull/26229)) +- chore: update @metamask/bitcoin-wallet-snap to 0.3.0 ([#26168](https://github.com/MetaMask/metamask-extension/pull/26168)) +- chore: update Bitcoin Snap to version 0.2.5 ([#26058](https://github.com/MetaMask/metamask-extension/pull/26058)) +- fix(multichain): use accounts{Added,Removed} to fetch/clear balances ([#25884](https://github.com/MetaMask/metamask-extension/pull/25884)) +- feat: add BTC support survey link ([#25875](https://github.com/MetaMask/metamask-extension/pull/25875)) +- Cherrypick flaky test fix 12.2.0 ([#26747](https://github.com/MetaMask/metamask-extension/pull/26747)) +- chore: cherry pick remove token and nft detection modals (#26403) ([#26403](https://github.com/MetaMask/metamask-extension/pull/26403)) +- Synchronize v12.2.0 RC with v12.1.0 ([#26729](https://github.com/MetaMask/metamask-extension/pull/26729)) +- Merge remote-tracking branch 'origin/master' into v12.2.0-sync-master +- v12.2.0 sync with v12.1.0 ([#26695](https://github.com/MetaMask/metamask-extension/pull/26695)) +- Fix Sentry state merge conflict error +- fix cherry-pick test: UX: Multichain: Add E2E for signaling network change from Netwo… ([#26704](https://github.com/MetaMask/metamask-extension/pull/26704)) +- test: Removed step from e2e tests ([#25910](https://github.com/MetaMask/metamask-extension/pull/25910)) +- Update LavaMoat policies +- Resolve changelog conflicts +- DResolve audit advisory +- Merge remote-tracking branch 'origin/Version-v12.1.0' into v12.2.0-sync-with-v12.1.0 +- Patch fix for initial connections in preinstalled Snaps ([#26602](https://github.com/MetaMask/metamask-extension/pull/26602)) +- add version in changelog/package.json files ([#25766](https://github.com/MetaMask/metamask-extension/pull/25766)) +- chore: Master sync ([#26395](https://github.com/MetaMask/metamask-extension/pull/26395)) +- chore: Bump Snaps packages ([#26086](https://github.com/MetaMask/metamask-extension/pull/26086)) +- fix: Improve AccountListMenu/Item performance ([#26379](https://github.com/MetaMask/metamask-extension/pull/26379)) +- fix: Codespaces `corepack enable` ([#25161](https://github.com/MetaMask/metamask-extension/pull/25161)) +- fix: display toast message if user quickly sends transaction on different networks ([#26114](https://github.com/MetaMask/metamask-extension/pull/26114)) +- fix: problem with origins in the Snaps permission UI ([#26422](https://github.com/MetaMask/metamask-extension/pull/26422)) +- feat: Add abstraction for Snaps permissions ([#25175](https://github.com/MetaMask/metamask-extension/pull/25175)) +- test: add transaction contract interaction integration tests ([#26272](https://github.com/MetaMask/metamask-extension/pull/26272)) +- fix: timeout and "Rerun failed tests" ([#26239](https://github.com/MetaMask/metamask-extension/pull/26239)) +- chore: migrate BridgeController to BaseController v2 ([#26109](https://github.com/MetaMask/metamask-extension/pull/26109)) +- feat: Enable why did you render ([#26339](https://github.com/MetaMask/metamask-extension/pull/26339)) +- fix: Delete invalid `SelectedNetworkController` state ([#26428](https://github.com/MetaMask/metamask-extension/pull/26428)) +- test: ensure bridge button handles clicks according to feature flags ([#25812](https://github.com/MetaMask/metamask-extension/pull/25812)) +- build(webpack): polyfill `setImmediate` ([#26398](https://github.com/MetaMask/metamask-extension/pull/26398)) +- feat: feature-flagged cross-chain swaps route [METABRIDGE-867] ([#25811](https://github.com/MetaMask/metamask-extension/pull/25811)) +- chore: Remove i18n translations from Developer Options Settings Page ([#26380](https://github.com/MetaMask/metamask-extension/pull/26380)) +- fix: Do not break application if no token details are found using getTokenStandardAndDetails ([#26324](https://github.com/MetaMask/metamask-extension/pull/26324)) +- fix: Flaky contract interaction test ([#26420](https://github.com/MetaMask/metamask-extension/pull/26420)) +- fix: Enter key on Create Account checkbox should not trigger show/hide ([#26394](https://github.com/MetaMask/metamask-extension/pull/26394)) +- fix: notifications use better events ([#26410](https://github.com/MetaMask/metamask-extension/pull/26410)) +- fix: Restore snaps-controllers version following patch ([#26412](https://github.com/MetaMask/metamask-extension/pull/26412)) +- fix: Improve hex copy button ([#26384](https://github.com/MetaMask/metamask-extension/pull/26384)) +- refactor: use core profile syncing controllers. ([#26370](https://github.com/MetaMask/metamask-extension/pull/26370)) +- test: snap account contract interaction ([#26234](https://github.com/MetaMask/metamask-extension/pull/26234)) +- feat: updated SSK version in e2e and added test for creating multiple… ([#26378](https://github.com/MetaMask/metamask-extension/pull/26378)) +- Merge origin/develop into master-sync +- chore: MMI move duck and selector to TS ([#26125](https://github.com/MetaMask/metamask-extension/pull/26125)) +- refactor(notifications): use contentful package as dev dependency ([#26381](https://github.com/MetaMask/metamask-extension/pull/26381)) +- fix: remove submitRequest from dapp permission ([#26319](https://github.com/MetaMask/metamask-extension/pull/26319)) +- feat: Add integration test for blockaid on contract interaction ([#26366](https://github.com/MetaMask/metamask-extension/pull/26366)) +- refactor: add performance tracing infrastructure ([#26044](https://github.com/MetaMask/metamask-extension/pull/26044)) +- refactor: replace deprecated mixins with Text component in slippage-buttons ([#25638](https://github.com/MetaMask/metamask-extension/pull/25638)) +- refactor: replace deprecated mixins with text component in loading-swaps-quotes ([#25553](https://github.com/MetaMask/metamask-extension/pull/25553)) +- feat: Add metrics for alerts (transactions redesign) ([#26121](https://github.com/MetaMask/metamask-extension/pull/26121)) +- fix(25350): fix flakey token importing e2e test ([#26351](https://github.com/MetaMask/metamask-extension/pull/26351)) +- fix: enable Save button on Add Contact page for address input ([#26155](https://github.com/MetaMask/metamask-extension/pull/26155)) +- test: Add test for migration 120.2 and fix docs ([#26333](https://github.com/MetaMask/metamask-extension/pull/26333)) +- chore: normalize separator in `content` on the `viewport` `meta` tag ([#26268](https://github.com/MetaMask/metamask-extension/pull/26268)) +- fix: Stop logging pipeline stream errors in the service worker if they match 'Premature close' ([#26336](https://github.com/MetaMask/metamask-extension/pull/26336)) +- build: add alternative build process to enable faster developer builds ([#22506](https://github.com/MetaMask/metamask-extension/pull/22506)) +- fix: issue where `setNetworkClientIdForDomain` was called without checking whether the origin was eligible for setting its own network ([#26323](https://github.com/MetaMask/metamask-extension/pull/26323)) +- fix: get permit and order signatures token decimals ([#26292](https://github.com/MetaMask/metamask-extension/pull/26292)) +- feat: Update Redesign Signature Permit to show ellipsis at max 15 digits ([#26227](https://github.com/MetaMask/metamask-extension/pull/26227)) +- fix: remove the ability to send to btc accounts in send page ([#26271](https://github.com/MetaMask/metamask-extension/pull/26271)) +- fix: Adding migration 125 to remove Deprecated TxController Key from state ([#26267](https://github.com/MetaMask/metamask-extension/pull/26267)) +- fix: Revert "fix: remove submitRequest from dapp permission" ([#26293](https://github.com/MetaMask/metamask-extension/pull/26293)) +- refactor: convert `icon-factory.js` to typescript ([#23823](https://github.com/MetaMask/metamask-extension/pull/23823)) +- fix(26065): remove persisted state mostRecentRetrievedState after initialization if no errors ([#26206](https://github.com/MetaMask/metamask-extension/pull/26206)) +- refactor: ENABLE_MV3 flag cleanup ([#26059](https://github.com/MetaMask/metamask-extension/pull/26059)) +- test: fix flaky test Import flow @no-mmi Import wallet using Secret Recovery Phrase ([#26275](https://github.com/MetaMask/metamask-extension/pull/26275)) +- chore: Fully remove `eth_sign` ([#24756](https://github.com/MetaMask/metamask-extension/pull/24756)) +- fix: remove submitRequest from dapp permission ([#26276](https://github.com/MetaMask/metamask-extension/pull/26276)) +- chore: Update `actions/cache` from v3 to v4 ([#26020](https://github.com/MetaMask/metamask-extension/pull/26020)) +- feat: QR-based add NGRAVE ZERO Hardware ([#25080](https://github.com/MetaMask/metamask-extension/pull/25080)) +- fix: Fix GitHub release description ([#26247](https://github.com/MetaMask/metamask-extension/pull/26247)) +- feat(btc): use new snap account flow for Bitcoin accounts ([#26183](https://github.com/MetaMask/metamask-extension/pull/26183)) +- refactor: replace deprecated mixins with text component in transaction-confirmed ([#25551](https://github.com/MetaMask/metamask-extension/pull/25551)) +- fix: improve warning in add network modal ([#26250](https://github.com/MetaMask/metamask-extension/pull/26250)) +- fix: Fix `create_release_pull_request` OOM error ([#26249](https://github.com/MetaMask/metamask-extension/pull/26249)) +- chore: Create a story for TokenCurrencyDisplay component ([#26172](https://github.com/MetaMask/metamask-extension/pull/26172)) +- chore: refactoring onboarding to remove deprecated components ([#26207](https://github.com/MetaMask/metamask-extension/pull/26207)) +- fix: Fix CircleCI `create_release_pull_request` job ([#26246](https://github.com/MetaMask/metamask-extension/pull/26246)) +- fix: flaky test `Import flow @no-mmi Import Account using json file` ([#26240](https://github.com/MetaMask/metamask-extension/pull/26240)) +- fix: sentry sessions ([#26192](https://github.com/MetaMask/metamask-extension/pull/26192)) +- test: [Page Object Model] rename process to flow ([#26228](https://github.com/MetaMask/metamask-extension/pull/26228)) +- test: header integration test for contract interaction ([#25981](https://github.com/MetaMask/metamask-extension/pull/25981)) +- chore: Pass along hashed `rpcUrl` during `CustomNetworkAdded` event ([#26203](https://github.com/MetaMask/metamask-extension/pull/26203)) +- chore: Create a story for PageContainerHeader component ([#26031](https://github.com/MetaMask/metamask-extension/pull/26031)) +- chore: Create a story for GasTiming component ([#25557](https://github.com/MetaMask/metamask-extension/pull/25557)) +- New Crowdin translations by Github Action ([#26230](https://github.com/MetaMask/metamask-extension/pull/26230)) +- chore: update @metamask/bitcoin-wallet-snap to 0.4.0 ([#26229](https://github.com/MetaMask/metamask-extension/pull/26229)) +- fix: flaky test `Sentry errors before initialization, after opting into metrics @no-mmi should send error events in background` ([#26216](https://github.com/MetaMask/metamask-extension/pull/26216)) +- chore: Create a story for NftCollectionImage component ([#26069](https://github.com/MetaMask/metamask-extension/pull/26069)) +- fix: update icons ([#26180](https://github.com/MetaMask/metamask-extension/pull/26180)) +- refactor: replace Typography with Text component in restore-vault.js ([#25636](https://github.com/MetaMask/metamask-extension/pull/25636)) +- chore: Create a story for convert-token-to-nft-modal component ([#25561](https://github.com/MetaMask/metamask-extension/pull/25561)) +- refactor: replace deprecated mixins with Text component in qr-code-view ([#25637](https://github.com/MetaMask/metamask-extension/pull/25637)) +- test: Add manual scenario for network polling scenario ([#26195](https://github.com/MetaMask/metamask-extension/pull/26195)) +- feat: Add experimental settings toggle for transactions redesign ([#26010](https://github.com/MetaMask/metamask-extension/pull/26010)) +- feat: Support Permit variants: PermitSingle, PermitBatch, PermitTransferFrom, PermitBatchTransferFrom, TradeOrder, Seaport ([#26107](https://github.com/MetaMask/metamask-extension/pull/26107)) +- feat: updated dapp permission screen ([#25703](https://github.com/MetaMask/metamask-extension/pull/25703)) +- fix: improve performance in large signature request confirmations ([#26209](https://github.com/MetaMask/metamask-extension/pull/26209)) +- refactor: remove password manager mention ([#25985](https://github.com/MetaMask/metamask-extension/pull/25985)) +- New Crowdin translations by Github Action ([#25939](https://github.com/MetaMask/metamask-extension/pull/25939)) +- chore: remove opera manifest files as they are not used ([#26200](https://github.com/MetaMask/metamask-extension/pull/26200)) +- fix(deps): bump fast-xml-parser from 4.3.4 to 4.4.1. ([#26202](https://github.com/MetaMask/metamask-extension/pull/26202)) +- test: [Snaps E2E] remove unnecessary steps from snaps UI Images test ([#25640](https://github.com/MetaMask/metamask-extension/pull/25640)) +- fix: truncate long tokenId ([#26179](https://github.com/MetaMask/metamask-extension/pull/26179)) +- chore: Add en_GB locale ([#26196](https://github.com/MetaMask/metamask-extension/pull/26196)) +- chore: upgrade to Sentry 8 ([#25999](https://github.com/MetaMask/metamask-extension/pull/25999)) +- refactor: add unlock checks for notification related controllers ([#26189](https://github.com/MetaMask/metamask-extension/pull/26189)) +- fix: interpret multipart errors correctly and allow ignore ([#26113](https://github.com/MetaMask/metamask-extension/pull/26113)) +- feat: migrate global unit tests from Mocha to Jest ([#26104](https://github.com/MetaMask/metamask-extension/pull/26104)) +- fix: node being setup twice ([#26052](https://github.com/MetaMask/metamask-extension/pull/26052)) +- fix: setupControllerConnection outstream end event listener ([#26141](https://github.com/MetaMask/metamask-extension/pull/26141)) +- fix: Address performance issues with 'Portfolio Dashboard' loading in test environment ([#26182](https://github.com/MetaMask/metamask-extension/pull/26182)) +- chore: migrating interactive-replacement-token-page to ts ([#26115](https://github.com/MetaMask/metamask-extension/pull/26115)) +- feat: (cherry-pick)(Version v12.2.0) Migration #122 set redesignedConfirmationsEnabled to true ([#26139](https://github.com/MetaMask/metamask-extension/pull/26139)) +- chore: update @metamask/bitcoin-wallet-snap to 0.3.0 ([#26168](https://github.com/MetaMask/metamask-extension/pull/26168)) +- test: fix potential api-spec test race condition when adding to task queue ([#26171](https://github.com/MetaMask/metamask-extension/pull/26171)) +- fix(user-preference-currency-display): remove unused prop ethLogoHeight ([#24517](https://github.com/MetaMask/metamask-extension/pull/24517)) +- fix: update logos for flare-mainnet and songbird ([#25560](https://github.com/MetaMask/metamask-extension/pull/25560)) +- feat: define account name during creation ([#25191](https://github.com/MetaMask/metamask-extension/pull/25191)) +- chore: MMI move custody component to TS ([#26096](https://github.com/MetaMask/metamask-extension/pull/26096)) +- chore: add portfolio ephemeral domain URL ([#26163](https://github.com/MetaMask/metamask-extension/pull/26163)) +- fix: Flaky test `4byte setting ` ([#26111](https://github.com/MetaMask/metamask-extension/pull/26111)) +- fix: PPOM blockaid update ([#26154](https://github.com/MetaMask/metamask-extension/pull/26154)) +- fix: flaky BTC e2e tests ([#26082](https://github.com/MetaMask/metamask-extension/pull/26082)) +- chore: Add extra event props ([#26123](https://github.com/MetaMask/metamask-extension/pull/26123)) +- refactor: fix event names used to track notifications ([#25521](https://github.com/MetaMask/metamask-extension/pull/25521)) +- test: [Snaps E2E] Create test for snap dialog JSX functionality ([#25493](https://github.com/MetaMask/metamask-extension/pull/25493)) +- chore: update BNB logos ([#26140](https://github.com/MetaMask/metamask-extension/pull/26140)) +- fix: enable siwe redesign ([#26136](https://github.com/MetaMask/metamask-extension/pull/26136)) +- chore: cleanup `.prettierignore` file ([#24828](https://github.com/MetaMask/metamask-extension/pull/24828)) +- chore: Bump `@metamask/ens-controller` to v12 ([#26127](https://github.com/MetaMask/metamask-extension/pull/26127)) +- chore: Bump `@metamask/transaction-controller` to v34 ([#26124](https://github.com/MetaMask/metamask-extension/pull/26124)) +- Revert "test: Adding e2e for SIWE and re-enabling redesign for SIWE (#25831)" ([#25831](https://github.com/MetaMask/metamask-extension/pull/25831)) +- chore: Create a story for Snackbar component ([#25515](https://github.com/MetaMask/metamask-extension/pull/25515)) +- fix: add new helper function for `openMenuSafe` to mitigate all ocurrences for opening menu with MMI build ([#26079](https://github.com/MetaMask/metamask-extension/pull/26079)) +- test: Adding e2e for SIWE and re-enabling redesign for SIWE (#25831) ([#25831](https://github.com/MetaMask/metamask-extension/pull/25831)) +- feat: make add-team-label use the reusable workflow ([#25807](https://github.com/MetaMask/metamask-extension/pull/25807)) +- chore: MMI-5301 adds enums for custody type and status ([#26006](https://github.com/MetaMask/metamask-extension/pull/26006)) +- feat: Move ENABLE_CONFIRMATION_REDESIGN feature flag to the developer… ([#26095](https://github.com/MetaMask/metamask-extension/pull/26095)) +- fix: remove btc account from permission connect lists ([#25980](https://github.com/MetaMask/metamask-extension/pull/25980)) +- feat: update network list item to include start accessory and end ([#25507](https://github.com/MetaMask/metamask-extension/pull/25507)) +- chore: mmi 5305 mmi pages typescript migration ([#26081](https://github.com/MetaMask/metamask-extension/pull/26081)) +- fix: Move Snaps hooks out of code fence ([#26120](https://github.com/MetaMask/metamask-extension/pull/26120)) +- feat: Mitigate risk for distracted users on queued transactions from different dApps ([#25852](https://github.com/MetaMask/metamask-extension/pull/25852)) +- fix: lock Chrome version to 126 (#26101) ([#26101](https://github.com/MetaMask/metamask-extension/pull/26101)) +- feat: Add metrics event for advanced details section toggling ([#26083](https://github.com/MetaMask/metamask-extension/pull/26083)) +- fix: display link to privacy-policy explanation in onboarding flow ([#26038](https://github.com/MetaMask/metamask-extension/pull/26038)) +- chore: Create a story for InvalidCustomNetworkAlert component ([#25600](https://github.com/MetaMask/metamask-extension/pull/25600)) +- fix: number formatting on swap + send tx detail ([#26029](https://github.com/MetaMask/metamask-extension/pull/26029)) +- fix: Flaky test `Account Custom Name..` ([#26062](https://github.com/MetaMask/metamask-extension/pull/26062)) +- fix: snap flakiness on `installSnapSimpleKeyring` function ([#26039](https://github.com/MetaMask/metamask-extension/pull/26039)) +- fix: lock Chrome version to 126 ([#26101](https://github.com/MetaMask/metamask-extension/pull/26101)) +- fix: remove halo for tokens ([#26016](https://github.com/MetaMask/metamask-extension/pull/26016)) +- refactor: replace typography with text component in creation-successful.js ([#25552](https://github.com/MetaMask/metamask-extension/pull/25552)) +- fix: `vault decryption` broken tests due to update on window handling ([#26074](https://github.com/MetaMask/metamask-extension/pull/26074)) +- docs: Centralize Author/Team Mapping for Commit Tracking ([#25986](https://github.com/MetaMask/metamask-extension/pull/25986)) +- fix: flaky test: Check the toggle for hex data ([#25899](https://github.com/MetaMask/metamask-extension/pull/25899)) +- chore: migrated institutional ui components to ts ([#25858](https://github.com/MetaMask/metamask-extension/pull/25858)) +- chore: removed unused component ([#26000](https://github.com/MetaMask/metamask-extension/pull/26000)) +- chore: update Bitcoin Snap to version 0.2.5 ([#26058](https://github.com/MetaMask/metamask-extension/pull/26058)) +- refactor: replace Typography with Text component in metametrics.js ([#25630](https://github.com/MetaMask/metamask-extension/pull/25630)) +- refactor: replace typography with text component in review recovery phrase ([#25265](https://github.com/MetaMask/metamask-extension/pull/25265)) +- test: new switchToWindowWithTitle w/ Extension communication ([#25362](https://github.com/MetaMask/metamask-extension/pull/25362)) +- ci: Trimming the gitdiff output before writing to output file ([#26057](https://github.com/MetaMask/metamask-extension/pull/26057)) +- chore: tweak send page styling ([#25982](https://github.com/MetaMask/metamask-extension/pull/25982)) +- fix: mmi flaky tests `Reveal SRP through settings completes quiz and reveals SRP QR after wrong answers` , `Sign Typed Data Signature Request can initiate and reject a Signature Request of Sign Typed Data`, `Sign Typed Data Signature Request can queue multiple Signature Requests of Sign Typed Data and confirm` ([#26055](https://github.com/MetaMask/metamask-extension/pull/26055)) +- chore: Create a story for IconButton component ([#25277](https://github.com/MetaMask/metamask-extension/pull/25277)) +- fix: center token icon ([#26013](https://github.com/MetaMask/metamask-extension/pull/26013)) +- fix: flaky test `Import flow @no-mmi Import wallet using Secret Recovery Phrase with pasting word by word` ([#26049](https://github.com/MetaMask/metamask-extension/pull/26049)) +- fix: flaky test 25912 ([#25913](https://github.com/MetaMask/metamask-extension/pull/25913)) +- chore: add privacy query params to portfolio navigation ([#25958](https://github.com/MetaMask/metamask-extension/pull/25958)) +- fix: (cherry-pick) Remove special reject button case from api spec tests (#26048) ([#26048](https://github.com/MetaMask/metamask-extension/pull/26048)) +- chore: Temporarily disable Playwright Swaps tests ([#26050](https://github.com/MetaMask/metamask-extension/pull/26050)) +- fix: Remove special reject button case from api spec tests ([#26048](https://github.com/MetaMask/metamask-extension/pull/26048)) +- test(e2e): unlock trezor account ([#25824](https://github.com/MetaMask/metamask-extension/pull/25824)) +- fix: Flaky "Signature Approved Event" e2e test ([#26040](https://github.com/MetaMask/metamask-extension/pull/26040)) +- feat: Migration #122 set redesignedConfirmationsEnabled to true ([#25769](https://github.com/MetaMask/metamask-extension/pull/25769)) +- fix: Revert "refactor: use withKeyring method (#25435)" ([#25435](https://github.com/MetaMask/metamask-extension/pull/25435)) +- fix: :label: update the text in the popup to enable notifications ([#26026](https://github.com/MetaMask/metamask-extension/pull/26026)) +- fix: map the supported block explorers ([#25908](https://github.com/MetaMask/metamask-extension/pull/25908)) +- fix: update css for modals ([#25961](https://github.com/MetaMask/metamask-extension/pull/25961)) +- fix: Fix permssions for `update-attributions` workflow ([#26019](https://github.com/MetaMask/metamask-extension/pull/26019)) +- fix: add migration for profile syncing controller ([#26004](https://github.com/MetaMask/metamask-extension/pull/26004)) +- test: Adding e2e for SIWE and re-enabling redesign for SIWE ([#25831](https://github.com/MetaMask/metamask-extension/pull/25831)) +- test: UX: Multichain: Add E2E for signaling network change from Network menu to dapp, Autoswitching networks ([#25765](https://github.com/MetaMask/metamask-extension/pull/25765)) +- feat: Move ENABLE_CONFIRMATION_REDESIGN feature flag to the developer settings page ([#25520](https://github.com/MetaMask/metamask-extension/pull/25520)) +- fix: `yarn:start:test:flask` is broken `Lavapack is not defined` ([#25995](https://github.com/MetaMask/metamask-extension/pull/25995)) +- feat: add utility function to get supported chains from the Security Alerts API ([#25716](https://github.com/MetaMask/metamask-extension/pull/25716)) +- fix: `vault-decryption` test since the order of announcement modals changed ([#25997](https://github.com/MetaMask/metamask-extension/pull/25997)) +- fix: updated switch to this account condition ([#25609](https://github.com/MetaMask/metamask-extension/pull/25609)) +- fix: flaky test Settings Redirects to ENS domains when user inputs ENS into address bar ([#25782](https://github.com/MetaMask/metamask-extension/pull/25782)) +- chore: MMI-5248 introduce the token allowance functionality for MMI ([#25967](https://github.com/MetaMask/metamask-extension/pull/25967)) +- fix: vertically align asset image ([#25988](https://github.com/MetaMask/metamask-extension/pull/25988)) +- feat: Adding state per window in e2e, excluding null state ([#25900](https://github.com/MetaMask/metamask-extension/pull/25900)) +- fix: attribution link ([#25947](https://github.com/MetaMask/metamask-extension/pull/25947)) +- feat: Enable hardware wallets for smart transactions in swaps ([#25742](https://github.com/MetaMask/metamask-extension/pull/25742)) +- fix: fix link redirection ([#25983](https://github.com/MetaMask/metamask-extension/pull/25983)) +- fix: fix overlapping modals ([#25962](https://github.com/MetaMask/metamask-extension/pull/25962)) +- feat: Show the Close extension button on the Smart Transaction Status Page for a pending dapp transaction ([#25965](https://github.com/MetaMask/metamask-extension/pull/25965)) +- fix(multichain): use accounts{Added,Removed} to fetch/clear balances ([#25884](https://github.com/MetaMask/metamask-extension/pull/25884)) +- test: Add integration tests for permit simulation section ([#25856](https://github.com/MetaMask/metamask-extension/pull/25856)) +- fix: fixed max width for permissions page ([#25870](https://github.com/MetaMask/metamask-extension/pull/25870)) +- fix: show current network if domains are undefined ([#25960](https://github.com/MetaMask/metamask-extension/pull/25960)) +- fix: notification slowness and crashes ([#25946](https://github.com/MetaMask/metamask-extension/pull/25946)) +- ci: Disabling non-lint CI on the l10n_crowdin_action branch ([#25809](https://github.com/MetaMask/metamask-extension/pull/25809)) +- refactor: use `withKeyring` method ([#25435](https://github.com/MetaMask/metamask-extension/pull/25435)) +- feat: add BTC support survey link ([#25875](https://github.com/MetaMask/metamask-extension/pull/25875)) +- fix: re-organize files under assets folder ([#25897](https://github.com/MetaMask/metamask-extension/pull/25897)) +- fix: fix css nft detail ([#25931](https://github.com/MetaMask/metamask-extension/pull/25931)) +- fix: Implement Auto-Enable Feature for Basic Functionality in Metamask Extension v12.1.0 ([#25944](https://github.com/MetaMask/metamask-extension/pull/25944)) +- fix: Handle error when offscreen document already exists ([#25138](https://github.com/MetaMask/metamask-extension/pull/25138)) +- test: Expand coverage of sourcemap validator ([#25115](https://github.com/MetaMask/metamask-extension/pull/25115)) +- feat: Add full screen Snap Home and Dialog ([#25670](https://github.com/MetaMask/metamask-extension/pull/25670)) +- chore: swaps codeowners reorg ([#24803](https://github.com/MetaMask/metamask-extension/pull/24803)) +- fix: track token detection enabled ([#25822](https://github.com/MetaMask/metamask-extension/pull/25822)) +- fix: rm locales in other languages ([#25936](https://github.com/MetaMask/metamask-extension/pull/25936)) +- fix: fix ([#25907](https://github.com/MetaMask/metamask-extension/pull/25907)) +- fix: password reset ([#25847](https://github.com/MetaMask/metamask-extension/pull/25847)) +- New Crowdin translations by Github Action ([#24889](https://github.com/MetaMask/metamask-extension/pull/24889)) +- fix: Remove abandoned test:unit:jest command ([#25905](https://github.com/MetaMask/metamask-extension/pull/25905)) +- fix(22851): check if active device to prevent autoconnect for hw ([#25503](https://github.com/MetaMask/metamask-extension/pull/25503)) +- test: Removed step from e2e tests ([#25910](https://github.com/MetaMask/metamask-extension/pull/25910)) +- fix: calcTokenAmount BigNumber more than 15 digits error ([#25799](https://github.com/MetaMask/metamask-extension/pull/25799)) +- feat: add custom form check alerts ([#25259](https://github.com/MetaMask/metamask-extension/pull/25259)) +- fix: test failure on firefox ([#25895](https://github.com/MetaMask/metamask-extension/pull/25895)) +- fix: disables "swap and send" for MMI ([#25886](https://github.com/MetaMask/metamask-extension/pull/25886)) +- fix: Fixed flaky test 24645 ([#25786](https://github.com/MetaMask/metamask-extension/pull/25786)) +- chore: refactor SwapsController so it extends from BaseControllerV2 ([#25681](https://github.com/MetaMask/metamask-extension/pull/25681)) +- feat: Replace "Manage in settings" with "No thanks" in the STX Opt In modal, only show the modal for non-zero balances ([#25848](https://github.com/MetaMask/metamask-extension/pull/25848)) +- feat: Display advanced section within confirmation by default for some users ([#25687](https://github.com/MetaMask/metamask-extension/pull/25687)) +- chore: bump assets-controllers to v36.0.0 ([#25857](https://github.com/MetaMask/metamask-extension/pull/25857)) +- fix: add name to scuttling exception list ([#25849](https://github.com/MetaMask/metamask-extension/pull/25849)) +- fix: update build version to align with firefox's newer version restrictions ([#25456](https://github.com/MetaMask/metamask-extension/pull/25456)) +- feat: regression label ([#25691](https://github.com/MetaMask/metamask-extension/pull/25691)) +- chore: Master sync ([#25816](https://github.com/MetaMask/metamask-extension/pull/25816)) +- fix: contract data in metrics ([#25759](https://github.com/MetaMask/metamask-extension/pull/25759)) +- fix: flaky test `ERC721 NFTs testdapp interaction` ([#25854](https://github.com/MetaMask/metamask-extension/pull/25854)) +- fix: flaky test `Create BTC Account cannot create multiple BTC accounts...` ([#25861](https://github.com/MetaMask/metamask-extension/pull/25861)) +- feat: support creation of Bitcoin testnet accounts ([#25772](https://github.com/MetaMask/metamask-extension/pull/25772)) +- fix: use of an header in a dedicated call ([#25828](https://github.com/MetaMask/metamask-extension/pull/25828)) +- feat(tests): add btc e2e tests ([#25663](https://github.com/MetaMask/metamask-extension/pull/25663)) +- feat: NFT details new design ([#25524](https://github.com/MetaMask/metamask-extension/pull/25524)) +- feat: Add fuzzy matching for name lookup ([#25264](https://github.com/MetaMask/metamask-extension/pull/25264)) +- fix: edit path to dist folder ([#25826](https://github.com/MetaMask/metamask-extension/pull/25826)) +- chore: update @metamask/bitcoin-wallet-snap to 0.2.4 (#25808) ([#25808](https://github.com/MetaMask/metamask-extension/pull/25808)) +- chore: Patch security issue in snaps-utils ([#25827](https://github.com/MetaMask/metamask-extension/pull/25827)) +- feat: add option of copy to info row component ([#25682](https://github.com/MetaMask/metamask-extension/pull/25682)) +- fix: skip blockaid validations for users internal accounts ([#25695](https://github.com/MetaMask/metamask-extension/pull/25695)) +- chore: refactor custody component ([#25684](https://github.com/MetaMask/metamask-extension/pull/25684)) +- Merge origin/develop into master-sync +- chore: update @metamask/bitcoin-wallet-snap to 0.2.4 ([#25808](https://github.com/MetaMask/metamask-extension/pull/25808)) +- chore: removed unused getCustodianAccountsByAddress method ([#25798](https://github.com/MetaMask/metamask-extension/pull/25798)) +- feat: Make Jest unit tests run faster in GitHub actions ([#25726](https://github.com/MetaMask/metamask-extension/pull/25726)) +- revert: un-revert metrics and signature refactor test ([#25758](https://github.com/MetaMask/metamask-extension/pull/25758)) +- feat: Add `ui_customizations` metric for transactions ([#25736](https://github.com/MetaMask/metamask-extension/pull/25736)) +- test: add e2e tests for navigation (#25652) ([#25652](https://github.com/MetaMask/metamask-extension/pull/25652)) +- chore: remove `BTC_BETA_SUPPORT` flag ([#25776](https://github.com/MetaMask/metamask-extension/pull/25776)) +- chore: update @metamask/bitcoin-wallet-snap to 0.2.3 ([#25775](https://github.com/MetaMask/metamask-extension/pull/25775)) +- feat: add more whitelisted portfolio URLs ([#25767](https://github.com/MetaMask/metamask-extension/pull/25767)) +- fix: Fix page width for fullscreen mode send page ([#25639](https://github.com/MetaMask/metamask-extension/pull/25639)) +- chore: Update Snaps codeowners list ([#25581](https://github.com/MetaMask/metamask-extension/pull/25581)) +- fix: fine-tune for `Delineator` component styles ([#25760](https://github.com/MetaMask/metamask-extension/pull/25760)) +- feat: decode transaction data ([#25597](https://github.com/MetaMask/metamask-extension/pull/25597)) +- feat: add `Delineator` component ([#25610](https://github.com/MetaMask/metamask-extension/pull/25610)) +- feat(ramps): update isNativeTokenBuyable to include BTC ([#25621](https://github.com/MetaMask/metamask-extension/pull/25621)) +- fix: Fix issue 25285 max insufficient funds for gas ([#25574](https://github.com/MetaMask/metamask-extension/pull/25574)) +- feat: add BTC experimental toggle ([#25672](https://github.com/MetaMask/metamask-extension/pull/25672)) +- build: bump gas-fee-controller to v18 and remove patch ([#25679](https://github.com/MetaMask/metamask-extension/pull/25679)) +- fix: show correct asset and balance when BTC account is the selected account ([#25719](https://github.com/MetaMask/metamask-extension/pull/25719)) +- feat(btc): add BTC account creation menu entry ([#25625](https://github.com/MetaMask/metamask-extension/pull/25625)) +- fix: flaky test `Test Snap Metrics test snap update rejected metric` ([#25744](https://github.com/MetaMask/metamask-extension/pull/25744)) +- chore(deps): bump @metamask/accounts-controller from ^17.0.0 to ^17.2.0 ([#25676](https://github.com/MetaMask/metamask-extension/pull/25676)) +- fix: use LAVAMOAT_UPDATE_TOKEN in attributions workflow ([#25731](https://github.com/MetaMask/metamask-extension/pull/25731)) +- fix: caveat mutations for non-EVM accounts ([#25739](https://github.com/MetaMask/metamask-extension/pull/25739)) +- test: Add UI integration tests ([#24428](https://github.com/MetaMask/metamask-extension/pull/24428)) +- fix: revert "test: add e2e tests for navigation (#25652)" ([#25652](https://github.com/MetaMask/metamask-extension/pull/25652)) +- chore: Revert "test: e2e metrics test and refactor" ([#25722](https://github.com/MetaMask/metamask-extension/pull/25722)) +- feat: bundle pre-installed Bitcoin Wallet Snap ([#25715](https://github.com/MetaMask/metamask-extension/pull/25715)) +- fix: protect against phishing domain redirects in main/sub frames for http(s) requests ([#25153](https://github.com/MetaMask/metamask-extension/pull/25153)) +- fix: Fix crash of Transaction screen with smart transaction ([#25717](https://github.com/MetaMask/metamask-extension/pull/25717)) +- fix: Hide MMI Account Mistmatch BannerAlert from Sign-in with Ethereum (SIWE) Redesign Page ([#25662](https://github.com/MetaMask/metamask-extension/pull/25662)) +- fix: flaky test `Create token, approve token and approve token without gas approves an already created token and displays the token approval data` ([#25706](https://github.com/MetaMask/metamask-extension/pull/25706)) +- feat: Enable SIWE Signature Redesign ([#25660](https://github.com/MetaMask/metamask-extension/pull/25660)) +- fix: flaky test `Request-queue UI changes handles three confirmations on three confirmations concurrently` ([#25675](https://github.com/MetaMask/metamask-extension/pull/25675)) +- feat: move unit tests from Circleci to Github actions ([#25570](https://github.com/MetaMask/metamask-extension/pull/25570)) +- test: e2e metrics test and refactor ([#25632](https://github.com/MetaMask/metamask-extension/pull/25632)) +- test: add e2e tests for navigation ([#25652](https://github.com/MetaMask/metamask-extension/pull/25652)) +- feat: support security alerts API ([#25544](https://github.com/MetaMask/metamask-extension/pull/25544)) +- feat(ramps): add flag to ensure ramp networks are only fetched once ([#25686](https://github.com/MetaMask/metamask-extension/pull/25686)) +- fix: allow ramps dev environment on Flask ([#25659](https://github.com/MetaMask/metamask-extension/pull/25659)) +- feat: added check for if the selected account is BTC in transaction-list ([#25642](https://github.com/MetaMask/metamask-extension/pull/25642)) +- feat: Gas Fees Redesign PoC ([#24714](https://github.com/MetaMask/metamask-extension/pull/24714)) +- fix: show connected toast only for EVM accounts ([#25628](https://github.com/MetaMask/metamask-extension/pull/25628)) +- fix: changed logic to use the new banner alert ([#25626](https://github.com/MetaMask/metamask-extension/pull/25626)) +- fix: set network client id for domain ([#25646](https://github.com/MetaMask/metamask-extension/pull/25646)) +- feat: improvement for how we display big and small numbers ([#25438](https://github.com/MetaMask/metamask-extension/pull/25438)) +- chore: restore bot workflow to update attributions ([#25211](https://github.com/MetaMask/metamask-extension/pull/25211)) +- test: add swap e2e tests on Tenderly network ([#25060](https://github.com/MetaMask/metamask-extension/pull/25060)) +- fix: UX: Multichain: Add safeguard to throw error when confirmation chainId doesn't match current chainId ([#25634](https://github.com/MetaMask/metamask-extension/pull/25634)) +- chore: updates MMI custody controller ([#25631](https://github.com/MetaMask/metamask-extension/pull/25631)) +- fix: flaky test `Test Snap Get Locale test snap_getLocale functionality` ([#25648](https://github.com/MetaMask/metamask-extension/pull/25648)) +- fix: Skip blockaid validation for SIWE signature types ([#25612](https://github.com/MetaMask/metamask-extension/pull/25612)) +- feat: Add support for security alerts on zkSync, Berachain, Scroll and Metachain One on extension ([#25555](https://github.com/MetaMask/metamask-extension/pull/25555)) +- fix: Multichain: UX: Check for transactions on all networks and QueuedRequestCount ([#25614](https://github.com/MetaMask/metamask-extension/pull/25614)) +- feat: define which keyring methods Portfolio can call ([#25633](https://github.com/MetaMask/metamask-extension/pull/25633)) +- chore: flaky E2E tests improved ([#25565](https://github.com/MetaMask/metamask-extension/pull/25565)) +- feat: add SIWE mismatch account warning alert ([#25613](https://github.com/MetaMask/metamask-extension/pull/25613)) +- fix: support multichain in blockexplorer and qr code ([#25526](https://github.com/MetaMask/metamask-extension/pull/25526)) +- fix: decimal places displayed on token value on permit pages ([#25410](https://github.com/MetaMask/metamask-extension/pull/25410)) +- feat: added BTC variant to ramps-card and illustration image ([#25615](https://github.com/MetaMask/metamask-extension/pull/25615)) +- fix: Remove unused fixtures and fix test name in smart swaps disabled spec ([#25616](https://github.com/MetaMask/metamask-extension/pull/25616)) +- chore: Update @metamask/smart-transactions-controller from 10.1.2 to 10.1.6 ([#25611](https://github.com/MetaMask/metamask-extension/pull/25611)) +- fix: Fix issue 22837 about unknown error during ledger pair ([#25462](https://github.com/MetaMask/metamask-extension/pull/25462)) +- test: add e2e to swap with snap account ([#25558](https://github.com/MetaMask/metamask-extension/pull/25558)) +- chore: exclude running git diff job for the e2e quality gate in `develop`, `master` and release branches ([#25605](https://github.com/MetaMask/metamask-extension/pull/25605)) +- chore: [Delivery] Update author mapping list for PR ([#25606](https://github.com/MetaMask/metamask-extension/pull/25606)) +- fix: page object selector not found ([#25624](https://github.com/MetaMask/metamask-extension/pull/25624)) +- test: Initial PR for integrating the Page Object Model (POM) into e2e test suite ([#25373](https://github.com/MetaMask/metamask-extension/pull/25373)) +- refactor: Replace deprecated mixins with Text component in selected-account.component.js ([#25262](https://github.com/MetaMask/metamask-extension/pull/25262)) +- refactor: Replace deprecated mixins with Text component in unlock-page.component.js ([#25227](https://github.com/MetaMask/metamask-extension/pull/25227)) +- chore: Create a story for RestoreVaultPage component ([#25284](https://github.com/MetaMask/metamask-extension/pull/25284)) +- fix(snaps): Fix alignment of install origin is `snap-authorship-expanded` ([#25583](https://github.com/MetaMask/metamask-extension/pull/25583)) +- feat: Remove blockaid migration BannerAlert ([#25556](https://github.com/MetaMask/metamask-extension/pull/25556)) +- fix: failingt e2e `Click bridge button from asset page @no-mmi loads portfolio tab when flag is turned off` ([#25607](https://github.com/MetaMask/metamask-extension/pull/25607)) +- chore: adds quality gate for rerunning e2e spec files that are new or have been modified ([#24556](https://github.com/MetaMask/metamask-extension/pull/24556)) +- chore(deps): bump assets controller to v34.0.0 ([#25540](https://github.com/MetaMask/metamask-extension/pull/25540)) +- chore: add bridge controller, store and api utils ([#25044](https://github.com/MetaMask/metamask-extension/pull/25044)) +- fix: add eth_signTypedData and eth_signTypedData_v3 to `methodsRequiringNetworkSwitch` ([#25562](https://github.com/MetaMask/metamask-extension/pull/25562)) + ## [12.2.0] ## [12.1.3] @@ -5016,7 +5374,8 @@ Update styles and spacing on the critical error page ([#20350](https://github.c - Added the ability to restore accounts from seed words. -[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.2.0...HEAD +[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.3.0...HEAD +[12.3.0]: https://github.com/MetaMask/metamask-extension/compare/v12.2.0...v12.3.0 [12.2.0]: https://github.com/MetaMask/metamask-extension/compare/v12.1.3...v12.2.0 [12.1.3]: https://github.com/MetaMask/metamask-extension/compare/v12.1.2...v12.1.3 [12.1.2]: https://github.com/MetaMask/metamask-extension/compare/v12.1.1...v12.1.2 diff --git a/package.json b/package.json index 0176477d1e4e..251e90199db9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "metamask-crx", - "version": "12.2.0", + "version": "12.3.0", "private": true, "repository": { "type": "git", From 06c25bb1509cf9551fb8322baa05b1baeb88a45c Mon Sep 17 00:00:00 2001 From: Dan J Miller Date: Fri, 6 Sep 2024 16:47:08 -0230 Subject: [PATCH 02/43] Lint fix --- app/scripts/controllers/swaps/swaps.test.ts | 1 - app/scripts/lib/ppom/ppom-middleware.test.ts | 2 +- .../lib/snap-keyring/snap-keyring.test.ts | 4 ++++ app/scripts/lib/transaction/util.test.ts | 24 +++++++++++++++---- package.json | 1 - shared/modules/metametrics.test.ts | 1 + shared/modules/mv3.utils.js | 5 ++-- shared/modules/selectors/index.ts | 2 -- .../modules/selectors/smart-transactions.ts | 5 +--- ui/selectors/accounts.test.ts | 13 ++++++---- ui/store/actions.ts | 4 ++++ 11 files changed, 41 insertions(+), 21 deletions(-) diff --git a/app/scripts/controllers/swaps/swaps.test.ts b/app/scripts/controllers/swaps/swaps.test.ts index 62cc6796160f..8b2fbd22d032 100644 --- a/app/scripts/controllers/swaps/swaps.test.ts +++ b/app/scripts/controllers/swaps/swaps.test.ts @@ -1182,7 +1182,6 @@ describe('SwapsController', function () { swapsQuotePrefetchingRefreshTime, swapsStxBatchStatusRefreshTime, swapsStxGetTransactionsRefreshTime, - swapsStxStatusDeadline, }, }); diff --git a/app/scripts/lib/ppom/ppom-middleware.test.ts b/app/scripts/lib/ppom/ppom-middleware.test.ts index a9df5e093f95..6aafcddd0e58 100644 --- a/app/scripts/lib/ppom/ppom-middleware.test.ts +++ b/app/scripts/lib/ppom/ppom-middleware.test.ts @@ -222,7 +222,7 @@ describe('PPOMMiddleware', () => { const middlewareFunction = createMiddleware(); const req = { - ...JsonRpcRequestStruct, + ...REQUEST_MOCK, params: [{ to: INTERNAL_ACCOUNT_ADDRESS }], method: 'eth_sendTransaction', securityAlertResponse: undefined, diff --git a/app/scripts/lib/snap-keyring/snap-keyring.test.ts b/app/scripts/lib/snap-keyring/snap-keyring.test.ts index bfa8e124d3f0..4136fd1fd1fc 100644 --- a/app/scripts/lib/snap-keyring/snap-keyring.test.ts +++ b/app/scripts/lib/snap-keyring/snap-keyring.test.ts @@ -50,6 +50,10 @@ const mockInternalAccount = { name: mockSnapName, }, name: accountNameSuggestion, + keyring: { + type: '', + }, + importTime: 0, }, }; diff --git a/app/scripts/lib/transaction/util.test.ts b/app/scripts/lib/transaction/util.test.ts index d4376cb34947..a27844f53b41 100644 --- a/app/scripts/lib/transaction/util.test.ts +++ b/app/scripts/lib/transaction/util.test.ts @@ -1,4 +1,4 @@ -import { InternalAccount } from '@metamask/keyring-api'; +import { EthAccountType, InternalAccount } from '@metamask/keyring-api'; import { TransactionParams } from '@metamask/eth-json-rpc-middleware'; import { TransactionController, @@ -41,6 +41,24 @@ const SECURITY_ALERT_ID_MOCK = '123'; const INTERNAL_ACCOUNT_ADDRESS = '0xec1adf982415d2ef5ec55899b9bfb8bc0f29251b'; +const mockAccount = { + type: EthAccountType.Eoa, + id: '3afa663e-0600-4d93-868a-61c2e553013b', + address: INTERNAL_ACCOUNT_ADDRESS, + methods: [], + options: {}, +}; +const mockInternalAccount = { + ...mockAccount, + metadata: { + name: `Account 1`, + importTime: Date.now(), + keyring: { + type: '', + }, + }, +}; + const TRANSACTION_PARAMS_MOCK: TransactionParams = { from: '0x1', }; @@ -484,9 +502,7 @@ describe('Transaction Utils', () => { ...sendRequest, securityAlertsEnabled: false, chainId: '0x1', - internalAccounts: { - address: INTERNAL_ACCOUNT_ADDRESS, - } as InternalAccount, + internalAccounts: [mockInternalAccount], }); expect( diff --git a/package.json b/package.json index 251e90199db9..be00bf7c6c65 100644 --- a/package.json +++ b/package.json @@ -264,7 +264,6 @@ "@metamask/snaps-controllers@npm:^8.1.1": "patch:@metamask/snaps-controllers@npm%3A9.4.0#~/.yarn/patches/@metamask-snaps-controllers-npm-9.4.0-7c3abbbea6.patch", "@metamask/snaps-controllers@npm:^9.4.0": "patch:@metamask/snaps-controllers@npm%3A9.4.0#~/.yarn/patches/@metamask-snaps-controllers-npm-9.4.0-7c3abbbea6.patch", "@metamask/nonce-tracker@npm:^5.0.0": "patch:@metamask/nonce-tracker@npm%3A5.0.0#~/.yarn/patches/@metamask-nonce-tracker-npm-5.0.0-d81478218e.patch", - "@metamask/keyring-controller@npm:^16.0.0": "patch:@metamask/keyring-controller@npm%3A17.1.1#~/.yarn/patches/@metamask-keyring-controller-npm-17.1.1-098cb41930.patch", "@metamask/keyring-controller@npm:^17.1.0": "patch:@metamask/keyring-controller@npm%3A17.1.1#~/.yarn/patches/@metamask-keyring-controller-npm-17.1.1-098cb41930.patch", "@trezor/connect-web@npm:^9.1.11": "patch:@trezor/connect-web@npm%3A9.3.0#~/.yarn/patches/@trezor-connect-web-npm-9.3.0-040ab10d9a.patch" }, diff --git a/shared/modules/metametrics.test.ts b/shared/modules/metametrics.test.ts index 29434cfb1687..b313673056ac 100644 --- a/shared/modules/metametrics.test.ts +++ b/shared/modules/metametrics.test.ts @@ -43,6 +43,7 @@ const createTransactionMetricsRequest = (customProps = {}) => { getMethodData: jest.fn(), getIsRedesignedConfirmationsDeveloperEnabled: jest.fn(), getIsConfirmationAdvancedDetailsOpen: jest.fn(), + getRedesignedConfirmationsEnabled: jest.fn(), ...customProps, } as TransactionMetricsRequest; }; diff --git a/shared/modules/mv3.utils.js b/shared/modules/mv3.utils.js index d2b2cac26ada..417484c46de6 100644 --- a/shared/modules/mv3.utils.js +++ b/shared/modules/mv3.utils.js @@ -10,7 +10,7 @@ const runtimeManifest = * unavailable. That's why we have a fallback using the ENABLE_MV3 constant. The fallback is also * used in unit tests. */ -export const isManifestV3 = runtimeManifest +const isManifestV3 = runtimeManifest ? runtimeManifest.manifest_version === 3 : // Our build system sets this as a boolean, but in a Node.js context (e.g. unit tests) it will // always be a string @@ -31,8 +31,7 @@ const isOffscreenAvailable = Boolean(global.chrome?.offscreen); * happen to users on MetaMask versions 11.16.7 and higher, who are using a * chromium browser with a version below 109. */ -export const isMv3ButOffscreenDocIsMissing = - isManifestV3 && !isOffscreenAvailable; +const isMv3ButOffscreenDocIsMissing = isManifestV3 && !isOffscreenAvailable; module.exports = { isManifestV3, diff --git a/shared/modules/selectors/index.ts b/shared/modules/selectors/index.ts index 4328f98656b3..d53296394c26 100644 --- a/shared/modules/selectors/index.ts +++ b/shared/modules/selectors/index.ts @@ -2,8 +2,6 @@ import { getHardwareWalletType } from '../../../ui/selectors/selectors'; export * from './smart-transactions'; export * from './feature-flags'; -export * from './token-auto-detect'; -export * from './nft-auto-detect'; export * from './account'; export { getHardwareWalletType }; diff --git a/shared/modules/selectors/smart-transactions.ts b/shared/modules/selectors/smart-transactions.ts index f9256fc334b2..c510e817dbdb 100644 --- a/shared/modules/selectors/smart-transactions.ts +++ b/shared/modules/selectors/smart-transactions.ts @@ -10,10 +10,7 @@ import { getSelectedAccount, } from '../../../ui/selectors/selectors'; // TODO: Migrate shared selectors to this file. import { isProduction } from '../environment'; -import { - MultichainState, - MultichainState, -} from '../../../ui/selectors/multichain'; +import { MultichainState } from '../../../ui/selectors/multichain'; type SmartTransactionsMetaMaskState = { metamask: { diff --git a/ui/selectors/accounts.test.ts b/ui/selectors/accounts.test.ts index 76b9ea955862..22fd6f610b12 100644 --- a/ui/selectors/accounts.test.ts +++ b/ui/selectors/accounts.test.ts @@ -156,10 +156,11 @@ describe('Accounts Selectors', () => { ...MOCK_STATE.metamask, internalAccounts: { selectedAccount: MOCK_ACCOUNT_BIP122_P2WPKH.id, - accounts: [ - MOCK_ACCOUNT_BIP122_P2WPKH, - MOCK_ACCOUNT_BIP122_P2WPKH_TESTNET, - ], + accounts: { + mock_account_bip122_pwpkh: MOCK_ACCOUNT_BIP122_P2WPKH, + mock_account_bip122_p2wpkh_testnet: + MOCK_ACCOUNT_BIP122_P2WPKH_TESTNET, + }, }, }, }; @@ -174,7 +175,9 @@ describe('Accounts Selectors', () => { ...MOCK_STATE.metamask, internalAccounts: { selectedAccount: MOCK_ACCOUNT_BIP122_P2WPKH.id, - accounts: [MOCK_ACCOUNT_BIP122_P2WPKH], + accounts: { + mock_account_bip122_p2wpkh: MOCK_ACCOUNT_BIP122_P2WPKH, + }, }, }, }; diff --git a/ui/store/actions.ts b/ui/store/actions.ts index b9b9d362c417..12a54e84c943 100644 --- a/ui/store/actions.ts +++ b/ui/store/actions.ts @@ -5549,6 +5549,10 @@ export function setIsProfileSyncingEnabled( }; } +export function setConfirmationAdvancedDetailsOpen(value: boolean) { + return setPreference('showConfirmationAdvancedDetails', value); +} + export async function getNextAvailableAccountName( keyring?: KeyringTypes, ): Promise { From 84e5bb225e5213fc3a6e402a1b4b3215e3e1669e Mon Sep 17 00:00:00 2001 From: Dan J Miller Date: Mon, 9 Sep 2024 12:26:12 -0230 Subject: [PATCH 03/43] Fix unit tests --- .../info/row/__snapshots__/row.test.tsx.snap | 4 +- .../row/__snapshots__/dataTree.test.tsx.snap | 34 +++---------- .../__snapshots__/confirm.test.tsx.snap | 50 +++++++++---------- ui/pages/routes/routes.component.js | 3 ++ .../developer-options-tab.test.tsx.snap | 8 ++- .../developer-options-tab.tsx | 14 +++--- 6 files changed, 49 insertions(+), 64 deletions(-) diff --git a/ui/components/app/confirm/info/row/__snapshots__/row.test.tsx.snap b/ui/components/app/confirm/info/row/__snapshots__/row.test.tsx.snap index dffd29798bbc..3d8affc5a90d 100644 --- a/ui/components/app/confirm/info/row/__snapshots__/row.test.tsx.snap +++ b/ui/components/app/confirm/info/row/__snapshots__/row.test.tsx.snap @@ -7,7 +7,7 @@ exports[`ConfirmInfoRow should match snapshot 1`] = ` style="overflow-wrap: anywhere; min-height: 24px; position: relative;" >

-
-

- PrimaryType: -

-
-
-

-

-
-

{ setHideNftEnablementToast(false); }; + if (!this.onHomeScreen()) { + return null; + } return ( diff --git a/ui/pages/settings/developer-options-tab/__snapshots__/developer-options-tab.test.tsx.snap b/ui/pages/settings/developer-options-tab/__snapshots__/developer-options-tab.test.tsx.snap index 973e02da7b2e..f7f9b38a0235 100644 --- a/ui/pages/settings/developer-options-tab/__snapshots__/developer-options-tab.test.tsx.snap +++ b/ui/pages/settings/developer-options-tab/__snapshots__/developer-options-tab.test.tsx.snap @@ -326,11 +326,13 @@ exports[`Develop options tab should match snapshot 1`] = ` class="settings-page__content-description" > + Generate an unhandled TestError in this window. +

@@ -368,11 +370,13 @@ exports[`Develop options tab should match snapshot 1`] = ` class="settings-page__content-description" > + Generate an unhandled TestError in the service worker. +
@@ -410,11 +414,13 @@ exports[`Develop options tab should match snapshot 1`] = ` class="settings-page__content-description" > - Generate a + + Generate a Developer Test Sentry trace. +
diff --git a/ui/pages/settings/developer-options-tab/developer-options-tab.tsx b/ui/pages/settings/developer-options-tab/developer-options-tab.tsx index efbc6ea6c1da..da1bd4685a75 100644 --- a/ui/pages/settings/developer-options-tab/developer-options-tab.tsx +++ b/ui/pages/settings/developer-options-tab/developer-options-tab.tsx @@ -218,8 +218,8 @@ const DeveloperOptionsTab = () => { const renderServiceWorkerKeepAliveToggle = () => { return ( handleToggleServiceWorkerAlive(!value)} dataTestId="developer-options-service-worker-alive-toggle" @@ -231,8 +231,8 @@ const DeveloperOptionsTab = () => { const renderNetworkMenuRedesign = () => { return ( { setEnableNetworkRedesign(!value); @@ -249,10 +249,8 @@ const DeveloperOptionsTab = () => { const renderEnableConfirmationsRedesignToggle = () => { return ( setEnableConfirmationsRedesignEnabled(!value) From 06000067adb1f6847dbce2eb2c02843b78531feb Mon Sep 17 00:00:00 2001 From: Dan J Miller Date: Mon, 9 Sep 2024 13:13:36 -0230 Subject: [PATCH 04/43] Locales lint: remove unused locales --- app/_locales/de/messages.json | 36 -------------------------------- app/_locales/el/messages.json | 36 -------------------------------- app/_locales/en/messages.json | 30 -------------------------- app/_locales/es/messages.json | 36 -------------------------------- app/_locales/fr/messages.json | 36 -------------------------------- app/_locales/hi/messages.json | 36 -------------------------------- app/_locales/id/messages.json | 36 -------------------------------- app/_locales/ja/messages.json | 36 -------------------------------- app/_locales/ko/messages.json | 36 -------------------------------- app/_locales/pt/messages.json | 36 -------------------------------- app/_locales/ru/messages.json | 36 -------------------------------- app/_locales/tl/messages.json | 36 -------------------------------- app/_locales/tr/messages.json | 36 -------------------------------- app/_locales/vi/messages.json | 36 -------------------------------- app/_locales/zh_CN/messages.json | 36 -------------------------------- 15 files changed, 534 deletions(-) diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json index 084f184254d7..cdc7fdd96669 100644 --- a/app/_locales/de/messages.json +++ b/app/_locales/de/messages.json @@ -513,12 +513,6 @@ "allow": { "message": "Genehmigen" }, - "allowMetaMaskToDetectNFTs": { - "message": "Erlauben Sie MetaMask, Ihre NFTs mit automatischer Erkennung zu identifizieren und anzuzeigen. Das können Sie tun:" - }, - "allowMetaMaskToDetectTokens": { - "message": "Erlauben Sie MetaMask, Ihre Token mit automatischer Erkennung zu entdecken und anzuzeigen. Das können Sie tun:" - }, "allowMmiToConnectToCustodian": { "message": "Dadurch kann MMI sich zum Importieren Ihrer Konten mit $1 verbinden." }, @@ -1606,12 +1600,6 @@ "displayNftMediaDescription": { "message": "Durch die Anzeige von NFT-Medien und -Daten wird Ihre IP-Adresse an OpenSea oder andere Dritte weitergegeben. Dies kann es Angreifern ermöglichen, Ihre IP-Adresse mit Ihrer Ethereum-Adresse in Verbindung zu bringen. Die automatische NFT-Erkennung basiert auf dieser Einstellung und ist nicht verfügbar, wenn diese ausgeschaltet ist." }, - "diveStraightIntoUsingYourNFTs": { - "message": "Verwenden Sie Ihre NFTs sofort" - }, - "diveStraightIntoUsingYourTokens": { - "message": "Verwenden Sie Ihre Tokens sofort" - }, "doNotShare": { "message": "Teilen Sie dies mit niemanden" }, @@ -1743,9 +1731,6 @@ "editSpeedUpEditGasFeeModalTitle": { "message": "Beschleunigung der Gasgebühr bearbeiten" }, - "effortlesslyNavigateYourDigitalAssets": { - "message": "Mühelose Navigation durch Ihre digitalen Assets" - }, "enable": { "message": "Aktivieren" }, @@ -1755,9 +1740,6 @@ "enableFromSettings": { "message": " In den Einstellungen aktivieren." }, - "enableNftAutoDetection": { - "message": "Automatische NFT-Erkennung aktivieren" - }, "enableSnap": { "message": "Aktivieren" }, @@ -1765,12 +1747,6 @@ "message": "$1 aktivieren", "description": "$1 is a token symbol, e.g. ETH" }, - "enableTokenAutoDetection": { - "message": "Automatische Token-Erkennung aktivieren" - }, - "enable_auto_detection_toggle_automatically": { - "message": "Bei Nutzern, deren Basisfunktionalität aktiviert ist, wird diese automatisch in der Metamask-Erweiterung v12.3.0 aktiviert" - }, "enabled": { "message": "Aktiviert" }, @@ -2283,12 +2259,6 @@ "imToken": { "message": "imToken" }, - "immediateAccessToYourNFTs": { - "message": "Sofortiger Zugriff auf Ihre NFTs" - }, - "immediateAccessToYourTokens": { - "message": "Sofortiger Zugriff auf Ihre Tokens" - }, "import": { "message": "Importieren", "description": "Button to import an account from a selected file" @@ -3253,9 +3223,6 @@ "notEnoughGas": { "message": "Nicht genügend Gas" }, - "notRightNow": { - "message": "Im Moment nicht" - }, "note": { "message": "Notiz" }, @@ -3526,9 +3493,6 @@ "onboardingMetametricsDescription2": { "message": "Wenn wir Metriken sammeln, wird es immer wie folgt sein ..." }, - "onboardingMetametricsDisagree": { - "message": "Nein, danke!" - }, "onboardingMetametricsInfuraTerms": { "message": "Wir werden Sie informieren, wenn wir beschließen, diese Daten für andere Zwecke zu verwenden. Für weitere Informationen können Sie unsere $1 einsehen. Vergessen Sie nicht, dass Sie jederzeit zu Einstellungen gehen und sich abmelden können.", "description": "$1 represents `onboardingMetametricsInfuraTermsPolicy`" diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json index 5298c61a533b..3db88285098a 100644 --- a/app/_locales/el/messages.json +++ b/app/_locales/el/messages.json @@ -513,12 +513,6 @@ "allow": { "message": "Να επιτρέπεται" }, - "allowMetaMaskToDetectNFTs": { - "message": "Επιτρέψτε στο MetaMask να ανιχνεύει και να εμφανίζει τα NFT σας με αυτόματο εντοπισμό. Θα μπορείτε να:" - }, - "allowMetaMaskToDetectTokens": { - "message": "Επιτρέψτε στο MetaMask να ανιχνεύει και να εμφανίζει τα tokens σας με αυτόματο εντοπισμό. Θα μπορείτε να:" - }, "allowMmiToConnectToCustodian": { "message": "Αυτό θα επιτρέψει στο MMI να συνδεθεί στο $1 για να εισαγάγει τους λογαριασμούς σας." }, @@ -1606,12 +1600,6 @@ "displayNftMediaDescription": { "message": "Η προβολή μέσων και δεδομένων NFT εκθέτει τη διεύθυνση IP σας στo OpenSea ή σε άλλους τρίτους. Αυτό μπορεί να επιτρέψει στους εισβολείς να συσχετίσουν τη διεύθυνση IP σας με τη διεύθυνση σας στο Ethereum. Η αυτόματη ανίχνευση NFT βασίζεται σε αυτή τη ρύθμιση και δεν θα είναι διαθέσιμη όταν είναι απενεργοποιημένη." }, - "diveStraightIntoUsingYourNFTs": { - "message": "Ενημερωθείτε για τη χρήση των NFT σας" - }, - "diveStraightIntoUsingYourTokens": { - "message": "Ενημερωθείτε για τη χρήση των tokens σας" - }, "doNotShare": { "message": "Μην το μοιραστείτε με κανέναν" }, @@ -1743,9 +1731,6 @@ "editSpeedUpEditGasFeeModalTitle": { "message": "Επεξεργασία τελών επίσπευσης συναλλαγής" }, - "effortlesslyNavigateYourDigitalAssets": { - "message": "Εύκολη περιήγηση στα ψηφιακά σας περιουσιακά στοιχεία" - }, "enable": { "message": "Ενεργοποίηση" }, @@ -1755,9 +1740,6 @@ "enableFromSettings": { "message": "Ενεργοποιήστε το από τις Ρυθμίσεις." }, - "enableNftAutoDetection": { - "message": "Ενεργοποίηση της αυτόματης ανίχνευσης NFT" - }, "enableSnap": { "message": "Ενεργοποίηση" }, @@ -1765,12 +1747,6 @@ "message": "ενεργοποίηση $1", "description": "$1 is a token symbol, e.g. ETH" }, - "enableTokenAutoDetection": { - "message": "Ενεργοποίηση της αυτόματης ανίχνευσης των tokens" - }, - "enable_auto_detection_toggle_automatically": { - "message": "Οι χρήστες με ενεργοποιημένη την επιλογή Βασικές Λειτουργίες θα την έχουν ενεργοποιήσει αυτόματα στην επέκταση του Metamask v12.3.0" - }, "enabled": { "message": "Ενεργοποιημένο" }, @@ -2283,12 +2259,6 @@ "imToken": { "message": "imToken" }, - "immediateAccessToYourNFTs": { - "message": "Άμεση πρόσβαση στα NFT σας" - }, - "immediateAccessToYourTokens": { - "message": "Άμεση πρόσβαση στα tokens σας" - }, "import": { "message": "Εισαγωγή", "description": "Button to import an account from a selected file" @@ -3253,9 +3223,6 @@ "notEnoughGas": { "message": "Δεν υπάρχει αρκετό τέλος συναλλαγής" }, - "notRightNow": { - "message": "Όχι τώρα" - }, "note": { "message": "Σημείωση" }, @@ -3526,9 +3493,6 @@ "onboardingMetametricsDescription2": { "message": "Όταν συγκεντρώνουμε μετρήσεις, θα είναι πάντα..." }, - "onboardingMetametricsDisagree": { - "message": "Όχι, ευχαριστώ" - }, "onboardingMetametricsInfuraTerms": { "message": "Θα σας ενημερώσουμε εάν αποφασίσουμε να χρησιμοποιήσουμε αυτά τα δεδομένα για άλλους σκοπούς. Για περισσότερες πληροφορίες, μπορείτε να ανατρέξετε στην $1. Να θυμάστε ότι μπορείτε να μεταβείτε στις ρυθμίσεις και να εξαιρεθείτε ανά πάσα στιγμή.", "description": "$1 represents `onboardingMetametricsInfuraTermsPolicy`" diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 7a2abeb2e391..c3683becebbd 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -1549,24 +1549,6 @@ "developerOptions": { "message": "Developer Options" }, - "developerOptionsEnableConfirmationsRedesignDescription": { - "message": "Enables or disables the confirmations redesign feature currently in development" - }, - "developerOptionsEnableConfirmationsRedesignTitle": { - "message": "Confirmations Redesign" - }, - "developerOptionsNetworkMenuRedesignDescription": { - "message": "Toggles the new design of the Networks menu" - }, - "developerOptionsNetworkMenuRedesignTitle": { - "message": "Network Menu Redesign" - }, - "developerOptionsResetStatesAnnouncementsDescription": { - "message": "Resets isShown boolean to false for all announcements. Announcements are the notifications shown in the What's New popup modal." - }, - "developerOptionsResetStatesOnboarding": { - "message": "Resets various states related to onboarding and redirects to the \"Secure Your Wallet\" onboarding page." - }, "developerOptionsSentryButtonGenerateBackgroundError": { "message": "Generate Background Error" }, @@ -1585,9 +1567,6 @@ "developerOptionsSentryDescriptionGenerateUIError": { "message": "Generate an unhandled $1 in this window." }, - "developerOptionsServiceWorkerKeepAlive": { - "message": "Results in a timestamp being continuously saved to session.storage" - }, "disabledGasOptionToolTipMessage": { "message": "“$1” is disabled because it does not meet the minimum of a 10% increase from the original gas fee.", "description": "$1 is gas estimate type which can be market or aggressive" @@ -1795,12 +1774,6 @@ "message": "enable $1", "description": "$1 is a token symbol, e.g. ETH" }, - "enableTokenAutoDetection": { - "message": "Enable token autodetection" - }, - "enable_auto_detection_toggle_automatically": { - "message": "Users with the Basic Functionality toggle on will have this automatically turned on in the Metamask Extension v12.3.0" - }, "enabled": { "message": "Enabled" }, @@ -3562,9 +3535,6 @@ "onboardingMetametricsDescription2": { "message": "When we gather metrics, it will always be..." }, - "onboardingMetametricsDisagree": { - "message": "No thanks" - }, "onboardingMetametricsInfuraTerms": { "message": "We’ll let you know if we decide to use this data for other purposes. You can review our $1 for more information. Remember, you can go to settings and opt out at any time.", "description": "$1 represents `onboardingMetametricsInfuraTermsPolicy`" diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json index 0b18d79e33cf..19031ace0ed8 100644 --- a/app/_locales/es/messages.json +++ b/app/_locales/es/messages.json @@ -513,12 +513,6 @@ "allow": { "message": "Permitir" }, - "allowMetaMaskToDetectNFTs": { - "message": "Permita que MetaMask detecte y muestre sus NFT con autodetección. Podrá:" - }, - "allowMetaMaskToDetectTokens": { - "message": "Permita que MetaMask detecte y muestre sus tokens con autodetección. Podrá:" - }, "allowMmiToConnectToCustodian": { "message": "Esto permitirá que MMI se conecte a $1 para importar sus cuentas." }, @@ -1606,12 +1600,6 @@ "displayNftMediaDescription": { "message": "Mostrar los medios y datos NFT expone su dirección IP a OpenSea u otros terceros. Esto puede permitir que los atacantes asocien su dirección IP con su dirección Ethereum. La detección automática de NFT se basa en esta configuración y no estará disponible cuando esté desactivada." }, - "diveStraightIntoUsingYourNFTs": { - "message": "Comience a utilizar sus NFT" - }, - "diveStraightIntoUsingYourTokens": { - "message": "Comience a utilizar sus tokens" - }, "doNotShare": { "message": "No comparta esto con nadie" }, @@ -1743,9 +1731,6 @@ "editSpeedUpEditGasFeeModalTitle": { "message": "Editar la tarifa de aceleración de gas" }, - "effortlesslyNavigateYourDigitalAssets": { - "message": "Navegue sin esfuerzo por sus activos digitales" - }, "enable": { "message": "Habilitar" }, @@ -1755,9 +1740,6 @@ "enableFromSettings": { "message": " Actívela en Configuración." }, - "enableNftAutoDetection": { - "message": "Habilite la autodetección de NFT" - }, "enableSnap": { "message": "Activar" }, @@ -1765,12 +1747,6 @@ "message": "activar $1", "description": "$1 is a token symbol, e.g. ETH" }, - "enableTokenAutoDetection": { - "message": "Activar la autodetección de tokens" - }, - "enable_auto_detection_toggle_automatically": { - "message": "Esta opción estará activada automáticamente en la extensión Metamask v12.3.0 para los usuarios que tengan activada la funcionalidad básica" - }, "enabled": { "message": "Activado" }, @@ -2283,12 +2259,6 @@ "imToken": { "message": "imToken" }, - "immediateAccessToYourNFTs": { - "message": "Acceda inmediatamente a sus NFT" - }, - "immediateAccessToYourTokens": { - "message": "Acceso inmediato a sus tokens" - }, "import": { "message": "Importar", "description": "Button to import an account from a selected file" @@ -3253,9 +3223,6 @@ "notEnoughGas": { "message": "No hay gas suficiente" }, - "notRightNow": { - "message": "Ahora no" - }, "note": { "message": "Nota" }, @@ -3526,9 +3493,6 @@ "onboardingMetametricsDescription2": { "message": "Al recopilar métricas, siempre será..." }, - "onboardingMetametricsDisagree": { - "message": "No, gracias" - }, "onboardingMetametricsInfuraTerms": { "message": "Le informaremos si decidimos usar estos datos para otros fines. Puede consultar $1 para obtener más información. Recuerde que puede acceder a la configuración y excluirse en cualquier momento.", "description": "$1 represents `onboardingMetametricsInfuraTermsPolicy`" diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json index ec3a338656e3..2e7d3697e11d 100644 --- a/app/_locales/fr/messages.json +++ b/app/_locales/fr/messages.json @@ -513,12 +513,6 @@ "allow": { "message": "Autoriser" }, - "allowMetaMaskToDetectNFTs": { - "message": "Autorisez MetaMask à détecter et à afficher vos NFT grâce à la détection automatique des NFT. Vous pourrez ainsi :" - }, - "allowMetaMaskToDetectTokens": { - "message": "Autorisez MetaMask à détecter et à afficher vos jetons grâce à la détection automatique des jetons. Vous pourrez ainsi :" - }, "allowMmiToConnectToCustodian": { "message": "Cela permettra à MMI de se connecter à $1 pour importer vos comptes." }, @@ -1606,12 +1600,6 @@ "displayNftMediaDescription": { "message": "L’affichage des médias et des données NFT expose votre adresse IP à OpenSea ou à d’autres fournisseurs de services tiers. Cela permet à des hackers d’associer votre adresse IP à votre adresse Ethereum. La détection automatique des NFT dépend de ce paramètre et ne sera pas disponible lorsque celui-ci est désactivé." }, - "diveStraightIntoUsingYourNFTs": { - "message": "Commencer à utiliser vos NFT" - }, - "diveStraightIntoUsingYourTokens": { - "message": "Commencez à utiliser vos jetons" - }, "doNotShare": { "message": "Ne partagez ceci avec personne" }, @@ -1743,9 +1731,6 @@ "editSpeedUpEditGasFeeModalTitle": { "message": "Modifier les gas fees d’accélération" }, - "effortlesslyNavigateYourDigitalAssets": { - "message": "Gérez facilement à vos actifs numériques" - }, "enable": { "message": "Activer" }, @@ -1755,9 +1740,6 @@ "enableFromSettings": { "message": " Activez-la depuis les Paramètres." }, - "enableNftAutoDetection": { - "message": "Activer la détection automatique des NFT" - }, "enableSnap": { "message": "Activer" }, @@ -1765,12 +1747,6 @@ "message": "activer $1", "description": "$1 is a token symbol, e.g. ETH" }, - "enableTokenAutoDetection": { - "message": "Activer la détection automatique des jetons" - }, - "enable_auto_detection_toggle_automatically": { - "message": "Cette option sera automatiquement activée dans l’extension Metamask v12.3.0 si l’option « Fonctionnalité de base » est déjà activée" - }, "enabled": { "message": "Activé" }, @@ -2283,12 +2259,6 @@ "imToken": { "message": "imToken" }, - "immediateAccessToYourNFTs": { - "message": "Accéder immédiatement à vos NFT" - }, - "immediateAccessToYourTokens": { - "message": "Accès immédiat à vos jetons" - }, "import": { "message": "Importer", "description": "Button to import an account from a selected file" @@ -3253,9 +3223,6 @@ "notEnoughGas": { "message": "Pas assez de gaz" }, - "notRightNow": { - "message": "Pas maintenant" - }, "note": { "message": "Note" }, @@ -3526,9 +3493,6 @@ "onboardingMetametricsDescription2": { "message": "Lorsque nous recueillons des données, elles sont toujours…" }, - "onboardingMetametricsDisagree": { - "message": "Non merci" - }, "onboardingMetametricsInfuraTerms": { "message": "Nous vous informerons si nous décidons d’utiliser ces données à d’autres fins. Pour plus d’informations, vous pouvez consulter notre $1. N’oubliez pas que vous pouvez aller dans les paramètres et vous désinscrire à tout moment.", "description": "$1 represents `onboardingMetametricsInfuraTermsPolicy`" diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json index 8b941ba8716d..1c1e9363d761 100644 --- a/app/_locales/hi/messages.json +++ b/app/_locales/hi/messages.json @@ -513,12 +513,6 @@ "allow": { "message": "अनुमति दें" }, - "allowMetaMaskToDetectNFTs": { - "message": "MetaMask को ऑटोडिटेक्शन के साथ आपके NFT का पता लगाने और प्रदर्शित करने की अनुमति दें। आप यह कर सकेंगे:" - }, - "allowMetaMaskToDetectTokens": { - "message": "MetaMask को ऑटोडिटेक्शन के साथ आपके टोकन का पता लगाने और प्रदर्शित करने की अनुमति दें। आप यह कर सकेंगे:" - }, "allowMmiToConnectToCustodian": { "message": "यह आपके एकाउंट्स को इम्पोर्ट करने के लिए MMI को $1 से कनेक्ट करने की अनुमति देगा।" }, @@ -1606,12 +1600,6 @@ "displayNftMediaDescription": { "message": "NFT मीडिया और डेटा दिखाने से आपका IP एड्रेस OpenSea या अन्य थर्ड पार्टियों के सामने आ जाता है। ऐसा होने पर, हमला करने वाले आपके IP एड्रेस को आपके Ethereum एड्रेस के साथ जोड़ पाते हैं। NFT ऑटोडिटेक्शन की सुविधा इस सेटिंग पर निर्भर करती है, और इस सेटिंग को बंद किए जाने पर उपलब्ध नहीं रहेगी।" }, - "diveStraightIntoUsingYourNFTs": { - "message": "अपने NFT का उपयोग करने के लिए सीधे प्रवेश करें" - }, - "diveStraightIntoUsingYourTokens": { - "message": "अपने टोकन का उपयोग करने के लिए सीधे प्रवेश करें" - }, "doNotShare": { "message": "इसे किसी के साथ शेयर न करें।" }, @@ -1743,9 +1731,6 @@ "editSpeedUpEditGasFeeModalTitle": { "message": "गैस फ़ीस स्पीड अप को बदलें" }, - "effortlesslyNavigateYourDigitalAssets": { - "message": "अपनी डिजिटल एसेट को आसानी से नेविगेट करें" - }, "enable": { "message": "चालू करें" }, @@ -1755,9 +1740,6 @@ "enableFromSettings": { "message": " इसे सेटिंग्स से इनेबल करें।" }, - "enableNftAutoDetection": { - "message": "NFT ऑटोडिटेक्शन चालू करें" - }, "enableSnap": { "message": "इनेबल करें" }, @@ -1765,12 +1747,6 @@ "message": "$1 इनेबल करें", "description": "$1 is a token symbol, e.g. ETH" }, - "enableTokenAutoDetection": { - "message": "टोकन ऑटोडिटेक्शन चालू करें" - }, - "enable_auto_detection_toggle_automatically": { - "message": "बेसिक फ़ंक्शनैलिटी टॉगल को चालू रखने वाले उपयोगकर्ताओं के लिए MetaMask एक्सटेंशन v12.3.0 में यह स्वचालित रूप से चालू हो जाएगा" - }, "enabled": { "message": "इनेबल किया गया" }, @@ -2283,12 +2259,6 @@ "imToken": { "message": "imToken" }, - "immediateAccessToYourNFTs": { - "message": "तुरंत अपने NFT तक पहुंचें" - }, - "immediateAccessToYourTokens": { - "message": "आपके टोकन तक तत्काल पहुंच" - }, "import": { "message": "इम्पोर्ट करें", "description": "Button to import an account from a selected file" @@ -3253,9 +3223,6 @@ "notEnoughGas": { "message": "गैस कम है" }, - "notRightNow": { - "message": "अभी नहीं" - }, "note": { "message": "टिप्पणी" }, @@ -3526,9 +3493,6 @@ "onboardingMetametricsDescription2": { "message": "जब हम मेट्रिक्स इकट्ठा करते हैं, तो यह हमेशा... रहेगा" }, - "onboardingMetametricsDisagree": { - "message": "जी नहीं, धन्यवाद" - }, "onboardingMetametricsInfuraTerms": { "message": "यदि हम इस डेटा का उपयोग अन्य उद्देश्यों के लिए करने का निर्णय लेते हैं तो हम आपको बताएंगे। अधिक जानकारी के लिए आप हमारे $1 की समीक्षा कर सकते हैं। याद रखें, आप किसी भी समय सेटिंग्स में जाकर ऑप्ट आउट कर सकते हैं।", "description": "$1 represents `onboardingMetametricsInfuraTermsPolicy`" diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json index 6d58c18e01b4..13e7c6d1cbec 100644 --- a/app/_locales/id/messages.json +++ b/app/_locales/id/messages.json @@ -513,12 +513,6 @@ "allow": { "message": "Izinkan" }, - "allowMetaMaskToDetectNFTs": { - "message": "Izinkan MetaMask mendeteksi dan menampilkan NFT dengan autodeteksi. Anda dapat:" - }, - "allowMetaMaskToDetectTokens": { - "message": "Izinkan MetaMask mendeteksi dan menampilkan token dengan autodeteksi. Anda dapat:" - }, "allowMmiToConnectToCustodian": { "message": "Ini akan memungkinkan MMI terhubung ke $1 untuk mengimpor akun Anda." }, @@ -1606,12 +1600,6 @@ "displayNftMediaDescription": { "message": "Alamat IP dapat diketahui oleh OpenSea atau pihak ketiga lainnya saat menampilkan media dan data NFT. Ini memungkinkan penyerang menghubungkan alamat IP dengan alamat Ethereum Anda. Deteksi otomatis NFT bergantung pada pengaturan ini, dan tidak akan tersedia saat dinonaktifkan." }, - "diveStraightIntoUsingYourNFTs": { - "message": "Gunakan NFT secara langsung" - }, - "diveStraightIntoUsingYourTokens": { - "message": "Gunakan token secara langsung" - }, "doNotShare": { "message": "Jangan bagikan ini kepada siapa pun" }, @@ -1743,9 +1731,6 @@ "editSpeedUpEditGasFeeModalTitle": { "message": "Edit biaya gas percepatan" }, - "effortlesslyNavigateYourDigitalAssets": { - "message": "Navigasikan aset digital Anda dengan mudah" - }, "enable": { "message": "Aktifkan" }, @@ -1755,9 +1740,6 @@ "enableFromSettings": { "message": " Aktifkan dari Pengaturan." }, - "enableNftAutoDetection": { - "message": "Aktifkan autodeteksi NFT" - }, "enableSnap": { "message": "Aktifkan" }, @@ -1765,12 +1747,6 @@ "message": "aktifkan $1", "description": "$1 is a token symbol, e.g. ETH" }, - "enableTokenAutoDetection": { - "message": "Aktifkan autodeteksi token" - }, - "enable_auto_detection_toggle_automatically": { - "message": "Pengguna dengan Fungsionalitas Dasar yang diaktifkan akan mengaktifkannya secara otomatis di Ekstensi MetaMask v12.3.0" - }, "enabled": { "message": "Diaktifkan" }, @@ -2283,12 +2259,6 @@ "imToken": { "message": "imToken" }, - "immediateAccessToYourNFTs": { - "message": "Akses NFT secara langsung" - }, - "immediateAccessToYourTokens": { - "message": "Akses langsung ke token Anda" - }, "import": { "message": "Impor", "description": "Button to import an account from a selected file" @@ -3253,9 +3223,6 @@ "notEnoughGas": { "message": "Gas tidak cukup" }, - "notRightNow": { - "message": "Tidak sekarang" - }, "note": { "message": "Catatan" }, @@ -3526,9 +3493,6 @@ "onboardingMetametricsDescription2": { "message": "Saat kami mengumpulkan metrik, maka akan selalu..." }, - "onboardingMetametricsDisagree": { - "message": "Tidak, terima kasih" - }, "onboardingMetametricsInfuraTerms": { "message": "Kami akan memberitahukan keputusan untuk menggunakan data ini dengan tujuan lain. Anda dapat meninjau $1 kami untuk informasi selengkapnya. Ingat, Anda dapat membuka pengaturan dan memilih keluar setiap saat.", "description": "$1 represents `onboardingMetametricsInfuraTermsPolicy`" diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json index 754e883d4c25..5935c29f4eab 100644 --- a/app/_locales/ja/messages.json +++ b/app/_locales/ja/messages.json @@ -513,12 +513,6 @@ "allow": { "message": "許可する" }, - "allowMetaMaskToDetectNFTs": { - "message": "MetaMaskによる自動検出でのNFTの検出と表示を許可してください。これにより、次のことが可能になります:" - }, - "allowMetaMaskToDetectTokens": { - "message": "MetaMaskによる自動検出でのトークンの検出と表示を許可してください。これにより、次のことが可能になります:" - }, "allowMmiToConnectToCustodian": { "message": "これにより、MMIが$1に接続してアカウントをインポートできるようになります。" }, @@ -1606,12 +1600,6 @@ "displayNftMediaDescription": { "message": "NFTのメディアとデータを表示した場合、IPアドレスがOpenSeaをはじめとするサードパーティに公開されます。その結果、攻撃者がユーザーのIPアドレスとイーサリアムアドレスを関連付けられるようになる可能性があります。NFTの自動検出はこの設定に依存しており、この設定を無効にすると利用できなくなります。" }, - "diveStraightIntoUsingYourNFTs": { - "message": "NFTをすぐに使用開始" - }, - "diveStraightIntoUsingYourTokens": { - "message": "トークンをすぐに使用開始" - }, "doNotShare": { "message": "これは誰にも教えないでください" }, @@ -1743,9 +1731,6 @@ "editSpeedUpEditGasFeeModalTitle": { "message": "高速化用のガス代を編集" }, - "effortlesslyNavigateYourDigitalAssets": { - "message": "デジタル資産を簡単に運用" - }, "enable": { "message": "有効にする" }, @@ -1755,9 +1740,6 @@ "enableFromSettings": { "message": " 設定で有効にします。" }, - "enableNftAutoDetection": { - "message": "NFTの自動検出を有効にする" - }, "enableSnap": { "message": "有効にする" }, @@ -1765,12 +1747,6 @@ "message": "$1を有効にする", "description": "$1 is a token symbol, e.g. ETH" }, - "enableTokenAutoDetection": { - "message": "トークンの自動検出を有効にする" - }, - "enable_auto_detection_toggle_automatically": { - "message": "基本機能トグルがオンになっているユーザーは、MetaMask拡張機能 v12.3.0で、この機能が自動的にオンになります。" - }, "enabled": { "message": "有効" }, @@ -2283,12 +2259,6 @@ "imToken": { "message": "imToken" }, - "immediateAccessToYourNFTs": { - "message": "NFTにすぐにアクセス" - }, - "immediateAccessToYourTokens": { - "message": "トークンにすぐにアクセス" - }, "import": { "message": "インポート", "description": "Button to import an account from a selected file" @@ -3253,9 +3223,6 @@ "notEnoughGas": { "message": "ガスが不足しています" }, - "notRightNow": { - "message": "また後で" - }, "note": { "message": "備考" }, @@ -3526,9 +3493,6 @@ "onboardingMetametricsDescription2": { "message": "指標を収集する際、常に次の条件が適用されます..." }, - "onboardingMetametricsDisagree": { - "message": "結構です" - }, "onboardingMetametricsInfuraTerms": { "message": "このデータを他の目的に使用する際は、お知らせします。詳細は当社の$1をご覧ください。設定でいつでもオプトアウトできます。", "description": "$1 represents `onboardingMetametricsInfuraTermsPolicy`" diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json index ca2d3871d633..a4b9ca10e7b0 100644 --- a/app/_locales/ko/messages.json +++ b/app/_locales/ko/messages.json @@ -513,12 +513,6 @@ "allow": { "message": "허용" }, - "allowMetaMaskToDetectNFTs": { - "message": "자동 감지를 통해 MetaMask가 NFT를 감지하고 표시하도록 허용합니다. 다음과 같은 작업을 할 수 있습니다." - }, - "allowMetaMaskToDetectTokens": { - "message": "자동 감지를 통해 MetaMask가 토큰을 감지하고 표시하도록 허용합니다. 다음과 같은 작업을 할 수 있습니다." - }, "allowMmiToConnectToCustodian": { "message": "허용할 경우, MMI가 $1에 연결하여 계정을 가져올 수 있습니다." }, @@ -1606,12 +1600,6 @@ "displayNftMediaDescription": { "message": "NFT 미디어와 데이터를 표시하면 IP 주소가 OpenSea나 기타 제삼자에게 노출될 수 있습니다. 공격자는 이를 통해 회원님의 IP 주소와 이더리움 주소를 연결할 수 있습니다. NFT 자동 감지는 이 설정을 사용하며, 이 설정이 꺼져 있는 경우 사용할 수 없습니다." }, - "diveStraightIntoUsingYourNFTs": { - "message": "NFT 바로 사용" - }, - "diveStraightIntoUsingYourTokens": { - "message": "토큰 바로 사용" - }, "doNotShare": { "message": "누구와도 공유하지 마세요" }, @@ -1743,9 +1731,6 @@ "editSpeedUpEditGasFeeModalTitle": { "message": "가스비 가속 편집" }, - "effortlesslyNavigateYourDigitalAssets": { - "message": "디지털 자산을 손쉽게 탐색" - }, "enable": { "message": "활성화" }, @@ -1755,9 +1740,6 @@ "enableFromSettings": { "message": " 설정에서 이 기능을 활성화합니다." }, - "enableNftAutoDetection": { - "message": "NFT 자동 감지 활성화" - }, "enableSnap": { "message": "활성화" }, @@ -1765,12 +1747,6 @@ "message": "$1 활성화", "description": "$1 is a token symbol, e.g. ETH" }, - "enableTokenAutoDetection": { - "message": "토큰 자동 감지 활성화" - }, - "enable_auto_detection_toggle_automatically": { - "message": "기본 기능을 사용하면 Metamask 확장 v12.3.0에서 이 기능이 자동으로 켜집니다" - }, "enabled": { "message": "활성화됨" }, @@ -2283,12 +2259,6 @@ "imToken": { "message": "imToken" }, - "immediateAccessToYourNFTs": { - "message": "NFT에 즉시 액세스" - }, - "immediateAccessToYourTokens": { - "message": "토큰에 즉시 액세스" - }, "import": { "message": "가져오기", "description": "Button to import an account from a selected file" @@ -3253,9 +3223,6 @@ "notEnoughGas": { "message": "가스 부족" }, - "notRightNow": { - "message": "나중에" - }, "note": { "message": "메모" }, @@ -3526,9 +3493,6 @@ "onboardingMetametricsDescription2": { "message": "메트릭을 수집할 때는 항상..." }, - "onboardingMetametricsDisagree": { - "message": "괜찮습니다" - }, "onboardingMetametricsInfuraTerms": { "message": "이 데이터를 다른 목적으로 사용하기로 결정하면 알려드리겠습니다. 자세한 내용은 $1을(를) 참고하세요. 언제든지 설정으로 이동하여 해제할 수 있습니다.", "description": "$1 represents `onboardingMetametricsInfuraTermsPolicy`" diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json index d532fe9ff04f..5706a91b473a 100644 --- a/app/_locales/pt/messages.json +++ b/app/_locales/pt/messages.json @@ -513,12 +513,6 @@ "allow": { "message": "Permitir" }, - "allowMetaMaskToDetectNFTs": { - "message": "Permita que a MetaMask detecte e exiba seus NFTs com detecção automática. Você será capaz de:" - }, - "allowMetaMaskToDetectTokens": { - "message": "Permita que MetaMask detecte e exiba seus tokens com detecção automática. Você será capaz de:" - }, "allowMmiToConnectToCustodian": { "message": "Isso permite que o MMI se conecte ao $1 para importar suas contas." }, @@ -1606,12 +1600,6 @@ "displayNftMediaDescription": { "message": "Exibir arquivos de mídia e dados de NFTs expõe seu endereço IP à OpenSea ou outros terceiros. Isso pode possibilitar que invasores associem seu endereço IP ao seu endereço Ethereum. A detecção automática de NFTs depende dessa configuração e ficará indisponível quando ela estiver desativada." }, - "diveStraightIntoUsingYourNFTs": { - "message": "Acessar diretamente e começar a usar seus NFTs" - }, - "diveStraightIntoUsingYourTokens": { - "message": "Vá direto aos seus tokens e comece a usá-los" - }, "doNotShare": { "message": "Não compartilhe isso com ninguém" }, @@ -1743,9 +1731,6 @@ "editSpeedUpEditGasFeeModalTitle": { "message": "Editar taxa de gás para aceleração" }, - "effortlesslyNavigateYourDigitalAssets": { - "message": "Navegue sem esforço em seus ativos digitais" - }, "enable": { "message": "Ativar" }, @@ -1755,9 +1740,6 @@ "enableFromSettings": { "message": " Ative nas Configurações." }, - "enableNftAutoDetection": { - "message": "Ativar detecção automática de NFTs" - }, "enableSnap": { "message": "Ativar" }, @@ -1765,12 +1747,6 @@ "message": "ativar $1", "description": "$1 is a token symbol, e.g. ETH" }, - "enableTokenAutoDetection": { - "message": "Ativar detecção automática de tokens" - }, - "enable_auto_detection_toggle_automatically": { - "message": "Essa opção estará automaticamente ativada na extensão da Metamask v12.3.0 para usuários que tenham a funcionalidade básica ativada" - }, "enabled": { "message": "Ativado" }, @@ -2283,12 +2259,6 @@ "imToken": { "message": "imToken" }, - "immediateAccessToYourNFTs": { - "message": "Acessar suas NFTs imediatamente" - }, - "immediateAccessToYourTokens": { - "message": "Acesso imediato aos seus tokens" - }, "import": { "message": "Importar", "description": "Button to import an account from a selected file" @@ -3253,9 +3223,6 @@ "notEnoughGas": { "message": "Não há gás suficiente" }, - "notRightNow": { - "message": "Agora não" - }, "note": { "message": "Observação" }, @@ -3526,9 +3493,6 @@ "onboardingMetametricsDescription2": { "message": "Quando coletamos as métricas, elas sempre são..." }, - "onboardingMetametricsDisagree": { - "message": "Não, obrigado" - }, "onboardingMetametricsInfuraTerms": { "message": "Informaremos a você se decidirmos usar esses dados para outras finalidades. Você pode analisar nossa $1 para obter mais informações. Lembre-se: você pode acessar as configurações e revogar a permissão a qualquer momento.", "description": "$1 represents `onboardingMetametricsInfuraTermsPolicy`" diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json index 2467ee48a573..d08ae9c67865 100644 --- a/app/_locales/ru/messages.json +++ b/app/_locales/ru/messages.json @@ -513,12 +513,6 @@ "allow": { "message": "Разрешить" }, - "allowMetaMaskToDetectNFTs": { - "message": "Разрешите MetaMask обнаруживать и отображать ваши NFT-токены с помощью автоопределения. Вы сможете:" - }, - "allowMetaMaskToDetectTokens": { - "message": "Разрешите MetaMask обнаруживать и отображать ваши токены с помощью автоопределения. Вы сможете:" - }, "allowMmiToConnectToCustodian": { "message": "Это позволит MMI подключиться к $1 для импорта ваших счетов." }, @@ -1606,12 +1600,6 @@ "displayNftMediaDescription": { "message": "Отображение носителя и данных NFT раскрывает ваш IP-адрес для OpenSea или других третьих сторон. Это может позволить злоумышленникам связать ваш IP-адрес с вашим адресом Ethereum. Автоопределение NFT зависит от этого параметра и будет недоступно, если он отключен." }, - "diveStraightIntoUsingYourNFTs": { - "message": "Перейдите прямо к использованию своих NFT-токенов" - }, - "diveStraightIntoUsingYourTokens": { - "message": "Перейдите прямо к использованию своих токенов" - }, "doNotShare": { "message": "Не сообщайте ее никому" }, @@ -1743,9 +1731,6 @@ "editSpeedUpEditGasFeeModalTitle": { "message": "Изменить плату за газ за ускорение" }, - "effortlesslyNavigateYourDigitalAssets": { - "message": "Легко перемещайтесь по своим цифровым активам" - }, "enable": { "message": "Включить" }, @@ -1755,9 +1740,6 @@ "enableFromSettings": { "message": " Включите его в Настройках." }, - "enableNftAutoDetection": { - "message": "Включить автоопределение NFT" - }, "enableSnap": { "message": "Включить" }, @@ -1765,12 +1747,6 @@ "message": "активирует для $1", "description": "$1 is a token symbol, e.g. ETH" }, - "enableTokenAutoDetection": { - "message": "Включите автоопределение токена" - }, - "enable_auto_detection_toggle_automatically": { - "message": "Для пользователей, у которых включен переключатель базового функционала, он будет автоматически включен в расширении Metamask v12.3.0" - }, "enabled": { "message": "Включено" }, @@ -2283,12 +2259,6 @@ "imToken": { "message": "imToken" }, - "immediateAccessToYourNFTs": { - "message": "Немедленный доступ к вашим NFT-токенам" - }, - "immediateAccessToYourTokens": { - "message": "Немедленный доступ к вашим токенам" - }, "import": { "message": "Импорт", "description": "Button to import an account from a selected file" @@ -3253,9 +3223,6 @@ "notEnoughGas": { "message": "Недостаточно газа" }, - "notRightNow": { - "message": "Не сейчас" - }, "note": { "message": "Примечание" }, @@ -3526,9 +3493,6 @@ "onboardingMetametricsDescription2": { "message": "Когда мы собираем показатели, они всегда будут..." }, - "onboardingMetametricsDisagree": { - "message": "Нет, спасибо" - }, "onboardingMetametricsInfuraTerms": { "message": "Мы сообщим вам, если решим использовать эти данные для других целей. Вы можете ознакомиться с нашей $1 для получения дополнительной информации. Помните, что вы можете перейти в настройки и отказаться в любой момент.", "description": "$1 represents `onboardingMetametricsInfuraTermsPolicy`" diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json index e6e0ef7025b7..65268e6199d6 100644 --- a/app/_locales/tl/messages.json +++ b/app/_locales/tl/messages.json @@ -513,12 +513,6 @@ "allow": { "message": "Payagan" }, - "allowMetaMaskToDetectNFTs": { - "message": "Pahintulutan ang MetaMask na i-detect at ipakita ang iyong mga NFT gamit ang autodetection. Maaari mong:" - }, - "allowMetaMaskToDetectTokens": { - "message": "Pahintulutan ang MetaMask na i-detect at ipakita ang iyong mga token gamit ang autodetection. Maaari mong:" - }, "allowMmiToConnectToCustodian": { "message": "Papayagan nito ang MMI na kumonekto sa $1 para i-import ang iyong mga account." }, @@ -1606,12 +1600,6 @@ "displayNftMediaDescription": { "message": "Ang pagpapakita ng NFT media at data ay naglalantad sa iyong IP address sa OpenSea o sa ibang mga third party. Maaari nitong payagan ang mga umaatake na iugnay ang iyong IP address sa iyong Ethereum address. Umaasa ang awtomatikong pagtuklas ng NFT sa setting na ito, at hindi magagamit kapag naka-off ito." }, - "diveStraightIntoUsingYourNFTs": { - "message": "Dumiretso sa paggamit ng iyong mga NFT" - }, - "diveStraightIntoUsingYourTokens": { - "message": "Dumiretso sa paggamit ng iyong mga token" - }, "doNotShare": { "message": "Huwag ibahagi ito sa sinuman" }, @@ -1743,9 +1731,6 @@ "editSpeedUpEditGasFeeModalTitle": { "message": "I-edit ang pagpapabilis ng bayad sa gas" }, - "effortlesslyNavigateYourDigitalAssets": { - "message": "Walang hirap na pamahalaan ang iyong mga digital na asset" - }, "enable": { "message": "Payagan" }, @@ -1755,9 +1740,6 @@ "enableFromSettings": { "message": " Paganahin ito mula sa Mga Setting." }, - "enableNftAutoDetection": { - "message": "Paganahin ang autodetection ng NFT" - }, "enableSnap": { "message": "Paganahin" }, @@ -1765,12 +1747,6 @@ "message": "paganahin ang $1", "description": "$1 is a token symbol, e.g. ETH" }, - "enableTokenAutoDetection": { - "message": "Paganahin ang autodetection ng token" - }, - "enable_auto_detection_toggle_automatically": { - "message": "Ang mga user na naka-toggle on ang Basic Functionality ay awtomatikong naka-on sa Extension ng MetaMask v12.3.0" - }, "enabled": { "message": "Pinagana" }, @@ -2283,12 +2259,6 @@ "imToken": { "message": "imToken" }, - "immediateAccessToYourNFTs": { - "message": "Agad na i-access ang mga NFT mo" - }, - "immediateAccessToYourTokens": { - "message": "Agarang access sa iyong mga token" - }, "import": { "message": "Mag-import", "description": "Button to import an account from a selected file" @@ -3253,9 +3223,6 @@ "notEnoughGas": { "message": "Hindi Sapat ang Gas" }, - "notRightNow": { - "message": "Hindi ngayon" - }, "note": { "message": "Tala" }, @@ -3526,9 +3493,6 @@ "onboardingMetametricsDescription2": { "message": "Kapag kami ay nangangalap ng metrics, ito ay palaging..." }, - "onboardingMetametricsDisagree": { - "message": "Salamat nalang" - }, "onboardingMetametricsInfuraTerms": { "message": "Ipapaalam namin sa iyo kung magdesisyon kaming gamitin ang data na ito para sa ibang layunin. Maaari mong suriin ang aming $1 para sa karagdagang impormasyon. Tandaan, maaari kang magpunta sa mga setting at mag-opt out anumang oras.", "description": "$1 represents `onboardingMetametricsInfuraTermsPolicy`" diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json index 21af1e89ee17..b58a54040cb1 100644 --- a/app/_locales/tr/messages.json +++ b/app/_locales/tr/messages.json @@ -513,12 +513,6 @@ "allow": { "message": "İzin Ver" }, - "allowMetaMaskToDetectNFTs": { - "message": "MetaMask'in otomatik algılama ile NFT'lerinizi algılamasına ve göstermesine izin verin. Şunları yapabileceksiniz:" - }, - "allowMetaMaskToDetectTokens": { - "message": "MetaMask'in otomatik algılama ile token'lerinizi algılamasına ve göstermesine izin verin. Şunları yapabileceksiniz:" - }, "allowMmiToConnectToCustodian": { "message": "MMI'nin hesaplarınızı içe aktarmak için $1 ile bağlantı kurmasına izin verir." }, @@ -1606,12 +1600,6 @@ "displayNftMediaDescription": { "message": "NFT medyasının ve verilerin gösterilmesi IP adresinizin OpenSea veya diğer üçüncü taraflarla paylaşılmasına neden olur. Bu durum, saldırganların IP adresinizi Ethereum adresinizle ilişkilendirmesini sağlayabilir. NFT otomatik algılama bu ayara dayalıdır ve bu ayar kapatıldığında kullanılamaz olur." }, - "diveStraightIntoUsingYourNFTs": { - "message": "Doğrudan NFT'lerinizi kullanmaya başlayın" - }, - "diveStraightIntoUsingYourTokens": { - "message": "Doğrudan token'lerinizi kullanmaya başlayın" - }, "doNotShare": { "message": "Bunu hiç kimseyle paylaşmayın" }, @@ -1743,9 +1731,6 @@ "editSpeedUpEditGasFeeModalTitle": { "message": "Hızlandırma gaz ücretini düzenle" }, - "effortlesslyNavigateYourDigitalAssets": { - "message": "Dijital varlıklarınızda zahmetsizce gezinin" - }, "enable": { "message": "Etkinleştir" }, @@ -1755,9 +1740,6 @@ "enableFromSettings": { "message": " Ayarlardan etkinleştir." }, - "enableNftAutoDetection": { - "message": "NFT otomatik algılamayı etkinleştir" - }, "enableSnap": { "message": "Etkinleştir" }, @@ -1765,12 +1747,6 @@ "message": "şunu etkinleştir: $1", "description": "$1 is a token symbol, e.g. ETH" }, - "enableTokenAutoDetection": { - "message": "Otomatik token algılamayı etkinleştir" - }, - "enable_auto_detection_toggle_automatically": { - "message": "Temel İşlevsellik seçeneği açık olan kullanıcılarda bu seçenek MetaMask Uzantısı 12.3.0 sürümünde otomatik olarak açık olacaktır" - }, "enabled": { "message": "Etkinleştirildi" }, @@ -2283,12 +2259,6 @@ "imToken": { "message": "imToken" }, - "immediateAccessToYourNFTs": { - "message": "NFT'lerinize anında erişin" - }, - "immediateAccessToYourTokens": { - "message": "Token'lerinize derhal erişim" - }, "import": { "message": "İçe Aktar", "description": "Button to import an account from a selected file" @@ -3253,9 +3223,6 @@ "notEnoughGas": { "message": "Yeterli gaz yok" }, - "notRightNow": { - "message": "Şimdi değil" - }, "note": { "message": "Not" }, @@ -3526,9 +3493,6 @@ "onboardingMetametricsDescription2": { "message": "Ölçümleri toplarken bu her zaman aşağıdaki gibi olacaktır..." }, - "onboardingMetametricsDisagree": { - "message": "Hayır, istemiyorum" - }, "onboardingMetametricsInfuraTerms": { "message": "Bu verileri başka amaçlar için kullanmaya karar vermemiz durumunda sizi bilgilendireceğiz. Daha fazla bilgi için $1 bölümümüzü inceleyebilirsiniz. Unutmayın, dilediğiniz zaman ayarlar kısmına giderek vazgeçebilirsiniz.", "description": "$1 represents `onboardingMetametricsInfuraTermsPolicy`" diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json index 746b7a9178ea..bc956cf2e936 100644 --- a/app/_locales/vi/messages.json +++ b/app/_locales/vi/messages.json @@ -513,12 +513,6 @@ "allow": { "message": "Cho phép" }, - "allowMetaMaskToDetectNFTs": { - "message": "Cho phép MetaMask phát hiện và hiển thị NFT của bạn bằng tính năng tự động phát hiện. Bạn sẽ có thể:" - }, - "allowMetaMaskToDetectTokens": { - "message": "Cho phép MetaMask phát hiện và hiển thị token của bạn bằng tính năng tự động phát hiện. Bạn sẽ có thể:" - }, "allowMmiToConnectToCustodian": { "message": "Điều này sẽ cho phép MMI kết nối với $1 để nhập tài khoản của bạn." }, @@ -1606,12 +1600,6 @@ "displayNftMediaDescription": { "message": "Việc hiển thị dữ liệu và phương tiện NFT sẽ làm lộ địa chỉ IP của bạn với OpenSea hoặc các bên thứ ba khác. Điều này có thể cho phép kẻ tấn công liên kết địa chỉ IP với địa chỉ Ethereum của bạn. Tính năng tự động phát hiện NFT dựa trên chế độ cài đặt này và sẽ không khả dụng khi chế độ cài đặt này bị tắt." }, - "diveStraightIntoUsingYourNFTs": { - "message": "Bắt đầu sử dụng NFT của bạn ngay lập tức" - }, - "diveStraightIntoUsingYourTokens": { - "message": "Bắt đầu sử dụng token của bạn ngay lập tức" - }, "doNotShare": { "message": "Không chia sẻ thông tin này với bất kỳ ai" }, @@ -1743,9 +1731,6 @@ "editSpeedUpEditGasFeeModalTitle": { "message": "Chỉnh sửa phí gas tăng tốc" }, - "effortlesslyNavigateYourDigitalAssets": { - "message": "Dễ dàng quản lý tài sản kỹ thuật số của bạn" - }, "enable": { "message": "Bật" }, @@ -1755,9 +1740,6 @@ "enableFromSettings": { "message": " Bật trong Cài Đặt." }, - "enableNftAutoDetection": { - "message": "Bật tính năng tự động phát hiện NFT" - }, "enableSnap": { "message": "Bật" }, @@ -1765,12 +1747,6 @@ "message": "bật $1", "description": "$1 is a token symbol, e.g. ETH" }, - "enableTokenAutoDetection": { - "message": "Bật tính năng tự động phát hiện token" - }, - "enable_auto_detection_toggle_automatically": { - "message": "Người dùng đã bật công tắc Chức năng cơ bản sẽ tự động bật tính năng này trong Tiện ích mở rộng Metamask v12.3.0" - }, "enabled": { "message": "Đã bật" }, @@ -2283,12 +2259,6 @@ "imToken": { "message": "imToken" }, - "immediateAccessToYourNFTs": { - "message": "Truy cập ngay lập tức vào NFT của bạn" - }, - "immediateAccessToYourTokens": { - "message": "Truy cập ngay vào các token của bạn" - }, "import": { "message": "Nhập", "description": "Button to import an account from a selected file" @@ -3253,9 +3223,6 @@ "notEnoughGas": { "message": "Không đủ phí gas" }, - "notRightNow": { - "message": "Không phải bây giờ" - }, "note": { "message": "Ghi chú" }, @@ -3526,9 +3493,6 @@ "onboardingMetametricsDescription2": { "message": "Khi thu thập số liệu, chúng tôi sẽ luôn cam kết điều này..." }, - "onboardingMetametricsDisagree": { - "message": "Không, cảm ơn" - }, "onboardingMetametricsInfuraTerms": { "message": "Chúng tôi sẽ thông báo cho bạn nếu chúng tôi quyết định sử dụng dữ liệu này cho các mục đích khác. Bạn có thể xem lại $1 của chúng tôi để biết thêm thông tin. Lưu ý, bạn có thể truy cập cài đặt và chọn không tham gia bất kỳ lúc nào.", "description": "$1 represents `onboardingMetametricsInfuraTermsPolicy`" diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json index 853d830ed19f..7265f579a30f 100644 --- a/app/_locales/zh_CN/messages.json +++ b/app/_locales/zh_CN/messages.json @@ -513,12 +513,6 @@ "allow": { "message": "允许" }, - "allowMetaMaskToDetectNFTs": { - "message": "允许 MetaMask 使用自动检测功能检测并显示您的 NFT。您将能够：" - }, - "allowMetaMaskToDetectTokens": { - "message": "允许 MetaMask 使用自动检测功能检测并显示您的代币。您将能够：" - }, "allowMmiToConnectToCustodian": { "message": "这将允许 MMI 连接到 $1，以导入您的账户。" }, @@ -1606,12 +1600,6 @@ "displayNftMediaDescription": { "message": "显示 NFT 媒体和数据会将您的 IP 地址暴露给 OpenSea 或其他第三方。这可以让攻击者将您的 IP 地址与您的以太坊地址相关联。NFT 自动检测依赖于此设置，当此设置关闭时将无法使用。" }, - "diveStraightIntoUsingYourNFTs": { - "message": "直接开始使用您的 NFT" - }, - "diveStraightIntoUsingYourTokens": { - "message": "直接开始使用您的代币" - }, "doNotShare": { "message": "请勿与任何人分享此信息" }, @@ -1743,9 +1731,6 @@ "editSpeedUpEditGasFeeModalTitle": { "message": "编辑加速燃料费用" }, - "effortlesslyNavigateYourDigitalAssets": { - "message": "轻松浏览您的数字资产" - }, "enable": { "message": "启用" }, @@ -1755,9 +1740,6 @@ "enableFromSettings": { "message": " 从设置中启用它。" }, - "enableNftAutoDetection": { - "message": "启用 NFT 自动检测" - }, "enableSnap": { "message": "启用" }, @@ -1765,12 +1747,6 @@ "message": "启用 $1", "description": "$1 is a token symbol, e.g. ETH" }, - "enableTokenAutoDetection": { - "message": "启用代币自动检测" - }, - "enable_auto_detection_toggle_automatically": { - "message": "启用基本功能的用户将在 MetaMask Extension v12.3.0 中自动启用此功能" - }, "enabled": { "message": "已启用" }, @@ -2283,12 +2259,6 @@ "imToken": { "message": "imToken" }, - "immediateAccessToYourNFTs": { - "message": "立即访问您的 NFT" - }, - "immediateAccessToYourTokens": { - "message": "即时访问您的代币" - }, "import": { "message": "导入", "description": "Button to import an account from a selected file" @@ -3253,9 +3223,6 @@ "notEnoughGas": { "message": "燃料不足" }, - "notRightNow": { - "message": "暂时不" - }, "note": { "message": "单据" }, @@ -3526,9 +3493,6 @@ "onboardingMetametricsDescription2": { "message": "当我们收集指标时，总是..." }, - "onboardingMetametricsDisagree": { - "message": "不，谢谢" - }, "onboardingMetametricsInfuraTerms": { "message": "如果我们决定将这些数据用于其他目的，我们会通知您。您可以查看我们的 $1 以了解更多信息。请记住，您可以随时转到设置并选择退出。", "description": "$1 represents `onboardingMetametricsInfuraTermsPolicy`" From 8c1d8443a20e7fb1b8e584727231db2ab7a81e89 Mon Sep 17 00:00:00 2001 From: MetaMask Bot Date: Mon, 9 Sep 2024 15:51:09 +0000 Subject: [PATCH 05/43] Update LavaMoat policies --- lavamoat/browserify/beta/policy.json | 242 ++++++++++++++++---------- lavamoat/browserify/flask/policy.json | 242 ++++++++++++++++---------- lavamoat/browserify/main/policy.json | 242 ++++++++++++++++---------- lavamoat/browserify/mmi/policy.json | 242 ++++++++++++++++---------- 4 files changed, 588 insertions(+), 380 deletions(-) diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json index eee2bda9aeb1..eb3caba43c21 100644 --- a/lavamoat/browserify/beta/policy.json +++ b/lavamoat/browserify/beta/policy.json @@ -788,8 +788,23 @@ }, "@metamask/abi-utils": { "packages": { - "@metamask/utils": true, - "superstruct": true + "@metamask/abi-utils>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/utils": true + } + }, + "@metamask/abi-utils>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/abi-utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true } }, "@metamask/accounts-controller": { @@ -797,10 +812,10 @@ "@ethereumjs/tx>@ethereumjs/util": true, "@ethereumjs/tx>ethereum-cryptography": true, "@metamask/accounts-controller>@metamask/base-controller": true, + "@metamask/accounts-controller>@metamask/utils": true, "@metamask/eth-snap-keyring": true, "@metamask/keyring-api": true, "@metamask/keyring-controller": true, - "@metamask/utils": true, "uuid": true } }, @@ -812,6 +827,21 @@ "immer": true } }, + "@metamask/accounts-controller>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/abi-utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/address-book-controller": { "packages": { "@metamask/address-book-controller>@metamask/controller-utils": true, @@ -952,7 +982,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -1095,7 +1125,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -1144,33 +1174,27 @@ "setTimeout": true }, "packages": { - "@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": true, + "@metamask/eth-json-rpc-middleware>@metamask/utils": true, "@metamask/eth-json-rpc-middleware>klona": true, "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true, "@metamask/eth-sig-util": true, "@metamask/rpc-errors": true, - "@metamask/utils": true, - "pify": true - } - }, - "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider": { - "packages": { - "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider>@metamask/json-rpc-engine": true, - "@metamask/safe-event-emitter": true - } - }, - "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider>@metamask/json-rpc-engine": { - "packages": { - "@metamask/rpc-errors": true, - "@metamask/safe-event-emitter": true, - "@metamask/utils": true + "@metamask/snaps-controllers>@metamask/json-rpc-engine": true } }, - "@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": { + "@metamask/eth-json-rpc-middleware>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, "packages": { - "@metamask/rpc-errors": true, - "@metamask/safe-event-emitter": true, - "@metamask/utils": true + "@metamask/abi-utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true } }, "@metamask/eth-ledger-bridge-keyring": { @@ -1203,26 +1227,32 @@ "@ethereumjs/tx>@ethereumjs/util": true, "@ethereumjs/tx>ethereum-cryptography": true, "@metamask/abi-utils": true, + "@metamask/eth-sig-util>@metamask/utils": true, "@metamask/eth-sig-util>tweetnacl": true, - "@metamask/eth-sig-util>tweetnacl-util": true, - "@metamask/utils": true, + "@metamask/utils>@scure/base": true, "browserify>buffer": true } }, - "@metamask/eth-sig-util>tweetnacl": { + "@metamask/eth-sig-util>@metamask/utils": { "globals": { - "crypto": true, - "msCrypto": true, - "nacl": "write" + "TextDecoder": true, + "TextEncoder": true }, "packages": { - "browserify>browser-resolve": true + "@metamask/abi-utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true } }, - "@metamask/eth-sig-util>tweetnacl-util": { + "@metamask/eth-sig-util>tweetnacl": { "globals": { - "atob": true, - "btoa": true + "crypto": true, + "msCrypto": true, + "nacl": "write" }, "packages": { "browserify>browser-resolve": true @@ -1372,8 +1402,8 @@ "@ethereumjs/tx": true, "@ethereumjs/tx>@ethereumjs/util": true, "@metamask/eth-trezor-keyring>@trezor/connect-plugin-ethereum": true, - "@metamask/eth-trezor-keyring>@trezor/connect-web": true, "@metamask/eth-trezor-keyring>hdkey": true, + "@trezor/connect-web": true, "browserify>buffer": true, "webpack>events": true } @@ -1384,37 +1414,6 @@ "@swc/helpers>tslib": true } }, - "@metamask/eth-trezor-keyring>@trezor/connect-web": { - "globals": { - "URLSearchParams": true, - "__TREZOR_CONNECT_SRC": true, - "addEventListener": true, - "btoa": true, - "chrome": true, - "clearInterval": true, - "clearTimeout": true, - "console.warn": true, - "document.body": true, - "document.createElement": true, - "document.createTextNode": true, - "document.getElementById": true, - "document.querySelectorAll": true, - "location": true, - "navigator": true, - "open": true, - "origin": true, - "removeEventListener": true, - "setInterval": true, - "setTimeout": true - }, - "packages": { - "@swc/helpers>tslib": true, - "@trezor/connect-web>@trezor/connect": true, - "@trezor/connect-web>@trezor/connect-common": true, - "@trezor/connect-web>@trezor/utils": true, - "webpack>events": true - } - }, "@metamask/eth-trezor-keyring>hdkey": { "packages": { "browserify>assert": true, @@ -1582,7 +1581,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -1648,10 +1647,25 @@ "URL": true }, "packages": { + "@metamask/abi-utils>@metamask/superstruct": true, + "@metamask/keyring-api>@metamask/utils": true, "@metamask/keyring-api>bech32": true, - "@metamask/keyring-api>uuid": true, - "@metamask/utils": true, - "superstruct": true + "@metamask/keyring-api>uuid": true + } + }, + "@metamask/keyring-api>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/abi-utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true } }, "@metamask/keyring-api>uuid": { @@ -1709,7 +1723,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -1885,7 +1899,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -1911,12 +1925,12 @@ "setTimeout": true }, "packages": { - "@metamask/eth-json-rpc-middleware": true, "@metamask/eth-query": true, "@metamask/eth-token-tracker>@metamask/eth-block-tracker": true, "@metamask/network-controller>@metamask/base-controller": true, "@metamask/network-controller>@metamask/controller-utils": true, "@metamask/network-controller>@metamask/eth-json-rpc-infura": true, + "@metamask/network-controller>@metamask/eth-json-rpc-middleware": true, "@metamask/network-controller>@metamask/eth-json-rpc-provider": true, "@metamask/network-controller>@metamask/swappable-obj-proxy": true, "@metamask/rpc-errors": true, @@ -1958,7 +1972,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -1972,13 +1986,19 @@ "setTimeout": true }, "packages": { - "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider": true, + "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": true, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true, "@metamask/rpc-errors": true, "@metamask/utils": true, "node-fetch": true } }, + "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": { + "packages": { + "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true, + "@metamask/safe-event-emitter": true + } + }, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": { "packages": { "@metamask/rpc-errors": true, @@ -1986,6 +2006,29 @@ "@metamask/utils": true } }, + "@metamask/network-controller>@metamask/eth-json-rpc-middleware": { + "globals": { + "URL": true, + "console.error": true, + "setTimeout": true + }, + "packages": { + "@metamask/eth-json-rpc-middleware>klona": true, + "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true, + "@metamask/eth-sig-util": true, + "@metamask/network-controller>@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": true, + "@metamask/rpc-errors": true, + "@metamask/utils": true, + "pify": true + } + }, + "@metamask/network-controller>@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": { + "packages": { + "@metamask/rpc-errors": true, + "@metamask/safe-event-emitter": true, + "@metamask/utils": true + } + }, "@metamask/network-controller>@metamask/eth-json-rpc-provider": { "packages": { "@metamask/rpc-errors": true, @@ -2073,7 +2116,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -2312,7 +2355,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -2503,7 +2546,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -2690,7 +2733,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -2716,7 +2759,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -2764,7 +2807,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -2846,13 +2889,13 @@ "fetch": true }, "packages": { + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/eth-snap-keyring>@metamask/snaps-utils>@metamask/slip44": true, "@metamask/rpc-errors": true, "@metamask/snaps-execution-environments>@metamask/snaps-utils>@metamask/permission-controller": true, "@metamask/snaps-execution-environments>@metamask/utils": true, "@metamask/snaps-sdk": true, "@metamask/snaps-sdk>@metamask/key-tree": true, - "@metamask/snaps-sdk>@metamask/superstruct": true, "@metamask/snaps-utils>cron-parser": true, "@metamask/snaps-utils>fast-json-stable-stringify": true, "@metamask/snaps-utils>fast-xml-parser": true, @@ -2912,7 +2955,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -2928,12 +2971,12 @@ }, "@metamask/snaps-rpc-methods": { "packages": { + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/rpc-errors": true, "@metamask/snaps-rpc-methods>@metamask/permission-controller": true, "@metamask/snaps-rpc-methods>@metamask/utils": true, "@metamask/snaps-sdk": true, "@metamask/snaps-sdk>@metamask/key-tree": true, - "@metamask/snaps-sdk>@metamask/superstruct": true, "@metamask/snaps-utils": true, "@noble/hashes": true } @@ -2990,7 +3033,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -3004,8 +3047,8 @@ "fetch": true }, "packages": { + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/rpc-errors": true, - "@metamask/snaps-sdk>@metamask/superstruct": true, "@metamask/snaps-sdk>@metamask/utils": true } }, @@ -3024,7 +3067,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -3039,7 +3082,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -3064,10 +3107,10 @@ "fetch": true }, "packages": { + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/rpc-errors": true, "@metamask/snaps-sdk": true, "@metamask/snaps-sdk>@metamask/key-tree": true, - "@metamask/snaps-sdk>@metamask/superstruct": true, "@metamask/snaps-utils>@metamask/permission-controller": true, "@metamask/snaps-utils>@metamask/slip44": true, "@metamask/snaps-utils>@metamask/utils": true, @@ -3131,8 +3174,8 @@ }, "@metamask/snaps-utils>@metamask/snaps-registry": { "packages": { + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/message-signing-snap>@noble/curves": true, - "@metamask/snaps-sdk>@metamask/superstruct": true, "@metamask/snaps-utils>@metamask/snaps-registry>@metamask/utils": true, "@noble/hashes": true } @@ -3143,7 +3186,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -3158,7 +3201,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -3322,7 +3365,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -3399,7 +3442,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -3802,19 +3845,28 @@ "globals": { "AbortController": true, "Intl.NumberFormat": true, + "clearInterval": true, "clearTimeout": true, "console.error": true, "console.info": true, "console.log": true, "console.warn": true, + "setInterval": true, "setTimeout": true }, "packages": { "@swc/helpers>tslib": true, + "@trezor/connect-web>@trezor/utils>bignumber.js": true, "browserify>buffer": true, "webpack>events": true } }, + "@trezor/connect-web>@trezor/utils>bignumber.js": { + "globals": { + "crypto": true, + "define": true + } + }, "@welldone-software/why-did-you-render": { "globals": { "Element": true, diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json index eee2bda9aeb1..eb3caba43c21 100644 --- a/lavamoat/browserify/flask/policy.json +++ b/lavamoat/browserify/flask/policy.json @@ -788,8 +788,23 @@ }, "@metamask/abi-utils": { "packages": { - "@metamask/utils": true, - "superstruct": true + "@metamask/abi-utils>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/utils": true + } + }, + "@metamask/abi-utils>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/abi-utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true } }, "@metamask/accounts-controller": { @@ -797,10 +812,10 @@ "@ethereumjs/tx>@ethereumjs/util": true, "@ethereumjs/tx>ethereum-cryptography": true, "@metamask/accounts-controller>@metamask/base-controller": true, + "@metamask/accounts-controller>@metamask/utils": true, "@metamask/eth-snap-keyring": true, "@metamask/keyring-api": true, "@metamask/keyring-controller": true, - "@metamask/utils": true, "uuid": true } }, @@ -812,6 +827,21 @@ "immer": true } }, + "@metamask/accounts-controller>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/abi-utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/address-book-controller": { "packages": { "@metamask/address-book-controller>@metamask/controller-utils": true, @@ -952,7 +982,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -1095,7 +1125,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -1144,33 +1174,27 @@ "setTimeout": true }, "packages": { - "@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": true, + "@metamask/eth-json-rpc-middleware>@metamask/utils": true, "@metamask/eth-json-rpc-middleware>klona": true, "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true, "@metamask/eth-sig-util": true, "@metamask/rpc-errors": true, - "@metamask/utils": true, - "pify": true - } - }, - "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider": { - "packages": { - "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider>@metamask/json-rpc-engine": true, - "@metamask/safe-event-emitter": true - } - }, - "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider>@metamask/json-rpc-engine": { - "packages": { - "@metamask/rpc-errors": true, - "@metamask/safe-event-emitter": true, - "@metamask/utils": true + "@metamask/snaps-controllers>@metamask/json-rpc-engine": true } }, - "@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": { + "@metamask/eth-json-rpc-middleware>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, "packages": { - "@metamask/rpc-errors": true, - "@metamask/safe-event-emitter": true, - "@metamask/utils": true + "@metamask/abi-utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true } }, "@metamask/eth-ledger-bridge-keyring": { @@ -1203,26 +1227,32 @@ "@ethereumjs/tx>@ethereumjs/util": true, "@ethereumjs/tx>ethereum-cryptography": true, "@metamask/abi-utils": true, + "@metamask/eth-sig-util>@metamask/utils": true, "@metamask/eth-sig-util>tweetnacl": true, - "@metamask/eth-sig-util>tweetnacl-util": true, - "@metamask/utils": true, + "@metamask/utils>@scure/base": true, "browserify>buffer": true } }, - "@metamask/eth-sig-util>tweetnacl": { + "@metamask/eth-sig-util>@metamask/utils": { "globals": { - "crypto": true, - "msCrypto": true, - "nacl": "write" + "TextDecoder": true, + "TextEncoder": true }, "packages": { - "browserify>browser-resolve": true + "@metamask/abi-utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true } }, - "@metamask/eth-sig-util>tweetnacl-util": { + "@metamask/eth-sig-util>tweetnacl": { "globals": { - "atob": true, - "btoa": true + "crypto": true, + "msCrypto": true, + "nacl": "write" }, "packages": { "browserify>browser-resolve": true @@ -1372,8 +1402,8 @@ "@ethereumjs/tx": true, "@ethereumjs/tx>@ethereumjs/util": true, "@metamask/eth-trezor-keyring>@trezor/connect-plugin-ethereum": true, - "@metamask/eth-trezor-keyring>@trezor/connect-web": true, "@metamask/eth-trezor-keyring>hdkey": true, + "@trezor/connect-web": true, "browserify>buffer": true, "webpack>events": true } @@ -1384,37 +1414,6 @@ "@swc/helpers>tslib": true } }, - "@metamask/eth-trezor-keyring>@trezor/connect-web": { - "globals": { - "URLSearchParams": true, - "__TREZOR_CONNECT_SRC": true, - "addEventListener": true, - "btoa": true, - "chrome": true, - "clearInterval": true, - "clearTimeout": true, - "console.warn": true, - "document.body": true, - "document.createElement": true, - "document.createTextNode": true, - "document.getElementById": true, - "document.querySelectorAll": true, - "location": true, - "navigator": true, - "open": true, - "origin": true, - "removeEventListener": true, - "setInterval": true, - "setTimeout": true - }, - "packages": { - "@swc/helpers>tslib": true, - "@trezor/connect-web>@trezor/connect": true, - "@trezor/connect-web>@trezor/connect-common": true, - "@trezor/connect-web>@trezor/utils": true, - "webpack>events": true - } - }, "@metamask/eth-trezor-keyring>hdkey": { "packages": { "browserify>assert": true, @@ -1582,7 +1581,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -1648,10 +1647,25 @@ "URL": true }, "packages": { + "@metamask/abi-utils>@metamask/superstruct": true, + "@metamask/keyring-api>@metamask/utils": true, "@metamask/keyring-api>bech32": true, - "@metamask/keyring-api>uuid": true, - "@metamask/utils": true, - "superstruct": true + "@metamask/keyring-api>uuid": true + } + }, + "@metamask/keyring-api>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/abi-utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true } }, "@metamask/keyring-api>uuid": { @@ -1709,7 +1723,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -1885,7 +1899,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -1911,12 +1925,12 @@ "setTimeout": true }, "packages": { - "@metamask/eth-json-rpc-middleware": true, "@metamask/eth-query": true, "@metamask/eth-token-tracker>@metamask/eth-block-tracker": true, "@metamask/network-controller>@metamask/base-controller": true, "@metamask/network-controller>@metamask/controller-utils": true, "@metamask/network-controller>@metamask/eth-json-rpc-infura": true, + "@metamask/network-controller>@metamask/eth-json-rpc-middleware": true, "@metamask/network-controller>@metamask/eth-json-rpc-provider": true, "@metamask/network-controller>@metamask/swappable-obj-proxy": true, "@metamask/rpc-errors": true, @@ -1958,7 +1972,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -1972,13 +1986,19 @@ "setTimeout": true }, "packages": { - "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider": true, + "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": true, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true, "@metamask/rpc-errors": true, "@metamask/utils": true, "node-fetch": true } }, + "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": { + "packages": { + "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true, + "@metamask/safe-event-emitter": true + } + }, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": { "packages": { "@metamask/rpc-errors": true, @@ -1986,6 +2006,29 @@ "@metamask/utils": true } }, + "@metamask/network-controller>@metamask/eth-json-rpc-middleware": { + "globals": { + "URL": true, + "console.error": true, + "setTimeout": true + }, + "packages": { + "@metamask/eth-json-rpc-middleware>klona": true, + "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true, + "@metamask/eth-sig-util": true, + "@metamask/network-controller>@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": true, + "@metamask/rpc-errors": true, + "@metamask/utils": true, + "pify": true + } + }, + "@metamask/network-controller>@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": { + "packages": { + "@metamask/rpc-errors": true, + "@metamask/safe-event-emitter": true, + "@metamask/utils": true + } + }, "@metamask/network-controller>@metamask/eth-json-rpc-provider": { "packages": { "@metamask/rpc-errors": true, @@ -2073,7 +2116,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -2312,7 +2355,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -2503,7 +2546,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -2690,7 +2733,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -2716,7 +2759,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -2764,7 +2807,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -2846,13 +2889,13 @@ "fetch": true }, "packages": { + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/eth-snap-keyring>@metamask/snaps-utils>@metamask/slip44": true, "@metamask/rpc-errors": true, "@metamask/snaps-execution-environments>@metamask/snaps-utils>@metamask/permission-controller": true, "@metamask/snaps-execution-environments>@metamask/utils": true, "@metamask/snaps-sdk": true, "@metamask/snaps-sdk>@metamask/key-tree": true, - "@metamask/snaps-sdk>@metamask/superstruct": true, "@metamask/snaps-utils>cron-parser": true, "@metamask/snaps-utils>fast-json-stable-stringify": true, "@metamask/snaps-utils>fast-xml-parser": true, @@ -2912,7 +2955,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -2928,12 +2971,12 @@ }, "@metamask/snaps-rpc-methods": { "packages": { + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/rpc-errors": true, "@metamask/snaps-rpc-methods>@metamask/permission-controller": true, "@metamask/snaps-rpc-methods>@metamask/utils": true, "@metamask/snaps-sdk": true, "@metamask/snaps-sdk>@metamask/key-tree": true, - "@metamask/snaps-sdk>@metamask/superstruct": true, "@metamask/snaps-utils": true, "@noble/hashes": true } @@ -2990,7 +3033,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -3004,8 +3047,8 @@ "fetch": true }, "packages": { + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/rpc-errors": true, - "@metamask/snaps-sdk>@metamask/superstruct": true, "@metamask/snaps-sdk>@metamask/utils": true } }, @@ -3024,7 +3067,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -3039,7 +3082,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -3064,10 +3107,10 @@ "fetch": true }, "packages": { + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/rpc-errors": true, "@metamask/snaps-sdk": true, "@metamask/snaps-sdk>@metamask/key-tree": true, - "@metamask/snaps-sdk>@metamask/superstruct": true, "@metamask/snaps-utils>@metamask/permission-controller": true, "@metamask/snaps-utils>@metamask/slip44": true, "@metamask/snaps-utils>@metamask/utils": true, @@ -3131,8 +3174,8 @@ }, "@metamask/snaps-utils>@metamask/snaps-registry": { "packages": { + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/message-signing-snap>@noble/curves": true, - "@metamask/snaps-sdk>@metamask/superstruct": true, "@metamask/snaps-utils>@metamask/snaps-registry>@metamask/utils": true, "@noble/hashes": true } @@ -3143,7 +3186,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -3158,7 +3201,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -3322,7 +3365,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -3399,7 +3442,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -3802,19 +3845,28 @@ "globals": { "AbortController": true, "Intl.NumberFormat": true, + "clearInterval": true, "clearTimeout": true, "console.error": true, "console.info": true, "console.log": true, "console.warn": true, + "setInterval": true, "setTimeout": true }, "packages": { "@swc/helpers>tslib": true, + "@trezor/connect-web>@trezor/utils>bignumber.js": true, "browserify>buffer": true, "webpack>events": true } }, + "@trezor/connect-web>@trezor/utils>bignumber.js": { + "globals": { + "crypto": true, + "define": true + } + }, "@welldone-software/why-did-you-render": { "globals": { "Element": true, diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json index eee2bda9aeb1..eb3caba43c21 100644 --- a/lavamoat/browserify/main/policy.json +++ b/lavamoat/browserify/main/policy.json @@ -788,8 +788,23 @@ }, "@metamask/abi-utils": { "packages": { - "@metamask/utils": true, - "superstruct": true + "@metamask/abi-utils>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/utils": true + } + }, + "@metamask/abi-utils>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/abi-utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true } }, "@metamask/accounts-controller": { @@ -797,10 +812,10 @@ "@ethereumjs/tx>@ethereumjs/util": true, "@ethereumjs/tx>ethereum-cryptography": true, "@metamask/accounts-controller>@metamask/base-controller": true, + "@metamask/accounts-controller>@metamask/utils": true, "@metamask/eth-snap-keyring": true, "@metamask/keyring-api": true, "@metamask/keyring-controller": true, - "@metamask/utils": true, "uuid": true } }, @@ -812,6 +827,21 @@ "immer": true } }, + "@metamask/accounts-controller>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/abi-utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/address-book-controller": { "packages": { "@metamask/address-book-controller>@metamask/controller-utils": true, @@ -952,7 +982,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -1095,7 +1125,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -1144,33 +1174,27 @@ "setTimeout": true }, "packages": { - "@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": true, + "@metamask/eth-json-rpc-middleware>@metamask/utils": true, "@metamask/eth-json-rpc-middleware>klona": true, "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true, "@metamask/eth-sig-util": true, "@metamask/rpc-errors": true, - "@metamask/utils": true, - "pify": true - } - }, - "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider": { - "packages": { - "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider>@metamask/json-rpc-engine": true, - "@metamask/safe-event-emitter": true - } - }, - "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider>@metamask/json-rpc-engine": { - "packages": { - "@metamask/rpc-errors": true, - "@metamask/safe-event-emitter": true, - "@metamask/utils": true + "@metamask/snaps-controllers>@metamask/json-rpc-engine": true } }, - "@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": { + "@metamask/eth-json-rpc-middleware>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, "packages": { - "@metamask/rpc-errors": true, - "@metamask/safe-event-emitter": true, - "@metamask/utils": true + "@metamask/abi-utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true } }, "@metamask/eth-ledger-bridge-keyring": { @@ -1203,26 +1227,32 @@ "@ethereumjs/tx>@ethereumjs/util": true, "@ethereumjs/tx>ethereum-cryptography": true, "@metamask/abi-utils": true, + "@metamask/eth-sig-util>@metamask/utils": true, "@metamask/eth-sig-util>tweetnacl": true, - "@metamask/eth-sig-util>tweetnacl-util": true, - "@metamask/utils": true, + "@metamask/utils>@scure/base": true, "browserify>buffer": true } }, - "@metamask/eth-sig-util>tweetnacl": { + "@metamask/eth-sig-util>@metamask/utils": { "globals": { - "crypto": true, - "msCrypto": true, - "nacl": "write" + "TextDecoder": true, + "TextEncoder": true }, "packages": { - "browserify>browser-resolve": true + "@metamask/abi-utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true } }, - "@metamask/eth-sig-util>tweetnacl-util": { + "@metamask/eth-sig-util>tweetnacl": { "globals": { - "atob": true, - "btoa": true + "crypto": true, + "msCrypto": true, + "nacl": "write" }, "packages": { "browserify>browser-resolve": true @@ -1372,8 +1402,8 @@ "@ethereumjs/tx": true, "@ethereumjs/tx>@ethereumjs/util": true, "@metamask/eth-trezor-keyring>@trezor/connect-plugin-ethereum": true, - "@metamask/eth-trezor-keyring>@trezor/connect-web": true, "@metamask/eth-trezor-keyring>hdkey": true, + "@trezor/connect-web": true, "browserify>buffer": true, "webpack>events": true } @@ -1384,37 +1414,6 @@ "@swc/helpers>tslib": true } }, - "@metamask/eth-trezor-keyring>@trezor/connect-web": { - "globals": { - "URLSearchParams": true, - "__TREZOR_CONNECT_SRC": true, - "addEventListener": true, - "btoa": true, - "chrome": true, - "clearInterval": true, - "clearTimeout": true, - "console.warn": true, - "document.body": true, - "document.createElement": true, - "document.createTextNode": true, - "document.getElementById": true, - "document.querySelectorAll": true, - "location": true, - "navigator": true, - "open": true, - "origin": true, - "removeEventListener": true, - "setInterval": true, - "setTimeout": true - }, - "packages": { - "@swc/helpers>tslib": true, - "@trezor/connect-web>@trezor/connect": true, - "@trezor/connect-web>@trezor/connect-common": true, - "@trezor/connect-web>@trezor/utils": true, - "webpack>events": true - } - }, "@metamask/eth-trezor-keyring>hdkey": { "packages": { "browserify>assert": true, @@ -1582,7 +1581,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -1648,10 +1647,25 @@ "URL": true }, "packages": { + "@metamask/abi-utils>@metamask/superstruct": true, + "@metamask/keyring-api>@metamask/utils": true, "@metamask/keyring-api>bech32": true, - "@metamask/keyring-api>uuid": true, - "@metamask/utils": true, - "superstruct": true + "@metamask/keyring-api>uuid": true + } + }, + "@metamask/keyring-api>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/abi-utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true } }, "@metamask/keyring-api>uuid": { @@ -1709,7 +1723,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -1885,7 +1899,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -1911,12 +1925,12 @@ "setTimeout": true }, "packages": { - "@metamask/eth-json-rpc-middleware": true, "@metamask/eth-query": true, "@metamask/eth-token-tracker>@metamask/eth-block-tracker": true, "@metamask/network-controller>@metamask/base-controller": true, "@metamask/network-controller>@metamask/controller-utils": true, "@metamask/network-controller>@metamask/eth-json-rpc-infura": true, + "@metamask/network-controller>@metamask/eth-json-rpc-middleware": true, "@metamask/network-controller>@metamask/eth-json-rpc-provider": true, "@metamask/network-controller>@metamask/swappable-obj-proxy": true, "@metamask/rpc-errors": true, @@ -1958,7 +1972,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -1972,13 +1986,19 @@ "setTimeout": true }, "packages": { - "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider": true, + "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": true, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true, "@metamask/rpc-errors": true, "@metamask/utils": true, "node-fetch": true } }, + "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": { + "packages": { + "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true, + "@metamask/safe-event-emitter": true + } + }, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": { "packages": { "@metamask/rpc-errors": true, @@ -1986,6 +2006,29 @@ "@metamask/utils": true } }, + "@metamask/network-controller>@metamask/eth-json-rpc-middleware": { + "globals": { + "URL": true, + "console.error": true, + "setTimeout": true + }, + "packages": { + "@metamask/eth-json-rpc-middleware>klona": true, + "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true, + "@metamask/eth-sig-util": true, + "@metamask/network-controller>@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": true, + "@metamask/rpc-errors": true, + "@metamask/utils": true, + "pify": true + } + }, + "@metamask/network-controller>@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": { + "packages": { + "@metamask/rpc-errors": true, + "@metamask/safe-event-emitter": true, + "@metamask/utils": true + } + }, "@metamask/network-controller>@metamask/eth-json-rpc-provider": { "packages": { "@metamask/rpc-errors": true, @@ -2073,7 +2116,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -2312,7 +2355,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -2503,7 +2546,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -2690,7 +2733,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -2716,7 +2759,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -2764,7 +2807,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -2846,13 +2889,13 @@ "fetch": true }, "packages": { + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/eth-snap-keyring>@metamask/snaps-utils>@metamask/slip44": true, "@metamask/rpc-errors": true, "@metamask/snaps-execution-environments>@metamask/snaps-utils>@metamask/permission-controller": true, "@metamask/snaps-execution-environments>@metamask/utils": true, "@metamask/snaps-sdk": true, "@metamask/snaps-sdk>@metamask/key-tree": true, - "@metamask/snaps-sdk>@metamask/superstruct": true, "@metamask/snaps-utils>cron-parser": true, "@metamask/snaps-utils>fast-json-stable-stringify": true, "@metamask/snaps-utils>fast-xml-parser": true, @@ -2912,7 +2955,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -2928,12 +2971,12 @@ }, "@metamask/snaps-rpc-methods": { "packages": { + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/rpc-errors": true, "@metamask/snaps-rpc-methods>@metamask/permission-controller": true, "@metamask/snaps-rpc-methods>@metamask/utils": true, "@metamask/snaps-sdk": true, "@metamask/snaps-sdk>@metamask/key-tree": true, - "@metamask/snaps-sdk>@metamask/superstruct": true, "@metamask/snaps-utils": true, "@noble/hashes": true } @@ -2990,7 +3033,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -3004,8 +3047,8 @@ "fetch": true }, "packages": { + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/rpc-errors": true, - "@metamask/snaps-sdk>@metamask/superstruct": true, "@metamask/snaps-sdk>@metamask/utils": true } }, @@ -3024,7 +3067,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -3039,7 +3082,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -3064,10 +3107,10 @@ "fetch": true }, "packages": { + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/rpc-errors": true, "@metamask/snaps-sdk": true, "@metamask/snaps-sdk>@metamask/key-tree": true, - "@metamask/snaps-sdk>@metamask/superstruct": true, "@metamask/snaps-utils>@metamask/permission-controller": true, "@metamask/snaps-utils>@metamask/slip44": true, "@metamask/snaps-utils>@metamask/utils": true, @@ -3131,8 +3174,8 @@ }, "@metamask/snaps-utils>@metamask/snaps-registry": { "packages": { + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/message-signing-snap>@noble/curves": true, - "@metamask/snaps-sdk>@metamask/superstruct": true, "@metamask/snaps-utils>@metamask/snaps-registry>@metamask/utils": true, "@noble/hashes": true } @@ -3143,7 +3186,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -3158,7 +3201,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -3322,7 +3365,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -3399,7 +3442,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -3802,19 +3845,28 @@ "globals": { "AbortController": true, "Intl.NumberFormat": true, + "clearInterval": true, "clearTimeout": true, "console.error": true, "console.info": true, "console.log": true, "console.warn": true, + "setInterval": true, "setTimeout": true }, "packages": { "@swc/helpers>tslib": true, + "@trezor/connect-web>@trezor/utils>bignumber.js": true, "browserify>buffer": true, "webpack>events": true } }, + "@trezor/connect-web>@trezor/utils>bignumber.js": { + "globals": { + "crypto": true, + "define": true + } + }, "@welldone-software/why-did-you-render": { "globals": { "Element": true, diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json index 02d132bfc7cd..465b5dcf621b 100644 --- a/lavamoat/browserify/mmi/policy.json +++ b/lavamoat/browserify/mmi/policy.json @@ -880,8 +880,23 @@ }, "@metamask/abi-utils": { "packages": { - "@metamask/utils": true, - "superstruct": true + "@metamask/abi-utils>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/utils": true + } + }, + "@metamask/abi-utils>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/abi-utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true } }, "@metamask/accounts-controller": { @@ -889,10 +904,10 @@ "@ethereumjs/tx>@ethereumjs/util": true, "@ethereumjs/tx>ethereum-cryptography": true, "@metamask/accounts-controller>@metamask/base-controller": true, + "@metamask/accounts-controller>@metamask/utils": true, "@metamask/eth-snap-keyring": true, "@metamask/keyring-api": true, "@metamask/keyring-controller": true, - "@metamask/utils": true, "uuid": true } }, @@ -904,6 +919,21 @@ "immer": true } }, + "@metamask/accounts-controller>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/abi-utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true + } + }, "@metamask/address-book-controller": { "packages": { "@metamask/address-book-controller>@metamask/controller-utils": true, @@ -1044,7 +1074,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -1187,7 +1217,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -1236,33 +1266,27 @@ "setTimeout": true }, "packages": { - "@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": true, + "@metamask/eth-json-rpc-middleware>@metamask/utils": true, "@metamask/eth-json-rpc-middleware>klona": true, "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true, "@metamask/eth-sig-util": true, "@metamask/rpc-errors": true, - "@metamask/utils": true, - "pify": true - } - }, - "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider": { - "packages": { - "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider>@metamask/json-rpc-engine": true, - "@metamask/safe-event-emitter": true - } - }, - "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider>@metamask/json-rpc-engine": { - "packages": { - "@metamask/rpc-errors": true, - "@metamask/safe-event-emitter": true, - "@metamask/utils": true + "@metamask/snaps-controllers>@metamask/json-rpc-engine": true } }, - "@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": { + "@metamask/eth-json-rpc-middleware>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, "packages": { - "@metamask/rpc-errors": true, - "@metamask/safe-event-emitter": true, - "@metamask/utils": true + "@metamask/abi-utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true } }, "@metamask/eth-ledger-bridge-keyring": { @@ -1295,26 +1319,32 @@ "@ethereumjs/tx>@ethereumjs/util": true, "@ethereumjs/tx>ethereum-cryptography": true, "@metamask/abi-utils": true, + "@metamask/eth-sig-util>@metamask/utils": true, "@metamask/eth-sig-util>tweetnacl": true, - "@metamask/eth-sig-util>tweetnacl-util": true, - "@metamask/utils": true, + "@metamask/utils>@scure/base": true, "browserify>buffer": true } }, - "@metamask/eth-sig-util>tweetnacl": { + "@metamask/eth-sig-util>@metamask/utils": { "globals": { - "crypto": true, - "msCrypto": true, - "nacl": "write" + "TextDecoder": true, + "TextEncoder": true }, "packages": { - "browserify>browser-resolve": true + "@metamask/abi-utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true } }, - "@metamask/eth-sig-util>tweetnacl-util": { + "@metamask/eth-sig-util>tweetnacl": { "globals": { - "atob": true, - "btoa": true + "crypto": true, + "msCrypto": true, + "nacl": "write" }, "packages": { "browserify>browser-resolve": true @@ -1464,8 +1494,8 @@ "@ethereumjs/tx": true, "@ethereumjs/tx>@ethereumjs/util": true, "@metamask/eth-trezor-keyring>@trezor/connect-plugin-ethereum": true, - "@metamask/eth-trezor-keyring>@trezor/connect-web": true, "@metamask/eth-trezor-keyring>hdkey": true, + "@trezor/connect-web": true, "browserify>buffer": true, "webpack>events": true } @@ -1476,37 +1506,6 @@ "@swc/helpers>tslib": true } }, - "@metamask/eth-trezor-keyring>@trezor/connect-web": { - "globals": { - "URLSearchParams": true, - "__TREZOR_CONNECT_SRC": true, - "addEventListener": true, - "btoa": true, - "chrome": true, - "clearInterval": true, - "clearTimeout": true, - "console.warn": true, - "document.body": true, - "document.createElement": true, - "document.createTextNode": true, - "document.getElementById": true, - "document.querySelectorAll": true, - "location": true, - "navigator": true, - "open": true, - "origin": true, - "removeEventListener": true, - "setInterval": true, - "setTimeout": true - }, - "packages": { - "@swc/helpers>tslib": true, - "@trezor/connect-web>@trezor/connect": true, - "@trezor/connect-web>@trezor/connect-common": true, - "@trezor/connect-web>@trezor/utils": true, - "webpack>events": true - } - }, "@metamask/eth-trezor-keyring>hdkey": { "packages": { "browserify>assert": true, @@ -1674,7 +1673,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -1740,10 +1739,25 @@ "URL": true }, "packages": { + "@metamask/abi-utils>@metamask/superstruct": true, + "@metamask/keyring-api>@metamask/utils": true, "@metamask/keyring-api>bech32": true, - "@metamask/keyring-api>uuid": true, - "@metamask/utils": true, - "superstruct": true + "@metamask/keyring-api>uuid": true + } + }, + "@metamask/keyring-api>@metamask/utils": { + "globals": { + "TextDecoder": true, + "TextEncoder": true + }, + "packages": { + "@metamask/abi-utils>@metamask/superstruct": true, + "@metamask/utils>@scure/base": true, + "@metamask/utils>pony-cause": true, + "@noble/hashes": true, + "browserify>buffer": true, + "nock>debug": true, + "semver": true } }, "@metamask/keyring-api>uuid": { @@ -1801,7 +1815,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -1977,7 +1991,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -2003,12 +2017,12 @@ "setTimeout": true }, "packages": { - "@metamask/eth-json-rpc-middleware": true, "@metamask/eth-query": true, "@metamask/eth-token-tracker>@metamask/eth-block-tracker": true, "@metamask/network-controller>@metamask/base-controller": true, "@metamask/network-controller>@metamask/controller-utils": true, "@metamask/network-controller>@metamask/eth-json-rpc-infura": true, + "@metamask/network-controller>@metamask/eth-json-rpc-middleware": true, "@metamask/network-controller>@metamask/eth-json-rpc-provider": true, "@metamask/network-controller>@metamask/swappable-obj-proxy": true, "@metamask/rpc-errors": true, @@ -2050,7 +2064,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -2064,13 +2078,19 @@ "setTimeout": true }, "packages": { - "@metamask/eth-json-rpc-middleware>@metamask/eth-json-rpc-provider": true, + "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": true, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true, "@metamask/rpc-errors": true, "@metamask/utils": true, "node-fetch": true } }, + "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/eth-json-rpc-provider": { + "packages": { + "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": true, + "@metamask/safe-event-emitter": true + } + }, "@metamask/network-controller>@metamask/eth-json-rpc-infura>@metamask/json-rpc-engine": { "packages": { "@metamask/rpc-errors": true, @@ -2078,6 +2098,29 @@ "@metamask/utils": true } }, + "@metamask/network-controller>@metamask/eth-json-rpc-middleware": { + "globals": { + "URL": true, + "console.error": true, + "setTimeout": true + }, + "packages": { + "@metamask/eth-json-rpc-middleware>klona": true, + "@metamask/eth-json-rpc-middleware>safe-stable-stringify": true, + "@metamask/eth-sig-util": true, + "@metamask/network-controller>@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": true, + "@metamask/rpc-errors": true, + "@metamask/utils": true, + "pify": true + } + }, + "@metamask/network-controller>@metamask/eth-json-rpc-middleware>@metamask/json-rpc-engine": { + "packages": { + "@metamask/rpc-errors": true, + "@metamask/safe-event-emitter": true, + "@metamask/utils": true + } + }, "@metamask/network-controller>@metamask/eth-json-rpc-provider": { "packages": { "@metamask/rpc-errors": true, @@ -2165,7 +2208,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -2404,7 +2447,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -2595,7 +2638,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -2782,7 +2825,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -2808,7 +2851,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -2856,7 +2899,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -2938,13 +2981,13 @@ "fetch": true }, "packages": { + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/eth-snap-keyring>@metamask/snaps-utils>@metamask/slip44": true, "@metamask/rpc-errors": true, "@metamask/snaps-execution-environments>@metamask/snaps-utils>@metamask/permission-controller": true, "@metamask/snaps-execution-environments>@metamask/utils": true, "@metamask/snaps-sdk": true, "@metamask/snaps-sdk>@metamask/key-tree": true, - "@metamask/snaps-sdk>@metamask/superstruct": true, "@metamask/snaps-utils>cron-parser": true, "@metamask/snaps-utils>fast-json-stable-stringify": true, "@metamask/snaps-utils>fast-xml-parser": true, @@ -3004,7 +3047,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -3020,12 +3063,12 @@ }, "@metamask/snaps-rpc-methods": { "packages": { + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/rpc-errors": true, "@metamask/snaps-rpc-methods>@metamask/permission-controller": true, "@metamask/snaps-rpc-methods>@metamask/utils": true, "@metamask/snaps-sdk": true, "@metamask/snaps-sdk>@metamask/key-tree": true, - "@metamask/snaps-sdk>@metamask/superstruct": true, "@metamask/snaps-utils": true, "@noble/hashes": true } @@ -3082,7 +3125,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -3096,8 +3139,8 @@ "fetch": true }, "packages": { + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/rpc-errors": true, - "@metamask/snaps-sdk>@metamask/superstruct": true, "@metamask/snaps-sdk>@metamask/utils": true } }, @@ -3116,7 +3159,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -3131,7 +3174,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -3156,10 +3199,10 @@ "fetch": true }, "packages": { + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/rpc-errors": true, "@metamask/snaps-sdk": true, "@metamask/snaps-sdk>@metamask/key-tree": true, - "@metamask/snaps-sdk>@metamask/superstruct": true, "@metamask/snaps-utils>@metamask/permission-controller": true, "@metamask/snaps-utils>@metamask/slip44": true, "@metamask/snaps-utils>@metamask/utils": true, @@ -3223,8 +3266,8 @@ }, "@metamask/snaps-utils>@metamask/snaps-registry": { "packages": { + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/message-signing-snap>@noble/curves": true, - "@metamask/snaps-sdk>@metamask/superstruct": true, "@metamask/snaps-utils>@metamask/snaps-registry>@metamask/utils": true, "@noble/hashes": true } @@ -3235,7 +3278,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -3250,7 +3293,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -3414,7 +3457,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -3491,7 +3534,7 @@ "TextEncoder": true }, "packages": { - "@metamask/snaps-sdk>@metamask/superstruct": true, + "@metamask/abi-utils>@metamask/superstruct": true, "@metamask/utils>@scure/base": true, "@metamask/utils>pony-cause": true, "@noble/hashes": true, @@ -3894,19 +3937,28 @@ "globals": { "AbortController": true, "Intl.NumberFormat": true, + "clearInterval": true, "clearTimeout": true, "console.error": true, "console.info": true, "console.log": true, "console.warn": true, + "setInterval": true, "setTimeout": true }, "packages": { "@swc/helpers>tslib": true, + "@trezor/connect-web>@trezor/utils>bignumber.js": true, "browserify>buffer": true, "webpack>events": true } }, + "@trezor/connect-web>@trezor/utils>bignumber.js": { + "globals": { + "crypto": true, + "define": true + } + }, "@welldone-software/why-did-you-render": { "globals": { "Element": true, From 15841b49bab43ec3114cb1f5397cbd7608e5d949 Mon Sep 17 00:00:00 2001 From: Dan J Miller Date: Mon, 9 Sep 2024 17:52:42 -0230 Subject: [PATCH 06/43] fix merge conflict resolution errors --- app/scripts/constants/sentry-state.ts | 3 --- test/e2e/accounts/snap-account-signatures.spec.ts | 3 --- test/e2e/default-fixture.js | 1 - test/e2e/fixture-builder.js | 1 - .../errors-after-init-opt-in-background-state.json | 1 - test/e2e/tests/metrics/wallet-created.spec.js | 1 + .../creation-successful/creation-successful.js | 4 ++++ 7 files changed, 5 insertions(+), 9 deletions(-) diff --git a/app/scripts/constants/sentry-state.ts b/app/scripts/constants/sentry-state.ts index e56dbe287c55..b275dfcb7a8f 100644 --- a/app/scripts/constants/sentry-state.ts +++ b/app/scripts/constants/sentry-state.ts @@ -206,7 +206,6 @@ export const SENTRY_BACKGROUND_STATE = { PreferencesController: { advancedGasFee: true, currentLocale: true, - disabledRpcMethodPreferences: true, dismissSeedBackUpReminder: true, featureFlags: true, forgottenPassword: true, @@ -263,8 +262,6 @@ export const SENTRY_BACKGROUND_STATE = { }, SelectedNetworkController: { domains: false }, SignatureController: { - unapprovedMsgCount: true, - unapprovedMsgs: false, unapprovedPersonalMsgCount: true, unapprovedPersonalMsgs: false, unapprovedTypedMessages: false, diff --git a/test/e2e/accounts/snap-account-signatures.spec.ts b/test/e2e/accounts/snap-account-signatures.spec.ts index bef16f22a47c..536d8168b1a3 100644 --- a/test/e2e/accounts/snap-account-signatures.spec.ts +++ b/test/e2e/accounts/snap-account-signatures.spec.ts @@ -1,6 +1,5 @@ import { Suite } from 'mocha'; import { - openDapp, tempToggleSettingRedesignedConfirmations, withFixtures, } from '../helpers'; @@ -33,8 +32,6 @@ describe('Snap Account Signatures', function (this: Suite) { await tempToggleSettingRedesignedConfirmations(driver); - await openDapp(driver); - // Run all 5 signature types const locatorIDs = [ '#personalSign', diff --git a/test/e2e/default-fixture.js b/test/e2e/default-fixture.js index 8891d1830eb5..d07ca3ab3b58 100644 --- a/test/e2e/default-fixture.js +++ b/test/e2e/default-fixture.js @@ -214,7 +214,6 @@ function defaultFixture(inputChainId = CHAIN_IDS.LOCALHOST) { smartTransactionsOptInStatus: false, useNativeCurrencyAsPrimaryCurrency: true, petnamesEnabled: true, - showTokenAutodetectModal: false, isRedesignedConfirmationsDeveloperEnabled: false, showConfirmationAdvancedDetails: false, }, diff --git a/test/e2e/fixture-builder.js b/test/e2e/fixture-builder.js index 798b570c5a2d..cbccac2eab0d 100644 --- a/test/e2e/fixture-builder.js +++ b/test/e2e/fixture-builder.js @@ -87,7 +87,6 @@ function onboardingFixture() { smartTransactionsOptInStatus: false, useNativeCurrencyAsPrimaryCurrency: true, petnamesEnabled: true, - showTokenAutodetectModal: false, isRedesignedConfirmationsDeveloperEnabled: false, showConfirmationAdvancedDetails: false, }, diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json index 20663c4c52bc..7a4d6335dab5 100644 --- a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json +++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json @@ -201,7 +201,6 @@ "smartTransactionsOptInStatus": false, "useNativeCurrencyAsPrimaryCurrency": true, "petnamesEnabled": true, - "showTokenAutodetectModal": "boolean", "redesignedConfirmationsEnabled": true, "redesignedTransactionsEnabled": "boolean", "isRedesignedConfirmationsDeveloperEnabled": "boolean" diff --git a/test/e2e/tests/metrics/wallet-created.spec.js b/test/e2e/tests/metrics/wallet-created.spec.js index 890ac9342a8a..bc07cfdeea75 100644 --- a/test/e2e/tests/metrics/wallet-created.spec.js +++ b/test/e2e/tests/metrics/wallet-created.spec.js @@ -88,6 +88,7 @@ describe('Wallet Created Events @no-mmi', function () { chain_id: '0x539', environment_type: 'fullscreen', is_profile_syncing_enabled: null, + is_signed_in: false, }); }, ); diff --git a/ui/pages/onboarding-flow/creation-successful/creation-successful.js b/ui/pages/onboarding-flow/creation-successful/creation-successful.js index fab463e5b685..79321c7c5991 100644 --- a/ui/pages/onboarding-flow/creation-successful/creation-successful.js +++ b/ui/pages/onboarding-flow/creation-successful/creation-successful.js @@ -25,6 +25,7 @@ import { import { MetaMetricsContext } from '../../../contexts/metametrics'; import { useCreateSession } from '../../../hooks/metamask-notifications/useCreateSession'; import { selectIsProfileSyncingEnabled } from '../../../selectors/metamask-notifications/profile-syncing'; +import { selectIsSignedIn } from '../../../selectors/metamask-notifications/authentication'; export default function CreationSuccessful() { const history = useHistory(); @@ -36,6 +37,8 @@ export default function CreationSuccessful() { const isProfileSyncingEnabled = useSelector(selectIsProfileSyncingEnabled); + const isSignedIn = useSelector(selectIsSignedIn); + return (
@@ -115,6 +118,7 @@ export default function CreationSuccessful() { event: MetaMetricsEventName.OnboardingWalletCreationComplete, properties: { method: firstTimeFlowType, + is_signed_in: isSignedIn, is_profile_syncing_enabled: isProfileSyncingEnabled, }, }); From 0372aa7d1ddeb63fc2b8eb133cd6b45f202ea07e Mon Sep 17 00:00:00 2001 From: Dan J Miller Date: Wed, 11 Sep 2024 10:16:32 -0230 Subject: [PATCH 07/43] temp From c2b3dbc3d89b755b8d036c467f05e14f280e778e Mon Sep 17 00:00:00 2001 From: Dan J Miller Date: Tue, 10 Sep 2024 12:00:31 -0230 Subject: [PATCH 08/43] fix: Ignore yarn audit warning for GHSA-9wv6-86v2-598j (#27024) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** This addresses the following `yarn audit` failure: ``` └─ path-to-regexp ├─ ID: 1099496 ├─ Issue: path-to-regexp outputs backtracking regular expressions ├─ URL: https://github.com/advisories/GHSA-9wv6-86v2-598j ├─ Severity: high ├─ Vulnerable Versions: >=0.2.0 <8.0.0 │ ├─ Tree Versions │ └─ 1.7.0 │ └─ Dependents └─ react-router@npm:5.1.2 [12b72] ``` path-to-Regexp is used in two files within react-router v5.1.2: `generatePath.js` and `matchPath.js`. In both cases, `path` and `options` variables are passed to a `compilePath` function. Those are then passed to `pathtoRegexp`. The variables passed to `pathtoRegexp` are dependent on props or parameters passed to react-router components and/or methods explictly from the metamask code. So this vulnerability cannot be exploited by an external actor. [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/27024?quickstart=1) ## **Related issues** Fixes: ## **Manual testing steps** 1. Go to this page... 2. 3. ## **Screenshots/Recordings** ### **Before** ### **After** ## **Pre-merge author checklist** - [ ] I've followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Extension Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [ ] I've completed the PR template to the best of my ability - [ ] I’ve included tests if applicable - [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- .yarnrc.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.yarnrc.yml b/.yarnrc.yml index 252333917781..1522080c0561 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -43,6 +43,16 @@ npmAuditIgnoreAdvisories: # not appear to be used. - 1092461 + # Issue: path-to-regexp outputs backtracking regular expressions + # URL: https://github.com/advisories/GHSA-9wv6-86v2-598j + # path-to-regexp is used in react-router v5.1.2, which we use. However, the + # vulnerability in path-to-regexp could only be exploited within react-router + # if malicious properties were passed to react-router components or methods + # explicitly from our code. As such, this vulneratibility cannot be exploited + # by an external / malicious actor. Meanwhile, once we update to v6+, + # path-to-regexp will no longer be used. + - 1099499 + # Temp fix for https://github.com/MetaMask/metamask-extension/pull/16920 for the sake of 11.7.1 hotfix # This will be removed in this ticket https://github.com/MetaMask/metamask-extension/issues/22299 - 'ts-custom-error (deprecation)' From 856f1f942be124663ff7bde9a6394e03cc6ed0eb Mon Sep 17 00:00:00 2001 From: Dan J Miller Date: Tue, 10 Sep 2024 14:22:45 -0230 Subject: [PATCH 09/43] fix: Add a second id to ignore for the GHSA-9wv6-86v2-598j (#27041) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** Follow up to https://github.com/MetaMask/metamask-extension/pull/27024. Since that was merged, an update was made to https://github.com/MetaMask/metamask-extension/pull/27024, and so the yarn audit warning now has a new id, which we need to include in the `npmAuditIgnoreAdvisories` config. [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/27041?quickstart=1) ## **Related issues** Fixes: ## **Manual testing steps** 1. Go to this page... 2. 3. ## **Screenshots/Recordings** ### **Before** ### **After** ## **Pre-merge author checklist** - [ ] I've followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Extension Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [ ] I've completed the PR template to the best of my ability - [ ] I’ve included tests if applicable - [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- .yarnrc.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.yarnrc.yml b/.yarnrc.yml index 1522080c0561..63b9539cbfba 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -52,6 +52,7 @@ npmAuditIgnoreAdvisories: # by an external / malicious actor. Meanwhile, once we update to v6+, # path-to-regexp will no longer be used. - 1099499 + - 1099514 # Temp fix for https://github.com/MetaMask/metamask-extension/pull/16920 for the sake of 11.7.1 hotfix # This will be removed in this ticket https://github.com/MetaMask/metamask-extension/issues/22299 From e0deec9b2127f988212b41e6a5fc72412cab7b21 Mon Sep 17 00:00:00 2001 From: Dan J Miller Date: Tue, 10 Sep 2024 15:32:12 -0230 Subject: [PATCH 10/43] fix: Update id for ignoring path-to-regexp advisory (#27044) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** Follow up to https://github.com/MetaMask/metamask-extension/pull/27024 and https://github.com/MetaMask/metamask-extension/pull/27041 The id has changed again, so we are going to try updating one more time. [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/27044?quickstart=1) ## **Related issues** Fixes: ## **Manual testing steps** 1. Go to this page... 2. 3. ## **Screenshots/Recordings** ### **Before** ### **After** ## **Pre-merge author checklist** - [ ] I've followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Extension Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [ ] I've completed the PR template to the best of my ability - [ ] I’ve included tests if applicable - [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- .yarnrc.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.yarnrc.yml b/.yarnrc.yml index 63b9539cbfba..5d4aa7cd4e73 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -51,8 +51,7 @@ npmAuditIgnoreAdvisories: # explicitly from our code. As such, this vulneratibility cannot be exploited # by an external / malicious actor. Meanwhile, once we update to v6+, # path-to-regexp will no longer be used. - - 1099499 - - 1099514 + - 1099518 # Temp fix for https://github.com/MetaMask/metamask-extension/pull/16920 for the sake of 11.7.1 hotfix # This will be removed in this ticket https://github.com/MetaMask/metamask-extension/issues/22299 From 75fed5256044abc60fb929371424b863ac9d74cd Mon Sep 17 00:00:00 2001 From: MetaMask Bot Date: Wed, 11 Sep 2024 15:37:07 +0000 Subject: [PATCH 11/43] Version v12.2.3 --- CHANGELOG.md | 5 ++++- package.json | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b6d7f827ca85..58113296a846 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [12.2.3] + ## [12.2.2] ### Fixed - This build was needed to fix release publishing on our master branch. It also includes the addition of the missing v12.2.0 changelog. Functionality and code is equivalent to v12.2.0. @@ -5044,7 +5046,8 @@ Update styles and spacing on the critical error page ([#20350](https://github.c - Added the ability to restore accounts from seed words. -[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.2.2...HEAD +[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.2.3...HEAD +[12.2.3]: https://github.com/MetaMask/metamask-extension/compare/v12.2.2...v12.2.3 [12.2.2]: https://github.com/MetaMask/metamask-extension/compare/v12.2.1...v12.2.2 [12.2.1]: https://github.com/MetaMask/metamask-extension/compare/v12.2.0...v12.2.1 [12.2.0]: https://github.com/MetaMask/metamask-extension/compare/v12.1.3...v12.2.0 diff --git a/package.json b/package.json index 174a929240c4..f04c060bd55b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "metamask-crx", - "version": "12.2.2", + "version": "12.2.3", "private": true, "repository": { "type": "git", From 439f7d6a60dcd956271f0b228d878e222c454d33 Mon Sep 17 00:00:00 2001 From: Charly Chevalier Date: Fri, 6 Sep 2024 18:06:01 +0200 Subject: [PATCH 12/43] test(btc): mock ramps endpoints (#26941) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Follow-up of: - https://github.com/MetaMask/metamask-extension/pull/26929 The previous PR did unblock the CI quickly but relying on a external network call might still have side-effects, thus it's preferable to hook all network calls. [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/26941?quickstart=1) Relates to: - https://github.com/MetaMask/metamask-extension/pull/26929 1. `yarn build:test:flask` 2. `yarn test:e2e:single test/e2e/flask/btc/btc-account-overview.spec.ts` - [x] I've followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Extension Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [x] I've completed the PR template to the best of my ability - [x] I’ve included tests if applicable - [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [x] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- .../flask/btc/btc-account-overview.spec.ts | 4 +- test/e2e/flask/btc/common-btc.ts | 57 +++++++++++++++---- 2 files changed, 46 insertions(+), 15 deletions(-) diff --git a/test/e2e/flask/btc/btc-account-overview.spec.ts b/test/e2e/flask/btc/btc-account-overview.spec.ts index 1ec530b5b64c..070a87c5bd6e 100644 --- a/test/e2e/flask/btc/btc-account-overview.spec.ts +++ b/test/e2e/flask/btc/btc-account-overview.spec.ts @@ -33,9 +33,7 @@ describe('BTC Account - Overview', function (this: Suite) { const buySellButton = await driver.waitForSelector( '[data-testid="coin-overview-buy"]', ); - // Ramps now support buyable chains dynamically (https://github.com/MetaMask/metamask-extension/pull/24041), for now it's - // disabled for Bitcoin - assert.equal(await buySellButton.isEnabled(), false); + assert.equal(await buySellButton.isEnabled(), true); const portfolioButton = await driver.waitForSelector( '[data-testid="coin-overview-portfolio"]', diff --git a/test/e2e/flask/btc/common-btc.ts b/test/e2e/flask/btc/common-btc.ts index 0bcf1663b501..a33ab1241a1c 100644 --- a/test/e2e/flask/btc/common-btc.ts +++ b/test/e2e/flask/btc/common-btc.ts @@ -2,6 +2,7 @@ import { Mockttp } from 'mockttp'; import FixtureBuilder from '../../fixture-builder'; import { withFixtures, unlockWallet } from '../../helpers'; import { DEFAULT_BTC_ACCOUNT } from '../../constants'; +import { MultichainNetworks } from '../../../../shared/constants/multichain/networks'; import { Driver } from '../../webdriver/driver'; import { createBtcAccount } from '../../accounts/common'; @@ -19,17 +20,43 @@ export async function mockBtcBalanceQuote( mockServer: Mockttp, address: string = DEFAULT_BTC_ACCOUNT, ) { - return [ - await mockServer - .forGet(/https:\/\/api\.blockchair\.com\/bitcoin\/addresses\/balances/u) - .withQuery({ - addresses: address, - }) - .thenCallback(() => ({ - statusCode: 200, - json: GENERATE_MOCK_BTC_BALANCE_CALL(address), - })), - ]; + return await mockServer + .forGet(/https:\/\/api\.blockchair\.com\/bitcoin\/addresses\/balances/u) + .withQuery({ + addresses: address, + }) + .thenCallback(() => ({ + statusCode: 200, + json: GENERATE_MOCK_BTC_BALANCE_CALL(address), + })); +} + +export async function mockRampsDynamicFeatureFlag( + mockServer: Mockttp, + subDomain: string, +) { + return await mockServer + .forGet( + `https://on-ramp-content.${subDomain}.cx.metamask.io/regions/networks`, + ) + .withQuery({ + context: 'extension', + }) + .thenCallback(() => ({ + statusCode: 200, + json: { + networks: [ + { + active: true, + chainId: MultichainNetworks.BITCOIN, + chainName: 'Bitcoin', + shortName: 'Bitcoin', + nativeTokenSupported: true, + isEvm: false, + }, + ], + }, + })); } export async function withBtcAccountSnap( @@ -48,7 +75,13 @@ export async function withBtcAccountSnap( .build(), title, dapp: true, - testSpecificMock: mockBtcBalanceQuote, + testSpecificMock: async (mockServer: Mockttp) => [ + await mockBtcBalanceQuote(mockServer), + // See: PROD_RAMP_API_BASE_URL + await mockRampsDynamicFeatureFlag(mockServer, 'api'), + // See: UAT_RAMP_API_BASE_URL + await mockRampsDynamicFeatureFlag(mockServer, 'uat-api'), + ], }, async ({ driver }: { driver: Driver }) => { await unlockWallet(driver); From 5eaa9d312684e40ca2fae9625a45668a505de81b Mon Sep 17 00:00:00 2001 From: Jyoti Puri Date: Wed, 11 Sep 2024 22:28:10 +0530 Subject: [PATCH 13/43] fix (cherry-pick): Adding patch on eth-json-rpc-middleware to disable verifyContract field validation for cosmos (#27065) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cherry-picks https://github.com/MetaMask/metamask-extension/pull/27021 (https://github.com/MetaMask/metamask-extension/commit/4ee09fc71ff5915f3b4b64173d98312c913bf7f4) ## **Description** Adding patch on eth-json-rpc-middleware to disable verifyContract field validation for cosmos ## **Related issues** Fixes: https://github.com/MetaMask/metamask-extension/issues/26980 ## **Manual testing steps** 1. Submit a types signature request with verifyingContract set to `cosmos` 2. Ensure that you are able to sign it ## **Screenshots/Recordings** Screenshot 2024-09-10 at 4 08 00 PM ## **Pre-merge author checklist** - [X] I've followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Extension Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [X] I've completed the PR template to the best of my ability - [X] I’ve included tests if applicable - [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [X] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- ...rpc-middleware-npm-14.0.1-b6c2ccbe8c.patch | 13 ++++++ package.json | 2 +- yarn.lock | 41 ++++++++++++++----- 3 files changed, 44 insertions(+), 12 deletions(-) create mode 100644 .yarn/patches/@metamask-eth-json-rpc-middleware-npm-14.0.1-b6c2ccbe8c.patch diff --git a/.yarn/patches/@metamask-eth-json-rpc-middleware-npm-14.0.1-b6c2ccbe8c.patch b/.yarn/patches/@metamask-eth-json-rpc-middleware-npm-14.0.1-b6c2ccbe8c.patch new file mode 100644 index 000000000000..e82feb182c3a --- /dev/null +++ b/.yarn/patches/@metamask-eth-json-rpc-middleware-npm-14.0.1-b6c2ccbe8c.patch @@ -0,0 +1,13 @@ +diff --git a/dist/wallet.js b/dist/wallet.js +index fce8272ab926443df4c5971c811664f849791425..9237ffcaaea2260e01182feecec667b10edd35a0 100644 +--- a/dist/wallet.js ++++ b/dist/wallet.js +@@ -293,7 +293,7 @@ exports.createWalletMiddleware = createWalletMiddleware; + */ + function validateVerifyingContract(data) { + const { domain: { verifyingContract } = {} } = (0, normalize_1.parseTypedMessage)(data); +- if (verifyingContract && !(0, utils_1.isValidHexAddress)(verifyingContract)) { ++ if (verifyingContract && verifyingContract !== 'cosmos' && !(0, utils_1.isValidHexAddress)(verifyingContract)) { + throw rpc_errors_1.rpcErrors.invalidInput(); + } + } diff --git a/package.json b/package.json index f04c060bd55b..541a6a7bba82 100644 --- a/package.json +++ b/package.json @@ -303,7 +303,7 @@ "@metamask/design-tokens": "^4.0.0", "@metamask/ens-controller": "^10.0.1", "@metamask/eth-json-rpc-filters": "^7.0.0", - "@metamask/eth-json-rpc-middleware": "^14.0.1", + "@metamask/eth-json-rpc-middleware": "patch:@metamask/eth-json-rpc-middleware@npm%3A14.0.1#~/.yarn/patches/@metamask-eth-json-rpc-middleware-npm-14.0.1-b6c2ccbe8c.patch", "@metamask/eth-ledger-bridge-keyring": "patch:@metamask/eth-ledger-bridge-keyring@npm%3A2.0.1#~/.yarn/patches/@metamask-eth-ledger-bridge-keyring-npm-2.0.1-7a5d815b2d.patch", "@metamask/eth-query": "^4.0.0", "@metamask/eth-sig-util": "^7.0.1", diff --git a/yarn.lock b/yarn.lock index 41d26bdef14e..bd7c41b54bb8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5036,7 +5036,7 @@ __metadata: languageName: node linkType: hard -"@metamask/eth-block-tracker@npm:^9.0.2": +"@metamask/eth-block-tracker@npm:^9.0.2, @metamask/eth-block-tracker@npm:^9.0.3": version: 9.0.3 resolution: "@metamask/eth-block-tracker@npm:9.0.3" dependencies: @@ -5088,26 +5088,45 @@ __metadata: languageName: node linkType: hard +"@metamask/eth-json-rpc-middleware@npm:14.0.1": + version: 14.0.1 + resolution: "@metamask/eth-json-rpc-middleware@npm:14.0.1" + dependencies: + "@metamask/eth-block-tracker": "npm:^11.0.1" + "@metamask/eth-json-rpc-provider": "npm:^4.1.1" + "@metamask/eth-sig-util": "npm:^7.0.3" + "@metamask/json-rpc-engine": "npm:^9.0.2" + "@metamask/rpc-errors": "npm:^6.3.1" + "@metamask/utils": "npm:^9.1.0" + "@types/bn.js": "npm:^5.1.5" + bn.js: "npm:^5.2.1" + klona: "npm:^2.0.6" + pify: "npm:^5.0.0" + safe-stable-stringify: "npm:^2.4.3" + checksum: 10/39beecb0d2be19854b132fd615aee1f29195602d3db902f52755260b26a2c37c0a91cd635a09d4dc16f922d32bb229003b338228ae29577c5151d880fad04637 + languageName: node + linkType: hard + "@metamask/eth-json-rpc-middleware@npm:^12.1.1": - version: 12.1.1 - resolution: "@metamask/eth-json-rpc-middleware@npm:12.1.1" + version: 12.1.2 + resolution: "@metamask/eth-json-rpc-middleware@npm:12.1.2" dependencies: - "@metamask/eth-block-tracker": "npm:^9.0.2" - "@metamask/eth-json-rpc-provider": "npm:^2.1.0" + "@metamask/eth-block-tracker": "npm:^9.0.3" + "@metamask/eth-json-rpc-provider": "npm:^3.0.2" "@metamask/eth-sig-util": "npm:^7.0.0" - "@metamask/json-rpc-engine": "npm:^7.1.1" + "@metamask/json-rpc-engine": "npm:^8.0.2" "@metamask/rpc-errors": "npm:^6.0.0" "@metamask/utils": "npm:^8.1.0" klona: "npm:^2.0.6" pify: "npm:^5.0.0" safe-stable-stringify: "npm:^2.4.3" - checksum: 10/0018da198a4f8fbdeab25aa8184377b3215e365b2a631d0f8d7f0577e281c860a1d19fc58ad310afb6d005291c0797dabfe14bdb4adb16300c7f28b11fb26cbc + checksum: 10/1c0f186a35765394a28695bcade84c636b0c92cf3252219d1e9cbdd31231ad09fea5ec7bff7d31e2c7fe4d2158f15b54a5e42166549b69af1f7e475a1c7ae536 languageName: node linkType: hard -"@metamask/eth-json-rpc-middleware@npm:^14.0.1": +"@metamask/eth-json-rpc-middleware@patch:@metamask/eth-json-rpc-middleware@npm%3A14.0.1#~/.yarn/patches/@metamask-eth-json-rpc-middleware-npm-14.0.1-b6c2ccbe8c.patch": version: 14.0.1 - resolution: "@metamask/eth-json-rpc-middleware@npm:14.0.1" + resolution: "@metamask/eth-json-rpc-middleware@patch:@metamask/eth-json-rpc-middleware@npm%3A14.0.1#~/.yarn/patches/@metamask-eth-json-rpc-middleware-npm-14.0.1-b6c2ccbe8c.patch::version=14.0.1&hash=96e7e0" dependencies: "@metamask/eth-block-tracker": "npm:^11.0.1" "@metamask/eth-json-rpc-provider": "npm:^4.1.1" @@ -5120,7 +5139,7 @@ __metadata: klona: "npm:^2.0.6" pify: "npm:^5.0.0" safe-stable-stringify: "npm:^2.4.3" - checksum: 10/39beecb0d2be19854b132fd615aee1f29195602d3db902f52755260b26a2c37c0a91cd635a09d4dc16f922d32bb229003b338228ae29577c5151d880fad04637 + checksum: 10/d1d97a845a8a9a5931c3853c6e2768a97ba289d676a2a8b6111077531943f9647430ef8e3f2a05f4643760ffdab1af0dc72574ca3010feadbdfab3dec345b7c8 languageName: node linkType: hard @@ -25272,7 +25291,7 @@ __metadata: "@metamask/eslint-config-typescript": "npm:^9.0.1" "@metamask/eslint-plugin-design-tokens": "npm:^1.1.0" "@metamask/eth-json-rpc-filters": "npm:^7.0.0" - "@metamask/eth-json-rpc-middleware": "npm:^14.0.1" + "@metamask/eth-json-rpc-middleware": "patch:@metamask/eth-json-rpc-middleware@npm%3A14.0.1#~/.yarn/patches/@metamask-eth-json-rpc-middleware-npm-14.0.1-b6c2ccbe8c.patch" "@metamask/eth-ledger-bridge-keyring": "patch:@metamask/eth-ledger-bridge-keyring@npm%3A2.0.1#~/.yarn/patches/@metamask-eth-ledger-bridge-keyring-npm-2.0.1-7a5d815b2d.patch" "@metamask/eth-query": "npm:^4.0.0" "@metamask/eth-sig-util": "npm:^7.0.1" From 36118362c0ab59802ef9f749d412451650d65188 Mon Sep 17 00:00:00 2001 From: Dan J Miller Date: Wed, 11 Sep 2024 14:32:32 -0230 Subject: [PATCH 14/43] v12.2.3 changelog (#27073) Updates the changelog for v12.2.3 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 58113296a846..ad00f06ec372 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ## [12.2.3] +### Fixed +- Fixes dapps integrating with the cosmos chain that rely on setting the `verifyingContract` field of a signature to `"cosmos"` ## [12.2.2] ### Fixed From fc9b12ae55946b6f6d0a28218e2035dec62aa85d Mon Sep 17 00:00:00 2001 From: Dan J Miller Date: Wed, 11 Sep 2024 15:47:51 -0230 Subject: [PATCH 15/43] Temporary patch to changelog to get v12.3.0 RC build passing (#27075) Temporary patch to changelog to get v12.3.0 RC build passing --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9eac7f92132e..effd41bb7b8f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ## [12.3.0] -### Uncategorized +### Fixed - Merge branch 'Version-v12.2.0' into Version-v12.3.0 - Merge remote-tracking branch 'origin/master' into Version-v12.2.0 - CherryPick: "fix: issue where `wallet_addEtherumChain` was incorrectly enforcing inclusion of a blockExplorerUrls property which is not required (#26938)" ([#26938](https://github.com/MetaMask/metamask-extension/pull/26938)) From 6d3a56aebc52c27005bc0b923ed5a7fdb28a251b Mon Sep 17 00:00:00 2001 From: Brian Bergeron Date: Fri, 13 Sep 2024 08:04:51 -0700 Subject: [PATCH 16/43] feat(migration): enable token auto-detection when basic functionality is on (#27110) Cherry picks https://github.com/MetaMask/metamask-extension/pull/26406 to 12.3.0 Co-authored-by: sahar-fehri --- app/scripts/migrations/125.1.test.ts | 107 ++++++++++++++++++ app/scripts/migrations/125.1.ts | 50 ++++++++ app/scripts/migrations/index.js | 1 + ...rs-after-init-opt-in-background-state.json | 2 +- .../errors-after-init-opt-in-ui-state.json | 2 +- .../multichain/asset-picker-send.spec.ts | 13 ++- 6 files changed, 171 insertions(+), 4 deletions(-) create mode 100644 app/scripts/migrations/125.1.test.ts create mode 100644 app/scripts/migrations/125.1.ts diff --git a/app/scripts/migrations/125.1.test.ts b/app/scripts/migrations/125.1.test.ts new file mode 100644 index 000000000000..eb00db9d1e07 --- /dev/null +++ b/app/scripts/migrations/125.1.test.ts @@ -0,0 +1,107 @@ +import { migrate, version } from './125.1'; + +const oldVersion = 125; + +describe(`migration #${version}`, () => { + afterEach(() => jest.resetAllMocks()); + + it('updates the version metadata', async () => { + const oldStorage = { + meta: { version: oldVersion }, + data: {}, + }; + + const newStorage = await migrate(oldStorage); + expect(newStorage.meta).toStrictEqual({ version }); + }); + + it('Gracefully handles empty/undefined PreferencesController', async () => { + for (const PreferencesController of [{}, undefined, null, 1, '', []]) { + const oldStorage = { + meta: { version: oldVersion }, + data: { PreferencesController }, + }; + + const newStorage = await migrate(oldStorage); + expect(newStorage.data.TxController).toStrictEqual(undefined); + } + }); + + it('Enables token autodetection when basic functionality is on', async () => { + const oldStorage = { + meta: { version: oldVersion }, + data: { + PreferencesController: { + useExternalServices: true, + }, + }, + }; + + const newStorage = await migrate(oldStorage); + expect(newStorage.data).toEqual({ + PreferencesController: { + useExternalServices: true, + useTokenDetection: true, + }, + }); + }); + + it('Does not enable token autodetection when basic functionality is off', async () => { + const oldStorage = { + meta: { version: oldVersion }, + data: { + PreferencesController: { + useExternalServices: false, + }, + }, + }; + + const newStorage = await migrate(oldStorage); + expect(newStorage.data).toEqual({ + PreferencesController: { + useExternalServices: false, + }, + }); + }); + + it('Removes showTokenAutodetectModalOnUpgrade from the app metadata controller', async () => { + const oldStorage = { + meta: { version: oldVersion }, + data: { + AppMetadataController: { + previousMigrationVersion: oldVersion, + currentMigrationVersion: version, + showTokenAutodetectModalOnUpgrade: null, + }, + }, + }; + + const newStorage = await migrate(oldStorage); + expect(newStorage.data).toEqual({ + AppMetadataController: { + previousMigrationVersion: oldVersion, + currentMigrationVersion: version, + }, + }); + }); + + it('Does nothing if showTokenAutodetectModalOnUpgrade is not in the app metadata controller', async () => { + const oldStorage = { + meta: { version: oldVersion }, + data: { + AppMetadataController: { + previousMigrationVersion: oldVersion, + currentMigrationVersion: version, + }, + }, + }; + + const newStorage = await migrate(oldStorage); + expect(newStorage.data).toEqual({ + AppMetadataController: { + previousMigrationVersion: oldVersion, + currentMigrationVersion: version, + }, + }); + }); +}); diff --git a/app/scripts/migrations/125.1.ts b/app/scripts/migrations/125.1.ts new file mode 100644 index 000000000000..d3c975a78a11 --- /dev/null +++ b/app/scripts/migrations/125.1.ts @@ -0,0 +1,50 @@ +import { hasProperty, isObject } from '@metamask/utils'; +import { cloneDeep } from 'lodash'; + +type VersionedData = { + meta: { version: number }; + data: Record; +}; + +export const version = 125.1; + +/** + * This migration enables token auto-detection if the basic functionality toggle is on. + * + * It also removes an unused property `showTokenAutodetectModalOnUpgrade` from the app metadata controller. + * + * @param originalVersionedData - Versioned MetaMask extension state, exactly + * what we persist to dist. + * @param originalVersionedData.meta - State metadata. + * @param originalVersionedData.meta.version - The current state version. + * @param originalVersionedData.data - The persisted MetaMask state, keyed by + * controller. + * @returns Updated versioned MetaMask extension state. + */ +export async function migrate( + originalVersionedData: VersionedData, +): Promise { + const versionedData = cloneDeep(originalVersionedData); + versionedData.meta.version = version; + transformState(versionedData.data); + return versionedData; +} + +function transformState(state: Record) { + if ( + hasProperty(state, 'PreferencesController') && + isObject(state.PreferencesController) && + state.PreferencesController.useExternalServices === true + ) { + state.PreferencesController.useTokenDetection = true; + } + + if ( + hasProperty(state, 'AppMetadataController') && + isObject(state.AppMetadataController) + ) { + delete state.AppMetadataController.showTokenAutodetectModalOnUpgrade; + } + + return state; +} diff --git a/app/scripts/migrations/index.js b/app/scripts/migrations/index.js index 0146779d408f..bb64ec957f75 100644 --- a/app/scripts/migrations/index.js +++ b/app/scripts/migrations/index.js @@ -144,6 +144,7 @@ const migrations = [ require('./123'), require('./124'), require('./125'), + require('./125.1'), ]; export default migrations; diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json index 7a4d6335dab5..2d2c362b30f8 100644 --- a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json +++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json @@ -175,7 +175,7 @@ "dismissSeedBackUpReminder": true, "useMultiAccountBalanceChecker": true, "useSafeChainsListValidation": "boolean", - "useTokenDetection": false, + "useTokenDetection": true, "useNftDetection": false, "use4ByteResolution": true, "useCurrencyRateCheck": true, diff --git a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json index c74b7f35c85d..d5ff2eecc5eb 100644 --- a/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json +++ b/test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json @@ -109,7 +109,7 @@ "dismissSeedBackUpReminder": true, "useMultiAccountBalanceChecker": true, "useSafeChainsListValidation": true, - "useTokenDetection": false, + "useTokenDetection": true, "useNftDetection": false, "useCurrencyRateCheck": true, "useRequestQueue": true, diff --git a/test/e2e/tests/multichain/asset-picker-send.spec.ts b/test/e2e/tests/multichain/asset-picker-send.spec.ts index 8358e8242f69..5accb14c6074 100644 --- a/test/e2e/tests/multichain/asset-picker-send.spec.ts +++ b/test/e2e/tests/multichain/asset-picker-send.spec.ts @@ -34,6 +34,15 @@ describe('AssetPickerSendFlow @no-mmi', function () { async ({ driver }: { driver: Driver }) => { await unlockWallet(driver); + // Disable token auto detection + await driver.openNewURL( + `${driver.extensionUrl}/home.html#settings/security`, + ); + await driver.clickElement( + '[data-testid="autoDetectTokens"] .toggle-button', + ); + await driver.navigate(); + // Open the send flow openActionMenuAndStartSendFlow(driver); @@ -72,13 +81,13 @@ describe('AssetPickerSendFlow @no-mmi', function () { assert.equal(tokenListSecondaryValue, '$250,000.00'); - // Search for BNB + // Search for CHZ const searchInputField = await driver.waitForSelector( '[data-testid="asset-picker-modal-search-input"]', ); await searchInputField.sendKeys('CHZ'); - // check that BNB is disabled + // check that CHZ is disabled const [, tkn] = await driver.findElements( '[data-testid="multichain-token-list-button"]', ); From 88b8ef114551b69ad37b39ef7bed048c7241cc41 Mon Sep 17 00:00:00 2001 From: Charly Chevalier Date: Mon, 16 Sep 2024 17:14:20 +0200 Subject: [PATCH 17/43] fix(cherry-pick): resolve path-to-regexp to v1.9.0 to resolve GHSA-9wv6-86v2-598j (#27113) (#27159) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** This permanently fixes https://github.com/advisories/GHSA-9wv6-86v2-598j by resolving that package to a recently released version that does not having breaking changes and where the security vulnerability is resolved. [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/27159?quickstart=1) ## **Related issues** Fixes: - https://github.com/advisories/GHSA-9wv6-86v2-598j ## **Manual testing steps** N/A ## **Screenshots/Recordings** ### **Before** ### **After** ## **Pre-merge author checklist** - [x] I've followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Extension Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [x] I've completed the PR template to the best of my ability - [x] I’ve included tests if applicable - [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [x] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. Co-authored-by: Dan J Miller Co-authored-by: MetaMask Bot --- .yarnrc.yml | 10 ---------- lavamoat/browserify/beta/policy.json | 6 +++--- lavamoat/browserify/flask/policy.json | 6 +++--- lavamoat/browserify/main/policy.json | 6 +++--- lavamoat/browserify/mmi/policy.json | 6 +++--- package.json | 3 ++- yarn.lock | 22 ++++------------------ 7 files changed, 18 insertions(+), 41 deletions(-) diff --git a/.yarnrc.yml b/.yarnrc.yml index 5d4aa7cd4e73..252333917781 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -43,16 +43,6 @@ npmAuditIgnoreAdvisories: # not appear to be used. - 1092461 - # Issue: path-to-regexp outputs backtracking regular expressions - # URL: https://github.com/advisories/GHSA-9wv6-86v2-598j - # path-to-regexp is used in react-router v5.1.2, which we use. However, the - # vulnerability in path-to-regexp could only be exploited within react-router - # if malicious properties were passed to react-router components or methods - # explicitly from our code. As such, this vulneratibility cannot be exploited - # by an external / malicious actor. Meanwhile, once we update to v6+, - # path-to-regexp will no longer be used. - - 1099518 - # Temp fix for https://github.com/MetaMask/metamask-extension/pull/16920 for the sake of 11.7.1 hotfix # This will be removed in this ticket https://github.com/MetaMask/metamask-extension/issues/22299 - 'ts-custom-error (deprecation)' diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json index eb3caba43c21..605c88c89ea1 100644 --- a/lavamoat/browserify/beta/policy.json +++ b/lavamoat/browserify/beta/policy.json @@ -5552,7 +5552,7 @@ "react-router-dom>react-router>mini-create-react-context": true, "react-router-dom>tiny-invariant": true, "react-router-dom>tiny-warning": true, - "sinon>nise>path-to-regexp": true + "serve-handler>path-to-regexp": true } }, "react-router-dom>react-router>history": { @@ -5702,9 +5702,9 @@ "process": true } }, - "sinon>nise>path-to-regexp": { + "serve-handler>path-to-regexp": { "packages": { - "sinon>nise>path-to-regexp>isarray": true + "serve-handler>path-to-regexp>isarray": true } }, "stream-browserify": { diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json index eb3caba43c21..605c88c89ea1 100644 --- a/lavamoat/browserify/flask/policy.json +++ b/lavamoat/browserify/flask/policy.json @@ -5552,7 +5552,7 @@ "react-router-dom>react-router>mini-create-react-context": true, "react-router-dom>tiny-invariant": true, "react-router-dom>tiny-warning": true, - "sinon>nise>path-to-regexp": true + "serve-handler>path-to-regexp": true } }, "react-router-dom>react-router>history": { @@ -5702,9 +5702,9 @@ "process": true } }, - "sinon>nise>path-to-regexp": { + "serve-handler>path-to-regexp": { "packages": { - "sinon>nise>path-to-regexp>isarray": true + "serve-handler>path-to-regexp>isarray": true } }, "stream-browserify": { diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json index eb3caba43c21..605c88c89ea1 100644 --- a/lavamoat/browserify/main/policy.json +++ b/lavamoat/browserify/main/policy.json @@ -5552,7 +5552,7 @@ "react-router-dom>react-router>mini-create-react-context": true, "react-router-dom>tiny-invariant": true, "react-router-dom>tiny-warning": true, - "sinon>nise>path-to-regexp": true + "serve-handler>path-to-regexp": true } }, "react-router-dom>react-router>history": { @@ -5702,9 +5702,9 @@ "process": true } }, - "sinon>nise>path-to-regexp": { + "serve-handler>path-to-regexp": { "packages": { - "sinon>nise>path-to-regexp>isarray": true + "serve-handler>path-to-regexp>isarray": true } }, "stream-browserify": { diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json index 465b5dcf621b..96ba8b467983 100644 --- a/lavamoat/browserify/mmi/policy.json +++ b/lavamoat/browserify/mmi/policy.json @@ -5620,7 +5620,7 @@ "react-router-dom>react-router>mini-create-react-context": true, "react-router-dom>tiny-invariant": true, "react-router-dom>tiny-warning": true, - "sinon>nise>path-to-regexp": true + "serve-handler>path-to-regexp": true } }, "react-router-dom>react-router>history": { @@ -5770,9 +5770,9 @@ "process": true } }, - "sinon>nise>path-to-regexp": { + "serve-handler>path-to-regexp": { "packages": { - "sinon>nise>path-to-regexp>isarray": true + "serve-handler>path-to-regexp>isarray": true } }, "stream-browserify": { diff --git a/package.json b/package.json index be00bf7c6c65..c95b55be0b83 100644 --- a/package.json +++ b/package.json @@ -265,7 +265,8 @@ "@metamask/snaps-controllers@npm:^9.4.0": "patch:@metamask/snaps-controllers@npm%3A9.4.0#~/.yarn/patches/@metamask-snaps-controllers-npm-9.4.0-7c3abbbea6.patch", "@metamask/nonce-tracker@npm:^5.0.0": "patch:@metamask/nonce-tracker@npm%3A5.0.0#~/.yarn/patches/@metamask-nonce-tracker-npm-5.0.0-d81478218e.patch", "@metamask/keyring-controller@npm:^17.1.0": "patch:@metamask/keyring-controller@npm%3A17.1.1#~/.yarn/patches/@metamask-keyring-controller-npm-17.1.1-098cb41930.patch", - "@trezor/connect-web@npm:^9.1.11": "patch:@trezor/connect-web@npm%3A9.3.0#~/.yarn/patches/@trezor-connect-web-npm-9.3.0-040ab10d9a.patch" + "@trezor/connect-web@npm:^9.1.11": "patch:@trezor/connect-web@npm%3A9.3.0#~/.yarn/patches/@trezor-connect-web-npm-9.3.0-040ab10d9a.patch", + "path-to-regexp": "1.9.0" }, "dependencies": { "@babel/runtime": "patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch", diff --git a/yarn.lock b/yarn.lock index d0660f4d3233..c67922eaa24d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -28708,26 +28708,12 @@ __metadata: languageName: node linkType: hard -"path-to-regexp@npm:0.1.7": - version: 0.1.7 - resolution: "path-to-regexp@npm:0.1.7" - checksum: 10/701c99e1f08e3400bea4d701cf6f03517474bb1b608da71c78b1eb261415b645c5670dfae49808c89e12cea2dccd113b069f040a80de012da0400191c6dbd1c8 - languageName: node - linkType: hard - -"path-to-regexp@npm:2.2.1": - version: 2.2.1 - resolution: "path-to-regexp@npm:2.2.1" - checksum: 10/1a7125f8c1b5904d556a29722333219df4aa779039e903efe2fbfe0cc3ae9246672846fc8ad285664020b70e434347e0bc9af691fd7d61df8eaa7b018dcd56fb - languageName: node - linkType: hard - -"path-to-regexp@npm:^1.7.0": - version: 1.7.0 - resolution: "path-to-regexp@npm:1.7.0" +"path-to-regexp@npm:1.9.0": + version: 1.9.0 + resolution: "path-to-regexp@npm:1.9.0" dependencies: isarray: "npm:0.0.1" - checksum: 10/7e1275a34fcfed7ba9d0d82ea7149f0c87d8c941c9b34109ab455cceb783b6387ce9275deeb6519eb0f880777a44bcb387cd579d3bb0cfbf4e7fe93c0e3b1a69 + checksum: 10/67f0f4823f7aab356523d93a83f9f8222bdd119fa0b27a8f8b587e8e6c9825294bb4ccd16ae619def111ff3fe5d15ff8f658cdd3b0d58b9c882de6fd15bc1b76 languageName: node linkType: hard From dac872f3b751fbd46a53bd80af6018f26f6893ff Mon Sep 17 00:00:00 2001 From: Gustavo Antunes <17601467+gantunesr@users.noreply.github.com> Date: Mon, 16 Sep 2024 15:03:26 -0300 Subject: [PATCH 18/43] fix: remove repeated account option (#27116) --- .../account-list-menu/account-list-menu.tsx | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/ui/components/multichain/account-list-menu/account-list-menu.tsx b/ui/components/multichain/account-list-menu/account-list-menu.tsx index 2afbe6f1fcbc..653e6700c0a8 100644 --- a/ui/components/multichain/account-list-menu/account-list-menu.tsx +++ b/ui/components/multichain/account-list-menu/account-list-menu.tsx @@ -420,25 +420,6 @@ export const AccountListMenu = ({ ) : null ///: END:ONLY_INCLUDE_IF } - { - ///: BEGIN:ONLY_INCLUDE_IF(build-flask) - bitcoinTestnetSupportEnabled ? ( - - { - setActionMode(ACTION_MODES.ADD_BITCOIN_TESTNET); - }} - data-testid="multichain-account-menu-popover-add-account-testnet" - > - {t('addNewBitcoinTestnetAccount')} - - - ) : null - ///: END:ONLY_INCLUDE_IF - } Date: Mon, 16 Sep 2024 20:48:29 +0200 Subject: [PATCH 19/43] fix (cherry-pick): typo (#27010) (#27029) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** This PR fixes a typo for two properties that were updated in a recent change to the Segment schema. [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/27010?quickstart=1) ## **Related issues** [Fixes:](https://github.com/Consensys/segment-schema/pull/211) ## **Manual testing steps** N/A ## **Screenshots/Recordings** N/A ### **Before** N/A ### **After** N/A ## **Pre-merge author checklist** - [x] I've followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Extension Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [x] I've completed the PR template to the best of my ability - [x] I’ve included tests if applicable - [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [x] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. ## **Pre-merge reviewer checklist** - [x] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [x] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. ## **Description** [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/27029?quickstart=1) ## **Related issues** Fixes: ## **Manual testing steps** 1. Go to this page... 2. 3. ## **Screenshots/Recordings** ### **Before** ### **After** ## **Pre-merge author checklist** - [ ] I've followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Extension Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [ ] I've completed the PR template to the best of my ability - [ ] I’ve included tests if applicable - [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- .../notifications-settings-per-account.tsx | 2 +- .../notifications-settings/notifications-settings-types.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/pages/notifications-settings/notifications-settings-per-account.tsx b/ui/pages/notifications-settings/notifications-settings-per-account.tsx index e73d6807feff..4e5afa6cb5f1 100644 --- a/ui/pages/notifications-settings/notifications-settings-per-account.tsx +++ b/ui/pages/notifications-settings/notifications-settings-per-account.tsx @@ -74,7 +74,7 @@ export const NotificationsSettingsPerAccount = ({ category: MetaMetricsEventCategory.NotificationSettings, event: MetaMetricsEventName.NotificationsSettingsUpdated, properties: { - setting_type: 'account_notifications', + settings_type: 'account_notifications', old_value: isEnabled, new_value: !isEnabled, }, diff --git a/ui/pages/notifications-settings/notifications-settings-types.tsx b/ui/pages/notifications-settings/notifications-settings-types.tsx index 5b6b58763214..ba2516644e3b 100644 --- a/ui/pages/notifications-settings/notifications-settings-types.tsx +++ b/ui/pages/notifications-settings/notifications-settings-types.tsx @@ -58,7 +58,7 @@ export function NotificationsSettingsTypes({ category: MetaMetricsEventCategory.NotificationSettings, event: MetaMetricsEventName.NotificationsSettingsUpdated, properties: { - setting_type: 'product_announcements', + settings_type: 'product_announcements', old_value: featureAnnouncementsEnabled, new_value: !featureAnnouncementsEnabled, }, From bcd40f6a91e3195ed89640cbb0542775f338dbfd Mon Sep 17 00:00:00 2001 From: Matteo Scurati Date: Mon, 16 Sep 2024 20:49:03 +0200 Subject: [PATCH 20/43] fix: (cherry-pick) check if the notifications started flow is running (#27038) (#27056) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** This PR adds a check to the modal for enabling notifications. If the enabling process is in progress, closing the modal does not trigger the “dismissed” event. [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/27038?quickstart=1) ## **Related issues** N/A ## **Manual testing steps** N/A ## **Screenshots/Recordings** N/A ### **Before** N/A ### **After** N/A ## **Pre-merge author checklist** - [x] I've followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Extension Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [x] I've completed the PR template to the best of my ability - [x] I’ve included tests if applicable - [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [x] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. ## **Pre-merge reviewer checklist** - [x] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- .../turn-on-metamask-notifications.tsx | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/ui/components/app/modals/turn-on-metamask-notifications/turn-on-metamask-notifications.tsx b/ui/components/app/modals/turn-on-metamask-notifications/turn-on-metamask-notifications.tsx index e63e0a019b2f..de3da35fa841 100644 --- a/ui/components/app/modals/turn-on-metamask-notifications/turn-on-metamask-notifications.tsx +++ b/ui/components/app/modals/turn-on-metamask-notifications/turn-on-metamask-notifications.tsx @@ -51,14 +51,14 @@ export default function TurnOnMetamaskNotifications() { ); const isProfileSyncingEnabled = useSelector(selectIsProfileSyncingEnabled); - const [buttonState, setButtonState] = useState( + const [isLoading, setIsLoading] = useState( isUpdatingMetamaskNotifications, ); const { createNotifications, error } = useCreateNotifications(); const handleTurnOnNotifications = async () => { - setButtonState(true); + setIsLoading(true); await createNotifications(); trackEvent({ category: MetaMetricsEventCategory.NotificationsActivationFlow, @@ -72,13 +72,18 @@ export default function TurnOnMetamaskNotifications() { const handleHideModal = () => { hideModal(); - trackEvent({ - category: MetaMetricsEventCategory.NotificationsActivationFlow, - event: MetaMetricsEventName.NotificationsActivated, - properties: { - is_profile_syncing_enabled: isProfileSyncingEnabled, - action_type: 'dismissed', - }, + setIsLoading((prevLoadingState) => { + if (!prevLoadingState) { + trackEvent({ + category: MetaMetricsEventCategory.NotificationsActivationFlow, + event: MetaMetricsEventName.NotificationsActivated, + properties: { + is_profile_syncing_enabled: isProfileSyncingEnabled, + action_type: 'dismissed', + }, + }); + } + return prevLoadingState; }); }; @@ -149,8 +154,8 @@ export default function TurnOnMetamaskNotifications() { }} submitButtonProps={{ children: t('turnOnMetamaskNotificationsButton'), - loading: buttonState, - disabled: buttonState, + loading: isLoading, + disabled: isLoading, 'data-testid': 'turn-on-notifications-button', }} /> From 02de2abf2529e27cfcfd62ae7e88a7d1310b0aae Mon Sep 17 00:00:00 2001 From: David Walsh Date: Mon, 16 Sep 2024 13:53:54 -0500 Subject: [PATCH 21/43] fix (cherry-pick): Don't show AccountListMenu back button by default (#27152) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** A recent change (https://github.com/MetaMask/metamask-extension/pull/26271) made it such that the "<" (back button) in the `AccountListMenu` component always shows. We do *not* want this when the `AccountListMenu` first opens, so this PR ensures that. [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/26940?quickstart=1) ## **Related issues** Fixes: ## **Manual testing steps** 1. Open the `AccountListMenu` 2. Don't see the `<` 3. Click the "Add account" button 4. See the `<` 5. Click the `<`, go back to main menu ## **Screenshots/Recordings** ### **Before** SCR-20240904-pens ### **After** ## **Pre-merge author checklist** - [ ] I've followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Extension Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [ ] I've completed the PR template to the best of my ability - [ ] I’ve included tests if applicable - [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- .../component-library/modal-header/modal-header.types.ts | 2 +- .../multichain/account-list-menu/account-list-menu.test.tsx | 1 + .../multichain/account-list-menu/account-list-menu.tsx | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ui/components/component-library/modal-header/modal-header.types.ts b/ui/components/component-library/modal-header/modal-header.types.ts index e169c8e5709a..8b09318bf622 100644 --- a/ui/components/component-library/modal-header/modal-header.types.ts +++ b/ui/components/component-library/modal-header/modal-header.types.ts @@ -17,7 +17,7 @@ export interface ModalHeaderProps extends HeaderBaseStyleUtilityProps { * The onClick handler for the back `ButtonIcon` * When passed this will allow for the back `ButtonIcon` to show */ - onBack?: () => void; + onBack?: () => void | undefined; /** * The props to pass to the back `ButtonIcon` */ diff --git a/ui/components/multichain/account-list-menu/account-list-menu.test.tsx b/ui/components/multichain/account-list-menu/account-list-menu.test.tsx index 60e1ca8aa99f..c55116bd2d93 100644 --- a/ui/components/multichain/account-list-menu/account-list-menu.test.tsx +++ b/ui/components/multichain/account-list-menu/account-list-menu.test.tsx @@ -117,6 +117,7 @@ describe('AccountListMenu', () => { expect(getByPlaceholderText('Search accounts')).toBeInTheDocument(); expect(getByText('Add account or hardware wallet')).toBeInTheDocument(); + expect(document.querySelector('[aria-label="Back"]')).toStrictEqual(null); }); it('displays accounts for list and filters by search', () => { diff --git a/ui/components/multichain/account-list-menu/account-list-menu.tsx b/ui/components/multichain/account-list-menu/account-list-menu.tsx index 653e6700c0a8..f74d1c12a524 100644 --- a/ui/components/multichain/account-list-menu/account-list-menu.tsx +++ b/ui/components/multichain/account-list-menu/account-list-menu.tsx @@ -265,7 +265,7 @@ export const AccountListMenu = ({ ); // eslint-disable-next-line no-empty-function - let onBack = () => {}; + let onBack; if (actionMode !== ACTION_MODES.LIST) { if (actionMode === ACTION_MODES.MENU) { onBack = () => setActionMode(ACTION_MODES.LIST); From ad728f79983a014fc37e16734d2e31cffeb1d4fe Mon Sep 17 00:00:00 2001 From: Ariella Vu <20778143+digiwand@users.noreply.github.com> Date: Tue, 17 Sep 2024 02:55:49 +0800 Subject: [PATCH 22/43] fix: cherry-pick V12.3.0 fix: PermitTransferFrom or PermitBatchTransferFrom crashes MM when value for Name address has not been loaded (#27168) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## **Description** cherry-picks https://github.com/MetaMask/metamask-extension/pull/26791 into V12.3.0 no conflicts [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/27168?quickstart=1) ## **Related issues** Fixes: https://github.com/MetaMask/metamask-extension/issues/26593 ## **Manual testing steps** 1. Go to this page... 2. 3. ## **Screenshots/Recordings** ### **Before** ### **After** ## **Pre-merge author checklist** - [ ] I've followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Extension Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [ ] I've completed the PR template to the best of my ability - [ ] I’ve included tests if applicable - [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. --- .../app/name/__snapshots__/name.test.tsx.snap | 18 ++ .../__snapshots__/name-details.test.tsx.snap | 182 ++++++++++++++++++ .../name/name-details/name-details.test.tsx | 13 ++ .../app/name/name-details/name-details.tsx | 4 + ui/components/app/name/name.test.tsx | 14 ++ ui/components/app/name/name.tsx | 4 + 6 files changed, 235 insertions(+) diff --git a/ui/components/app/name/__snapshots__/name.test.tsx.snap b/ui/components/app/name/__snapshots__/name.test.tsx.snap index c3dd86968b31..ee4899a0c866 100644 --- a/ui/components/app/name/__snapshots__/name.test.tsx.snap +++ b/ui/components/app/name/__snapshots__/name.test.tsx.snap @@ -79,3 +79,21 @@ exports[`Name renders address with saved name 1`] = `
`; + +exports[`Name renders when no address value is passed 1`] = ` +
+
+
+ +

+

+
+
+`; diff --git a/ui/components/app/name/name-details/__snapshots__/name-details.test.tsx.snap b/ui/components/app/name/name-details/__snapshots__/name-details.test.tsx.snap index 6ba786d17e2e..4cc537529b14 100644 --- a/ui/components/app/name/name-details/__snapshots__/name-details.test.tsx.snap +++ b/ui/components/app/name/name-details/__snapshots__/name-details.test.tsx.snap @@ -259,6 +259,188 @@ exports[`NameDetails renders proposed names 1`] = ` `; +exports[`NameDetails renders when no address value is passed 1`] = ` + +
+
+
+
+
+