Use cancelledAt field for transaction cancellation instead of separat…

…e table (#210) * Remove extra table for transaction cancellation * Add drop table migration
thirdweb-dev · Oct 10, 2023 · 1eef23b · 1eef23b
1 parent f5c6ae0
commit 1eef23b
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 101 deletions.
diff --git a/server/utilities/transaction.ts b/server/utilities/transaction.ts
@@ -2,7 +2,6 @@ import { TransactionResponse } from "@ethersproject/abstract-provider";
 import { getDefaultGasOverrides } from "@thirdweb-dev/sdk";
 import { BigNumber } from "ethers";
 import { StatusCodes } from "http-status-codes";
-import { createCancelledTxData } from "../../src/db/cancelledTransactions/createCancelledTxData";
 import { getTxById } from "../../src/db/transactions/getTxById";
 import { updateTx } from "../../src/db/transactions/updateTx";
 import { createCustomError } from "../middleware/error";
@@ -43,17 +42,9 @@ export const cancelTransactionAndUpdate = async ({
       );
       break;
     case TransactionStatusEnum.Queued:
-    case TransactionStatusEnum.Processed:
-      await createCancelledTxData({
-        queueId,
-      });
-
       await updateTx({
         queueId,
         status: TransactionStatusEnum.Cancelled,
-        txData: {
-          cancelledAt: new Date(),
-        },
       });
       message = "Transaction cancelled on-database successfully.";
       break;
@@ -64,6 +55,7 @@ export const cancelTransactionAndUpdate = async ({
         "TransactionAlreadyMined",
       );
       break;
+    case TransactionStatusEnum.Processed:
     case TransactionStatusEnum.Submitted: {
       const sdk = await getSdk({
         chainId: txData.chainId!,
@@ -80,6 +72,7 @@ export const cancelTransactionAndUpdate = async ({
           "Transaction already mined. Cannot cancel transaction on-chain.";
         break;
       }
+
       const gasOverrides = await getDefaultGasOverrides(sdk.getProvider());
       transferTransactionResult = await sdk.wallet.sendRawTransaction({
         to: txData.fromAddress!,

diff --git a/src/db/cancelledTransactions/checkIfTxCancelled.ts b/src/db/cancelledTransactions/checkIfTxCancelled.ts
diff --git a/src/db/cancelledTransactions/createCancelledTxData.ts b/src/db/cancelledTransactions/createCancelledTxData.ts
diff --git a/src/db/cancelledTransactions/updateCancelStatus.ts b/src/db/cancelledTransactions/updateCancelStatus.ts
diff --git a/src/db/transactions/updateTx.ts b/src/db/transactions/updateTx.ts
@@ -80,7 +80,6 @@ export const updateTx = async ({
           id: queueId,
         },
         data: {
-          // TODO: minedAt will always get overwritten in blockchainReader.ts
           minedAt: new Date(),
           ...txData,
         },
@@ -92,12 +91,7 @@ export const updateTx = async ({
           id: queueId,
         },
         data: {
-          transactionHash: res?.hash,
-          transactionType: res?.type,
-          gasPrice: res?.gasPrice?.toString(),
-          gasLimit: res?.gasLimit?.toString(),
-          maxFeePerGas: res?.maxFeePerGas?.toString(),
-          maxPriorityFeePerGas: res?.maxPriorityFeePerGas?.toString(),
+          cancelledAt: new Date(),
           ...txData,
         },
       });

diff --git a/src/prisma/migrations/20231010225604_remove_cancelled_txs/migration.sql b/src/prisma/migrations/20231010225604_remove_cancelled_txs/migration.sql
@@ -0,0 +1,8 @@
+/*
+  Warnings:
+
+  - You are about to drop the `cancelled_transactions` table. If the table is not empty, all the data it contains will be lost.
+
+*/
+-- DropTable
+DROP TABLE "cancelled_transactions";
diff --git a/src/prisma/schema.prisma b/src/prisma/schema.prisma
@@ -88,10 +88,3 @@ model Transactions {
 
   @@map("transactions")
 }
-
-model CancelledTransactions {
-  queueId             String    @id @map("queueId")
-  cancelledByWorkerAt DateTime? @map("cancelledByWorkerAt")
-
-  @@map("cancelled_transactions")
-}
diff --git a/src/worker/tasks/processTx.ts b/src/worker/tasks/processTx.ts
@@ -8,8 +8,6 @@ import {
   transactionResponseSchema,
 } from "../../../server/schemas/transaction";
 import { getSdk } from "../../../server/utils/cache/getSdk";
-import { checkIfIDCancelled } from "../../db/cancelledTransactions/checkIfTxCancelled";
-import { updateCancelStatus } from "../../db/cancelledTransactions/updateCancelStatus";
 import { prisma } from "../../db/client";
 import { getQueuedTxs } from "../../db/transactions/getQueuedTxs";
 import { updateTx } from "../../db/transactions/updateTx";
@@ -47,21 +45,10 @@ export const processTx = async () => {
         const txsToSend = [];
         const userOpsToSend = [];
         for (const tx of txs) {
-          const cancelled = await checkIfIDCancelled({
-            queueId: tx.queueId!,
-          });
-
-          if (cancelled) {
+          if (tx.cancelledAt) {
             logger.worker.info(
               `[Transaction] [${tx.queueId}] Cancelled by user`,
             );
-
-            if (!cancelled.cancelledByWorkerAt) {
-              await updateCancelStatus({
-                queueId: tx.queueId!,
-              });
-            }
-
             continue;
           }