Version v10.11.0 RC

.circleci/scripts/chrome-install.sh

@@ -5,12 +5,12 @@ set -u
 set -o pipefail
 
 # To get the latest version, see <https://www.ubuntuupdates.org/ppa/google_chrome?dist=stable>
-CHROME_VERSION='96.0.4664.45-1'
+CHROME_VERSION='98.0.4758.80-1'
 CHROME_BINARY="google-chrome-stable_${CHROME_VERSION}_amd64.deb"
 CHROME_BINARY_URL="https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/${CHROME_BINARY}"
 
 # To retrieve this checksum, run the `wget` and `shasum` commands below
-CHROME_BINARY_SHA512SUM='98433b003d43627e221faad212cba3df42d7f3d6e31894b1e14a9058069cbcd2bd3c83b3c59ecc1733dab11e36b181fa1d89e33b841a21fd53a8e82bbddc39aa'
+CHROME_BINARY_SHA512SUM='83d151f05017ee1f255f4134ee84efdb5c7826d6c64d43e6d402bef1569e4800806be0f87af3cacd240917cacaeedb9cae5833ccbc65740482f6aafbef9b38e7'
 
 wget -O "${CHROME_BINARY}" -t 5 "${CHROME_BINARY_URL}"
 

.eslintrc.js

@@ -171,7 +171,7 @@ module.exports = {
         'app/scripts/migrations/*.test.js',
         'app/scripts/platforms/*.test.js',
         'app/scripts/controllers/network/**/*.test.js',
-        'app/scripts/controllers/permissions/*.test.js',
+        'app/scripts/controllers/permissions/**/*.test.js',
       ],
       extends: ['@metamask/eslint-config-mocha'],
       rules: {
@@ -198,7 +198,7 @@ module.exports = {
         'app/scripts/migrations/*.test.js',
         'app/scripts/platforms/*.test.js',
         'app/scripts/controllers/network/**/*.test.js',
-        'app/scripts/controllers/permissions/*.test.js',
+        'app/scripts/controllers/permissions/**/*.test.js',
       ],
       extends: ['@metamask/eslint-config-jest'],
       rules: {

.gitattributes

@@ -10,3 +10,9 @@ yarn.lock linguist-generated=false
 
 test/e2e/send-eth-with-private-key-test/ethereumjs-tx.js linguist-vendored linguist-generated -diff
 test/e2e/send-eth-with-private-key-test/web3js.js linguist-vendored linguist-generated -diff
+
+# Collapse changes to translation files by default in diffs as it is very common
+# to remove keys in PRs. Of course this means that PRs that solely update
+# translations will be a little harder to review but those do not get submitted
+# as often as other PRs.
+app/_locales/** linguist-generated

.github/workflows/crowdin_action.yml

@@ -25,7 +25,10 @@ jobs:
       with:
         upload_translations: true
         download_translations: true
+        github_user_name: metamaskbot
+        github_user_email: metamaskbot@users.noreply.github.com
       env:
+        GITHUB_ACTOR: metamaskbot
         GITHUB_TOKEN: ${{ secrets.METAMASKBOT_CROWDIN_TOKEN }}
         CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
         CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}

.mocharc.js

@@ -6,7 +6,7 @@ module.exports = {
     './app/scripts/migrations/*.test.js',
     './app/scripts/platforms/*.test.js',
     './app/scripts/controllers/network/**/*.test.js',
-    './app/scripts/controllers/permissions/*.test.js',
+    './app/scripts/controllers/permissions/**/*.test.js',
   ],
   recursive: true,
   require: ['test/env.js', 'test/setup.js'],

.storybook/test-data.js

@@ -102,6 +102,85 @@ const state = {
       swapsFeatureIsLive: false,
       swapsQuoteRefreshTime: 60000,
     },
+    "snapStates": {},
+    "snaps": {
+      "local:http://localhost:8080/": {
+        "enabled": true,
+        "id": "local:http://localhost:8080/",
+        "initialPermissions": {
+          "snap_confirm": {}
+        },
+        "manifest": {
+          "description": "An example MetaMask Snap.",
+          "initialPermissions": {
+            "snap_confirm": {}
+          },
+          "manifestVersion": "0.1",
+          "proposedName": "MetaMask Example Snap",
+          "repository": {
+            "type": "git",
+            "url": "https://github.com/MetaMask/snaps-skunkworks.git"
+          },
+          "source": {
+            "location": {
+              "npm": {
+                "filePath": "dist/bundle.js",
+                "iconPath": "images/icon.svg",
+                "packageName": "@metamask/example-snap",
+                "registry": "https://registry.npmjs.org/"
+              }
+            },
+            "shasum": "3lEt0yUu080DwV78neROaAAIQWXukSkMnP4OBhOhBnE="
+          },
+          "version": "0.6.0"
+        },
+        "permissionName": "wallet_snap_local:http://localhost:8080/",
+        "sourceCode": "(...)",
+        "status": "stopped",
+        "svgIcon": "<svg>...</svg>",
+        "version": "0.6.0"
+      },
+      "Filecoin Snap": {
+        "enabled": true,
+        "id": "npm:http://localhost:8080/",
+        "initialPermissions": {
+          "snap_confirm": {},
+          "eth_accounts": {},
+          "snap_manageState": {},
+        },
+        "manifest": {
+          "description": "This swap provides developers everywhere access to an entirely new data storage paradigm, even letting your programs store data autonomously. Learn more.",
+          "initialPermissions": {
+            "snap_confirm": {},
+            "eth_accounts": {},
+            "snap_manageState": {},
+          },
+          "manifestVersion": "0.1",
+          "proposedName": "Filecoin Snap",
+          "repository": {
+            "type": "git",
+            "url": "https://github.com/MetaMask/snaps-skunkworks.git"
+          },
+          "source": {
+            "location": {
+              "npm": {
+                "filePath": "dist/bundle.js",
+                "iconPath": "images/icon.svg",
+                "packageName": "@metamask/example-snap",
+                "registry": "https://registry.npmjs.org/"
+              }
+            },
+            "shasum": "3lEt0yUu080DwV78neROaAAIQWXukSkMnP4OBhOhBnE="
+          },
+          "version": "0.6.0"
+        },
+        "permissionName": "wallet_snap_npm:http://localhost:8080/",
+        "sourceCode": "(...)",
+        "status": "stopped",
+        "svgIcon": "<svg>...</svg>",
+        "version": "0.6.0"
+      },
+    },
     accountArray: [
       {
         name: 'This is a Really Long Account Name',
@@ -1030,6 +1109,17 @@ const state = {
           },
         },
       },
+      "local:http://localhost:8080/": {
+        permissions: {
+          'snap_confirm': {
+            invoker: "local:http://localhost:8080/",
+            parentCapability: 'snap_confirm',
+            id: 'a7342F4b-beae-4525-a36c-c0635fd03359',
+            date: 1620710693178,
+            caveats: []
+          },
+        },
+      },
     },
     permissionActivityLog: [
       {
@@ -1172,20 +1262,6 @@ const state = {
         },
       },
     },
