fix: donating with erc20 issue during direct donations

Author: bhargavaparoksham

packages/common/src/allo/allo.ts

@@ -265,6 +265,7 @@ export interface Allo {
     recipient: Address;
     nonce: bigint;
     requireTokenApproval?: boolean;
+    strategyAddress: Address;
   }) => AlloOperation<
     Result<null>,
     {

packages/common/src/allo/backends/allo-v1.ts

@@ -1329,14 +1329,14 @@ export class AlloV1 implements Allo {
     });
   }
 
-
   directAllocation(args: {
     tokenAddress: Address;
     poolId: string;
     amount: bigint;
     recipient: Address;
     nonce: bigint;
     requireTokenApproval?: boolean;
+    strategyAddress: Address;
   }): AlloOperation<
     Result<null>,
     {

packages/common/src/allo/backends/allo-v2.ts

@@ -1547,7 +1547,9 @@ export class AlloV2 implements Allo {
         emit("transactionStatus", success(receipt));
       } catch (err) {
         console.log(err);
-        const result = new AlloError(`Failed to ${args.addOrRemove} profile members`);
+        const result = new AlloError(
+          `Failed to ${args.addOrRemove} profile members`
+        );
         emit("transactionStatus", error(result));
         return error(result);
       }
@@ -1570,6 +1572,7 @@ export class AlloV2 implements Allo {
     recipient: Address;
     nonce: bigint;
     requireTokenApproval?: boolean;
+    strategyAddress: Address;
   }): AlloOperation<
     Result<null>,
     {
@@ -1591,9 +1594,7 @@ export class AlloV2 implements Allo {
         poolId: poolId,
       });
 
