diff --git a/.depcheckrc.yml b/.depcheckrc.yml
index 7ce26732fcf7..bafacc56c918 100644
--- a/.depcheckrc.yml
+++ b/.depcheckrc.yml
@@ -28,6 +28,7 @@ ignores:
   - '@sentry/cli' # invoked as `sentry-cli`
   - 'chromedriver'
   - 'depcheck' # ooo meta
+  - 'ethers' # ethers @5.7.0 expected by @account-abstraction/contracts, but conflicts with transitive ethers@6.x
   - 'ganache-cli'
   - 'geckodriver'
   - 'jest'
diff --git a/app/_locales/am/messages.json b/app/_locales/am/messages.json
index cb193bc11c36..f2efb2511d06 100644
--- a/app/_locales/am/messages.json
+++ b/app/_locales/am/messages.json
@@ -220,9 +220,6 @@
   "editContact": {
     "message": "ዕውቂያን አርትዕ"
   },
-  "ensRegistrationError": {
-    "message": "በ ENS የስም ምዝገባ ላይ የተፈጠረ ስህተት"
-  },
   "enterPasswordContinue": {
     "message": "ለመቀጠል የይለፍ ቃል ያስገቡ"
   },
@@ -345,9 +342,6 @@
   "invalidAddressRecipient": {
     "message": "የተቀባይ አድራሻ ትክክል አይደለም"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "ETH አውታረ መረብ አይደለም፣ ወደ ትናንሽ ፊደላት ቀይር"
-  },
   "invalidBlockExplorerURL": {
     "message": "ልክ ያልሆነ Block Explorer ዩአርኤል"
   },
@@ -444,9 +438,6 @@
   "next": {
     "message": "ቀጣይ"
   },
-  "noAddressForName": {
-    "message": "በዚህ ስም የተሞላ አድራሻ የለም።"
-  },
   "noConversionRateAvailable": {
     "message": "ምንም የልወጣ ተመን አይገኝም"
   },
@@ -530,9 +521,6 @@
   "readdToken": {
     "message": "በመለያ አማራጮችዎ ምናሌ ውስጥ ወደ “ተለዋጭ ስም አክል” በመግባት ለወደፊቱ ይህን ተለዋጭ ስም መልሰው ማከል ይችላሉ።"
   },
-  "recipientAddressPlaceholder": {
-    "message": "ፍለጋ፣ ለሕዝብ ክፍት የሆነ አድራሻ (0x), ወይም ENS"
-  },
   "reject": {
     "message": "አይቀበሉ"
   },
diff --git a/app/_locales/ar/messages.json b/app/_locales/ar/messages.json
index e262cebf3537..e9a099be976c 100644
--- a/app/_locales/ar/messages.json
+++ b/app/_locales/ar/messages.json
@@ -233,9 +233,6 @@
   "editContact": {
     "message": "تعديل جهة الاتصال"
   },
-  "ensRegistrationError": {
-    "message": "خطأ في تسجيل اسم ENS"
-  },
   "enterPasswordContinue": {
     "message": "أدخل كلمة المرور للمتابعة"
   },
@@ -354,9 +351,6 @@
   "invalidAddressRecipient": {
     "message": "عنوان المستلم غير صحيح"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "لا تجعلها شبكة ETH، قم بتعيين الأحرف صغيرة"
-  },
   "invalidBlockExplorerURL": {
     "message": "غير صحيح Block Explorer رابط"
   },
@@ -456,9 +450,6 @@
   "next": {
     "message": "التالي"
   },
-  "noAddressForName": {
-    "message": "لم يتم تعيين عنوان لهذا الاسم."
-  },
   "noConversionRateAvailable": {
     "message": "لا يوجد معدل تحويل متاح"
   },
@@ -542,9 +533,6 @@
   "readdToken": {
     "message": "يمكنك إضافة هذه العملة الرمزية مرة أخرى في المستقبل من خلال الانتقال إلى \"إضافة عملة رمزية\" في قائمة خيارات الحسابات الخاصة بك."
   },
-  "recipientAddressPlaceholder": {
-    "message": "البحث، العنوان العام (0x)، أو ENS"
-  },
   "reject": {
     "message": "رفض"
   },
diff --git a/app/_locales/bg/messages.json b/app/_locales/bg/messages.json
index 2169f13ecf9d..8a21fc86c7f4 100644
--- a/app/_locales/bg/messages.json
+++ b/app/_locales/bg/messages.json
@@ -229,9 +229,6 @@
   "editContact": {
     "message": "Редактиране на контакт"
   },
-  "ensRegistrationError": {
-    "message": "Грешка при регистрацията на име на ENS"
-  },
   "enterPasswordContinue": {
     "message": "Въведете парола, за да продължите"
   },
@@ -350,9 +347,6 @@
   "invalidAddressRecipient": {
     "message": "Адресът на получателя е невалиден"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "Не е ETH мрежа, задаване на малки букви"
-  },
   "invalidBlockExplorerURL": {
     "message": "Невалиден Block Explorer URL адрес"
   },
@@ -455,9 +449,6 @@
   "next": {
     "message": "Напред"
   },
-  "noAddressForName": {
-    "message": "За това име не е зададен адрес."
-  },
   "noConversionRateAvailable": {
     "message": "Няма наличен процент на преобръщане"
   },
@@ -541,9 +532,6 @@
   "readdToken": {
     "message": "Можете да добавите този жетон в бъдеще, като отидете на „Добавяне на жетон“ в менюто с опции на акаунти."
   },
-  "recipientAddressPlaceholder": {
-    "message": "Търсене, публичен адрес (0x) или ENS"
-  },
   "reject": {
     "message": "Отхвърляне"
   },
diff --git a/app/_locales/bn/messages.json b/app/_locales/bn/messages.json
index 29e06173be17..593ab8dd158b 100644
--- a/app/_locales/bn/messages.json
+++ b/app/_locales/bn/messages.json
@@ -226,9 +226,6 @@
   "editContact": {
     "message": "পরিচিতি সম্পাদনা করুন"
   },
-  "ensRegistrationError": {
-    "message": "ENS নাম নিবন্ধীকরণে ত্রুটি হয়েছে"
-  },
   "enterPasswordContinue": {
     "message": "অবিরত রাখতে পাসওয়ার্ড লিখুন"
   },
@@ -351,9 +348,6 @@
   "invalidAddressRecipient": {
     "message": "প্রাপকের ঠিকানা অবৈধ"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "ETH নেটওয়ার্ক নয়, ছোটো হরফে সেট করা হয়েছে"
-  },
   "invalidBlockExplorerURL": {
     "message": "অবৈধ Block Explorer URL"
   },
@@ -453,9 +447,6 @@
   "next": {
     "message": "পরবর্তী"
   },
-  "noAddressForName": {
-    "message": "এই নামের জন্য কোনো ঠিকানা সেট করা হয় নি।"
-  },
   "noConversionRateAvailable": {
     "message": "কোনো বিনিময় হার উপলভ্য নয়"
   },
@@ -539,9 +530,6 @@
   "readdToken": {
     "message": "আপনি আপনার অ্যাকাউন্টস বিকল্পের মেনুতে \"টোকেনগুলি যোগ করুন\" এ গিয়ে ভবিষ্যতে আবার এই টোকেনটি যোগ করতে পারবেন। "
   },
-  "recipientAddressPlaceholder": {
-    "message": "অনুসন্ধান, সার্বজনীন ঠিকানা (0x), বা ENS"
-  },
   "reject": {
     "message": "প্রত্যাখ্যান"
   },
diff --git a/app/_locales/ca/messages.json b/app/_locales/ca/messages.json
index 4393ea21f108..61f2c5e32481 100644
--- a/app/_locales/ca/messages.json
+++ b/app/_locales/ca/messages.json
@@ -226,9 +226,6 @@
   "editContact": {
     "message": "Editar Contacte"
   },
-  "ensRegistrationError": {
-    "message": "Error al registre de nom ENS"
-  },
   "enterPasswordContinue": {
     "message": "Introdueix la contrasenya per continuar"
   },
@@ -341,9 +338,6 @@
   "invalidAddressRecipient": {
     "message": "L'adreça del recipient no és vàlida"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "No hi ha xarxa ETH, posar en minúscules"
-  },
   "invalidBlockExplorerURL": {
     "message": "URL de Block Explorer"
   },
@@ -443,9 +437,6 @@
   "next": {
     "message": "Següent"
   },
-  "noAddressForName": {
-    "message": "No existeix cap adreça amb aquest nom."
-  },
   "noConversionRateAvailable": {
     "message": "No hi ha cap tarifa de conversió disponible"
   },
@@ -526,9 +517,6 @@
   "readdToken": {
     "message": "Pots tornar a afegir aquesta fitxa en el futur anant a \"Afegir fitxa\" al menu d'opcions dels teus comptes."
   },
-  "recipientAddressPlaceholder": {
-    "message": "Cerca, adreça pública (0x), o ENS"
-  },
   "reject": {
     "message": "Rebutja"
   },
diff --git a/app/_locales/cs/messages.json b/app/_locales/cs/messages.json
index f67d21b5cb52..96b9a3291ea3 100644
--- a/app/_locales/cs/messages.json
+++ b/app/_locales/cs/messages.json
@@ -220,9 +220,6 @@
   "next": {
     "message": "Další"
   },
-  "noAddressForName": {
-    "message": "Pro toto jméno nebyla nastavena žádná adresa."
-  },
   "noTransactions": {
     "message": "Žádné transakce"
   },
diff --git a/app/_locales/da/messages.json b/app/_locales/da/messages.json
index f5d7c9c89c3e..26aa63a60257 100644
--- a/app/_locales/da/messages.json
+++ b/app/_locales/da/messages.json
@@ -229,9 +229,6 @@
   "editContact": {
     "message": "Redigér Kontakt"
   },
-  "ensRegistrationError": {
-    "message": "Fejl i ENS-navneregistrering"
-  },
   "enterPasswordContinue": {
     "message": "Indtast adgangskode for at fortsætte"
   },
@@ -347,9 +344,6 @@
   "invalidAddressRecipient": {
     "message": "Modtageradressen er ugyldig"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "Ikke ETH-netværk, sat til små bogstaver"
-  },
   "invalidBlockExplorerURL": {
     "message": "Ugyldig Block Explorer-webadresse"
   },
@@ -443,9 +437,6 @@
   "next": {
     "message": "Næste"
   },
-  "noAddressForName": {
-    "message": "Ingen adresse indstillet for dette navn."
-  },
   "noConversionRateAvailable": {
     "message": "Ingen tilgængelig omregningskurs"
   },
@@ -526,9 +517,6 @@
   "readdToken": {
     "message": "Du kan tilføje denne token i fremtiden, ved at gå til \"Tilføj token\" under dine valgmenuen for dine konti."
   },
-  "recipientAddressPlaceholder": {
-    "message": "Søg, offentlig adresse (0x) eller ENS"
-  },
   "reject": {
     "message": "Afvis"
   },
diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index 5178ae6630a8..ff0773178691 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -1597,9 +1597,6 @@
   "domain": {
     "message": "Domain"
   },
-  "domainNotSupportedOnNetwork": {
-    "message": "Netzwerk unterstützt kein Domain-Lookup"
-  },
   "done": {
     "message": "Fertig"
   },
@@ -1773,12 +1770,6 @@
   "ensDomainsSettingTitle": {
     "message": "ENS-Domains in der Adresszeile anzeigen"
   },
-  "ensIllegalCharacter": {
-    "message": "Unzulässiges Zeichen für ENS."
-  },
-  "ensRegistrationError": {
-    "message": "Fehler bei der ENS-Namensregistrierung"
-  },
   "ensUnknownError": {
     "message": "ENS-Lookup fehlgeschlagen."
   },
@@ -2422,9 +2413,6 @@
   "invalidAddressRecipient": {
     "message": "Empfängeradresse ist unzulässig"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "Kein ETH-Netzwerk, auf Kleinschreibung gesetzt"
-  },
   "invalidAssetType": {
     "message": "Dieses Asset ist ein NFT und muss auf der Seite „NFTs importieren“ unter dem Tab NFTs erneut hinzugefügt werden."
   },
@@ -3152,9 +3140,6 @@
   "noAccountsFound": {
     "message": "Keine Konten für die angegebene Suchanfrage gefunden"
   },
-  "noAddressForName": {
-    "message": "Für den angegebene Namen wurde keine Adresse eingegeben."
-  },
   "noConnectedAccountDescription": {
     "message": "Wählen Sie ein Konto, das Sie auf dieser Website verwenden möchten, um fortzufahren."
   },
@@ -4166,12 +4151,6 @@
   "receive": {
     "message": "Empfangen"
   },
-  "recipientAddressPlaceholder": {
-    "message": "Öffentliche Adresse (0x) oder ENS-Name eingeben"
-  },
-  "recipientAddressPlaceholderFlask": {
-    "message": "Öffentliche Adresse (0x) oder Domainname eingeben"
-  },
   "recommendedGasLabel": {
     "message": "Empfohlen"
   },
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
index 897763ec56b3..3a191b6e9579 100644
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@@ -1597,9 +1597,6 @@
   "domain": {
     "message": "Τομέας"
   },
-  "domainNotSupportedOnNetwork": {
-    "message": "Το δίκτυο δεν υποστηρίζει αναζήτηση τομέα"
-  },
   "done": {
     "message": "Τέλος"
   },
@@ -1773,12 +1770,6 @@
   "ensDomainsSettingTitle": {
     "message": "Εμφάνιση τομέων ENS στη γραμμή διευθύνσεων"
   },
-  "ensIllegalCharacter": {
-    "message": "Μη έγκυρος χαρακτήρας για το ENS."
-  },
-  "ensRegistrationError": {
-    "message": "Σφάλμα στην καταχώριση ονόματος ENS"
-  },
   "ensUnknownError": {
     "message": "Η αναζήτηση ENS απέτυχε."
   },
@@ -2422,9 +2413,6 @@
   "invalidAddressRecipient": {
     "message": "Η διεύθυνση παραλήπτη δεν είναι έγκυρη"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "Δεν είναι δίκτυο ETH, ορίστε με πεζά γράμματα"
-  },
   "invalidAssetType": {
     "message": "Αυτό το περιουσιακό στοιχείο είναι NFT και πρέπει να προστεθεί ξανά στη σελίδα «Εισαγωγή NFT» που βρίσκεται στην καρτέλα των NFT"
   },
@@ -3152,9 +3140,6 @@
   "noAccountsFound": {
     "message": "Δεν βρέθηκαν λογαριασμοί για το συγκεκριμένο αίτημα αναζήτησης"
   },
-  "noAddressForName": {
-    "message": "Δεν έχει οριστεί διεύθυνση για αυτό το όνομα."
-  },
   "noConnectedAccountDescription": {
     "message": "Επιλέξτε έναν λογαριασμό που θέλετε να χρησιμοποιήσετε σε αυτόν τον ιστότοπο για να συνεχίσετε."
   },
@@ -4166,12 +4151,6 @@
   "receive": {
     "message": "Λήψη"
   },
-  "recipientAddressPlaceholder": {
-    "message": "Εισάγετε τη δημόσια διεύθυνση (0x) ή το όνομα ENS"
-  },
-  "recipientAddressPlaceholderFlask": {
-    "message": "Εισαγάγετε τη δημόσια διεύθυνση (0x) ή το όνομα τομέα"
-  },
   "recommendedGasLabel": {
     "message": "Προτεινόμενο"
   },
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index b512383c874e..5aee8cd393aa 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -1657,9 +1657,6 @@
   "domain": {
     "message": "Domain"
   },
-  "domainNotSupportedOnNetwork": {
-    "message": "Network does not support domain lookup"
-  },
   "done": {
     "message": "Done"
   },
@@ -1848,12 +1845,6 @@
   "ensDomainsSettingTitle": {
     "message": "Show ENS domains in address bar"
   },
-  "ensIllegalCharacter": {
-    "message": "Illegal character for ENS."
-  },
-  "ensRegistrationError": {
-    "message": "Error in ENS name registration"
-  },
   "ensUnknownError": {
     "message": "ENS lookup failed."
   },
@@ -2518,9 +2509,6 @@
   "invalidAddressRecipient": {
     "message": "Recipient address is invalid"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "Not ETH network, set to lowercase"
-  },
   "invalidAssetType": {
     "message": "This asset is an NFT and needs to be re-added on the Import NFTs page found under the NFTs tab"
   },
@@ -3265,9 +3253,6 @@
   "noAccountsFound": {
     "message": "No accounts found for the given search query"
   },
-  "noAddressForName": {
-    "message": "No address has been set for this name."
-  },
   "noConnectedAccountDescription": {
     "message": "Select an account you want to use on this site to continue."
   },
@@ -4290,10 +4275,7 @@
   "receiveCrypto": {
     "message": "Receive crypto"
   },
-  "recipientAddressPlaceholder": {
-    "message": "Enter public address (0x) or ENS name"
-  },
-  "recipientAddressPlaceholderFlask": {
+  "recipientAddressPlaceholderNew": {
     "message": "Enter public address (0x) or domain name"
   },
   "recommendedGasLabel": {
diff --git a/app/_locales/en_GB/messages.json b/app/_locales/en_GB/messages.json
index 78474d81a9f8..e67b9f0e4fcb 100644
--- a/app/_locales/en_GB/messages.json
+++ b/app/_locales/en_GB/messages.json
@@ -1612,9 +1612,6 @@
   "domain": {
     "message": "Domain"
   },
-  "domainNotSupportedOnNetwork": {
-    "message": "Network does not support domain lookup"
-  },
   "done": {
     "message": "Done"
   },
@@ -1800,12 +1797,6 @@
   "ensDomainsSettingTitle": {
     "message": "Show ENS domains in address bar"
   },
-  "ensIllegalCharacter": {
-    "message": "Illegal character for ENS."
-  },
-  "ensRegistrationError": {
-    "message": "Error in ENS name registration"
-  },
   "ensUnknownError": {
     "message": "ENS lookup failed."
   },
@@ -2455,9 +2446,6 @@
   "invalidAddressRecipient": {
     "message": "Recipient address is invalid"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "Not ETH network, set to lowercase"
-  },
   "invalidAssetType": {
     "message": "This asset is an NFT and needs to be re-added on the Import NFTs page found under the NFTs tab"
   },
@@ -3181,9 +3169,6 @@
   "noAccountsFound": {
     "message": "No accounts found for the given search query"
   },
-  "noAddressForName": {
-    "message": "No address has been set for this name."
-  },
   "noConnectedAccountDescription": {
     "message": "Select an account you want to use on this site to continue."
   },
@@ -4199,9 +4184,6 @@
     "message": "Receive"
   },
   "recipientAddressPlaceholder": {
-    "message": "Enter public address (0x) or ENS name"
-  },
-  "recipientAddressPlaceholderFlask": {
     "message": "Enter public address (0x) or domain name"
   },
   "recommendedGasLabel": {
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index e9ec77cb3de6..88524f86f3cc 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -1594,9 +1594,6 @@
   "domain": {
     "message": "Dominio"
   },
-  "domainNotSupportedOnNetwork": {
-    "message": "La red no admite la búsqueda de dominios"
-  },
   "done": {
     "message": "Hecho"
   },
@@ -1770,12 +1767,6 @@
   "ensDomainsSettingTitle": {
     "message": "Mostrar dominios ENS en la barra de direcciones"
   },
-  "ensIllegalCharacter": {
-    "message": "Caracter ilegal para ENS."
-  },
-  "ensRegistrationError": {
-    "message": "Error en el registro del nombre de ENS"
-  },
   "ensUnknownError": {
     "message": "Error al buscar ENS."
   },
@@ -2419,9 +2410,6 @@
   "invalidAddressRecipient": {
     "message": "La dirección del destinatario no es válida"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "No es una red ETH; configurar en minúsculas"
-  },
   "invalidAssetType": {
     "message": "Este activo es un NFT y debe volver a añadirse en la página de Importar NFTs que se encuentra en la pestaña de NFTs"
   },
@@ -3149,9 +3137,6 @@
   "noAccountsFound": {
     "message": "No se encuentran cuentas para la consulta de búsqueda determinada"
   },
-  "noAddressForName": {
-    "message": "No se estableció ninguna dirección para este nombre."
-  },
   "noConnectedAccountDescription": {
     "message": "Seleccione una cuenta que desee utilizar en este sitio para continuar."
   },
@@ -4163,12 +4148,6 @@
   "receive": {
     "message": "Recibir"
   },
-  "recipientAddressPlaceholder": {
-    "message": "Ingrese la dirección pública (0x) o el nombre de ENS"
-  },
-  "recipientAddressPlaceholderFlask": {
-    "message": "Ingrese la dirección pública (0x) o el nombre de dominio"
-  },
   "recommendedGasLabel": {
     "message": "Recomendado"
   },
diff --git a/app/_locales/es_419/messages.json b/app/_locales/es_419/messages.json
index c406955c36c9..1dd375450a81 100644
--- a/app/_locales/es_419/messages.json
+++ b/app/_locales/es_419/messages.json
@@ -705,12 +705,6 @@
     "message": "El punto de conexión devolvió un id. de cadena diferente: $1",
     "description": "$1 is the return value of eth_chainId from an RPC endpoint"
   },
-  "ensIllegalCharacter": {
-    "message": "Caracter ilegal para ENS."
-  },
-  "ensRegistrationError": {
-    "message": "Error en el registro del nombre de ENS"
-  },
   "ensUnknownError": {
     "message": "Error al buscar ENS."
   },
@@ -1020,9 +1014,6 @@
   "invalidAddressRecipient": {
     "message": "La dirección del destinatario no es válida"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "No es una red ETH; configurar en minúsculas"
-  },
   "invalidBlockExplorerURL": {
     "message": "Dirección URL del explorador de bloques no válida"
   },
@@ -1339,9 +1330,6 @@
   "noAccountsFound": {
     "message": "No se encuentran cuentas para la consulta de búsqueda determinada"
   },
-  "noAddressForName": {
-    "message": "No se estableció ninguna dirección para este nombre."
-  },
   "noConversionDateAvailable": {
     "message": "No hay fecha de conversión de moneda disponible"
   },
@@ -1562,9 +1550,6 @@
   "receive": {
     "message": "Recibir"
   },
-  "recipientAddressPlaceholder": {
-    "message": "Búsqueda, dirección pública (0x) o ENS"
-  },
   "recommendedGasLabel": {
     "message": "Recomendado"
   },
diff --git a/app/_locales/et/messages.json b/app/_locales/et/messages.json
index dbfe1f88fb55..1e9bdffeb20e 100644
--- a/app/_locales/et/messages.json
+++ b/app/_locales/et/messages.json
@@ -229,9 +229,6 @@
   "editContact": {
     "message": "Muuda kontakti"
   },
-  "ensRegistrationError": {
-    "message": "Tõrge ENS-i nime registreerimisel"
-  },
   "enterPasswordContinue": {
     "message": "Jätkamiseks sisestage parool"
   },
@@ -350,9 +347,6 @@
   "invalidAddressRecipient": {
     "message": "Saaja aadress on vale"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "Kehtetu ETH-võrk, kasutage väiketähti"
-  },
   "invalidBlockExplorerURL": {
     "message": "Vale Block Explorer URL"
   },
@@ -449,9 +443,6 @@
   "next": {
     "message": "Edasi"
   },
-  "noAddressForName": {
-    "message": "Sellele nimele pole registreeritud ühtegi aadressi."
-  },
   "noConversionRateAvailable": {
     "message": "Ühtegi vahetuskurssi pole saadaval"
   },
@@ -535,9 +526,6 @@
   "readdToken": {
     "message": "Saate selle loa tulevikus tagasi lisada, kui lähete oma kontovalikute menüüs vahelehele „Lisa luba“."
   },
-  "recipientAddressPlaceholder": {
-    "message": "Otsing, avalik aadress (0x) või ENS"
-  },
   "reject": {
     "message": "Lükka tagasi"
   },
diff --git a/app/_locales/fa/messages.json b/app/_locales/fa/messages.json
index 9f1d89793c1b..8fe574e7a81a 100644
--- a/app/_locales/fa/messages.json
+++ b/app/_locales/fa/messages.json
@@ -229,9 +229,6 @@
   "editContact": {
     "message": "ویرایش تماس"
   },
-  "ensRegistrationError": {
-    "message": "خطا در ثبت نام ENS"
-  },
   "enterPasswordContinue": {
     "message": "برای ادامه رمز عبور را وارد کنید"
   },
@@ -354,9 +351,6 @@
   "invalidAddressRecipient": {
     "message": "آدرس دریافت کننده نامعتبر است"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "شبکه ETH نه، به حروف کوچک تنظیم کنید"
-  },
   "invalidBlockExplorerURL": {
     "message": "Block Explorer URL نا معتبر"
   },
@@ -459,9 +453,6 @@
   "next": {
     "message": "بعدی"
   },
-  "noAddressForName": {
-    "message": "هیچ آدرسی برای این نام تنظیم نشده است."
-  },
   "noConversionRateAvailable": {
     "message": "هیچ نرخ تغییر موجود نمیباشد"
   },
@@ -545,9 +536,6 @@
   "readdToken": {
     "message": "شما میتوانید این رمزیاب را دوباره برای آینده با رفتن به گزینه \"Add token\" در مینوی تنظیمات حساب ها، اضافه نمایید."
   },
-  "recipientAddressPlaceholder": {
-    "message": "جستجو، آدرس عمومی (0x)، یا ENS"
-  },
   "reject": {
     "message": "عدم پذیرش"
   },
diff --git a/app/_locales/fi/messages.json b/app/_locales/fi/messages.json
index 4f193797912c..b69440707992 100644
--- a/app/_locales/fi/messages.json
+++ b/app/_locales/fi/messages.json
@@ -229,9 +229,6 @@
   "editContact": {
     "message": "Muokkaa yhteystietoa"
   },
-  "ensRegistrationError": {
-    "message": "Virhe ENS-nimen rekisteröinnissä"
-  },
   "enterPasswordContinue": {
     "message": "Syötä salasana voidaksesi jatkaa"
   },
@@ -354,9 +351,6 @@
   "invalidAddressRecipient": {
     "message": "Vastaanottajan osoite on virheellinen"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "Ei ole ETH-verkosto; vaihda pieniin kirjaimiin"
-  },
   "invalidBlockExplorerURL": {
     "message": "Virheellinen Block Explorer URL-osoite"
   },
@@ -459,9 +453,6 @@
   "next": {
     "message": "Seuraava"
   },
-  "noAddressForName": {
-    "message": "Tälle nimelle ei ole määritetty osoitetta."
-  },
   "noConversionRateAvailable": {
     "message": "Vaihtokurssi ei saatavilla"
   },
@@ -542,9 +533,6 @@
   "readdToken": {
     "message": "Voit lisätä tämän tietueen myöhemmin takaisin siirtymällä tilisi vaihtoehtovalikon kohtaan ”Lisää tietue”."
   },
-  "recipientAddressPlaceholder": {
-    "message": "Haku, julkinen osoite (0x) tai ENS"
-  },
   "reject": {
     "message": "Hylkää"
   },
diff --git a/app/_locales/fil/messages.json b/app/_locales/fil/messages.json
index ab098442e52e..a437fb1e7100 100644
--- a/app/_locales/fil/messages.json
+++ b/app/_locales/fil/messages.json
@@ -205,9 +205,6 @@
   "editContact": {
     "message": "I-edit ang Contact"
   },
-  "ensRegistrationError": {
-    "message": "May error sa pagrerehistro ng ENS name"
-  },
   "enterPasswordContinue": {
     "message": "Ilagay ang password para magpatuloy"
   },
@@ -311,9 +308,6 @@
   "invalidAddressRecipient": {
     "message": "Hindi valid ang address ng recipient"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "Hindi ito isang ETH network, i-set sa lowercase"
-  },
   "invalidBlockExplorerURL": {
     "message": "Hindi valid ang Block Explorer URL"
   },
@@ -393,9 +387,6 @@
   "next": {
     "message": "Susunod"
   },
-  "noAddressForName": {
-    "message": "Walang address na na-set para sa pangalang ito."
-  },
   "noConversionRateAvailable": {
     "message": "Walang Presyo ng Palitan na Available"
   },
@@ -469,9 +460,6 @@
   "readdToken": {
     "message": "Puwede mong idagdag ulit ang token na ito sa hinaharap sa pamamagitan ng pagpunta sa “Magdagdag ng token” sa menu ng mga opsyon ng iyong mga accounts."
   },
-  "recipientAddressPlaceholder": {
-    "message": "Maghanap, pampublikong address (0x), o ENS"
-  },
   "reject": {
     "message": "Tanggihan"
   },
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index db411ae0996b..f376101c5b2d 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -1597,9 +1597,6 @@
   "domain": {
     "message": "Domaine"
   },
-  "domainNotSupportedOnNetwork": {
-    "message": "Le réseau ne prend pas en charge la recherche de noms de domaine"
-  },
   "done": {
     "message": "Terminé"
   },
@@ -1773,12 +1770,6 @@
   "ensDomainsSettingTitle": {
     "message": "Afficher les domaines ENS dans la barre d’adresse"
   },
-  "ensIllegalCharacter": {
-    "message": "Caractère invalide pour l’ENS."
-  },
-  "ensRegistrationError": {
-    "message": "Erreur dans l’enregistrement du nom ENS"
-  },
   "ensUnknownError": {
     "message": "La recherche d’ENS a échoué."
   },
@@ -2422,9 +2413,6 @@
   "invalidAddressRecipient": {
     "message": "L’adresse du destinataire n’est pas valide"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "Pas de réseau ETH, régler en minuscules"
-  },
   "invalidAssetType": {
     "message": "Cet actif est un NFT et doit être ajouté de nouveau à la page Importer des NFT qui se trouve sous l’onglet NFT"
   },
@@ -3152,9 +3140,6 @@
   "noAccountsFound": {
     "message": "Aucun compte trouvé pour la demande de recherche effectuée"
   },
-  "noAddressForName": {
-    "message": "Aucune adresse n’a été définie pour ce nom."
-  },
   "noConnectedAccountDescription": {
     "message": "Sélectionnez un compte que vous souhaitez utiliser sur ce site pour continuer."
   },
@@ -4166,12 +4151,6 @@
   "receive": {
     "message": "Recevoir"
   },
-  "recipientAddressPlaceholder": {
-    "message": "Saisissez l’adresse publique (0x) ou le nom de domaine ENS"
-  },
-  "recipientAddressPlaceholderFlask": {
-    "message": "Saisissez l’adresse publique (0x) ou le nom de domaine"
-  },
   "recommendedGasLabel": {
     "message": "Recommandé"
   },
diff --git a/app/_locales/he/messages.json b/app/_locales/he/messages.json
index e29f44c9f834..b255bd0310c4 100644
--- a/app/_locales/he/messages.json
+++ b/app/_locales/he/messages.json
@@ -229,9 +229,6 @@
   "editContact": {
     "message": "ערוך איש קשר"
   },
-  "ensRegistrationError": {
-    "message": "שגיאה ברישום שם ENS"
-  },
   "enterPasswordContinue": {
     "message": "יש להזין ססמה כדי להמשיך"
   },
@@ -354,9 +351,6 @@
   "invalidAddressRecipient": {
     "message": "כתובת הנמען אינה חוקית"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "לא רשת ETH, מוגדר במצב אותיות קטנות"
-  },
   "invalidBlockExplorerURL": {
     "message": "כתובת URL לא חוקית של Block Explorer"
   },
@@ -456,9 +450,6 @@
   "next": {
     "message": "הבא"
   },
-  "noAddressForName": {
-    "message": "לא הוגדרה כתובת עבור שם זה."
-  },
   "noConversionRateAvailable": {
     "message": "אין שער המרה זמין"
   },
@@ -542,9 +533,6 @@
   "readdToken": {
     "message": "באפשרותך להוסיף טוקן זה בחזרה בעתיד על ידי מעבר אל \"הוסף טוקן\" בתפריט אפשרויות החשבונות שלך."
   },
-  "recipientAddressPlaceholder": {
-    "message": "חיפוש, כתובת ציבורית (0x), או ENS"
-  },
   "reject": {
     "message": "דחה"
   },
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
index 460f47a33735..cff9295abc33 100644
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@@ -1597,9 +1597,6 @@
   "domain": {
     "message": "डोमेन"
   },
-  "domainNotSupportedOnNetwork": {
-    "message": "नेटवर्क, डोमेन लुकअप का सपोर्ट नहीं करता"
-  },
   "done": {
     "message": "हो गया"
   },
@@ -1773,12 +1770,6 @@
   "ensDomainsSettingTitle": {
     "message": "एड्रेस बार में ENS डोमेन दिखाएँ"
   },
-  "ensIllegalCharacter": {
-    "message": "ENS के लिए गैर-कानूनी कैरेक्टर।"
-  },
-  "ensRegistrationError": {
-    "message": "ENS नाम रजिस्ट्रेशन में गड़बड़ी"
-  },
   "ensUnknownError": {
     "message": "ENS लुकअप नहीं हो पाया।"
   },
@@ -2422,9 +2413,6 @@
   "invalidAddressRecipient": {
     "message": "प्राप्तकर्ता का एड्रेस ग़लत है"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "ETH नेटवर्क नहीं, लोअरकेस में सेट करें"
-  },
   "invalidAssetType": {
     "message": "ये एसेट एक NFT है और इसे इंपोर्ट NFTज़ पेज पर फिर से जोड़ना होगा जो NFTज़ टैब के नीचे मिलेगा"
   },
@@ -3152,9 +3140,6 @@
   "noAccountsFound": {
     "message": "दी गई खोज क्वेरी के लिए कोई अकाउंट नहीं मिला"
   },
-  "noAddressForName": {
-    "message": "इस नाम के लिए कोई एड्रेस नहीं सेट किया गया है।"
-  },
   "noConnectedAccountDescription": {
     "message": "जारी रखने के लिए जिस अकाउंट को आप इस साइट पर उपयोग करना चाहते हैं वह अकाउंट चुनें।"
   },
@@ -4166,12 +4151,6 @@
   "receive": {
     "message": "प्राप्त करें"
   },
-  "recipientAddressPlaceholder": {
-    "message": "सार्वजनिक एड्रेस (0x) या ENS नाम डालें"
-  },
-  "recipientAddressPlaceholderFlask": {
-    "message": "पब्लिक एड्रेस (0x) या डोमेन नाम एंटर करें"
-  },
   "recommendedGasLabel": {
     "message": "अनुशंसित"
   },
diff --git a/app/_locales/hn/messages.json b/app/_locales/hn/messages.json
index 03c87498c87f..246c9c88d5bc 100644
--- a/app/_locales/hn/messages.json
+++ b/app/_locales/hn/messages.json
@@ -203,9 +203,6 @@
   "next": {
     "message": "अगला"
   },
-  "noAddressForName": {
-    "message": "इस नाम के लिए कोई पता सेट नहीं किया गया है।"
-  },
   "noTransactions": {
     "message": "कोई लेन-देन नहीं"
   },
diff --git a/app/_locales/hr/messages.json b/app/_locales/hr/messages.json
index d7e62da80ba4..b8e1c9bf15c1 100644
--- a/app/_locales/hr/messages.json
+++ b/app/_locales/hr/messages.json
@@ -229,9 +229,6 @@
   "editContact": {
     "message": "Uredi kontakt"
   },
-  "ensRegistrationError": {
-    "message": "Greška u registraciji naziva ENS"
-  },
   "enterPasswordContinue": {
     "message": "Upišite lozinku za nastavak"
   },
@@ -350,9 +347,6 @@
   "invalidAddressRecipient": {
     "message": "Adresa primatelja nije valjana"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "Ne mreža ETH, postavite na mala slova"
-  },
   "invalidBlockExplorerURL": {
     "message": "Nevaljani URL Block Explorer-a"
   },
@@ -452,9 +446,6 @@
   "next": {
     "message": "Sljedeće"
   },
-  "noAddressForName": {
-    "message": "Nijedna adresa nije postavljena za ovaj naziv."
-  },
   "noConversionRateAvailable": {
     "message": "Nijedan konverzijski tečaj nije dostupan"
   },
@@ -538,9 +529,6 @@
   "readdToken": {
     "message": "Ovaj token možete dodati kasnije odlaskom pod stavku „Dodaj token” u izborniku mogućnosti računa. "
   },
-  "recipientAddressPlaceholder": {
-    "message": "Pretraži, javne adrese (0x) ili ENS"
-  },
   "reject": {
     "message": "Odbaci"
   },
diff --git a/app/_locales/ht/messages.json b/app/_locales/ht/messages.json
index 02f06746a58a..879eeab1722d 100644
--- a/app/_locales/ht/messages.json
+++ b/app/_locales/ht/messages.json
@@ -317,9 +317,6 @@
   "next": {
     "message": "Aprè sa"
   },
-  "noAddressForName": {
-    "message": "Pa gen adrès ki etabli pou non sa a."
-  },
   "noConversionRateAvailable": {
     "message": "Pa gen okenn Konvèsyon Disponib"
   },
diff --git a/app/_locales/hu/messages.json b/app/_locales/hu/messages.json
index 456b63710dd6..eef301ef9273 100644
--- a/app/_locales/hu/messages.json
+++ b/app/_locales/hu/messages.json
@@ -229,9 +229,6 @@
   "editContact": {
     "message": "Kapcsolatok szerkesztése"
   },
-  "ensRegistrationError": {
-    "message": "Hiba történt az ENS név regisztrációjakor"
-  },
   "enterPasswordContinue": {
     "message": "A folytatáshoz adja meg a jelszót"
   },
@@ -350,9 +347,6 @@
   "invalidAddressRecipient": {
     "message": "A címzett címe érvénytelen "
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "Nem ETH hálózat, állítsa kisbetűre"
-  },
   "invalidBlockExplorerURL": {
     "message": "Helytelen Block Explorer URL"
   },
@@ -452,9 +446,6 @@
   "next": {
     "message": "Következő"
   },
-  "noAddressForName": {
-    "message": "Nem lett cím beállítva ehhez a névhez."
-  },
   "noConversionRateAvailable": {
     "message": "Nincs elérhető átváltási díj"
   },
@@ -538,9 +529,6 @@
   "readdToken": {
     "message": "Ezt a tokent a jövőben is hozzáadhatja, ha a fiókbeállítások menü „Token hozzáadása” elemére lép."
   },
-  "recipientAddressPlaceholder": {
-    "message": "Keresés, nyilvános cím (0x) vagy ENS"
-  },
   "reject": {
     "message": "Elutasítás"
   },
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
index 6e6bf520481b..8e2437d8c2bf 100644
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@@ -1597,9 +1597,6 @@
   "domain": {
     "message": "Domain"
   },
-  "domainNotSupportedOnNetwork": {
-    "message": "Jaringan tidak mendukung pencarian domain"
-  },
   "done": {
     "message": "Selesai"
   },
@@ -1773,12 +1770,6 @@
   "ensDomainsSettingTitle": {
     "message": "Tampilkan domain ENS di bilah alamat"
   },
-  "ensIllegalCharacter": {
-    "message": "Karakter tidak sah untuk ENS."
-  },
-  "ensRegistrationError": {
-    "message": "Terjadi kesalahan pada pendaftaran nama ENS"
-  },
   "ensUnknownError": {
     "message": "Pencarian ENS gagal."
   },
@@ -2422,9 +2413,6 @@
   "invalidAddressRecipient": {
     "message": "Alamat penerima tidak valid"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "Bukan jaringan ETH, atur ke huruf kecil"
-  },
   "invalidAssetType": {
     "message": "Aset ini merupakan NFT dan harus ditambahkan kembali di halaman Impor NFT yang ada di bawah tab NFT"
   },
@@ -3152,9 +3140,6 @@
   "noAccountsFound": {
     "message": "Tidak ditemukan akun untuk kueri pencarian yang diberikan"
   },
-  "noAddressForName": {
-    "message": "Alamat untuk nama ini belum diatur."
-  },
   "noConnectedAccountDescription": {
     "message": "Pilih akun yang ingin Anda gunakan di situs ini untuk melanjutkan."
   },
@@ -4166,12 +4151,6 @@
   "receive": {
     "message": "Terima"
   },
-  "recipientAddressPlaceholder": {
-    "message": "Masukkan alamat publik (0x) atau nama ENS"
-  },
-  "recipientAddressPlaceholderFlask": {
-    "message": "Masukkan alamat publik (0x) atau nama domain"
-  },
   "recommendedGasLabel": {
     "message": "Direkomendasikan"
   },
diff --git a/app/_locales/it/messages.json b/app/_locales/it/messages.json
index 9f9085f4ed81..2cd696e5b5ba 100644
--- a/app/_locales/it/messages.json
+++ b/app/_locales/it/messages.json
@@ -774,9 +774,6 @@
     "message": "L'endpoint ha restituito un chain ID diverso: $1",
     "description": "$1 is the return value of eth_chainId from an RPC endpoint"
   },
