Merge pull request #1647 from decentdao/remove-keyValuePairsContract-…

…from-FractalContracts Remove key value pairs contract from base contracts
decentdao · May 7, 2024 · 7d2280d · 7d2280d
2 parents 84a6e2e + 2cf8408
commit 7d2280d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 18 deletions.
diff --git a/src/components/pages/DaoSettings/components/Metadata/index.tsx b/src/components/pages/DaoSettings/components/Metadata/index.tsx
@@ -3,8 +3,9 @@ import { Flex, Text, Button, Divider } from '@chakra-ui/react';
 import { useState, useEffect, ChangeEventHandler } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
-import { isHex, getAddress } from 'viem';
+import { isHex, getAddress, encodeFunctionData } from 'viem';
 import { SettingsSection } from '..';
+import KeyValuePairsAbi from '../../../../../assets/abi/KeyValuePairs';
 import { DAO_ROUTES } from '../../../../../constants/routes';
 import useSubmitProposal from '../../../../../hooks/DAO/proposal/useSubmitProposal';
 import { useCanUserCreateProposal } from '../../../../../hooks/utils/useCanUserSubmitProposal';
@@ -30,7 +31,10 @@ export default function MetadataContainer() {
       user: { votingWeight },
     },
   } = useFractal();
-  const { addressPrefix } = useNetworkConfig();
+  const {
+    addressPrefix,
+    contracts: { keyValuePairs },
+  } = useNetworkConfig();
 
   useEffect(() => {
     if (daoName && daoAddress && createAccountSubstring(daoAddress) !== daoName) {
@@ -94,24 +98,19 @@ export default function MetadataContainer() {
   };
 
   const handleEditDAOSnapshotENS = () => {
-    if (!baseContracts) {
-      return;
-    }
-    const { keyValuePairsContract } = baseContracts;
-    const encodedUpdateValues = keyValuePairsContract.asProvider.interface.encodeFunctionData(
-      'updateValues',
-      [['snapshotENS'], [snapshotENS]],
-    );
-    if (!isHex(encodedUpdateValues)) {
-      return;
-    }
+    const encodedUpdateValues = encodeFunctionData({
+      abi: KeyValuePairsAbi,
+      functionName: 'updateValues',
+      args: [['snapshotENS'], [snapshotENS]],
+    });
+
     const proposalData: ProposalExecuteData = {
       metaData: {
         title: t('Update Snapshot Space', { ns: 'proposalMetadata' }),
         description: '',
         documentationUrl: '',
       },
-      targets: [getAddress(keyValuePairsContract.asProvider.address)],
+      targets: [keyValuePairs],
       values: [0n],
       calldatas: [encodedUpdateValues],
     };

diff --git a/src/hooks/DAO/useBuildDAOTx.ts b/src/hooks/DAO/useBuildDAOTx.ts
@@ -62,7 +62,6 @@ const useBuildDAOTx = () => {
         freezeERC20VotingMasterCopyContract,
         freezeERC721VotingMasterCopyContract,
         claimingMasterCopyContract,
-        keyValuePairsContract,
       } = baseContracts;
 
       if (
@@ -104,7 +103,6 @@ const useBuildDAOTx = () => {
         freezeERC721VotingMasterCopyContract: freezeERC721VotingMasterCopyContract.asSigner,
         freezeMultisigVotingMasterCopyContract: freezeMultisigVotingMasterCopyContract.asSigner,
         zodiacModuleProxyFactoryContract: zodiacModuleProxyFactoryContract.asSigner,
-        keyValuePairsContract: keyValuePairsContract.asSigner,
       } as BaseContracts;
 
       const txBuilderFactory = new TxBuilderFactory(

diff --git a/src/types/fractal.ts b/src/types/fractal.ts
@@ -10,7 +10,6 @@ import {
   ERC20FreezeVoting,
   MultisigFreezeVoting,
   MultisigFreezeGuard,
-  KeyValuePairs,
   ERC721FreezeVoting,
   LinearERC721Voting,
 } from '@fractal-framework/fractal-contracts';
@@ -347,7 +346,6 @@ export interface FractalContracts {
   freezeERC20VotingMasterCopyContract: ContractConnection<ERC20FreezeVoting>;
   freezeERC721VotingMasterCopyContract: ContractConnection<ERC721FreezeVoting>;
   claimingMasterCopyContract: ContractConnection<ERC20Claim>;
-  keyValuePairsContract: ContractConnection<KeyValuePairs>;
 }
 
 export type FractalProposal = AzoriusProposal | MultisigProposal | SnapshotProposal;