Merge branch 'main' into refresh-network-when-connection-is-reset

MetaMask · Apr 20, 2023 · c88d819 · c88d819
2 parents b6205ae + 7d5057b
commit c88d819
Show file tree

Hide file tree

Showing 7 changed files with 500 additions and 9 deletions.
diff --git a/packages/controller-utils/src/constants.ts b/packages/controller-utils/src/constants.ts
@@ -1,4 +1,9 @@
-import { NetworkType, NetworksTicker, NetworksChainId } from './types';
+import {
+  NetworkType,
+  NetworksTicker,
+  NetworksChainId,
+  NetworkId,
+} from './types';
 
 export const RPC = 'rpc';
 export const FALL_BACK_VS_CURRENCY = 'ETH';
@@ -110,3 +115,12 @@ export enum ApprovalType {
   Unlock = 'unlock',
   ConnectAccounts = 'connect_accounts',
 }
+
+export const NETWORK_ID_TO_ETHERS_NETWORK_NAME_MAP: Record<
+  NetworkId,
+  NetworkType
+> = {
+  [NetworkId.goerli]: NetworkType.goerli,
+  [NetworkId.sepolia]: NetworkType.sepolia,
+  [NetworkId.mainnet]: NetworkType.mainnet,
+};
diff --git a/packages/controller-utils/src/types.ts b/packages/controller-utils/src/types.ts
@@ -27,6 +27,12 @@ export enum NetworksChainId {
   rpc = '',
 }
 
+export enum NetworkId {
+  mainnet = '1',
+  goerli = '5',
+  sepolia = '11155111',
+}
+
 export enum NetworksTicker {
   mainnet = 'ETH',
   goerli = 'GoerliETH',

diff --git a/packages/ens-controller/package.json b/packages/ens-controller/package.json
@@ -29,8 +29,12 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
+    "@ethersproject/providers": "^5.7.0",
     "@metamask/base-controller": "workspace:^",
-    "@metamask/controller-utils": "workspace:^"
+    "@metamask/controller-utils": "workspace:^",
+    "@metamask/utils": "^5.0.1",
+    "ethereum-ens-network-map": "^1.0.2",
+    "punycode": "^2.1.1"
   },
   "devDependencies": {
     "@metamask/auto-changelog": "^3.1.0",