Merge pull request #2276 from decentdao/hotfix/v0.2.12

Hotfix/v0.2.12
decentdao · Aug 19, 2024 · 60e01d9 · 60e01d9
2 parents 97426bf + ddb2b4b
commit 60e01d9
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 13 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "decent-interface",
-  "version": "0.2.11",
+  "version": "0.2.12",
   "private": true,
   "dependencies": {
     "@apollo/client": "^3.7.10",

diff --git a/src/components/Proposals/ProposalSummary.tsx b/src/components/Proposals/ProposalSummary.tsx
@@ -84,6 +84,7 @@ export function AzoriusProposalSummary({ proposal }: { proposal: AzoriusProposal
   }, [
     address,
     baseContracts,
+    votesToken?.decimals,
     governanceContracts.ozLinearVotingContractAddress,
     proposal.proposalId,
   ]);

diff --git a/src/hooks/utils/cache/cacheDefaults.ts b/src/hooks/utils/cache/cacheDefaults.ts
@@ -50,6 +50,7 @@ export interface MasterCacheKey extends CacheKey {
   cacheName: CacheKeys.MASTER_COPY;
   chainId: number;
   proxyAddress: Address;
+  moduleProxyFactoryAddress: Address;
 }
 
 export interface ProposalCacheKey extends CacheKey {

diff --git a/src/hooks/utils/useMasterCopy.ts b/src/hooks/utils/useMasterCopy.ts
@@ -1,7 +1,7 @@
 import { ModuleProxyFactory } from '@fractal-framework/fractal-contracts';
 import { Contract } from 'ethers';
 import { useCallback } from 'react';
-import { Address, zeroAddress } from 'viem';
+import { Address, getAddress, zeroAddress } from 'viem';
 import { getEventRPC } from '../../helpers';
 import { useFractal } from '../../providers/App/AppProvider';
 import { useNetworkConfig } from '../../providers/NetworkConfig/NetworkConfigProvider';
@@ -10,7 +10,10 @@ import { getValue, setValue } from './cache/useLocalStorage';
 
 export function useMasterCopy() {
   const { baseContracts } = useFractal();
-  const { chain } = useNetworkConfig();
+  const {
+    chain,
+    contracts: { zodiacModuleProxyFactoryOld },
+  } = useNetworkConfig();
 
   const isOzLinearVoting = useCallback(
     (masterCopyAddress: Address) =>
@@ -54,18 +57,20 @@ export function useMasterCopy() {
       const cachedValue = getValue({
         cacheName: CacheKeys.MASTER_COPY,
         chainId: chain.id,
+        moduleProxyFactoryAddress: getAddress(contract.address),
         proxyAddress,
       });
       if (cachedValue) return [cachedValue, null] as const;
 
       const filter = contract.filters.ModuleProxyCreation(proxyAddress, null);
       return contract.queryFilter(filter).then(proxiesCreated => {
-        // @dev to prevent redundant queries, cache the master copy address as AddressZero if no proxies were created
         if (proxiesCreated.length === 0) {
+          // @dev to prevent redundant queries, cache the master copy address as AddressZero if no proxies were created
           setValue(
             {
               cacheName: CacheKeys.MASTER_COPY,
               chainId: chain.id,
+              moduleProxyFactoryAddress: getAddress(contract.address),
               proxyAddress,
             },
             zeroAddress,
@@ -78,6 +83,7 @@ export function useMasterCopy() {
           {
             cacheName: CacheKeys.MASTER_COPY,
             chainId: chain.id,
+            moduleProxyFactoryAddress: getAddress(contract.address),
             proxyAddress,
           },
           masterCopyAddress,
@@ -91,12 +97,20 @@ export function useMasterCopy() {
   const getZodiacModuleProxyMasterCopyData = useCallback(
     async function (proxyAddress: Address) {
       let masterCopyAddress: Address = zeroAddress;
-      let error;
+      let error: string | null = null;
       if (baseContracts) {
         const contract = getEventRPC<ModuleProxyFactory>(
           baseContracts?.zodiacModuleProxyFactoryContract,
         );
         [masterCopyAddress, error] = await getMasterCopyAddress(contract, proxyAddress);
+        // @dev checks Zodiac's ModuleProxyFactory Contract if the first one fails.
+        if (error) {
+          const moduleProxyFactoryOld = contract.attach(zodiacModuleProxyFactoryOld);
+          [masterCopyAddress, error] = await getMasterCopyAddress(
+            moduleProxyFactoryOld,
+            proxyAddress,
+          );
+        }
         if (error) {
           console.error(error);
         }
@@ -122,6 +136,7 @@ export function useMasterCopy() {
       isOzLinearVoting,
       isOzLinearVotingERC721,
       baseContracts,
+      zodiacModuleProxyFactoryOld,
     ],
   );
 

diff --git a/src/providers/NetworkConfig/networks/base.ts b/src/providers/NetworkConfig/networks/base.ts
@@ -62,7 +62,8 @@ export const baseConfig: NetworkConfig = {
       version: SAFE_VERSION,
       network: base.id.toString(),
     })?.networkAddresses[base.id.toString()]!,
-    zodiacModuleProxyFactory: ModuleProxyFactory.address,
+    zodiacModuleProxyFactory: '0x000000000000aDdB49795b0f9bA5BC298cDda236',
+    zodiacModuleProxyFactoryOld: ModuleProxyFactory.address,
     linearVotingMasterCopy: LinearERC20Voting.address,
     multisend: getMultiSendCallOnlyDeployment({
       version: SAFE_VERSION,

diff --git a/src/providers/NetworkConfig/networks/baseSepolia.ts b/src/providers/NetworkConfig/networks/baseSepolia.ts
@@ -64,7 +64,8 @@ export const baseSepoliaConfig: NetworkConfig = {
       version: SAFE_VERSION,
       network: baseSepolia.id.toString(),
     })?.networkAddresses[baseSepolia.id.toString()]!,
-    zodiacModuleProxyFactory: ModuleProxyFactory.address,
+    zodiacModuleProxyFactory: '0x000000000000aDdB49795b0f9bA5BC298cDda236',
+    zodiacModuleProxyFactoryOld: ModuleProxyFactory.address,
     linearVotingMasterCopy: LinearERC20Voting.address,
     multisend: getMultiSendCallOnlyDeployment({
       version: SAFE_VERSION,

diff --git a/src/providers/NetworkConfig/networks/mainnet.ts b/src/providers/NetworkConfig/networks/mainnet.ts
@@ -62,7 +62,8 @@ export const mainnetConfig: NetworkConfig = {
       version: SAFE_VERSION,
       network: mainnet.id.toString(),
     })?.networkAddresses[mainnet.id.toString()]!,
-    zodiacModuleProxyFactory: ModuleProxyFactory.address,
+    zodiacModuleProxyFactory: '0x000000000000aDdB49795b0f9bA5BC298cDda236',
+    zodiacModuleProxyFactoryOld: ModuleProxyFactory.address,
     linearVotingMasterCopy: LinearERC20Voting.address,
     multisend: getMultiSendCallOnlyDeployment({
       version: SAFE_VERSION,

diff --git a/src/providers/NetworkConfig/networks/optimism.ts b/src/providers/NetworkConfig/networks/optimism.ts
@@ -62,7 +62,8 @@ export const optimismConfig: NetworkConfig = {
       version: SAFE_VERSION,
       network: optimism.id.toString(),
     })?.networkAddresses[optimism.id.toString()]!,
-    zodiacModuleProxyFactory: ModuleProxyFactory.address,
+    zodiacModuleProxyFactory: '0x000000000000aDdB49795b0f9bA5BC298cDda236',
+    zodiacModuleProxyFactoryOld: ModuleProxyFactory.address,
     linearVotingMasterCopy: LinearERC20Voting.address,
     multisend: getMultiSendCallOnlyDeployment({
       version: SAFE_VERSION,

diff --git a/src/providers/NetworkConfig/networks/polygon.ts b/src/providers/NetworkConfig/networks/polygon.ts
@@ -62,7 +62,8 @@ export const polygonConfig: NetworkConfig = {
       version: SAFE_VERSION,
       network: polygon.id.toString(),
     })?.networkAddresses[polygon.id.toString()]!,
-    zodiacModuleProxyFactory: ModuleProxyFactory.address,
+    zodiacModuleProxyFactory: '0x000000000000aDdB49795b0f9bA5BC298cDda236',
+    zodiacModuleProxyFactoryOld: ModuleProxyFactory.address,
     linearVotingMasterCopy: LinearERC20Voting.address,
     multisend: getMultiSendCallOnlyDeployment({
       version: SAFE_VERSION,

diff --git a/src/providers/NetworkConfig/networks/sepolia.ts b/src/providers/NetworkConfig/networks/sepolia.ts
@@ -62,7 +62,8 @@ export const sepoliaConfig: NetworkConfig = {
       version: SAFE_VERSION,
       network: sepolia.id.toString(),
     })?.networkAddresses[sepolia.id.toString()]!,
-    zodiacModuleProxyFactory: ModuleProxyFactory.address,
+    zodiacModuleProxyFactory: '0x000000000000aDdB49795b0f9bA5BC298cDda236',
+    zodiacModuleProxyFactoryOld: ModuleProxyFactory.address,
     linearVotingMasterCopy: LinearERC20Voting.address,
     multisend: getMultiSendCallOnlyDeployment({
       version: SAFE_VERSION,

diff --git a/src/types/network.ts b/src/types/network.ts
@@ -27,6 +27,7 @@ export type NetworkConfig = {
     safeFactory: string;
     fallbackHandler: string;
     zodiacModuleProxyFactory: string;
+    zodiacModuleProxyFactoryOld: string;
     linearVotingMasterCopy: string;
     multisend: string;
     fractalAzoriusMasterCopy: string;