Refactor: remove custom ENS resolver for Sepolia (#3204)

safe-global · Feb 7, 2024 · 074146d · 074146d
1 parent 7a0e42f
commit 074146d
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 61 deletions.
diff --git a/src/components/common/AddressInput/index.tsx b/src/components/common/AddressInput/index.tsx
@@ -117,7 +117,7 @@ const AddressInput = ({
         className={inputCss.input}
         autoComplete="off"
         autoFocus={props.focused}
-        label={<>{error?.message || props.label}</>}
+        label={<>{error?.message || props.label || `Recipient address${isDomainLookupEnabled ? ' or ENS' : ''}`}</>}
         error={!!error}
         fullWidth
         spellCheck={false}

diff --git a/src/components/tx-flow/flows/NftTransfer/SendNftBatch.tsx b/src/components/tx-flow/flows/NftTransfer/SendNftBatch.tsx
@@ -113,7 +113,7 @@ const SendNftBatch = ({ params, onSubmit }: SendNftBatchProps) => {
       <FormProvider {...formMethods}>
         <form onSubmit={handleSubmit(onFormSubmit)}>
           <FormControl fullWidth sx={{ mb: 3, mt: 1 }}>
-            <AddressBookInput name={Field.recipient} label="Recipient address or ENS" canAdd={isAddressValid} />
+            <AddressBookInput name={Field.recipient} canAdd={isAddressValid} />
           </FormControl>
 
           <Typography data-testid="selected-nfts" variant="body2" color="text.secondary" mb={2}>

diff --git a/src/components/tx-flow/flows/TokenTransfer/CreateTokenTransfer.tsx b/src/components/tx-flow/flows/TokenTransfer/CreateTokenTransfer.tsx
@@ -103,11 +103,7 @@ export const CreateTokenTransfer = ({
       <FormProvider {...formMethods}>
         <form onSubmit={handleSubmit(onSubmit)} className={commonCss.form}>
           <FormControl fullWidth sx={{ mt: 1 }}>
-            <AddressBookInput
-              name={TokenTransferFields.recipient}
-              label="Recipient address or ENS"
-              canAdd={isAddressValid}
-            />
+            <AddressBookInput name={TokenTransferFields.recipient} canAdd={isAddressValid} />
           </FormControl>
 
           <TokenAmountInput balances={balancesItems} selectedToken={selectedToken} maxAmount={maxAmount} />

diff --git a/src/components/tx-flow/flows/TokenTransfer/__tests__/CreateTokenTransfer.test.tsx b/src/components/tx-flow/flows/TokenTransfer/__tests__/CreateTokenTransfer.test.tsx
@@ -29,7 +29,7 @@ describe('CreateTokenTransfer', () => {
       <CreateTokenTransfer params={mockParams} onSubmit={jest.fn()} isSafeTokenPaused={true} />,
     )
 
-    expect(getAllByText('Recipient address or ENS')[0]).toBeInTheDocument()
+    expect(getAllByText('Recipient address')[0]).toBeInTheDocument()
   })
 
   it('should disable the submit button and display a warning if $SAFE token is selected and not transferable', () => {

diff --git a/src/services/ens/config.ts b/src/services/ens/config.ts
diff --git a/src/services/ens/custom.ts b/src/services/ens/custom.ts
diff --git a/src/services/ens/index.test.ts b/src/services/ens/index.test.ts
@@ -4,7 +4,7 @@ import { logError } from '../exceptions'
 
 // mock rpcProvider
 const rpcProvider = {
-  resolveName: jest.fn(() => Promise.resolve('0x0000000000000000000000000000000000000000')),
+  resolveName: jest.fn(() => Promise.resolve('0x0000000000000000000000000000000000000001')),
   lookupAddress: jest.fn(() => Promise.resolve('safe.eth')),
   getNetwork: jest.fn(() => Promise.resolve({ chainId: 1 })),
 } as unknown as JsonRpcProvider
@@ -20,10 +20,6 @@ jest.mock('../exceptions', () => ({
   logError: jest.fn(),
 }))
 
-jest.mock('./custom', () => ({
-  customResolveName: jest.fn(() => Promise.resolve('0x0000001111111111111111111111111111111111')),
-}))
-
 describe('domains', () => {
   describe('isDomain', () => {
     it('should check the domain format', async () => {
@@ -37,23 +33,14 @@ describe('domains', () => {
 
   describe('resolveName', () => {
     it('should resolve names', async () => {
-      expect(await resolveName(rpcProvider, 'test.eth')).toBe('0x0000000000000000000000000000000000000000')
+      expect(await resolveName(rpcProvider, 'test.eth')).toBe('0x0000000000000000000000000000000000000001')
     })
 
     it('should return undefined and log on error', async () => {
       const address = await resolveName(badRpcProvider, 'safe.eth')
       expect(address).toBe(undefined)
       expect(logError).toHaveBeenCalledWith('101: Failed to resolve the address', 'bad resolveName')
     })
-
-    it('should look up names on Sepolia', async () => {
-      // mock rpcProvider
-      const rpcProvider = {
-        getNetwork: jest.fn(() => Promise.resolve({ chainId: 11155111 })),
-      } as unknown as JsonRpcProvider
-
-      expect(await resolveName(rpcProvider, 'sepolia.eth')).toBe('0x0000001111111111111111111111111111111111')
-    })
   })
 
   describe('lookupAddress', () => {

diff --git a/src/services/ens/index.ts b/src/services/ens/index.ts
@@ -1,8 +1,6 @@
 import { type Provider } from 'ethers'
 import { logError } from '../exceptions'
 import ErrorCodes from '../exceptions/ErrorCodes'
-import { CUSTOM_REGISTRIES } from './config'
-import { customResolveName } from './custom'
 
 type EthersError = Error & {
   reason?: string
@@ -22,12 +20,6 @@ export const resolveName = async (rpcProvider: Provider, name: string): Promise<
   } catch {}
 
   try {
-    // Try custom resolvers first
-    if (chainId && CUSTOM_REGISTRIES[chainId]) {
-      return await customResolveName(CUSTOM_REGISTRIES[chainId], rpcProvider, name)
-    }
-
-    // The default ENS resolver
     return (await rpcProvider.resolveName(name)) || undefined
   } catch (e) {
     const err = e as EthersError