From e9ed03ed2e5ca016c5e4f1666a29c6919a86077d Mon Sep 17 00:00:00 2001
From: Shiv Bhonde <shivbhonde04@gmail.com>
Date: Thu, 7 Mar 2024 00:11:52 +0530
Subject: [PATCH 1/4] add splitETH contract txn's while doing batch action

---
 packages/nextjs/app/admin/page.tsx | 40 ++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 11 deletions(-)

diff --git a/packages/nextjs/app/admin/page.tsx b/packages/nextjs/app/admin/page.tsx
index d06bac5..98dd486 100644
--- a/packages/nextjs/app/admin/page.tsx
+++ b/packages/nextjs/app/admin/page.tsx
@@ -4,6 +4,8 @@ import { useRef, useState } from "react";
 import { BatchActionModal } from "./_components/BatchActionModal";
 import { GrantReview } from "./_components/GrantReview";
 import useSWR from "swr";
+import { parseEther } from "viem";
+import { useScaffoldContractWrite } from "~~/hooks/scaffold-eth";
 import { GrantDataWithBuilder } from "~~/services/database/schema";
 import { PROPOSAL_STATUS } from "~~/utils/grants";
 import { notification } from "~~/utils/scaffold-eth";
@@ -43,6 +45,28 @@ const AdminPage = () => {
     }
   };
 
+  const { data: txResult, writeAsync: splitEqualETH } = useScaffoldContractWrite({
+    contractName: "BGGrants",
+    functionName: "splitEqualETH",
+    args: [undefined],
+  });
+
+  const handleBatchClick = async (filteredGrants: GrantDataWithBuilder[], action: "approve" | "complete") => {
+    const selectedGrantsWithMetaData = filteredGrants.filter(grant => {
+      if (action === "approve") return selectedApproveGrants.includes(grant.id);
+      return selectedCompleteGrants.includes(grant.id);
+    });
+    const builders = selectedGrantsWithMetaData.map(grant => grant.builder);
+    const totalAmount = selectedGrantsWithMetaData.reduce((acc, grant) => acc + grant.askAmount, 0);
+    const value = parseEther((totalAmount / 2).toString());
+    const hash = await splitEqualETH({
+      args: [builders],
+      value,
+    });
+    setModalBtnLabel(action === "approve" ? "Approve" : "Complete");
+    if (hash && modalRef.current) modalRef.current.showModal();
+  };
+
   const completedGrants = grants?.filter(grant => grant.status === PROPOSAL_STATUS.SUBMITTED);
   const newGrants = grants?.filter(grant => grant.status === PROPOSAL_STATUS.PROPOSED);
 
