Merge branch 'develop' into fix/linea-token-detection

MetaMask · Oct 20, 2023 · 161100f · 161100f
2 parents b9d9477 + d6180fe
commit 161100f
Show file tree

Hide file tree

Showing 359 changed files with 12,063 additions and 8,822 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -814,18 +814,11 @@ jobs:
               yarn test:e2e:chrome --retries 2 --debug
             fi
           no_output_timeout: 20m
-      - run:
-          name: Merge JUnit report
-          command: |
-            if [ "$(ls -A test/test-results/e2e)" ]; then
-              yarn test:e2e:report
-            fi
-          when: always
       - store_artifacts:
           path: test-artifacts
           destination: test-artifacts
       - store_test_results:
-          path: test/test-results/e2e.xml
+          path: test/test-results/e2e
 
   test-e2e-chrome-mv3:
     executor: node-browsers
@@ -848,7 +841,7 @@ jobs:
           command: |
             if .circleci/scripts/test-run-e2e.sh
             then
-              yarn test:e2e:chrome --retries 2 --debug --mv3 || echo "Temporarily suppressing MV3 e2e test failures"
+              yarn test:e2e:chrome --retries 2 --debug || echo "Temporarily suppressing MV3 e2e test failures"
             fi
           no_output_timeout: 20m
       - store_artifacts:
@@ -879,18 +872,11 @@ jobs:
               yarn test:e2e:chrome:rpc --retries 2
             fi
           no_output_timeout: 20m
-      - run:
-          name: Merge JUnit report
-          command: |
-            if [ "$(ls -A test/test-results/e2e)" ]; then
-              yarn test:e2e:report
-            fi
-          when: always
       - store_artifacts:
           path: test-artifacts
           destination: test-artifacts
       - store_test_results:
-          path: test/test-results/e2e.xml
+          path: test/test-results/e2e
 
   test-e2e-chrome-rpc-mmi:
     executor: node-browsers
@@ -915,18 +901,11 @@ jobs:
               yarn test:e2e:chrome:rpc --retries 2 --debug --build-type=mmi
             fi
           no_output_timeout: 20m
-      - run:
-          name: Merge JUnit report
-          command: |
-            if [ "$(ls -A test/test-results/e2e)" ]; then
-              yarn test:e2e:report
-            fi
-          when: always
       - store_artifacts:
           path: test-artifacts
           destination: test-artifacts
       - store_test_results:
-          path: test/test-results/e2e.xml
+          path: test/test-results/e2e
 
   test-e2e-firefox-snaps:
     executor: node-browsers
@@ -952,18 +931,11 @@ jobs:
               yarn test:e2e:firefox:snaps --retries 2 --debug --build-type=main
             fi
           no_output_timeout: 20m
-      - run:
-          name: Merge JUnit report
-          command: |
-            if [ "$(ls -A test/test-results/e2e)" ]; then
-              yarn test:e2e:report
-            fi
-          when: always
       - store_artifacts:
           path: test-artifacts
           destination: test-artifacts
       - store_test_results:
-          path: test/test-results/e2e.xml
+          path: test/test-results/e2e
 
   test-e2e-chrome-snaps:
     executor: node-browsers
@@ -989,18 +961,11 @@ jobs:
               yarn test:e2e:chrome:snaps --retries 2 --debug --build-type=main
             fi
           no_output_timeout: 20m
-      - run:
-          name: Merge JUnit report
-          command: |
-            if [ "$(ls -A test/test-results/e2e)" ]; then
-              yarn test:e2e:report
-            fi
-          when: always
       - store_artifacts:
           path: test-artifacts
           destination: test-artifacts
       - store_test_results:
-          path: test/test-results/e2e.xml
+          path: test/test-results/e2e
 
   test-e2e-firefox-snaps-flask:
     executor: node-browsers
@@ -1026,18 +991,11 @@ jobs:
               yarn test:e2e:firefox:snaps --retries 2 --debug --build-type=flask
             fi
           no_output_timeout: 20m
-      - run:
-          name: Merge JUnit report
-          command: |
-            if [ "$(ls -A test/test-results/e2e)" ]; then
-              yarn test:e2e:report
-            fi
-          when: always
       - store_artifacts:
           path: test-artifacts
           destination: test-artifacts
       - store_test_results:
-          path: test/test-results/e2e.xml
+          path: test/test-results/e2e
 
   test-e2e-chrome-snaps-flask:
     executor: node-browsers
@@ -1063,18 +1021,11 @@ jobs:
               yarn test:e2e:chrome:snaps --retries 2 --debug --build-type=flask
             fi
           no_output_timeout: 20m
-      - run:
-          name: Merge JUnit report
-          command: |
-            if [ "$(ls -A test/test-results/e2e)" ]; then
-              yarn test:e2e:report
-            fi
-          when: always
       - store_artifacts:
           path: test-artifacts
           destination: test-artifacts
       - store_test_results:
