revert extra type safety

Author: dynst

packages/amino/src/addresses.ts

@@ -37,6 +37,6 @@ export function pubkeyToRawAddress(pubkey: Pubkey): Uint8Array {
   }
 }
 
-export function pubkeyToAddress(pubkey: Pubkey, prefix: string): `${string}1${string}` {
+export function pubkeyToAddress(pubkey: Pubkey, prefix: string): string {
   return toBech32(prefix, pubkeyToRawAddress(pubkey));
 }

packages/amino/src/secp256k1wallet.ts

@@ -33,7 +33,7 @@ export class Secp256k1Wallet implements OfflineAminoSigner {
     this.prefix = prefix;
   }
 
-  private get address(): `${string}1${string}` {
+  private get address(): string {
     return toBech32(this.prefix, rawSecp256k1PubkeyToRawAddress(this.pubkey));
   }
 

packages/cosmwasm-stargate/src/instantiate2.ts

@@ -29,7 +29,7 @@ export function _instantiate2AddressIntermediate(
   salt: Uint8Array,
   msg: string | null,
   prefix: string,
-): { key: Uint8Array; addressData: Uint8Array; address: `${string}1${string}` } {
+): { key: Uint8Array; addressData: Uint8Array; address: string } {
   assert(checksum.length === 32);
   const creatorData = fromBech32(creator).data;
 
@@ -68,7 +68,7 @@ export function instantiate2Address(
   creator: string,
   salt: Uint8Array,
   bech32Prefix: string,
-): `${string}1${string}` {
+): string {
   // Non-empty msg values are discouraged.
   // See https://medium.com/cosmwasm/dev-note-3-limitations-of-instantiate2-and-how-to-deal-with-them-a3f946874230.
   const msg = null;

packages/cosmwasm-stargate/src/testutils.spec.ts

@@ -65,7 +65,7 @@ export function getHackatom(): ContractUploadInstructions {
   };
 }
 
-export function makeRandomAddress(): `${string}1${string}` {
+export function makeRandomAddress(): string {
   return toBech32("wasm", Random.getBytes(20));
 }
 

packages/encoding/src/bech32.ts

@@ -1,7 +1,7 @@
 import { bech32 } from "@scure/base";
 
-export function toBech32(prefix: string, data: Uint8Array, limit?: number): `${string}1${string}` {
-  const address = bech32.encode(prefix, data, limit);
+export function toBech32(prefix: string, data: Uint8Array, limit?: number): string {
+  const address: `${typeof prefix}1${string}` = bech32.encode(prefix, data, limit);
   return address;
 }
 
@@ -22,7 +22,7 @@ export function fromBech32(
  * The input is validated along the way, which makes this significantly safer than
  * using `address.toLowerCase()`.
  */
-export function normalizeBech32(address: string): `${string}1${string}` {
+export function normalizeBech32(address: string): string {
   const { prefix, data } = fromBech32(address.toLowerCase() as `${string}1${string}`);
   return toBech32(prefix, data);
 }

packages/ledger-amino/src/ledgerconnector.ts

@@ -95,7 +95,7 @@ export class LedgerConnector {
     );
   }
 
-  public async getCosmosAddress(pubkey?: Uint8Array): Promise<`${string}1${string}`> {
+  public async getCosmosAddress(pubkey?: Uint8Array): Promise<string> {
     const pubkeyToUse = pubkey || (await this.getPubkey());
     return pubkeyToAddress(encodeSecp256k1Pubkey(pubkeyToUse), this.prefix);
   }

packages/proto-signing/src/directsecp256k1wallet.ts

@@ -33,7 +33,7 @@ export class DirectSecp256k1Wallet implements OfflineDirectSigner {
     this.prefix = prefix;
   }
 
-  private get address(): `${string}1${string}` {
+  private get address(): string {
     return toBech32(this.prefix, rawSecp256k1PubkeyToRawAddress(this.pubkey));
   }
 

packages/stargate/src/modules/staking/messages.spec.ts

@@ -16,7 +16,7 @@ import {
 } from "../../testutils.spec";
 import { MsgCreateValidatorEncodeObject, MsgEditValidatorEncodeObject } from "./messages";
 
-function changePrefix(address: string, newPrefix: string): `${string}1${string}` {
+function changePrefix(address: string, newPrefix: string): string {
   return toBech32(newPrefix, fromBech32(address).data);
 }