-  "ensRegistrationError": {
-    "message": "Errore nella registrazione del nome ENS"
-  },
   "enterMaxSpendLimit": {
     "message": "Inserisici Limite Spesa"
   },
@@ -955,9 +952,6 @@
   "invalidAddressRecipient": {
     "message": "Indirizzo destinatario invalido"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "Rete non ETH, inserisci caratteri minuscoli"
-  },
   "invalidBlockExplorerURL": {
     "message": "URI Block Explorer invalido"
   },
@@ -1120,9 +1114,6 @@
   "noAccountsFound": {
     "message": "Nessun account trovato per la ricerca effettuata"
   },
-  "noAddressForName": {
-    "message": "Nessun indirizzo è stato impostato per questo nome."
-  },
   "noConversionRateAvailable": {
     "message": "Tasso di conversione non disponibile"
   },
@@ -1236,9 +1227,6 @@
   "receive": {
     "message": "Ricevi"
   },
-  "recipientAddressPlaceholder": {
-    "message": "Ricerca, indirizzo pubblico (0x) o ENS"
-  },
   "reject": {
     "message": "Annulla"
   },
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index 6fd157c2e8b2..e1ca82a04a42 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -1597,9 +1597,6 @@
   "domain": {
     "message": "ドメイン"
   },
-  "domainNotSupportedOnNetwork": {
-    "message": "ネットワークがドメイン検索をサポートしていません"
-  },
   "done": {
     "message": "完了"
   },
@@ -1773,12 +1770,6 @@
   "ensDomainsSettingTitle": {
     "message": "アドレスバーにENSドメインを表示する"
   },
-  "ensIllegalCharacter": {
-    "message": "ENSにサポートされていない文字が使用されています。"
-  },
-  "ensRegistrationError": {
-    "message": "ENS名の登録エラー"
-  },
   "ensUnknownError": {
     "message": "ENSの検索に失敗しました。"
   },
@@ -2422,9 +2413,6 @@
   "invalidAddressRecipient": {
     "message": "送金先アドレスが無効です"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "ETHネットワークではありません。小文字にしてください。"
-  },
   "invalidAssetType": {
     "message": "このアセットはNFTであるため、「NFT」タブの「NFTのインポート」ページで追加しなおす必要があります"
   },
@@ -3152,9 +3140,6 @@
   "noAccountsFound": {
     "message": "指定された検索クエリでアカウントが見つかりませんでした"
   },
-  "noAddressForName": {
-    "message": "この名前にアドレスが設定されていません。"
-  },
   "noConnectedAccountDescription": {
     "message": "続行するには、このサイトで使用するアカウントを選択してください。"
   },
@@ -4166,12 +4151,6 @@
   "receive": {
     "message": "受取"
   },
-  "recipientAddressPlaceholder": {
-    "message": "パブリックアドレス (0x) またはENS名を入力してください"
-  },
-  "recipientAddressPlaceholderFlask": {
-    "message": "パブリックアドレス (0x) またはドメイン名を入力してください"
-  },
   "recommendedGasLabel": {
     "message": "推奨"
   },
diff --git a/app/_locales/kn/messages.json b/app/_locales/kn/messages.json
index 0b0479e3dddf..d5fe970b32e0 100644
--- a/app/_locales/kn/messages.json
+++ b/app/_locales/kn/messages.json
@@ -229,9 +229,6 @@
   "editContact": {
     "message": "ಸಂಪರ್ಕವನ್ನು ಸಂಪಾದಿಸಿ"
   },
-  "ensRegistrationError": {
-    "message": "ENS ಹೆಸರಿನ ನೋಂದಣಿಯಲ್ಲಿ ದೋಷ"
-  },
   "enterPasswordContinue": {
     "message": "ಮುಂದುವರೆಯಲು ಪಾಸ್‌ವರ್ಡ್ ನಮೂದಿಸಿ"
   },
@@ -354,9 +351,6 @@
   "invalidAddressRecipient": {
     "message": "ಸ್ವೀಕೃತಿದಾರರ ವಿಳಾಸವು ಅಮಾನ್ಯವಾಗಿದೆ"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "ETH ನೆಟ್‌ವರ್ಕ್‌ಗಳಿಲ್ಲ, ಸಣ್ಣಕ್ಷರಕ್ಕೆ ಹೊಂದಿಸಲಾಗಿದೆ"
-  },
   "invalidBlockExplorerURL": {
     "message": "ಅಮಾನ್ಯವಾದ Block Explorer URL"
   },
@@ -459,9 +453,6 @@
   "next": {
     "message": "ಮುಂದೆ"
   },
-  "noAddressForName": {
-    "message": "ಈ ಹೆಸರಿಗೆ ಯಾವುದೇ ವಿಳಾಸವನ್ನು ಹೊಂದಿಸಲಾಗಿಲ್ಲ."
-  },
   "noConversionRateAvailable": {
     "message": "ಯಾವುದೇ ಪರಿವರ್ತನೆ ದರ ಲಭ್ಯವಿಲ್ಲ"
   },
@@ -545,9 +536,6 @@
   "readdToken": {
     "message": "ನಿಮ್ಮ ಖಾತೆಗಳ ಆಯ್ಕೆಗಳ ಮೆನುವಿನಲ್ಲಿ \"ಟೋಕನ್ ಸೇರಿಸು\" ಗೆ ಹೋಗುವ ಮೂಲಕ ನೀವು ಈ ಟೋಕನ್ ಅನ್ನು ಭವಿಷ್ಯದಲ್ಲಿ ಮರಳಿ ಸೇರಿಸಬಹುದು."
   },
-  "recipientAddressPlaceholder": {
-    "message": "ಸಾರ್ವಜನಿಕ ವಿಳಾಸ (0x) ಅಥವಾ ENS ಹುಡುಕಿ"
-  },
   "reject": {
     "message": "ತಿರಸ್ಕರಿಸಿ"
   },
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index a027815872d8..2c36d6ad2f58 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -1597,9 +1597,6 @@
   "domain": {
     "message": "도메인"
   },
-  "domainNotSupportedOnNetwork": {
-    "message": "네트워크에서 도메인 조회를 지원하지 않음"
-  },
   "done": {
     "message": "완료"
   },
@@ -1773,12 +1770,6 @@
   "ensDomainsSettingTitle": {
     "message": "주소창에 ENS 도메인 표시하기"
   },
-  "ensIllegalCharacter": {
-    "message": "ENS에 맞지 않는 문자입니다."
-  },
-  "ensRegistrationError": {
-    "message": "ENS 이름 등록 중 오류 발생"
-  },
   "ensUnknownError": {
     "message": "ENS를 조회하지 못했습니다."
   },
@@ -2422,9 +2413,6 @@
   "invalidAddressRecipient": {
     "message": "수신 주소가 올바르지 않음"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "ETH 네트워크가 아닙니다. 소문자로 설정하세요."
-  },
   "invalidAssetType": {
     "message": "이 자산은 NFT이므로 NFT 탭에 있는 NFT 가져오기 페이지에서 다시 추가해야 합니다"
   },
@@ -3152,9 +3140,6 @@
   "noAccountsFound": {
     "message": "검색어에 해당하는 계정이 없습니다."
   },
-  "noAddressForName": {
-    "message": "이 이름에 설정된 주소가 없습니다."
-  },
   "noConnectedAccountDescription": {
     "message": "이 사이트에서 계속 사용하고자 하는 계정을 선택하세요."
   },
@@ -4166,12 +4151,6 @@
   "receive": {
     "message": "받기"
   },
-  "recipientAddressPlaceholder": {
-    "message": "공개 주소(0x) 또는 ENS 제목 입력"
-  },
-  "recipientAddressPlaceholderFlask": {
-    "message": "공개 주소(0x) 또는 도메인 이름 입력"
-  },
   "recommendedGasLabel": {
     "message": "권장됨"
   },
diff --git a/app/_locales/lt/messages.json b/app/_locales/lt/messages.json
index 0600ea96f32b..1c0c341f7726 100644
--- a/app/_locales/lt/messages.json
+++ b/app/_locales/lt/messages.json
@@ -229,9 +229,6 @@
   "editContact": {
     "message": "Taisyti kontaktą"
   },
-  "ensRegistrationError": {
-    "message": "ENS pavadinimo registracijos klaida"
-  },
   "enterPasswordContinue": {
     "message": "Norėdami tęsti, įveskite slaptažodį"
   },
@@ -354,9 +351,6 @@
   "invalidAddressRecipient": {
     "message": "Gavėjo adresas netinkamas"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "Ne ETH tinklas, nustatykite į mažąsias raides"
-  },
   "invalidBlockExplorerURL": {
     "message": "Netinkamas Block Explorer URL"
   },
@@ -459,9 +453,6 @@
   "next": {
     "message": "Toliau"
   },
-  "noAddressForName": {
-    "message": "Šiam pavadinimui nenurodytas adresas."
-  },
   "noConversionRateAvailable": {
     "message": "Nėra keitimo kurso"
   },
@@ -545,9 +536,6 @@
   "readdToken": {
     "message": "Šį žetoną galite bet kada galite įtraukti ir vėl, tiesiog savo paskyros parinkčių meniu nueikite  į „Įtraukti žetoną“."
   },
-  "recipientAddressPlaceholder": {
-    "message": "Ieška, viešieji adresai (0x) arba ENS"
-  },
   "reject": {
     "message": "Atmesti"
   },
diff --git a/app/_locales/lv/messages.json b/app/_locales/lv/messages.json
index c0dfc6d573b8..08b28f2c30ca 100644
--- a/app/_locales/lv/messages.json
+++ b/app/_locales/lv/messages.json
@@ -229,9 +229,6 @@
   "editContact": {
     "message": "Rediģēt līgumu"
   },
-  "ensRegistrationError": {
-    "message": "Kļūda ENS vārda reģistrācijā"
-  },
   "enterPasswordContinue": {
     "message": "Ievadiet paroli, lai turpinātu"
   },
@@ -350,9 +347,6 @@
   "invalidAddressRecipient": {
     "message": "Nederīga saņēmēja adrese"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "Nav ETH tīkls, iestatīti mazie burti"
-  },
   "invalidBlockExplorerURL": {
     "message": "Nederīgs Block Explorer URL"
   },
@@ -455,9 +449,6 @@
   "next": {
     "message": "Nākamais"
   },
-  "noAddressForName": {
-    "message": "Šim vārdam nav iestatīta adrese."
-  },
   "noConversionRateAvailable": {
     "message": "Konversijas kurss nav pieejams"
   },
@@ -541,9 +532,6 @@
   "readdToken": {
     "message": "Jūs varat šo marķieri iestatīt atpakaļ nākotnē, konta opciju izvēlnē atverot \"Pievienot marķieri\"."
   },
-  "recipientAddressPlaceholder": {
-    "message": "Meklēšana, publiskā adrese (0x) vai ENS"
-  },
   "reject": {
     "message": "Noraidīt"
   },
diff --git a/app/_locales/ms/messages.json b/app/_locales/ms/messages.json
index b8a0cb2ac507..8bd9278ef2d3 100644
--- a/app/_locales/ms/messages.json
+++ b/app/_locales/ms/messages.json
@@ -226,9 +226,6 @@
   "editContact": {
     "message": "Edit Kenalan"
   },
-  "ensRegistrationError": {
-    "message": "Ralat dalam pendaftaran nama ENS"
-  },
   "enterPasswordContinue": {
     "message": "Masukkan kata laluan untuk teruskan"
   },
@@ -343,9 +340,6 @@
   "invalidAddressRecipient": {
     "message": "Alamat penerima tidak sah"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "Bukan rangkaian ETH, tetapkan kepada huruf kecil"
-  },
   "invalidBlockExplorerURL": {
     "message": "URL Block Explorer tidak sah"
   },
@@ -442,9 +436,6 @@
   "next": {
     "message": "Seterusnya"
   },
-  "noAddressForName": {
-    "message": "Tiada alamat yang ditetapkan untuk nama ini."
-  },
   "noConversionRateAvailable": {
     "message": "Tiada Kadar Penukaran yang Tersedia"
   },
@@ -525,9 +516,6 @@
   "readdToken": {
     "message": "Anda boleh tambah token ini kembali pada masa depan dengan pergi ke \"Tambah token\" di dalam menu pilihan akaun anda."
   },
-  "recipientAddressPlaceholder": {
-    "message": "Cari, alamat awam (0x), atau ENS"
-  },
   "reject": {
     "message": "Tolak"
   },
diff --git a/app/_locales/nl/messages.json b/app/_locales/nl/messages.json
index f3ae82f80616..de0a2fd9f5e2 100644
--- a/app/_locales/nl/messages.json
+++ b/app/_locales/nl/messages.json
@@ -193,9 +193,6 @@
   "next": {
     "message": "volgende"
   },
-  "noAddressForName": {
-    "message": "Er is geen adres ingesteld voor deze naam."
-  },
   "noTransactions": {
     "message": "Geen transacties"
   },
diff --git a/app/_locales/no/messages.json b/app/_locales/no/messages.json
index 56c05ffd958c..7e50d555e852 100644
--- a/app/_locales/no/messages.json
+++ b/app/_locales/no/messages.json
@@ -226,9 +226,6 @@
   "editContact": {
     "message": "Rediger kontakt"
   },
-  "ensRegistrationError": {
-    "message": "Feil i ENS-navneregistrering"
-  },
   "enterPasswordContinue": {
     "message": "Skriv inn passord for å fortsette"
   },
@@ -341,9 +338,6 @@
   "invalidAddressRecipient": {
     "message": "Mottaksadresse er ugyldig "
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "Ikke ETH-nettverk, bruk små bokstaver"
-  },
   "invalidBlockExplorerURL": {
     "message": "Ugyldig Block Explorer URL"
   },
@@ -443,9 +437,6 @@
   "next": {
     "message": "Neste"
   },
-  "noAddressForName": {
-    "message": "Ingen adresse har blitt angitt for dette navnet. "
-  },
   "noConversionRateAvailable": {
     "message": "Ingen konverteringsrate tilgjengelig "
   },
@@ -529,9 +520,6 @@
   "readdToken": {
     "message": "Du kan legge til dette tokenet igjen i fremtiden ved å gå til \"Legg til token\" i menyen for kontoalternativer."
   },
-  "recipientAddressPlaceholder": {
-    "message": "Søk, offentlig adresse (0x) eller ENS"
-  },
   "reject": {
     "message": "Avslå"
   },
diff --git a/app/_locales/ph/messages.json b/app/_locales/ph/messages.json
index debc2d35640a..ecbc7a99ab37 100644
--- a/app/_locales/ph/messages.json
+++ b/app/_locales/ph/messages.json
@@ -445,9 +445,6 @@
     "message": "Nagbalik ang endpoint ng ibang chain ID: $1",
     "description": "$1 is the return value of eth_chainId from an RPC endpoint"
   },
-  "ensRegistrationError": {
-    "message": "Nagka-error sa pag-register ng ENS name"
-  },
   "enterMaxSpendLimit": {
     "message": "Ilagay ang Max na Limitasyon sa Paggastos"
   },
@@ -670,9 +667,6 @@
   "invalidAddressRecipient": {
     "message": "Hindi valid ang address ng tatanggap"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "Hindi ETH network, itakda sa maliliit na letra"
-  },
   "invalidBlockExplorerURL": {
     "message": "Invalid na URL ng Block Explorer"
   },
@@ -879,9 +873,6 @@
   "noAccountsFound": {
     "message": "Walang nakitang account para sa ibinigay na query sa paghahanap"
   },
-  "noAddressForName": {
-    "message": "Walang naitakdang address para sa pangalang ito."
-  },
   "noConversionRateAvailable": {
     "message": "Hindi Available ang Rate ng Conversion"
   },
@@ -1013,9 +1004,6 @@
   "receive": {
     "message": "Tumanggap"
   },
-  "recipientAddressPlaceholder": {
-    "message": "Maghanap, pampublikong address (0x), o ENS"
-  },
   "recoveryPhraseReminderBackupStart": {
     "message": "Magsimula rito"
   },
diff --git a/app/_locales/pl/messages.json b/app/_locales/pl/messages.json
index dbc986a194e4..46b178cdf985 100644
--- a/app/_locales/pl/messages.json
+++ b/app/_locales/pl/messages.json
@@ -229,9 +229,6 @@
   "editContact": {
     "message": "Edytuj kontakt"
   },
-  "ensRegistrationError": {
-    "message": "Błąd w rejestracji nazwy ENS"
-  },
   "enterPasswordContinue": {
     "message": "Podaj hasło żeby kontynuować"
   },
@@ -354,9 +351,6 @@
   "invalidAddressRecipient": {
     "message": "Nieprawidłowy adres odbiorcy"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "To nie jest sieć ETH, zmień na małe litery"
-  },
   "invalidBlockExplorerURL": {
     "message": "Nieprawidłowe Block Explorer URI"
   },
@@ -456,9 +450,6 @@
   "next": {
     "message": "Dalej"
   },
-  "noAddressForName": {
-    "message": "Nie wybrano żadnego adresu dla tej nazwy."
-  },
   "noConversionRateAvailable": {
     "message": "Brak kursu waluty"
   },
@@ -539,9 +530,6 @@
   "readdToken": {
     "message": "Możesz później ponownie dodać ten token poprzez \"Dodaj token\" w opcjach menu swojego konta."
   },
-  "recipientAddressPlaceholder": {
-    "message": "Szukaj, adres publiczny (0x) lub ENS"
-  },
   "reject": {
     "message": "Odrzuć"
   },
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index 7ee487ac9bcf..27587daf31d0 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -1597,9 +1597,6 @@
   "domain": {
     "message": "Domínio"
   },
-  "domainNotSupportedOnNetwork": {
-    "message": "A rede não suporta a consulta de domínio"
-  },
   "done": {
     "message": "Concluído"
   },
@@ -1773,12 +1770,6 @@
   "ensDomainsSettingTitle": {
     "message": "Exibir domínios ENS na barra de endereço"
   },
-  "ensIllegalCharacter": {
-    "message": "Caractere inválido para ENS."
-  },
-  "ensRegistrationError": {
-    "message": "Erro no registro do nome ENS"
-  },
   "ensUnknownError": {
     "message": "Falha na busca de ENS."
   },
@@ -2422,9 +2413,6 @@
   "invalidAddressRecipient": {
     "message": "O endereço do destinatário é inválido "
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "Não é uma rede de ETH; configurar em minúsculas"
-  },
   "invalidAssetType": {
     "message": "Esse ativo é um NFT e precisa ser adicionado novamente à página Importar NFT, encontrada na aba NFTs."
   },
@@ -3152,9 +3140,6 @@
   "noAccountsFound": {
     "message": "Nenhuma conta encontrada para a pesquisa efetuada"
   },
-  "noAddressForName": {
-    "message": "Não foi configurado nenhum endereço para esse nome."
-  },
   "noConnectedAccountDescription": {
     "message": "Selecione uma conta que você deseja usar neste site para continuar."
   },
@@ -4166,12 +4151,6 @@
   "receive": {
     "message": "Receber"
   },
-  "recipientAddressPlaceholder": {
-    "message": "Insira o endereço público (0x) ou o nome ENS"
-  },
-  "recipientAddressPlaceholderFlask": {
-    "message": "Insira o endereço público (0x) ou nome do domínio"
-  },
   "recommendedGasLabel": {
     "message": "Recomendado"
   },
