Merge pull request #283 from hypercerts-org/develop

Deploy to PROD

Author: pheuberger

package.json

@@ -26,10 +26,10 @@
     "commitlint": "commitlint --config commitlintrc.ts --edit"
   },
   "dependencies": {
-    "@graphql-tools/merge": "^9.0.3",
-    "@graphql-yoga/plugin-response-cache": "^3.5.0",
+    "@graphql-tools/merge": "^9.0.19",
+    "@graphql-yoga/plugin-response-cache": "^3.13.0",
     "@hypercerts-org/contracts": "2.0.0-alpha.12",
-    "@hypercerts-org/marketplace-sdk": "0.3.37",
+    "@hypercerts-org/marketplace-sdk": "0.5.1",
     "@hypercerts-org/sdk": "2.5.0-beta.6",
     "@ipld/car": "^5.2.5",
     "@openzeppelin/merkle-tree": "^1.0.5",
@@ -56,12 +56,12 @@
     "ethers": "^6.12.2",
     "express": "^4.19.2",
     "file-type": "^19.6.0",
-    "gql.tada": "^1.2.1",
-    "graphql": "^16.8.1",
+    "gql.tada": "^1.8.10",
+    "graphql": "^16.10.0",
     "graphql-filter": "^1.1.5",
     "graphql-middleware": "^6.1.35",
-    "graphql-scalars": "^1.23.0",
-    "graphql-yoga": "^5.1.1",
+    "graphql-scalars": "^1.24.1",
+    "graphql-yoga": "^5.11.0",
     "kysely": "^0.27.4",
     "lodash": "^4.17.21",
     "lru-cache": "^11.0.0",
@@ -83,17 +83,17 @@
     "node": "20.x"
   },
   "devDependencies": {
-    "@0no-co/graphqlsp": "^1.4.1",
+    "@0no-co/graphqlsp": "^1.12.16",
     "@commitlint/cli": "^19.4.1",
     "@commitlint/config-conventional": "^19.4.1",
-    "@eddeee888/gcg-typescript-resolver-files": "^0.7.2",
+    "@eddeee888/gcg-typescript-resolver-files": "^0.7.5",
     "@eslint/js": "^9.0.0",
     "@graphql-codegen/cli": "5.0.2",
-    "@graphql-tools/delegate": "^10.0.3",
-    "@graphql-tools/executor-http": "^1.0.8",
-    "@graphql-tools/schema": "^10.0.2",
-    "@graphql-tools/stitch": "^9.0.3",
-    "@graphql-tools/wrap": "^10.0.1",
+    "@graphql-tools/delegate": "^10.2.11",
+    "@graphql-tools/executor-http": "^1.2.6",
+    "@graphql-tools/schema": "^10.0.18",
+    "@graphql-tools/stitch": "^9.4.16",
+    "@graphql-tools/wrap": "^10.0.29",
     "@inquirer/prompts": "^7.2.3",
     "@rollup/plugin-typescript": "^11.1.6",
     "@sentry/types": "^8.2.1",

pnpm-lock.yaml

@@ -64,12 +64,45 @@ class GlifProvider implements RpcProvider {
   }
 }
 
