Merge pull request #2535 from AmbireTech/hotfix/citrea-requests-despite-disabled

Hotfix/ Don't make requests to citrea if disabled

Author: superKalo

src/controllers/domains/domains.test.ts

@@ -78,7 +78,10 @@ const ENS2 = {
 const NO_DOMAINS_ADDRESS = '0x1b9B9813C5805A60184091956F8b36E752272a93'
 
 describe('Domains', () => {
-  const domainsController = new DomainsController({ providers })
+  const domainsController = new DomainsController({
+    providers,
+    isNetworkEnabled: () => true
+  })
 
   it('should reverse lookup (ENS)', async () => {
     await domainsController.reverseLookup(ENS_OLDEST_RESOLVER.address)
@@ -204,7 +207,10 @@ describe('Domains', () => {
   })
   it('batchReverseLookup should use deployless batched reverse lookup', async () => {
     const provider = getRpcProvider(networks.find((n) => n.chainId === 1n)!.rpcUrls, 1n)
-    const controller = new DomainsController({ providers: { ['1']: provider } })
+    const controller = new DomainsController({
+      providers: { ['1']: provider },
+      isNetworkEnabled: () => true
+    })
     const reverseLookupEnsSpy = jest.spyOn(ensDomainsModule, 'reverseLookupEns')
     reverseLookupEnsSpy
       .mockResolvedValueOnce({
@@ -247,7 +253,10 @@ describe('Domains', () => {
   })
   it('reverseLookup awaits an in-flight lookup instead of starting a duplicate', async () => {
     const provider = getRpcProvider(networks.find((n) => n.chainId === 1n)!.rpcUrls, 1n)
-    const controller = new DomainsController({ providers: { ['1']: provider } })
+    const controller = new DomainsController({
+      providers: { ['1']: provider },
+      isNetworkEnabled: () => true
+    })
     const address = getAddress(ENS_OLDEST_RESOLVER.address)
 
     let resolveLookup!: (value: ensDomainsModule.ReverseLookupResult) => void
@@ -280,7 +289,10 @@ describe('Domains', () => {
   })
   it('batchReverseLookup awaits an address already in flight from reverseLookup', async () => {
     const provider = getRpcProvider(networks.find((n) => n.chainId === 1n)!.rpcUrls, 1n)
-    const controller = new DomainsController({ providers: { ['1']: provider } })
+    const controller = new DomainsController({
+      providers: { ['1']: provider },
+      isNetworkEnabled: () => true
+    })
     const addressInFlight = getAddress(ENS_OLDEST_RESOLVER.address)
     const addressInBatch = getAddress(ENS_LATEST_RESOLVER.address)
 
@@ -318,7 +330,8 @@ describe('Domains', () => {
   it('marks the address as failed (updateFailedAt) when the lookup returns a failed entry', async () => {
     const { restore } = suppressConsole(true)
     const controller = new DomainsController({
-      providers: { ['1']: getRpcProvider(networks.find((n) => n.chainId === 1n)!.rpcUrls, 1n) }
+      providers: { ['1']: getRpcProvider(networks.find((n) => n.chainId === 1n)!.rpcUrls, 1n) },
+      isNetworkEnabled: () => true
     })
     const reverseLookupEnsSpy = jest.spyOn(ensDomainsModule, 'reverseLookupEns')
     const FAILED_ADDRESS = getAddress(ENS2.address)
@@ -378,7 +391,8 @@ describe('Domains', () => {
     const controllerWithoutCitrea = new DomainsController({
       providers: {
         ['1']: getRpcProvider(networks.find((n) => n.chainId === 1n)!.rpcUrls, 1n)
-      }
+      },
+      isNetworkEnabled: () => true
     })
 
     const TEST = {

src/controllers/domains/domains.ts

@@ -44,6 +44,8 @@ export class DomainsController extends EventEmitter implements IDomainsControlle
 
   #defaultNetworksMode: 'mainnet' | 'testnet' = 'mainnet'
 
+  #isNetworkEnabled: (chainId: bigint) => boolean
+
   /** Stores ENS names, avatars, and metadata (timestamps) indexed by account address */
   domains: Domains = {}
 
@@ -68,16 +70,19 @@ export class DomainsController extends EventEmitter implements IDomainsControlle
   constructor({
     eventEmitterRegistry,
     providers,
-    defaultNetworksMode
+    defaultNetworksMode,
+    isNetworkEnabled
   }: {
     eventEmitterRegistry?: IEventEmitterRegistryController
     providers: RPCProviders
     defaultNetworksMode?: 'mainnet' | 'testnet'
+    isNetworkEnabled: (chainId: bigint) => boolean
   }) {
     super(eventEmitterRegistry)
 
     this.#providers = providers
     if (defaultNetworksMode) this.#defaultNetworksMode = defaultNetworksMode
+    this.#isNetworkEnabled = isNetworkEnabled
   }
 
   async batchReverseLookup(addresses: string[]) {
@@ -120,17 +125,23 @@ export class DomainsController extends EventEmitter implements IDomainsControlle
       : this.#defaultNetworksMode === 'mainnet'
         ? '1'
         : '11155111'
-    const provider = this.#providers[providerChainId]
+    const provider =
+      this.#isNetworkEnabled(BigInt(providerChainId)) && this.#providers[providerChainId]
 
     if (!provider) {
       // Don't emit an error if the citrea provider is missing
-      if (isNamoshiDomain) return
+      if (!isNamoshiDomain) {
+        this.emitError({
+          error: new Error('domains.resolveDomain: Ethereum provider is not available'),
+          message: 'The RPC provider for Ethereum is not available.',
+          level: 'major'
+        })
+      }
+
+      this.resolveDomainsStatus[domain] = 'FAILED'
+      await this.forceEmitUpdate()
+      this.resolveDomainsStatus[domain] = undefined
 
-      this.emitError({
-        error: new Error('domains.resolveDomain: Ethereum provider is not available'),
-        message: 'The RPC provider for Ethereum is not available.',
-        level: 'major'
-      })
       return
     }
 
@@ -289,7 +300,7 @@ export class DomainsController extends EventEmitter implements IDomainsControlle
 
     const ethereumProvider =
       this.#providers[this.#defaultNetworksMode === 'mainnet' ? '1' : '11155111']
-    const citreaProvider = this.#providers['4114']
+    const citreaProvider = this.#isNetworkEnabled(4114n) && this.#providers['4114']
 
     if (!ethereumProvider) {
       this.emitError({

src/controllers/main/main.ts

@@ -558,7 +558,9 @@ export class MainController extends EventEmitter implements IMainController {
     this.domains = new DomainsController({
       eventEmitterRegistry,
       providers: this.providers.providers,
-      defaultNetworksMode: this.networks.defaultNetworksMode
+      defaultNetworksMode: this.networks.defaultNetworksMode,
+      isNetworkEnabled: (chainId: bigint) =>
+        !!this.networks.networks.find((n) => n.chainId === chainId)
     })
 
     this.contractNames = new ContractNamesController({