Feature/frontend compatibility with v2

schema.graphql

@@ -17,6 +17,9 @@ type AllowlistRecord {
   """The hypercert ID the claimable fraction belongs to"""
   hypercert_id: String
 
+  """The ID of the allow list record"""
+  id: String
+
   """The leaf of the Merkle tree for the claimable fraction"""
   leaf: String
 
@@ -168,6 +171,7 @@ type AttestationSchema {
 
 input AttestationSchemaAttestationWhereInput {
   attester: StringSearchOptions
+  contract_address: StringSearchOptions
   creation_block_number: BigIntSearchOptions
   creation_block_timestamp: BigIntSearchOptions
   id: StringSearchOptions
@@ -217,6 +221,7 @@ input AttestationSchemaWhereInput {
 
 input AttestationSortOptions {
   attester: SortOrder = null
+  contract_address: SortOrder = null
   creation_block_number: SortOrder = null
   creation_block_timestamp: SortOrder = null
   id: SortOrder = null
@@ -230,6 +235,7 @@ input AttestationSortOptions {
 
 input AttestationWhereInput {
   attester: StringSearchOptions
+  contract_address: StringSearchOptions
   creation_block_number: BigIntSearchOptions
   creation_block_timestamp: BigIntSearchOptions
   eas_schema: AttestationAttestationSchemaWhereInput = {}
@@ -268,6 +274,7 @@ type Blueprint {
 }
 
 input BlueprintSortOptions {
+  admin_address: SortOrder = null
   created_at: SortOrder = null
   id: SortOrder = null
   minted: SortOrder = null
@@ -282,6 +289,7 @@ input BlueprintUserWhereInput {
 }
 
 input BlueprintWhereInput {
+  admin_address: StringSearchOptions
   admins: BlueprintUserWhereInput = {}
   created_at: StringSearchOptions
   id: NumberSearchOptions
@@ -314,6 +322,7 @@ type Collection {
 }
 
 input CollectionBlueprintWhereInput {
+  admin_address: StringSearchOptions
   created_at: StringSearchOptions
   id: NumberSearchOptions
   minted: BooleanSearchOptions
@@ -628,6 +637,7 @@ type HyperboardOwner {
 }
 
 input HyperboardSortOptions {
+  admin_address: SortOrder = null
   chain_ids: SortOrder = null
   id: SortOrder = null
 }
@@ -640,6 +650,7 @@ input HyperboardUserWhereInput {
 }
 
 input HyperboardWhereInput {
+  admin_address: StringSearchOptions
   admins: HyperboardUserWhereInput = {}
   chain_ids: NumberArraySearchOptions
   collections: HyperboardCollectionWhereInput = {}
@@ -702,6 +713,7 @@ type Hypercert {
 
 input HypercertAttestationWhereInput {
   attester: StringSearchOptions
+  contract_address: StringSearchOptions
   creation_block_number: BigIntSearchOptions
   creation_block_timestamp: BigIntSearchOptions
   id: StringSearchOptions
@@ -816,6 +828,45 @@ input HypercertWhereInput {
   uri: StringSearchOptions
 }
 
+"""
+Hypercert with metadata, contract, orders, sales and fraction information
+"""
+type HypercertWithMetadata {
+  """Count of attestations referencing this hypercert"""
+  attestations_count: Int
+
+  """The UUID of the contract as stored in the database"""
+  contracts_id: ID
+  creation_block_number: EthBigInt
+  creation_block_timestamp: EthBigInt
+
+  """The address of the creator of the hypercert"""
+  creator_address: String
+
+  """
+  Concatenation of [chainID]-[contractAddress]-[tokenID] to discern hypercerts across chains
+  """
+  hypercert_id: ID
+  id: ID
+  last_update_block_number: EthBigInt
+  last_update_block_timestamp: EthBigInt
+
+  """The metadata for the hypercert as referenced by the uri"""
+  metadata: Metadata
+
+  """Count of sales of fractions that belong to this hypercert"""
+  sales_count: Int
+
+  """The token ID of the hypercert"""
+  token_id: EthBigInt
+
+  """The total units held by the hypercert"""
+  units: EthBigInt
+
+  """References the metadata for this claim"""
+  uri: String
+}
+
 """
 Hypercert without metadata, contract, orders, sales and fraction information
 """
@@ -878,6 +929,21 @@ type Metadata {
   work_timeframe_to: EthBigInt
 }
 
+input MetadataHypercertWhereInput {
+  attestations_count: NumberSearchOptions
+  creation_block_number: BigIntSearchOptions
+  creation_block_timestamp: BigIntSearchOptions
+  creator_address: StringSearchOptions
+  hypercert_id: StringSearchOptions
+  id: StringSearchOptions
+  last_update_block_number: BigIntSearchOptions
+  last_update_block_timestamp: BigIntSearchOptions
+  sales_count: NumberSearchOptions
+  token_id: BigIntSearchOptions
+  units: BigIntSearchOptions
+  uri: StringSearchOptions
+}
+
 input MetadataSortOptions {
   allow_list_uri: SortOrder = null
   contributors: SortOrder = null
@@ -900,6 +966,7 @@ input MetadataWhereInput {
   contributors: StringArraySearchOptions
   description: StringSearchOptions
   external_url: StringSearchOptions
+  hypercert: MetadataHypercertWhereInput = {}
   id: StringSearchOptions
   impact_scope: StringArraySearchOptions
   impact_timeframe_from: BigIntSearchOptions
@@ -942,7 +1009,7 @@ type Order {
   globalNonce: String!
 
   """The hypercert associated with this order"""
-  hypercert: HypercertBaseType
+  hypercert: HypercertWithMetadata
   hypercert_id: String!
   id: ID
   invalidated: Boolean!
@@ -1058,7 +1125,7 @@ type Sale {
   currency_amount: EthBigInt!
 
   """The hypercert associated with this order"""
-  hypercert: HypercertBaseType
+  hypercert: HypercertWithMetadata
 
   """The ID of the hypercert token referenced in the order"""
   hypercert_id: String

src/controllers/HyperboardController.ts

@@ -630,7 +630,14 @@ export class HyperboardController extends Controller {
     }
 
     const { signature, adminAddress } = parsedBody.data;
-    const chainId = hyperboard.chain_ids[0];
+    const chainId = hyperboard.chain_ids?.[0];
+    if (!chainId) {
+      this.setStatus(400);
+      return {
+        success: false,
+        message: "Hyperboard must have a chain id",
+      };
+    }
     const success = await verifyAuthSignedData({
       address: adminAddress as `0x${string}`,
       signature: signature as `0x${string}`,
@@ -700,6 +707,14 @@ export class HyperboardController extends Controller {
       };
     }
 
+    if (!hyperboard.chain_ids) {
+      this.setStatus(400);
+      return {
+        success: false,
+        message: "Hyperboard must have a chain id",
+      };
+    }
+
     try {
       await this.hyperboardsService.upsertHyperboard([
         {
@@ -967,7 +982,14 @@ export class HyperboardController extends Controller {
     const { data: admins } =
       await this.hyperboardsService.getHyperboardAdmins(hyperboardId);
 
-    const chain_id = hyperboard.chain_ids[0];
+    const chain_id = hyperboard.chain_ids?.[0];
+    if (!chain_id) {
+      this.setStatus(400);
+      return {
+        success: false,
+        message: "Hyperboard must have a chain id",
+      };
+    }
 
     if (
       !admins.find(

src/graphql/schemas/args/metadataArgs.ts

@@ -2,10 +2,18 @@ import { ArgsType } from "type-graphql";
 import { BaseQueryArgs } from "../../../lib/graphql/BaseQueryArgs.js";
 import { createEntityArgs } from "../../../lib/graphql/createEntityArgs.js";
 import { WhereFieldDefinitions } from "../../../lib/graphql/whereFieldDefinitions.js";
+import { EntityTypeDefs } from "../typeDefs/typeDefs.js";
 
 const { WhereInput: MetadataWhereInput, SortOptions: MetadataSortOptions } =
   createEntityArgs("Metadata", {
     ...WhereFieldDefinitions.Metadata.fields,
+    hypercert: {
+      type: "id",
+      references: {
+        entity: EntityTypeDefs.Hypercert,
+        fields: WhereFieldDefinitions.Hypercert.fields,
+      },
+    },
   });
 
 @ArgsType()

src/graphql/schemas/typeDefs/allowlistRecordTypeDefs.ts

@@ -8,6 +8,11 @@ import { Hypercert } from "./hypercertTypeDefs.js";
   simpleResolvers: true,
 })
 export class AllowlistRecord {
+  @Field({
+    nullable: true,
+    description: "The ID of the allow list record",
+  })
+  id?: string;
   @Field({
     nullable: true,
     description: "The hypercert ID the claimable fraction belongs to",

src/graphql/schemas/typeDefs/baseTypes/hypercertBaseWithMetadata.ts

@@ -0,0 +1,19 @@
+import { ObjectType } from "type-graphql";
+
+import { Field } from "type-graphql";
+import { Metadata } from "../metadataTypeDefs.js";
+import { HypercertBaseType } from "./hypercertBaseType.js";
+
+@ObjectType({
+  description:
+    "Hypercert with metadata, contract, orders, sales and fraction information",
+  simpleResolvers: true,
+})
+export class HypercertWithMetadata extends HypercertBaseType {
+  // Resolved fields
+  @Field(() => Metadata, {
+    nullable: true,
+    description: "The metadata for the hypercert as referenced by the uri",
+  })
+  metadata?: Metadata;
+}

src/graphql/schemas/typeDefs/orderTypeDefs.ts

@@ -3,6 +3,7 @@ import { DataResponse } from "../../../lib/graphql/DataResponse.js";
 import { EthBigInt } from "../../scalars/ethBigInt.js";
 import { BasicTypeDef } from "./baseTypes/basicTypeDef.js";
 import { HypercertBaseType } from "./baseTypes/hypercertBaseType.js";
+import { HypercertWithMetadata } from "./baseTypes/hypercertBaseWithMetadata.js";
 
 @ObjectType({
   description: "Marketplace order for a hypercert",
@@ -56,7 +57,7 @@ export class Order extends BasicTypeDef {
   @Field()
   pricePerPercentInToken?: string;
 
-  @Field(() => HypercertBaseType, {
+  @Field(() => HypercertWithMetadata, {
     nullable: true,
     description: "The hypercert associated with this order",
   })

src/graphql/schemas/typeDefs/salesTypeDefs.ts

@@ -1,8 +1,9 @@
 import { Field, ObjectType } from "type-graphql";
 import { EthBigInt } from "../../scalars/ethBigInt.js";
 import { BasicTypeDef } from "./baseTypes/basicTypeDef.js";
-import { HypercertBaseType } from "./baseTypes/hypercertBaseType.js";
 import { DataResponse } from "../../../lib/graphql/DataResponse.js";
+import { HypercertBaseType } from "./baseTypes/hypercertBaseType.js";
+import { HypercertWithMetadata } from "./baseTypes/hypercertBaseWithMetadata.js";
 
 @ObjectType()
 export class Sale extends BasicTypeDef {
@@ -51,7 +52,7 @@ export class Sale extends BasicTypeDef {
   })
   creation_block_timestamp?: bigint | number | string;
 
-  @Field(() => HypercertBaseType, {
+  @Field(() => HypercertWithMetadata, {
     nullable: true,
     description: "The hypercert associated with this order",
   })

src/lib/graphql/whereFieldDefinitions.ts

@@ -47,6 +47,7 @@ export const WhereFieldDefinitions = {
       recipient: "string",
       resolver: "string",
       supported_schemas_id: "string",
+      contract_address: "string",
     },
   },
   AttestationSchema: {
@@ -64,6 +65,7 @@ export const WhereFieldDefinitions = {
       created_at: "string",
       minter_address: "string",
       minted: "boolean",
+      admin_address: "string",
     },
   },
   Collection: {
@@ -115,6 +117,7 @@ export const WhereFieldDefinitions = {
     fields: {
       id: "string",
       chain_ids: "numberArray",
+      admin_address: "string",
     },
   },
   Metadata: {

src/lib/strategies/isWhereEmpty.ts

@@ -12,5 +12,5 @@ export function isWhereEmpty(
 ): boolean {
   if (!where) return true;
   if (Array.isArray(where)) return where.length === 0;
-  return Object.keys(where).length === 0;
+  return Object.values(where).filter((x) => x !== undefined).length === 0;
 }

src/services/database/entities/AttestationEntityService.ts

@@ -116,10 +116,7 @@ export class AttestationService {
       "token_id" in data &&
       data.token_id
     ) {
-      const tokenId =
-        typeof data.token_id === "string"
-          ? data.token_id
-          : String(data.token_id);
+      const tokenId = Number(data.token_id);
       return { ...data, token_id: BigInt(tokenId).toString() };
     }
     return data;

src/services/database/entities/BlueprintsEntityService.ts

@@ -28,7 +28,7 @@ export type BlueprintAdminSelect = Selectable<DataDatabase["users"]>;
 @singleton()
 export class BlueprintsService {
   private entityService: EntityService<
-    DataDatabase["blueprints"],
+    DataDatabase["blueprints_with_admins"],
     GetBlueprintsArgs
   >;
 
@@ -44,9 +44,9 @@ export class BlueprintsService {
   ) {
     this.entityService = createEntityService<
       DataDatabase,
-      "blueprints",
+      "blueprints_with_admins",
       GetBlueprintsArgs
-    >("blueprints", "BlueprintsEntityService", kyselyData);
+    >("blueprints_with_admins", "BlueprintsEntityService", kyselyData);
   }
 
   /**
@@ -87,7 +87,14 @@ export class BlueprintsService {
       .where("blueprint_id", "=", blueprintId)
       .innerJoin("users", "blueprint_admins.user_id", "users.id")
       .selectAll("users")
-      .execute();
+      .execute()
+      .then((res) =>
+        res.map((admin) => ({
+          ...admin,
+          // TODO: Investigate why chain_id is returned as a string
+          chain_id: Number(admin.chain_id),
+        })),
+      );
   }
 
   /**