-      const strategyAddress = getDirectAllocationStrategyAddress(this.chainId);
-
-      if (strategyAddress === undefined) {
+      if (args.strategyAddress === undefined) {
         return error(new AlloError("Direct allocation strategy not found"));
       }
 
@@ -1604,7 +1605,7 @@ export class AlloV2 implements Allo {
           address: args.tokenAddress,
           abi: Erc20ABI,
           functionName: "approve",
-          args: [strategyAddress, args.amount],
+          args: [args.strategyAddress, args.amount],
         });
 
         if (approvalTx.type === "error") {

packages/data-layer/src/data-layer.ts

@@ -685,13 +685,17 @@ export class DataLayer {
   async getRoundForExplorer({
     roundId,
     chainId,
+    isDirectAllocationRound,
   }: {
     roundId: string;
     chainId: number;
+    isDirectAllocationRound?: boolean;
   }): Promise<{ round: Round } | null> {
+    const directAllocationRound = isDirectAllocationRound ?? false;
     const requestVariables = {
       roundId,
       chainId,
+      isDirectAllocationRound: directAllocationRound,
     };
 
     const response: { rounds: RoundForExplorer[] } = await request(

packages/data-layer/src/queries.ts

@@ -494,7 +494,7 @@ export const getProjectsBySearchTerm = gql`
     searchProjects(
       searchTerm: $searchTerm
       filter: {
-        metadata: {isNull: false }
+        metadata: { isNull: false }
         tags: { equalTo: "allo-v2" }
         not: { tags: { contains: "program" } }
         chainId: {
@@ -609,9 +609,9 @@ export const getRoundByIdAndChainId = gql`
   query getRoundByIdAndChainId($roundId: String!, $chainId: Int!) {
     rounds(
       first: 1
-      filter: { 
-        id: { equalTo: $roundId },
-        chainId: { equalTo: $chainId },
+      filter: {
+        id: { equalTo: $roundId }
+        chainId: { equalTo: $chainId }
         roundMetadata: { isNull: false }
       }
     ) {
@@ -733,13 +733,17 @@ export const getRoundsForManagerByAddress = gql`
 `;
 
 export const getRoundForExplorer = gql`
-  query getRoundForExplorer($roundId: String!, $chainId: Int!) {
+  query getRoundForExplorer(
+    $roundId: String!
+    $chainId: Int!
+    $isDirectAllocationRound: Boolean!
+  ) {
     rounds(
       first: 1
-      filter: { 
-        id: { equalTo: $roundId },
-        chainId: { equalTo: $chainId },
-        roundMetadata: { isNull: false }
+      filter: {
+        id: { equalTo: $roundId }
+        chainId: { equalTo: $chainId }
+        roundMetadata: { isNull: $isDirectAllocationRound }
       }
     ) {
       id

packages/grant-explorer/src/context/RoundContext.tsx

@@ -95,14 +95,16 @@ function fetchRoundsById(
   dispatch: Dispatch,
   dataLayer: DataLayer,
   chainId: number,
-  roundId: string
+  roundId: string,
+  isDirectAllocationRound?: boolean
 ) {
   dispatch({ type: ActionType.SET_LOADING, payload: true });
 
   dataLayer
     .getRoundForExplorer({
       roundId,
       chainId,
+      isDirectAllocationRound,
     })
     .then((result) => {
       if (result === null) {
@@ -123,7 +125,8 @@ function fetchRoundsById(
 
 export const useRoundById = (
   chainId: number,
-  roundId: string
+  roundId: string,
+  isDirectAllocationRound?: boolean
 ): {
   round?: Round;
   isLoading: boolean;
@@ -143,7 +146,13 @@ export const useRoundById = (
       );
 
       if (!existingRound?.token) {
-        fetchRoundsById(context.dispatch, dataLayer, chainId, roundId);
+        fetchRoundsById(
+          context.dispatch,
+          dataLayer,
+          chainId,
+          roundId,
+          isDirectAllocationRound
+        );
       }
     }
   }, [chainId, roundId]); // eslint-disable-line react-hooks/exhaustive-deps

packages/grant-explorer/src/features/projects/ViewProject.tsx

@@ -59,6 +59,7 @@ import { ethers } from "ethers";
 import { useNavigate } from "react-router-dom";
 import { Logger } from "ethers/lib/utils";
 import SwitchNetworkModal from "../common/SwitchNetworkModal";
+import { useRoundById } from "../../context/RoundContext";
 
 const CalendarIcon = (props: React.SVGProps<SVGSVGElement>) => {
   return (
@@ -113,6 +114,7 @@ export default function ViewProject() {
   const allo = useAllo();
   const navigate = useNavigate();
   const { switchChain } = useSwitchChain();
+  const isDirectAllocationRound = true;
 
   const {
     data: projectData,
@@ -136,6 +138,14 @@ export default function ViewProject() {
     dataLayer
   );
 
+  const { round } = useRoundById(
+    chainId ?? 1,
+    directAllocationPoolId?.toString() ?? "",
+    isDirectAllocationRound
+  );
+
+  const directAllocationStrategyAddress = round?.payoutStrategy.id;
+
   const {
     directAllocation,
     tokenApprovalStatus,
@@ -455,7 +465,8 @@ export default function ViewProject() {
     if (
       directDonationAmount === undefined ||
       allo === null ||
-      payoutToken === undefined
+      payoutToken === undefined ||
+      directAllocationStrategyAddress === undefined
     ) {
       return;
     }
@@ -500,6 +511,7 @@ export default function ViewProject() {
         recipient,
         nonce,
         requireTokenApproval,
+        strategyAddress: directAllocationStrategyAddress,
       });
     } catch (error) {
       if (error === Logger.errors.TRANSACTION_REPLACED) {

packages/grant-explorer/src/features/projects/hooks/useDirectAllocation.tsx

@@ -33,6 +33,7 @@ export type DirectAllocationParams = {
   recipient: string;
   nonce: bigint;
   requireTokenApproval?: boolean;
+  strategyAddress: string;
 };
 
 type SubmitFundParams = DirectAllocationParams & {
@@ -154,6 +155,7 @@ async function _directAllocation({
   recipient,
   nonce,
   requireTokenApproval,
+  strategyAddress,
 }: SubmitFundParams) {
   resetToInitialState(context);
 
@@ -163,6 +165,7 @@ async function _directAllocation({
       .toBigInt();
 
     const recipientAddress = getAddress(recipient);
+    const directAllocationStrategyAddress = getAddress(strategyAddress);
 
     context.setTokenApprovalStatus(ProgressStatus.IN_PROGRESS);
 
@@ -174,6 +177,7 @@ async function _directAllocation({
         recipient: recipientAddress,
         nonce,
         requireTokenApproval,
+        strategyAddress: directAllocationStrategyAddress,
       })
       .on("tokenApprovalStatus", (tx) => {
         if (tx.type === "error") {