Add updated transaction receipt (#317)

Author: adam-maj

src/db/transactions/updateTx.ts

@@ -22,7 +22,8 @@ type UpdateTxData =
     }
   | {
       status: TransactionStatusEnum.Submitted;
-      res: ethers.providers.TransactionResponse;
+      transactionHash: string;
+      res: ethers.providers.TransactionResponse | null;
       sentAtBlockNumber: number;
       retryCount?: number;
     }
@@ -41,6 +42,7 @@ type UpdateTxData =
       gasLimit?: string;
       maxFeePerGas?: string;
       maxPriorityFeePerGas?: string;
+      nonce?: number;
     };
 
 export const updateTx = async ({ pgtx, queueId, data }: UpdateTxParams) => {
@@ -83,15 +85,15 @@ export const updateTx = async ({ pgtx, queueId, data }: UpdateTxParams) => {
         },
         data: {
           sentAt: new Date(),
-          nonce: data.res.nonce,
-          transactionHash: data.res.hash,
-          transactionType: data.res.type || undefined,
-          gasPrice: data.res.gasPrice?.toString(),
-          gasLimit: data.res.gasLimit?.toString(),
-          maxFeePerGas: data.res.maxFeePerGas?.toString(),
-          maxPriorityFeePerGas: data.res.maxPriorityFeePerGas?.toString(),
+          transactionHash: data.transactionHash,
           sentAtBlockNumber: data.sentAtBlockNumber,
           retryCount: data.retryCount,
+          nonce: data.res?.nonce,
+          transactionType: data.res?.type || undefined,
+          gasPrice: data.res?.gasPrice?.toString(),
+          gasLimit: data.res?.gasLimit?.toString(),
+          maxFeePerGas: data.res?.maxFeePerGas?.toString(),
+          maxPriorityFeePerGas: data.res?.maxPriorityFeePerGas?.toString(),
         },
       });
       break;
@@ -113,14 +115,15 @@ export const updateTx = async ({ pgtx, queueId, data }: UpdateTxParams) => {
         },
         data: {
           minedAt: data.minedAt,
-          gasPrice: data.gasPrice,
           blockNumber: data.blockNumber,
           onChainTxStatus: data.onChainTxStatus,
           transactionHash: data.transactionHash,
           transactionType: data.transactionType,
+          gasPrice: data.gasPrice,
           gasLimit: data.gasLimit,
           maxFeePerGas: data.maxFeePerGas,
           maxPriorityFeePerGas: data.maxPriorityFeePerGas,
+          nonce: data.nonce,
         },
       });
       break;

src/worker/tasks/processTx.ts

@@ -26,9 +26,10 @@ import { randomNonce } from "../utils/nonce";
 
 type SentTxStatus =
   | {
+      transactionHash: string;
       status: TransactionStatusEnum.Submitted;
       queueId: string;
-      res: ethers.providers.TransactionResponse;
+      res: ethers.providers.TransactionResponse | null;
       sentAtBlockNumber: number;
     }
   | {
@@ -233,11 +234,23 @@ export const processTx = async () => {
               const tx = txsToSend[i];
               if (rpcRes.result) {
                 const txHash = rpcRes.result;
-                const txRes = await provider.getTransaction(txHash);
+
+                const txRes = (await provider.getTransaction(
+                  txHash,
+                )) as ethers.providers.TransactionResponse | null;
+
                 logger.worker.info(
-                  `[Transaction] [${tx.queueId}] Sent tx ${txHash}, with Nonce ${txRes.nonce}`,
+                  `[Transaction] [${tx.queueId}] Sent transaction with hash ${txHash}`,
                 );
+
+                if (!!txRes) {
+                  logger.worker.debug(
+                    `[Transaction] [${tx.queueId}] Using nonce ${txRes.nonce}`,
+                  );
+                }
+
                 return {
+                  transactionHash: txHash,
                   status: TransactionStatusEnum.Submitted,
                   queueId: tx.queueId!,
                   res: txRes,
@@ -274,6 +287,7 @@ export const processTx = async () => {
                     queueId: tx.queueId,
                     data: {
                       status: TransactionStatusEnum.Submitted,
+                      transactionHash: tx.transactionHash,
                       res: tx.res,
                       sentAtBlockNumber: await provider.getBlockNumber(),
                     },

src/worker/tasks/updateMinedTx.ts

@@ -34,6 +34,12 @@ export const updateMinedTx = async () => {
                 return undefined;
               }
 
+              const response = (await sdk
+                .getProvider()
+                .getTransaction(
+                  tx.transactionHash!,
+                )) as ethers.providers.TransactionResponse | null;
+
               // Get the timestamp when the transaction was mined
               const minedAt = new Date(
                 (
@@ -47,6 +53,7 @@ export const updateMinedTx = async () => {
               return {
                 tx,
                 receipt,
+                response,
                 minedAt,
               };
             }),
@@ -57,6 +64,7 @@ export const updateMinedTx = async () => {
         }) as {
           tx: Transactions;
           receipt: ethers.providers.TransactionReceipt;
+          response: ethers.providers.TransactionResponse;
           minedAt: Date;
         }[];
 
@@ -68,12 +76,20 @@ export const updateMinedTx = async () => {
               queueId: txWithReceipt.tx.id,
               data: {
                 status: TransactionStatusEnum.Mined,
-                gasPrice: txWithReceipt.receipt.effectiveGasPrice.toString(),
-                blockNumber: txWithReceipt.receipt.blockNumber,
                 minedAt: txWithReceipt.minedAt,
+                blockNumber: txWithReceipt.receipt.blockNumber,
                 onChainTxStatus: txWithReceipt.receipt.status,
+                transactionHash: txWithReceipt.receipt.transactionHash,
+                transactionType: txWithReceipt.receipt.type,
+                gasPrice: txWithReceipt.receipt.effectiveGasPrice.toString(),
+                gasLimit: txWithReceipt.response?.gasLimit?.toString(),
+                maxFeePerGas: txWithReceipt.response?.maxFeePerGas?.toString(),
+                maxPriorityFeePerGas:
+                  txWithReceipt.response?.maxPriorityFeePerGas?.toString(),
+                nonce: txWithReceipt.response?.nonce,
               },
             });
+
             logger.worker.info(
               `[Transaction] [${txWithReceipt.tx.id}] Updated with receipt`,
             );