-          path: test/test-results/e2e.xml
+          path: test/test-results/e2e
 
   test-e2e-chrome-mmi:
     executor: node-browsers
@@ -1100,18 +1051,11 @@ jobs:
               yarn test:e2e:chrome:mmi --retries 2 --debug --build-type=mmi
             fi
           no_output_timeout: 20m
-      - run:
-          name: Merge JUnit report
-          command: |
-            if [ "$(ls -A test/test-results/e2e)" ]; then
-              yarn test:e2e:report
-            fi
-          when: always
       - store_artifacts:
           path: test-artifacts
           destination: test-artifacts
       - store_test_results:
-          path: test/test-results/e2e.xml
+          path: test/test-results/e2e
 
   test-e2e-firefox:
     executor: node-browsers-medium-plus
@@ -1137,18 +1081,11 @@ jobs:
               yarn test:e2e:firefox --retries 2 --debug
             fi
           no_output_timeout: 20m
-      - run:
-          name: Merge JUnit report
-          command: |
-            if [ "$(ls -A test/test-results/e2e)" ]; then
-              yarn test:e2e:report
-            fi
-          when: always
       - store_artifacts:
           path: test-artifacts
           destination: test-artifacts
       - store_test_results:
-          path: test/test-results/e2e.xml
+          path: test/test-results/e2e
 
   benchmark:
     executor: node-browsers-medium-plus

diff --git a/.depcheckrc.yml b/.depcheckrc.yml
@@ -32,6 +32,7 @@ ignores:
   - 'geckodriver'
   - 'jest'
   - 'lavamoat-viz'