diff --git a/app/_locales/pt_BR/messages.json b/app/_locales/pt_BR/messages.json
index a4b211bb0529..eae48ba1dc7f 100644
--- a/app/_locales/pt_BR/messages.json
+++ b/app/_locales/pt_BR/messages.json
@@ -705,12 +705,6 @@
     "message": "O endpoint retornou um ID diferente da chain: $1",
     "description": "$1 is the return value of eth_chainId from an RPC endpoint"
   },
-  "ensIllegalCharacter": {
-    "message": "Caractere inválido para ENS."
-  },
-  "ensRegistrationError": {
-    "message": "Erro no registro do nome ENS"
-  },
   "ensUnknownError": {
     "message": "Falha na busca de ENS."
   },
@@ -1020,9 +1014,6 @@
   "invalidAddressRecipient": {
     "message": "O endereço do destinatário é inválido"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "Não é uma rede de ETH; configurar em minúsculas"
-  },
   "invalidBlockExplorerURL": {
     "message": "URL inválido do Block Explorer"
   },
@@ -1339,9 +1330,6 @@
   "noAccountsFound": {
     "message": "Nenhuma conta encontrada para a busca efetuada"
   },
-  "noAddressForName": {
-    "message": "Não foi configurado nenhum endereço para esse nome."
-  },
   "noConversionDateAvailable": {
     "message": "Não há uma data de conversão de moeda disponível"
   },
@@ -1566,9 +1554,6 @@
   "receive": {
     "message": "Receber"
   },
-  "recipientAddressPlaceholder": {
-    "message": "Busca, endereço público (0x) ou ENS"
-  },
   "recommendedGasLabel": {
     "message": "Recomendado"
   },
diff --git a/app/_locales/ro/messages.json b/app/_locales/ro/messages.json
index a7f916825e57..dde9be461087 100644
--- a/app/_locales/ro/messages.json
+++ b/app/_locales/ro/messages.json
@@ -229,9 +229,6 @@
   "editContact": {
     "message": "Editați contact"
   },
-  "ensRegistrationError": {
-    "message": "Eroare la înregistrarea numelui ENS"
-  },
   "enterPasswordContinue": {
     "message": "Introduceți parola pentru a continua"
   },
@@ -344,9 +341,6 @@
   "invalidAddressRecipient": {
     "message": "Adresa destinatarului nu este validă"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "Nu este rețea ETH, setați pe minuscule"
-  },
   "invalidBlockExplorerURL": {
     "message": "URL Block Explorer nevalid"
   },
@@ -446,9 +440,6 @@
   "next": {
     "message": "Înainte"
   },
-  "noAddressForName": {
-    "message": "Nu a fost configurată nicio adresă pentru acest nume."
-  },
   "noConversionRateAvailable": {
     "message": "Nici o rată de conversie disponibilă"
   },
@@ -532,9 +523,6 @@
   "readdToken": {
     "message": "Puteți adăuga din nou acest indicativ în viitor accesând „Adăugați indicativ” din meniul de opțiuni al contului dvs."
   },
-  "recipientAddressPlaceholder": {
-    "message": "Căutare, adresa publică (0x) sau ENS"
-  },
   "reject": {
     "message": "Respingeți"
   },
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index a02ba7831f01..6b13eaf1a46f 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -1597,9 +1597,6 @@
   "domain": {
     "message": "Домен"
   },
-  "domainNotSupportedOnNetwork": {
-    "message": "Сеть не поддерживает поиск домена"
-  },
   "done": {
     "message": "Выполнено"
   },
@@ -1773,12 +1770,6 @@
   "ensDomainsSettingTitle": {
     "message": "Показать домены ENS в адресной строке"
   },
-  "ensIllegalCharacter": {
-    "message": "Недопустимый символ для ENS."
-  },
-  "ensRegistrationError": {
-    "message": "Ошибка при регистрации имени ENS"
-  },
   "ensUnknownError": {
     "message": "Ошибка поиска ENS."
   },
@@ -2422,9 +2413,6 @@
   "invalidAddressRecipient": {
     "message": "Неверный адрес получателя"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "Не сеть ETH, задана в нижнем регистре"
-  },
   "invalidAssetType": {
     "message": "Этот актив является NFT, и его необходимо повторно добавить на странице «Импорт NFT», которая находится на вкладке NFT."
   },
@@ -3152,9 +3140,6 @@
   "noAccountsFound": {
     "message": "По данному поисковому запросу счетов не найдено"
   },
-  "noAddressForName": {
-    "message": "Для этого имени не задан адрес."
-  },
   "noConnectedAccountDescription": {
     "message": "Для продолжения выберите счет, который вы хотите использовать на этом сайте."
   },
@@ -4166,12 +4151,6 @@
   "receive": {
     "message": "Получить"
   },
-  "recipientAddressPlaceholder": {
-    "message": "Введите публичный адрес (0x) или имя ENS"
-  },
-  "recipientAddressPlaceholderFlask": {
-    "message": "Введите публичный адрес (0x) или имя домена"
-  },
   "recommendedGasLabel": {
     "message": "Рекомендовано"
   },
diff --git a/app/_locales/sk/messages.json b/app/_locales/sk/messages.json
index 79a185cf896c..6e28cc44f574 100644
--- a/app/_locales/sk/messages.json
+++ b/app/_locales/sk/messages.json
@@ -223,9 +223,6 @@
   "editContact": {
     "message": "Upraviť kontakt"
   },
-  "ensRegistrationError": {
-    "message": "Chyba pri registrácii názvu ENS"
-  },
   "enterPasswordContinue": {
     "message": "Pokračujte zadaním hesla"
   },
@@ -341,9 +338,6 @@
   "invalidAddressRecipient": {
     "message": "Adresa příjemce je neplatná"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "Nie sieť ETH, nastaviť malé písmená"
-  },
   "invalidBlockExplorerURL": {
     "message": "Neplatné Block Explorer URI"
   },
@@ -434,9 +428,6 @@
   "next": {
     "message": "Další"
   },
-  "noAddressForName": {
-    "message": "Pro toto jméno nebyla nastavena žádná adresa."
-  },
   "noConversionRateAvailable": {
     "message": "Nie je k dispozícii žiadna sadzba konverzie"
   },
@@ -517,9 +508,6 @@
   "readdToken": {
     "message": "Tento token můžete v budoucnu přidat zpět s „Přidat token“ v nastavení účtu."
   },
-  "recipientAddressPlaceholder": {
-    "message": "Vyhľadávať verejnú adresu (0x) alebo ENS"
-  },
   "reject": {
     "message": "Odmítnout"
   },
diff --git a/app/_locales/sl/messages.json b/app/_locales/sl/messages.json
index 64e7c5662c3c..60f18a004305 100644
--- a/app/_locales/sl/messages.json
+++ b/app/_locales/sl/messages.json
@@ -229,9 +229,6 @@
   "editContact": {
     "message": "Uredi stik"
   },
-  "ensRegistrationError": {
-    "message": "Napaka pri registraciji imena ENS"
-  },
   "enterPasswordContinue": {
     "message": "Za nadaljevanje vnesite geslo"
   },
@@ -348,9 +345,6 @@
   "invalidAddressRecipient": {
     "message": "Neveljaven nasklov prejemnika"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "Ni omrežja ETH, nastavljene so male črke"
-  },
   "invalidBlockExplorerURL": {
     "message": "Neveljaven Block Explorer URL"
   },
@@ -447,9 +441,6 @@
   "next": {
     "message": "Naprej"
   },
-  "noAddressForName": {
-    "message": "Za to ime ni naslovov."
-  },
   "noConversionRateAvailable": {
     "message": "Menjalni tečaj ni na voljo"
   },
@@ -533,9 +524,6 @@
   "readdToken": {
     "message": "Ta žeton lahko dodate tudi kasneje z uporabo gumba “Dodaj žeton” v možnostih vašega računa."
   },
-  "recipientAddressPlaceholder": {
-    "message": "Iskanje, javni naslov (0x) ali ENS"
-  },
   "reject": {
     "message": "Zavrni"
   },
diff --git a/app/_locales/sr/messages.json b/app/_locales/sr/messages.json
index 1741b7567833..58bc09614d32 100644
--- a/app/_locales/sr/messages.json
+++ b/app/_locales/sr/messages.json
@@ -226,9 +226,6 @@
   "editContact": {
     "message": "Izmeni kontakt"
   },
-  "ensRegistrationError": {
-    "message": "Greška u registraciji ENS imena."
-  },
   "enterPasswordContinue": {
     "message": "Unesite lozinku kako biste nastavili"
   },
@@ -351,9 +348,6 @@
   "invalidAddressRecipient": {
     "message": "Adresa primaoca nije važeća"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "Nije ETH mreža, podešeno na mala slova"
-  },
   "invalidBlockExplorerURL": {
     "message": "Nevažeći Block Explorer URL"
   },
@@ -450,9 +444,6 @@
   "next": {
     "message": "Даље"
   },
-  "noAddressForName": {
-    "message": "Za ovo ime nije podešena adresa."
-  },
   "noConversionRateAvailable": {
     "message": "Nije dostupan kurs za konverziju"
   },
@@ -536,9 +527,6 @@
   "readdToken": {
     "message": "U budućnosti možete vratiti ovaj token tako što ćete otvoriti „Dodaj token“ u meniju opcija vašeg naloga."
   },
-  "recipientAddressPlaceholder": {
-    "message": "Pretraga, javna adresa (0x) ili ENS"
-  },
   "reject": {
     "message": "Одбиј"
   },
diff --git a/app/_locales/sv/messages.json b/app/_locales/sv/messages.json
index df3766108437..204c84f63caa 100644
--- a/app/_locales/sv/messages.json
+++ b/app/_locales/sv/messages.json
@@ -223,9 +223,6 @@
   "editContact": {
     "message": "Redigera kontakt"
   },
-  "ensRegistrationError": {
-    "message": "Fel i ENS-namnregistrering"
-  },
   "enterPasswordContinue": {
     "message": "Ange lösenord för att fortsätta"
   },
@@ -344,9 +341,6 @@
   "invalidAddressRecipient": {
     "message": "Mottagarens adress är ogiltig"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "Ej ETH-nätverk, ange med små bokstäver"
-  },
   "invalidBlockExplorerURL": {
     "message": "Ogiltig Block Explorer URL"
   },
@@ -443,9 +437,6 @@
   "next": {
     "message": "Nästa"
   },
-  "noAddressForName": {
-    "message": "Inga adresser har angetts för detta namn."
-  },
   "noConversionRateAvailable": {
     "message": "Ingen omräkningskurs tillgänglig"
   },
@@ -529,9 +520,6 @@
   "readdToken": {
     "message": "Du kan lägga till denna token i framtiden genom att välja \"Lägg till token\" i kontots alternativmeny."
   },
-  "recipientAddressPlaceholder": {
-    "message": "Sök, allmän adress (0x) eller ENS"
-  },
   "reject": {
     "message": "Avvisa"
   },
diff --git a/app/_locales/sw/messages.json b/app/_locales/sw/messages.json
index 7eb535bee573..1d9be8ad3f8d 100644
--- a/app/_locales/sw/messages.json
+++ b/app/_locales/sw/messages.json
@@ -223,9 +223,6 @@
   "editContact": {
     "message": "Hariri Mawasiliano"
   },
-  "ensRegistrationError": {
-    "message": "Hitilafu imetokea kwenye usajili wa jina la ENS"
-  },
   "enterPasswordContinue": {
     "message": "Ingiza nenosiri ili uendelee"
   },
@@ -341,9 +338,6 @@
   "invalidAddressRecipient": {
     "message": "Anwani ya mpokeaji si halali"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "Kwa mtandao wa ETH, weka herufi ndogo"
-  },
   "invalidBlockExplorerURL": {
     "message": "Block Explorer URL batili"
   },
@@ -437,9 +431,6 @@
   "next": {
     "message": "Inayofuata"
   },
-  "noAddressForName": {
-    "message": "Hakuna anwani iliyoundwa kwa jina hili."
-  },
   "noConversionRateAvailable": {
     "message": "Hakuna Kiwango cha Ubadilishaji"
   },
@@ -523,9 +514,6 @@
   "readdToken": {
     "message": "Unaweza kuongeza tena kianzio hiki hapo baadaye kwa kwenda kwenye \"Ongeza kianzio\" kwenye machaguo yako ya menyu ya akaunti."
   },
-  "recipientAddressPlaceholder": {
-    "message": "Tafuta, anwani za umma (0x), au ENS"
-  },
   "reject": {
     "message": "Kataa"
   },
diff --git a/app/_locales/ta/messages.json b/app/_locales/ta/messages.json
index f9c7274ac55c..8a6f3351db0d 100644
--- a/app/_locales/ta/messages.json
+++ b/app/_locales/ta/messages.json
@@ -263,9 +263,6 @@
   "next": {
     "message": "அடுத்தது"
   },
-  "noAddressForName": {
-    "message": "இந்த பெயருக்கான முகவரி அமைக்கப்படவில்லை."
-  },
   "noTransactions": {
     "message": "பரிவர்த்தனைகள் இல்லை"
   },
diff --git a/app/_locales/th/messages.json b/app/_locales/th/messages.json
index 0b2dbb8664aa..19b005ef7cee 100644
--- a/app/_locales/th/messages.json
+++ b/app/_locales/th/messages.json
@@ -182,9 +182,6 @@
   "invalidAddressRecipient": {
     "message": "แอดแดรสผู้รับไม่ถูกต้อง"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "ไม่ใช่เครือข่าย ETH ตั้งเป็นตัวพิมพ์เล็ก"
-  },
   "invalidBlockExplorerURL": {
     "message": "Block Explorer URI ไม่ถูกต้อง"
   },
@@ -248,9 +245,6 @@
   "next": {
     "message": "ถัดไป"
   },
-  "noAddressForName": {
-    "message": "ยังไม่มีแอดแดรสไหนตั้งในชื่อนี้"
-  },
   "noTransactions": {
     "message": "ยังไม่มีรายการธุรกรรม"
   },
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
index 5068cd8e5dcd..624e9059634a 100644
--- a/app/_locales/tl/messages.json
+++ b/app/_locales/tl/messages.json
@@ -1597,9 +1597,6 @@
   "domain": {
     "message": "Domain"
   },
-  "domainNotSupportedOnNetwork": {
-    "message": "Hindi sinusuportahan ng network ang domain lookup"
-  },
   "done": {
     "message": "Tapos na"
   },
@@ -1773,12 +1770,6 @@
   "ensDomainsSettingTitle": {
     "message": "Ipinapakita ang mga ENS domain sa address bar"
   },
-  "ensIllegalCharacter": {
-    "message": "Mga ilegal na character para sa ENS."
-  },
-  "ensRegistrationError": {
-    "message": "Nagka-error sa pag-register ng ENS name"
-  },
   "ensUnknownError": {
     "message": "Nabigong makita ang ENS."
   },
@@ -2422,9 +2413,6 @@
   "invalidAddressRecipient": {
     "message": "Ang address ng tatanggap ay hindi wasto"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "Hindi ETH network, itakda sa maliliit na letra"
-  },
   "invalidAssetType": {
     "message": "Ang asset na ito ay isang NFT at kailangang idagdag muli sa pahina ng Mag-import ng mga NFT na matatagpuan sa ilalim ng tab ng mga NFT"
   },
@@ -3152,9 +3140,6 @@
   "noAccountsFound": {
     "message": "Walang nakitang account para sa ibinigay na query sa paghahanap"
   },
-  "noAddressForName": {
-    "message": "Walang naitakdang address para sa pangalang ito."
-  },
   "noConnectedAccountDescription": {
     "message": "Pumili ng account na gusto mong gamitin sa site na ito para magpatuloy."
   },
@@ -4166,12 +4151,6 @@
   "receive": {
     "message": "Tumanggap"
   },
-  "recipientAddressPlaceholder": {
-    "message": "Ilagay ang pampublikong address (0x) o ENS name"
-  },
-  "recipientAddressPlaceholderFlask": {
-    "message": "Ilagay ang pampublikong address (0x) o pangalan ng domain"
-  },
   "recommendedGasLabel": {
     "message": "Nirekomenda"
   },
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index 0c5ef35c5c88..09ee23ea8d92 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -1597,9 +1597,6 @@
   "domain": {
     "message": "Alan"
   },
-  "domainNotSupportedOnNetwork": {
-    "message": "Ağ alan aramasını desteklemiyor"
-  },
   "done": {
     "message": "Bitti"
   },
@@ -1773,12 +1770,6 @@
   "ensDomainsSettingTitle": {
     "message": "ENS alanlarını adres çubuğunda göster"
   },
-  "ensIllegalCharacter": {
-    "message": "ENS için uygun olmayan karakter."
-  },
-  "ensRegistrationError": {
-    "message": "ENS adı kaydında hata"
-  },
   "ensUnknownError": {
     "message": "ENS arama başarısız oldu."
   },
@@ -2422,9 +2413,6 @@
   "invalidAddressRecipient": {
     "message": "Alıcı adresi geçersiz"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "ETH ağı yok, küçük harfle başlayın"
-  },
   "invalidAssetType": {
     "message": "Bu varlık bir NFT'dir ve NFT'ler sekmesi altında bulunan NFT'leri İçe Aktar sayfasına yeniden eklenmesi gerekir"
   },
@@ -3152,9 +3140,6 @@
   "noAccountsFound": {
     "message": "Belirtilen arama sorgusu için hesap bulunamadı"
   },
-  "noAddressForName": {
-    "message": "Bu isim için adres tanımlanmamış."
-  },
   "noConnectedAccountDescription": {
     "message": "Devam etmek için bu sitede kullanmak istediğiniz bir hesap seçin."
   },
@@ -4166,12 +4151,6 @@
   "receive": {
     "message": "Al"
   },
-  "recipientAddressPlaceholder": {
-    "message": "Genel adres (0x) veya ENS adı girin"
-  },
-  "recipientAddressPlaceholderFlask": {
-    "message": "Genel adres (0x) veya alan adı girin"
-  },
   "recommendedGasLabel": {
     "message": "Önerilen"
   },
diff --git a/app/_locales/uk/messages.json b/app/_locales/uk/messages.json
index 59bb0b477008..48d559bbdb40 100644
--- a/app/_locales/uk/messages.json
+++ b/app/_locales/uk/messages.json
@@ -229,9 +229,6 @@
   "editContact": {
     "message": "Редагувати контракт"
   },
-  "ensRegistrationError": {
-    "message": "Помилка у реєстрації ENS ім'я"
-  },
   "enterPasswordContinue": {
     "message": "Введіть пароль, щоб продовжити"
   },
@@ -354,9 +351,6 @@
   "invalidAddressRecipient": {
     "message": "Недійсна адреса отримувача"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "Не є мережею ETH, налаштуйте нижній регістр"
-  },
   "invalidBlockExplorerURL": {
     "message": "Недійсний Block Explorer URL"
   },
@@ -459,9 +453,6 @@
   "next": {
     "message": "Далі"
   },
-  "noAddressForName": {
-    "message": "На це ім'я не встановлено адреси."
-  },
   "noConversionRateAvailable": {
     "message": "Немає доступного обмінного курсу"
   },
@@ -545,9 +536,6 @@
   "readdToken": {
     "message": "Ви можете знову додати цей токен у меню облікового запису у розділі “Додати токен”. "
   },
-  "recipientAddressPlaceholder": {
-    "message": "Пошук, публічна адреса (0x), або ENS"
-  },
   "reject": {
     "message": "Відхилити"
   },
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index 25159e58b605..b1fa5514980e 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -1597,9 +1597,6 @@
   "domain": {
     "message": "Tên miền"
   },
-  "domainNotSupportedOnNetwork": {
-    "message": "Mạng không hỗ trợ tra cứu tên miền"
-  },
   "done": {
     "message": "Hoàn tất"
   },
@@ -1773,12 +1770,6 @@
   "ensDomainsSettingTitle": {
     "message": "Hiển thị tên miền ENS trong thanh địa chỉ"
   },
-  "ensIllegalCharacter": {
-    "message": "Ký tự không hợp lệ đối với ENS."
-  },
-  "ensRegistrationError": {
-    "message": "Lỗi khi đăng ký tên ENS"
-  },
   "ensUnknownError": {
     "message": "Tra cứu ENS thất bại."
   },
@@ -2422,9 +2413,6 @@
   "invalidAddressRecipient": {
     "message": "Địa chỉ người nhận không hợp lệ"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "Không phải mạng ETH, hãy đặt thành chữ viết thường"
-  },
   "invalidAssetType": {
     "message": "Tài sản này là một NFT và cần được thêm lại trên trang Nhập NFT bên dưới thẻ NFT"
   },
@@ -3152,9 +3140,6 @@
   "noAccountsFound": {
     "message": "Không tìm thấy tài khoản nào cho cụm từ tìm kiếm đã đưa ra"
   },
-  "noAddressForName": {
-    "message": "Chưa có địa chỉ nào được đặt cho tên này."
-  },
   "noConnectedAccountDescription": {
     "message": "Chọn tài khoản mà bạn muốn sử dụng trên trang web này để tiếp tục."
   },
@@ -4166,12 +4151,6 @@
   "receive": {
     "message": "Nhận"
   },
-  "recipientAddressPlaceholder": {
-    "message": "Nhập địa chỉ công khai (0x) hoặc tên ENS"
-  },
-  "recipientAddressPlaceholderFlask": {
-    "message": "Nhập địa chỉ công khai (0x) hoặc tên miền"
-  },
   "recommendedGasLabel": {
     "message": "Được đề xuất"
   },
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index e2853be601a0..8733daf9431c 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -1597,9 +1597,6 @@
   "domain": {
     "message": "域"
   },
-  "domainNotSupportedOnNetwork": {
-    "message": "网络不支持域查找"
-  },
   "done": {
     "message": "完成"
   },
@@ -1773,12 +1770,6 @@
   "ensDomainsSettingTitle": {
     "message": "在地址栏中显示ENS域"
   },
-  "ensIllegalCharacter": {
-    "message": "ENS 的非法字符。"
-  },
-  "ensRegistrationError": {
-    "message": "ENS 名称注册错误"
-  },
   "ensUnknownError": {
     "message": "ENS 查找失败。"
   },
@@ -2422,9 +2413,6 @@
   "invalidAddressRecipient": {
     "message": "接收方地址无效"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "非 ETH 网络，请使用小写"
-  },
   "invalidAssetType": {
     "message": "该资产是NFT，需要在NFT选项卡下的“导入NFT”页面上重新添加"
   },
@@ -3152,9 +3140,6 @@
   "noAccountsFound": {
     "message": "未找到符合给定查询条件的账户"
   },
-  "noAddressForName": {
-    "message": "此名称尚未设置地址。"
-  },
   "noConnectedAccountDescription": {
     "message": "选择要在此站点上使用的账户以继续。"
   },
@@ -4166,12 +4151,6 @@
   "receive": {
     "message": "收款"
   },
-  "recipientAddressPlaceholder": {
-    "message": "输入公钥 (0x) 或 ENS 名称"
-  },
-  "recipientAddressPlaceholderFlask": {
-    "message": "输入公钥 (0x) 或域名"
-  },
   "recommendedGasLabel": {
     "message": "建议"
   },
diff --git a/app/_locales/zh_TW/messages.json b/app/_locales/zh_TW/messages.json
index 83c0fc09e565..04d3b772da22 100644
--- a/app/_locales/zh_TW/messages.json
+++ b/app/_locales/zh_TW/messages.json
@@ -444,12 +444,6 @@
     "message": "這個 RPC 端點回傳了一個不同的鏈 ID：$1",
     "description": "$1 is the return value of eth_chainId from an RPC endpoint"
   },
-  "ensIllegalCharacter": {
-    "message": "Illegal Character for ENS."
-  },
-  "ensRegistrationError": {
-    "message": "ENS 名稱註冊錯誤"
-  },
   "ensUnknownError": {
     "message": "ENS Lookup failed."
   },
@@ -675,9 +669,6 @@
   "invalidAddressRecipient": {
     "message": "接收位址錯誤"
   },
-  "invalidAddressRecipientNotEthNetwork": {
-    "message": "非 ETH 網路，請設定至小寫"
-  },
   "invalidBlockExplorerURL": {
     "message": "無效的區塊鏈瀏覽器 URL"
   },
@@ -875,9 +866,6 @@
   "noAccountsFound": {
     "message": "指定的搜尋條件找不到帳戶"
   },
-  "noAddressForName": {
-    "message": "此 ENS 尚未指定位址。"
-  },
   "noConversionRateAvailable": {
     "message": "尚未有匯率比較值"
   },
@@ -1005,9 +993,6 @@
   "receive": {
     "message": "接收"
   },
-  "recipientAddressPlaceholder": {
-    "message": "搜尋、公開位址 (0x)、或 ENS"
-  },
   "reject": {
     "message": "拒絕"
   },
diff --git a/app/scripts/metamask-controller.actions.test.js b/app/scripts/metamask-controller.actions.test.js
index b5c4ef72dc63..f3dc22b46865 100644
--- a/app/scripts/metamask-controller.actions.test.js
+++ b/app/scripts/metamask-controller.actions.test.js
@@ -70,7 +70,7 @@ describe('MetaMaskController', function () {
   const noop = () => undefined;
 
   beforeAll(async function () {
-    await ganacheServer.start();
+    await ganacheServer.start({ port: 32545 });
   });
 
   beforeEach(function () {
diff --git a/app/scripts/snaps/preinstalled-snaps.ts b/app/scripts/snaps/preinstalled-snaps.ts
index b30945e76477..d38d4f1fca4a 100644
--- a/app/scripts/snaps/preinstalled-snaps.ts
+++ b/app/scripts/snaps/preinstalled-snaps.ts
@@ -1,5 +1,6 @@
 import type { PreinstalledSnap } from '@metamask/snaps-controllers';
 import MessageSigningSnap from '@metamask/message-signing-snap/dist/preinstalled-snap.json';
+import EnsResolverSnap from '@metamask/ens-resolver-snap/dist/preinstalled-snap.json';
 import AccountWatcherSnap from '@metamask/account-watcher/dist/preinstalled-snap.json';
 ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
 import BitcoinWalletSnap from '@metamask/bitcoin-wallet-snap/dist/preinstalled-snap.json';
@@ -8,6 +9,7 @@ import BitcoinWalletSnap from '@metamask/bitcoin-wallet-snap/dist/preinstalled-s
 // The casts here are less than ideal but we expect the SnapController to validate the inputs.
 const PREINSTALLED_SNAPS = Object.freeze<PreinstalledSnap[]>([
   MessageSigningSnap as PreinstalledSnap,
+  EnsResolverSnap as PreinstalledSnap,
   AccountWatcherSnap as PreinstalledSnap,
   ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
   BitcoinWalletSnap as unknown as PreinstalledSnap,
diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index 43f83e019cee..304da136a56f 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -191,64 +191,27 @@
         "console.log": true
       },
       "packages": {
-        "@ethersproject/abi>@ethersproject/address": true,
-        "@ethersproject/abi>@ethersproject/constants": true,
-        "@ethersproject/abi>@ethersproject/keccak256": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/abi>@ethersproject/strings": true,
         "@ethersproject/bignumber": true,
         "@ethersproject/bytes": true,
-        "@ethersproject/hash": true
-      }
-    },
-    "@ethersproject/abi>@ethersproject/address": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/keccak256": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "@ethersproject/providers>@ethersproject/rlp": true
-      }
-    },
-    "@ethersproject/abi>@ethersproject/constants": {
-      "packages": {
-        "@ethersproject/bignumber": true
-      }
-    },
-    "@ethersproject/abi>@ethersproject/keccak256": {
-      "packages": {
-        "@ethersproject/bytes": true,
-        "@metamask/ethjs>js-sha3": true
-      }
-    },
-    "@ethersproject/abi>@ethersproject/logger": {
-      "globals": {
-        "console": true
-      }
-    },
-    "@ethersproject/abi>@ethersproject/properties": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true
-      }
-    },
-    "@ethersproject/abi>@ethersproject/strings": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/constants": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/bytes": true
+        "@ethersproject/hash": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/constants": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
       }
     },
     "@ethersproject/bignumber": {
       "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
         "@ethersproject/bytes": true,
-        "bn.js": true
+        "bn.js": true,
+        "ethers>@ethersproject/logger": true
       }
     },
     "@ethersproject/bytes": {
       "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true
+        "ethers>@ethersproject/logger": true
       }
     },
     "@ethersproject/contracts": {
@@ -257,116 +220,41 @@
       },
       "packages": {
         "@ethersproject/abi": true,
-        "@ethersproject/abi>@ethersproject/address": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
         "@ethersproject/bignumber": true,
         "@ethersproject/bytes": true,
-        "@ethersproject/hash>@ethersproject/abstract-signer": true,
-        "@ethersproject/hdnode>@ethersproject/transactions": true,
-        "@ethersproject/wallet>@ethersproject/abstract-provider": true
+        "ethers>@ethersproject/abstract-provider": true,
+        "ethers>@ethersproject/abstract-signer": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/transactions": true
       }
     },
     "@ethersproject/hash": {
       "packages": {
-        "@ethersproject/abi>@ethersproject/address": true,
-        "@ethersproject/abi>@ethersproject/keccak256": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/abi>@ethersproject/strings": true,
         "@ethersproject/bignumber": true,
         "@ethersproject/bytes": true,
-        "@ethersproject/hash>@ethersproject/base64": true
-      }
-    },
-    "@ethersproject/hash>@ethersproject/abstract-signer": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true
-      }
-    },
-    "@ethersproject/hash>@ethersproject/base64": {
-      "globals": {
-        "atob": true,
-        "btoa": true
-      },
-      "packages": {
-        "@ethersproject/bytes": true
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
       }
     },
     "@ethersproject/hdnode": {
       "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/abi>@ethersproject/strings": true,
         "@ethersproject/bignumber": true,
         "@ethersproject/bytes": true,
-        "@ethersproject/hdnode>@ethersproject/basex": true,
-        "@ethersproject/hdnode>@ethersproject/pbkdf2": true,
-        "@ethersproject/hdnode>@ethersproject/sha2": true,
-        "@ethersproject/hdnode>@ethersproject/signing-key": true,
-        "@ethersproject/hdnode>@ethersproject/transactions": true,
-        "@ethersproject/hdnode>@ethersproject/wordlists": true
-      }
-    },
-    "@ethersproject/hdnode>@ethersproject/basex": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/bytes": true
-      }
-    },
-    "@ethersproject/hdnode>@ethersproject/pbkdf2": {
-      "packages": {
-        "@ethersproject/bytes": true,
-        "@ethersproject/hdnode>@ethersproject/sha2": true
-      }
-    },
-    "@ethersproject/hdnode>@ethersproject/sha2": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/bytes": true,
-        "ethereumjs-util>ethereum-cryptography>hash.js": true
-      }
-    },
-    "@ethersproject/hdnode>@ethersproject/signing-key": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/bytes": true,
-        "@ethersproject/hdnode>@ethersproject/signing-key>elliptic": true
-      }
-    },
-    "@ethersproject/hdnode>@ethersproject/signing-key>elliptic": {
-      "packages": {
-        "@metamask/ppom-validator>elliptic>brorand": true,
-        "@metamask/ppom-validator>elliptic>hmac-drbg": true,
-        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
-        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
-        "bn.js": true,
-        "ethereumjs-util>ethereum-cryptography>hash.js": true,
-        "pumpify>inherits": true
-      }
-    },
-    "@ethersproject/hdnode>@ethersproject/transactions": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/address": true,
-        "@ethersproject/abi>@ethersproject/constants": true,
-        "@ethersproject/abi>@ethersproject/keccak256": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "@ethersproject/hdnode>@ethersproject/signing-key": true,
-        "@ethersproject/providers>@ethersproject/rlp": true
-      }
-    },
-    "@ethersproject/hdnode>@ethersproject/wordlists": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/abi>@ethersproject/strings": true,
-        "@ethersproject/bytes": true,
-        "@ethersproject/hash": true
+        "ethers>@ethersproject/basex": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/pbkdf2": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/sha2": true,
+        "ethers>@ethersproject/signing-key": true,
+        "ethers>@ethersproject/strings": true,
+        "ethers>@ethersproject/transactions": true,
+        "ethers>@ethersproject/wordlists": true
       }
     },
     "@ethersproject/providers": {
@@ -380,24 +268,24 @@
         "setTimeout": true
       },
       "packages": {
-        "@ethersproject/abi>@ethersproject/address": true,
-        "@ethersproject/abi>@ethersproject/constants": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/abi>@ethersproject/strings": true,
         "@ethersproject/bignumber": true,
         "@ethersproject/bytes": true,
         "@ethersproject/hash": true,
-        "@ethersproject/hash>@ethersproject/abstract-signer": true,
-        "@ethersproject/hash>@ethersproject/base64": true,
-        "@ethersproject/hdnode>@ethersproject/basex": true,
-        "@ethersproject/hdnode>@ethersproject/sha2": true,
-        "@ethersproject/hdnode>@ethersproject/transactions": true,
         "@ethersproject/providers>@ethersproject/web": true,
         "@ethersproject/providers>bech32": true,
-        "@ethersproject/wallet>@ethersproject/abstract-provider": true,
-        "@ethersproject/wallet>@ethersproject/random": true,
-        "@metamask/test-bundler>@ethersproject/networks": true
+        "@metamask/test-bundler>@ethersproject/networks": true,
+        "ethers>@ethersproject/abstract-provider": true,
+        "ethers>@ethersproject/abstract-signer": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/basex": true,
+        "ethers>@ethersproject/constants": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/random": true,
+        "ethers>@ethersproject/sha2": true,
+        "ethers>@ethersproject/strings": true,
+        "ethers>@ethersproject/transactions": true
       }
     },
     "@ethersproject/providers>@ethersproject/random": {
@@ -405,12 +293,6 @@
         "crypto.getRandomValues": true
       }
     },
