Merge pull request #56 from nervosnetwork/fix-null-tx

fix: Process null tx with status
godwokenrises · Aug 20, 2021 · 5ecf488 · 5ecf488
2 parents 8ebcfd9 + 47cf645
commit 5ecf488
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/packages/api-server/src/methods/modules/eth.ts b/packages/api-server/src/methods/modules/eth.ts
@@ -566,6 +566,9 @@ export class Eth {
 
     // if null, find pending transactions
     const godwokenTxWithStatus = await this.rpc.getTransaction(txHash);
+    if (godwokenTxWithStatus == null) {
+      return null;
+    }
     const godwokenTxReceipt = await this.rpc.getTransactionReceipt(txHash);
     const tipBlock = await this.query.getTipBlock();
     if (tipBlock == null) {
@@ -653,6 +656,9 @@ export class Eth {
     }
 
     const godwokenTxWithStatus = await this.rpc.getTransaction(txHash);
+    if (godwokenTxWithStatus == null) {
+      return null;
+    }
     const godwokenTxReceipt = await this.rpc.getTransactionReceipt(txHash);
     if (godwokenTxReceipt == null) {
       return null;

diff --git a/packages/godwoken/src/client.ts b/packages/godwoken/src/client.ts
@@ -126,7 +126,9 @@ export class GodwokenClient {
     return await this.rpcCall("submit_l2transaction", data);
   }
 
-  public async getTransaction(hash: Hash): Promise<L2TransactionWithStatus> {
+  public async getTransaction(
+    hash: Hash
+  ): Promise<L2TransactionWithStatus | undefined> {
     return await this.rpcCall("get_transaction", hash);
   }