fix version loading

src/hooks/loadables/useLoadSafeInfo.ts

@@ -10,10 +10,12 @@ import { POLLING_INTERVAL } from '@/config/constants'
 import { isLegacyVersion, useSafeImplementation, useSafeSDK } from '@/hooks/coreSDK/safeCoreSDK'
 import { addressEx } from '@/utils/addresses'
 import type Safe from '@safe-global/safe-core-sdk'
-import { _safeDeployments } from '@safe-global/safe-deployments'
+import { _safeDeployments, _safeL2Deployments } from '@safe-global/safe-deployments'
 
 const isKnownContract = (address: string): boolean => {
- return _safeDeployments.some((deployment) => Object.values(deployment.networkAddresses).includes(address))
+ return _safeDeployments
+ .concat(_safeL2Deployments)
+ .some((deployment) => Object.values(deployment.networkAddresses).includes(address))
 }
 
 export const getSafeInfo = async (sdk: Safe, implementation: string): Promise<SafeInfo> => {

src/utils/safe-versions.ts

@@ -2,8 +2,7 @@ import { hasSafeFeature as sdkHasSafeFeature } from '@safe-global/safe-core-sdk-
 import type { SAFE_FEATURES } from '@safe-global/safe-core-sdk-utils'
 import type { SafeInfo } from '@safe-global/safe-gateway-typescript-sdk'
 import type { Provider } from '@ethersproject/providers'
-import { isValidSafeVersion, type ModernSafeVersion } from '@/hooks/coreSDK/safeCoreSDK'
-import { LATEST_SAFE_VERSION } from '@/config/constants'
+import { isValidSafeVersion } from '@/hooks/coreSDK/safeCoreSDK'
 
 import { Gnosis_safe__factory as Gnosis_safe__factory111 } from '@/types/contracts/factories/@safe-global/safe-deployments/dist/assets/v1.1.1'
 import { Gnosis_safe__factory as Gnosis_safe__factory120 } from '@/types/contracts/factories/@safe-global/safe-deployments/dist/assets/v1.2.0'
@@ -25,10 +24,8 @@ export const hasSafeFeature = (feature: SAFE_FEATURES, version: SafeInfo['versio
 }
 
 function getSafeFactory(safeVersion: string | null) {
- const isL2 = safeVersion?.endsWith('L2') ?? false
- if (!isValidSafeVersion(safeVersion)) return
-
- const version: ModernSafeVersion = safeVersion ?? LATEST_SAFE_VERSION
+ const [version, isL2] = (safeVersion ?? '').split('+')
+ if (!isValidSafeVersion(version)) return
 
  const factories = {
  '1.1.1': Gnosis_safe__factory111,
@@ -45,17 +42,5 @@ export const getSafeABI = (safeVersion: string | null) => {
 }
 
 export const getSafeContract = (safeAddress: string, safeVersion: string | null, provider: Provider) => {
- const isL2 = safeVersion?.endsWith('L2') ?? false
- if (!isValidSafeVersion(safeVersion)) return
-
- const version: ModernSafeVersion = safeVersion ?? LATEST_SAFE_VERSION
-
- const factories = {
- '1.1.1': Gnosis_safe__factory111,
- '1.2.0': Gnosis_safe__factory120,
- '1.3.0': isL2 ? Gnosis_safe_l2__factory130 : Gnosis_safe__factory130,
- '1.4.1': isL2 ? Safe_l2__factory141 : Safe__factory141,
- }
-
- return factories[version].connect(safeAddress, provider)
+ return getSafeFactory(safeVersion)?.connect(safeAddress, provider)
 }