Remove safeFactoryContract from FractalContracts & BaseContracts inte…

…rfaces, resolve downstream issues

src/hooks/DAO/useBuildDAOTx.ts

@@ -25,6 +25,7 @@ const useBuildDAOTx = () => {
       votesERC20MasterCopy,
       keyValuePairs,
       fractalRegistry,
+      safeFactory,
     },
   } = useNetworkConfig();
 
@@ -49,7 +50,6 @@ const useBuildDAOTx = () => {
       }
       const {
         multiSendContract,
-        safeFactoryContract,
         safeSingletonContract,
         linearVotingMasterCopyContract,
         linearVotingERC721MasterCopyContract,
@@ -94,7 +94,6 @@ const useBuildDAOTx = () => {
 
       const buildrerBaseContracts: BaseContracts = {
         fractalModuleMasterCopyContract: fractalModuleMasterCopyContract.asSigner,
-        safeFactoryContract: safeFactoryContract.asSigner,
         safeSingletonContract: safeSingletonContract.asSigner,
         multisigFreezeGuardMasterCopyContract: multisigFreezeGuardMasterCopyContract.asSigner,
         multiSendContract: multiSendContract.asSigner,
@@ -115,6 +114,7 @@ const useBuildDAOTx = () => {
         votesERC20MasterCopy,
         keyValuePairs,
         fractalRegistry,
+        safeFactory,
         parentAddress,
         parentTokenAddress,
       );
@@ -166,6 +166,7 @@ const useBuildDAOTx = () => {
       votesERC20MasterCopy,
       keyValuePairs,
       fractalRegistry,
+      safeFactory,
     ],
   );
 

src/hooks/DAO/useDeployAzorius.ts

@@ -28,6 +28,7 @@ const useDeployAzorius = () => {
       votesERC20MasterCopy,
       keyValuePairs,
       fractalRegistry,
+      safeFactory,
     },
     addressPrefix,
   } = useNetworkConfig();
@@ -52,7 +53,6 @@ const useDeployAzorius = () => {
       }
       const {
         multiSendContract,
-        safeFactoryContract,
         safeSingletonContract,
         linearVotingMasterCopyContract,
         linearVotingERC721MasterCopyContract,
@@ -78,7 +78,6 @@ const useDeployAzorius = () => {
 
       const builderBaseContracts: BaseContracts = {
         fractalModuleMasterCopyContract: fractalModuleMasterCopyContract.asProvider,
-        safeFactoryContract: safeFactoryContract.asProvider,
         safeSingletonContract: safeSingletonContract.asProvider,
         multisigFreezeGuardMasterCopyContract: multisigFreezeGuardMasterCopyContract.asProvider,
         multiSendContract: multiSendContract.asProvider,
@@ -99,6 +98,7 @@ const useDeployAzorius = () => {
         votesERC20MasterCopy,
         keyValuePairs,
         fractalRegistry,
+        safeFactory,
         undefined,
         undefined,
       );
@@ -161,6 +161,7 @@ const useDeployAzorius = () => {
       votesERC20MasterCopy,
       keyValuePairs,
       fractalRegistry,
+      safeFactory,
     ],
   );
 

src/models/TxBuilderFactory.ts

@@ -1,5 +1,6 @@
 import { ethers } from 'ethers';
-import { PublicClient, getAddress } from 'viem';
+import { PublicClient, getAddress, getContract } from 'viem';
+import GnosisSafeProxyFactoryAbi from '../assets/abi/GnosisSafeProxyFactory';
 import { GnosisSafeL2 } from '../assets/typechain-types/usul/@gnosis.pm/safe-contracts/contracts';
 import { GnosisSafeL2__factory } from '../assets/typechain-types/usul/factories/@gnosis.pm/safe-contracts/contracts';
 import { getRandomBytes } from '../helpers';
@@ -33,6 +34,7 @@ export class TxBuilderFactory extends BaseTxBuilder {
   private votesERC20MasterCopyAddress: string;
   private keyValuePairsAddress: string;
   private fractalRegistryAddress: string;
+  private gnosisSafeProxyFactoryAddress: string;
 
   constructor(
     signerOrProvider: ethers.Signer | any,
@@ -45,6 +47,7 @@ export class TxBuilderFactory extends BaseTxBuilder {
     votesERC20MasterCopyAddress: string,
     keyValuePairsAddress: string,
     fractalRegistryAddress: string,
+    gnosisSafeProxyFactoryAddress: string,
     parentAddress?: string,
     parentTokenAddress?: string,
   ) {
@@ -64,6 +67,7 @@ export class TxBuilderFactory extends BaseTxBuilder {
     this.votesERC20MasterCopyAddress = votesERC20MasterCopyAddress;
     this.keyValuePairsAddress = keyValuePairsAddress;
     this.fractalRegistryAddress = fractalRegistryAddress;
+    this.gnosisSafeProxyFactoryAddress = gnosisSafeProxyFactoryAddress;
   }
 
   public setSafeContract(safeAddress: string) {
@@ -72,9 +76,14 @@ export class TxBuilderFactory extends BaseTxBuilder {
   }
 
   public async setupSafeData(): Promise<void> {
+    const safeProxyFactoryContract = getContract({
+      abi: GnosisSafeProxyFactoryAbi,
+      address: getAddress(this.gnosisSafeProxyFactoryAddress),
+      client: this.publicClient,
+    });
     const { predictedSafeAddress, createSafeTx } = await safeData(
       this.baseContracts.multiSendContract,
-      this.baseContracts.safeFactoryContract,
+      safeProxyFactoryContract,
       this.baseContracts.safeSingletonContract,
       this.daoData as SafeMultisigDAO,
       this.saltNum,

src/models/helpers/safeData.ts

@@ -1,4 +1,3 @@
-import { GnosisSafeProxyFactory } from '@fractal-framework/fractal-contracts';
 import {
   getCreate2Address,
   zeroAddress,
@@ -9,16 +8,19 @@ import {
   encodeFunctionData,
   isHex,
   hexToBigInt,
+  GetContractReturnType,
+  PublicClient,
 } from 'viem';
 import GnosisSafeL2Abi from '../../assets/abi/GnosisSafeL2';
+import GnosisSafeProxyFactoryAbi from '../../assets/abi/GnosisSafeProxyFactory';
 import { MultiSend } from '../../assets/typechain-types/usul';
 import { GnosisSafeL2 } from '../../assets/typechain-types/usul/@gnosis.pm/safe-contracts/contracts';
-import { buildContractCall } from '../../helpers/crypto';
+import { buildContractCallViem } from '../../helpers/crypto';
 import { SafeMultisigDAO } from '../../types';
 
 export const safeData = async (
   multiSendContract: MultiSend,
-  safeFactoryContract: GnosisSafeProxyFactory,
+  safeFactoryContract: GetContractReturnType<typeof GnosisSafeProxyFactoryAbi, PublicClient>,
   safeSingletonContract: GnosisSafeL2,
   daoData: SafeMultisigDAO,
   saltNum: bigint,
@@ -44,7 +46,7 @@ export const safeData = async (
     abi: GnosisSafeL2Abi,
   });
 
-  const safeFactoryContractProxyCreationCode = await safeFactoryContract.proxyCreationCode();
+  const safeFactoryContractProxyCreationCode = await safeFactoryContract.read.proxyCreationCode();
   if (!isHex(safeFactoryContractProxyCreationCode)) {
     throw new Error('Error retrieving proxy creation code from Safe Factory Contract ');
   }
@@ -68,8 +70,9 @@ export const safeData = async (
     ),
   });
 
-  const createSafeTx = buildContractCall(
-    safeFactoryContract,
+  const createSafeTx = buildContractCallViem(
+    GnosisSafeProxyFactoryAbi,
+    safeFactoryContract.address,
     'createProxyWithNonce',
     [safeSingletonContract.address, createSafeCalldata, saltNum],
     0,

src/types/contract.ts

@@ -1,5 +1,4 @@
 import {
-  GnosisSafeProxyFactory,
   ModuleProxyFactory,
   FractalModule,
   MultisigFreezeGuard,
@@ -21,7 +20,6 @@ export type ContractConnection<T> = {
 
 export interface BaseContracts {
   fractalModuleMasterCopyContract: FractalModule;
-  safeFactoryContract: GnosisSafeProxyFactory;
   safeSingletonContract: GnosisSafeL2;
   multisigFreezeGuardMasterCopyContract: MultisigFreezeGuard;
   multiSendContract: MultiSend;

src/types/fractal.ts

@@ -1,6 +1,5 @@
 import {
   FractalModule,
-  GnosisSafeProxyFactory,
   ModuleProxyFactory,
   LinearERC20Voting,
   Azorius,
@@ -331,7 +330,6 @@ export interface NodeHierarchy {
 
 export interface FractalContracts {
   multiSendContract: ContractConnection<MultiSend>;
-  safeFactoryContract: ContractConnection<GnosisSafeProxyFactory>;
   fractalAzoriusMasterCopyContract: ContractConnection<Azorius>;
   linearVotingMasterCopyContract: ContractConnection<LinearERC20Voting>;
   linearVotingERC721MasterCopyContract: ContractConnection<LinearERC721Voting>;