From 32c05f1efff69e64cb646ac004151271513d1e59 Mon Sep 17 00:00:00 2001
From: jrmeurer <jrmeurer@wisc.edu>
Date: Fri, 9 Jun 2023 12:50:13 -0600
Subject: [PATCH] Update getBlockNumber to use getBlock latest

---
 src/utils/available-rpc.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/utils/available-rpc.ts b/src/utils/available-rpc.ts
index 87d4e41..496db30 100644
--- a/src/utils/available-rpc.ts
+++ b/src/utils/available-rpc.ts
@@ -63,11 +63,14 @@ const getBlockNumber = async (
 ): Promise<Optional<number>> => {
   try {
     const rpcProvider = new JsonRpcProvider(provider);
-    const blockNumber = await promiseTimeout(
-      rpcProvider.getBlockNumber(),
+    const block = await promiseTimeout(
+      rpcProvider.getBlock('latest'),
       BLOCK_NUMBER_TIMEOUT_MS,
     );
-    return blockNumber;
+    if (block == null) {
+      throw new Error('Block is null');
+    }
+    return block.number;
   } catch (err) {
     if (!(err instanceof Error)) {
       throw err;