fix: don't mark tx as REVERTED when in block, check tx receipt status…

… instead. * fixes decentraland#81
tmilar · Sep 1, 2020 · b74a133 · b74a133
1 parent 5c6c262
commit b74a133
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/modules/transaction/txUtils.ts b/src/modules/transaction/txUtils.ts
@@ -83,11 +83,21 @@ export async function getTransaction(
 
   const receipt = await eth.getTransactionReceipt(hash)
 
+  if (receipt == null) {
+    // pending (in block, but not yet mined)
+    const tx: PendingTransaction = {
+      status: TransactionStatus.PENDING,
+      ...response
+    }
+    return tx
+  }
+
   // reverted
-  if (receipt == null || !receipt.status) {
+  if (!receipt.status) {
     const tx: RevertedTransaction = {
       status: TransactionStatus.REVERTED,
-      ...response
+      ...response,
+      receipt
     }
     return tx
   }

diff --git a/src/modules/transaction/types.ts b/src/modules/transaction/types.ts
@@ -33,6 +33,7 @@ export type PendingTransaction = TransactionResponse & {
 
 export type RevertedTransaction = TransactionResponse & {
   status: TransactionStatus.REVERTED
+  receipt: TransactionReceipt
 }
 
 export type ConfirmedTransaction = TransactionResponse & {