updates

Author: farhanW3

src/db/configuration/getConfiguration.ts

@@ -1,6 +1,7 @@
 import { Configuration } from "@prisma/client";
 import { LocalWallet } from "@thirdweb-dev/wallets";
 import { ethers } from "ethers";
+import { Config } from "../../schema/config";
 import { WalletType } from "../../schema/wallet";
 import { mandatoryAllowedCorsUrls } from "../../server/utils/cors-urls";
 import { decrypt } from "../../utils/crypto";
@@ -9,38 +10,6 @@ import { logger } from "../../utils/logger";
 import { prisma } from "../client";
 import { updateConfiguration } from "./updateConfiguration";
 
-interface Config
-  extends Omit<
-    Configuration,
-    | "awsAccessKeyId"
-    | "awsSecretAccessKey"
-    | "awsRegion"
-    | "gcpApplicationProjectId"
-    | "gcpKmsLocationId"
-    | "gcpKmsKeyRingId"
-    | "gcpApplicationCredentialEmail"
-    | "gcpApplicationCredentialPrivateKey"
-  > {
-  walletConfiguration:
-    | {
-        type: WalletType.local;
-      }
-    | {
-        type: WalletType.awsKms;
-        awsAccessKeyId: string;
-        awsSecretAccessKey: string;
-        awsRegion: string;
-      }
-    | {
-        type: WalletType.gcpKms;
-        gcpApplicationProjectId: string;
-        gcpKmsLocationId: string;
-        gcpKmsKeyRingId: string;
-        gcpApplicationCredentialEmail: string;
-        gcpApplicationCredentialPrivateKey: string;
-      };
-}
-
 const withWalletConfig = async (config: Configuration): Promise<Config> => {
   // We destructure the config to omit wallet related fields to prevent direct access
   const {
@@ -84,8 +53,13 @@ const withWalletConfig = async (config: Configuration): Promise<Config> => {
       }
     }
 
+    // Renaming contractSubscriptionsRetryDelaySeconds
+    // to contractSubscriptionsRequeryDelaySeconds to reflect its purpose
+    // as we are requerying (& not retrying) with different delays
     return {
       ...restConfig,
+      contractSubscriptionsRequeryDelaySeconds:
+        restConfig.contractSubscriptionsRetryDelaySeconds,
       walletConfiguration: {
         type: WalletType.awsKms,
         awsRegion,

src/schema/config.ts

@@ -0,0 +1,36 @@
+import { Configuration } from "@prisma/client";
+import { WalletType } from "./wallet";
+
+export interface Config
+  extends Omit<
+    Configuration,
+    | "awsAccessKeyId"
+    | "awsSecretAccessKey"
+    | "awsRegion"
+    | "gcpApplicationProjectId"
+    | "gcpKmsLocationId"
+    | "gcpKmsKeyRingId"
+    | "gcpApplicationCredentialEmail"
+    | "gcpApplicationCredentialPrivateKey"
+    | "contractSubscriptionsRetryDelaySeconds"
+  > {
+  walletConfiguration:
+    | {
+        type: WalletType.local;
+      }
+    | {
+        type: WalletType.awsKms;
+        awsAccessKeyId: string;
+        awsSecretAccessKey: string;
+        awsRegion: string;
+      }
+    | {
+        type: WalletType.gcpKms;
+        gcpApplicationProjectId: string;
+        gcpKmsLocationId: string;
+        gcpKmsKeyRingId: string;
+        gcpApplicationCredentialEmail: string;
+        gcpApplicationCredentialPrivateKey: string;
+      };
+  contractSubscriptionsRequeryDelaySeconds: string;
+}

src/server/routes/configuration/contract-subscriptions/get.ts

@@ -1,17 +1,21 @@
-import { Static } from "@sinclair/typebox";
+import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
 import { getConfig } from "../../../../utils/cache/getConfig";
 import {
-  contractSubscriptionResponseSchema,
+  contractSubscriptionConfigurationSchema,
   standardResponseSchema,
 } from "../../../schemas/sharedApiSchemas";
 
+const responseSchema = Type.Object({
+  result: contractSubscriptionConfigurationSchema,
+});
+
 export async function getContractSubscriptionsConfiguration(
   fastify: FastifyInstance,
 ) {
   fastify.route<{
-    Reply: Static<typeof contractSubscriptionResponseSchema>;
+    Reply: Static<typeof responseSchema>;
   }>({
     method: "GET",
     url: "/configuration/contract-subscriptions",
@@ -22,7 +26,7 @@ export async function getContractSubscriptionsConfiguration(
       operationId: "getContractSubscriptionsConfiguration",
       response: {
         ...standardResponseSchema,
-        [StatusCodes.OK]: contractSubscriptionResponseSchema,
+        [StatusCodes.OK]: responseSchema,
       },
     },
     handler: async (req, res) => {
@@ -31,7 +35,7 @@ export async function getContractSubscriptionsConfiguration(
         result: {
           maxBlocksToIndex: config.maxBlocksToIndex,
           contractSubscriptionsRequeryDelaySeconds:
-            config.contractSubscriptionsRetryDelaySeconds,
+            config.contractSubscriptionsRequeryDelaySeconds,
         },
       });
     },

src/server/routes/configuration/contract-subscriptions/update.ts

@@ -5,20 +5,24 @@ import { updateConfiguration } from "../../../../db/configuration/updateConfigur
 import { getConfig } from "../../../../utils/cache/getConfig";
 import { createCustomError } from "../../../middleware/error";
 import {
-  contractSubscriptionResponseSchema,
+  contractSubscriptionConfigurationSchema,
   standardResponseSchema,
 } from "../../../schemas/sharedApiSchemas";
 
-const BodySchema = Type.Object({
+const requestBodySchema = Type.Object({
   maxBlocksToIndex: Type.Optional(Type.Number({ minimum: 1, maximum: 25 })),
   contractSubscriptionsRequeryDelaySeconds: Type.Optional(Type.String()),
 });
 
+const responseSchema = Type.Object({
+  result: contractSubscriptionConfigurationSchema,
+});
+
 export async function updateContractSubscriptionsConfiguration(
   fastify: FastifyInstance,
 ) {
   fastify.route<{
-    Body: Static<typeof BodySchema>;
+    Body: Static<typeof requestBodySchema>;
   }>({
     method: "POST",
     url: "/configuration/contract-subscriptions",
@@ -27,10 +31,10 @@ export async function updateContractSubscriptionsConfiguration(
       description: "Update the configuration for Contract Subscriptions",
       tags: ["Configuration"],
       operationId: "updateContractSubscriptionsConfiguration",
-      body: BodySchema,
+      body: requestBodySchema,
       response: {
         ...standardResponseSchema,
-        [StatusCodes.OK]: contractSubscriptionResponseSchema,
+        [StatusCodes.OK]: responseSchema,
       },
     },
     handler: async (req, res) => {
@@ -72,7 +76,7 @@ export async function updateContractSubscriptionsConfiguration(
         result: {
           maxBlocksToIndex: config.maxBlocksToIndex,
           contractSubscriptionsRequeryDelaySeconds:
-            config.contractSubscriptionsRetryDelaySeconds,
+            config.contractSubscriptionsRequeryDelaySeconds,
         },
       });
     },

src/server/schemas/sharedApiSchemas.ts

@@ -333,9 +333,7 @@ export const walletDetailsSchema = Type.Object({
   ]),
 });
 
-export const contractSubscriptionResponseSchema = Type.Object({
-  result: Type.Object({
-    maxBlocksToIndex: Type.Number(),
-    contractSubscriptionsRequeryDelaySeconds: Type.String(),
-  }),
+export const contractSubscriptionConfigurationSchema = Type.Object({
+  maxBlocksToIndex: Type.Number(),
+  contractSubscriptionsRequeryDelaySeconds: Type.String(),
 });

src/utils/cache/getConfig.ts

@@ -1,40 +1,7 @@
-import { Configuration } from "@prisma/client";
 import { getConfiguration } from "../../db/configuration/getConfiguration";
-import { WalletType } from "../../schema/wallet";
+import { Config } from "../../schema/config";
 
 const cacheKey = "config";
-interface Config
-  extends Omit<
-    Configuration,
-    | "awsAccessKeyId"
-    | "awsSecretAccessKey"
-    | "awsRegion"
-    | "gcpApplicationProjectId"
-    | "gcpKmsLocationId"
-    | "gcpKmsKeyRingId"
-    | "gcpApplicationCredentialEmail"
-    | "gcpApplicationCredentialPrivateKey"
-  > {
-  walletConfiguration:
-    | {
-        type: WalletType.local;
-      }
-    | {
-        type: WalletType.awsKms;
-        awsAccessKeyId: string;
-        awsSecretAccessKey: string;
-        awsRegion: string;
-      }
-    | {
-        type: WalletType.gcpKms;
-        gcpApplicationProjectId: string;
-        gcpKmsLocationId: string;
-        gcpKmsKeyRingId: string;
-        gcpApplicationCredentialEmail: string;
-        gcpApplicationCredentialPrivateKey: string;
-      };
-}
-
 export const configCache = new Map<string, Config>();
 
 export const getConfig = async (retrieveFromCache = true): Promise<Config> => {
@@ -51,7 +18,6 @@ export const getConfig = async (retrieveFromCache = true): Promise<Config> => {
   }
 
   const configData = await getConfiguration();
-
   configCache.set(cacheKey, configData);
   return configData;
 };

src/worker/queues/processEventLogsQueue.ts

@@ -32,8 +32,8 @@ export const enqueueProcessEventLogs = async (
   const serialized = SuperJSON.stringify(data);
   // e.g. 8453:14423125-14423685
   const jobName = `${data.chainId}:${data.fromBlock}-${data.toBlock}`;
-  const { contractSubscriptionsRetryDelaySeconds } = await getConfig();
-  const requeryDelays = contractSubscriptionsRetryDelaySeconds.split(",");
+  const { contractSubscriptionsRequeryDelaySeconds } = await getConfig();
+  const requeryDelays = contractSubscriptionsRequeryDelaySeconds.split(",");
 
   // Enqueue one job immediately and any delayed jobs.
   await _queue.add(jobName, serialized);

src/worker/queues/processTransactionReceiptsQueue.ts

@@ -33,8 +33,8 @@ export const enqueueProcessTransactionReceipts = async (
   const serialized = SuperJSON.stringify(data);
   // e.g. 8453:14423125-14423685
   const jobName = `${data.chainId}:${data.fromBlock}-${data.toBlock}`;
-  const { contractSubscriptionsRetryDelaySeconds } = await getConfig();
-  const requeryDelays = contractSubscriptionsRetryDelaySeconds.split(",");
+  const { contractSubscriptionsRequeryDelaySeconds } = await getConfig();
+  const requeryDelays = contractSubscriptionsRequeryDelaySeconds.split(",");
 
   // Enqueue one job immediately and any delayed jobs.
   await _queue.add(jobName, serialized);