Safe subgraph queries

src/graphql/SafeQueries.ts

@@ -0,0 +1,29 @@
+import { Address, Hex } from 'viem';
+
+// Define the base DAO structure that can be nested
+interface Safe {
+  id: Address;
+  created: string;
+  creator: Address;
+  transactionHash: Hex;
+  factoryAddress: Address;
+  singleton: Address;
+  setupData: Hex;
+}
+
+// Define the top-level DAO response structure
+export interface SafeQueryResponse {
+  safes: Safe[];
+}
+
+export const SafeQuery = `query SafeQuery($safeAddress: Bytes) {
+  safes(where: { id: $safeAddress }) {
+    id
+    created
+    creator
+    transactionHash
+    factoryAddress
+    singleton
+    setupData
+  }
+}`;

src/hooks/DAO/useSearchDao.ts

@@ -28,23 +28,31 @@ export const useSearchDao = () => {
 
   const findSafes = useCallback(
     async (resolvedAddressesWithChainId: { address: Address; chainId: number }[]) => {
-      /*
-      This function only checks if the address is on any of the EVM networks. 
-      The same safe could of on multiple networks
-
-      Changes requested inside getSafeCreationInfo
-      */
-      for await (const resolved of resolvedAddressesWithChainId) {
-        try {
-          const safeAPI = getSafeAPI(getConfigByChainId(resolved.chainId));
-          await safeAPI.getSafeCreationInfo(resolved.address);
+      // We're going to call getSafeCreationInfo for each resolved address
+      // If it throws, we don't have a Safe at that address
+      // If it doesn't throw, we add the resolved address and chainId to our list
+      const creationInfos = (
+        await Promise.all(
+          resolvedAddressesWithChainId.map(async resolved => {
+            try {
+              const safeAPI = getSafeAPI(getConfigByChainId(resolved.chainId));
 
-          setSafeResolvedAddressesWithPrefix(prevState => [...prevState, resolved]);
-        } catch (e) {
-          // Safe not found
-          continue;
-        }
-      }
+              // if this throws, we don't have a Safe
+              await safeAPI.getSafeCreationInfo(resolved.address);
+
+              // We actually only care about returning the resolved address and chainId
+              return resolved;
+            } catch (e) {
+              // Safe not found
+              return null;
+            }
+          }),
+        )
+      ).filter(creationInfo => creationInfo !== null);
+
+      // We're left with a list of chains and addresses
+      // (all the same address) that have a Safe at that address.
+      setSafeResolvedAddressesWithPrefix(creationInfos);
     },
     [getConfigByChainId],
   );

src/providers/App/hooks/useSafeAPI.ts

@@ -21,6 +21,8 @@ import {
 } from 'viem';
 import GnosisSafeL2Abi from '../../../assets/abi/GnosisSafeL2';
 import { SENTINEL_ADDRESS } from '../../../constants/common';
+import { createDecentSubgraphClient } from '../../../graphql';
+import { SafeQuery } from '../../../graphql/SafeQueries';
 import { SafeWithNextNonce } from '../../../types';
 import { NetworkConfig } from '../../../types/network';
 import { useNetworkConfigStore } from '../../NetworkConfig/useNetworkConfigStore';
@@ -141,31 +143,40 @@ class EnhancedSafeApiKit extends SafeApiKit {
       console.error('Error fetching getSafeCreationInfo from safeAPI:', error);
     }
 
+    // TODO: uncomment this out once subgraph testing is completed and working
+    // try {
+    //   type SafeClientCreationInfoResponse = {
+    //     readonly created: string;
+    //     readonly creator: string;
+    //     readonly transactionHash: string;
+    //     readonly factoryAddress: string;
+
+    //     readonly masterCopy: string;
+    //     readonly setupData: string;
+    //   };
+
+    //   const response: SafeClientCreationInfoResponse = await this._safeClientGet(
+    //     safeAddress,
+    //     '/transactions/creation',
+    //   );
+
+    //   return { ...response, singleton: response.masterCopy };
+    // } catch (error) {
+    //   console.error('Error fetching getSafeCreationInfo from safe-client:', error);
+    // }
+
+    // TODO: this is what needs to be tested
     try {
-      type SafeClientCreationInfoResponse = {
-        readonly created: string;
-        readonly creator: string;
-        readonly transactionHash: string;
-        readonly factoryAddress: string;
-
-        readonly masterCopy: string;
-        readonly setupData: string;
-      };
-
-      const response: SafeClientCreationInfoResponse = await this._safeClientGet(
-        safeAddress,
-        '/transactions/creation',
-      );
+      const client = createDecentSubgraphClient(this.networkConfig);
+      const queryResult = await client.query<any>(SafeQuery, { safeAddress });
 
-      return { ...response, singleton: response.masterCopy };
-    } catch (error) {
-      console.error('Error fetching getSafeCreationInfo from safe-client:', error);
-    }
+      console.log('queryResult', queryResult);
 
-    try {
-      // TODO ENG-291
-      // add another layer of onchain fallback here
-      // use subgraph to get this data
+      const safeCreationInfo = queryResult.data?.safes[0];
+      if (safeCreationInfo) {
+        return safeCreationInfo;
+      }
+      console.log('Safe creation info not found');
     } catch (error) {
       console.error('Error fetching getSafeCreationInfo from subgraph:', error);
     }