+class AnkrProvider implements RpcProvider {
+  getUrl(chainId: number): string | undefined {
+    const urls: Record<number, string> = {
+      314: "https://rpc.ankr.com/filecoin",
+      314159: "https://rpc.ankr.com/filecoin_testnet",
+    };
+    return urls[chainId];
+  }
+}
+
+class ChainUpProvider implements RpcProvider {
+  getUrl(chainId: number): string | undefined {
+    const urls: Record<number, string> = {
+      314: "https://filecoin.chainup.net/rpc/v1",
+      314159: "https://filecoin-calibration.chainup.net/rpc/v1",
+    };
+    return urls[chainId];
+  }
+}
+
+class LavaProvider implements RpcProvider {
+  getUrl(chainId: number): string | undefined {
+    const urls: Record<number, string> = {
+      314: "https://filecoin.lava.build",
+      314159: "https://filecoin-testnet.lava.build",
+    };
+    return urls[chainId];
+  }
+}
+
 export class EvmClientFactory {
   private static readonly providers: RpcProvider[] = [
     new AlchemyProvider(),
     new InfuraProvider(),
     new DrpcProvider(),
     new GlifProvider(),
+    new AnkrProvider(),
+    new ChainUpProvider(),
+    new LavaProvider(),
   ];
 
   static createViemClient(chainId: number): PublicClient {

src/__generated__/routes/routes.ts

@@ -27,7 +27,7 @@ export const supabaseData = createClient<DataDatabaseTypes>(
 const handleChangeClaims = (
   payload: RealtimePostgresChangesPayload<{ [key: string]: any }>,
 ) => {
-  console.log(payload);
+  console.debug(payload);
   switch (payload.eventType) {
     case "INSERT":
       cache.invalidate([{ typename: "Hypercert" }]);
@@ -44,7 +44,7 @@ const handleChangeClaims = (
 const handleChangeFractions = (
   payload: RealtimePostgresChangesPayload<{ [key: string]: any }>,
 ) => {
-  console.log(payload);
+  console.debug(payload);
   switch (payload.eventType) {
     case "INSERT":
       cache.invalidate([{ typename: "Fraction" }]);
@@ -61,7 +61,7 @@ const handleChangeFractions = (
 const handleChangeMetadata = (
   payload: RealtimePostgresChangesPayload<{ [key: string]: any }>,
 ) => {
-  console.log(payload);
+  console.debug(payload);
   switch (payload.eventType) {
     case "INSERT":
       cache.invalidate([{ typename: "Metadata", id: payload.new.id }]);
@@ -78,7 +78,7 @@ const handleChangeMetadata = (
 const handleChangeSales = (
   payload: RealtimePostgresChangesPayload<{ [key: string]: any }>,
 ) => {
-  console.log(payload);
+  console.debug(payload);
   switch (payload.eventType) {
     case "INSERT":
       cache.invalidate([{ typename: "Sale" }]);
@@ -95,13 +95,22 @@ const handleChangeSales = (
 const handleChangeAllowlistRecords = (
   payload: RealtimePostgresChangesPayload<{ [key: string]: any }>,
 ) => {
-  console.log(payload);
+  console.debug(payload);
   switch (payload.eventType) {
     case "INSERT":
-      cache.invalidate([{ typename: "AllowlistRecord" }]);
+      cache.invalidate([
+        {
+          typename: "AllowlistRecord",
+        },
+      ]);
       break;
     case "UPDATE":
-      cache.invalidate([{ typename: "AllowlistRecord", id: payload.new.id }]);
+      cache.invalidate([
+        {
+          typename: "AllowlistRecord",
+          id: payload.new.id,
+        },
+      ]);
       break;
     default:
       break;
@@ -112,7 +121,7 @@ const handleChangeAllowlistRecords = (
 const handleChangeAttestations = (
   payload: RealtimePostgresChangesPayload<{ [key: string]: any }>,
 ) => {
-  console.log(payload);
+  console.debug(payload);
   switch (payload.eventType) {
     case "INSERT":
       cache.invalidate([{ typename: "Attestation" }]);
@@ -129,7 +138,7 @@ const handleChangeAttestations = (
 const handleChangeUsers = (
   payload: RealtimePostgresChangesPayload<{ [key: string]: any }>,
 ) => {
-  console.log(payload);
+  console.debug(payload);
   switch (payload.eventType) {
     case "INSERT":
       cache.invalidate([{ typename: "User" }]);
@@ -146,7 +155,7 @@ const handleChangeUsers = (
 const handleChangeBlueprints = (
   payload: RealtimePostgresChangesPayload<{ [key: string]: any }>,
 ) => {
-  console.log(payload);
+  console.debug(payload);
   switch (payload.eventType) {
     case "INSERT":
       cache.invalidate([{ typename: "Blueprint" }]);
@@ -166,7 +175,7 @@ const handleChangeBlueprints = (
 const handleChangeHyperboards = (
   payload: RealtimePostgresChangesPayload<{ [key: string]: any }>,
 ) => {
-  console.log(payload);
+  console.debug(payload);
   switch (payload.eventType) {
     case "UPDATE":
     case "DELETE":
@@ -192,7 +201,8 @@ const handleChangeHyperboards = (
 const handleChangeOrders = (
   payload: RealtimePostgresChangesPayload<{ [key: string]: any }>,
 ) => {
-  console.log(payload);
+  console.debug(payload);
+
   switch (payload.eventType) {
     case "INSERT":
     case "UPDATE":
@@ -208,6 +218,8 @@ const handleChangeOrders = (
 const handleChangeSignatureRequests = (
   payload: RealtimePostgresChangesPayload<{ [key: string]: any }>,
 ) => {
+  console.debug(payload);
+
   switch (payload.eventType) {
     case "INSERT":
     case "UPDATE":
@@ -275,6 +287,15 @@ supabaseCaching
     },
     (payload) => handleChangeAllowlistRecords(payload),
   )
+  .on(
+    "postgres_changes",
+    {
+      event: "*",
+      schema: "public",
+      table: "hypercert_allow_list_records",
+    },
+    (payload) => handleChangeAllowlistRecords(payload),
+  )
   .on(
     "postgres_changes",
     {

src/__generated__/swagger.json

@@ -0,0 +1,20 @@
+import { Route, Get, Response } from "tsoa";
+
+@Route("monitoring")
+export class MonitoringController {
+  @Get("/health")
+  @Response(200, "OK")
+  public async healthCheck(): Promise<{
+    status: string;
+    uptime: number;
+    timestamp: number;
+    memory: NodeJS.MemoryUsage;
+  }> {
+    return {
+      status: "OK",
+      uptime: process.uptime(),
+      timestamp: Date.now(),
+      memory: process.memoryUsage(),
+    };
+  }
+}

src/client/evmClient.ts

@@ -0,0 +1,73 @@
+import cron from "node-cron";
+import { OrderValidatorCode } from "@hypercerts-org/marketplace-sdk";
+import { SupabaseDataService } from "../services/SupabaseDataService.js";
+import _ from "lodash";
+import { kyselyData } from "../client/kysely.js";
+import { sql } from "kysely";
+
+/**
+ * These error codes are considered temporary and should be
+ * rechecked periodically so that they can be marked as valid again.
+ */
+export const TEMPORARILY_INVALID_ERROR_CODES = [
+  OrderValidatorCode.ORDER_EXPECTED_TO_BE_VALID,
+  OrderValidatorCode.TOO_EARLY_TO_EXECUTE_ORDER,
+];
+
+export default class OrderInvalidationCronjob {
+  private static instance: OrderInvalidationCronjob;
+  private dataService: SupabaseDataService;
+
+  private constructor() {
+    this.dataService = new SupabaseDataService();
+    this.setupCronJob();
+  }
+
+  private setupCronJob() {
+    // Run every 30 seconds
+    cron.schedule("*/30 * * * * *", async () => {
+      try {
+        await this.invalidateOrders();
+      } catch (error) {
+        console.error("Error in order invalidation cron job:", error);
+      }
+    });
+  }
+
+  public static start(): void {
+    if (!OrderInvalidationCronjob.instance) {
+      OrderInvalidationCronjob.instance = new OrderInvalidationCronjob();
+    }
+  }
+
+  private async invalidateOrders() {
+    const result = await kyselyData
+      .selectFrom("marketplace_orders")
+      .select(["itemIds", "invalidated", "validator_codes", "chainId"])
+      .where((eb) =>
+        eb.or([
+          eb("invalidated", "=", false),
+          // Include all orders that have been invalidated but only have validator codes that are in the accepted validator codes
+          // Example: order has been validated because it hasn't openened yet. Will initially be invalidated, but should be rechecked
+          // periodically so that it can be marked as valid again once it has opened.
+          eb("invalidated", "=", true).and(
+            "validator_codes",
+            "<@",
+            // @ts-expect-error Typing issue with sql arrays
+            sql`ARRAY[${sql.join(TEMPORARILY_INVALID_ERROR_CODES)}]::int4[]`,
+          ),
+        ]),
+      )
+      .execute();
+    const ordersByChain = _.groupBy(result, "chainId");
+
+    for (const chainId in ordersByChain) {
+      const ordersForChain = ordersByChain[chainId];
+      const tokenIds = _.uniq(ordersForChain.map((order) => order.itemIds[0]));
+      await this.dataService.validateOrdersByTokenIds({
+        tokenIds,
+        chainId: parseInt(chainId, 10),
+      });
+    }
+  }
+}