+  - 'mocha-junit-reporter'
   - 'prettier-plugin-sort-json' # automatically imported by prettier
   - 'source-map-explorer'
   - 'playwright'

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -9,7 +9,6 @@
 
 *                                    @MetaMask/extension-devs
 **/snaps/**                          @MetaMask/snaps-devs
-**/flask/**                          @MetaMask/extension-devs @MetaMask/snaps-devs
 development/                         @MetaMask/extension-devs @kumavis
 lavamoat/                            @MetaMask/extension-devs @MetaMask/supply-chain @MetaMask/snaps-devs
 

diff --git a/.github/ISSUE_TEMPLATE/general-issue.yml b/.github/ISSUE_TEMPLATE/general-issue.yml
@@ -13,7 +13,7 @@ body:
     id: description
     attributes:
       label: What is this about?
-      placeholder: Describe the issue here.
+      placeholder: As a user, describe the issue here.
     validations:
       required: true
 

diff --git a/.storybook/initial-states/approval-screens/token-approval.js b/.storybook/initial-states/approval-screens/token-approval.js
@@ -2,7 +2,6 @@ export const currentNetworkTxListSample = {
   "id": 7900715443136469,
   "time": 1621395091737,
   "status": "unapproved",
-  "metamaskNetworkId": "1337",
   "chainId": "0x539",
   "loadingDefaults": false,
   "txParams": {
@@ -20,7 +19,6 @@ export const currentNetworkTxListSample = {
       "id": 7900715443136469,
       "time": 1621395091737,
       "status": "unapproved",
-      "metamaskNetworkId": "1337",
       "chainId": "0x539",
       "loadingDefaults": true,
       "txParams": {
@@ -53,4 +51,4 @@ export const subjectMetadata = {
     "iconUrl": "https://metamask.github.io/test-dapp/metamask-fox.svg",
     "subjectType": "website"
   }
-}
+}
diff --git a/.storybook/initial-states/transactions.js b/.storybook/initial-states/transactions.js
@@ -24,7 +24,6 @@ export const MOCK_TRANSACTION_BY_TYPE = {
     id: 643368596521636,
     time: 1653527035634,
     status: 'submitted',
-    metamaskNetworkId: '5',
     originalGasEstimate: '5208',
     userEditedGasLimit: false,
     chainId: '0x5',
@@ -50,7 +49,6 @@ export const MOCK_TRANSACTION_BY_TYPE = {
         id: 643368596521636,
         time: 1653527035634,
         status: 'approved',
-        metamaskNetworkId: '5',
         originalGasEstimate: '5208',
         userEditedGasLimit: false,
         chainId: '0x5',
@@ -158,7 +156,6 @@ export const MOCK_TRANSACTION_BY_TYPE = {
     },
     id: 7694052085150913,
     loadingDefaults: true,
-    metamaskNetworkId: '5',
     origin: 'https://remix.ethereum.org',
     originalGasEstimate: '0x118f4',
     sendFlowHistory: [],
@@ -181,7 +178,7 @@ export const MOCK_TRANSACTION_BY_TYPE = {
   [MOCK_TX_TYPE.DEPLOY_CONTRACT]: {
     blockNumber: '6195527',
     id: 4243712234858468,
-    metamaskNetworkId: '5',
+    chainId: '0x5',
     status: 'confirmed',
     time: 1585088013000,
     txParams: {
@@ -238,7 +235,7 @@ export const MOCK_TRANSACTION_BY_TYPE = {
   [MOCK_TX_TYPE.INCOMING]: {
     blockNumber: '6477257',
     id: 4243712234858505,
-    metamaskNetworkId: '5',
+    chainId: '0x5',
     status: 'confirmed',
     time: 1589314295000,
     txParams: {
@@ -292,7 +289,7 @@ export const MOCK_TRANSACTION_BY_TYPE = {
     id: 3938342322880462,
     time: 1653459456297,
     status: 'failed',
-    metamaskNetworkId: '5',
+    chainId: '0x5',
     originalGasEstimate: '14609',
     userEditedGasLimit: false,
     chainId: '0x5',
@@ -322,7 +319,6 @@ export const MOCK_TRANSACTION_BY_TYPE = {
         id: 3938342322880462,
         time: 1653459456297,
         status: 'approved',
-        metamaskNetworkId: '5',
         originalGasEstimate: '14609',
         userEditedGasLimit: false,
         chainId: '0x5',
@@ -481,7 +477,7 @@ export const MOCK_TRANSACTION_BY_TYPE = {
     id: 4243712234858512,
     time: 1589314601567,
     status: 'confirmed',
-    metamaskNetworkId: '5',
+    chainId: '0x5',
     loadingDefaults: false,
     txParams: {
       from: '0xabca64466f257793eaa52fcfff5066894b76a149',
@@ -497,7 +493,7 @@ export const MOCK_TRANSACTION_BY_TYPE = {
   [MOCK_TX_TYPE.SMART]: {
     blockNumber: '6195527',
     id: 4243712234858468,
-    metamaskNetworkId: '5',
+    chainId: '0x5',
     status: 'confirmed',
     time: 1585088013000,
     txParams: {
@@ -517,7 +513,7 @@ export const MOCK_TRANSACTION_BY_TYPE = {
   [MOCK_TX_TYPE.SWAP]: {
     blockNumber: '6195527',
     id: 4243712234858467,
-    metamaskNetworkId: '5',
+    chainId: '0x5',
     status: 'confirmed',
     time: 1585088013000,
     txParams: {
@@ -536,7 +532,7 @@ export const MOCK_TRANSACTION_BY_TYPE = {
   [MOCK_TX_TYPE.SWAP_APPROVAL]: {
     blockNumber: '6195527',
     id: 4243712234858467,
-    metamaskNetworkId: '5',
+    chainId: '0x5',
     status: 'confirmed',
     time: 1585088013000,
     txParams: {
@@ -556,7 +552,6 @@ export const MOCK_TRANSACTION_BY_TYPE = {
     id: 5177046356058729,
     time: 1653457101080,
     status: 'submitted',
-    metamaskNetworkId: '5',
     originalGasEstimate: '0xb427',
     userEditedGasLimit: false,
     chainId: '0x5',
@@ -584,7 +579,7 @@ export const MOCK_TRANSACTION_BY_TYPE = {
         id: 5177046356058729,
         time: 1653457101080,
         status: 'unapproved',
-        metamaskNetworkId: '5',
+        chainId: '0x5',
         originalGasEstimate: '0xb427',
         userEditedGasLimit: false,
         chainId: '0x5',
@@ -760,7 +755,7 @@ export const MOCK_TRANSACTION_BY_TYPE = {
     id: 1441203963845330,
     time: 1652206763566,
     status: 'confirmed',
-    metamaskNetworkId: '5',
+    chainId: '0x5',
     originalGasEstimate: '0x118e0',
     userEditedGasLimit: false,
     chainId: '0x5',
@@ -861,7 +856,7 @@ export const MOCK_TRANSACTION_BY_TYPE = {
     id: 5177046356058725,
     time: 1653457077370,
     status: 'confirmed',
-    metamaskNetworkId: '5',
+    chainId: '0x5',
     originalGasEstimate: '0xea60',
     userEditedGasLimit: false,
     chainId: '0x5',
@@ -889,7 +884,7 @@ export const MOCK_TRANSACTION_BY_TYPE = {
         id: 5177046356058725,
         time: 1653457077370,
         status: 'unapproved',
-        metamaskNetworkId: '5',
+        chainId: '0x5',
         originalGasEstimate: '0xea60',
         userEditedGasLimit: false,
         chainId: '0x5',
@@ -1215,7 +1210,7 @@ export const MOCK_TRANSACTION_BY_TYPE = {
     id: 5177046356058754,
     time: 1653457323504,
     status: 'confirmed',
-    metamaskNetworkId: '5',
+    chainId: '0x5',
     originalGasEstimate: '0x10896',
     userEditedGasLimit: false,
     chainId: '0x5',
@@ -1265,7 +1260,7 @@ export const MOCK_TRANSACTION_BY_TYPE = {
         id: 5177046356058754,
         time: 1653457323504,
         status: 'unapproved',
-        metamaskNetworkId: '5',
+        chainId: '0x5',
         originalGasEstimate: '0x10896',
         userEditedGasLimit: false,
         chainId: '0x5',