No gasless vouches removal

Opacity set for non human vouchers Fix for listing requests claimed before an expired personhood
Proof-Of-Humanity · Mar 8, 2024 · 8831249 · 8831249
1 parent daf1bf2
commit 8831249
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 205 deletions.
diff --git a/src/app/[pohid]/[chain]/[request]/ActionBar.tsx b/src/app/[pohid]/[chain]/[request]/ActionBar.tsx
@@ -297,12 +297,12 @@ export default withClientConnected<ActionBarProps>(function ActionBar({
                 ) : (
                   !isVouchGranted.didIVouchFor ? 
                   <Vouch pohId={pohId} claimer={requester} />
-                :
+                : isVouchGranted.isVouchOnchain ? 
                   <RemoveVouch 
                     requester={requester}
                     pohId={pohId}
-                    isOnchain={isVouchGranted.isVouchOnchain}
                   />
+                : null
                 )}
               </div>
             </>
@@ -324,12 +324,12 @@ export default withClientConnected<ActionBarProps>(function ActionBar({
               ) : (
                 !isVouchGranted.didIVouchFor ? 
                   <Vouch pohId={pohId} claimer={requester} />
-                :
+                : isVouchGranted.isVouchOnchain ? 
                   <RemoveVouch 
                     requester={requester}
                     pohId={pohId}
-                    isOnchain={isVouchGranted.isVouchOnchain}
                   />
+                : null
               )}
               <button
                 disabled={pending}
@@ -345,15 +345,6 @@ export default withClientConnected<ActionBarProps>(function ActionBar({
           <>
             <span className="text-slate-400">Ready to finalize.</span>
             <div className="flex flex-col md:flex-row md:items-center justify-between font-normal gap-4">
-              {isVouchGranted.didIVouchFor ? 
-                <RemoveVouch 
-                  requester={requester}
-                  pohId={pohId}
-                  isOnchain={isVouchGranted.isVouchOnchain}
-                />
-                : null
-              }
-
               <button
                 disabled={pending}
                 className="btn-main mb-2"
@@ -419,16 +410,6 @@ export default withClientConnected<ActionBarProps>(function ActionBar({
             />
             .
           </span>
-          <div className="flex flex-col md:flex-row md:items-center justify-between font-normal gap-4">
-            {isVouchGranted.didIVouchFor ? 
-              <RemoveVouch 
-                requester={requester}
-                pohId={pohId}
-                isOnchain={isVouchGranted.isVouchOnchain}
-              />
-              : null
-            }
-          </div>
           </>
         )}
 

diff --git a/src/app/[pohid]/[chain]/[request]/RemoveVouch.tsx b/src/app/[pohid]/[chain]/[request]/RemoveVouch.tsx
@@ -5,23 +5,17 @@ import { useLoading } from "hooks/useLoading";
 import { enableReactUse } from "@legendapp/state/config/enableReactUse";
 import { toast } from "react-toastify";
 import { useEffectOnce } from "@legendapp/state/react";
-import axios from "axios";
-import useChainParam from "hooks/useChainParam";
-import { useAccount, useSignTypedData } from "wagmi";
-import { Contract } from "contracts";
 
 enableReactUse();
 
 interface RemoveVouchProps {
   pohId: Hash;
   requester: Address;
-  isOnchain: boolean;
 }
 
-export default function RemoveVouch({ pohId, requester, isOnchain }: RemoveVouchProps) {
+export default function RemoveVouch({ pohId, requester }: RemoveVouchProps) {
   const loading = useLoading();
   const [pending] = loading.use();
-  const chain = useChainParam()!;
 
   const [prepareRemoveVouch, removeOnchainVouch] = usePoHWrite(
     "removeVouch",
@@ -46,69 +40,12 @@ export default function RemoveVouch({ pohId, requester, isOnchain }: RemoveVouch
     prepareRemoveVouch({ args: [requester, pohId] });
   });
 
-  const { address } = useAccount();
-  const voucher = address!.toLowerCase();
-  const expiration = useMemo(
-    () => Math.floor(Date.now() / 1000) + 60 * 60 * 24 * 30 * 6,
-    []
-  );
-
-  const { signTypedData } = useSignTypedData({
-    onSuccess: async (signature) => {
-      try {
-        await axios.delete(`/api/vouch/${chain.name}/remove`, {
-          data: {
-            pohId: pohId,
-            voucher: voucher,
-            claimer: requester,
-            expiration: expiration,
-            signature
-          }
-        });
-        toast.success("Vouch removed successfully");
-      } catch (err) {
-        console.error(err);
-        toast.error("Some error occurred");
-      }
-    },
-  });
-
-  const removeOffchainVouch = () => {
-    signTypedData({
-      domain: {
-        name: "Proof of Humanity",
-        chainId: chain.id,
-        verifyingContract: Contract.ProofOfHumanity[chain.id],
-      },
-      types: {
-        IsHumanVoucher: [
-          { name: "vouched", type: "address" },
-          { name: "humanityId", type: "bytes20" },
-          { name: "expirationTimestamp", type: "uint256" },
-        ],
-      },
-      primaryType: "IsHumanVoucher",
-      message: {
-        vouched: requester,
-        humanityId: pohId,
-        expirationTimestamp: BigInt(expiration),
-      },
-    });
-  };
-
-  const removeVouch = () => {
-    if (isOnchain) 
-      removeOnchainVouch()
-    else
-      removeOffchainVouch()
-  }
-
   return (
     <div className="flex gap-4">
       <button
         disabled={pending}
         className="btn-main mb-2"
-        onClick={removeVouch}
+        onClick={removeOnchainVouch}
       >
         Remove Vouch
       </button>

diff --git a/src/app/[pohid]/[chain]/[request]/Vouch.tsx b/src/app/[pohid]/[chain]/[request]/Vouch.tsx
@@ -99,7 +99,8 @@ export default function Vouch({ pohId, claimer }: VouchButtonProps) {
           (Sybil attack) or (Identity theft), all people who had vouched for it get
           removed as well. Profiles that do not follow the Policy risk being
           challenged and removed. Make sure you read and understand the Policy
-          before proceeding.
+          before proceeding. Also take into account that although a gasless vouch is possible, 
+          it cannot be removed. Gasless vouches expire after one year. 
         </span>
         <button
           className={cn(

diff --git a/src/app/[pohid]/[chain]/[request]/page.tsx b/src/app/[pohid]/[chain]/[request]/page.tsx
@@ -1,6 +1,6 @@
 import { EvidenceFile, RegistrationFile } from "types/docs";
 import { ipfs, ipfsFetch } from "utils/ipfs";
-import { paramToChain, supportedChains } from "config/chains";
+import { SupportedChain, getChainRpc, paramToChain, supportedChains } from "config/chains";
 import ActionBar from "./ActionBar";
 import Evidence from "./Evidence";
 import { getOffChainVouches, getRequestData } from "data/request";
@@ -19,10 +19,12 @@ import Link from "next/link";
 import Attachment from "components/Attachment";
 import ChainLogo from "components/ChainLogo";
 import Info from "./Info";
-import { Address } from "viem";
+import { Address, createPublicClient, getContract, http } from "viem";
 import { Hash } from "@wagmi/core";
 import { getClaimerData } from "data/claimer";
 import { Request } from "generated/graphql";
+import abis from "contracts/abis";
+import { Contract } from "contracts";
 
 interface PageProps {
   params: { pohid: string; chain: string; request: string };
@@ -149,6 +151,22 @@ export default async function Request({ params }: PageProps) {
   // advanceRequests.offChain =
   // }
 
+  const getProofOfHumanity = (chain: SupportedChain) =>
+  getContract({
+    abi: abis.ProofOfHumanity,
+    address: Contract.ProofOfHumanity[chain.id],
+    publicClient: createPublicClient({
+      chain,
+      transport: http(getChainRpc(chain.id)),
+    }),
+  });
+
+  const isVoucherHuman = async (voucher: `0x${string}`, chain: SupportedChain): Promise<boolean> => {
+    const poh = getProofOfHumanity(chain);
+    const result = await poh.read.isHuman([voucher]);
+    return result;
+  }
+
   const vouchersData = await Promise.all(
     (
       await Promise.all([
@@ -161,29 +179,34 @@ export default async function Request({ params }: PageProps) {
           (chain) =>
             voucher[chain.id].claimer?.registration?.humanity.winnerClaim
         );
-        if (voucherEvidenceChain)
+
+        if (voucherEvidenceChain) {
           return {
-            pohId:
-              voucher[voucherEvidenceChain.id].claimer!.registration!.humanity
-                .id,
+            pohId: voucher[voucherEvidenceChain.id].claimer!.registration!.humanity.id,
             uri: voucher[voucherEvidenceChain.id]
               .claimer!.registration!.humanity.winnerClaim.at(0)
               ?.evidenceGroup.evidence.at(0)?.uri,
-          };
+            chain: voucherEvidenceChain,
+            voucherId: voucher[voucherEvidenceChain.id].claimer!.registration!.humanity.id,
+          }
+        };
         return {
           voucher: voucher[chain.id].claimer?.id as Address,
           pohId: undefined,
           uri: undefined,
+          chain: chain,
+          voucherId: voucher[chain.id].claimer!.registration!.humanity.id,
         };
       })
-      .map(async ({ voucher, pohId, uri }) => {
+      .map(async ({ voucher, pohId, uri, voucherId, chain }) => {
         if (!uri || !pohId) return { voucher };
         try {
           const evFile = await ipfsFetch<EvidenceFile>(uri);
           if (!evFile?.fileURI) return { pohId };
           return {
             pohId,
             photo: (await ipfsFetch<RegistrationFile>(evFile.fileURI)).photo,
+            isHuman: await isVoucherHuman(voucherId, chain),
           };
         } catch {
           return { pohId };
@@ -351,11 +374,12 @@ export default async function Request({ params }: PageProps) {
                   Vouched by
 
                   <div className="flex gap-2">
-                    {vouchersData.map(({ photo, pohId, voucher }, idx) =>
-                      photo ? (
+                    {vouchersData.map(({ photo, pohId, voucher, isHuman }, idx) => {
+                      const className = `w-8 h-8 rounded-full cursor-pointer ${!isHuman? 'opacity-25' : ''}`
+                      return photo ? (
                         <Link key={idx} href={`/${prettifyId(pohId)}`}>
                           <Image
-                            className="w-8 h-8 rounded-full cursor-pointer"
+                            className={className}
                             alt="image"
                             src={ipfs(photo)}
                             width={64}
@@ -367,7 +391,7 @@ export default async function Request({ params }: PageProps) {
                           <Identicon key={idx} address={voucher} diameter={32} />
                         </Link>
                       )
-                    )}
+                    })}
                   </div>
                 </div>
               )}

diff --git a/src/app/api/vouch/[chain]/add/route.ts b/src/app/api/vouch/[chain]/add/route.ts
@@ -86,12 +86,12 @@ export async function POST(
 
     if (!validSignature) throw new Error("Invalid signature");
 
-    await datalake
+/*     await datalake
       .from("poh-vouchdb")
       .delete()
       .eq("pohId", pohId.toLowerCase())
       .eq("voucher", voucher.toLowerCase());
-
+ */
     await datalake
       .from("poh-vouchdb")
       .upsert({

diff --git a/src/app/api/vouch/[chain]/remove/route.ts b/src/app/api/vouch/[chain]/remove/route.ts