fix(rabbitmq): 🐛 Remove the stale message logic, it was useless and p…

…otentially broken
bcnmy · Jan 25, 2025 · a21a078 · a21a078
1 parent 9ebc2c1
commit a21a078
Showing 14 changed files with 0 additions and 94 deletions.
diff --git a/config/default.json b/config/default.json
@@ -1116,10 +1116,6 @@
     "maxBlockWait": 26,
     "supportedNetworks": []
   },
-  "clearStaleMessages": {
-    "supportedNetworks": [1, 11155111],
-    "ttlSeconds": 3600
-  },
   "isTWSetup": false,
   "redisCluster": {
     "port": 6379,

diff --git a/src/common/queue/BundlerTransactionQueue.ts b/src/common/queue/BundlerTransactionQueue.ts
@@ -3,7 +3,6 @@ import { logger } from "../logger";
 import { SendUserOperation, TransactionType } from "../types";
 import { IQueue } from "./interface/IQueue";
 import { customJSONStringify } from "../utils";
-import { shouldDiscardStaleMessage } from "./queueUtils";
 
 const log = logger.child({
   module: module.filename.split("/").slice(-4).join("/"),
@@ -67,11 +66,6 @@ export class BundlerTransactionQueue implements IQueue<SendUserOperation> {
     _log.info(`BundlerTransactionQueue:: Publishing data to retry queue`);
 
     try {
-      if (shouldDiscardStaleMessage(this.chainId, data, Date.now())) {
-        _log.warn(`BundlerTransactionQueue:: Discarding message because it's stale`);
-        return true;
-      }
-
       this.channel.publish(
         this.exchangeName,
         key,

diff --git a/src/common/queue/RetryTransactionHandlerQueue.ts b/src/common/queue/RetryTransactionHandlerQueue.ts
@@ -4,7 +4,6 @@ import { logger } from "../logger";
 import { IQueue } from "./interface/IQueue";
 import { RetryTransactionQueueData } from "./types";
 import { customJSONStringify } from "../utils";
-import { shouldDiscardStaleMessage } from "./queueUtils";
 
 const log = logger.child({
   module: module.filename.split("/").slice(-4).join("/"),
@@ -84,11 +83,6 @@ export class RetryTransactionHandlerQueue
     _log.info({ data }, `RetryTransactionHandlerQueue:: Publishing data to retry queue`);
 
     try {
-      if (shouldDiscardStaleMessage(this.chainId, data, Date.now())) {
-        _log.warn(`RetryTransactionHandlerQueue:: Discarding message because it's stale`);
-        return true;
-      }
-
       if (this.channel) {
         this.channel.publish(
           this.exchangeName,

diff --git a/src/common/queue/queueUtils.test.ts b/src/common/queue/queueUtils.test.ts
diff --git a/src/common/queue/queueUtils.ts b/src/common/queue/queueUtils.ts
diff --git a/src/common/queue/types/index.ts b/src/common/queue/types/index.ts
@@ -13,5 +13,4 @@ export type RetryTransactionQueueData = {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   metaData: any;
   relayerManagerName: string;
-  timestamp?: number;
 };
diff --git a/src/common/relay-service/BundlerRelayService.ts b/src/common/relay-service/BundlerRelayService.ts
@@ -22,10 +22,6 @@ export class BundlerRelayService implements IRelayService<SendUserOperation> {
   async sendUserOperation(
     data: SendUserOperation,
   ): Promise<RelayServiceResponseType> {
-    if (!data.timestamp) {
-      data.timestamp = Date.now();
-    }
-
     const _log = log.child({
       sendUserOperation: data,
     });

diff --git a/src/common/types/index.ts b/src/common/types/index.ts
@@ -94,7 +94,6 @@ export type SendUserOperation = {
   transactionId: string;
   userOp?: UserOperationType | UserOperationStruct;
   walletAddress?: string;
-  timestamp?: number;
 };
 
 type ResponseType = {

diff --git a/src/relayer/relayer-manager/EVMRelayerManager.ts b/src/relayer/relayer-manager/EVMRelayerManager.ts
@@ -527,7 +527,6 @@ export class EVMRelayerManager
               ...rawTx,
               transactionId,
               walletAddress: "",
-              timestamp: Date.now(),
             },
             this.ownerAccountDetails,
             TransactionType.FUNDING,

diff --git a/src/relayer/transaction-listener/EVMTransactionListener.ts b/src/relayer/transaction-listener/EVMTransactionListener.ts
@@ -105,7 +105,6 @@ export class EVMTransactionListener
       metaData,
       relayerManagerName,
       previousTransactionHash,
-      timestamp,
     } = notifyTransactionListenerParams;
 
     const _log = log.child({
@@ -167,7 +166,6 @@ export class EVMTransactionListener
         walletAddress,
         metaData,
         relayerManagerName,
-        timestamp,
       });
     } catch (publishToRetryTransactionQueueError) {
       _log.error(

diff --git a/src/relayer/transaction-listener/types/index.ts b/src/relayer/transaction-listener/types/index.ts
@@ -45,7 +45,6 @@ export type NotifyTransactionListenerParamsType = {
   metaData?: any;
   relayerManagerName: string;
   error?: string;
-  timestamp?: number;
 };
 
 export type OnTransactionSuccessParamsType =

diff --git a/src/relayer/transaction-service/EVMTransactionService.ts b/src/relayer/transaction-service/EVMTransactionService.ts
@@ -118,7 +118,6 @@ export class EVMTransactionService
       transactionId,
       walletAddress,
       metaData,
-      timestamp,
     } = transactionData;
 
     const retryTransactionCount = parseInt(
@@ -234,7 +233,6 @@ export class EVMTransactionService
           walletAddress,
           metaData,
           relayerManagerName,
-          timestamp,
         });
 
       if (transactionType === TransactionType.FUNDING) {
@@ -344,7 +342,6 @@ export class EVMTransactionService
       walletAddress,
       metaData,
       relayerManagerName,
-      timestamp,
     } = retryTransactionData;
 
     const _log = log.child({
@@ -424,7 +421,6 @@ export class EVMTransactionService
           walletAddress,
           metaData,
           relayerManagerName,
-          timestamp,
         });
 
       _log.info(

diff --git a/src/relayer/transaction-service/types/index.ts b/src/relayer/transaction-service/types/index.ts
@@ -42,7 +42,6 @@ export type TransactionDataType = {
   metaData?: {
     dappAPIKey: string;
   };
-  timestamp?: number;
 };
 
 export type ErrorTransactionResponseType = {

diff --git a/src/server/api/v2/eth_sendUserOperation/handler.ts b/src/server/api/v2/eth_sendUserOperation/handler.ts
@@ -122,7 +122,6 @@ export const eth_sendUserOperation = async (req: Request, res: Response) => {
         userOp,
         transactionId,
         walletAddress,
-        timestamp: Date.now(),
       });
 
       if (isError(response)) {