feat: allow to specify an AccountParser inside CosmWasmClient (#1928)

Author: webmaster128

CHANGELOG.md

@@ -21,6 +21,8 @@ and this project adheres to
   using the `DynamicGasPriceConfig` interface for `gasPrice`. This then uses
   Osmosis' EIP-1559 implementation or the Skip fee market module to get the gas
   price from the chain. ([#1926])
+- @cosmjs/cosmwasm-stargate: Add the ability to specify a custom account parser
+  for `CosmWasmClient`.
 
 [#1883]: https://github.com/cosmos/cosmjs/issues/1883
 [#1916]: https://github.com/cosmos/cosmjs/pull/1916

packages/cosmwasm/src/cosmwasmclient.ts

@@ -3,6 +3,7 @@ import { Uint53 } from "@cosmjs/math";
 import {
   Account,
   accountFromAny,
+  AccountParser,
   AuthExtension,
   BankExtension,
   Block,
@@ -81,35 +82,43 @@ export interface PrivateCosmWasmClient {
     | undefined;
 }
 
+export interface CosmWasmClientOptions {
+  readonly accountParser?: AccountParser;
+}
+
 export class CosmWasmClient {
   private readonly cometClient: CometClient | undefined;
   private readonly queryClient:
     | (QueryClient & AuthExtension & BankExtension & TxExtension & WasmExtension)
     | undefined;
   private readonly codesCache = new Map<number, CodeDetails>();
   private chainId: string | undefined;
+  private readonly accountParser: AccountParser;
 
   /**
    * Creates an instance by connecting to the given CometBFT RPC endpoint.
    *
    * This uses auto-detection to decide between a CometBFT 1.x, CometBFT 0.38 and Tendermint 0.37 client.
    * To set the Comet client explicitly, use `create`.
    */
-  public static async connect(endpoint: string | HttpEndpoint): Promise<CosmWasmClient> {
+  public static async connect(
+    endpoint: string | HttpEndpoint,
+    options: CosmWasmClientOptions = {},
+  ): Promise<CosmWasmClient> {
     const cometClient = await connectComet(endpoint);
-    return CosmWasmClient.create(cometClient);
+    return CosmWasmClient.create(cometClient, options);
   }
 
   /**
    * Creates an instance from a manually created Comet client.
    * Use this to use `Comet38Client` or `Tendermint37Client` instead of
    * auto-detection.
    */
-  public static create(cometClient: CometClient): CosmWasmClient {
-    return new CosmWasmClient(cometClient);
+  public static create(cometClient: CometClient, options: CosmWasmClientOptions = {}): CosmWasmClient {
+    return new CosmWasmClient(cometClient, options);
   }
 
-  protected constructor(cometClient: CometClient | undefined) {
+  protected constructor(cometClient: CometClient | undefined, options: CosmWasmClientOptions = {}) {
     if (cometClient) {
       this.cometClient = cometClient;
       this.queryClient = QueryClient.withExtensions(
@@ -120,6 +129,8 @@ export class CosmWasmClient {
         setupTxExtension,
       );
     }
+    const { accountParser = accountFromAny } = options;
+    this.accountParser = accountParser;
   }
 
   protected getCometClient(): CometClient | undefined {
@@ -165,7 +176,7 @@ export class CosmWasmClient {
   public async getAccount(searchAddress: string): Promise<Account | null> {
     try {
       const account = await this.forceGetQueryClient().auth.account(searchAddress);
-      return account ? accountFromAny(account) : null;
+      return account ? this.accountParser(account) : null;
     } catch (error: any) {
       if (/rpc error: code = NotFound/i.test(String(error))) {
         return null;

packages/cosmwasm/src/signingcosmwasmclient.ts

@@ -53,7 +53,7 @@ import {
 import { AccessConfig } from "cosmjs-types/cosmwasm/wasm/v1/types";
 
 import { gzip } from "./compression";
-import { CosmWasmClient } from "./cosmwasmclient";
+import { CosmWasmClient, CosmWasmClientOptions } from "./cosmwasmclient";
 import {
   createWasmAminoConverters,
   JsonObject,
@@ -189,7 +189,7 @@ function createDeliverTxResponseErrorMessage(result: DeliverTxResponse): string
   return `Error when broadcasting tx ${result.transactionHash} at height ${result.height}. Code: ${result.code}; Raw log: ${result.rawLog}`;
 }
 
-export interface SigningCosmWasmClientOptions {
+export interface SigningCosmWasmClientOptions extends CosmWasmClientOptions {
   readonly registry?: Registry;
   readonly aminoTypes?: AminoTypes;
   readonly broadcastTimeoutMs?: number;
@@ -261,7 +261,7 @@ export class SigningCosmWasmClient extends CosmWasmClient {
     signer: OfflineSigner,
     options: SigningCosmWasmClientOptions,
   ) {
-    super(cometClient);
+    super(cometClient, options);
     const {
       registry = new Registry([...defaultStargateTypes, ...wasmTypes]),
       aminoTypes = new AminoTypes({