From fa0fe7e22e59df8439e9f4165a3e21b9f0ceb7f0 Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Mon, 17 Feb 2020 12:38:13 +0100 Subject: [PATCH] Use cosmWasmClient.getAccount in BCP --- packages/bcp/src/cosmwasmconnection.ts | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/packages/bcp/src/cosmwasmconnection.ts b/packages/bcp/src/cosmwasmconnection.ts index 25122b27..4bacadb1 100644 --- a/packages/bcp/src/cosmwasmconnection.ts +++ b/packages/bcp/src/cosmwasmconnection.ts @@ -154,12 +154,9 @@ export class CosmWasmConnection implements BlockchainConnection { public async getAccount(query: AccountQuery): Promise { const address = isPubkeyQuery(query) ? pubkeyToAddress(query.pubkey, this.addressPrefix) : query.address; - // tslint:disable-next-line: deprecation - const { result } = await this.restClient.authAccounts(address); - const bankAccount = result.value; - const hasBankAccount = !!bankAccount.address; + const bankAccount = await this.cosmWasmClient.getAccount(address); - const supportedBankCoins = bankAccount.coins.filter(({ denom }) => + const supportedBankCoins = (bankAccount?.coins || []).filter(({ denom }) => this.bankTokens.find(token => token.denom === denom), ); const erc20Amounts = await Promise.all( @@ -179,14 +176,14 @@ export class CosmWasmConnection implements BlockchainConnection { ); const nonZeroErc20Amounts = erc20Amounts.filter(amount => amount.quantity !== "0"); - if (!hasBankAccount && nonZeroErc20Amounts.length === 0) { + if (!bankAccount && nonZeroErc20Amounts.length === 0) { return undefined; } else { const balance = [ ...supportedBankCoins.map(coin => decodeAmount(this.bankTokens, coin)), ...nonZeroErc20Amounts, ].sort((a, b) => a.tokenTicker.localeCompare(b.tokenTicker)); - const pubkey = !bankAccount.public_key ? undefined : decodeCosmosPubkey(bankAccount.public_key); + const pubkey = bankAccount?.public_key ? decodeCosmosPubkey(bankAccount.public_key) : undefined; return { address: address, balance: balance,