@@ -55,13 +79,10 @@ const AdminPage = () => {
           <div>
             <div className="flex justify-between items-center">
               <h2 className="font-bold">Proposals submitted as completed:</h2>
-              {completedGrants?.length !== 0 && (
+              {completedGrants && completedGrants.length !== 0 && (
                 <button
                   className="btn btn-sm btn-primary"
-                  onClick={async () => {
-                    setModalBtnLabel("Complete");
-                    if (modalRef.current) modalRef.current.showModal();
-                  }}
+                  onClick={() => handleBatchClick(completedGrants, "complete")}
                   disabled={selectedCompleteGrants.length === 0}
                 >
                   Batch Complete
@@ -81,13 +102,10 @@ const AdminPage = () => {
           <div>
             <div className="flex justify-between items-center">
               <h2 className="font-bold">New grant proposal:</h2>
-              {newGrants?.length !== 0 && (
+              {newGrants && newGrants.length !== 0 && (
                 <button
                   className="btn btn-sm btn-primary"
-                  onClick={async () => {
-                    setModalBtnLabel("Approve");
-                    if (modalRef.current) modalRef.current.showModal();
-                  }}
+                  onClick={() => handleBatchClick(newGrants, "approve")}
                   disabled={selectedApproveGrants.length === 0}
                 >
                   Batch Approve
@@ -110,7 +128,7 @@ const AdminPage = () => {
         ref={modalRef}
         selectedGrants={modalBtnLabel === "Approve" ? selectedApproveGrants : selectedCompleteGrants}
         btnLabel={modalBtnLabel}
-        initialTxLink={"0xdummyTransactionHash"}
+        initialTxLink={txResult?.hash}
         closeModal={() => {
           if (modalRef.current) modalRef.current.close();
         }}

From 5c843aac72a99580c669d7f165fc80039cb7e474 Mon Sep 17 00:00:00 2001
From: Shiv Bhonde <shivbhonde04@gmail.com>
Date: Thu, 7 Mar 2024 00:13:13 +0530
Subject: [PATCH 2/4] rename click handler

---
 packages/nextjs/app/admin/page.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/nextjs/app/admin/page.tsx b/packages/nextjs/app/admin/page.tsx
index 98dd486..fff30b1 100644
--- a/packages/nextjs/app/admin/page.tsx
+++ b/packages/nextjs/app/admin/page.tsx
@@ -51,7 +51,7 @@ const AdminPage = () => {
     args: [undefined],
   });
 
-  const handleBatchClick = async (filteredGrants: GrantDataWithBuilder[], action: "approve" | "complete") => {
+  const handleBatchAction = async (filteredGrants: GrantDataWithBuilder[], action: "approve" | "complete") => {
     const selectedGrantsWithMetaData = filteredGrants.filter(grant => {
       if (action === "approve") return selectedApproveGrants.includes(grant.id);
       return selectedCompleteGrants.includes(grant.id);
@@ -82,7 +82,7 @@ const AdminPage = () => {
               {completedGrants && completedGrants.length !== 0 && (
                 <button
                   className="btn btn-sm btn-primary"
-                  onClick={() => handleBatchClick(completedGrants, "complete")}
+                  onClick={() => handleBatchAction(completedGrants, "complete")}
                   disabled={selectedCompleteGrants.length === 0}
                 >
                   Batch Complete
@@ -105,7 +105,7 @@ const AdminPage = () => {
               {newGrants && newGrants.length !== 0 && (
                 <button
                   className="btn btn-sm btn-primary"
-                  onClick={() => handleBatchClick(newGrants, "approve")}
+                  onClick={() => handleBatchAction(newGrants, "approve")}
                   disabled={selectedApproveGrants.length === 0}
                 >
                   Batch Approve

From 2230038c5c06f3c7da23ed5b4f7d730705124b6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20S=C3=A1nchez?= <oceanrdn@gmail.com>
Date: Fri, 8 Mar 2024 18:12:27 +0100
Subject: [PATCH 3/4] SplitETH function

---
 packages/hardhat/contracts/BGGrants.sol | 46 +++++++++++++++++--------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/packages/hardhat/contracts/BGGrants.sol b/packages/hardhat/contracts/BGGrants.sol
index e76729e..01cb4b6 100644
--- a/packages/hardhat/contracts/BGGrants.sol
+++ b/packages/hardhat/contracts/BGGrants.sol
@@ -10,35 +10,53 @@ contract BGGrants is Ownable, ReentrancyGuard {
     error INVALID_RECIPIENT();
     error INSUFFICIENT_RECIPIENT_COUNT();
     error TRANSFER_FAILED();
+    error INSUFFICIENT_SPLIT_AMOUNT();
+    error INVALID_INPUT();
 
-    event EthSplitEqual(address indexed sender, uint256 totalAmount, address payable[] recipients);
+    event EthSplit(address indexed sender, uint256 totalAmount, address payable[] recipients, uint256[] amounts);
 
     constructor(address _owner) {
         super.transferOwnership(_owner);
     }
 
-    function splitEqualETH(address payable[] calldata recipients) external payable nonReentrant {
-        uint256 totalAmount = msg.value;
-        uint256 rLength = recipients.length;
-        uint256 equalAmount = totalAmount / rLength;
-        uint256 remainingAmount = totalAmount % rLength;
+    function splitETH(
+        address payable[] calldata recipients,
+        uint256[] calldata amounts
+    ) external payable nonReentrant {
+        uint256 remainingAmount = _splitETH(recipients, amounts, msg.value);
+        emit EthSplit(msg.sender, msg.value, recipients, amounts);
 
-        if (rLength > 25) revert INSUFFICIENT_RECIPIENT_COUNT();
+        if (remainingAmount > 0) {
+            (bool success, ) = msg.sender.call{value: remainingAmount, gas: 20000}("");
+            if (!success) revert TRANSFER_FAILED();
+        }
+    }
+
+    function _splitETH(
+        address payable[] calldata recipients,
+        uint256[] calldata amounts,
+        uint256 totalAvailable
+    ) internal returns (uint256 remainingAmount) {
+        uint256 length = recipients.length;
+        if (length != amounts.length) revert INVALID_INPUT();
 
-        for (uint256 i = 0; i < rLength; ) {
+        if (length > 25) revert INSUFFICIENT_RECIPIENT_COUNT();
+
+        uint256 totalAmount = 0;
+        for (uint256 i = 0; i < length; ) {
             if (recipients[i] == address(0)) revert INVALID_RECIPIENT();
-            uint256 amountToSend = equalAmount;
-            if (i == 0) {
-                amountToSend = amountToSend + remainingAmount;
-            }
-            (bool success, ) = recipients[i].call{value: amountToSend, gas: 20000}("");
+            if (amounts[i] == 0) revert INSUFFICIENT_SPLIT_AMOUNT();
+
+            totalAmount = totalAmount + amounts[i];
+
+            (bool success, ) = recipients[i].call{value: amounts[i], gas: 20000}("");
             if (!success) revert TRANSFER_FAILED();
             unchecked {
                 ++i;
             }
         }
 
-        emit EthSplitEqual(msg.sender, msg.value, recipients);
+        return totalAvailable - totalAmount;
     }
 
     /**

From 0c193fb7c4f0c205b6a3dd739387616cecba66a3 Mon Sep 17 00:00:00 2001
From: Shiv Bhonde <shivbhonde04@gmail.com>
Date: Wed, 13 Mar 2024 23:33:02 +0000
Subject: [PATCH 4/4] use contract for single action

---
 .../app/admin/_components/GrantReview.tsx     | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/packages/nextjs/app/admin/_components/GrantReview.tsx b/packages/nextjs/app/admin/_components/GrantReview.tsx
index 7adfd7a..4ccca09 100644
--- a/packages/nextjs/app/admin/_components/GrantReview.tsx
+++ b/packages/nextjs/app/admin/_components/GrantReview.tsx
@@ -3,12 +3,11 @@ import Image from "next/image";
 import { useReviewGrant } from "../hooks/useReviewGrant";
 import { ActionModal } from "./ActionModal";
 import { parseEther } from "viem";
-import { useSendTransaction } from "wagmi";
 import { ArrowTopRightOnSquareIcon } from "@heroicons/react/20/solid";
 import TelegramIcon from "~~/components/assets/TelegramIcon";
 import TwitterIcon from "~~/components/assets/TwitterIcon";
 import { Address } from "~~/components/scaffold-eth";
-import { useTransactor } from "~~/hooks/scaffold-eth";
+import { useScaffoldContractWrite } from "~~/hooks/scaffold-eth";
 import { GrantDataWithBuilder, SocialLinks } from "~~/services/database/schema";
 import { PROPOSAL_STATUS } from "~~/utils/grants";
 
@@ -49,11 +48,12 @@ type GrantReviewProps = {
 export const GrantReview = ({ grant, selected, toggleSelection }: GrantReviewProps) => {
   const modalRef = useRef<HTMLDialogElement>(null);
 
-  const { data: txnHash, sendTransactionAsync } = useSendTransaction({
-    to: grant.builder,
-    value: parseEther((grant.askAmount / 2).toString()),
+  const { data: txResult, writeAsync: splitEqualETH } = useScaffoldContractWrite({
+    contractName: "BGGrants",
+    functionName: "splitETH",
+    args: [undefined, undefined],
   });
-  const sendTx = useTransactor();
+
   const { handleReviewGrant, isLoading } = useReviewGrant(grant);
 
   if (grant.status !== PROPOSAL_STATUS.PROPOSED && grant.status !== PROPOSAL_STATUS.SUBMITTED) return null;
@@ -96,7 +96,10 @@ export const GrantReview = ({ grant, selected, toggleSelection }: GrantReviewPro
           <button
             className={`btn btn-sm btn-neutral ${isLoading ? "opacity-50" : ""}`}
             onClick={async () => {
-              const resHash = await sendTx(sendTransactionAsync);
+              const resHash = await splitEqualETH({
+                args: [[grant.builder], [parseEther((grant.askAmount / 2).toString())]],
+                value: parseEther((grant.askAmount / 2).toString()),
+              });
               // Transactor eats the error, so we need to handle by checking resHash
               if (resHash && modalRef.current) modalRef.current.showModal();
             }}
@@ -115,7 +118,7 @@ export const GrantReview = ({ grant, selected, toggleSelection }: GrantReviewPro
           </button>
         </div>
       </div>
-      <ActionModal ref={modalRef} grant={grant} initialTxLink={txnHash?.hash} />
+      <ActionModal ref={modalRef} grant={grant} initialTxLink={txResult?.hash} />
     </div>
   );
 };