Merge branch 'main' into fix-ci-deployment

Concordium · Aug 8, 2023 · 1a0803b · 1a0803b
2 parents 59a32c0 + 6047bd3
commit 1a0803b
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/packages/common/src/GRPCClient.ts b/packages/common/src/GRPCClient.ts
@@ -528,17 +528,19 @@ export class ConcordiumGRPCClient {
                 }, timeoutTime);
             }
 
-            const blockStream = this.getFinalizedBlocks(abortController.signal);
-
-            const response = await this.getBlockItemStatus(transactionHash);
-            if (response.status === 'finalized') {
-                // Simply doing `abortController.abort()` causes an error.
-                // See: https://github.com/grpc/grpc-node/issues/1652
-                setTimeout(() => abortController.abort(), 0);
-                return resolve(response.outcome);
-            }
-
             try {
+                const blockStream = this.getFinalizedBlocks(
+                    abortController.signal
+                );
+
+                const response = await this.getBlockItemStatus(transactionHash);
+                if (response.status === 'finalized') {
+                    // Simply doing `abortController.abort()` causes an error.
+                    // See: https://github.com/grpc/grpc-node/issues/1652
+                    setTimeout(() => abortController.abort(), 0);
+                    return resolve(response.outcome);
+                }
+
                 // eslint-disable-next-line @typescript-eslint/no-unused-vars
                 for await (const _ of blockStream) {
                     const response = await this.getBlockItemStatus(