-    "@ethersproject/providers>@ethersproject/rlp": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/bytes": true
-      }
-    },
     "@ethersproject/providers>@ethersproject/web": {
       "globals": {
         "clearTimeout": true,
@@ -418,63 +300,28 @@
         "setTimeout": true
       },
       "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/abi>@ethersproject/strings": true,
         "@ethersproject/bytes": true,
-        "@ethersproject/hash>@ethersproject/base64": true
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
       }
     },
     "@ethersproject/wallet": {
       "packages": {
-        "@ethersproject/abi>@ethersproject/address": true,
-        "@ethersproject/abi>@ethersproject/keccak256": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
         "@ethersproject/bytes": true,
         "@ethersproject/hash": true,
-        "@ethersproject/hash>@ethersproject/abstract-signer": true,
-        "@ethersproject/hdnode": true,
-        "@ethersproject/hdnode>@ethersproject/signing-key": true,
-        "@ethersproject/hdnode>@ethersproject/transactions": true,
-        "@ethersproject/wallet>@ethersproject/abstract-provider": true,
-        "@ethersproject/wallet>@ethersproject/json-wallets": true,
-        "@ethersproject/wallet>@ethersproject/random": true
-      }
-    },
-    "@ethersproject/wallet>@ethersproject/abstract-provider": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true
-      }
-    },
-    "@ethersproject/wallet>@ethersproject/json-wallets": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/address": true,
-        "@ethersproject/abi>@ethersproject/keccak256": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/abi>@ethersproject/strings": true,
-        "@ethersproject/bytes": true,
         "@ethersproject/hdnode": true,
-        "@ethersproject/hdnode>@ethersproject/pbkdf2": true,
-        "@ethersproject/hdnode>@ethersproject/transactions": true,
-        "@ethersproject/wallet>@ethersproject/json-wallets>aes-js": true,
-        "@ethersproject/wallet>@ethersproject/random": true,
-        "ethereumjs-util>ethereum-cryptography>scrypt-js": true
-      }
-    },
-    "@ethersproject/wallet>@ethersproject/json-wallets>aes-js": {
-      "globals": {
-        "define": true
-      }
-    },
-    "@ethersproject/wallet>@ethersproject/random": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/bytes": true
+        "ethers>@ethersproject/abstract-provider": true,
+        "ethers>@ethersproject/abstract-signer": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/json-wallets": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/random": true,
+        "ethers>@ethersproject/signing-key": true,
+        "ethers>@ethersproject/transactions": true
       }
     },
     "@keystonehq/bc-ur-registry-eth": {
@@ -847,7 +694,6 @@
       },
       "packages": {
         "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethersproject/abi>@ethersproject/address": true,
         "@ethersproject/contracts": true,
         "@ethersproject/providers": true,
         "@metamask/abi-utils": true,
@@ -863,6 +709,7 @@
         "@metamask/utils": true,
         "bn.js": true,
         "cockatiel": true,
+        "ethers>@ethersproject/address": true,
         "lodash": true,
         "single-call-balance-checker-abi": true,
         "uuid": true
@@ -1590,7 +1437,7 @@
         "crypto-browserify>randombytes": true,
         "eth-lattice-keyring>gridplus-sdk>aes-js": true,
         "ethereumjs-util>ethereum-cryptography>bs58check": true,
-        "ethereumjs-util>ethereum-cryptography>scrypt-js": true,
+        "ethers>@ethersproject/json-wallets>scrypt-js": true,
         "uuid": true
       }
     },
@@ -1601,8 +1448,8 @@
         "crypto-browserify>create-hmac": true,
         "crypto-browserify>randombytes": true,
         "ethereumjs-util>ethereum-cryptography>bs58check": true,
-        "ethereumjs-util>ethereum-cryptography>hash.js": true,
         "ethereumjs-util>ethereum-cryptography>keccak": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
         "ganache>secp256k1": true,
         "koa>content-disposition>safe-buffer": true
       }
@@ -2217,7 +2064,7 @@
         "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
         "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
         "bn.js": true,
-        "ethereumjs-util>ethereum-cryptography>hash.js": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
         "pumpify>inherits": true
       }
     },
@@ -2234,7 +2081,7 @@
       "packages": {
         "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
         "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
-        "ethereumjs-util>ethereum-cryptography>hash.js": true
+        "ethers>@ethersproject/sha2>hash.js": true
       }
     },
     "@metamask/profile-sync-controller": {
@@ -2269,7 +2116,7 @@
         "@metamask/controller-utils>@spruceid/siwe-parser>valid-url": true,
         "@metamask/profile-sync-controller>siwe>@spruceid/siwe-parser": true,
         "@metamask/profile-sync-controller>siwe>@stablelib/random": true,
-        "@metamask/test-bundler>ethers": true
+        "ethers": true
       }
     },
     "@metamask/profile-sync-controller>siwe>@spruceid/siwe-parser": {
@@ -3018,54 +2865,7 @@
     },
     "@metamask/test-bundler>@ethersproject/networks": {
       "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true
-      }
-    },
-    "@metamask/test-bundler>ethers": {
-      "packages": {
-        "@ethersproject/abi": true,
-        "@ethersproject/abi>@ethersproject/address": true,
-        "@ethersproject/abi>@ethersproject/constants": true,
-        "@ethersproject/abi>@ethersproject/keccak256": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/abi>@ethersproject/strings": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "@ethersproject/contracts": true,
-        "@ethersproject/hash": true,
-        "@ethersproject/hash>@ethersproject/abstract-signer": true,
-        "@ethersproject/hash>@ethersproject/base64": true,
-        "@ethersproject/hdnode": true,
-        "@ethersproject/hdnode>@ethersproject/basex": true,
-        "@ethersproject/hdnode>@ethersproject/sha2": true,
-        "@ethersproject/hdnode>@ethersproject/signing-key": true,
-        "@ethersproject/hdnode>@ethersproject/transactions": true,
-        "@ethersproject/hdnode>@ethersproject/wordlists": true,
-        "@ethersproject/providers": true,
-        "@ethersproject/providers>@ethersproject/rlp": true,
-        "@ethersproject/providers>@ethersproject/web": true,
-        "@ethersproject/wallet": true,
-        "@ethersproject/wallet>@ethersproject/json-wallets": true,
-        "@ethersproject/wallet>@ethersproject/random": true,
-        "@metamask/test-bundler>ethers>@ethersproject/solidity": true,
-        "@metamask/test-bundler>ethers>@ethersproject/units": true
-      }
-    },
-    "@metamask/test-bundler>ethers>@ethersproject/solidity": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/keccak256": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/strings": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "@ethersproject/hdnode>@ethersproject/sha2": true
-      }
-    },
-    "@metamask/test-bundler>ethers>@ethersproject/units": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/bignumber": true
+        "ethers>@ethersproject/logger": true
       }
     },
     "@metamask/transaction-controller": {
@@ -4244,7 +4044,7 @@
         "eth-lattice-keyring>gridplus-sdk>secp256k1": true,
         "eth-lattice-keyring>gridplus-sdk>uuid": true,
         "ethereumjs-util>ethereum-cryptography>bs58check": true,
-        "ethereumjs-util>ethereum-cryptography>hash.js": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
         "lodash": true
       }
     },
@@ -4338,7 +4138,7 @@
         "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
         "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
         "bn.js": true,
-        "ethereumjs-util>ethereum-cryptography>hash.js": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
         "pumpify>inherits": true
       }
     },
@@ -4369,7 +4169,7 @@
         "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
         "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
         "bn.js": true,
-        "ethereumjs-util>ethereum-cryptography>hash.js": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
         "pumpify>inherits": true
       }
     },
@@ -4478,19 +4278,119 @@
         "@ensdomains/content-hash>multihashes>multibase>base-x": true
       }
     },
-    "ethereumjs-util>ethereum-cryptography>hash.js": {
-      "packages": {
-        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
-        "pumpify>inherits": true
-      }
-    },
     "ethereumjs-util>ethereum-cryptography>keccak": {
       "packages": {
         "browserify>buffer": true,
         "readable-stream": true
       }
     },
-    "ethereumjs-util>ethereum-cryptography>scrypt-js": {
+    "ethereumjs-util>rlp": {
+      "packages": {
+        "bn.js": true,
+        "browserify>buffer": true
+      }
+    },
+    "ethereumjs-wallet>randombytes": {
+      "globals": {
+        "crypto.getRandomValues": true
+      }
+    },
+    "ethers": {
+      "packages": {
+        "@ethersproject/abi": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "@ethersproject/contracts": true,
+        "@ethersproject/hash": true,
+        "@ethersproject/hdnode": true,
+        "@ethersproject/wallet": true,
+        "ethers>@ethersproject/abstract-signer": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/basex": true,
+        "ethers>@ethersproject/constants": true,
+        "ethers>@ethersproject/json-wallets": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/providers": true,
+        "ethers>@ethersproject/random": true,
+        "ethers>@ethersproject/rlp": true,
+        "ethers>@ethersproject/sha2": true,
+        "ethers>@ethersproject/signing-key": true,
+        "ethers>@ethersproject/solidity": true,
+        "ethers>@ethersproject/strings": true,
+        "ethers>@ethersproject/transactions": true,
+        "ethers>@ethersproject/units": true,
+        "ethers>@ethersproject/web": true,
+        "ethers>@ethersproject/wordlists": true
+      }
+    },
+    "ethers>@ethersproject/abstract-provider": {
+      "packages": {
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true
+      }
+    },
+    "ethers>@ethersproject/abstract-signer": {
+      "packages": {
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true
+      }
+    },
+    "ethers>@ethersproject/address": {
+      "packages": {
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/rlp": true
+      }
+    },
+    "ethers>@ethersproject/base64": {
+      "globals": {
+        "atob": true,
+        "btoa": true
+      },
+      "packages": {
+        "@ethersproject/bytes": true
+      }
+    },
+    "ethers>@ethersproject/basex": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/properties": true
+      }
+    },
+    "ethers>@ethersproject/constants": {
+      "packages": {
+        "@ethersproject/bignumber": true
+      }
+    },
+    "ethers>@ethersproject/json-wallets": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "@ethersproject/hdnode": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/json-wallets>aes-js": true,
+        "ethers>@ethersproject/json-wallets>scrypt-js": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/pbkdf2": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/random": true,
+        "ethers>@ethersproject/strings": true,
+        "ethers>@ethersproject/transactions": true
+      }
+    },
+    "ethers>@ethersproject/json-wallets>aes-js": {
+      "globals": {
+        "define": true
+      }
+    },
+    "ethers>@ethersproject/json-wallets>scrypt-js": {
       "globals": {
         "define": true,
         "setTimeout": true
@@ -4499,15 +4399,179 @@
         "browserify>timers-browserify": true
       }
     },
-    "ethereumjs-util>rlp": {
+    "ethers>@ethersproject/keccak256": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "@metamask/ethjs>js-sha3": true
+      }
+    },
+    "ethers>@ethersproject/logger": {
+      "globals": {
+        "console": true
+      }
+    },
+    "ethers>@ethersproject/pbkdf2": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/sha2": true
+      }
+    },
+    "ethers>@ethersproject/properties": {
+      "packages": {
+        "ethers>@ethersproject/logger": true
+      }
+    },
+    "ethers>@ethersproject/providers": {
+      "globals": {
+        "WebSocket": true,
+        "clearInterval": true,
+        "clearTimeout": true,
+        "console.log": true,
+        "console.warn": true,
+        "setInterval": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "@ethersproject/hash": true,
+        "ethers>@ethersproject/abstract-provider": true,
+        "ethers>@ethersproject/abstract-signer": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/basex": true,
+        "ethers>@ethersproject/constants": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/providers>@ethersproject/networks": true,
+        "ethers>@ethersproject/providers>@ethersproject/web": true,
+        "ethers>@ethersproject/providers>bech32": true,
+        "ethers>@ethersproject/random": true,
+        "ethers>@ethersproject/sha2": true,
+        "ethers>@ethersproject/strings": true,
+        "ethers>@ethersproject/transactions": true
+      }
+    },
+    "ethers>@ethersproject/providers>@ethersproject/networks": {
       "packages": {
+        "ethers>@ethersproject/logger": true
+      }
+    },
+    "ethers>@ethersproject/providers>@ethersproject/web": {
+      "globals": {
+        "clearTimeout": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
+      }
+    },
+    "ethers>@ethersproject/random": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true
+      }
+    },
+    "ethers>@ethersproject/rlp": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true
+      }
+    },
+    "ethers>@ethersproject/sha2": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/sha2>hash.js": true
+      }
+    },
+    "ethers>@ethersproject/sha2>hash.js": {
+      "packages": {
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
+        "pumpify>inherits": true
+      }
+    },
+    "ethers>@ethersproject/signing-key": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/signing-key>elliptic": true
+      }
+    },
+    "ethers>@ethersproject/signing-key>elliptic": {
+      "packages": {
+        "@metamask/ppom-validator>elliptic>brorand": true,
+        "@metamask/ppom-validator>elliptic>hmac-drbg": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
         "bn.js": true,
-        "browserify>buffer": true
+        "ethers>@ethersproject/sha2>hash.js": true,
+        "pumpify>inherits": true
       }
     },
-    "ethereumjs-wallet>randombytes": {
+    "ethers>@ethersproject/solidity": {
+      "packages": {
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/sha2": true,
+        "ethers>@ethersproject/strings": true
+      }
+    },
+    "ethers>@ethersproject/strings": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/constants": true,
+        "ethers>@ethersproject/logger": true
+      }
+    },
+    "ethers>@ethersproject/transactions": {
+      "packages": {
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/constants": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/rlp": true,
+        "ethers>@ethersproject/signing-key": true
+      }
+    },
+    "ethers>@ethersproject/units": {
+      "packages": {
+        "@ethersproject/bignumber": true,
+        "ethers>@ethersproject/logger": true
+      }
+    },
+    "ethers>@ethersproject/web": {
       "globals": {
-        "crypto.getRandomValues": true
+        "clearTimeout": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
+      }
+    },
+    "ethers>@ethersproject/wordlists": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "@ethersproject/hash": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
       }
     },
     "extension-port-stream": {
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index 43f83e019cee..304da136a56f 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -191,64 +191,27 @@
         "console.log": true
       },
       "packages": {
-        "@ethersproject/abi>@ethersproject/address": true,
-        "@ethersproject/abi>@ethersproject/constants": true,
-        "@ethersproject/abi>@ethersproject/keccak256": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/abi>@ethersproject/strings": true,
         "@ethersproject/bignumber": true,
         "@ethersproject/bytes": true,
-        "@ethersproject/hash": true
-      }
-    },
-    "@ethersproject/abi>@ethersproject/address": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/keccak256": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "@ethersproject/providers>@ethersproject/rlp": true
-      }
-    },
-    "@ethersproject/abi>@ethersproject/constants": {
-      "packages": {
-        "@ethersproject/bignumber": true
-      }
-    },
-    "@ethersproject/abi>@ethersproject/keccak256": {
-      "packages": {
-        "@ethersproject/bytes": true,
-        "@metamask/ethjs>js-sha3": true
-      }
-    },
-    "@ethersproject/abi>@ethersproject/logger": {
-      "globals": {
-        "console": true
-      }
-    },
-    "@ethersproject/abi>@ethersproject/properties": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true
-      }
-    },
-    "@ethersproject/abi>@ethersproject/strings": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/constants": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/bytes": true
+        "@ethersproject/hash": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/constants": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
       }
     },
     "@ethersproject/bignumber": {
       "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
         "@ethersproject/bytes": true,
-        "bn.js": true
+        "bn.js": true,
+        "ethers>@ethersproject/logger": true
       }
     },
     "@ethersproject/bytes": {
       "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true
+        "ethers>@ethersproject/logger": true
       }
     },
     "@ethersproject/contracts": {
@@ -257,116 +220,41 @@
       },
       "packages": {
         "@ethersproject/abi": true,
-        "@ethersproject/abi>@ethersproject/address": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
         "@ethersproject/bignumber": true,
         "@ethersproject/bytes": true,
-        "@ethersproject/hash>@ethersproject/abstract-signer": true,
-        "@ethersproject/hdnode>@ethersproject/transactions": true,
-        "@ethersproject/wallet>@ethersproject/abstract-provider": true
+        "ethers>@ethersproject/abstract-provider": true,
+        "ethers>@ethersproject/abstract-signer": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/transactions": true
       }
     },
     "@ethersproject/hash": {
       "packages": {
-        "@ethersproject/abi>@ethersproject/address": true,
-        "@ethersproject/abi>@ethersproject/keccak256": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/abi>@ethersproject/strings": true,
         "@ethersproject/bignumber": true,
         "@ethersproject/bytes": true,
-        "@ethersproject/hash>@ethersproject/base64": true
-      }
-    },
-    "@ethersproject/hash>@ethersproject/abstract-signer": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true
-      }
-    },
-    "@ethersproject/hash>@ethersproject/base64": {
-      "globals": {
-        "atob": true,
-        "btoa": true
-      },
-      "packages": {
-        "@ethersproject/bytes": true
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
       }
     },
     "@ethersproject/hdnode": {
       "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/abi>@ethersproject/strings": true,
         "@ethersproject/bignumber": true,
         "@ethersproject/bytes": true,
-        "@ethersproject/hdnode>@ethersproject/basex": true,
-        "@ethersproject/hdnode>@ethersproject/pbkdf2": true,
-        "@ethersproject/hdnode>@ethersproject/sha2": true,
-        "@ethersproject/hdnode>@ethersproject/signing-key": true,
-        "@ethersproject/hdnode>@ethersproject/transactions": true,
-        "@ethersproject/hdnode>@ethersproject/wordlists": true
-      }
-    },
-    "@ethersproject/hdnode>@ethersproject/basex": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/bytes": true
-      }
-    },
-    "@ethersproject/hdnode>@ethersproject/pbkdf2": {
-      "packages": {
-        "@ethersproject/bytes": true,
-        "@ethersproject/hdnode>@ethersproject/sha2": true
-      }
-    },
-    "@ethersproject/hdnode>@ethersproject/sha2": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/bytes": true,
-        "ethereumjs-util>ethereum-cryptography>hash.js": true
-      }
-    },
-    "@ethersproject/hdnode>@ethersproject/signing-key": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/bytes": true,
-        "@ethersproject/hdnode>@ethersproject/signing-key>elliptic": true
-      }
-    },
-    "@ethersproject/hdnode>@ethersproject/signing-key>elliptic": {
-      "packages": {
-        "@metamask/ppom-validator>elliptic>brorand": true,
-        "@metamask/ppom-validator>elliptic>hmac-drbg": true,
-        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
-        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
-        "bn.js": true,
-        "ethereumjs-util>ethereum-cryptography>hash.js": true,
-        "pumpify>inherits": true
-      }
-    },
-    "@ethersproject/hdnode>@ethersproject/transactions": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/address": true,
-        "@ethersproject/abi>@ethersproject/constants": true,
-        "@ethersproject/abi>@ethersproject/keccak256": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "@ethersproject/hdnode>@ethersproject/signing-key": true,
-        "@ethersproject/providers>@ethersproject/rlp": true
-      }
-    },
-    "@ethersproject/hdnode>@ethersproject/wordlists": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/abi>@ethersproject/strings": true,
-        "@ethersproject/bytes": true,
-        "@ethersproject/hash": true
+        "ethers>@ethersproject/basex": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/pbkdf2": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/sha2": true,
+        "ethers>@ethersproject/signing-key": true,
+        "ethers>@ethersproject/strings": true,
+        "ethers>@ethersproject/transactions": true,
+        "ethers>@ethersproject/wordlists": true
       }
     },
     "@ethersproject/providers": {
@@ -380,24 +268,24 @@
         "setTimeout": true
       },
       "packages": {
-        "@ethersproject/abi>@ethersproject/address": true,
-        "@ethersproject/abi>@ethersproject/constants": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/abi>@ethersproject/strings": true,
         "@ethersproject/bignumber": true,
         "@ethersproject/bytes": true,
         "@ethersproject/hash": true,
-        "@ethersproject/hash>@ethersproject/abstract-signer": true,
-        "@ethersproject/hash>@ethersproject/base64": true,
-        "@ethersproject/hdnode>@ethersproject/basex": true,
-        "@ethersproject/hdnode>@ethersproject/sha2": true,
-        "@ethersproject/hdnode>@ethersproject/transactions": true,
         "@ethersproject/providers>@ethersproject/web": true,
         "@ethersproject/providers>bech32": true,
-        "@ethersproject/wallet>@ethersproject/abstract-provider": true,
-        "@ethersproject/wallet>@ethersproject/random": true,
-        "@metamask/test-bundler>@ethersproject/networks": true
+        "@metamask/test-bundler>@ethersproject/networks": true,
+        "ethers>@ethersproject/abstract-provider": true,
+        "ethers>@ethersproject/abstract-signer": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/basex": true,
+        "ethers>@ethersproject/constants": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/random": true,
+        "ethers>@ethersproject/sha2": true,
+        "ethers>@ethersproject/strings": true,
+        "ethers>@ethersproject/transactions": true
       }
     },
     "@ethersproject/providers>@ethersproject/random": {
@@ -405,12 +293,6 @@
         "crypto.getRandomValues": true
       }
     },
-    "@ethersproject/providers>@ethersproject/rlp": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/bytes": true
-      }
-    },
     "@ethersproject/providers>@ethersproject/web": {
       "globals": {
         "clearTimeout": true,
@@ -418,63 +300,28 @@
         "setTimeout": true
       },
       "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/abi>@ethersproject/strings": true,
         "@ethersproject/bytes": true,
-        "@ethersproject/hash>@ethersproject/base64": true
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
       }
     },
     "@ethersproject/wallet": {
       "packages": {
-        "@ethersproject/abi>@ethersproject/address": true,
-        "@ethersproject/abi>@ethersproject/keccak256": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
         "@ethersproject/bytes": true,
         "@ethersproject/hash": true,
-        "@ethersproject/hash>@ethersproject/abstract-signer": true,
-        "@ethersproject/hdnode": true,
-        "@ethersproject/hdnode>@ethersproject/signing-key": true,
-        "@ethersproject/hdnode>@ethersproject/transactions": true,
-        "@ethersproject/wallet>@ethersproject/abstract-provider": true,
-        "@ethersproject/wallet>@ethersproject/json-wallets": true,
-        "@ethersproject/wallet>@ethersproject/random": true
-      }
-    },
-    "@ethersproject/wallet>@ethersproject/abstract-provider": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true
-      }
-    },
-    "@ethersproject/wallet>@ethersproject/json-wallets": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/address": true,
-        "@ethersproject/abi>@ethersproject/keccak256": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/abi>@ethersproject/strings": true,
-        "@ethersproject/bytes": true,
         "@ethersproject/hdnode": true,
-        "@ethersproject/hdnode>@ethersproject/pbkdf2": true,
-        "@ethersproject/hdnode>@ethersproject/transactions": true,
-        "@ethersproject/wallet>@ethersproject/json-wallets>aes-js": true,
-        "@ethersproject/wallet>@ethersproject/random": true,
-        "ethereumjs-util>ethereum-cryptography>scrypt-js": true
-      }
-    },
-    "@ethersproject/wallet>@ethersproject/json-wallets>aes-js": {
-      "globals": {
-        "define": true
-      }
-    },
-    "@ethersproject/wallet>@ethersproject/random": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/bytes": true
+        "ethers>@ethersproject/abstract-provider": true,
+        "ethers>@ethersproject/abstract-signer": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/json-wallets": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/random": true,
+        "ethers>@ethersproject/signing-key": true,
+        "ethers>@ethersproject/transactions": true
       }
     },
     "@keystonehq/bc-ur-registry-eth": {
@@ -847,7 +694,6 @@
       },
       "packages": {
         "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethersproject/abi>@ethersproject/address": true,
         "@ethersproject/contracts": true,
         "@ethersproject/providers": true,
         "@metamask/abi-utils": true,
@@ -863,6 +709,7 @@
         "@metamask/utils": true,
         "bn.js": true,
         "cockatiel": true,
+        "ethers>@ethersproject/address": true,
         "lodash": true,
         "single-call-balance-checker-abi": true,
         "uuid": true
@@ -1590,7 +1437,7 @@
         "crypto-browserify>randombytes": true,
         "eth-lattice-keyring>gridplus-sdk>aes-js": true,
         "ethereumjs-util>ethereum-cryptography>bs58check": true,
-        "ethereumjs-util>ethereum-cryptography>scrypt-js": true,
+        "ethers>@ethersproject/json-wallets>scrypt-js": true,
         "uuid": true
       }
     },
@@ -1601,8 +1448,8 @@
         "crypto-browserify>create-hmac": true,
         "crypto-browserify>randombytes": true,
         "ethereumjs-util>ethereum-cryptography>bs58check": true,
-        "ethereumjs-util>ethereum-cryptography>hash.js": true,
         "ethereumjs-util>ethereum-cryptography>keccak": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
         "ganache>secp256k1": true,
         "koa>content-disposition>safe-buffer": true
       }
@@ -2217,7 +2064,7 @@
         "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
         "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
         "bn.js": true,
-        "ethereumjs-util>ethereum-cryptography>hash.js": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
         "pumpify>inherits": true
       }
     },
@@ -2234,7 +2081,7 @@
       "packages": {
         "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
         "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
-        "ethereumjs-util>ethereum-cryptography>hash.js": true
+        "ethers>@ethersproject/sha2>hash.js": true
       }
     },
     "@metamask/profile-sync-controller": {
@@ -2269,7 +2116,7 @@
         "@metamask/controller-utils>@spruceid/siwe-parser>valid-url": true,
         "@metamask/profile-sync-controller>siwe>@spruceid/siwe-parser": true,
         "@metamask/profile-sync-controller>siwe>@stablelib/random": true,
-        "@metamask/test-bundler>ethers": true
+        "ethers": true
       }
     },
     "@metamask/profile-sync-controller>siwe>@spruceid/siwe-parser": {
@@ -3018,54 +2865,7 @@
     },
     "@metamask/test-bundler>@ethersproject/networks": {
       "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true
-      }
-    },
-    "@metamask/test-bundler>ethers": {
-      "packages": {
-        "@ethersproject/abi": true,
-        "@ethersproject/abi>@ethersproject/address": true,
-        "@ethersproject/abi>@ethersproject/constants": true,
-        "@ethersproject/abi>@ethersproject/keccak256": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/abi>@ethersproject/strings": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "@ethersproject/contracts": true,
-        "@ethersproject/hash": true,
-        "@ethersproject/hash>@ethersproject/abstract-signer": true,
-        "@ethersproject/hash>@ethersproject/base64": true,
-        "@ethersproject/hdnode": true,
-        "@ethersproject/hdnode>@ethersproject/basex": true,
-        "@ethersproject/hdnode>@ethersproject/sha2": true,
-        "@ethersproject/hdnode>@ethersproject/signing-key": true,
-        "@ethersproject/hdnode>@ethersproject/transactions": true,
-        "@ethersproject/hdnode>@ethersproject/wordlists": true,
-        "@ethersproject/providers": true,
-        "@ethersproject/providers>@ethersproject/rlp": true,
-        "@ethersproject/providers>@ethersproject/web": true,
-        "@ethersproject/wallet": true,
-        "@ethersproject/wallet>@ethersproject/json-wallets": true,
-        "@ethersproject/wallet>@ethersproject/random": true,
-        "@metamask/test-bundler>ethers>@ethersproject/solidity": true,
-        "@metamask/test-bundler>ethers>@ethersproject/units": true
-      }
-    },
-    "@metamask/test-bundler>ethers>@ethersproject/solidity": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/keccak256": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/strings": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "@ethersproject/hdnode>@ethersproject/sha2": true
-      }
-    },
-    "@metamask/test-bundler>ethers>@ethersproject/units": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/bignumber": true
+        "ethers>@ethersproject/logger": true
       }
     },
     "@metamask/transaction-controller": {
@@ -4244,7 +4044,7 @@
         "eth-lattice-keyring>gridplus-sdk>secp256k1": true,
         "eth-lattice-keyring>gridplus-sdk>uuid": true,
         "ethereumjs-util>ethereum-cryptography>bs58check": true,
-        "ethereumjs-util>ethereum-cryptography>hash.js": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
         "lodash": true
       }
     },
