Create toBech32 and fromBech32 in @cosmjs/encoding (#1058)

msteiner96 · webmaster128 · web-flow · commit 4c8b278c1d98 · 2022-02-22T14:05:34.000+01:00
* Create toBech32 and fromBech32

* Add changes to CHANGELOG.md

* Fix linting

* Update packages/encoding/src/bech32.ts

Co-authored-by: Simon Warta &lt;2603011+webmaster128@users.noreply.github.com&gt;

* Update CHANGELOG.md

Co-authored-by: Simon Warta &lt;2603011+webmaster128@users.noreply.github.com&gt;

* Update packages/encoding/src/bech32.ts

Co-authored-by: Simon Warta &lt;2603011+webmaster128@users.noreply.github.com&gt;

* Update bech32.ts

Co-authored-by: Simon Warta &lt;2603011+webmaster128@users.noreply.github.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -37,13 +37,16 @@ and this project adheres to
   identifier which should not be the case anyways.
 - @cosmjs/stargate: Added support for slashing queries ([#927])
 - @cosmjs/ledger-amino: Renamed `LaunchpadLedger` to `LedgerConnector` ([#955])
+- @cosmjs/encoding: Created `toBech32()` and `fromBech32()`. Class Bech32 is now
+  deprecated and should not longer be used. ([#1053])
 
 [#927]: https://github.com/cosmos/cosmjs/issues/927
 [#955]: https://github.com/cosmos/cosmjs/issues/955
 [#989]: https://github.com/cosmos/cosmjs/issues/989
 [#994]: https://github.com/cosmos/cosmjs/issues/994
 [#1011]: https://github.com/cosmos/cosmjs/issues/1011
 [#1026]: https://github.com/cosmos/cosmjs/issues/1026
+[#1053]: https://github.com/cosmos/cosmjs/issues/1053
 
 ### Removed
 
diff --git a/packages/amino/src/addresses.spec.ts b/packages/amino/src/addresses.spec.ts
@@ -1,4 +1,4 @@
-import { Bech32, fromHex, toBase64 } from "@cosmjs/encoding";
+import { fromBech32, fromHex, toBase64 } from "@cosmjs/encoding";
 
 import { pubkeyToAddress, pubkeyToRawAddress } from "./addresses";
 import { decodeBech32Pubkey } from "./encoding";
@@ -12,7 +12,7 @@ describe("addresses", () => {
         value: "AtQaCqFnshaZQp6rIkvAPyzThvCvXSDO+9AzbxVErqJP",
       };
       expect(pubkeyToRawAddress(pubkey)).toEqual(
-        Bech32.decode("cosmos1h806c7khnvmjlywdrkdgk2vrayy2mmvf9rxk2r").data,
+        fromBech32("cosmos1h806c7khnvmjlywdrkdgk2vrayy2mmvf9rxk2r").data,
       );
     });
 
@@ -22,7 +22,7 @@ describe("addresses", () => {
         value: toBase64(fromHex("12ee6f581fe55673a1e9e1382a0829e32075a0aa4763c968bc526e1852e78c95")),
       };
       expect(pubkeyToRawAddress(pubkey)).toEqual(
-        Bech32.decode("cosmos1pfq05em6sfkls66ut4m2257p7qwlk448h8mysz").data,
+        fromBech32("cosmos1pfq05em6sfkls66ut4m2257p7qwlk448h8mysz").data,
       );
     });
 
diff --git a/packages/amino/src/addresses.ts b/packages/amino/src/addresses.ts
@@ -1,7 +1,7 @@
 // See https://github.com/tendermint/tendermint/blob/f2ada0a604b4c0763bda2f64fac53d506d3beca7/docs/spec/blockchain/encoding.md#public-key-cryptography
 
 import { ripemd160, sha256 } from "@cosmjs/crypto";
-import { Bech32, fromBase64 } from "@cosmjs/encoding";
+import { fromBase64, toBech32 } from "@cosmjs/encoding";
 
 import { encodeAminoPubkey } from "./encoding";
 import { isEd25519Pubkey, isMultisigThresholdPubkey, isSecp256k1Pubkey, Pubkey } from "./pubkeys";
@@ -38,5 +38,5 @@ export function pubkeyToRawAddress(pubkey: Pubkey): Uint8Array {
 }
 
 export function pubkeyToAddress(pubkey: Pubkey, prefix: string): string {
-  return Bech32.encode(prefix, pubkeyToRawAddress(pubkey));
+  return toBech32(prefix, pubkeyToRawAddress(pubkey));
 }
diff --git a/packages/amino/src/encoding.spec.ts b/packages/amino/src/encoding.spec.ts
@@ -1,4 +1,4 @@
-import { Bech32, fromBase64, fromHex } from "@cosmjs/encoding";
+import { fromBase64, fromBech32, fromHex } from "@cosmjs/encoding";
 
 import {
   decodeAminoPubkey,
@@ -39,7 +39,7 @@ describe("encoding", () => {
 
   describe("decodeAminoPubkey", () => {
     it("works for secp256k1", () => {
-      const amino = Bech32.decode(
+      const amino = fromBech32(
         "cosmospub1addwnpepqd8sgxq7aw348ydctp3n5ajufgxp395hksxjzc6565yfp56scupfqhlgyg5",
       ).data;
       expect(decodeAminoPubkey(amino)).toEqual({
@@ -51,7 +51,7 @@ describe("encoding", () => {
     it("works for ed25519", () => {
       // Encoded from `corald tendermint show-validator`
       // Decoded from http://localhost:26657/validators
-      const amino = Bech32.decode(
+      const amino = fromBech32(
         "coralvalconspub1zcjduepqvxg72ccnl9r65fv0wn3amlk4sfzqfe2k36l073kjx2qyaf6sk23qw7j8wq",
       ).data;
       expect(decodeAminoPubkey(amino)).toEqual({
@@ -65,7 +65,7 @@ describe("encoding", () => {
     });
 
     it("works for multisig", () => {
-      const pubkeyData = Bech32.decode(
+      const pubkeyData = fromBech32(
         "cosmospub1addwnpepqd8sgxq7aw348ydctp3n5ajufgxp395hksxjzc6565yfp56scupfqhlgyg5",
       ).data;
       const pubkey = {
@@ -156,7 +156,7 @@ describe("encoding", () => {
         type: "tendermint/PubKeySecp256k1",
         value: "A08EGB7ro1ORuFhjOnZcSgwYlpe0DSFjVNUIkNNQxwKQ",
       };
-      const expected = Bech32.decode(
+      const expected = fromBech32(
         "cosmospub1addwnpepqd8sgxq7aw348ydctp3n5ajufgxp395hksxjzc6565yfp56scupfqhlgyg5",
       ).data;
       expect(encodeAminoPubkey(pubkey)).toEqual(expected);
@@ -169,7 +169,7 @@ describe("encoding", () => {
         type: "tendermint/PubKeyEd25519",
         value: "YZHlYxP5R6olj3Tj3f7VgkQE5VaOvv9G0jKATqdQsqI=",
       };
-      const expected = Bech32.decode(
+      const expected = fromBech32(
         "coralvalconspub1zcjduepqvxg72ccnl9r65fv0wn3amlk4sfzqfe2k36l073kjx2qyaf6sk23qw7j8wq",
       ).data;
       expect(encodeAminoPubkey(pubkey)).toEqual(expected);
@@ -200,16 +200,16 @@ describe("encoding", () => {
     });
 
     it("works for multisig", () => {
-      const expected1 = Bech32.decode(testgroup1PubkeyBech32).data;
+      const expected1 = fromBech32(testgroup1PubkeyBech32).data;
       expect(encodeAminoPubkey(testgroup1)).toEqual(expected1);
 
-      const expected2 = Bech32.decode(testgroup2PubkeyBech32).data;
+      const expected2 = fromBech32(testgroup2PubkeyBech32).data;
       expect(encodeAminoPubkey(testgroup2)).toEqual(expected2);
 
-      const expected3 = Bech32.decode(testgroup3PubkeyBech32).data;
+      const expected3 = fromBech32(testgroup3PubkeyBech32).data;
       expect(encodeAminoPubkey(testgroup3)).toEqual(expected3);
 
-      const expected4 = Bech32.decode(testgroup4PubkeyBech32).data;
+      const expected4 = fromBech32(testgroup4PubkeyBech32).data;
       expect(encodeAminoPubkey(testgroup4)).toEqual(expected4);
     });
   });
diff --git a/packages/amino/src/encoding.ts b/packages/amino/src/encoding.ts
@@ -1,4 +1,4 @@
-import { Bech32, fromBase64, fromHex, toBase64, toHex } from "@cosmjs/encoding";
+import { fromBase64, fromBech32, fromHex, toBase64, toBech32, toHex } from "@cosmjs/encoding";
 import { Uint53 } from "@cosmjs/math";
 import { arrayContentStartsWith } from "@cosmjs/utils";
 
@@ -77,7 +77,7 @@ export function decodeAminoPubkey(data: Uint8Array): Pubkey {
  * @param bechEncoded the bech32 encoded pubkey
  */
 export function decodeBech32Pubkey(bechEncoded: string): Pubkey {
-  const { data } = Bech32.decode(bechEncoded);
+  const { data } = fromBech32(bechEncoded);
   return decodeAminoPubkey(data);
 }
 
@@ -200,5 +200,5 @@ export function encodeAminoPubkey(pubkey: Pubkey): Uint8Array {
  * @param prefix the bech32 prefix (human readable part)
  */
 export function encodeBech32Pubkey(pubkey: Pubkey, prefix: string): string {
-  return Bech32.encode(prefix, encodeAminoPubkey(pubkey));
+  return toBech32(prefix, encodeAminoPubkey(pubkey));
 }
diff --git a/packages/amino/src/secp256k1hdwallet.ts b/packages/amino/src/secp256k1hdwallet.ts
@@ -11,7 +11,7 @@ import {
   Slip10Curve,
   stringToPath,
 } from "@cosmjs/crypto";
-import { Bech32, fromBase64, fromUtf8, toBase64, toUtf8 } from "@cosmjs/encoding";
+import { fromBase64, fromUtf8, toBase64, toBech32, toUtf8 } from "@cosmjs/encoding";
 import { assert, isNonNullObject } from "@cosmjs/utils";
 
 import { rawSecp256k1PubkeyToRawAddress } from "./addresses";
@@ -346,7 +346,7 @@ export class Secp256k1HdWallet implements OfflineAminoSigner {
     return Promise.all(
       this.accounts.map(async ({ hdPath, prefix }) => {
         const { privkey, pubkey } = await this.getKeyPair(hdPath);
-        const address = Bech32.encode(prefix, rawSecp256k1PubkeyToRawAddress(pubkey));
+        const address = toBech32(prefix, rawSecp256k1PubkeyToRawAddress(pubkey));
         return {
           algo: "secp256k1" as const,
           privkey: privkey,
diff --git a/packages/amino/src/secp256k1wallet.ts b/packages/amino/src/secp256k1wallet.ts
@@ -1,5 +1,5 @@
 import { Secp256k1, Sha256 } from "@cosmjs/crypto";
-import { Bech32 } from "@cosmjs/encoding";
+import { toBech32 } from "@cosmjs/encoding";
 
 import { rawSecp256k1PubkeyToRawAddress } from "./addresses";
 import { encodeSecp256k1Signature } from "./signature";
@@ -34,7 +34,7 @@ export class Secp256k1Wallet implements OfflineAminoSigner {
   }
 
   private get address(): string {
-    return Bech32.encode(this.prefix, rawSecp256k1PubkeyToRawAddress(this.pubkey));
+    return toBech32(this.prefix, rawSecp256k1PubkeyToRawAddress(this.pubkey));
   }
 
   public async getAccounts(): Promise<readonly AccountData[]> {
diff --git a/packages/amino/src/signdoc.spec.ts b/packages/amino/src/signdoc.spec.ts
@@ -1,11 +1,11 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 import { Random } from "@cosmjs/crypto";
-import { Bech32 } from "@cosmjs/encoding";
+import { toBech32 } from "@cosmjs/encoding";
 
 import { AminoMsg, makeSignDoc, sortedJsonStringify } from "./signdoc";
 
 function makeRandomAddress(): string {
-  return Bech32.encode("cosmos", Random.getBytes(20));
+  return toBech32("cosmos", Random.getBytes(20));
 }
 const testAddress = "cosmos1pkptre7fdkl6gfrzlesjjvhxhlc3r4gmmk8rs6";
 const testValidatorAddress = "cosmosvaloper1yfkkk04ve8a0sugj4fe6q6zxuvmvza8r3arurr";
diff --git a/packages/cosmwasm-stargate/src/testutils.spec.ts b/packages/cosmwasm-stargate/src/testutils.spec.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 import { AminoSignResponse, Secp256k1HdWallet, Secp256k1HdWalletOptions, StdSignDoc } from "@cosmjs/amino";
 import { Bip39, EnglishMnemonic, Random } from "@cosmjs/crypto";
-import { Bech32, fromBase64 } from "@cosmjs/encoding";
+import { fromBase64, toBech32 } from "@cosmjs/encoding";
 import {
   DirectSecp256k1HdWallet,
   DirectSecp256k1HdWalletOptions,
@@ -64,7 +64,7 @@ export function getHackatom(): ContractUploadInstructions {
 }
 
 export function makeRandomAddress(): string {
-  return Bech32.encode("wasm", Random.getBytes(20));
+  return toBech32("wasm", Random.getBytes(20));
 }
 
 export const tendermintIdMatcher = /^[0-9A-F]{64}$/;
diff --git a/packages/encoding/README.md b/packages/encoding/README.md
@@ -10,9 +10,9 @@ on invalid input.
 ## Convert between bech32 and hex addresses
 
 ```
->> Bech32.encode("tiov", fromHex("1234ABCD0000AA0000FFFF0000AA00001234ABCD"))
+>> toBech32("tiov", fromHex("1234ABCD0000AA0000FFFF0000AA00001234ABCD"))
 'tiov1zg62hngqqz4qqq8lluqqp2sqqqfrf27dzrrmea'
->> toHex(Bech32.decode("tiov1zg62hngqqz4qqq8lluqqp2sqqqfrf27dzrrmea").data)
+>> toHex(fromBech32("tiov1zg62hngqqz4qqq8lluqqp2sqqqfrf27dzrrmea").data)
 '1234abcd0000aa0000ffff0000aa00001234abcd'
 ```
 
diff --git a/packages/encoding/src/bech32.spec.ts b/packages/encoding/src/bech32.spec.ts
@@ -1,4 +1,4 @@
-import { Bech32 } from "./bech32";
+import { fromBech32, toBech32 } from "./bech32";
 import { fromHex } from "./hex";
 
 describe("Bech32", () => {
@@ -8,30 +8,30 @@ describe("Bech32", () => {
 
   describe("encode", () => {
     it("works", () => {
-      expect(Bech32.encode("eth", ethAddressRaw)).toEqual("eth1n48g2mjh9ezz7zjtya37wtgg5r5emr0drkwlgw");
+      expect(toBech32("eth", ethAddressRaw)).toEqual("eth1n48g2mjh9ezz7zjtya37wtgg5r5emr0drkwlgw");
     });
 
     it("works for very short data", () => {
-      expect(() => Bech32.encode("eth", new Uint8Array(1))).not.toThrow();
+      expect(() => toBech32("eth", new Uint8Array(1))).not.toThrow();
     });
 
     it("works for very long prefixes", () => {
-      expect(() => Bech32.encode("p".repeat(70), new Uint8Array(20))).toThrowError(/exceeds length limit/i);
+      expect(() => toBech32("p".repeat(70), new Uint8Array(20))).toThrowError(/exceeds length limit/i);
     });
 
     // See https://github.com/bitcoin/bips/blob/master/bip-0173.mediawiki#Bech32
     it("works if result is 90 characters", () => {
-      const result = Bech32.encode("eth", new Uint8Array(50));
+      const result = toBech32("eth", new Uint8Array(50));
       expect(result.length).toEqual(90);
     });
 
     it("throws if result exceeds 90 characters", () => {
-      expect(() => Bech32.encode("eth", new Uint8Array(51))).toThrowError(/exceeds length limit/i);
+      expect(() => toBech32("eth", new Uint8Array(51))).toThrowError(/exceeds length limit/i);
     });
 
     it("works if a limit parameter is provided", () => {
       const limit = 1024;
-      const result = Bech32.encode("eth", new Uint8Array(51), limit);
+      const result = toBech32("eth", new Uint8Array(51), limit);
       expect(result).toEqual(
         "eth1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqug55er",
       );
@@ -40,13 +40,13 @@ describe("Bech32", () => {
 
     it("throws if result exceeds the provided limit parameter", () => {
       const limit = 10;
-      expect(() => Bech32.encode("eth", ethAddressRaw, limit)).toThrowError(/exceeds length limit/i);
+      expect(() => toBech32("eth", ethAddressRaw, limit)).toThrowError(/exceeds length limit/i);
     });
   });
 
   describe("decode", () => {
     it("works", () => {
-      expect(Bech32.decode("eth1n48g2mjh9ezz7zjtya37wtgg5r5emr0drkwlgw")).toEqual({
+      expect(fromBech32("eth1n48g2mjh9ezz7zjtya37wtgg5r5emr0drkwlgw")).toEqual({
         prefix: "eth",
         data: ethAddressRaw,
       });
@@ -55,7 +55,7 @@ describe("Bech32", () => {
     it("works for addresses which exceed the specification limit of 90 characters", () => {
       // Example from https://github.com/cosmos/cosmos-sdk/pull/6237#issuecomment-658116534
       expect(() =>
-        Bech32.decode(
+        fromBech32(
           "cosmospub1ytql0csgqvfzd666axrjzqmn5q2ucztcyxw8hvlzen94ay05tegaerkug5pn3xn8wqdymt598ufzd666axrjzqsxllmwacap3f6xyc4x30jl8ecrcs2tze3zzgxkmthcsqxnqxhwwgfzd666axrjzqs2rlu3wz5gnslgpprszjr8r65n0d6y39q657th77eyvengtk3z0y6h2pnk",
         ),
       ).not.toThrow();
@@ -64,7 +64,7 @@ describe("Bech32", () => {
     it("throws for addresses which exceed the specification limit of 90 characters if a limit is specified", () => {
       // Example from https://github.com/cosmos/cosmos-sdk/pull/6237#issuecomment-658116534
       expect(() =>
-        Bech32.decode(
+        fromBech32(
           "cosmospub1ytql0csgqvfzd666axrjzqmn5q2ucztcyxw8hvlzen94ay05tegaerkug5pn3xn8wqdymt598ufzd666axrjzqsxllmwacap3f6xyc4x30jl8ecrcs2tze3zzgxkmthcsqxnqxhwwgfzd666axrjzqs2rlu3wz5gnslgpprszjr8r65n0d6y39q657th77eyvengtk3z0y6h2pnk",
           90,
         ),
diff --git a/packages/encoding/src/bech32.ts b/packages/encoding/src/bech32.ts
@@ -1,19 +1,39 @@
 import * as bech32 from "bech32";
 
+export function toBech32(prefix: string, data: Uint8Array, limit?: number): string {
+  const address = bech32.encode(prefix, bech32.toWords(data), limit);
+  return address;
+}
+
+export function fromBech32(
+  address: string,
+  limit = Infinity,
+): { readonly prefix: string; readonly data: Uint8Array } {
+  const decodedAddress = bech32.decode(address, limit);
+  return {
+    prefix: decodedAddress.prefix,
+    data: new Uint8Array(bech32.fromWords(decodedAddress.words)),
+  };
+}
+
+/**
+ * @deprecated This class is deprecated and will be removed soon. Please use fromBech32() and toBech32() instead. For more details please refer to https://github.com/cosmos/cosmjs/issues/1053.
+ */
 export class Bech32 {
+  /**
+   * @deprecated This class is deprecated and will be removed soon. Please use fromBech32() and toBech32() instead. For more details please refer to https://github.com/cosmos/cosmjs/issues/1053.
+   */
   public static encode(prefix: string, data: Uint8Array, limit?: number): string {
-    const address = bech32.encode(prefix, bech32.toWords(data), limit);
-    return address;
+    return toBech32(prefix, data, limit);
   }
 
+  /**
+   * @deprecated This class is deprecated and will be removed soon. Please use fromBech32() and toBech32() instead. For more details please refer to https://github.com/cosmos/cosmjs/issues/1053.
+   */
   public static decode(
     address: string,
     limit = Infinity,
   ): { readonly prefix: string; readonly data: Uint8Array } {
-    const decodedAddress = bech32.decode(address, limit);
-    return {
-      prefix: decodedAddress.prefix,
-      data: new Uint8Array(bech32.fromWords(decodedAddress.words)),
-    };
+    return fromBech32(address, limit);
   }
 }
diff --git a/packages/encoding/src/index.ts b/packages/encoding/src/index.ts
@@ -1,6 +1,6 @@
 export { fromAscii, toAscii } from "./ascii";
 export { fromBase64, toBase64 } from "./base64";
-export { Bech32 } from "./bech32";
+export { Bech32, fromBech32, toBech32 } from "./bech32";
 export { fromHex, toHex } from "./hex";
 export { fromRfc3339, toRfc3339 } from "./rfc3339";
 export { fromUtf8, toUtf8 } from "./utf8";
diff --git a/packages/faucet/src/faucet.spec.ts b/packages/faucet/src/faucet.spec.ts
@@ -1,5 +1,5 @@
 import { Random } from "@cosmjs/crypto";
-import { Bech32 } from "@cosmjs/encoding";
+import { toBech32 } from "@cosmjs/encoding";
 import { makeCosmoshubPath, StargateClient } from "@cosmjs/stargate";
 import { assert } from "@cosmjs/utils";
 
@@ -18,7 +18,7 @@ const defaultTokenConfig: TokenConfiguration = {
 const defaultAddressPrefix = "cosmos";
 
 function makeRandomAddress(): string {
-  return Bech32.encode(defaultAddressPrefix, Random.getBytes(20));
+  return toBech32(defaultAddressPrefix, Random.getBytes(20));
 }
 
 const faucetMnemonic =
diff --git a/packages/proto-signing/src/directsecp256k1hdwallet.ts b/packages/proto-signing/src/directsecp256k1hdwallet.ts
@@ -12,7 +12,7 @@ import {
   Slip10Curve,
   stringToPath,
 } from "@cosmjs/crypto";
-import { Bech32, fromBase64, fromUtf8, toBase64, toUtf8 } from "@cosmjs/encoding";
+import { fromBase64, fromUtf8, toBase64, toBech32, toUtf8 } from "@cosmjs/encoding";
 import { assert, isNonNullObject } from "@cosmjs/utils";
 import { SignDoc } from "cosmjs-types/cosmos/tx/v1beta1/tx";
 
@@ -346,7 +346,7 @@ export class DirectSecp256k1HdWallet implements OfflineDirectSigner {
     return Promise.all(
       this.accounts.map(async ({ hdPath, prefix }) => {
         const { privkey, pubkey } = await this.getKeyPair(hdPath);
-        const address = Bech32.encode(prefix, rawSecp256k1PubkeyToRawAddress(pubkey));
+        const address = toBech32(prefix, rawSecp256k1PubkeyToRawAddress(pubkey));
         return {
           algo: "secp256k1" as const,
           privkey: privkey,
diff --git a/packages/proto-signing/src/directsecp256k1wallet.ts b/packages/proto-signing/src/directsecp256k1wallet.ts
diff --git a/packages/stargate/src/multisignature.ts b/packages/stargate/src/multisignature.ts
diff --git a/packages/stargate/src/queries/utils.ts b/packages/stargate/src/queries/utils.ts
diff --git a/packages/stargate/src/testutils.spec.ts b/packages/stargate/src/testutils.spec.ts
diff --git a/scripts/wasmd/send_first.js b/scripts/wasmd/send_first.js

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`// See https://github.com/tendermint/tendermint/blob/f2ada0a604b4c0763bda2f64fac53d506d3beca7/docs/spec/blockchain/encoding.md#public-key-cryptography`
`2`	`2`
`3`	`3`	`import { ripemd160, sha256 } from "@cosmjs/crypto";`
`4`		`-import { Bech32, fromBase64 } from "@cosmjs/encoding";`
	`4`	`+import { fromBase64, toBech32 } from "@cosmjs/encoding";`
`5`	`5`
`6`	`6`	`import { encodeAminoPubkey } from "./encoding";`
`7`	`7`	`import { isEd25519Pubkey, isMultisigThresholdPubkey, isSecp256k1Pubkey, Pubkey } from "./pubkeys";`
`@@ -38,5 +38,5 @@ export function pubkeyToRawAddress(pubkey: Pubkey): Uint8Array {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`export function pubkeyToAddress(pubkey: Pubkey, prefix: string): string {`
`41`		`- return Bech32.encode(prefix, pubkeyToRawAddress(pubkey));`
	`41`	`+ return toBech32(prefix, pubkeyToRawAddress(pubkey));`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`import { Secp256k1, Sha256 } from "@cosmjs/crypto";`
`2`		`-import { Bech32 } from "@cosmjs/encoding";`
	`2`	`+import { toBech32 } from "@cosmjs/encoding";`
`3`	`3`
`4`	`4`	`import { rawSecp256k1PubkeyToRawAddress } from "./addresses";`
`5`	`5`	`import { encodeSecp256k1Signature } from "./signature";`
`@@ -34,7 +34,7 @@ export class Secp256k1Wallet implements OfflineAminoSigner {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`private get address(): string {`
`37`		`- return Bech32.encode(this.prefix, rawSecp256k1PubkeyToRawAddress(this.pubkey));`
	`37`	`+ return toBech32(this.prefix, rawSecp256k1PubkeyToRawAddress(this.pubkey));`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`public async getAccounts(): Promise<readonly AccountData[]> {`