Merge pull request #1376 from AmbireTech/remove/ud-resolution

Remove/ UD Resolution

Author: PetromirDev

package-lock.json

@@ -29,7 +29,6 @@
     "@ethersproject/abstract-signer": "^5.7.0",
     "@types/uuid": "9.0.0",
     "@types/validator": "^13.7.0",
-    "@unstoppabledomains/resolution": "^9.2.2",
     "@walletconnect/client": "^1.7.1",
     "bip44-constants": "^128.0.0",
     "ethereumjs-util": "^7.1.3",

package.json

@@ -18,11 +18,6 @@ const ENS2 = {
   name: 'josh.eth'
 }
 
-const UD = {
-  address: '0x8aaD44321A86b170879d7A244c1e8d360c99DdA8',
-  name: 'brad.x'
-}
-
 const NO_DOMAINS_ADDRESS = '0x1b9B9813C5805A60184091956F8b36E752272a93'
 
 describe('Domains', () => {
@@ -33,12 +28,6 @@ describe('Domains', () => {
 
     expect(domainsController.domains[ENS.address].ens).toBe(ENS.name)
   })
-  // UD reverse lookup is removed for now
-  it.skip('should reverse lookup (UD)', async () => {
-    await domainsController.reverseLookup(UD.address)
-
-    expect(domainsController.domains[UD.address].ud).toBe(UD.name)
-  })
   it('should save resolved reverse lookup', () => {
     const { name, address } = ENS2
     const type = 'ens'
@@ -75,11 +64,10 @@ describe('Domains', () => {
 
     expect(domainsController.domains[address].savedAt).toBe(savedAtFirstCall)
   })
-  it('should set both ens and ud to null if no domain is found', async () => {
+  it('should set ens to null if no domain is found', async () => {
     await domainsController.reverseLookup(NO_DOMAINS_ADDRESS)
 
     expect(domainsController.domains[NO_DOMAINS_ADDRESS].ens).toBe(null)
-    expect(domainsController.domains[NO_DOMAINS_ADDRESS].ud).toBe(null)
   })
   it('should reverse multiple addresses', async () => {
     domainsController.domains = {}

src/controllers/domains/domains.test.ts

@@ -2,28 +2,20 @@ import { getAddress, isAddress } from 'ethers'
 
 import { RPCProviders } from '../../interfaces/provider'
 import { reverseLookupEns } from '../../services/ensDomains'
-// import { reverseLookupUD } from '../../services/unstoppableDomains'
 import EventEmitter from '../eventEmitter/eventEmitter'
 
 interface Domains {
   [address: string]: {
     ens: string | null
-    ud: string | null
     savedAt: number
   }
 }
 
 // 15 minutes
 const PERSIST_DOMAIN_FOR_IN_MS = 15 * 60 * 1000
 
-// const EXPECTED_UD_ERROR_MESSAGES = [
-//   'Only absolute URLs are supported',
-//   'unexpected character at line 1 column 1 of the JSON data',
-//   'Unexpected token'
-// ]
-
 /**
- * Domains controller- responsible for handling the reverse lookup of addresses to ENS and UD names.
+ * Domains controller- responsible for handling the reverse lookup of addresses to ENS names.
  * Resolved names are saved in `domains` for a short period of time(15 minutes) to avoid unnecessary lookups.
  */
 export class DomainsController extends EventEmitter {
@@ -46,7 +38,7 @@ export class DomainsController extends EventEmitter {
   }
 
   /**
-   *Saves an already resolved ENS or UD name for an address.
+   *Saves an already resolved ENS name for an address.
    */
   saveResolvedReverseLookup({
     address,
@@ -55,21 +47,20 @@ export class DomainsController extends EventEmitter {
   }: {
     address: string
     name: string
-    type: 'ens' | 'ud'
+    type: 'ens'
   }) {
     const checksummedAddress = getAddress(address)
-    const { ens: oldEns, ud: oldUd } = this.domains[checksummedAddress] || { ens: null, ud: null }
+    const { ens: oldEns } = this.domains[checksummedAddress] || { ens: null }
 
     this.domains[checksummedAddress] = {
       ens: type === 'ens' ? name : oldEns,
-      ud: type === 'ud' ? name : oldUd,
       savedAt: Date.now()
     }
     this.emitUpdate()
   }
 
   /**
-   * Resolves the ENS and UD names for an address if such exist.
+   * Resolves the ENS names for an address if such exist.
    */
   async reverseLookup(address: string, emitUpdate = true) {
     if (!('1' in this.#providers)) {
@@ -100,22 +91,8 @@ export class DomainsController extends EventEmitter {
       console.error('ENS reverse lookup unexpected error', e)
     }
 
-    // Don't reverse lookup UD names for now
-    // https://github.com/AmbireTech/ambire-app/issues/2681#issuecomment-2299460748
-    // If UD is ever needed, rewrite using Promise.all
-    // try {
-    //   udName = (await reverseLookupUD(checksummedAddress)) || null
-    // } catch (e: any) {
-    //   if (
-    //     !EXPECTED_UD_ERROR_MESSAGES.some((expectedMessage) => e.message.includes(expectedMessage))
-    //   ) {
-    //     console.error('UD reverse lookup unexpected error', e)
-    //   }
-    // }
-
     this.domains[checksummedAddress] = {
       ens: ensName,
-      ud: null,
       savedAt: Date.now()
     }
 

src/controllers/domains/domains.ts

@@ -94,7 +94,6 @@ describe('Transfer Controller', () => {
       addressState: {
         fieldValue: PLACEHOLDER_RECIPIENT,
         ensAddress: '',
-        udAddress: '',
         isDomainResolving: false
       }
     })
@@ -108,7 +107,6 @@ describe('Transfer Controller', () => {
       addressState: {
         fieldValue: XWALLET_ADDRESS,
         ensAddress: '',
-        udAddress: '',
         isDomainResolving: false
       }
     })
@@ -149,7 +147,6 @@ describe('Transfer Controller', () => {
       addressState: {
         fieldValue: PLACEHOLDER_RECIPIENT,
         ensAddress: '',
-        udAddress: '',
         isDomainResolving: false
       }
     })
@@ -206,7 +203,6 @@ describe('Transfer Controller', () => {
       addressState: {
         fieldValue: FEE_COLLECTOR,
         ensAddress: '',
-        udAddress: '',
         isDomainResolving: false
       }
     })
@@ -222,7 +218,6 @@ describe('Transfer Controller', () => {
     expect(transferController.addressState).toEqual({
       fieldValue: '',
       ensAddress: '',
-      udAddress: '',
       isDomainResolving: false
     })
     expect(transferController.isRecipientAddressUnknownAgreed).toBe(false)

src/controllers/transfer/transfer.test.ts

@@ -22,7 +22,6 @@ const CONVERSION_PRECISION_POW = BigInt(10 ** CONVERSION_PRECISION)
 const DEFAULT_ADDRESS_STATE = {
   fieldValue: '',
   ensAddress: '',
-  udAddress: '',
   isDomainResolving: false
 }
 
@@ -194,7 +193,6 @@ export class TransferController extends EventEmitter {
     const validationFormMsgsNew = DEFAULT_VALIDATION_FORM_MSGS
 
     if (this.#humanizerInfo && this.#selectedAccountData) {
-      const isUDAddress = !!this.addressState.udAddress
       const isEnsAddress = !!this.addressState.ensAddress
 
       validationFormMsgsNew.recipientAddress = validateSendTransferAddress(
@@ -203,7 +201,6 @@ export class TransferController extends EventEmitter {
         this.isRecipientAddressUnknownAgreed,
         this.isRecipientAddressUnknown,
         this.isRecipientHumanizerKnownTokenOrSmartContract,
-        isUDAddress,
         isEnsAddress,
         this.addressState.isDomainResolving,
         this.isSWWarningVisible,
@@ -261,9 +258,7 @@ export class TransferController extends EventEmitter {
   }
 
   get recipientAddress() {
-    return (
-      this.addressState.ensAddress || this.addressState.udAddress || this.addressState.fieldValue
-    )
+    return this.addressState.ensAddress || this.addressState.fieldValue
   }
 
   update({

src/controllers/transfer/transfer.ts

@@ -1,14 +1,12 @@
 type AddressState = {
   fieldValue: string
-  udAddress: string
   ensAddress: string
   isDomainResolving: boolean
 }
 
 type AddressStateOptional = {
   fieldValue?: AddressState['fieldValue']
   ensAddress?: AddressState['ensAddress']
-  udAddress?: AddressState['udAddress']
   isDomainResolving?: AddressState['isDomainResolving']
 }
 

src/interfaces/domains.ts

@@ -73,7 +73,7 @@ export const getNetworksWithFailedRPCErrors = ({
       networkNames: [n.name],
       type: 'error',
       title: `Failed to retrieve network data for ${n.name}. You can try selecting another RPC URL`,
-      text: 'Affected features: visible assets, DeFi positions, sign message/transaction, ENS/UD domain resolving, add account.',
+      text: 'Affected features: visible assets, DeFi positions, sign message/transaction, ENS domain resolving, add account.',
       actions: [
         {
           label: 'Select',
@@ -93,7 +93,7 @@ export const getNetworksWithFailedRPCErrors = ({
     title: `Failed to retrieve network data for ${networksToGroupInSingleBanner
       .map((n) => n.name)
       .join(', ')} (RPC malfunction)`,
-    text: 'Affected features: visible assets, DeFi positions, sign message/transaction, ENS/UD domain resolving, add account.'
+    text: 'Affected features: visible assets, DeFi positions, sign message/transaction, ENS domain resolving, add account.'
   })
 
   return errors

src/libs/selectedAccount/errors.ts

@@ -58,7 +58,6 @@ const validateSendTransferAddress = (
   addressConfirmed: any,
   isRecipientAddressUnknown: boolean,
   isRecipientHumanizerKnownTokenOrSmartContract: boolean,
-  isUDAddress: boolean,
   isEnsAddress: boolean,
   isRecipientDomainResolving: boolean,
   isSWWarningVisible?: boolean,
@@ -89,7 +88,6 @@ const validateSendTransferAddress = (
   if (
     isRecipientAddressUnknown &&
     !addressConfirmed &&
-    !isUDAddress &&
     !isEnsAddress &&
     !isRecipientDomainResolving
   ) {
@@ -103,10 +101,10 @@ const validateSendTransferAddress = (
   if (
     isRecipientAddressUnknown &&
     !addressConfirmed &&
-    (isUDAddress || isEnsAddress) &&
+    isEnsAddress &&
     !isRecipientDomainResolving
   ) {
-    const name = isUDAddress ? 'Unstoppable domain' : 'Ethereum Name Service'
+    const name = 'Ethereum Name Service'
     return {
       success: false,
       message: `You're trying to send to an unknown ${name}. If you really trust the person who gave it to you, confirm using the checkbox below.`