@@ -4338,7 +4138,7 @@
         "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
         "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
         "bn.js": true,
-        "ethereumjs-util>ethereum-cryptography>hash.js": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
         "pumpify>inherits": true
       }
     },
@@ -4369,7 +4169,7 @@
         "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
         "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
         "bn.js": true,
-        "ethereumjs-util>ethereum-cryptography>hash.js": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
         "pumpify>inherits": true
       }
     },
@@ -4478,19 +4278,119 @@
         "@ensdomains/content-hash>multihashes>multibase>base-x": true
       }
     },
-    "ethereumjs-util>ethereum-cryptography>hash.js": {
-      "packages": {
-        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
-        "pumpify>inherits": true
-      }
-    },
     "ethereumjs-util>ethereum-cryptography>keccak": {
       "packages": {
         "browserify>buffer": true,
         "readable-stream": true
       }
     },
-    "ethereumjs-util>ethereum-cryptography>scrypt-js": {
+    "ethereumjs-util>rlp": {
+      "packages": {
+        "bn.js": true,
+        "browserify>buffer": true
+      }
+    },
+    "ethereumjs-wallet>randombytes": {
+      "globals": {
+        "crypto.getRandomValues": true
+      }
+    },
+    "ethers": {
+      "packages": {
+        "@ethersproject/abi": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "@ethersproject/contracts": true,
+        "@ethersproject/hash": true,
+        "@ethersproject/hdnode": true,
+        "@ethersproject/wallet": true,
+        "ethers>@ethersproject/abstract-signer": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/basex": true,
+        "ethers>@ethersproject/constants": true,
+        "ethers>@ethersproject/json-wallets": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/providers": true,
+        "ethers>@ethersproject/random": true,
+        "ethers>@ethersproject/rlp": true,
+        "ethers>@ethersproject/sha2": true,
+        "ethers>@ethersproject/signing-key": true,
+        "ethers>@ethersproject/solidity": true,
+        "ethers>@ethersproject/strings": true,
+        "ethers>@ethersproject/transactions": true,
+        "ethers>@ethersproject/units": true,
+        "ethers>@ethersproject/web": true,
+        "ethers>@ethersproject/wordlists": true
+      }
+    },
+    "ethers>@ethersproject/abstract-provider": {
+      "packages": {
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true
+      }
+    },
+    "ethers>@ethersproject/abstract-signer": {
+      "packages": {
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true
+      }
+    },
+    "ethers>@ethersproject/address": {
+      "packages": {
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/rlp": true
+      }
+    },
+    "ethers>@ethersproject/base64": {
+      "globals": {
+        "atob": true,
+        "btoa": true
+      },
+      "packages": {
+        "@ethersproject/bytes": true
+      }
+    },
+    "ethers>@ethersproject/basex": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/properties": true
+      }
+    },
+    "ethers>@ethersproject/constants": {
+      "packages": {
+        "@ethersproject/bignumber": true
+      }
+    },
+    "ethers>@ethersproject/json-wallets": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "@ethersproject/hdnode": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/json-wallets>aes-js": true,
+        "ethers>@ethersproject/json-wallets>scrypt-js": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/pbkdf2": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/random": true,
+        "ethers>@ethersproject/strings": true,
+        "ethers>@ethersproject/transactions": true
+      }
+    },
+    "ethers>@ethersproject/json-wallets>aes-js": {
+      "globals": {
+        "define": true
+      }
+    },
+    "ethers>@ethersproject/json-wallets>scrypt-js": {
       "globals": {
         "define": true,
         "setTimeout": true
@@ -4499,15 +4399,179 @@
         "browserify>timers-browserify": true
       }
     },
-    "ethereumjs-util>rlp": {
+    "ethers>@ethersproject/keccak256": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "@metamask/ethjs>js-sha3": true
+      }
+    },
+    "ethers>@ethersproject/logger": {
+      "globals": {
+        "console": true
+      }
+    },
+    "ethers>@ethersproject/pbkdf2": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/sha2": true
+      }
+    },
+    "ethers>@ethersproject/properties": {
+      "packages": {
+        "ethers>@ethersproject/logger": true
+      }
+    },
+    "ethers>@ethersproject/providers": {
+      "globals": {
+        "WebSocket": true,
+        "clearInterval": true,
+        "clearTimeout": true,
+        "console.log": true,
+        "console.warn": true,
+        "setInterval": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "@ethersproject/hash": true,
+        "ethers>@ethersproject/abstract-provider": true,
+        "ethers>@ethersproject/abstract-signer": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/basex": true,
+        "ethers>@ethersproject/constants": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/providers>@ethersproject/networks": true,
+        "ethers>@ethersproject/providers>@ethersproject/web": true,
+        "ethers>@ethersproject/providers>bech32": true,
+        "ethers>@ethersproject/random": true,
+        "ethers>@ethersproject/sha2": true,
+        "ethers>@ethersproject/strings": true,
+        "ethers>@ethersproject/transactions": true
+      }
+    },
+    "ethers>@ethersproject/providers>@ethersproject/networks": {
       "packages": {
+        "ethers>@ethersproject/logger": true
+      }
+    },
+    "ethers>@ethersproject/providers>@ethersproject/web": {
+      "globals": {
+        "clearTimeout": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
+      }
+    },
+    "ethers>@ethersproject/random": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true
+      }
+    },
+    "ethers>@ethersproject/rlp": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true
+      }
+    },
+    "ethers>@ethersproject/sha2": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/sha2>hash.js": true
+      }
+    },
+    "ethers>@ethersproject/sha2>hash.js": {
+      "packages": {
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
+        "pumpify>inherits": true
+      }
+    },
+    "ethers>@ethersproject/signing-key": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/signing-key>elliptic": true
+      }
+    },
+    "ethers>@ethersproject/signing-key>elliptic": {
+      "packages": {
+        "@metamask/ppom-validator>elliptic>brorand": true,
+        "@metamask/ppom-validator>elliptic>hmac-drbg": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
         "bn.js": true,
-        "browserify>buffer": true
+        "ethers>@ethersproject/sha2>hash.js": true,
+        "pumpify>inherits": true
       }
     },
-    "ethereumjs-wallet>randombytes": {
+    "ethers>@ethersproject/solidity": {
+      "packages": {
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/sha2": true,
+        "ethers>@ethersproject/strings": true
+      }
+    },
+    "ethers>@ethersproject/strings": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/constants": true,
+        "ethers>@ethersproject/logger": true
+      }
+    },
+    "ethers>@ethersproject/transactions": {
+      "packages": {
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/constants": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/rlp": true,
+        "ethers>@ethersproject/signing-key": true
+      }
+    },
+    "ethers>@ethersproject/units": {
+      "packages": {
+        "@ethersproject/bignumber": true,
+        "ethers>@ethersproject/logger": true
+      }
+    },
+    "ethers>@ethersproject/web": {
       "globals": {
-        "crypto.getRandomValues": true
+        "clearTimeout": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
+      }
+    },
+    "ethers>@ethersproject/wordlists": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "@ethersproject/hash": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
       }
     },
     "extension-port-stream": {
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index 43f83e019cee..304da136a56f 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -191,64 +191,27 @@
         "console.log": true
       },
       "packages": {
-        "@ethersproject/abi>@ethersproject/address": true,
-        "@ethersproject/abi>@ethersproject/constants": true,
-        "@ethersproject/abi>@ethersproject/keccak256": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/abi>@ethersproject/strings": true,
         "@ethersproject/bignumber": true,
         "@ethersproject/bytes": true,
-        "@ethersproject/hash": true
-      }
-    },
-    "@ethersproject/abi>@ethersproject/address": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/keccak256": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "@ethersproject/providers>@ethersproject/rlp": true
-      }
-    },
-    "@ethersproject/abi>@ethersproject/constants": {
-      "packages": {
-        "@ethersproject/bignumber": true
-      }
-    },
-    "@ethersproject/abi>@ethersproject/keccak256": {
-      "packages": {
-        "@ethersproject/bytes": true,
-        "@metamask/ethjs>js-sha3": true
-      }
-    },
-    "@ethersproject/abi>@ethersproject/logger": {
-      "globals": {
-        "console": true
-      }
-    },
-    "@ethersproject/abi>@ethersproject/properties": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true
-      }
-    },
-    "@ethersproject/abi>@ethersproject/strings": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/constants": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/bytes": true
+        "@ethersproject/hash": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/constants": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
       }
     },
     "@ethersproject/bignumber": {
       "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
         "@ethersproject/bytes": true,
-        "bn.js": true
+        "bn.js": true,
+        "ethers>@ethersproject/logger": true
       }
     },
     "@ethersproject/bytes": {
       "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true
+        "ethers>@ethersproject/logger": true
       }
     },
     "@ethersproject/contracts": {
@@ -257,116 +220,41 @@
       },
       "packages": {
         "@ethersproject/abi": true,
-        "@ethersproject/abi>@ethersproject/address": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
         "@ethersproject/bignumber": true,
         "@ethersproject/bytes": true,
-        "@ethersproject/hash>@ethersproject/abstract-signer": true,
-        "@ethersproject/hdnode>@ethersproject/transactions": true,
-        "@ethersproject/wallet>@ethersproject/abstract-provider": true
+        "ethers>@ethersproject/abstract-provider": true,
+        "ethers>@ethersproject/abstract-signer": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/transactions": true
       }
     },
     "@ethersproject/hash": {
       "packages": {
-        "@ethersproject/abi>@ethersproject/address": true,
-        "@ethersproject/abi>@ethersproject/keccak256": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/abi>@ethersproject/strings": true,
         "@ethersproject/bignumber": true,
         "@ethersproject/bytes": true,
-        "@ethersproject/hash>@ethersproject/base64": true
-      }
-    },
-    "@ethersproject/hash>@ethersproject/abstract-signer": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true
-      }
-    },
-    "@ethersproject/hash>@ethersproject/base64": {
-      "globals": {
-        "atob": true,
-        "btoa": true
-      },
-      "packages": {
-        "@ethersproject/bytes": true
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
       }
     },
     "@ethersproject/hdnode": {
       "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/abi>@ethersproject/strings": true,
         "@ethersproject/bignumber": true,
         "@ethersproject/bytes": true,
-        "@ethersproject/hdnode>@ethersproject/basex": true,
-        "@ethersproject/hdnode>@ethersproject/pbkdf2": true,
-        "@ethersproject/hdnode>@ethersproject/sha2": true,
-        "@ethersproject/hdnode>@ethersproject/signing-key": true,
-        "@ethersproject/hdnode>@ethersproject/transactions": true,
-        "@ethersproject/hdnode>@ethersproject/wordlists": true
-      }
-    },
-    "@ethersproject/hdnode>@ethersproject/basex": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/bytes": true
-      }
-    },
-    "@ethersproject/hdnode>@ethersproject/pbkdf2": {
-      "packages": {
-        "@ethersproject/bytes": true,
-        "@ethersproject/hdnode>@ethersproject/sha2": true
-      }
-    },
-    "@ethersproject/hdnode>@ethersproject/sha2": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/bytes": true,
-        "ethereumjs-util>ethereum-cryptography>hash.js": true
-      }
-    },
-    "@ethersproject/hdnode>@ethersproject/signing-key": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/bytes": true,
-        "@ethersproject/hdnode>@ethersproject/signing-key>elliptic": true
-      }
-    },
-    "@ethersproject/hdnode>@ethersproject/signing-key>elliptic": {
-      "packages": {
-        "@metamask/ppom-validator>elliptic>brorand": true,
-        "@metamask/ppom-validator>elliptic>hmac-drbg": true,
-        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
-        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
-        "bn.js": true,
-        "ethereumjs-util>ethereum-cryptography>hash.js": true,
-        "pumpify>inherits": true
-      }
-    },
-    "@ethersproject/hdnode>@ethersproject/transactions": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/address": true,
-        "@ethersproject/abi>@ethersproject/constants": true,
-        "@ethersproject/abi>@ethersproject/keccak256": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "@ethersproject/hdnode>@ethersproject/signing-key": true,
-        "@ethersproject/providers>@ethersproject/rlp": true
-      }
-    },
-    "@ethersproject/hdnode>@ethersproject/wordlists": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/abi>@ethersproject/strings": true,
-        "@ethersproject/bytes": true,
-        "@ethersproject/hash": true
+        "ethers>@ethersproject/basex": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/pbkdf2": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/sha2": true,
+        "ethers>@ethersproject/signing-key": true,
+        "ethers>@ethersproject/strings": true,
+        "ethers>@ethersproject/transactions": true,
+        "ethers>@ethersproject/wordlists": true
       }
     },
     "@ethersproject/providers": {
@@ -380,24 +268,24 @@
         "setTimeout": true
       },
       "packages": {
-        "@ethersproject/abi>@ethersproject/address": true,
-        "@ethersproject/abi>@ethersproject/constants": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/abi>@ethersproject/strings": true,
         "@ethersproject/bignumber": true,
         "@ethersproject/bytes": true,
         "@ethersproject/hash": true,
-        "@ethersproject/hash>@ethersproject/abstract-signer": true,
-        "@ethersproject/hash>@ethersproject/base64": true,
-        "@ethersproject/hdnode>@ethersproject/basex": true,
-        "@ethersproject/hdnode>@ethersproject/sha2": true,
-        "@ethersproject/hdnode>@ethersproject/transactions": true,
         "@ethersproject/providers>@ethersproject/web": true,
         "@ethersproject/providers>bech32": true,
-        "@ethersproject/wallet>@ethersproject/abstract-provider": true,
-        "@ethersproject/wallet>@ethersproject/random": true,
-        "@metamask/test-bundler>@ethersproject/networks": true
+        "@metamask/test-bundler>@ethersproject/networks": true,
+        "ethers>@ethersproject/abstract-provider": true,
+        "ethers>@ethersproject/abstract-signer": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/basex": true,
+        "ethers>@ethersproject/constants": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/random": true,
+        "ethers>@ethersproject/sha2": true,
+        "ethers>@ethersproject/strings": true,
+        "ethers>@ethersproject/transactions": true
       }
     },
     "@ethersproject/providers>@ethersproject/random": {
@@ -405,12 +293,6 @@
         "crypto.getRandomValues": true
       }
     },
-    "@ethersproject/providers>@ethersproject/rlp": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/bytes": true
-      }
-    },
     "@ethersproject/providers>@ethersproject/web": {
       "globals": {
         "clearTimeout": true,
@@ -418,63 +300,28 @@
         "setTimeout": true
       },
       "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/abi>@ethersproject/strings": true,
         "@ethersproject/bytes": true,
-        "@ethersproject/hash>@ethersproject/base64": true
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
       }
     },
     "@ethersproject/wallet": {
       "packages": {
-        "@ethersproject/abi>@ethersproject/address": true,
-        "@ethersproject/abi>@ethersproject/keccak256": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
         "@ethersproject/bytes": true,
         "@ethersproject/hash": true,
-        "@ethersproject/hash>@ethersproject/abstract-signer": true,
-        "@ethersproject/hdnode": true,
-        "@ethersproject/hdnode>@ethersproject/signing-key": true,
-        "@ethersproject/hdnode>@ethersproject/transactions": true,
-        "@ethersproject/wallet>@ethersproject/abstract-provider": true,
-        "@ethersproject/wallet>@ethersproject/json-wallets": true,
-        "@ethersproject/wallet>@ethersproject/random": true
-      }
-    },
-    "@ethersproject/wallet>@ethersproject/abstract-provider": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true
-      }
-    },
-    "@ethersproject/wallet>@ethersproject/json-wallets": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/address": true,
-        "@ethersproject/abi>@ethersproject/keccak256": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/abi>@ethersproject/strings": true,
-        "@ethersproject/bytes": true,
         "@ethersproject/hdnode": true,
-        "@ethersproject/hdnode>@ethersproject/pbkdf2": true,
-        "@ethersproject/hdnode>@ethersproject/transactions": true,
-        "@ethersproject/wallet>@ethersproject/json-wallets>aes-js": true,
-        "@ethersproject/wallet>@ethersproject/random": true,
-        "ethereumjs-util>ethereum-cryptography>scrypt-js": true
-      }
-    },
-    "@ethersproject/wallet>@ethersproject/json-wallets>aes-js": {
-      "globals": {
-        "define": true
-      }
-    },
-    "@ethersproject/wallet>@ethersproject/random": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/bytes": true
+        "ethers>@ethersproject/abstract-provider": true,
+        "ethers>@ethersproject/abstract-signer": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/json-wallets": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/random": true,
+        "ethers>@ethersproject/signing-key": true,
+        "ethers>@ethersproject/transactions": true
       }
     },
     "@keystonehq/bc-ur-registry-eth": {
@@ -847,7 +694,6 @@
       },
       "packages": {
         "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethersproject/abi>@ethersproject/address": true,
         "@ethersproject/contracts": true,
         "@ethersproject/providers": true,
         "@metamask/abi-utils": true,
@@ -863,6 +709,7 @@
         "@metamask/utils": true,
         "bn.js": true,
         "cockatiel": true,
+        "ethers>@ethersproject/address": true,
         "lodash": true,
         "single-call-balance-checker-abi": true,
         "uuid": true
@@ -1590,7 +1437,7 @@
         "crypto-browserify>randombytes": true,
         "eth-lattice-keyring>gridplus-sdk>aes-js": true,
         "ethereumjs-util>ethereum-cryptography>bs58check": true,
-        "ethereumjs-util>ethereum-cryptography>scrypt-js": true,
+        "ethers>@ethersproject/json-wallets>scrypt-js": true,
         "uuid": true
       }
     },
@@ -1601,8 +1448,8 @@
         "crypto-browserify>create-hmac": true,
         "crypto-browserify>randombytes": true,
         "ethereumjs-util>ethereum-cryptography>bs58check": true,
-        "ethereumjs-util>ethereum-cryptography>hash.js": true,
         "ethereumjs-util>ethereum-cryptography>keccak": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
         "ganache>secp256k1": true,
         "koa>content-disposition>safe-buffer": true
       }
@@ -2217,7 +2064,7 @@
         "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
         "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
         "bn.js": true,
-        "ethereumjs-util>ethereum-cryptography>hash.js": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
         "pumpify>inherits": true
       }
     },
@@ -2234,7 +2081,7 @@
       "packages": {
         "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
         "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
-        "ethereumjs-util>ethereum-cryptography>hash.js": true
+        "ethers>@ethersproject/sha2>hash.js": true
       }
     },
     "@metamask/profile-sync-controller": {
@@ -2269,7 +2116,7 @@
         "@metamask/controller-utils>@spruceid/siwe-parser>valid-url": true,
         "@metamask/profile-sync-controller>siwe>@spruceid/siwe-parser": true,
         "@metamask/profile-sync-controller>siwe>@stablelib/random": true,
-        "@metamask/test-bundler>ethers": true
+        "ethers": true
       }
     },
     "@metamask/profile-sync-controller>siwe>@spruceid/siwe-parser": {
@@ -3018,54 +2865,7 @@
     },
     "@metamask/test-bundler>@ethersproject/networks": {
       "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true
-      }
-    },
-    "@metamask/test-bundler>ethers": {
-      "packages": {
-        "@ethersproject/abi": true,
-        "@ethersproject/abi>@ethersproject/address": true,
-        "@ethersproject/abi>@ethersproject/constants": true,
-        "@ethersproject/abi>@ethersproject/keccak256": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/abi>@ethersproject/strings": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "@ethersproject/contracts": true,
-        "@ethersproject/hash": true,
-        "@ethersproject/hash>@ethersproject/abstract-signer": true,
-        "@ethersproject/hash>@ethersproject/base64": true,
-        "@ethersproject/hdnode": true,
-        "@ethersproject/hdnode>@ethersproject/basex": true,
-        "@ethersproject/hdnode>@ethersproject/sha2": true,
-        "@ethersproject/hdnode>@ethersproject/signing-key": true,
-        "@ethersproject/hdnode>@ethersproject/transactions": true,
-        "@ethersproject/hdnode>@ethersproject/wordlists": true,
-        "@ethersproject/providers": true,
-        "@ethersproject/providers>@ethersproject/rlp": true,
-        "@ethersproject/providers>@ethersproject/web": true,
-        "@ethersproject/wallet": true,
-        "@ethersproject/wallet>@ethersproject/json-wallets": true,
-        "@ethersproject/wallet>@ethersproject/random": true,
-        "@metamask/test-bundler>ethers>@ethersproject/solidity": true,
-        "@metamask/test-bundler>ethers>@ethersproject/units": true
-      }
-    },
-    "@metamask/test-bundler>ethers>@ethersproject/solidity": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/keccak256": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/strings": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "@ethersproject/hdnode>@ethersproject/sha2": true
-      }
-    },
-    "@metamask/test-bundler>ethers>@ethersproject/units": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/bignumber": true
+        "ethers>@ethersproject/logger": true
       }
     },
     "@metamask/transaction-controller": {
@@ -4244,7 +4044,7 @@
         "eth-lattice-keyring>gridplus-sdk>secp256k1": true,
         "eth-lattice-keyring>gridplus-sdk>uuid": true,
         "ethereumjs-util>ethereum-cryptography>bs58check": true,
-        "ethereumjs-util>ethereum-cryptography>hash.js": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
         "lodash": true
       }
     },
@@ -4338,7 +4138,7 @@
         "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
         "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
         "bn.js": true,
-        "ethereumjs-util>ethereum-cryptography>hash.js": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
         "pumpify>inherits": true
       }
     },
@@ -4369,7 +4169,7 @@
         "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
         "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
         "bn.js": true,
-        "ethereumjs-util>ethereum-cryptography>hash.js": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
         "pumpify>inherits": true
       }
     },
@@ -4478,19 +4278,119 @@
         "@ensdomains/content-hash>multihashes>multibase>base-x": true
       }
     },
-    "ethereumjs-util>ethereum-cryptography>hash.js": {
-      "packages": {
-        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
-        "pumpify>inherits": true
-      }
-    },
     "ethereumjs-util>ethereum-cryptography>keccak": {
       "packages": {
         "browserify>buffer": true,
         "readable-stream": true
       }
     },
-    "ethereumjs-util>ethereum-cryptography>scrypt-js": {
+    "ethereumjs-util>rlp": {
+      "packages": {
+        "bn.js": true,
+        "browserify>buffer": true
+      }
+    },
+    "ethereumjs-wallet>randombytes": {
+      "globals": {
+        "crypto.getRandomValues": true
+      }
+    },
+    "ethers": {
+      "packages": {
+        "@ethersproject/abi": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "@ethersproject/contracts": true,
+        "@ethersproject/hash": true,
+        "@ethersproject/hdnode": true,
+        "@ethersproject/wallet": true,
+        "ethers>@ethersproject/abstract-signer": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/basex": true,
+        "ethers>@ethersproject/constants": true,
+        "ethers>@ethersproject/json-wallets": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/providers": true,
+        "ethers>@ethersproject/random": true,
+        "ethers>@ethersproject/rlp": true,
+        "ethers>@ethersproject/sha2": true,
+        "ethers>@ethersproject/signing-key": true,
+        "ethers>@ethersproject/solidity": true,
+        "ethers>@ethersproject/strings": true,
+        "ethers>@ethersproject/transactions": true,
+        "ethers>@ethersproject/units": true,
+        "ethers>@ethersproject/web": true,
+        "ethers>@ethersproject/wordlists": true
+      }
+    },
+    "ethers>@ethersproject/abstract-provider": {
+      "packages": {
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true
+      }
+    },
+    "ethers>@ethersproject/abstract-signer": {
+      "packages": {
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true
+      }
+    },
+    "ethers>@ethersproject/address": {
+      "packages": {
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/rlp": true
+      }
+    },
+    "ethers>@ethersproject/base64": {
+      "globals": {
+        "atob": true,
+        "btoa": true
+      },
+      "packages": {
+        "@ethersproject/bytes": true
+      }
+    },
+    "ethers>@ethersproject/basex": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/properties": true
+      }
+    },
+    "ethers>@ethersproject/constants": {
+      "packages": {
+        "@ethersproject/bignumber": true
+      }
+    },
+    "ethers>@ethersproject/json-wallets": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "@ethersproject/hdnode": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/json-wallets>aes-js": true,
+        "ethers>@ethersproject/json-wallets>scrypt-js": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/pbkdf2": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/random": true,
+        "ethers>@ethersproject/strings": true,
+        "ethers>@ethersproject/transactions": true
+      }
+    },
+    "ethers>@ethersproject/json-wallets>aes-js": {
+      "globals": {
+        "define": true
+      }
+    },
+    "ethers>@ethersproject/json-wallets>scrypt-js": {
       "globals": {
         "define": true,
         "setTimeout": true
@@ -4499,15 +4399,179 @@
         "browserify>timers-browserify": true
       }
     },
-    "ethereumjs-util>rlp": {
+    "ethers>@ethersproject/keccak256": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "@metamask/ethjs>js-sha3": true
+      }
+    },
+    "ethers>@ethersproject/logger": {
+      "globals": {
+        "console": true
+      }
+    },
+    "ethers>@ethersproject/pbkdf2": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/sha2": true
+      }
+    },
+    "ethers>@ethersproject/properties": {
+      "packages": {
+        "ethers>@ethersproject/logger": true
+      }
+    },
+    "ethers>@ethersproject/providers": {
+      "globals": {
+        "WebSocket": true,
+        "clearInterval": true,
+        "clearTimeout": true,
+        "console.log": true,
+        "console.warn": true,
+        "setInterval": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "@ethersproject/hash": true,
+        "ethers>@ethersproject/abstract-provider": true,
+        "ethers>@ethersproject/abstract-signer": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/basex": true,
+        "ethers>@ethersproject/constants": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/providers>@ethersproject/networks": true,
+        "ethers>@ethersproject/providers>@ethersproject/web": true,
+        "ethers>@ethersproject/providers>bech32": true,
+        "ethers>@ethersproject/random": true,
+        "ethers>@ethersproject/sha2": true,
+        "ethers>@ethersproject/strings": true,
+        "ethers>@ethersproject/transactions": true
+      }
+    },
+    "ethers>@ethersproject/providers>@ethersproject/networks": {
       "packages": {
+        "ethers>@ethersproject/logger": true
+      }
+    },
+    "ethers>@ethersproject/providers>@ethersproject/web": {
+      "globals": {
+        "clearTimeout": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
+      }
+    },
+    "ethers>@ethersproject/random": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true
+      }
+    },
+    "ethers>@ethersproject/rlp": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true
+      }
+    },
+    "ethers>@ethersproject/sha2": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/sha2>hash.js": true
+      }
+    },
+    "ethers>@ethersproject/sha2>hash.js": {
+      "packages": {
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
+        "pumpify>inherits": true
+      }
+    },
+    "ethers>@ethersproject/signing-key": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/signing-key>elliptic": true
+      }
+    },
+    "ethers>@ethersproject/signing-key>elliptic": {
+      "packages": {
+        "@metamask/ppom-validator>elliptic>brorand": true,
+        "@metamask/ppom-validator>elliptic>hmac-drbg": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
         "bn.js": true,
-        "browserify>buffer": true
+        "ethers>@ethersproject/sha2>hash.js": true,
+        "pumpify>inherits": true
       }
     },