-    subjectMetadata: {
-      'https://metamask.github.io': {
-        name: 'E2E Test Dapp',
-        origin: 'https://metamask.github.io',
-        iconUrl: 'https://metamask.github.io/test-dapp/metamask-fox.svg',
-        subjectType: 'website',
-      },
-      'https://app.uniswap.org': {
-        name: 'Uniswap',
-        origin: 'https://app.uniswap.org',
-        iconUrl: './UNI.png',
-        subjectType: 'website',
-      },
-    },
     threeBoxSyncingAllowed: false,
     showRestorePrompt: true,
     threeBoxLastUpdated: 0,
@@ -1212,6 +1288,31 @@ const state = {
     ensResolutionsByAddress: {},
     pendingApprovals: {},
     pendingApprovalCount: 0,
+    subjectMetadata: {
+      "http://localhost:8080": {
+        extensionId: null,
+        iconUrl: null,
+        name: "Hello, Snaps!",
+        origin: "http://localhost:8080",
+        subjectType: "website"
+      },
+      "https://metamask.github.io": {
+        extensionId: null,
+        iconUrl: null,
+        name: "Snaps Iframe Execution Environment",
+        origin: "https://metamask.github.io",
+        subjectType: "website"
+      },
+      "local:http://localhost:8080/": {
+        extensionId: null,
+        iconUrl: null,
+        name: "MetaMask Example Snap",
+        origin: "local:http://localhost:8080/",
+        subjectType: "snap",
+        svgIcon: "<svg>...</svg>",
+        version: "0.6.0"
+      }
+    }
   },
   appState: {
     shouldClose: false,

CHANGELOG.md

@@ -6,6 +6,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [10.11.0]
+### Added
+- Swaps: Add support for Smart Transactions on Mainnet and Rinkeby ([#12676](https://github.com/MetaMask/metamask-extension/pull/12676))
+- Add "Token details" page ([#13216](https://github.com/MetaMask/metamask-extension/pull/13216))
+- Add icons to sections in settings ([#12920](https://github.com/MetaMask/metamask-extension/pull/12920))
+- Add EIP-712 support for Trezor ([#13693](https://github.com/MetaMask/metamask-extension/pull/13693))
+
+### Changed
+- Swaps: Change language "Quote X of Y" to "Fetching quote X of Y" ([#13663](https://github.com/MetaMask/metamask-extension/pull/13663))
+- Update preferred account identicon selection UI ([#13408](https://github.com/MetaMask/metamask-extension/pull/13408))
+- Include transactions from all networks in state logs ([#13599](https://github.com/MetaMask/metamask-extension/pull/13599))
+- Update accounts connection language ([#13605](https://github.com/MetaMask/metamask-extension/pull/13605))
+- Style updates for setting page in full screen mode ([#13569](https://github.com/MetaMask/metamask-extension/pull/13569))
+- Add currency symbol validation in the add network form ([#12431](https://github.com/MetaMask/metamask-extension/pull/12431))
+
+### Fixed
+- Ensure pre-selected account on connect screen is visible in list ([#13621](https://github.com/MetaMask/metamask-extension/pull/13621))
+- Do not allow transaction creation with gas limit below minimum ([#13574](https://github.com/MetaMask/metamask-extension/pull/13574))
+- Fix network editing error when no block explorer is provided ([#13527](https://github.com/MetaMask/metamask-extension/pull/13527))
+- Swaps: Fix BigNumber error when submitting quote ([#13555](https://github.com/MetaMask/metamask-extension/pull/13555))
+
 ## [10.10.2]
 ### Added
 - Add EIP-712 support for Trezor ([#13693](https://github.com/MetaMask/metamask-extension/pull/13693))
@@ -2743,7 +2764,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Uncategorized
 - Added the ability to restore accounts from seed words.
 
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.10.2...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.11.0...HEAD
+[10.11.0]: https://github.com/MetaMask/metamask-extension/compare/v10.10.2...v10.11.0
 [10.10.2]: https://github.com/MetaMask/metamask-extension/compare/v10.10.1...v10.10.2
 [10.10.1]: https://github.com/MetaMask/metamask-extension/compare/v10.10.0...v10.10.1
 [10.10.0]: https://github.com/MetaMask/metamask-extension/compare/v10.9.3...v10.10.0