Merge branch 'develop' of github.com:MetaMask/metamask-extension into…

… jb-privacy-mode
MetaMask · Oct 29, 2024 · 475a2d8 · 475a2d8
2 parents 72198f0 + 1fd9510
commit 475a2d8
Show file tree

Hide file tree

Showing 67 changed files with 2,504 additions and 778 deletions.
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -117,7 +117,8 @@ npmAuditIgnoreAdvisories:
   # Currently in use for the network list drag and drop functionality.
   # Maintenance has stopped and the project will be archived in 2025.
   - 'react-beautiful-dnd (deprecation)'
-
+  # New package name format for new versions: @ethereumjs/wallet.
+  - 'ethereumjs-wallet (deprecation)'
 npmRegistries:
   'https://npm.pkg.github.com':
     npmAlwaysAuth: true

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
@@ -156,7 +156,6 @@ import {
   NotificationServicesPushController,
   NotificationServicesController,
 } from '@metamask/notification-services-controller';
-import { isProduction } from '../../shared/modules/environment';
 import { methodsRequiringNetworkSwitch } from '../../shared/constants/methods-tags';
 
 ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
@@ -1559,7 +1558,7 @@ export default class MetamaskController extends EventEmitter {
         },
       },
       env: {
-        isAccountSyncingEnabled: !isProduction() && isManifestV3,
+        isAccountSyncingEnabled: isManifestV3,
       },
       messenger: this.controllerMessenger.getRestricted({
         name: 'UserStorageController',

diff --git a/package.json b/package.json
@@ -288,7 +288,7 @@
     "@metamask/approval-controller": "^7.0.0",
     "@metamask/assets-controllers": "patch:@metamask/assets-controllers@npm%3A38.3.0#~/.yarn/patches/@metamask-assets-controllers-npm-38.3.0-57b3d695bb.patch",
     "@metamask/base-controller": "^7.0.0",
-    "@metamask/bitcoin-wallet-snap": "^0.8.1",
+    "@metamask/bitcoin-wallet-snap": "^0.8.2",
     "@metamask/browser-passworder": "^4.3.0",
     "@metamask/contract-metadata": "^2.5.0",
     "@metamask/controller-utils": "^11.2.0",

diff --git a/test/data/bridge/mock-quotes-erc20-erc20.json b/test/data/bridge/mock-quotes-erc20-erc20.json
@@ -0,0 +1,248 @@
+[
+  {
+    "quote": {
+      "requestId": "90ae8e69-f03a-4cf6-bab7-ed4e3431eb37",
+      "srcChainId": 10,
+      "srcAsset": {
+        "chainId": 10,
+        "address": "0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85",
+        "symbol": "USDC",
+        "name": "USD Coin",
+        "decimals": 6,
+        "icon": "https://media.socket.tech/tokens/all/USDC",
+        "logoURI": "https://media.socket.tech/tokens/all/USDC",
+        "chainAgnosticId": null
+      },
+      "srcTokenAmount": "14000000",
+      "destChainId": 137,
+      "destAsset": {
+        "chainId": 137,
+        "address": "0x3c499c542cef5e3811e1192ce70d8cc03d5c3359",
+        "symbol": "USDC",
+        "name": "Native USD Coin (POS)",
+        "decimals": 6,
+        "icon": "https://media.socket.tech/tokens/all/USDC",
+        "logoURI": "https://media.socket.tech/tokens/all/USDC",
+        "chainAgnosticId": "USDC"
+      },
+      "destTokenAmount": "13984280",
+      "feeData": {
+        "metabridge": {
+          "amount": "0",
+          "asset": {
+            "chainId": 10,
+            "address": "0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85",
+            "symbol": "USDC",
+            "name": "USD Coin",
+            "decimals": 6,
+            "icon": "https://media.socket.tech/tokens/all/USDC",
+            "logoURI": "https://media.socket.tech/tokens/all/USDC",
+            "chainAgnosticId": null
+          }
+        }
+      },
+      "bridgeId": "socket",
+      "bridges": ["across"],
+      "steps": [
+        {
+          "action": "bridge",
+          "srcChainId": 10,
+          "destChainId": 137,
+          "protocol": {
+            "name": "across",
+            "displayName": "Across",
+            "icon": "https://miro.medium.com/max/800/1*PN_F5yW4VMBgs_xX-fsyzQ.png"
+          },
+          "srcAsset": {
+            "chainId": 10,
+            "address": "0x0b2c639c533813f4aa9d7837caf62653d097ff85",
+            "symbol": "USDC",
+            "name": "USD Coin",
+            "decimals": 6,
+            "icon": "https://assets.polygon.technology/tokenAssets/usdc.svg",
+            "logoURI": "https://assets.polygon.technology/tokenAssets/usdc.svg",
+            "chainAgnosticId": null
+          },
+          "destAsset": {
+            "chainId": 137,
+            "address": "0x3c499c542cef5e3811e1192ce70d8cc03d5c3359",
+            "symbol": "USDC",
+            "name": "Native USD Coin (POS)",
+            "decimals": 6,
+            "icon": "https://assets.polygon.technology/tokenAssets/usdc.svg",
+            "logoURI": "https://assets.polygon.technology/tokenAssets/usdc.svg",
+            "chainAgnosticId": "USDC"
+          },
+          "srcAmount": "14000000",
+          "destAmount": "13984280"
+        }
+      ],
+      "refuel": {
+        "action": "refuel",
+        "srcChainId": 10,
+        "destChainId": 137,
+        "protocol": {
+          "name": "refuel",
+          "displayName": "Refuel",
+          "icon": ""
+        },
+        "srcAsset": {
+          "chainId": 10,
+          "address": "0x0000000000000000000000000000000000000000",
+          "symbol": "ETH",
+          "name": "Ether",
+          "decimals": 18
+        },
+        "destAsset": {
+          "chainId": 137,
+          "address": "0x0000000000000000000000000000000000000000",
+          "symbol": "MATIC",
+          "name": "Matic",
+          "decimals": 18
+        },
+        "srcAmount": "1000000000000000",
+        "destAmount": "4405865573929566208"
+      }
+    },
+    "approval": {
+      "chainId": 10,
+      "to": "0x0b2c639c533813f4aa9d7837caf62653d097ff85",
+      "from": "0x141d32a89a1e0a5ef360034a2f60a4b917c18838",
+      "value": "0x00",
+      "data": "0x095ea7b3000000000000000000000000b90357f2b86dbfd59c3502215d4060f71df8ca0e0000000000000000000000000000000000000000000000000000000000d59f80",
+      "gasLimit": 61865
+    },
+    "trade": {
+      "chainId": 10,
+      "to": "0xB90357f2b86dbfD59c3502215d4060f71DF8ca0e",
+      "from": "0x141d32a89a1e0a5ef360034a2f60a4b917c18838",
+      "value": "0x038d7ea4c68000",
+      "data": "0x3ce33bff00000000000000000000000000000000000000000000000000000000000000800000000000000000000000000b2c639c533813f4aa9d7837caf62653d097ff850000000000000000000000000000000000000000000000000000000000d59f8000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000f736f636b6574416461707465725632000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005e00000000000000000000000003a23f943181408eac424116af7b7790c94cb97a50000000000000000000000003a23f943181408eac424116af7b7790c94cb97a500000000000000000000000000000000000000000000000000000000000000890000000000000000000000000b2c639c533813f4aa9d7837caf62653d097ff850000000000000000000000003c499c542cef5e3811e1192ce70d8cc03d5c33590000000000000000000000000000000000000000000000000000000000d59f8000000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000716a8b9dd056055c84b7a2ba0a016099465a518700000000000000000000000000000000000000000000000000000000000004a0c3540448000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000019d0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000084ad69fa4f00000000000000000000000000000000000000000000000000038d7ea4c68000000000000000000000000000141d32a89a1e0a5ef360034a2f60a4b917c1883800000000000000000000000000000000000000000000000000000000000000890000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000284792ebcb90000000000000000000000000000000000000000000000000000000000d59f80000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000454000000000000000000000000000000000000000000000000000000000000000c40000000000000000000000000000000000000000000000000000000000000002000000000000000000000000141d32a89a1e0a5ef360034a2f60a4b917c18838000000000000000000000000141d32a89a1e0a5ef360034a2f60a4b917c1883800000000000000000000000000000000000000000000000000000000000000020000000000000000000000000b2c639c533813f4aa9d7837caf62653d097ff850000000000000000000000003c499c542cef5e3811e1192ce70d8cc03d5c335900000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000d55a40000000000000000000000000000000000000000000000000000000000000008900000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000067041c47000000000000000000000000000000000000000000000000000000006704704d00000000000000000000000000000000000000000000000000000000d00dfeeddeadbeef765753be7f7a64d5509974b0d678e1e3149b02f42c7402906f9888136205038026f20b3f6df2899044cab41d632bc7a6c35debd40516df85de6f194aeb05b72cb9ea4d5ce0f7c56c91a79536331112f1a846dc641c",
+      "gasLimit": 287227
+    },
+    "estimatedProcessingTimeInSeconds": 60
+  },
+  {
+    "quote": {
+      "requestId": "0b6caac9-456d-47e6-8982-1945ae81ae82",
+      "srcChainId": 10,
+      "srcAsset": {
+        "chainId": 10,
+        "address": "0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85",
+        "symbol": "USDC",
+        "name": "USD Coin",
+        "decimals": 6,
+        "icon": "https://media.socket.tech/tokens/all/USDC",
+        "logoURI": "https://media.socket.tech/tokens/all/USDC",
+        "chainAgnosticId": null
+      },
+      "srcTokenAmount": "14000000",
+      "destChainId": 137,
+      "destAsset": {
+        "chainId": 137,
+        "address": "0x3c499c542cef5e3811e1192ce70d8cc03d5c3359",
+        "symbol": "USDC",
+        "name": "Native USD Coin (POS)",
+        "decimals": 6,
+        "icon": "https://media.socket.tech/tokens/all/USDC",
+        "logoURI": "https://media.socket.tech/tokens/all/USDC",
+        "chainAgnosticId": "USDC"
+      },
+      "destTokenAmount": "13800000",
+      "feeData": {
+        "metabridge": {
+          "amount": "0",
+          "asset": {
+            "chainId": 10,
+            "address": "0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85",
+            "symbol": "USDC",
+            "name": "USD Coin",
+            "decimals": 6,
+            "icon": "https://media.socket.tech/tokens/all/USDC",
+            "logoURI": "https://media.socket.tech/tokens/all/USDC",
+            "chainAgnosticId": null
+          }
+        }
+      },
+      "bridgeId": "socket",
+      "bridges": ["celercircle"],
+      "steps": [
+        {
+          "action": "bridge",
+          "srcChainId": 10,
+          "destChainId": 137,
+          "protocol": {
+            "name": "cctp",
+            "displayName": "Circle CCTP",
+            "icon": "https://movricons.s3.ap-south-1.amazonaws.com/CCTP.svg"
+          },
+          "srcAsset": {
+            "chainId": 10,
+            "address": "0x0b2c639c533813f4aa9d7837caf62653d097ff85",
+            "symbol": "USDC",
+            "name": "USD Coin",
+            "decimals": 6,
+            "icon": "https://assets.polygon.technology/tokenAssets/usdc.svg",
+            "logoURI": "https://assets.polygon.technology/tokenAssets/usdc.svg",
+            "chainAgnosticId": null
+          },
+          "destAsset": {
+            "chainId": 137,
+            "address": "0x3c499c542cef5e3811e1192ce70d8cc03d5c3359",
+            "symbol": "USDC",
+            "name": "Native USD Coin (POS)",
+            "decimals": 6,
+            "icon": "https://assets.polygon.technology/tokenAssets/usdc.svg",
+            "logoURI": "https://assets.polygon.technology/tokenAssets/usdc.svg",
+            "chainAgnosticId": "USDC"
+          },
+          "srcAmount": "14000000",
+          "destAmount": "13800000"
+        }
+      ],
+      "refuel": {
+        "action": "refuel",
+        "srcChainId": 10,
+        "destChainId": 137,
+        "protocol": {
+          "name": "refuel",
+          "displayName": "Refuel",
+          "icon": ""
+        },
+        "srcAsset": {
+          "chainId": 10,
+          "address": "0x0000000000000000000000000000000000000000",
+          "symbol": "ETH",
+          "name": "Ether",
+          "decimals": 18
+        },
+        "destAsset": {
+          "chainId": 137,
+          "address": "0x0000000000000000000000000000000000000000",
+          "symbol": "MATIC",
+          "name": "Matic",
+          "decimals": 18
+        },
+        "srcAmount": "1000000000000000",
+        "destAmount": "4405865573929566208"
+      }
+    },
+    "approval": {
+      "chainId": 10,
+      "to": "0x0b2c639c533813f4aa9d7837caf62653d097ff85",
+      "from": "0x141d32a89a1e0a5ef360034a2f60a4b917c18838",
+      "value": "0x00",
+      "data": "0x095ea7b3000000000000000000000000b90357f2b86dbfd59c3502215d4060f71df8ca0e0000000000000000000000000000000000000000000000000000000000d59f80",
+      "gasLimit": 61865
+    },
+    "trade": {
+      "chainId": 10,
+      "to": "0xB90357f2b86dbfD59c3502215d4060f71DF8ca0e",
+      "from": "0x141d32a89a1e0a5ef360034a2f60a4b917c18838",
+      "value": "0x038d7ea4c68000",
+      "data": "0x3ce33bff00000000000000000000000000000000000000000000000000000000000000800000000000000000000000000b2c639c533813f4aa9d7837caf62653d097ff850000000000000000000000000000000000000000000000000000000000d59f8000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000f736f636b6574416461707465725632000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004400000000000000000000000003a23f943181408eac424116af7b7790c94cb97a50000000000000000000000003a23f943181408eac424116af7b7790c94cb97a500000000000000000000000000000000000000000000000000000000000000890000000000000000000000000b2c639c533813f4aa9d7837caf62653d097ff850000000000000000000000003c499c542cef5e3811e1192ce70d8cc03d5c33590000000000000000000000000000000000000000000000000000000000d59f8000000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000716a8b9dd056055c84b7a2ba0a016099465a518700000000000000000000000000000000000000000000000000000000000002e4c3540448000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000018c0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000084ad69fa4f00000000000000000000000000000000000000000000000000038d7ea4c68000000000000000000000000000141d32a89a1e0a5ef360034a2f60a4b917c18838000000000000000000000000000000000000000000000000000000000000008900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e4b7dfe9d00000000000000000000000000000000000000000000000000000000000d59f8000000000000000000000000000000000000000000000000000000000000000c4000000000000000000000000141d32a89a1e0a5ef360034a2f60a4b917c188380000000000000000000000000b2c639c533813f4aa9d7837caf62653d097ff85000000000000000000000000000000000000000000000000000000000000008900000000000000000000000000000000000000000000000000000000000000070000000000000000000000000000000000000000000000000000000000030d400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000138bc5930d51a475e4669db259f69e61ca33803675e76540f062a76af8cbaef4672c9926e56d6a8c29a263de3ee8f734ad760461c448f82fdccdd8c2360fffba1b",
+      "gasLimit": 343079
+    },
+    "estimatedProcessingTimeInSeconds": 1560
+  }
+]