Merge pull request #514 from hypercerts-org/dev

Deprecate infura on prod

Author: Jipperism

.env.test

@@ -2,5 +2,4 @@ NEXT_PUBLIC_ENVIRONMENT=test
 NEXT_PUBLIC_WC_PROJECT_ID=<placeholder wc project id>
 NEXT_PUBLIC_ALCHEMY_API_KEY="mock-alchemy-key"
 NEXT_PUBLIC_DRPC_API_PKEY="mock-drpc-key"
-NEXT_PUBLIC_INFURA_API_KEY="mock-infura-key"
 NEXT_PUBLIC_FILECOIN_API_KEY="mock-filecoin-key"

app/collections/[collectionId]/page.tsx

@@ -17,7 +17,7 @@ const CollectionPageInner = async ({
     <div>
       <h3 className="text-2xl font-medium">{data.name}</h3>
       <p className="text-sm text-slate-500 pb-2">
-        {data.sections.data[0].collection.description}
+        {data.sections?.data?.[0]?.collections?.[0].description}
       </p>
 
       <div className="pt-8 justify-center flex w-full">

app/collections/edit/[collectionId]/page.tsx

@@ -17,13 +17,13 @@ const EditCollectionPage = async ({
 
   const prefilledValues: CollectionCreateFormValues = {
     id: collectionId,
-    collectionId: data.sections.data[0].collection.id,
+    collectionId: data.sections?.data?.[0]?.collections?.[0]?.id || "",
     title: data.name,
-    description: data.sections.data[0].collection.description,
+    description: data.sections?.data?.[0]?.collections?.[0]?.description || "",
     borderColor: data.tile_border_color || "#000000",
     backgroundImg: data.background_image || "",
     entries:
-      data.sections.data[0].entries?.map((hc) => ({
+      data.sections?.data?.[0]?.entries?.map((hc) => ({
         entryId: hc.id,
         factor: hc.display_size,
       })) || [],

app/profile/[address]/collections-tab-content-inner.tsx

@@ -36,17 +36,23 @@ export const HyperboardsOverview = ({
         </div>
       )}
       <div className="flex flex-col gap-4">
-        {hyperboards.map((hyperboard) => (
-          <HyperboardRow
-            key={hyperboard.id}
-            hyperboardId={hyperboard.id}
-            name={hyperboard.name || ""}
-            description={
-              hyperboard.sections?.data?.[0]?.collection.description || ""
-            }
-            showEditAndDeleteButtons={isOwnProfile}
-          />
-        ))}
+        {hyperboards.map((hyperboard) => {
+          if (!hyperboard.id) {
+            return null;
+          }
+          return (
+            <HyperboardRow
+              key={hyperboard.id}
+              hyperboardId={hyperboard.id}
+              name={hyperboard.name || ""}
+              description={
+                hyperboard.sections?.data?.[0]?.collections?.[0].description ||
+                ""
+              }
+              showEditAndDeleteButtons={isOwnProfile}
+            />
+          );
+        })}
       </div>
     </div>
   );

attestations/getAttestations.tsx

@@ -43,20 +43,26 @@ export async function getAttestations({
 }: GetAttestationsParams) {
   const where: Record<string, any> = {};
 
-  if (filter?.chainId) {
-    where.chain_id = { eq: filter.chainId.toString() };
-  }
+  // where: {hypercert: {token_id: {eq: 292983117918928017041965536998752430063616}}, eas_schema: {uid: {eq: "0x2f4f575d5df78ac52e8b124c4c900ec4c540f1d44f5b8825fac0af5308c91449"}, chain_id: {eq: 11155111}}}
   if (filter?.contractAddress) {
     where.contract_address = { eq: filter.contractAddress };
   }
+
   if (filter?.tokenId) {
-    where.token_id = { eq: filter.tokenId.toString() };
+    where.hypercert = { token_id: { eq: filter.tokenId } };
   }
 
   if (filter?.schemaId) {
     where.eas_schema = { uid: { eq: filter.schemaId } };
   }
 
+  if (filter?.chainId) {
+    where.eas_schema = {
+      ...(where.eas_schema || {}),
+      chain_id: { eq: Number(filter.chainId) },
+    };
+  }
+
   const res = await request(HYPERCERTS_API_URL_GRAPH, query, {
     first,
     offset,

attestations/getCreatorFeedAttestation.tsx

@@ -9,7 +9,7 @@ const query = graphql(
     query AttestationsQuery($where: AttestationWhereInput) {
       attestations(
         where: $where
-        sort: { by: { creation_block_timestamp: descending } }
+        sortBy: { creation_block_timestamp: descending }
       ) {
         count
         data {
@@ -38,20 +38,25 @@ export async function getCreatorFeedAttestations({
 }: GetAttestationsParams) {
   const where: Record<string, any> = {};
 
-  if (filter?.chainId) {
-    where.chain_id = { eq: filter.chainId.toString() };
-  }
   if (filter?.contractAddress) {
     where.contract_address = { eq: filter.contractAddress };
   }
+
   if (filter?.tokenId) {
-    where.token_id = { eq: filter.tokenId.toString() };
+    where.hypercert = { token_id: { eq: filter.tokenId } };
   }
 
   if (filter?.schemaId) {
     where.eas_schema = { uid: { eq: filter.schemaId } };
   }
 
+  if (filter?.chainId) {
+    where.eas_schema = {
+      ...(where.eas_schema || {}),
+      chain_id: { eq: Number(filter.chainId) },
+    };
+  }
+
   const res = await request(HYPERCERTS_API_URL_GRAPH, query, {
     first,
     offset,

collections/getCollectionById.ts

@@ -8,7 +8,7 @@ import { HYPERCERTS_API_URL_GRAPH } from "@/configs/hypercerts";
 
 const query = graphql(
   `
-    query Hyperboard($id: UUID!) {
+    query Hyperboard($id: String!) {
       hyperboards(where: { id: { eq: $id } }) {
         data {
           ...HyperboardFragment

collections/getCollectionsByAdminAddress.ts

@@ -11,7 +11,7 @@ const query = graphql(
   `
     query Collection($admin_address: String!, $first: Int, $offset: Int) {
       hyperboards(
-        where: { admin_id: { eq: $admin_address } }
+        where: { admin_address: { eq: $admin_address } }
         first: $first
         offset: $offset
       ) {

collections/hyperboard.fragment.ts

@@ -4,8 +4,10 @@ export const HyperboardFragment = graphql(`
   fragment HyperboardFragment on Hyperboard {
     id
     admins {
-      address
-      chain_id
+      data {
+        address
+        chain_id
+      }
     }
     name
     background_image
@@ -15,7 +17,7 @@ export const HyperboardFragment = graphql(`
       count
       data {
         label
-        collection {
+        collections {
           name
           admins {
             address
@@ -32,18 +34,22 @@ export const HyperboardFragment = graphql(`
           name
           total_units
           owners {
-            percentage
-            address
-            units
-            avatar
-            display_name
+            data {
+              percentage
+              address
+              units
+              avatar
+              display_name
+            }
           }
         }
         owners {
-          percentage_owned
-          address
-          display_name
-          avatar
+          data {
+            percentage_owned
+            address
+            display_name
+            avatar
+          }
         }
       }
     }

components/hypercert/creator.tsx

@@ -14,7 +14,7 @@ export default function Creator({ hypercert }: { hypercert: HypercertState }) {
       {hypercert.creator_address && (
         <div className="flex space-x-1 items-center">
           <span>by</span>
-          <EthAddress address={hypercert.creator_address} />
+          <EthAddress address={hypercert.creator_address} showEnsName />
         </div>
       )}
       {hypercert.contract?.chain_id && (