From 8d452b6479adef41a7bcaed7d57ca6deb6e8dbbe Mon Sep 17 00:00:00 2001
From: Jan-Felix <jfschwarz@users.noreply.github.com>
Date: Fri, 26 Jul 2024 14:54:26 +0200
Subject: [PATCH] fix issue caused by circular module chains

---
 .../src/integrations/zodiac/useZodiacModules.ts     | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/extension/src/integrations/zodiac/useZodiacModules.ts b/extension/src/integrations/zodiac/useZodiacModules.ts
index 2973dd83..e325c698 100644
--- a/extension/src/integrations/zodiac/useZodiacModules.ts
+++ b/extension/src/integrations/zodiac/useZodiacModules.ts
@@ -35,7 +35,6 @@ export const useZodiacModules = (
   const [modules, setModules] = useState<Module[]>([])
 
   const { chainId } = useRoute(connectionId)
-
   useEffect(() => {
     setLoading(true)
     setError(false)
@@ -57,8 +56,15 @@ export const useZodiacModules = (
 
 async function fetchModules(
   safeOrModifierAddress: string,
-  chainId: ChainId
+  chainId: ChainId,
+  previous: Set<string> = new Set()
 ): Promise<Module[]> {
+  if (previous.has(safeOrModifierAddress.toLowerCase())) {
+    // circuit breaker in case of circular module references
+    return []
+  }
+  previous.add(safeOrModifierAddress.toLowerCase())
+
   const provider = getReadOnlyProvider(chainId)
 
   const mastercopyAddresses = ContractAddresses[chainId] || {}
@@ -67,7 +73,6 @@ async function fetchModules(
     AvatarInterface,
     provider
   )
-
   const moduleAddresses = (
     await contract.getModulesPaginated(ADDRESS_ONE, 100)
   )[0] as string[]
@@ -115,7 +120,7 @@ async function fetchModules(
       if (MODIFIERS.includes(type)) {
         // recursively fetch modules from modifier
         try {
-          modules = await fetchModules(moduleAddress, chainId)
+          modules = await fetchModules(moduleAddress, chainId, previous)
         } catch (e) {
           console.error(
             `Could not fetch sub modules of ${type} modifier ${moduleAddress}`,