added cleanup expired proposals

Author: ehsan6sha

src/components/admin/AirdropAdmin.tsx

@@ -55,13 +55,15 @@ export function AirdropAdmin() {
     isLoading,
     tgeStatus,
     initiateTGE,
+    cleanupExpiredProposals,
   } = useAdminContract()
 
   const [isCreatingCap, setIsCreatingCap] = useState(false)
   const [isAddingWallet, setIsAddingWallet] = useState(false)
   const [isApproving, setIsApproving] = useState(false)
   const [isExecuting, setIsExecuting] = useState(false)
   const [isSettingTGE, setIsSettingTGE] = useState(false)
+  const [isCleaning, setIsCleaning] = useState(false)
 
   const handleCreateCap = async () => {
     try {
@@ -174,6 +176,18 @@ export function AirdropAdmin() {
     }
   }
 
+  const handleCleanupExpiredProposals = async () => {
+    try {
+      setError(null)
+      setIsCleaning(true)
+      await cleanupExpiredProposals(10)
+    } catch (error: any) {
+      setError(error.message)
+    } finally {
+      setIsCleaning(false)
+    }
+  }
+
   const renderVestingCapTable = () => {
     if (isLoading) {
       return <CircularProgress />
@@ -599,6 +613,14 @@ export function AirdropAdmin() {
               </TableBody>
             </Table>
           </TableContainer>
+          <Button
+            variant="contained"
+            onClick={handleCleanupExpiredProposals}
+            disabled={isCleaning}
+            sx={{ mt: 2 }}
+          >
+            {isCleaning ? <CircularProgress size={24} /> : 'Cleanup Expired Proposals'}
+          </Button>
         </AccordionDetails>
       </Accordion>
     </Box>

src/components/admin/TestnetMiningAdmin.tsx

@@ -55,13 +55,15 @@ export function TestnetMiningAdmin() {
     isLoading,
     tgeStatus,
     initiateTGE,
+    cleanupExpiredProposals,
   } = useAdminContract()
 
   const [isCreatingCap, setIsCreatingCap] = useState(false)
   const [isAddingWallet, setIsAddingWallet] = useState(false)
   const [isApproving, setIsApproving] = useState(false)
   const [isExecuting, setIsExecuting] = useState(false)
   const [isSettingTGE, setIsSettingTGE] = useState(false)
+  const [isCleaning, setIsCleaning] = useState(false)
 
   const handleCreateCap = async () => {
     try {
@@ -174,6 +176,18 @@ export function TestnetMiningAdmin() {
     }
   }
 
+  const handleCleanupExpiredProposals = async () => {
+    try {
+      setError(null)
+      setIsCleaning(true)
+      await cleanupExpiredProposals(10)
+    } catch (error: any) {
+      setError(error.message)
+    } finally {
+      setIsCleaning(false)
+    }
+  }
+
   const renderVestingCapTable = () => {
     if (isLoading) {
       return <CircularProgress />
@@ -599,6 +613,14 @@ export function TestnetMiningAdmin() {
               </TableBody>
             </Table>
           </TableContainer>
+          <Button
+            variant="contained"
+            onClick={handleCleanupExpiredProposals}
+            disabled={isCleaning}
+            sx={{ mt: 2 }}
+          >
+            {isCleaning ? <CircularProgress size={24} /> : 'Cleanup Expired Proposals'}
+          </Button>
         </AccordionDetails>
       </Accordion>
     </Box>

src/components/admin/TokenAdmin.tsx

@@ -750,6 +750,14 @@ function ConnectedView({ error, setError, formData, setFormData, handlers, state
                   </TableBody>
                 </Table>
               </TableContainer>
+              <Button
+                variant="contained"
+                onClick={handlers.handleCleanupExpiredProposals}
+                disabled={states.isCleaning}
+                sx={{ mt: 2 }}
+              >
+                {states.isCleaning ? <CircularProgress size={24} /> : 'Cleanup Expired Proposals'}
+              </Button>
             </AccordionDetails>
           </Accordion>
         </Grid>
@@ -803,6 +811,7 @@ export function TokenAdmin() {
     nonceEvents,
     bridgeOpEvents,
     transferFromContract,
+    cleanupExpiredProposals,
   } = useAdminContract()
 
   const [isAddingToWhitelist, setIsAddingToWhitelist] = useState(false)
@@ -814,6 +823,7 @@ export function TokenAdmin() {
   const [isWhitelisting, setIsWhitelisting] = useState(false)
   const [isSettingNonce, setIsSettingNonce] = useState(false)
   const [isTransferring, setIsTransferring] = useState(false)
+  const [isCleaning, setIsCleaning] = useState(false)
   const [whitelistedAddresses, setWhitelistedAddresses] = useState<string[]>([]);
 
   // Add this effect to fetch whitelisted addresses when component mounts
@@ -991,6 +1001,18 @@ export function TokenAdmin() {
     }
   }
 
+  const handleCleanupExpiredProposals = async () => {
+    try {
+      setError(null)
+      setIsCleaning(true)
+      await cleanupExpiredProposals(10)
+    } catch (error: any) {
+      setError(error.message)
+    } finally {
+      setIsCleaning(false)
+    }
+  }
+
   const handlers = {
     handleAddToWhitelist,
     handleSetTransactionLimit,
@@ -1003,6 +1025,7 @@ export function TokenAdmin() {
     handleSetBridgeOpNonce,
     handleBridgeOp,
     handleTransfer,
+    handleCleanupExpiredProposals,
   }
 
   const states = {
@@ -1016,6 +1039,7 @@ export function TokenAdmin() {
     isSettingNonce,
     isBridgeOp,
     isTransferring,
+    isCleaning,
   }
 
   const data = {

src/components/admin/VestingAdmin.tsx

@@ -55,13 +55,15 @@ export function VestingAdmin() {
     isLoading,
     tgeStatus,
     initiateTGE,
+    cleanupExpiredProposals,
   } = useAdminContract()
 
   const [isCreatingCap, setIsCreatingCap] = useState(false)
   const [isAddingWallet, setIsAddingWallet] = useState(false)
   const [isApproving, setIsApproving] = useState(false)
   const [isExecuting, setIsExecuting] = useState(false)
   const [isSettingTGE, setIsSettingTGE] = useState(false)
+  const [isCleaning, setIsCleaning] = useState(false)
 
   const handleCreateCap = async () => {
     try {
@@ -174,6 +176,18 @@ export function VestingAdmin() {
     }
   }
 
+  const handleCleanupExpiredProposals = async () => {
+    try {
+      setError(null)
+      setIsCleaning(true)
+      await cleanupExpiredProposals(10)
+    } catch (error: any) {
+      setError(error.message)
+    } finally {
+      setIsCleaning(false)
+    }
+  }
+
   const renderVestingCapTable = () => {
     if (isLoading) {
       return <CircularProgress />
@@ -599,6 +613,14 @@ export function VestingAdmin() {
               </TableBody>
             </Table>
           </TableContainer>
+          <Button
+            variant="contained"
+            onClick={handleCleanupExpiredProposals}
+            disabled={isCleaning}
+            sx={{ mt: 2 }}
+          >
+            {isCleaning ? <CircularProgress size={24} /> : 'Cleanup Expired Proposals'}
+          </Button>
         </AccordionDetails>
       </Accordion>
     </Box>

src/config/abis.ts

@@ -361,6 +361,13 @@ export const GOVERNANCE_ABI = [
     name: "ProposalExecuted",
     type: "event"
   },
+  {
+    inputs: [{ type: "uint256", name: "maxProposalsToCheck" }],
+    name: "cleanupExpiredProposals",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function"
+  },
 ] as const;
 
 // Common Contract ABI used across multiple contracts

src/hooks/useAdminContract.ts

@@ -1258,6 +1258,27 @@ export function useAdminContract() {
     }
   }
 
+  const cleanupExpiredProposals = async (maxProposalsToCheck: number) => {
+    if (!contractAddress) throw new Error('Contract address not found');
+    if (!userAddress) throw new Error('Please connect your wallet');
+
+    try {
+      const { request } = await publicClient.simulateContract({
+        address: contractAddress,
+        abi: contractAbi,
+        functionName: 'cleanupExpiredProposals',
+        args: [BigInt(maxProposalsToCheck)],
+        account: userAddress,
+      });
+
+      const hash = await writeContractAsync(request);
+      return hash;
+    } catch (error: any) {
+      console.error('Error cleaning up expired proposals:', error);
+      throw error;
+    }
+  };
+
   return {
     whitelistInfo,
     whitelistedAddresses,
@@ -1294,5 +1315,6 @@ export function useAdminContract() {
     handleSetRoleQuorum,
     checkRoleConfig,
     roleConfigs,
+    cleanupExpiredProposals,
   }
 }