Merge pull request #37 from martillansky/Desing-alignment

Chiado + IPFS Gateway
Proof-Of-Humanity · Mar 29, 2024 · a3b27ba · a3b27ba
2 parents c6b4d60 + dc2b959
commit a3b27ba
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 18 deletions.
diff --git a/env.d.ts b/env.d.ts
@@ -2,6 +2,7 @@ declare global {
   namespace NodeJS {
     interface ProcessEnv {
       GNOSIS_RPC: string;
+      CHIADO_RPC: string;
       SEPOLIA_RPC: string;
       FILEBASE_TOKEN: string;
       DATALAKE_URL: string;

diff --git a/next.config.js b/next.config.js
@@ -10,12 +10,14 @@ const nextConfig = {
 
     return config;
   },
+  env: {
+    REACT_APP_IPFS_GATEWAY: process.env.REACT_APP_IPFS_GATEWAY,
+  },
   images: {
     remotePatterns: [
       {
         protocol: "https",
         hostname: process.env.REACT_APP_IPFS_GATEWAY,
-        //hostname: "ipfs.kleros.io",
         port: "",
         pathname: "/ipfs/**",
       },

diff --git a/src/app/[pohid]/page.tsx b/src/app/[pohid]/page.tsx
@@ -43,9 +43,10 @@ async function Profile({ params: { pohid } }: PageProps) {
     (chain) => !!humanity[chain.id]?.crossChainRegistration
   );
 
-  const humanityHomeChainRegistration = homeChain && humanity[homeChain.id]!.humanity!.registration;
+  //const humanityHomeChainRegistration = homeChain && humanity[homeChain.id]!.humanity!.registration;
   const humanityCrossChainRegistration = homeCrossChain && humanity[homeCrossChain.id].crossChainRegistration;
 
+  console.log(">>>>>>>>> >>>>>>> >>>>> >>> > ", homeChain, homeCrossChain, humanityCrossChainRegistration);
 
   const arbitrationCost = homeChain
     ? await getArbitrationCost(
@@ -67,7 +68,7 @@ async function Profile({ params: { pohid } }: PageProps) {
       })[0]
     : null;
 
-  const humanityLEChainRegistration = lastEvidenceChain && humanity[lastEvidenceChain.id]!.humanity!.registration;
+  //const humanityLEChainRegistration = lastEvidenceChain && humanity[lastEvidenceChain.id]!.humanity!.registration;
 
   const pendingRequests = supportedChains.reduce(
     (acc, chain) => [
@@ -86,16 +87,16 @@ async function Profile({ params: { pohid } }: PageProps) {
   );
 
 
-  let expired = (lastEvidenceChain && humanity[lastEvidenceChain.id]!.humanity!.registration!.expirationTime < Date.now() / 1000) 
+  let expired = (lastEvidenceChain && humanity[lastEvidenceChain.id]!.humanity!.registration!.expirationTime < Date.now() / 1000);
 
   let winnerClaimRequest =
     (lastEvidenceChain &&
     !(expired) && // It did not expired
     humanity[lastEvidenceChain.id].humanity!.winnerClaim[0]);
 
-  if (!winnerClaimRequest) {
-    winnerClaimRequest = (!!homeCrossChain && humanity[homeCrossChain.id].humanity!.winnerClaim[0]);
+  if (!(!!lastEvidenceChain) && !winnerClaimRequest) {
     expired = (!!humanityCrossChainRegistration && humanityCrossChainRegistration.expirationTime < Date.now() / 1000);
+    winnerClaimRequest = (!expired && !!homeCrossChain && humanity[homeCrossChain.id].humanity!.winnerClaim[0]);
   }
 
   // pastRequests must not contain pendingRequests nor winningClaimRequest if it did not expired
@@ -229,7 +230,7 @@ async function Profile({ params: { pohid } }: PageProps) {
               lastTransferChain={lastTransferChain}
             />
           </>
-        ) : homeCrossChain && humanityCrossChainRegistration ? (
+        ) : homeCrossChain && humanityCrossChainRegistration && !expired ? (
           <CrossChain
             claimer={
               humanityCrossChainRegistration!.claimer.id
@@ -356,7 +357,7 @@ async function Profile({ params: { pohid } }: PageProps) {
           <div className="grid gap-4 grid-cols-1 sm:grid-cols-2 md:grid-cols-3 xl:grid-cols-4">
             {pastRequests.map((req) => (
               <Card
-                key={req.id}
+                key={req.chainId+'/'+req.id}
                 chainId={req.chainId}
                 claimer={req.claimer.id}
                 evidence={req.evidenceGroup.evidence}

diff --git a/src/components/ChainLogo.tsx b/src/components/ChainLogo.tsx
@@ -1,10 +1,10 @@
 "use client";
 
 import { SVGProps } from "react";
-import { mainnet, sepolia, gnosis } from "viem/chains";
+import { mainnet, sepolia, gnosis, gnosisChiado } from "viem/chains";
 import MainnetIcon from "icons/mainnet.svg";
 import GnosisIcon from "icons/gnosis.svg";
-// import TestnetIcon from "icons/testnet.svg";
+import TestnetIcon from "icons/testnet.svg";
 
 interface ChainLogoProps extends SVGProps<any> {
   chainId: number;
@@ -18,6 +18,8 @@ const ChainLogo: React.FC<ChainLogoProps> = ({ chainId, ...props }) => {
       return <MainnetIcon {...props} />;
     case gnosis.id:
       return <GnosisIcon {...props} />;
+    case gnosisChiado.id:
+      return <TestnetIcon {...props} />;
     default:
       throw new Error("chain not supported");
   }

diff --git a/src/config/chains.ts b/src/config/chains.ts
@@ -1,6 +1,6 @@
-import { gnosis, sepolia } from "viem/chains";
+import { gnosis, sepolia, /* gnosisChiado */ } from "viem/chains";
 
-export const supportedChains = [gnosis, sepolia];
+export const supportedChains = [gnosis, sepolia, /* gnosisChiado */];
 export const defaultChain = supportedChains[0];
 
 export const legacyChain = sepolia;
@@ -16,6 +16,8 @@ export function nameToChain(name: string): SupportedChain | null {
       return sepolia;
     case gnosis.name.toLowerCase():
       return gnosis;
+    /* case gnosisChiado.name.toLowerCase():
+      return gnosisChiado; */
     default:
       return null;
     // throw new Error("chain not supported");
@@ -28,6 +30,8 @@ export function idToChain(id: number): SupportedChain | null {
       return sepolia;
     case gnosis.id:
       return gnosis;
+    /* case gnosisChiado.id:
+      return gnosisChiado; */
     default:
       return null;
     // throw new Error("chain not supported");
@@ -49,6 +53,8 @@ export function getChainRpc(id: number): string {
       return process.env.SEPOLIA_RPC;
     case gnosis.id:
       return process.env.GNOSIS_RPC;
+    /* case gnosisChiado.id:
+      return process.env.CHIADO_RPC; */
     default:
       throw new Error("chain not supported");
   }

diff --git a/src/config/index.ts b/src/config/index.ts
diff --git a/src/config/subgraph.ts b/src/config/subgraph.ts
@@ -1,6 +1,6 @@
 import { getSdk } from "generated/graphql";
 import { GraphQLClient } from "graphql-request";
-import { gnosis, sepolia } from "viem/chains";
+import { gnosis, sepolia, /* gnosisChiado */ } from "viem/chains";
 import { SupportedChainId } from "./chains";
 
 export type sdkReturnType = ReturnType<typeof getSdk>;
@@ -21,4 +21,10 @@ export const sdk = {
       "https://api.studio.thegraph.com/query/64099/proof-of-humanity-gnosis/version/latest"
     )
   ),
+  /* [gnosisChiado.id]: getSdk(
+    new GraphQLClient(
+      "https://api.studio.thegraph.com/query/64099/proof-of-humanity-gnosis/version/latest"
+      //"https://api.studio.thegraph.com/query/64099/proof-of-humanity-chiado/version/latest"
+    )
+  ), */
 };
diff --git a/src/contracts/index.ts b/src/contracts/index.ts
@@ -1,18 +1,21 @@
-import { gnosis, sepolia } from "viem/chains";
+import { gnosis, sepolia, /* gnosisChiado */ } from "viem/chains";
 
 export const Contract = {
   ProofOfHumanity: {
     [sepolia.id]: "0x29defF3DbEf6f79ef20d3fe4f9CFa0547acCeC0D",
     //[gnosis.id]: "0xB6412c84eC958cafcC80B688d6F473e399be488f",
     [gnosis.id]: "0x4a594f0e73223c9a1CE0EfC16da92fFaA193a612",
+    //[gnosisChiado.id]: "0x2505C87AA36d9ed18514Ea7473Ac58aeDeb50849",
   },
   CrossChainProofOfHumanity: {
     [sepolia.id]: "0xd134748B972A320a73EfDe3AfF7a68718F6bA92c",
     [gnosis.id]: "0x2C692919Da3B5471F9Ac6ae1C9D1EE54F8111f76",
+    //[gnosisChiado.id]: "0xBEd896A3DEa0E065F05Ba83Fa63322c7b9d67838",
   },
   Multicall3: {
     [sepolia.id]: sepolia.contracts.multicall3.address,
     [gnosis.id]: gnosis.contracts.multicall3.address,
+    //[gnosisChiado.id]: gnosisChiado.contracts.multicall3.address,
   },
   // GroupCurrencyToken: {
   //   [sepolia.id]: "0x0000000000000000000000000000000000000000",

diff --git a/src/utils/ipfs.ts b/src/utils/ipfs.ts
@@ -1,13 +1,11 @@
 import axios from "axios";
-import { IPFS_GATEWAY } from "../config";
 
 export const uploadToIPFS = async (data: FormData) => {
   const result = await axios.post("/api/ipfs-upload", data);
   return result.data.uri;
 };
 
-export const ipfs = (uri: string) => `https://${IPFS_GATEWAY}${uri}`;
-//export const ipfs = (uri: string) => `https://ipfs.kleros.io${uri}`;
+export const ipfs = (uri: string) => `https://${process.env.REACT_APP_IPFS_GATEWAY}${uri}`;
 
 export const ipfsFetch = async <F>(ipfsURI: string) =>
   (await axios.get(ipfs(ipfsURI))).data as F;