[core-v2.15.3-alpha.2]: Fix - Add config to disable Unstoppable Domai…

…ns resolution (#1556) * Add config to disable Unstoppable Domains resolution * Remove commented code * Clean up uns import * Add check to getUns func * revert check at account level
blocknative · Feb 28, 2023 · f794937 · f794937
1 parent 626e5ae
commit f794937
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 13 deletions.
diff --git a/docs/src/routes/docs/[...3]modules/core.md b/docs/src/routes/docs/[...3]modules/core.md
@@ -195,6 +195,14 @@ type ConnectModalOptions = {
    * Defaults to `https://ethereum.org/en/wallets/find-wallet/#main-content`
    */
   iDontHaveAWalletLink?: string
+  /**
+   * Define support for Unstoppable Domains resolutions
+   * after a user connects. Similar to ens, uns can be used for users who
+   * have minted an Unstoppable Domain and associated it with their wallet.
+   * ENS resolution takes precedent over UNS
+   * Defaults to true
+   */
+    disableUDResolution?: boolean
 }
 ```
 

diff --git a/docs/src/routes/docs/[...4]wallets/formatic.md b/docs/src/routes/docs/[...4]wallets/formatic.md
@@ -1,6 +1,6 @@
 # Fortmatic
 
-Wallet module for connecting Ledger hardware wallets to web3-onboard
+Wallet module for connecting Fortmatic hardware wallets to web3-onboard
 
 ### Install
 

diff --git a/packages/core/README.md b/packages/core/README.md
@@ -145,6 +145,14 @@ type ConnectModalOptions = {
    * Defaults to `https://ethereum.org/en/wallets/find-wallet/#main-content`
    */
   iDontHaveAWalletLink?: string
+  /**
+   * Define support for Unstoppable Domains resolutions
+   * after a user connects. Similar to ens, uns can be used for users who
+   * have minted an Unstoppable Domain and associated it with their wallet.
+   * ENS resolution takes precedent over UNS
+   * Defaults to false
+   */
+    disableUDResolution?: boolean
 }
 ```
 

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/core",
-  "version": "2.15.3-alpha.1",
+  "version": "2.15.3-alpha.2",
   "description": "Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardized spec compliant web3 providers for all supported wallets, framework agnostic modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.",
   "keywords": [
     "Ethereum",

diff --git a/packages/core/src/provider.ts b/packages/core/src/provider.ts
@@ -9,7 +9,6 @@ import { validEnsChain } from './utils.js'
 import disconnect from './disconnect.js'
 import { state } from './store/index.js'
 import { getBNMulitChainSdk } from './services.js'
-import { Resolution } from '@unstoppabledomains/resolution'
 
 import type {
   ChainId,
@@ -384,15 +383,19 @@ export async function getUns(
   address: Address,
   chain: Chain
 ): Promise<Uns | null> {
+  const { connect } = state.get()
+
   // check if address is valid ETH address before attempting to resolve
   // chain we don't recognize and don't have a rpcUrl for requests
-  if (!utils.isAddress(address) || !chain) return null
-
-  const resolutionInstance = new Resolution()
+  if (connect.disableUDResolution || !utils.isAddress(address) || !chain)
+    return null
 
   try {
-    const name = await resolutionInstance.reverse(address)
     let uns = null
+    const { Resolution } = await import('@unstoppabledomains/resolution')
+
+    const resolutionInstance = new Resolution()
+    const name = await resolutionInstance.reverse(address)
 
     if (name) {
       uns = {

diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
@@ -195,6 +195,14 @@ export type ConnectModalOptions = {
    * Defaults to `https://ethereum.org/en/wallets/find-wallet/#main-content`
    */
   iDontHaveAWalletLink?: string
+  /**
+   * Define support for Unstoppable Domains resolutions
+   * after a user connects. Similar to ens, uns can be used for users who
+   * have minted an Unstoppable Domain and associated it with their wallet.
+   * ENS resolution takes precedent over UNS
+   * Defaults to false
+   */
+  disableUDResolution?: boolean
 }
 
 export type CommonPositions =

diff --git a/packages/core/src/validation.ts b/packages/core/src/validation.ts
@@ -174,7 +174,8 @@ const connectModalOptions = Joi.object({
   showSidebar: Joi.boolean(),
   disableClose: Joi.boolean(),
   autoConnectLastWallet: Joi.boolean(),
-  iDontHaveAWalletLink: Joi.string()
+  iDontHaveAWalletLink: Joi.string(),
+  disableUDResolution: Joi.boolean()
 })
 
 const containerElements = Joi.object({

diff --git a/packages/demo/package.json b/packages/demo/package.json
@@ -23,7 +23,7 @@
     "webpack-dev-server": "4.7.4"
   },
   "dependencies": {
-    "@web3-onboard/core": "^2.15.3-alpha.1",
+    "@web3-onboard/core": "^2.15.3-alpha.2",
     "@web3-onboard/coinbase": "^2.1.4",
     "@web3-onboard/transaction-preview": "^2.0.4",
     "@web3-onboard/dcent": "^2.2.3",

diff --git a/packages/demo/src/App.svelte b/packages/demo/src/App.svelte
@@ -243,6 +243,7 @@
     ],
     connect: {
       // disableClose: true,
+      // disableUDResolution: true,
       autoConnectLastWallet: true
     },
     appMetadata: {

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/react",
-  "version": "2.6.5-alpha.1",
+  "version": "2.6.5-alpha.2",
   "description": "A collection of React hooks for integrating Web3-Onboard in to React and Next.js projects. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardised spec compliant web3 providers for all supported wallets, modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.",
   "keywords": [
     "Ethereum",
@@ -62,7 +62,7 @@
     "typescript": "^4.5.5"
   },
   "dependencies": {
-    "@web3-onboard/core": "^2.15.3-alpha.1",
+    "@web3-onboard/core": "^2.15.3-alpha.2",
     "@web3-onboard/common": "^2.2.3",
     "use-sync-external-store": "1.0.0"
   },

diff --git a/packages/vue/package.json b/packages/vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/vue",
-  "version": "2.5.5-alpha.1",
+  "version": "2.5.5-alpha.12",
   "description": "A collection of Vue Composables for integrating Web3-Onboard in to a Vue or Nuxt project. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardized spec compliant web3 providers for all supported wallets, modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.",
   "keywords": [
     "Ethereum",
@@ -63,7 +63,7 @@
     "@vueuse/core": "^8.4.2",
     "@vueuse/rxjs": "^8.2.0",
     "@web3-onboard/common": "^2.2.3",
-    "@web3-onboard/core": "^2.15.3-alpha.1",
+    "@web3-onboard/core": "^2.15.3-alpha.2",
     "vue-demi": "^0.12.4"
   },
   "peerDependencies": {