Update accuracy of sentAt timing (#353)

* Improve accuracy of sentAt

* Update

* undo

Author: adam-maj

src/db/transactions/updateTx.ts

@@ -22,13 +22,15 @@ type UpdateTxData =
     }
   | {
       status: TransactionStatusEnum.Submitted;
+      sentAt: Date;
       transactionHash: string;
       res: ethers.providers.TransactionResponse | null;
       sentAtBlockNumber: number;
       retryCount?: number;
     }
   | {
       status: TransactionStatusEnum.UserOpSent;
+      sentAt: Date;
       userOpHash: string;
     }
   | {
@@ -84,7 +86,7 @@ export const updateTx = async ({ pgtx, queueId, data }: UpdateTxParams) => {
           id: queueId,
         },
         data: {
-          sentAt: new Date(),
+          sentAt: data.sentAt,
           transactionHash: data.transactionHash,
           sentAtBlockNumber: data.sentAtBlockNumber,
           retryCount: data.retryCount,
@@ -103,7 +105,7 @@ export const updateTx = async ({ pgtx, queueId, data }: UpdateTxParams) => {
           id: queueId,
         },
         data: {
-          sentAt: new Date(),
+          sentAt: data.sentAt,
           userOpHash: data.userOpHash,
         },
       });

src/worker/tasks/processTx.ts

@@ -29,6 +29,7 @@ import { getWithdrawalValue } from "../utils/withdraw";
 type SentTxStatus =
   | {
       transactionHash: string;
+      sentAt: Date;
       status: TransactionStatusEnum.Submitted;
       queueId: string;
       res: ethers.providers.TransactionResponse | null;
@@ -205,13 +206,13 @@ export const processTx = async () => {
               queueId: string;
               tx: ethers.providers.TransactionRequest;
               res: RpcResponse;
+              sentAt: Date;
             }[] = [];
             for (const tx of txsToSend) {
               const nonce = startNonce.add(sentTxCount);
 
               try {
                 let value: ethers.BigNumberish = tx.value!;
-
                 if (tx.extension === "withdraw") {
                   value = await getWithdrawalValue({
                     provider,
@@ -299,6 +300,7 @@ export const processTx = async () => {
                   queueId: tx.queueId!,
                   tx: txRequest,
                   res: rpcResponse,
+                  sentAt: new Date(),
                 });
 
                 if (!rpcResponse.error && !!rpcResponse.result) {
@@ -342,7 +344,7 @@ export const processTx = async () => {
 
             // Update transaction records with updated data
             const txStatuses: SentTxStatus[] = await Promise.all(
-              rpcResponses.map(async ({ queueId, tx, res }) => {
+              rpcResponses.map(async ({ queueId, tx, res, sentAt }) => {
                 if (res.result) {
                   const txHash = res.result;
                   const txRes = (await provider.getTransaction(
@@ -357,6 +359,7 @@ export const processTx = async () => {
                   });
 
                   return {
+                    sentAt,
                     transactionHash: txHash,
                     status: TransactionStatusEnum.Submitted,
                     queueId: queueId,
@@ -393,6 +396,7 @@ export const processTx = async () => {
                       pgtx,
                       queueId: tx.queueId,
                       data: {
+                        sentAt: tx.sentAt,
                         status: TransactionStatusEnum.Submitted,
                         transactionHash: tx.transactionHash,
                         res: tx.res,
@@ -462,13 +466,15 @@ export const processTx = async () => {
             const userOpHash = await signer.smartAccountAPI.getUserOpHash(
               userOp,
             );
+
             await signer.httpRpcClient.sendUserOpToBundler(userOp);
 
             // TODO: Need to update with other user op data
             await updateTx({
               pgtx,
               queueId: tx.queueId!,
               data: {
+                sentAt: new Date(),
                 status: TransactionStatusEnum.UserOpSent,
                 userOpHash,
               },

src/worker/tasks/retryTx.ts

@@ -72,6 +72,7 @@ export const retryTx = async () => {
           message: `Retrying with nonce ${tx.nonce}`,
         });
 
+        const sentAt = new Date();
         let res: ethers.providers.TransactionResponse;
         try {
           res = await sdk.getSigner()!.sendTransaction({
@@ -113,6 +114,7 @@ export const retryTx = async () => {
           pgtx,
           queueId: tx.id,
           data: {
+            sentAt,
             status: TransactionStatusEnum.Submitted,
             res,
             sentAtBlockNumber: await sdk.getProvider().getBlockNumber(),