From d3d24fdf0f434b83480f0a15da7e226fcb7a2f4f Mon Sep 17 00:00:00 2001
From: willclarktech <willclarktech@users.noreply.github.com>
Date: Tue, 30 Mar 2021 16:13:00 +0200
Subject: [PATCH] cosmwasm-stargate: Harmonise CosmWasmClient.getAccount method

---
 .../cosmwasm-stargate/src/cosmwasmclient.ts   | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/packages/cosmwasm-stargate/src/cosmwasmclient.ts b/packages/cosmwasm-stargate/src/cosmwasmclient.ts
index 80ee8fd5..11644fb8 100644
--- a/packages/cosmwasm-stargate/src/cosmwasmclient.ts
+++ b/packages/cosmwasm-stargate/src/cosmwasmclient.ts
@@ -109,20 +109,25 @@ export class CosmWasmClient {
   }
 
   public async getAccount(searchAddress: string): Promise<Account | null> {
-    const account = await this.forceGetQueryClient().auth.account(searchAddress);
-    return account ? accountFromAny(account) : null;
+    try {
+      const account = await this.forceGetQueryClient().auth.account(searchAddress);
+      return account ? accountFromAny(account) : null;
+    } catch (error) {
+      if (/rpc error: code = NotFound/i.test(error)) {
+        return null;
+      }
+      throw error;
+    }
   }
 
   public async getSequence(address: string): Promise<SequenceResponse | null> {
     const account = await this.getAccount(address);
-    if (account) {
-      return {
-        accountNumber: account.accountNumber,
-        sequence: account.sequence,
-      };
-    } else {
-      return null;
-    }
+    return account
+      ? {
+          accountNumber: account.accountNumber,
+          sequence: account.sequence,
+        }
+      : null;
   }
 
   public async getBlock(height?: number): Promise<Block> {