-    "ethereumjs-wallet>randombytes": {
+    "ethers>@ethersproject/solidity": {
+      "packages": {
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/sha2": true,
+        "ethers>@ethersproject/strings": true
+      }
+    },
+    "ethers>@ethersproject/strings": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/constants": true,
+        "ethers>@ethersproject/logger": true
+      }
+    },
+    "ethers>@ethersproject/transactions": {
+      "packages": {
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/constants": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/rlp": true,
+        "ethers>@ethersproject/signing-key": true
+      }
+    },
+    "ethers>@ethersproject/units": {
+      "packages": {
+        "@ethersproject/bignumber": true,
+        "ethers>@ethersproject/logger": true
+      }
+    },
+    "ethers>@ethersproject/web": {
       "globals": {
-        "crypto.getRandomValues": true
+        "clearTimeout": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
+      }
+    },
+    "ethers>@ethersproject/wordlists": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "@ethersproject/hash": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
       }
     },
     "extension-port-stream": {
diff --git a/lavamoat/browserify/mmi/policy.json b/lavamoat/browserify/mmi/policy.json
index 7641b2869288..756f31eaeb55 100644
--- a/lavamoat/browserify/mmi/policy.json
+++ b/lavamoat/browserify/mmi/policy.json
@@ -191,64 +191,27 @@
         "console.log": true
       },
       "packages": {
-        "@ethersproject/abi>@ethersproject/address": true,
-        "@ethersproject/abi>@ethersproject/constants": true,
-        "@ethersproject/abi>@ethersproject/keccak256": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/abi>@ethersproject/strings": true,
         "@ethersproject/bignumber": true,
         "@ethersproject/bytes": true,
-        "@ethersproject/hash": true
-      }
-    },
-    "@ethersproject/abi>@ethersproject/address": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/keccak256": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "@ethersproject/providers>@ethersproject/rlp": true
-      }
-    },
-    "@ethersproject/abi>@ethersproject/constants": {
-      "packages": {
-        "@ethersproject/bignumber": true
-      }
-    },
-    "@ethersproject/abi>@ethersproject/keccak256": {
-      "packages": {
-        "@ethersproject/bytes": true,
-        "@metamask/ethjs>js-sha3": true
-      }
-    },
-    "@ethersproject/abi>@ethersproject/logger": {
-      "globals": {
-        "console": true
-      }
-    },
-    "@ethersproject/abi>@ethersproject/properties": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true
-      }
-    },
-    "@ethersproject/abi>@ethersproject/strings": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/constants": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/bytes": true
+        "@ethersproject/hash": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/constants": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
       }
     },
     "@ethersproject/bignumber": {
       "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
         "@ethersproject/bytes": true,
-        "bn.js": true
+        "bn.js": true,
+        "ethers>@ethersproject/logger": true
       }
     },
     "@ethersproject/bytes": {
       "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true
+        "ethers>@ethersproject/logger": true
       }
     },
     "@ethersproject/contracts": {
@@ -257,116 +220,41 @@
       },
       "packages": {
         "@ethersproject/abi": true,
-        "@ethersproject/abi>@ethersproject/address": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
         "@ethersproject/bignumber": true,
         "@ethersproject/bytes": true,
-        "@ethersproject/hash>@ethersproject/abstract-signer": true,
-        "@ethersproject/hdnode>@ethersproject/transactions": true,
-        "@ethersproject/wallet>@ethersproject/abstract-provider": true
+        "ethers>@ethersproject/abstract-provider": true,
+        "ethers>@ethersproject/abstract-signer": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/transactions": true
       }
     },
     "@ethersproject/hash": {
       "packages": {
-        "@ethersproject/abi>@ethersproject/address": true,
-        "@ethersproject/abi>@ethersproject/keccak256": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/abi>@ethersproject/strings": true,
         "@ethersproject/bignumber": true,
         "@ethersproject/bytes": true,
-        "@ethersproject/hash>@ethersproject/base64": true
-      }
-    },
-    "@ethersproject/hash>@ethersproject/abstract-signer": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true
-      }
-    },
-    "@ethersproject/hash>@ethersproject/base64": {
-      "globals": {
-        "atob": true,
-        "btoa": true
-      },
-      "packages": {
-        "@ethersproject/bytes": true
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
       }
     },
     "@ethersproject/hdnode": {
       "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/abi>@ethersproject/strings": true,
         "@ethersproject/bignumber": true,
         "@ethersproject/bytes": true,
-        "@ethersproject/hdnode>@ethersproject/basex": true,
-        "@ethersproject/hdnode>@ethersproject/pbkdf2": true,
-        "@ethersproject/hdnode>@ethersproject/sha2": true,
-        "@ethersproject/hdnode>@ethersproject/signing-key": true,
-        "@ethersproject/hdnode>@ethersproject/transactions": true,
-        "@ethersproject/hdnode>@ethersproject/wordlists": true
-      }
-    },
-    "@ethersproject/hdnode>@ethersproject/basex": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/bytes": true
-      }
-    },
-    "@ethersproject/hdnode>@ethersproject/pbkdf2": {
-      "packages": {
-        "@ethersproject/bytes": true,
-        "@ethersproject/hdnode>@ethersproject/sha2": true
-      }
-    },
-    "@ethersproject/hdnode>@ethersproject/sha2": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/bytes": true,
-        "ethereumjs-util>ethereum-cryptography>hash.js": true
-      }
-    },
-    "@ethersproject/hdnode>@ethersproject/signing-key": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/bytes": true,
-        "@ethersproject/hdnode>@ethersproject/signing-key>elliptic": true
-      }
-    },
-    "@ethersproject/hdnode>@ethersproject/signing-key>elliptic": {
-      "packages": {
-        "@metamask/ppom-validator>elliptic>brorand": true,
-        "@metamask/ppom-validator>elliptic>hmac-drbg": true,
-        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
-        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
-        "bn.js": true,
-        "ethereumjs-util>ethereum-cryptography>hash.js": true,
-        "pumpify>inherits": true
-      }
-    },
-    "@ethersproject/hdnode>@ethersproject/transactions": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/address": true,
-        "@ethersproject/abi>@ethersproject/constants": true,
-        "@ethersproject/abi>@ethersproject/keccak256": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "@ethersproject/hdnode>@ethersproject/signing-key": true,
-        "@ethersproject/providers>@ethersproject/rlp": true
-      }
-    },
-    "@ethersproject/hdnode>@ethersproject/wordlists": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/abi>@ethersproject/strings": true,
-        "@ethersproject/bytes": true,
-        "@ethersproject/hash": true
+        "ethers>@ethersproject/basex": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/pbkdf2": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/sha2": true,
+        "ethers>@ethersproject/signing-key": true,
+        "ethers>@ethersproject/strings": true,
+        "ethers>@ethersproject/transactions": true,
+        "ethers>@ethersproject/wordlists": true
       }
     },
     "@ethersproject/providers": {
@@ -380,24 +268,24 @@
         "setTimeout": true
       },
       "packages": {
-        "@ethersproject/abi>@ethersproject/address": true,
-        "@ethersproject/abi>@ethersproject/constants": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/abi>@ethersproject/strings": true,
         "@ethersproject/bignumber": true,
         "@ethersproject/bytes": true,
         "@ethersproject/hash": true,
-        "@ethersproject/hash>@ethersproject/abstract-signer": true,
-        "@ethersproject/hash>@ethersproject/base64": true,
-        "@ethersproject/hdnode>@ethersproject/basex": true,
-        "@ethersproject/hdnode>@ethersproject/sha2": true,
-        "@ethersproject/hdnode>@ethersproject/transactions": true,
         "@ethersproject/providers>@ethersproject/web": true,
         "@ethersproject/providers>bech32": true,
-        "@ethersproject/wallet>@ethersproject/abstract-provider": true,
-        "@ethersproject/wallet>@ethersproject/random": true,
-        "@metamask/test-bundler>@ethersproject/networks": true
+        "@metamask/test-bundler>@ethersproject/networks": true,
+        "ethers>@ethersproject/abstract-provider": true,
+        "ethers>@ethersproject/abstract-signer": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/basex": true,
+        "ethers>@ethersproject/constants": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/random": true,
+        "ethers>@ethersproject/sha2": true,
+        "ethers>@ethersproject/strings": true,
+        "ethers>@ethersproject/transactions": true
       }
     },
     "@ethersproject/providers>@ethersproject/random": {
@@ -405,12 +293,6 @@
         "crypto.getRandomValues": true
       }
     },
-    "@ethersproject/providers>@ethersproject/rlp": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/bytes": true
-      }
-    },
     "@ethersproject/providers>@ethersproject/web": {
       "globals": {
         "clearTimeout": true,
@@ -418,63 +300,28 @@
         "setTimeout": true
       },
       "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/abi>@ethersproject/strings": true,
         "@ethersproject/bytes": true,
-        "@ethersproject/hash>@ethersproject/base64": true
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
       }
     },
     "@ethersproject/wallet": {
       "packages": {
-        "@ethersproject/abi>@ethersproject/address": true,
-        "@ethersproject/abi>@ethersproject/keccak256": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
         "@ethersproject/bytes": true,
         "@ethersproject/hash": true,
-        "@ethersproject/hash>@ethersproject/abstract-signer": true,
-        "@ethersproject/hdnode": true,
-        "@ethersproject/hdnode>@ethersproject/signing-key": true,
-        "@ethersproject/hdnode>@ethersproject/transactions": true,
-        "@ethersproject/wallet>@ethersproject/abstract-provider": true,
-        "@ethersproject/wallet>@ethersproject/json-wallets": true,
-        "@ethersproject/wallet>@ethersproject/random": true
-      }
-    },
-    "@ethersproject/wallet>@ethersproject/abstract-provider": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true
-      }
-    },
-    "@ethersproject/wallet>@ethersproject/json-wallets": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/address": true,
-        "@ethersproject/abi>@ethersproject/keccak256": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/abi>@ethersproject/strings": true,
-        "@ethersproject/bytes": true,
         "@ethersproject/hdnode": true,
-        "@ethersproject/hdnode>@ethersproject/pbkdf2": true,
-        "@ethersproject/hdnode>@ethersproject/transactions": true,
-        "@ethersproject/wallet>@ethersproject/json-wallets>aes-js": true,
-        "@ethersproject/wallet>@ethersproject/random": true,
-        "ethereumjs-util>ethereum-cryptography>scrypt-js": true
-      }
-    },
-    "@ethersproject/wallet>@ethersproject/json-wallets>aes-js": {
-      "globals": {
-        "define": true
-      }
-    },
-    "@ethersproject/wallet>@ethersproject/random": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/bytes": true
+        "ethers>@ethersproject/abstract-provider": true,
+        "ethers>@ethersproject/abstract-signer": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/json-wallets": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/random": true,
+        "ethers>@ethersproject/signing-key": true,
+        "ethers>@ethersproject/transactions": true
       }
     },
     "@keystonehq/bc-ur-registry-eth": {
@@ -939,7 +786,6 @@
       },
       "packages": {
         "@ethereumjs/tx>@ethereumjs/util": true,
-        "@ethersproject/abi>@ethersproject/address": true,
         "@ethersproject/contracts": true,
         "@ethersproject/providers": true,
         "@metamask/abi-utils": true,
@@ -955,6 +801,7 @@
         "@metamask/utils": true,
         "bn.js": true,
         "cockatiel": true,
+        "ethers>@ethersproject/address": true,
         "lodash": true,
         "single-call-balance-checker-abi": true,
         "uuid": true
@@ -1682,7 +1529,7 @@
         "crypto-browserify>randombytes": true,
         "eth-lattice-keyring>gridplus-sdk>aes-js": true,
         "ethereumjs-util>ethereum-cryptography>bs58check": true,
-        "ethereumjs-util>ethereum-cryptography>scrypt-js": true,
+        "ethers>@ethersproject/json-wallets>scrypt-js": true,
         "uuid": true
       }
     },
@@ -1693,8 +1540,8 @@
         "crypto-browserify>create-hmac": true,
         "crypto-browserify>randombytes": true,
         "ethereumjs-util>ethereum-cryptography>bs58check": true,
-        "ethereumjs-util>ethereum-cryptography>hash.js": true,
         "ethereumjs-util>ethereum-cryptography>keccak": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
         "ganache>secp256k1": true,
         "koa>content-disposition>safe-buffer": true
       }
@@ -2309,7 +2156,7 @@
         "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
         "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
         "bn.js": true,
-        "ethereumjs-util>ethereum-cryptography>hash.js": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
         "pumpify>inherits": true
       }
     },
@@ -2326,7 +2173,7 @@
       "packages": {
         "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
         "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
-        "ethereumjs-util>ethereum-cryptography>hash.js": true
+        "ethers>@ethersproject/sha2>hash.js": true
       }
     },
     "@metamask/profile-sync-controller": {
@@ -2361,7 +2208,7 @@
         "@metamask/controller-utils>@spruceid/siwe-parser>valid-url": true,
         "@metamask/profile-sync-controller>siwe>@spruceid/siwe-parser": true,
         "@metamask/profile-sync-controller>siwe>@stablelib/random": true,
-        "@metamask/test-bundler>ethers": true
+        "ethers": true
       }
     },
     "@metamask/profile-sync-controller>siwe>@spruceid/siwe-parser": {
@@ -3110,54 +2957,7 @@
     },
     "@metamask/test-bundler>@ethersproject/networks": {
       "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true
-      }
-    },
-    "@metamask/test-bundler>ethers": {
-      "packages": {
-        "@ethersproject/abi": true,
-        "@ethersproject/abi>@ethersproject/address": true,
-        "@ethersproject/abi>@ethersproject/constants": true,
-        "@ethersproject/abi>@ethersproject/keccak256": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/properties": true,
-        "@ethersproject/abi>@ethersproject/strings": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "@ethersproject/contracts": true,
-        "@ethersproject/hash": true,
-        "@ethersproject/hash>@ethersproject/abstract-signer": true,
-        "@ethersproject/hash>@ethersproject/base64": true,
-        "@ethersproject/hdnode": true,
-        "@ethersproject/hdnode>@ethersproject/basex": true,
-        "@ethersproject/hdnode>@ethersproject/sha2": true,
-        "@ethersproject/hdnode>@ethersproject/signing-key": true,
-        "@ethersproject/hdnode>@ethersproject/transactions": true,
-        "@ethersproject/hdnode>@ethersproject/wordlists": true,
-        "@ethersproject/providers": true,
-        "@ethersproject/providers>@ethersproject/rlp": true,
-        "@ethersproject/providers>@ethersproject/web": true,
-        "@ethersproject/wallet": true,
-        "@ethersproject/wallet>@ethersproject/json-wallets": true,
-        "@ethersproject/wallet>@ethersproject/random": true,
-        "@metamask/test-bundler>ethers>@ethersproject/solidity": true,
-        "@metamask/test-bundler>ethers>@ethersproject/units": true
-      }
-    },
-    "@metamask/test-bundler>ethers>@ethersproject/solidity": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/keccak256": true,
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/abi>@ethersproject/strings": true,
-        "@ethersproject/bignumber": true,
-        "@ethersproject/bytes": true,
-        "@ethersproject/hdnode>@ethersproject/sha2": true
-      }
-    },
-    "@metamask/test-bundler>ethers>@ethersproject/units": {
-      "packages": {
-        "@ethersproject/abi>@ethersproject/logger": true,
-        "@ethersproject/bignumber": true
+        "ethers>@ethersproject/logger": true
       }
     },
     "@metamask/transaction-controller": {
@@ -4336,7 +4136,7 @@
         "eth-lattice-keyring>gridplus-sdk>secp256k1": true,
         "eth-lattice-keyring>gridplus-sdk>uuid": true,
         "ethereumjs-util>ethereum-cryptography>bs58check": true,
-        "ethereumjs-util>ethereum-cryptography>hash.js": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
         "lodash": true
       }
     },
@@ -4430,7 +4230,7 @@
         "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
         "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
         "bn.js": true,
-        "ethereumjs-util>ethereum-cryptography>hash.js": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
         "pumpify>inherits": true
       }
     },
@@ -4461,7 +4261,7 @@
         "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
         "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
         "bn.js": true,
-        "ethereumjs-util>ethereum-cryptography>hash.js": true,
+        "ethers>@ethersproject/sha2>hash.js": true,
         "pumpify>inherits": true
       }
     },
@@ -4570,19 +4370,119 @@
         "@ensdomains/content-hash>multihashes>multibase>base-x": true
       }
     },
-    "ethereumjs-util>ethereum-cryptography>hash.js": {
-      "packages": {
-        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
-        "pumpify>inherits": true
-      }
-    },
     "ethereumjs-util>ethereum-cryptography>keccak": {
       "packages": {
         "browserify>buffer": true,
         "readable-stream": true
       }
     },
-    "ethereumjs-util>ethereum-cryptography>scrypt-js": {
+    "ethereumjs-util>rlp": {
+      "packages": {
+        "bn.js": true,
+        "browserify>buffer": true
+      }
+    },
+    "ethereumjs-wallet>randombytes": {
+      "globals": {
+        "crypto.getRandomValues": true
+      }
+    },
+    "ethers": {
+      "packages": {
+        "@ethersproject/abi": true,
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "@ethersproject/contracts": true,
+        "@ethersproject/hash": true,
+        "@ethersproject/hdnode": true,
+        "@ethersproject/wallet": true,
+        "ethers>@ethersproject/abstract-signer": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/basex": true,
+        "ethers>@ethersproject/constants": true,
+        "ethers>@ethersproject/json-wallets": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/providers": true,
+        "ethers>@ethersproject/random": true,
+        "ethers>@ethersproject/rlp": true,
+        "ethers>@ethersproject/sha2": true,
+        "ethers>@ethersproject/signing-key": true,
+        "ethers>@ethersproject/solidity": true,
+        "ethers>@ethersproject/strings": true,
+        "ethers>@ethersproject/transactions": true,
+        "ethers>@ethersproject/units": true,
+        "ethers>@ethersproject/web": true,
+        "ethers>@ethersproject/wordlists": true
+      }
+    },
+    "ethers>@ethersproject/abstract-provider": {
+      "packages": {
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true
+      }
+    },
+    "ethers>@ethersproject/abstract-signer": {
+      "packages": {
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true
+      }
+    },
+    "ethers>@ethersproject/address": {
+      "packages": {
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/rlp": true
+      }
+    },
+    "ethers>@ethersproject/base64": {
+      "globals": {
+        "atob": true,
+        "btoa": true
+      },
+      "packages": {
+        "@ethersproject/bytes": true
+      }
+    },
+    "ethers>@ethersproject/basex": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/properties": true
+      }
+    },
+    "ethers>@ethersproject/constants": {
+      "packages": {
+        "@ethersproject/bignumber": true
+      }
+    },
+    "ethers>@ethersproject/json-wallets": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "@ethersproject/hdnode": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/json-wallets>aes-js": true,
+        "ethers>@ethersproject/json-wallets>scrypt-js": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/pbkdf2": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/random": true,
+        "ethers>@ethersproject/strings": true,
+        "ethers>@ethersproject/transactions": true
+      }
+    },
+    "ethers>@ethersproject/json-wallets>aes-js": {
+      "globals": {
+        "define": true
+      }
+    },
+    "ethers>@ethersproject/json-wallets>scrypt-js": {
       "globals": {
         "define": true,
         "setTimeout": true
@@ -4591,15 +4491,179 @@
         "browserify>timers-browserify": true
       }
     },
-    "ethereumjs-util>rlp": {
+    "ethers>@ethersproject/keccak256": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "@metamask/ethjs>js-sha3": true
+      }
+    },
+    "ethers>@ethersproject/logger": {
+      "globals": {
+        "console": true
+      }
+    },
+    "ethers>@ethersproject/pbkdf2": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/sha2": true
+      }
+    },
+    "ethers>@ethersproject/properties": {
+      "packages": {
+        "ethers>@ethersproject/logger": true
+      }
+    },
+    "ethers>@ethersproject/providers": {
+      "globals": {
+        "WebSocket": true,
+        "clearInterval": true,
+        "clearTimeout": true,
+        "console.log": true,
+        "console.warn": true,
+        "setInterval": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "@ethersproject/hash": true,
+        "ethers>@ethersproject/abstract-provider": true,
+        "ethers>@ethersproject/abstract-signer": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/basex": true,
+        "ethers>@ethersproject/constants": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/providers>@ethersproject/networks": true,
+        "ethers>@ethersproject/providers>@ethersproject/web": true,
+        "ethers>@ethersproject/providers>bech32": true,
+        "ethers>@ethersproject/random": true,
+        "ethers>@ethersproject/sha2": true,
+        "ethers>@ethersproject/strings": true,
+        "ethers>@ethersproject/transactions": true
+      }
+    },
+    "ethers>@ethersproject/providers>@ethersproject/networks": {
       "packages": {
+        "ethers>@ethersproject/logger": true
+      }
+    },
+    "ethers>@ethersproject/providers>@ethersproject/web": {
+      "globals": {
+        "clearTimeout": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
+      }
+    },
+    "ethers>@ethersproject/random": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true
+      }
+    },
+    "ethers>@ethersproject/rlp": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true
+      }
+    },
+    "ethers>@ethersproject/sha2": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/sha2>hash.js": true
+      }
+    },
+    "ethers>@ethersproject/sha2>hash.js": {
+      "packages": {
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
+        "pumpify>inherits": true
+      }
+    },
+    "ethers>@ethersproject/signing-key": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/signing-key>elliptic": true
+      }
+    },
+    "ethers>@ethersproject/signing-key>elliptic": {
+      "packages": {
+        "@metamask/ppom-validator>elliptic>brorand": true,
+        "@metamask/ppom-validator>elliptic>hmac-drbg": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-assert": true,
+        "@metamask/ppom-validator>elliptic>minimalistic-crypto-utils": true,
         "bn.js": true,
-        "browserify>buffer": true
+        "ethers>@ethersproject/sha2>hash.js": true,
+        "pumpify>inherits": true
       }
     },
