add AdapterErrorWrapper

gitcoinco · May 9, 2024 · 3a63bdb · 3a63bdb
1 parent cd61e22
commit 3a63bdb
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 36 deletions.
diff --git a/packages/common/src/allo-strategy-adapters/adapter.ts b/packages/common/src/allo-strategy-adapters/adapter.ts
@@ -1,31 +1,29 @@
 import { Address, PublicClient } from "viem";
 
-export class AdapterError extends Error {
-  public readonly reason: string;
-  public readonly innerError?: Error;
-
-  constructor(reason: string, innerError?: Error) {
-    super(reason);
-    this.reason = reason;
-    this.innerError = innerError;
-  }
-}
-
-export class AdapterResponseError extends AdapterError {
-  constructor(reason: string, error: AdapterError) {
-    super(reason, error);
-  }
-}
-
-export class UnknownAdapterError extends AdapterError {
-  constructor(strategyName: string) {
-    super(`Adapter not found for strategy: ${strategyName}`);
-  }
-}
+export type AdapterNotFoundError = {
+  type: "ADAPTER_NOT_FOUND";
+  strategyName: string;
+  error: Error;
+};
+
+export type AdapterAllocationUnauthorizedError = {
+  type: "ADAPTER_ALLOCATION_UNAUTHORIZED";
+  error: Error;
+};
+
+export type AdapterUnknownError = {
+  type: "ADAPTER_UNKNOWN_ERROR";
+  error: Error;
+};
+
+export type AdapterErrorWrapper =
+  | AdapterNotFoundError
+  | AdapterAllocationUnauthorizedError
+  | AdapterUnknownError;
 
 export type AdapterResponse<T> =
   | { type: "success"; value: T }
-  | { type: "error"; error: AdapterError };
+  | { type: "error"; error: AdapterErrorWrapper };
 
 export interface AllocationAdapter {
   // Returns true if the allocator can allocate to the pool.

diff --git a/...utionDirectTransferStrategy/allocation.ts → ...adapters/adapters/allov2.QF/allocation.ts b/...utionDirectTransferStrategy/allocation.ts → ...adapters/adapters/allov2.QF/allocation.ts
@@ -1,5 +1,5 @@
 import { Address, PublicClient } from "viem";
-import { AdapterResponse, AdapterError } from "../../adapter";
+import { AdapterResponse } from "../../adapter";
 
 export function canAllocate(
   _client: PublicClient,
@@ -25,7 +25,10 @@ export function canAllocate(
       return resolve({
         type: "error",
 
-        error: new AdapterError("you don't have a badge to vote."),
+        error: {
+          type: "ADAPTER_ALLOCATION_UNAUTHORIZED",
+          error: new Error("you don't have a badge to vote."),
+        },
       });
     }, 2000);
   });

diff --git a/...stributionDirectTransferStrategy/index.ts → ...tegy-adapters/adapters/allov2.QF/index.ts b/...stributionDirectTransferStrategy/index.ts → ...tegy-adapters/adapters/allov2.QF/index.ts
diff --git a/packages/common/src/allo-strategy-adapters/hooks.ts b/packages/common/src/allo-strategy-adapters/hooks.ts
@@ -2,11 +2,11 @@ import { Address } from "wagmi";
 import { PublicClient } from "viem";
 import { useState, useEffect } from "react";
 import { getAllocationAdapter } from "./index";
-import { AdapterError, UnknownAdapterError } from "./adapter";
+import { AdapterErrorWrapper } from "./adapter";
 
 type AdapterResponseWrapper<T> = {
   loading: boolean;
-  error: Error | undefined;
+  error: AdapterErrorWrapper | undefined;
   value: T | undefined;
 };
 
@@ -17,7 +17,7 @@ export function useAdapterCanAllocate(
   address: Address | undefined
 ): AdapterResponseWrapper<boolean> {
   const [loading, setLoading] = useState(false);
-  const [error, setError] = useState<AdapterError>();
+  const [error, setError] = useState<AdapterErrorWrapper>();
   const [value, setValue] = useState<boolean>();
 
   useEffect(() => {
@@ -33,7 +33,11 @@ export function useAdapterCanAllocate(
 
     const adapter = getAllocationAdapter(strategyName);
     if (adapter === undefined) {
-      setError(new UnknownAdapterError(strategyName));
+      setError({
+        type: "ADAPTER_NOT_FOUND",
+        strategyName,
+        error: new Error(`Adapter not found for strategy: ${strategyName}`),
+      });
       setLoading(false);
       return;
     }
@@ -47,7 +51,7 @@ export function useAdapterCanAllocate(
           setError(resp.error);
         }
       })
-      .catch((e: AdapterError) => {
+      .catch((e: AdapterErrorWrapper) => {
         setError(e);
       })
       .finally(() => {

diff --git a/packages/common/src/allo-strategy-adapters/index.ts b/packages/common/src/allo-strategy-adapters/index.ts
@@ -1,9 +1,8 @@
 import type { AllocationAdapter, Adapter } from "./adapter";
-import allov2DonationVotingMerkleDistributionDirectTransferStrategy from "./adapters/allov2.DonationVotingMerkleDistributionDirectTransferStrategy";
+import alloV2QF from "./adapters/allov2.QF";
 
 export const adapters: { [key: string]: Adapter } = {
-  "allov2.DonationVotingMerkleDistributionDirectTransferStrategy":
-    allov2DonationVotingMerkleDistributionDirectTransferStrategy,
+  "allov2.DonationVotingMerkleDistributionDirectTransferStrategy": alloV2QF,
 };
 
 export function getAllocationAdapter(

diff --git a/packages/grant-explorer/src/features/round/ViewRoundPage.tsx b/packages/grant-explorer/src/features/round/ViewRoundPage.tsx
@@ -865,12 +865,22 @@ export function CartButtonToggle(props: {
     return <div>Loading...</div>;
   }
 
-  if (error) {
-    return <div>Error checking if you can allocate: {error.message}</div>;
+  if (error !== undefined) {
+    switch (error.type) {
+      case "ADAPTER_ALLOCATION_UNAUTHORIZED":
+        return (
+          <div>
+            You are not authorized to allocate:
+            {error.error.message}
+          </div>
+        );
+      default:
+        return <div>Something went wrong {error.error.message}</div>;
+    }
   }
 
   if (!canAllocate) {
-    return <div>You can't allocate</div>;
+    return <div>Allocation not allowed</div>;
   }
 
   return (