chore: 7 day prune, expose UID in sig prepare (#570)

* chore: 7 day prune, expose UID in sig prepare

* accept number env var

* remove console log

Author: arcoraven

src/server/routes/contract/extensions/erc721/read/signaturePrepare.ts

@@ -35,7 +35,7 @@ import { checkAndReturnNFTSignaturePayload } from "../../../../../utils/validato
 
 // INPUTS
 const requestSchema = erc721ContractParamSchema;
-const requestBodySchema = Type.Omit(signature721InputSchema, ["uid"]);
+const requestBodySchema = signature721InputSchema;
 
 // OUTPUT
 const responseSchema = Type.Object({
@@ -213,6 +213,7 @@ export async function erc721SignaturePrepare(fastify: FastifyInstance) {
         quantity,
         royaltyBps,
         royaltyRecipient,
+        uid,
       } = request.body;
 
       const chainId = await getChainIdFromChain(chain);
@@ -245,7 +246,7 @@ export async function erc721SignaturePrepare(fastify: FastifyInstance) {
       const parsed = await Signature721WithQuantityInput.parseAsync(payload);
       const mintPayload = {
         ...parsed,
-        uid: generateUid(),
+        uid: uid ?? generateUid(),
         uri,
         royaltyBps: BigNumber.from(parsed.royaltyBps),
       };

src/utils/env.ts

@@ -61,7 +61,13 @@ export const env = createEnv({
     ENABLE_HTTPS: boolSchema("false"),
     HTTPS_PASSPHRASE: z.string().default("thirdweb-engine"),
     TRUST_PROXY: z.boolean().default(false),
-    PRUNE_TRANSACTIONS: boolSchema("true"),
+    PRUNE_TRANSACTIONS: z
+      .union([
+        z.literal("true").transform(() => 7),
+        z.literal("false").transform(() => 0),
+        z.coerce.number().int(),
+      ])
+      .default(7),
     CLIENT_ANALYTICS_URL: z
       .union([UrlSchema, z.literal("")])
       .default("https://c.thirdweb.com/event"),

src/worker/index.ts

@@ -3,7 +3,7 @@ import {
   newConfigurationListener,
   updatedConfigurationListener,
 } from "./listeners/configListener";
-import { deleteProcessedTx } from "./listeners/deleteProcessedTx";
+import { pruneCompletedTransactions } from "./listeners/deleteProcessedTx";
 import { minedTxListener } from "./listeners/minedTxListener";
 import { queuedTxListener } from "./listeners/queuedTxListener";
 import { retryTxListener } from "./listeners/retryTxListener";
@@ -25,8 +25,8 @@ export const initWorker = async () => {
   // Poll for mined transactions to update database
   await minedTxListener();
 
-  // Delete Successfully Processed Transactions which are older than 24 hours
-  await deleteProcessedTx();
+  // Delete completed transactions after some age.
+  await pruneCompletedTransactions();
 
   // Listen for new & updated configuration data
   await newConfigurationListener();

src/worker/listeners/deleteProcessedTx.ts

@@ -4,11 +4,10 @@ import { deleteTx } from "../tasks/deleteTx";
 
 const CLEAR_QUEUED_TX_CRON_SCHEDULE = "0 0 */2 * * *";
 
-// Deletes successfully processed transactions which were queued 24 hrs ago.
-export const deleteProcessedTx = async () => {
-  cron.schedule(CLEAR_QUEUED_TX_CRON_SCHEDULE, async () => {
-    if (env.PRUNE_TRANSACTIONS) {
-      await deleteTx();
-    }
-  });
+export const pruneCompletedTransactions = async () => {
+  if (env.PRUNE_TRANSACTIONS > 0) {
+    cron.schedule(CLEAR_QUEUED_TX_CRON_SCHEDULE, async () => {
+      await deleteTx(env.PRUNE_TRANSACTIONS);
+    });
+  }
 };

src/worker/tasks/deleteTx.ts

@@ -1,31 +1,22 @@
 import { prisma } from "../../db/client";
 import { logger } from "../../utils/logger";
 
-export const deleteTx = async () => {
+export const deleteTx = async (maxAgeDays: number) => {
   try {
-    const twentyFourHoursAgo = new Date();
-    twentyFourHoursAgo.setHours(twentyFourHoursAgo.getHours() - 24);
+    const deleteBefore = new Date();
+    deleteBefore.setDate(deleteBefore.getDate() - maxAgeDays);
 
     const deletedItems = await prisma.transactions.deleteMany({
       where: {
-        // All txs queued 24+ hours ago that are mined, cancelled, or errored.
         AND: [
           {
-            queuedAt: {
-              lt: twentyFourHoursAgo,
-            },
+            queuedAt: { lt: deleteBefore },
           },
           {
             OR: [
-              {
-                minedAt: { not: null },
-              },
-              {
-                cancelledAt: { not: null },
-              },
-              {
-                errorMessage: { not: null },
-              },
+              { minedAt: { not: null } },
+              { cancelledAt: { not: null } },
+              { errorMessage: { not: null } },
             ],
           },
         ],