-    "ethereumjs-wallet>randombytes": {
+    "ethers>@ethersproject/solidity": {
+      "packages": {
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/sha2": true,
+        "ethers>@ethersproject/strings": true
+      }
+    },
+    "ethers>@ethersproject/strings": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/constants": true,
+        "ethers>@ethersproject/logger": true
+      }
+    },
+    "ethers>@ethersproject/transactions": {
+      "packages": {
+        "@ethersproject/bignumber": true,
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/address": true,
+        "ethers>@ethersproject/constants": true,
+        "ethers>@ethersproject/keccak256": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/rlp": true,
+        "ethers>@ethersproject/signing-key": true
+      }
+    },
+    "ethers>@ethersproject/units": {
+      "packages": {
+        "@ethersproject/bignumber": true,
+        "ethers>@ethersproject/logger": true
+      }
+    },
+    "ethers>@ethersproject/web": {
       "globals": {
-        "crypto.getRandomValues": true
+        "clearTimeout": true,
+        "fetch": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@ethersproject/bytes": true,
+        "ethers>@ethersproject/base64": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
+      }
+    },
+    "ethers>@ethersproject/wordlists": {
+      "packages": {
+        "@ethersproject/bytes": true,
+        "@ethersproject/hash": true,
+        "ethers>@ethersproject/logger": true,
+        "ethers>@ethersproject/properties": true,
+        "ethers>@ethersproject/strings": true
       }
     },
     "extension-port-stream": {
diff --git a/package.json b/package.json
index 70195f5ae650..7605e5042066 100644
--- a/package.json
+++ b/package.json
@@ -312,6 +312,7 @@
     "@metamask/controller-utils": "^11.2.0",
     "@metamask/design-tokens": "^4.0.0",
     "@metamask/ens-controller": "^13.0.0",
+    "@metamask/ens-resolver-snap": "^0.1.2",
     "@metamask/eth-json-rpc-filters": "^7.0.0",
     "@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": "^3.0.1",
@@ -392,7 +393,6 @@
     "eth-lattice-keyring": "^0.12.4",
     "eth-method-registry": "^4.0.0",
     "eth-rpc-errors": "^4.0.2",
-    "ethereum-ens-network-map": "^1.0.2",
     "ethereumjs-util": "^7.0.10",
     "extension-port-stream": "^3.0.0",
     "fast-json-patch": "^3.1.1",
@@ -584,6 +584,7 @@
     "eslint-plugin-react-hooks": "^4.2.0",
     "eslint-plugin-storybook": "^0.6.15",
     "eta": "^3.2.0",
+    "ethers": "5.7.0",
     "fake-indexeddb": "^4.0.1",
     "fancy-log": "^1.3.3",
     "fast-glob": "^3.2.2",
diff --git a/shared/modules/hexstring-utils.test.js b/shared/modules/hexstring-utils.test.js
index 74e444437310..5fe876428bcc 100644
--- a/shared/modules/hexstring-utils.test.js
+++ b/shared/modules/hexstring-utils.test.js
@@ -1,7 +1,50 @@
 import { toChecksumAddress } from 'ethereumjs-util';
-import { isValidHexAddress } from './hexstring-utils';
+import { isPossibleAddress, isValidHexAddress } from './hexstring-utils';
 
 describe('hexstring utils', function () {
+  describe('isPossibleAddress', function () {
+    it('should allow 40-char non-prefixed hex', function () {
+      const address = 'fdea65c8e26263f6d9a1b5de9555d2931a33b825';
+      const result = isPossibleAddress(address);
+      expect(result).toStrictEqual(true);
+    });
+    it('should allow 42-char prefixed hex', function () {
+      const address = '0xfdea65c8e26263f6d9a1b5de9555d2931a33b825';
+      const result = isPossibleAddress(address);
+      expect(result).toStrictEqual(true);
+    });
+    it('should not allow 42-char prefixed non-hex', function () {
+      const address = '0xzzzz65c8e26263f6d9a1b5de9555d2931a33b825';
+      const result = isPossibleAddress(address);
+      expect(result).toStrictEqual(false);
+    });
+    it('should not allow 40-char non-prefixed non-hex', function () {
+      const address = 'zzzz65c8e26263f6d9a1b5de9555d2931a33b825';
+      const result = isPossibleAddress(address);
+      expect(result).toStrictEqual(false);
+    });
+    it('should not allow shorter prefixed hex strings', function () {
+      const address = '0x1234';
+      const result = isPossibleAddress(address);
+      expect(result).toStrictEqual(false);
+    });
+    it('should not allow shorter non-prefixed hex strings', function () {
+      const address = '1234';
+      const result = isPossibleAddress(address);
+      expect(result).toStrictEqual(false);
+    });
+    it('should not allow longer prefixed hex strings', function () {
+      const address = '0xfdea65c8e26263f6d9a1b5de9555d2931a33b825fdea65c8e262';
+      const result = isPossibleAddress(address);
+      expect(result).toStrictEqual(false);
+    });
+    it('should not allow longer non-prefixed hex strings', function () {
+      const address = 'fdea65c8e26263f6d9a1b5de9555d2931a33b825fdea65c8e262';
+      const result = isPossibleAddress(address);
+      expect(result).toStrictEqual(false);
+    });
+  });
+
   describe('isValidHexAddress', function () {
     it('should allow 40-char non-prefixed hex', function () {
       const address = 'fdea65c8e26263f6d9a1b5de9555d2931a33b825';
diff --git a/shared/modules/hexstring-utils.ts b/shared/modules/hexstring-utils.ts
index b81dc1303f9c..84b052716738 100644
--- a/shared/modules/hexstring-utils.ts
+++ b/shared/modules/hexstring-utils.ts
@@ -66,6 +66,16 @@ export function isValidHexAddress(
   return isValidAddress(addressToCheck);
 }
 
+/**
+ * Determines if a string is a possible ethereum address
+ *
+ * @param candidate - the input to check
+ * @returns true if the input is a 40 char hex string with optional 0x prefix, false otherwise
+ */
+export function isPossibleAddress(candidate: string) {
+  return /^(0x)?[0-9a-fA-F]{40}$/iu.test(candidate);
+}
+
 export function toChecksumHexAddress(address: string) {
   if (!address) {
     // our internal checksumAddress function that this method replaces would
diff --git a/test/e2e/page-objects/pages/send/send-token-page.ts b/test/e2e/page-objects/pages/send/send-token-page.ts
index b5b703814a5f..65727b106783 100644
--- a/test/e2e/page-objects/pages/send/send-token-page.ts
+++ b/test/e2e/page-objects/pages/send/send-token-page.ts
@@ -97,7 +97,6 @@ class SendTokenPage {
     });
     await this.driver.waitForSelector({
       text: address,
-      css: this.ensResolvedAddress,
     });
   }
 
diff --git a/test/e2e/tests/account/import-flow.spec.js b/test/e2e/tests/account/import-flow.spec.js
index 3c05131090cc..045600cff4f4 100644
--- a/test/e2e/tests/account/import-flow.spec.js
+++ b/test/e2e/tests/account/import-flow.spec.js
@@ -132,7 +132,7 @@ describe('Import flow @no-mmi', function () {
         await locateAccountBalanceDOM(driver, ganacheServer);
         await openActionMenuAndStartSendFlow(driver);
         await driver.fill(
-          'input[placeholder="Enter public address (0x) or ENS name"]',
+          'input[placeholder="Enter public address (0x) or domain name"]',
           '0x2f318C334780961FB129D2a6c30D0763d9a5C970',
         );
         await driver.fill('input[placeholder="0"]', '1');
diff --git a/test/e2e/tests/account/metamask-responsive-ui.spec.js b/test/e2e/tests/account/metamask-responsive-ui.spec.js
index 037179b500b0..6afdb9062ac3 100644
--- a/test/e2e/tests/account/metamask-responsive-ui.spec.js
+++ b/test/e2e/tests/account/metamask-responsive-ui.spec.js
@@ -132,7 +132,7 @@ describe('MetaMask Responsive UI', function () {
         // starts to send a transaction
         await openActionMenuAndStartSendFlow(driver);
         await driver.fill(
-          'input[placeholder="Enter public address (0x) or ENS name"]',
+          'input[placeholder="Enter public address (0x) or domain name"]',
           '0x2f318C334780961FB129D2a6c30D0763d9a5C970',
         );
 
diff --git a/test/e2e/tests/network/network-error.spec.js b/test/e2e/tests/network/network-error.spec.js
index 02514f19718c..4d45734edf77 100644
--- a/test/e2e/tests/network/network-error.spec.js
+++ b/test/e2e/tests/network/network-error.spec.js
@@ -60,7 +60,7 @@ describe('Gas API fallback', function () {
 
         await openActionMenuAndStartSendFlow(driver);
         await driver.fill(
-          'input[placeholder="Enter public address (0x) or ENS name"]',
+          'input[placeholder="Enter public address (0x) or domain name"]',
           '0x2f318C334780961FB129D2a6c30D0763d9a5C970',
         );
 
diff --git a/test/e2e/tests/petnames/petnames-transactions.spec.js b/test/e2e/tests/petnames/petnames-transactions.spec.js
index ed8115da4a0c..cc19e44a55eb 100644
--- a/test/e2e/tests/petnames/petnames-transactions.spec.js
+++ b/test/e2e/tests/petnames/petnames-transactions.spec.js
@@ -22,7 +22,7 @@ async function createDappSendTransaction(driver) {
 async function createWalletSendTransaction(driver, recipientAddress) {
   await openActionMenuAndStartSendFlow(driver);
   await driver.fill(
-    'input[placeholder="Enter public address (0x) or ENS name"]',
+    'input[placeholder="Enter public address (0x) or domain name"]',
     recipientAddress,
   );
 
diff --git a/test/e2e/tests/ppom/mocks/mock-server-json-rpc.ts b/test/e2e/tests/ppom/mocks/mock-server-json-rpc.ts
index 2c560c20c522..ce197e462c80 100644
--- a/test/e2e/tests/ppom/mocks/mock-server-json-rpc.ts
+++ b/test/e2e/tests/ppom/mocks/mock-server-json-rpc.ts
@@ -43,7 +43,7 @@ const DEFAULT_VARIANT = 'default';
  *  ]);
  * ```
  */
-async function mockServerJsonRpc(
+export async function mockServerJsonRpc(
   mockServer: MockttpServer,
   listOfRequestConfigs: RequestConfig[],
 ) {
diff --git a/test/e2e/tests/settings/change-language.spec.ts b/test/e2e/tests/settings/change-language.spec.ts
index 578c27be84f6..aafb36059c9b 100644
--- a/test/e2e/tests/settings/change-language.spec.ts
+++ b/test/e2e/tests/settings/change-language.spec.ts
@@ -145,7 +145,11 @@ describe('Settings - general tab @no-mmi', function (this: Suite) {
         await changeLanguage(driver, languageIndex);
         await driver.navigate();
         await driver.clickElement(selectors.ethOverviewSend);
-        await driver.fill(selectors.ensInput, 'test');
+        await driver.pasteIntoField(
+          selectors.ensInput,
+          // use wrong checksum address; other inputs don't show error until snaps name-lookup has happened
+          '0xAAAA6BF26964aF9D7eEd9e03E53415D37aA96045',
+        );
 
         // Validate the language change is reflected in the dialog message
         const isDialogMessageChanged = await driver.isElementPresent(
diff --git a/test/e2e/tests/swap-send/swap-send-test-utils.ts b/test/e2e/tests/swap-send/swap-send-test-utils.ts
index 8eff9051b9d1..121b297ac83b 100644
--- a/test/e2e/tests/swap-send/swap-send-test-utils.ts
+++ b/test/e2e/tests/swap-send/swap-send-test-utils.ts
@@ -21,7 +21,7 @@ export class SwapSendPage {
 
   fillRecipientAddressInput = async (address: string) => {
     await this.driver.fill(
-      'input[placeholder="Enter public address (0x) or ENS name"]',
+      'input[placeholder="Enter public address (0x) or domain name"]',
       address,
     );
   };
diff --git a/test/e2e/tests/tokens/custom-token-send-transfer.spec.js b/test/e2e/tests/tokens/custom-token-send-transfer.spec.js
index fa87c9cfbe64..de2aa2addcf8 100644
--- a/test/e2e/tests/tokens/custom-token-send-transfer.spec.js
+++ b/test/e2e/tests/tokens/custom-token-send-transfer.spec.js
@@ -36,7 +36,7 @@ describe('Transfer custom tokens @no-mmi', function () {
         await driver.delay(500);
         await driver.clickElement('[data-testid="eth-overview-send"]');
         await driver.fill(
-          'input[placeholder="Enter public address (0x) or ENS name"]',
+          'input[placeholder="Enter public address (0x) or domain name"]',
           recipientAddress,
         );
         await driver.waitForSelector({
diff --git a/test/e2e/tests/tokens/nft/send-nft.spec.js b/test/e2e/tests/tokens/nft/send-nft.spec.js
index 0fe23673a769..35585bbaf2ea 100644
--- a/test/e2e/tests/tokens/nft/send-nft.spec.js
+++ b/test/e2e/tests/tokens/nft/send-nft.spec.js
@@ -30,7 +30,7 @@ describe('Send NFT', function () {
         // TODO: Update Test when Multichain Send Flow is added
         await driver.clickElement({ text: 'Send', tag: 'button' });
         await driver.fill(
-          'input[placeholder="Enter public address (0x) or ENS name"]',
+          'input[placeholder="Enter public address (0x) or domain name"]',
           '0xc427D562164062a23a5cFf596A4a3208e72Acd28',
         );
         await driver.clickElement({
@@ -104,7 +104,7 @@ describe('Send NFT', function () {
 
         await driver.clickElement({ text: 'Send', tag: 'button' });
         await driver.fill(
-          'input[placeholder="Enter public address (0x) or ENS name"]',
+          'input[placeholder="Enter public address (0x) or domain name"]',
           '0xc427D562164062a23a5cFf596A4a3208e72Acd28',
         );
 
@@ -164,7 +164,7 @@ describe('Send NFT', function () {
         await driver.clickElement({ text: 'Send', tag: 'button' });
 
         await driver.fill(
-          'input[placeholder="Enter public address (0x) or ENS name"]',
+          'input[placeholder="Enter public address (0x) or domain name"]',
           '0xc427D562164062a23a5cFf596A4a3208e72Acd28',
         );
 
diff --git a/test/e2e/tests/tokens/send-erc20-to-contract.spec.js b/test/e2e/tests/tokens/send-erc20-to-contract.spec.js
index a07bdea9bfdc..6e94b6377e67 100644
--- a/test/e2e/tests/tokens/send-erc20-to-contract.spec.js
+++ b/test/e2e/tests/tokens/send-erc20-to-contract.spec.js
@@ -36,7 +36,7 @@ describe('Send ERC20 token to contract address', function () {
 
         // Type contract address
         await driver.fill(
-          'input[placeholder="Enter public address (0x) or ENS name"]',
+          'input[placeholder="Enter public address (0x) or domain name"]',
           contractAddress,
         );
 
diff --git a/test/e2e/tests/transaction/ens.spec.ts b/test/e2e/tests/transaction/ens.spec.ts
index d9cd3f36b4e3..77d10d9b95ad 100644
--- a/test/e2e/tests/transaction/ens.spec.ts
+++ b/test/e2e/tests/transaction/ens.spec.ts
@@ -10,6 +10,7 @@ import FixtureBuilder from '../../fixture-builder';
 import { loginWithBalanceValidation } from '../../page-objects/flows/login.flow';
 import HomePage from '../../page-objects/pages/homepage';
 import SendTokenPage from '../../page-objects/pages/send/send-token-page';
+import { mockServerJsonRpc } from '../ppom/mocks/mock-server-json-rpc';
 
 describe('ENS', function (this: Suite) {
   const sampleAddress: string = '1111111111111111111111111111111111111111';
@@ -17,6 +18,8 @@ describe('ENS', function (this: Suite) {
   // Having 2 versions of the address is a bug(#25286)
   const shortSampleAddress = '0x1111...1111';
   const shortSampleAddresV2 = '0x11111...11111';
+  const chainId = 1;
+  const mockResolver = '226159d592e2b063810a10ebf6dcbada94ed68b8';
 
   const sampleEnsDomain: string = 'test.eth';
   const infuraUrl: string =
@@ -59,17 +62,45 @@ describe('ENS', function (this: Suite) {
         },
       }));
 
-    await mockServer
-      .forPost(infuraUrl)
-      .withJsonBodyIncluding({ method: 'eth_call' })
-      .thenCallback(() => ({
-        statusCode: 200,
-        json: {
-          jsonrpc: '2.0',
-          id: '1111111111111111',
+    await mockServerJsonRpc(mockServer, [
+      ['eth_chainId', { result: `0x${chainId}` }],
+      [
+        'eth_call',
+        {
+          params: [
+            {
+              to: '0x00000000000c2e074ec69a0dfb2997ba6c7d2e1e',
+              data: '0x0178b8bfeb4f647bea6caa36333c816d7b46fdcb05f9466ecacc140ea8c66faf15b3d9f1',
+            },
+          ],
+          result: `0x000000000000000000000000${mockResolver}`,
+        },
+      ],
+      [
+        'eth_call',
+        {
+          params: [
+            {
+              to: `0x${mockResolver}`,
+              data: '0x01ffc9a79061b92300000000000000000000000000000000000000000000000000000000',
+            },
+          ],
+          result: `0x0000000000000000000000000000000000000000000000000000000000000000`,
+        },
+      ],
+      [
+        'eth_call',
+        {
+          params: [
+            {
+              to: `0x${mockResolver}`,
+              data: '0x3b3b57deeb4f647bea6caa36333c816d7b46fdcb05f9466ecacc140ea8c66faf15b3d9f1',
+            },
+          ],
           result: `0x000000000000000000000000${sampleAddress}`,
         },
-      }));
+      ],
+    ]);
   }
 
   it('domain resolves to a correct address', async function () {
diff --git a/test/e2e/tests/transaction/gas-estimates.spec.js b/test/e2e/tests/transaction/gas-estimates.spec.js
index c4ce94ee9631..263dfc85d904 100644
--- a/test/e2e/tests/transaction/gas-estimates.spec.js
+++ b/test/e2e/tests/transaction/gas-estimates.spec.js
@@ -30,7 +30,7 @@ describe('Gas estimates generated by MetaMask', function () {
           await openActionMenuAndStartSendFlow(driver);
 
           await driver.fill(
-            'input[placeholder="Enter public address (0x) or ENS name"]',
+            'input[placeholder="Enter public address (0x) or domain name"]',
             '0x2f318C334780961FB129D2a6c30D0763d9a5C970',
           );
 
@@ -72,7 +72,7 @@ describe('Gas estimates generated by MetaMask', function () {
           await openActionMenuAndStartSendFlow(driver);
 
           await driver.fill(
-            'input[placeholder="Enter public address (0x) or ENS name"]',
+            'input[placeholder="Enter public address (0x) or domain name"]',
             '0x2f318C334780961FB129D2a6c30D0763d9a5C970',
           );
 
@@ -111,7 +111,7 @@ describe('Gas estimates generated by MetaMask', function () {
           await openActionMenuAndStartSendFlow(driver);
 
           await driver.fill(
-            'input[placeholder="Enter public address (0x) or ENS name"]',
+            'input[placeholder="Enter public address (0x) or domain name"]',
             '0x2f318C334780961FB129D2a6c30D0763d9a5C970',
           );
 
@@ -145,7 +145,7 @@ describe('Gas estimates generated by MetaMask', function () {
 
           await openActionMenuAndStartSendFlow(driver);
           await driver.fill(
-            'input[placeholder="Enter public address (0x) or ENS name"]',
+            'input[placeholder="Enter public address (0x) or domain name"]',
             '0x2f318C334780961FB129D2a6c30D0763d9a5C970',
           );
 
@@ -191,7 +191,7 @@ describe('Gas estimates generated by MetaMask', function () {
 
           await openActionMenuAndStartSendFlow(driver);
           await driver.fill(
-            'input[placeholder="Enter public address (0x) or ENS name"]',
+            'input[placeholder="Enter public address (0x) or domain name"]',
             '0x2f318C334780961FB129D2a6c30D0763d9a5C970',
           );
 
@@ -220,7 +220,7 @@ describe('Gas estimates generated by MetaMask', function () {
 
           await openActionMenuAndStartSendFlow(driver);
           await driver.fill(
-            'input[placeholder="Enter public address (0x) or ENS name"]',
+            'input[placeholder="Enter public address (0x) or domain name"]',
             '0x2f318C334780961FB129D2a6c30D0763d9a5C970',
           );
 
diff --git a/test/e2e/tests/transaction/send-eth.spec.js b/test/e2e/tests/transaction/send-eth.spec.js
index 5c49bba0cf4e..36872115dcbe 100644
--- a/test/e2e/tests/transaction/send-eth.spec.js
+++ b/test/e2e/tests/transaction/send-eth.spec.js
@@ -27,7 +27,7 @@ describe('Send ETH', function () {
           await openActionMenuAndStartSendFlow(driver);
 
           await driver.fill(
-            'input[placeholder="Enter public address (0x) or ENS name"]',
+            'input[placeholder="Enter public address (0x) or domain name"]',
             '0x2f318C334780961FB129D2a6c30D0763d9a5C970',
           );
 
@@ -110,7 +110,7 @@ describe('Send ETH', function () {
 
           await openActionMenuAndStartSendFlow(driver);
           await driver.fill(
-            'input[placeholder="Enter public address (0x) or ENS name"]',
+            'input[placeholder="Enter public address (0x) or domain name"]',
             '0x2f318C334780961FB129D2a6c30D0763d9a5C970',
           );
 
@@ -172,7 +172,7 @@ describe('Send ETH', function () {
 
           await driver.clickElement('[data-testid="eth-overview-send"]');
           await driver.fill(
-            'input[placeholder="Enter public address (0x) or ENS name"]',
+            'input[placeholder="Enter public address (0x) or domain name"]',
             contractAddress,
           );
 
@@ -442,7 +442,7 @@ describe('Send ETH', function () {
             await openActionMenuAndStartSendFlow(driver);
 
             await driver.fill(
-              'input[placeholder="Enter public address (0x) or ENS name"]',
+              'input[placeholder="Enter public address (0x) or domain name"]',
               '0xc427D562164062a23a5cFf596A4a3208e72Acd28',
             );
 
diff --git a/test/e2e/tests/transaction/send-hex-address.spec.js b/test/e2e/tests/transaction/send-hex-address.spec.js
index 6adb6b5f9f6c..d93f1a0d5484 100644
--- a/test/e2e/tests/transaction/send-hex-address.spec.js
+++ b/test/e2e/tests/transaction/send-hex-address.spec.js
@@ -27,7 +27,7 @@ describe('Send ETH to a 40 character hexadecimal address', function () {
         await openActionMenuAndStartSendFlow(driver);
         // Paste address without hex prefix
         await driver.pasteIntoField(
-          'input[placeholder="Enter public address (0x) or ENS name"]',
+          'input[placeholder="Enter public address (0x) or domain name"]',
           nonHexPrefixedAddress,
         );
         await driver.findElement({
@@ -72,7 +72,7 @@ describe('Send ETH to a 40 character hexadecimal address', function () {
         await openActionMenuAndStartSendFlow(driver);
         // Type address without hex prefix
         await driver.fill(
-          'input[placeholder="Enter public address (0x) or ENS name"]',
+          'input[placeholder="Enter public address (0x) or domain name"]',
           nonHexPrefixedAddress,
         );
         await driver.findElement({
@@ -130,7 +130,7 @@ describe('Send ERC20 to a 40 character hexadecimal address', function () {
         await driver.clickElement('[data-testid="coin-overview-send"]');
         // Paste address without hex prefix
         await driver.pasteIntoField(
-          'input[placeholder="Enter public address (0x) or ENS name"]',
+          'input[placeholder="Enter public address (0x) or domain name"]',
           nonHexPrefixedAddress,
         );
         await driver.findElement({
@@ -192,7 +192,7 @@ describe('Send ERC20 to a 40 character hexadecimal address', function () {
 
         // Type address without hex prefix
         await driver.fill(
-          'input[placeholder="Enter public address (0x) or ENS name"]',
+          'input[placeholder="Enter public address (0x) or domain name"]',
           nonHexPrefixedAddress,
         );
         await driver.findElement({
diff --git a/test/e2e/user-actions-benchmark.js b/test/e2e/user-actions-benchmark.js
index 515764b6259b..5a851c59d61f 100644
--- a/test/e2e/user-actions-benchmark.js
+++ b/test/e2e/user-actions-benchmark.js
@@ -73,7 +73,7 @@ async function confirmTx() {
       await openActionMenuAndStartSendFlow(driver);
 
       await driver.fill(
-        'input[placeholder="Enter public address (0x) or ENS name"]',
+        'input[placeholder="Enter public address (0x) or domain name"]',
         '0x2f318C334780961FB129D2a6c30D0763d9a5C970',
       );
 
diff --git a/ui/components/multichain/pages/send/__snapshots__/send.test.js.snap b/ui/components/multichain/pages/send/__snapshots__/send.test.js.snap
index 82455205be0c..814dc934fc9a 100644
--- a/ui/components/multichain/pages/send/__snapshots__/send.test.js.snap
+++ b/ui/components/multichain/pages/send/__snapshots__/send.test.js.snap
@@ -178,7 +178,7 @@ exports[`SendPage render and initialization should render correctly even when a
                   class="ens-input__wrapper__input"
                   data-testid="ens-input"
                   dir="auto"
-                  placeholder="Enter public address (0x) or ENS name"
+                  placeholder="Enter public address (0x) or domain name"
                   spellcheck="false"
                   type="text"
                   value=""
diff --git a/ui/components/multichain/pages/send/components/domain-input-resolution-cell.stories.tsx b/ui/components/multichain/pages/send/components/domain-input-resolution-cell.stories.tsx
index 5fb788bfa1b3..4a8515055d20 100644
--- a/ui/components/multichain/pages/send/components/domain-input-resolution-cell.stories.tsx
+++ b/ui/components/multichain/pages/send/components/domain-input-resolution-cell.stories.tsx
@@ -6,9 +6,6 @@ export default {
   title: 'Components/Multichain/DomainInputResolutionCell',
   component: DomainInputResolutionCell,
   argTypes: {
-    domainType: {
-      control: 'text',
-    },
     address: {
       control: 'text',
     },
@@ -26,7 +23,6 @@ export default {
     },
   },
   args: {
-    domainType: 'ENS',
     address: '0xc0ffee254729296a45a3885639AC7E10F9d54979',
     protocol: 'Ethereum Name Service',
     domainName: 'hamer.eth',
@@ -41,7 +37,6 @@ DefaultStory.storyName = 'ENS Resolution';
 
 export const LensStory = (args) => <DomainInputResolutionCell {...args} />;
 LensStory.args = {
-  domainType: 'Other',
   address: '0xc0ffee254729296a45a3885639AC7E10F9d54979',
   protocol: 'Lens Protocol',
   domainName: 'm0nt0y4.lens',
@@ -58,7 +53,6 @@ export const OverflowingTitleStory = (args) => (
 );
 
 OverflowingTitleStory.args = {
-  domainType: 'Other',
   address: '0xc0ffee254729296a45a3885639AC7E10F9d54979',
   protocol: 'Test Protocol',
   domainName: 'superduperlongnamethatisoverflowingthiscontainer.testprotocol',
diff --git a/ui/components/multichain/pages/send/components/domain-input-resolution-cell.tsx b/ui/components/multichain/pages/send/components/domain-input-resolution-cell.tsx
index 914c904e76dd..6ff8a6292afc 100644
--- a/ui/components/multichain/pages/send/components/domain-input-resolution-cell.tsx
+++ b/ui/components/multichain/pages/send/components/domain-input-resolution-cell.tsx
@@ -24,7 +24,6 @@ import { ellipsify } from '../../../../../pages/confirmations/send/send.utils';
 import Tooltip from '../../../../ui/tooltip';
 
 type DomainInputResolutionCellArgs = {
-  domainType: string;
   address: string;
   protocol?: string;
   domainName: string;
@@ -33,7 +32,6 @@ type DomainInputResolutionCellArgs = {
 };
 
 export const DomainInputResolutionCell = ({
-  domainType,
   address,
   domainName,
   resolvingSnap = '',
@@ -89,88 +87,7 @@ export const DomainInputResolutionCell = ({
     </Tooltip>
   );
 
-  if (domainType === 'Other') {
-    // Snap provided resolution.
-    return (
-      <Box
-        key={address}
-        className="multichain-send-page__recipient__item"
-        onClick={() => onClick()}
-        display={Display.Flex}
-        alignItems={AlignItems.center}
-        paddingBottom={2}
-        style={{ cursor: 'pointer' }}
-      >
-        <Tooltip title={t('suggestedBySnap', [resolvingSnap])}>
-          <BadgeWrapper
-            badge={
-              <AvatarIcon
-                iconName={IconName.Snaps}
-                size={AvatarIconSize.Xs}
-                className="multichain-send-page__recipient__item__avatar"
-                backgroundColor={BackgroundColor.infoDefault}
-                borderColor={BorderColor.backgroundDefault}
-                borderWidth={2}
-                iconProps={{
-                  color: IconColor.infoInverse,
-                  style: { width: '12px', height: '12px' },
-                  name: IconName.Snaps,
-                }}
-              />
-            }
-            positionObj={{
-              bottom: '25%',
-              right: '10%',
-            }}
-            badgeContainerProps={{
-              className: 'multichain-send-page__recipient__item__badge',
-            }}
-          >
-            <AvatarAccount address={address} />
-          </BadgeWrapper>
-        </Tooltip>
-        <Box
-          className="multichain-send-page__recipient__item__content"
-          paddingLeft={4}
-          style={{ overflow: 'hidden' }}
-        >
-          <Box
-            ref={titleRef}
-            className="multichain-send-page__recipient__item__title"
-            data-testid="multichain-send-page__recipient__item__title"
-            display={Display.Flex}
-          >
-            {isTitleOverflowing ? (
-              <OverflowingTitle />
-            ) : (
-              <Confusable asText input={domainName} />
-            )}
-          </Box>
-          <Text color={TextColor.textAlternative}>{ellipsify(address)}</Text>
-          <Box
-            className="multichain-send-page__recipient__item__subtitle"
-            data-testid="multichain-send-page__recipient__item__subtitle"
-          >
-            <Text
-              color={TextColor.textAlternative}
-              variant={TextVariant.bodySm}
-            >
-              {protocol}
-            </Text>
-          </Box>
-        </Box>
-      </Box>
-    );
-  }
-  const getTitle = () => {
-    if (domainName && isTitleOverflowing) {
-      return <OverflowingTitle />;
-    } else if (domainName && !isTitleOverflowing) {
-      return <Confusable asText input={domainName} />;
-    }
-    return ellipsify(address);
-  };
-
+  // Snap provided resolution.
   return (
     <Box
       key={address}
@@ -181,13 +98,34 @@ export const DomainInputResolutionCell = ({
       paddingBottom={2}
       style={{ cursor: 'pointer' }}
     >
-      <Box
-        className="multichain-send-page__recipient__item__avatar-wrapper"
-        display={Display.Flex}
-        alignItems={AlignItems.center}
-      >
-        <AvatarAccount address={address} />
-      </Box>
+      <Tooltip title={t('suggestedBySnap', [resolvingSnap])}>
+        <BadgeWrapper
+          badge={
+            <AvatarIcon
+              iconName={IconName.Snaps}
+              size={AvatarIconSize.Xs}
+              className="multichain-send-page__recipient__item__avatar"
+              backgroundColor={BackgroundColor.infoDefault}
+              borderColor={BorderColor.backgroundDefault}
+              borderWidth={2}
+              iconProps={{
+                color: IconColor.infoInverse,
+                style: { width: '12px', height: '12px' },
+                name: IconName.Snaps,
+              }}
+            />
+          }
+          positionObj={{
+            bottom: '25%',
+            right: '10%',
+          }}
+          badgeContainerProps={{
+            className: 'multichain-send-page__recipient__item__badge',
+          }}
+        >
+          <AvatarAccount address={address} />
+        </BadgeWrapper>
+      </Tooltip>
       <Box
         className="multichain-send-page__recipient__item__content"
         paddingLeft={4}
@@ -199,28 +137,27 @@ export const DomainInputResolutionCell = ({
           data-testid="multichain-send-page__recipient__item__title"
           display={Display.Flex}
         >
-          {getTitle()}
+          {isTitleOverflowing ? (
+            <OverflowingTitle />
+          ) : (
+            <Confusable asText input={domainName} />
+          )}
         </Box>
-        {domainName && (
-          <Box
-            className="multichain-send-page__recipient__item__subtitle"
-            data-testid="multichain-send-page__recipient__item__subtitle"
-          >
-            <Text color={TextColor.textAlternative}>{ellipsify(address)}</Text>
-          </Box>
-        )}
-        {domainType === 'ENS' && (
+        <Text color={TextColor.textAlternative}>{ellipsify(address)}</Text>
+        <Box
+          className="multichain-send-page__recipient__item__subtitle"
+          data-testid="multichain-send-page__recipient__item__subtitle"
+        >
           <Text color={TextColor.textAlternative} variant={TextVariant.bodySm}>
             {protocol}
           </Text>
-        )}
+        </Box>
       </Box>
     </Box>
   );
 };
 
 DomainInputResolutionCell.propTypes = {
-  domainType: PropTypes.string.isRequired,
   address: PropTypes.string.isRequired,
   domainName: PropTypes.string.isRequired,
   resolvingSnap: PropTypes.string.isRequired,
diff --git a/ui/components/multichain/pages/send/components/recipient.tsx b/ui/components/multichain/pages/send/components/recipient.tsx
index 7458083b9d3f..d1c2cea2250a 100644
--- a/ui/components/multichain/pages/send/components/recipient.tsx
+++ b/ui/components/multichain/pages/send/components/recipient.tsx
@@ -11,7 +11,6 @@ import {
 import {
   getDomainError,
   getDomainResolutions,
-  getDomainType,
   getDomainWarning,
 } from '../../../../../ducks/domains';
 import {
@@ -42,7 +41,6 @@ export const SendPageRecipient = () => {
   const domainResolutions = useSelector(getDomainResolutions) || [];
   const domainError = useSelector(getDomainError);
   const domainWarning = useSelector(getDomainWarning);
-  const domainType = useSelector(getDomainType);
 
   const showErrorBanner =
     domainError || (recipient.error && recipient.error !== 'required');
@@ -86,7 +84,6 @@ export const SendPageRecipient = () => {
   if (recipient.address) {
     contents = (
       <DomainInputResolutionCell
-        domainType={domainType}
         address={recipient.address}
         domainName={recipient.nickname}
         onClick={() => onClick(recipient.address, recipient.nickname)}
@@ -104,7 +101,6 @@ export const SendPageRecipient = () => {
       return (
         <DomainInputResolutionCell
           key={`${resolvedAddress}${resolvingSnap}${protocol}`}
-          domainType={domainType}
           address={resolvedAddress}
           domainName={addressBookEntryName ?? domainName}
           onClick={() =>
diff --git a/ui/components/multichain/pages/send/send.test.js b/ui/components/multichain/pages/send/send.test.js
index 164fe2b8bb3c..cdba904090b2 100644
--- a/ui/components/multichain/pages/send/send.test.js
+++ b/ui/components/multichain/pages/send/send.test.js
@@ -274,7 +274,7 @@ describe('SendPage', () => {
       // Ensure that the send flow renders on the add recipient screen when
       // there is no draft transaction.
       expect(
-        getByPlaceholderText('Enter public address (0x) or ENS name'),
+        getByPlaceholderText('Enter public address (0x) or domain name'),
       ).toBeTruthy();
 
       expect(container).toMatchSnapshot();
diff --git a/ui/ducks/domains.js b/ui/ducks/domains.js
index d8635a8d23ed..2b0146cde1ba 100644
--- a/ui/ducks/domains.js
+++ b/ui/ducks/domains.js
@@ -1,9 +1,5 @@
 import { createSlice } from '@reduxjs/toolkit';
 import log from 'loglevel';
-import ensNetworkMap from 'ethereum-ens-network-map';
-import { isConfusing } from 'unicode-confusables';
-import { isHexString } from 'ethereumjs-util';
-import { Web3Provider } from '@ethersproject/providers';
 
 import {
   getChainIdsCaveat,
@@ -17,31 +13,12 @@ import {
   getSnapMetadata,
 } from '../selectors';
 import { handleSnapRequest } from '../store/actions';
-import {
-  CHAIN_IDS,
-  CHAIN_ID_TO_ETHERS_NETWORK_NAME_MAP,
-} from '../../shared/constants/network';
-import {
-  CONFUSING_ENS_ERROR,
-  ENS_ILLEGAL_CHARACTER,
-  ENS_NOT_FOUND_ON_NETWORK,
-  DOMAIN_NOT_SUPPORTED_ON_NETWORK,
-  ENS_NO_ADDRESS_FOR_NAME,
-  ENS_REGISTRATION_ERROR,
-  ENS_UNKNOWN_ERROR,
-  NO_RESOLUTION_FOR_DOMAIN,
-} from '../pages/confirmations/send/send.constants';
-import { isValidDomainName } from '../helpers/utils/util';
+import { NO_RESOLUTION_FOR_DOMAIN } from '../pages/confirmations/send/send.constants';
 import { CHAIN_CHANGED } from '../store/actionConstants';
-import {
-  BURN_ADDRESS,
-  isBurnAddress,
-  isValidHexAddress,
-} from '../../shared/modules/hexstring-utils';
+import { BURN_ADDRESS } from '../../shared/modules/hexstring-utils';
 
 // Local Constants
 const ZERO_X_ERROR_ADDRESS = '0x';
-const ENS = 'ENS';
 
 const initialState = {
   stage: 'UNINITIALIZED',
@@ -49,7 +26,6 @@ const initialState = {
   error: null,
   warning: null,
   chainId: null,
-  domainType: null,
   domainName: null,
 };
 
@@ -57,60 +33,30 @@ export const domainInitialState = initialState;
 
 const name = 'DNS';
 
-let web3Provider = null;
-
 const slice = createSlice({
   name,
   initialState,
   reducers: {
     lookupStart: (state, action) => {
       state.domainName = action.payload;
+      state.warning = 'loading';
+      state.error = null;
     },
     lookupEnd: (state, action) => {
       // first clear out the previous state
       state.resolutions = null;
       state.error = null;
       state.warning = null;
-      state.domainType = null;
       state.domainName = null;
-      const { resolutions, error, chainId, domainType, domainName } =
-        action.payload;
-      state.domainType = domainType;
-      if (state.domainType === ENS) {
-        // currently ENS resolutions will only ever have one element since we do not do fuzzy matching for ENS.
-        // error handling logic will need to be updated to accommodate multiple results in the future when the ENS snap is built.
-        const address = resolutions[0]?.resolvedAddress;
-        if (error) {
-          if (
-            isValidDomainName(domainName) &&
-            error.message === 'ENS name not defined.'
-          ) {
-            state.error =
-              chainId === CHAIN_IDS.MAINNET
-                ? ENS_NO_ADDRESS_FOR_NAME
-                : ENS_NOT_FOUND_ON_NETWORK;
-          } else if (error.message === 'Illegal character for ENS.') {
-            state.error = ENS_ILLEGAL_CHARACTER;
-          } else {
-            log.error(error);
-            state.error = ENS_UNKNOWN_ERROR;
-          }
-        } else if (address) {
-          if (address === BURN_ADDRESS) {
-            state.error = ENS_NO_ADDRESS_FOR_NAME;
-          } else if (address === ZERO_X_ERROR_ADDRESS) {
-            state.error = ENS_REGISTRATION_ERROR;
-          } else {
-            state.resolutions = resolutions;
-          }
-          if (isValidDomainName(address) && isConfusing(address)) {
-            state.warning = CONFUSING_ENS_ERROR;
-          }
-        } else {
-          state.error = ENS_NO_ADDRESS_FOR_NAME;
-        }
-      } else if (resolutions.length > 0) {
-        state.resolutions = resolutions;
+      const { resolutions, domainName } = action.payload;
+      const filteredResolutions = resolutions.filter((resolution) => {
+        return (
+          resolution.resolvedAddress !== BURN_ADDRESS &&
+          resolution.resolvedAddress !== ZERO_X_ERROR_ADDRESS
+        );
+      });
+      if (filteredResolutions.length > 0) {
+        state.resolutions = filteredResolutions;
       } else if (domainName.length > 0) {
         state.error = NO_RESOLUTION_FOR_DOMAIN;
       }
@@ -122,30 +68,16 @@ const slice = createSlice({
       state.warning = null;
       state.chainId = action.payload;
     },
-    disableDomainLookup: (state) => {
-      state.stage = 'NO_NETWORK_SUPPORT';
-      state.error = null;
-      state.warning = null;
-      state.resolutions = null;
-      state.chainId = null;
-    },
-    domainNotSupported: (state) => {
-      state.resolutions = null;
-      state.warning = null;
-      state.error = DOMAIN_NOT_SUPPORTED_ON_NETWORK;
-    },
     resetDomainResolution: (state) => {
       state.resolutions = null;
       state.warning = null;
       state.error = null;
-      state.domainType = null;
     },
   },
   extraReducers: (builder) => {
     builder.addCase(CHAIN_CHANGED, (state, action) => {
       if (action.payload !== state.chainId) {
         state.stage = 'UNINITIALIZED';
-        web3Provider = null;
       }
     });
   },
@@ -154,32 +86,14 @@ const slice = createSlice({
 const { reducer, actions } = slice;
 export default reducer;
 
-const {
-  lookupStart,
-  lookupEnd,
-  enableDomainLookup,
-  domainNotSupported,
-  resetDomainResolution,
-} = actions;
+const { lookupStart, lookupEnd, enableDomainLookup, resetDomainResolution } =
+  actions;
 export { resetDomainResolution };
 
 export function initializeDomainSlice() {
   return (dispatch, getState) => {
     const state = getState();
     const chainId = getCurrentChainId(state);
-    const networkName = CHAIN_ID_TO_ETHERS_NETWORK_NAME_MAP[chainId];
-    const chainIdInt = parseInt(chainId, 16);
-    const ensAddress = ensNetworkMap[chainIdInt.toString()];
-    const networkIsSupported = Boolean(ensAddress);
-    if (networkIsSupported) {
-      web3Provider = new Web3Provider(global.ethereumProvider, {
-        chainId: chainIdInt,
-        name: networkName,
-        ensAddress,
-      });
-    } else {
-      web3Provider = null;
-    }
     dispatch(enableDomainLookup(chainId));
   };
 }
@@ -269,73 +183,34 @@ export function lookupDomainName(domainName) {
     if (state[name].stage === 'UNINITIALIZED') {
       await dispatch(initializeDomainSlice());
     }
+    await dispatch(lookupStart(trimmedDomainName));
     state = getState();
-    if (
-      state[name].stage === 'NO_NETWORK_SUPPORT' &&
-      !(
-        isBurnAddress(trimmedDomainName) === false &&
-        isValidHexAddress(trimmedDomainName, { mixedCaseUseChecksum: true })
-      ) &&
-      !isHexString(trimmedDomainName)
-    ) {
-      await dispatch(domainNotSupported());
-    } else {
-      await dispatch(lookupStart(trimmedDomainName));
-      log.info(`Resolvers attempting to resolve name: ${trimmedDomainName}`);
-      let resolutions = [];
-      let fetchedResolutions;
-      let hasSnapResolution = false;
-      let error;
-      let address;
-      try {
-        address = await web3Provider?.resolveName(trimmedDomainName);
-      } catch (err) {
-        error = err;
-      }
-      const chainId = getCurrentChainId(state);
-      const chainIdInt = parseInt(chainId, 16);
-      if (address) {
-        resolutions = [
-          {
-            resolvedAddress: address,
-            protocol: 'Ethereum Name Service',
-            addressBookEntryName: getAddressBookEntry(state, address)?.name,
-            domainName: trimmedDomainName,
-          },
-        ];
-      } else {
-        fetchedResolutions = await fetchResolutions({
-          domain: trimmedDomainName,
-          chainId: `eip155:${chainIdInt}`,
-          state,
-        });
-        hasSnapResolution = fetchedResolutions.length > 0;
-        if (hasSnapResolution) {
-          resolutions = fetchedResolutions;
-        }
-      }
-
-      // Due to the asynchronous nature of looking up domains, we could reach this point
-      // while a new lookup has started, if so we don't use the found result.
-      state = getState();
-      if (trimmedDomainName !== state[name].domainName) {
-        return;
-      }
+    log.info(`Resolvers attempting to resolve name: ${trimmedDomainName}`);
+    let error;
+    const chainId = getCurrentChainId(state);
+    const chainIdInt = parseInt(chainId, 16);
+    const resolutions = await fetchResolutions({
+      domain: trimmedDomainName,
+      chainId: `eip155:${chainIdInt}`,
+      state,
+    });
 
-      await dispatch(
-        lookupEnd({
-          resolutions,
-          error,
-          chainId,
-          network: chainIdInt,
-          domainType:
-            hasSnapResolution || (!hasSnapResolution && !address)
-              ? 'Other'
-              : ENS,
-          domainName: trimmedDomainName,
-        }),
-      );
+    // Due to the asynchronous nature of looking up domains, we could reach this point
+    // while a new lookup has started, if so we don't use the found result.
+    state = getState();
+    if (trimmedDomainName !== state[name].domainName) {
+      return;
     }
+
+    await dispatch(
+      lookupEnd({
+        resolutions,
+        error,
+        chainId,
+        network: chainIdInt,
+        domainName: trimmedDomainName,
+      }),
+    );
   };
 }
 
@@ -350,7 +225,3 @@ export function getDomainError(state) {
 export function getDomainWarning(state) {
   return state[name].warning;
 }
-
-export function getDomainType(state) {
-  return state[name].domainType;
-}
diff --git a/ui/ducks/send/send.js b/ui/ducks/send/send.js
index 92eb9fb507b9..09cc2412d995 100644
--- a/ui/ducks/send/send.js
+++ b/ui/ducks/send/send.js
@@ -25,7 +25,6 @@ import {
   INSUFFICIENT_TOKENS_ERROR,
   NEGATIVE_OR_ZERO_AMOUNT_TOKENS_ERROR,
   INVALID_RECIPIENT_ADDRESS_ERROR,
-  INVALID_RECIPIENT_ADDRESS_NOT_ETH_NETWORK_ERROR,
   KNOWN_RECIPIENT_ADDRESS_WARNING,
   RECIPIENT_TYPES,
   SWAPS_NO_QUOTES,
@@ -95,11 +94,8 @@ import {
   getTokenIdParam,
 } from '../../helpers/utils/token-util';
 import {
-  IS_FLASK,
   checkExistingAddresses,
-  isDefaultMetaMaskChain,
   isOriginContractAddress,
-  isValidDomainName,
 } from '../../helpers/utils/util';
 import {
   getGasEstimateType,
@@ -111,6 +107,7 @@ import {
 import { resetDomainResolution } from '../domains';
 import {
   isBurnAddress,
+  isPossibleAddress,
   isValidHexAddress,
   toChecksumHexAddress,
 } from '../../../shared/modules/hexstring-utils';
@@ -1598,24 +1595,17 @@ const slice = createSlice({
           draftTransaction.recipient.error = null;
           draftTransaction.recipient.warning = null;
         } else {
-          const {
-            chainId,
-            tokens,
-            tokenAddressList,
-            isProbablyAnAssetContract,
-          } = action.payload;
+          const { tokens, tokenAddressList, isProbablyAnAssetContract } =
+            action.payload;
 
           if (
             isBurnAddress(state.recipientInput) ||
-            (!isValidHexAddress(state.recipientInput, {
-              mixedCaseUseChecksum: true,
-            }) &&
-              !IS_FLASK &&
-              !isValidDomainName(state.recipientInput))
+            (isPossibleAddress(state.recipientInput) &&
+              !isValidHexAddress(state.recipientInput, {
+                mixedCaseUseChecksum: true,
+              }))
           ) {
-            draftTransaction.recipient.error = isDefaultMetaMaskChain(chainId)
-              ? INVALID_RECIPIENT_ADDRESS_ERROR
-              : INVALID_RECIPIENT_ADDRESS_NOT_ETH_NETWORK_ERROR;
+            draftTransaction.recipient.error = INVALID_RECIPIENT_ADDRESS_ERROR;
           } else if (
             isOriginContractAddress(
               state.recipientInput,
diff --git a/ui/ducks/send/send.test.js b/ui/ducks/send/send.test.js
index 70ca9cde62c7..cdb6e3ad7e94 100644
--- a/ui/ducks/send/send.test.js
+++ b/ui/ducks/send/send.test.js
@@ -765,7 +765,7 @@ describe('Send Slice', () => {
         expect(draftTransaction.recipient.warning).toBeNull();
       });
 
-      it('should error with an invalid address error when user input is not a valid hex string', () => {
+      it('should not error with an invalid address error when user input is not a valid hex string', () => {
         const tokenAssetTypeState = {
           ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
           recipientInput: '0xValidateError',
@@ -784,21 +784,18 @@ describe('Send Slice', () => {
 
         const draftTransaction = getTestUUIDTx(result);
 
-        expect(draftTransaction.recipient.error).toStrictEqual(
-          'invalidAddressRecipient',
-        );
+        expect(draftTransaction.recipient.error).toBeNull();
       });
 
-      // TODO: Expectation might change in the future
-      it('should error with an invalid network error when user input is not a valid hex string on a non default network', () => {
+      it('should error with an invalid address error when user input is not a valid checksum address', () => {
         const tokenAssetTypeState = {
           ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-          recipientInput: '0xValidateError',
+          recipientInput: '0xAAAA6BF26964aF9D7eEd9e03E53415D37aA96045',
         };
         const action = {
           type: 'send/validateRecipientUserInput',
           payload: {
-            chainId: '0x55',
+            chainId: '',
             tokens: [],
             useTokenDetection: true,
             tokenAddressList: [],
@@ -810,7 +807,7 @@ describe('Send Slice', () => {
         const draftTransaction = getTestUUIDTx(result);
 
         expect(draftTransaction.recipient.error).toStrictEqual(
-          'invalidAddressRecipientNotEthNetwork',
+          'invalidAddressRecipient',
         );
       });
 
diff --git a/ui/pages/confirmations/send/send-content/add-recipient/domain-input.component.js b/ui/pages/confirmations/send/send-content/add-recipient/domain-input.component.js
index 5eef93681a3c..0b2514f12414 100644
--- a/ui/pages/confirmations/send/send-content/add-recipient/domain-input.component.js
+++ b/ui/pages/confirmations/send/send-content/add-recipient/domain-input.component.js
@@ -4,11 +4,7 @@ import classnames from 'classnames';
 
 import { isHexString } from '@metamask/utils';
 import { addHexPrefix } from '../../../../../../app/scripts/lib/util';
-import {
-  IS_FLASK,
-  isValidDomainName,
-  shortenAddress,
-} from '../../../../../helpers/utils/util';
+import { shortenAddress } from '../../../../../helpers/utils/util';
 import {
   isBurnAddress,
   isValidHexAddress,
@@ -87,9 +83,7 @@ export default class DomainInput extends Component {
       return null;
     }
 
-    if ((IS_FLASK && !isHexString(input)) || isValidDomainName(input)) {
-      lookupDomainName(input);
-    } else {
+    if (isHexString(input)) {
       resetDomainResolution();
       if (
         onValidAddressTyped &&
@@ -98,6 +92,8 @@ export default class DomainInput extends Component {
       ) {
         onValidAddressTyped(addHexPrefix(input));
       }
+    } else {
+      lookupDomainName(input);
     }
 
     return null;
@@ -167,11 +163,7 @@ export default class DomainInput extends Component {
                 className="ens-input__wrapper__input"
                 type="text"
                 dir="auto"
-                placeholder={
-                  IS_FLASK
-                    ? t('recipientAddressPlaceholderFlask')
-                    : t('recipientAddressPlaceholder')
-                }
+                placeholder={t('recipientAddressPlaceholderNew')}
                 onChange={this.onChange}
                 onPaste={this.onPaste}
                 spellCheck="false"
diff --git a/ui/pages/confirmations/send/send.constants.js b/ui/pages/confirmations/send/send.constants.js
index b13fd3e8e4e4..acf129412135 100644
--- a/ui/pages/confirmations/send/send.constants.js
+++ b/ui/pages/confirmations/send/send.constants.js
@@ -32,18 +32,11 @@ const NEGATIVE_ETH_ERROR = 'negativeETH';
 const NEGATIVE_OR_ZERO_AMOUNT_TOKENS_ERROR = 'negativeOrZeroAmountToken';
 const FLOAT_TOKENS_ERROR = 'floatAmountToken';
 const INVALID_RECIPIENT_ADDRESS_ERROR = 'invalidAddressRecipient';
-const INVALID_RECIPIENT_ADDRESS_NOT_ETH_NETWORK_ERROR =
-  'invalidAddressRecipientNotEthNetwork';
 const REQUIRED_ERROR = 'required';
 const KNOWN_RECIPIENT_ADDRESS_WARNING = 'knownAddressRecipient';
 const CONTRACT_ADDRESS_ERROR = 'contractAddressError';
 const CONFUSING_ENS_ERROR = 'confusingEnsDomain';
-const ENS_NO_ADDRESS_FOR_NAME = 'noAddressForName';
-const ENS_NOT_FOUND_ON_NETWORK = 'ensNotFoundOnCurrentNetwork';
-const ENS_ILLEGAL_CHARACTER = 'ensIllegalCharacter';
 const ENS_UNKNOWN_ERROR = 'ensUnknownError';
-const ENS_REGISTRATION_ERROR = 'ensRegistrationError';
-const DOMAIN_NOT_SUPPORTED_ON_NETWORK = 'domainNotSupportedOnNetwork';
 const NO_RESOLUTION_FOR_DOMAIN = 'noDomainResolution';
 const SWAPS_NO_QUOTES = 'swapQuotesNotAvailableErrorTitle';
 const SWAPS_QUOTES_ERROR = 'swapFetchingQuotesErrorTitle';
@@ -62,12 +55,7 @@ export {
   INVALID_RECIPIENT_ADDRESS_ERROR,
   KNOWN_RECIPIENT_ADDRESS_WARNING,
   CONTRACT_ADDRESS_ERROR,
-  INVALID_RECIPIENT_ADDRESS_NOT_ETH_NETWORK_ERROR,
-  ENS_NO_ADDRESS_FOR_NAME,
-  ENS_NOT_FOUND_ON_NETWORK,
-  ENS_ILLEGAL_CHARACTER,
   ENS_UNKNOWN_ERROR,
-  ENS_REGISTRATION_ERROR,
   MIN_GAS_LIMIT_DEC,
   MIN_GAS_PRICE_DEC,
   MIN_GAS_PRICE_GWEI,
@@ -83,7 +71,6 @@ export {
   NFT_TRANSFER_FROM_FUNCTION_SIGNATURE,
   NFT_SAFE_TRANSFER_FROM_FUNCTION_SIGNATURE,
   RECIPIENT_TYPES,
-  DOMAIN_NOT_SUPPORTED_ON_NETWORK,
   SWAPS_NO_QUOTES,
   SWAPS_QUOTES_ERROR,
 };
diff --git a/ui/pages/settings/contact-list-tab/add-contact/add-contact.component.js b/ui/pages/settings/contact-list-tab/add-contact/add-contact.component.js
index e2a0586fddcf..76f706bb8320 100644
--- a/ui/pages/settings/contact-list-tab/add-contact/add-contact.component.js
+++ b/ui/pages/settings/contact-list-tab/add-contact/add-contact.component.js
@@ -149,9 +149,6 @@ export default class AddContact extends PureComponent {
                 return (
                   <DomainInputResolutionCell
                     key={`${resolvedAddress}${resolvingSnap}${protocol}`}
-                    domainType={
-                      protocol === 'Ethereum Name Service' ? 'ENS' : 'Other'
-                    }
                     address={resolvedAddress}
                     domainName={addressBookEntryName ?? domainName}
                     onClick={() => {
diff --git a/yarn.lock b/yarn.lock
index 2149a6bd2404..adc43681e805 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -50,6 +50,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@adraffy/ens-normalize@npm:1.10.1":
+  version: 1.10.1
+  resolution: "@adraffy/ens-normalize@npm:1.10.1"
+  checksum: 10/4cb938c4abb88a346d50cb0ea44243ab3574330c81d4f5aaaf9dfee584b96189d0faa404de0fcbef5a1b73909ea4ebc3e63d84bd23f9949e5c8d4085207a5091
+  languageName: node
+  linkType: hard
+
 "@ampproject/remapping@npm:^2.2.0":
   version: 2.2.1
   resolution: "@ampproject/remapping@npm:2.2.1"
@@ -2666,6 +2673,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@ethersproject/networks@npm:5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/networks@npm:5.7.0"
+  dependencies:
+    "@ethersproject/logger": "npm:^5.7.0"
+  checksum: 10/c77efcd4ee44fe17fea448f135b6a6393d6c42122e725730ced37b7f2e3137e48c6712f3ff3d07d7fb4ddb0222bb404ad3088964b8db579620054788a8110101
+  languageName: node
+  linkType: hard
+
 "@ethersproject/networks@npm:5.7.1, @ethersproject/networks@npm:^5.7.0":
   version: 5.7.1
   resolution: "@ethersproject/networks@npm:5.7.1"
@@ -2694,6 +2710,34 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@ethersproject/providers@npm:5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/providers@npm:5.7.0"
+  dependencies:
+    "@ethersproject/abstract-provider": "npm:^5.7.0"
+    "@ethersproject/abstract-signer": "npm:^5.7.0"
+    "@ethersproject/address": "npm:^5.7.0"
+    "@ethersproject/base64": "npm:^5.7.0"
+    "@ethersproject/basex": "npm:^5.7.0"
+    "@ethersproject/bignumber": "npm:^5.7.0"
+    "@ethersproject/bytes": "npm:^5.7.0"
+    "@ethersproject/constants": "npm:^5.7.0"
+    "@ethersproject/hash": "npm:^5.7.0"
+    "@ethersproject/logger": "npm:^5.7.0"
+    "@ethersproject/networks": "npm:^5.7.0"
+    "@ethersproject/properties": "npm:^5.7.0"
+    "@ethersproject/random": "npm:^5.7.0"
+    "@ethersproject/rlp": "npm:^5.7.0"
+    "@ethersproject/sha2": "npm:^5.7.0"
+    "@ethersproject/strings": "npm:^5.7.0"
+    "@ethersproject/transactions": "npm:^5.7.0"
+    "@ethersproject/web": "npm:^5.7.0"
+    bech32: "npm:1.1.4"
+    ws: "npm:7.4.6"
+  checksum: 10/8d8e57ba80250ef4960de294baec9e6a1bd9cc79fa6820ac346d4180069d2929f272881bd6b16cd53a596368ba359bd5dd8e3e4d82b0afa883881e9ff937db44
+  languageName: node
+  linkType: hard
+
 "@ethersproject/providers@npm:5.7.2, @ethersproject/providers@npm:^5.7.0, @ethersproject/providers@npm:^5.7.2":
   version: 5.7.2
   resolution: "@ethersproject/providers@npm:5.7.2"
@@ -2843,6 +2887,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@ethersproject/web@npm:5.7.0":
+  version: 5.7.0
+  resolution: "@ethersproject/web@npm:5.7.0"
+  dependencies:
+    "@ethersproject/base64": "npm:^5.7.0"
+    "@ethersproject/bytes": "npm:^5.7.0"
+    "@ethersproject/logger": "npm:^5.7.0"
+    "@ethersproject/properties": "npm:^5.7.0"
+    "@ethersproject/strings": "npm:^5.7.0"
+  checksum: 10/ed1509b1cd1d4cf9fbb34383dfa5d70ae1b8450f86a623ca851f01bbdb41d9e2c69ffdb6b015c03082ea885cd1f7fdde16960976fc163618e170686d15558793
+  languageName: node
+  linkType: hard
+
 "@ethersproject/web@npm:5.7.1, @ethersproject/web@npm:^5.7.0":
   version: 5.7.1
   resolution: "@ethersproject/web@npm:5.7.1"
@@ -4984,6 +5041,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/ens-resolver-snap@npm:^0.1.2":
+  version: 0.1.2
+  resolution: "@metamask/ens-resolver-snap@npm:0.1.2"
+  dependencies:
+    "@metamask/snaps-sdk": "npm:^6.2.0"
+    ethers: "npm:^6.13.1"
+  checksum: 10/0dae3dff8815ad11805ec0c0d339a2fba9216ea8bd03a60ef9e3b7f330c45a15ae0136b8b735b20454ebe9183e4c2e15570ac2b22cf9fecfde00db853d7bcc23
+  languageName: node
+  linkType: hard
+
 "@metamask/eslint-config-jest@npm:^9.0.0":
   version: 9.0.0
   resolution: "@metamask/eslint-config-jest@npm:9.0.0"
@@ -6654,6 +6721,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@noble/curves@npm:1.2.0":
+  version: 1.2.0
+  resolution: "@noble/curves@npm:1.2.0"
+  dependencies:
+    "@noble/hashes": "npm:1.3.2"
+  checksum: 10/94e02e9571a9fd42a3263362451849d2f54405cb3ce9fa7c45bc6b9b36dcd7d1d20e2e1e14cfded24937a13d82f1e60eefc4d7a14982ce0bc219a9fc0f51d1f9
+  languageName: node
+  linkType: hard
+
 "@noble/curves@npm:1.4.2, @noble/curves@npm:^1.2.0, @noble/curves@npm:^1.4.0, @noble/curves@npm:^1.4.2, @noble/curves@npm:~1.4.0":
   version: 1.4.2
   resolution: "@noble/curves@npm:1.4.2"
@@ -6670,6 +6746,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@noble/hashes@npm:1.3.2":
+  version: 1.3.2
+  resolution: "@noble/hashes@npm:1.3.2"
+  checksum: 10/685f59d2d44d88e738114b71011d343a9f7dce9dfb0a121f1489132f9247baa60bc985e5ec6f3213d114fbd1e1168e7294644e46cbd0ce2eba37994f28eeb51b
+  languageName: node
+  linkType: hard
+
 "@noble/hashes@npm:1.4.0, @noble/hashes@npm:^1.1.2, @noble/hashes@npm:^1.2.0, @noble/hashes@npm:^1.3.1, @noble/hashes@npm:^1.3.2, @noble/hashes@npm:^1.3.3, @noble/hashes@npm:^1.4.0, @noble/hashes@npm:~1.4.0":
   version: 1.4.0
   resolution: "@noble/hashes@npm:1.4.0"
@@ -10676,6 +10759,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/node@npm:18.15.13":
+  version: 18.15.13
+  resolution: "@types/node@npm:18.15.13"
+  checksum: 10/b9bbe923573797ef7c5fd2641a6793489e25d9369c32aeadcaa5c7c175c85b42eb12d6fe173f6781ab6f42eaa1ebd9576a419eeaa2a1ec810094adb8adaa9a54
+  languageName: node
+  linkType: hard
+
 "@types/node@npm:^12.12.54":
   version: 12.20.55
   resolution: "@types/node@npm:12.20.55"
@@ -12077,6 +12167,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"aes-js@npm:4.0.0-beta.5":
+  version: 4.0.0-beta.5
+  resolution: "aes-js@npm:4.0.0-beta.5"
+  checksum: 10/8f745da2e8fb38e91297a8ec13c2febe3219f8383303cd4ed4660ca67190242ccfd5fdc2f0d1642fd1ea934818fb871cd4cc28d3f28e812e3dc6c3d0f1f97c24
+  languageName: node
+  linkType: hard
+
 "aes-js@npm:^3.1.1, aes-js@npm:^3.1.2":
   version: 3.1.2
   resolution: "aes-js@npm:3.1.2"
@@ -18479,13 +18576,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ethereum-ens-network-map@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "ethereum-ens-network-map@npm:1.0.2"
-  checksum: 10/34fa160f2b1ee8ec31bfe3dcec7b4becd4a6110acde171f43b9c28e0adc126dbded9dc6747d03088b6c99f04582887e6a23cb24b718321712c85208965835ea1
-  languageName: node
-  linkType: hard
-
 "ethereumjs-util@npm:7.1.5, ethereumjs-util@npm:^7.1.2":
   version: 7.1.5
   resolution: "ethereumjs-util@npm:7.1.5"
@@ -18528,6 +18618,44 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ethers@npm:5.7.0":
+  version: 5.7.0
+  resolution: "ethers@npm:5.7.0"
+  dependencies:
+    "@ethersproject/abi": "npm:5.7.0"
+    "@ethersproject/abstract-provider": "npm:5.7.0"
+    "@ethersproject/abstract-signer": "npm:5.7.0"
+    "@ethersproject/address": "npm:5.7.0"
+    "@ethersproject/base64": "npm:5.7.0"
+    "@ethersproject/basex": "npm:5.7.0"
+    "@ethersproject/bignumber": "npm:5.7.0"
+    "@ethersproject/bytes": "npm:5.7.0"
+    "@ethersproject/constants": "npm:5.7.0"
+    "@ethersproject/contracts": "npm:5.7.0"
+    "@ethersproject/hash": "npm:5.7.0"
+    "@ethersproject/hdnode": "npm:5.7.0"
+    "@ethersproject/json-wallets": "npm:5.7.0"
+    "@ethersproject/keccak256": "npm:5.7.0"
+    "@ethersproject/logger": "npm:5.7.0"
+    "@ethersproject/networks": "npm:5.7.0"
+    "@ethersproject/pbkdf2": "npm:5.7.0"
+    "@ethersproject/properties": "npm:5.7.0"
+    "@ethersproject/providers": "npm:5.7.0"
+    "@ethersproject/random": "npm:5.7.0"
+    "@ethersproject/rlp": "npm:5.7.0"
+    "@ethersproject/sha2": "npm:5.7.0"
+    "@ethersproject/signing-key": "npm:5.7.0"
+    "@ethersproject/solidity": "npm:5.7.0"
+    "@ethersproject/strings": "npm:5.7.0"
+    "@ethersproject/transactions": "npm:5.7.0"
+    "@ethersproject/units": "npm:5.7.0"
+    "@ethersproject/wallet": "npm:5.7.0"
+    "@ethersproject/web": "npm:5.7.0"
+    "@ethersproject/wordlists": "npm:5.7.0"
+  checksum: 10/6b3cb82233573d8cc7edae9ade5d59a95c451dbb828a5aaba81a1959495c76d99e3a7a73f783f92e3f46fe17b18b7042ade627f409583ba89c2d6cbcdd76edcb
+  languageName: node
+  linkType: hard
+
 "ethers@npm:^5.7.0, ethers@npm:^5.7.2":
   version: 5.7.2
   resolution: "ethers@npm:5.7.2"
@@ -18566,6 +18694,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ethers@npm:^6.13.1":
+  version: 6.13.2
+  resolution: "ethers@npm:6.13.2"
+  dependencies:
+    "@adraffy/ens-normalize": "npm:1.10.1"
+    "@noble/curves": "npm:1.2.0"
+    "@noble/hashes": "npm:1.3.2"
+    "@types/node": "npm:18.15.13"
+    aes-js: "npm:4.0.0-beta.5"
+    tslib: "npm:2.4.0"
+    ws: "npm:8.17.1"
+  checksum: 10/e611c2e2c5340982dfd1f004895f55abda11748a7edec9e6315226dec42d58aa61b827dd389ec904db5f9a244c475ae795e528da579251fdf62e914bde12809e
+  languageName: node
+  linkType: hard
+
 "ethjs-abi@npm:0.2.1, ethjs-abi@npm:^0.2.0":
   version: 0.2.1
   resolution: "ethjs-abi@npm:0.2.1"
@@ -26005,6 +26148,7 @@ __metadata:
     "@metamask/controller-utils": "npm:^11.2.0"
     "@metamask/design-tokens": "npm:^4.0.0"
     "@metamask/ens-controller": "npm:^13.0.0"
+    "@metamask/ens-resolver-snap": "npm:^0.1.2"
     "@metamask/eslint-config": "npm:^9.0.0"
     "@metamask/eslint-config-jest": "npm:^9.0.0"
     "@metamask/eslint-config-mocha": "npm:^9.0.0"
@@ -26203,8 +26347,8 @@ __metadata:
     eth-lattice-keyring: "npm:^0.12.4"
     eth-method-registry: "npm:^4.0.0"
     eth-rpc-errors: "npm:^4.0.2"
-    ethereum-ens-network-map: "npm:^1.0.2"
     ethereumjs-util: "npm:^7.0.10"
+    ethers: "npm:5.7.0"
     extension-port-stream: "npm:^3.0.0"
     fake-indexeddb: "npm:^4.0.1"
     fancy-log: "npm:^1.3.3"
@@ -34875,6 +35019,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tslib@npm:2.4.0":
+  version: 2.4.0
+  resolution: "tslib@npm:2.4.0"
+  checksum: 10/d8379e68b36caf082c1905ec25d17df8261e1d68ddc1abfd6c91158a064f6e4402039ae7c02cf4c81d12e3a2a2c7cd8ea2f57b233eb80136a2e3e7279daf2911
+  languageName: node
+  linkType: hard
+
 "tslib@npm:^1.13.0, tslib@npm:^1.8.1, tslib@npm:^1.9.0":
   version: 1.14.1
   resolution: "tslib@npm:1.14.1"
@@ -37005,7 +37156,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ws@npm:*, ws@npm:>=8.14.2, ws@npm:^8.0.0, ws@npm:^8.11.0, ws@npm:^8.16.0, ws@npm:^8.17.1, ws@npm:^8.2.3, ws@npm:^8.5.0, ws@npm:^8.8.0":
+"ws@npm:*, ws@npm:8.17.1, ws@npm:>=8.14.2, ws@npm:^8.0.0, ws@npm:^8.11.0, ws@npm:^8.16.0, ws@npm:^8.17.1, ws@npm:^8.2.3, ws@npm:^8.5.0, ws@npm:^8.8.0":
   version: 8.17.1
   resolution: "ws@npm:8.17.1"
   peerDependencies: