launchpad: Use Coin and StdFee from amino

packages/launchpad/src/coins.ts

@@ -1,10 +1,6 @@
+import { Coin } from "@cosmjs/amino";
 import { Uint53, Uint64 } from "@cosmjs/math";
 
-export interface Coin {
-  readonly denom: string;
-  readonly amount: string;
-}
-
 /** Creates a coin */
 export function coin(amount: number, denom: string): Coin {
   return { amount: new Uint53(amount).toString(), denom: denom };

packages/launchpad/src/cosmosclient.spec.ts

@@ -1,10 +1,10 @@
 /* eslint-disable @typescript-eslint/naming-convention */
+import { StdFee } from "@cosmjs/amino";
 import { assert, sleep } from "@cosmjs/utils";
 import { ReadonlyDate } from "readonly-date";
 
 import { assertIsBroadcastTxSuccess, CosmosClient, PrivateCosmosClient } from "./cosmosclient";
 import { makeSignDoc } from "./encoding";
-import { StdFee } from "./fee";
 import { findAttribute } from "./logs";
 import { MsgSend } from "./msgs";
 import { Secp256k1HdWallet } from "./secp256k1hdwallet";

packages/launchpad/src/cosmosclient.ts

@@ -1,9 +1,8 @@
-import { Pubkey } from "@cosmjs/amino";
+import { Coin, Pubkey } from "@cosmjs/amino";
 import { sha256 } from "@cosmjs/crypto";
 import { fromBase64, fromHex, toHex } from "@cosmjs/encoding";
 import { Uint53 } from "@cosmjs/math";
 
-import { Coin } from "./coins";
 import {
   AuthExtension,
   BroadcastMode,

packages/launchpad/src/encoding.ts

@@ -1,10 +1,8 @@
 /* eslint-disable @typescript-eslint/naming-convention */
-import { AminoMsg, StdSignDoc } from "@cosmjs/amino";
+import { AminoMsg, StdFee, StdSignDoc } from "@cosmjs/amino";
 import { toUtf8 } from "@cosmjs/encoding";
 import { Uint53 } from "@cosmjs/math";
 
-import { StdFee } from "./fee";
-
 function sortedObject(obj: any): any {
   if (typeof obj !== "object" || obj === null) {
     return obj;

packages/launchpad/src/fee.ts

@@ -1,11 +1,7 @@
+import { StdFee } from "@cosmjs/amino";
 import { Decimal, Uint53 } from "@cosmjs/math";
 
-import { Coin, coins } from "./coins";
-
-export interface StdFee {
-  readonly amount: readonly Coin[];
-  readonly gas: string;
-}
+import { coins } from "./coins";
 
 export type FeeTable = Record<string, StdFee>;
 

packages/launchpad/src/index.ts

@@ -4,7 +4,9 @@ export {
   Algo,
   AminoMsg as Msg,
   AminoSignResponse,
+  Coin,
   OfflineAminoSigner as OfflineSigner,
+  StdFee,
   StdSignDoc,
   StdSignature,
   decodeAminoPubkey,
@@ -24,8 +26,7 @@ export type PubKey = SinglePubkey;
 import * as logs from "./logs";
 export { logs };
 
-export { Coin, coin, coins, parseCoins } from "./coins";
-
+export { coin, coins, parseCoins } from "./coins";
 export {
   Account,
   assertIsBroadcastTxSuccess,
@@ -49,7 +50,7 @@ export {
   isSearchByTagsQuery,
 } from "./cosmosclient";
 export { makeSignDoc, serializeSignDoc } from "./encoding";
-export { buildFeeTable, FeeTable, GasLimits, GasPrice, StdFee } from "./fee";
+export { buildFeeTable, FeeTable, GasLimits, GasPrice } from "./fee";
 export {
   AuthAccountsResponse,
   AuthExtension,

packages/launchpad/src/lcdapi/auth.ts

@@ -1,7 +1,6 @@
 /* eslint-disable @typescript-eslint/naming-convention */
-import { Pubkey } from "@cosmjs/amino";
+import { Coin, Pubkey } from "@cosmjs/amino";
 
-import { Coin } from "../coins";
 import { LcdClient } from "./lcdclient";
 
 /**

packages/launchpad/src/lcdapi/bank.ts

@@ -1,4 +1,5 @@
-import { Coin } from "../coins";
+import { Coin } from "@cosmjs/amino";
+
 import { LcdClient } from "./lcdclient";
 
 export interface BankBalancesResponse {

packages/launchpad/src/lcdapi/distribution.ts

@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/naming-convention */
-import { Coin } from "../coins";
+import { Coin } from "@cosmjs/amino";
+
 import { LcdClient } from "./lcdclient";
 
 export interface RewardContainer {

packages/launchpad/src/lcdapi/gov.ts

@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/naming-convention */
-import { Coin } from "../coins";
+import { Coin } from "@cosmjs/amino";
+
 import { LcdClient } from "./lcdclient";
 
 export enum GovParametersType {

packages/launchpad/src/lcdapi/lcdclient.spec.ts

@@ -1,10 +1,9 @@
 /* eslint-disable @typescript-eslint/naming-convention */
+import { Coin, StdFee } from "@cosmjs/amino";
 import { assert, sleep } from "@cosmjs/utils";
 
-import { Coin } from "../coins";
 import { isBroadcastTxFailure } from "../cosmosclient";
 import { makeSignDoc } from "../encoding";
-import { StdFee } from "../fee";
 import { parseLogs } from "../logs";
 import { MsgSend } from "../msgs";
 import { makeCosmoshubPath } from "../paths";

packages/launchpad/src/lcdapi/staking.ts

@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/naming-convention */
-import { Coin } from "../coins";
+import { Coin } from "@cosmjs/amino";
+
 import { BlockHeader, SearchTxsResponse } from "./base";
 import { LcdClient } from "./lcdclient";
 

packages/launchpad/src/lcdapi/supply.ts

@@ -1,4 +1,5 @@
-import { Coin } from "../coins";
+import { Coin } from "@cosmjs/amino";
+
 import { LcdApiArray, LcdClient } from "./lcdclient";
 
 export interface TotalSupplyAllResponse {

packages/launchpad/src/msgs.ts

@@ -1,7 +1,5 @@
 /* eslint-disable @typescript-eslint/naming-convention */
-import { AminoMsg } from "@cosmjs/amino";
-
-import { Coin } from "./coins";
+import { AminoMsg, Coin } from "@cosmjs/amino";
 
 // auth (no messages) - see https://github.com/cosmos/cosmos-sdk/blob/efa73c7/proto/cosmos/auth/auth.proto
 

packages/launchpad/src/signingcosmosclient.spec.ts

@@ -1,7 +1,8 @@
 /* eslint-disable @typescript-eslint/naming-convention */
+import { Coin } from "@cosmjs/amino";
 import { assert } from "@cosmjs/utils";
 
-import { Coin, coin, coins } from "./coins";
+import { coin, coins } from "./coins";
 import { assertIsBroadcastTxSuccess, PrivateCosmosClient } from "./cosmosclient";
 import { GasPrice } from "./fee";
 import { MsgDelegate, MsgSend } from "./msgs";

packages/launchpad/src/signingcosmosclient.ts

@@ -1,11 +1,10 @@
 /* eslint-disable @typescript-eslint/naming-convention */
-import { AminoMsg, OfflineAminoSigner } from "@cosmjs/amino";
+import { AminoMsg, Coin, OfflineAminoSigner, StdFee } from "@cosmjs/amino";
 import equals from "fast-deep-equal";
 
-import { Coin } from "./coins";
 import { Account, BroadcastTxResult, CosmosClient, GetSequenceResult } from "./cosmosclient";
 import { makeSignDoc } from "./encoding";
-import { buildFeeTable, FeeTable, GasLimits, GasPrice, StdFee } from "./fee";
+import { buildFeeTable, FeeTable, GasLimits, GasPrice } from "./fee";
 import { BroadcastMode } from "./lcdapi";
 import { MsgSend } from "./msgs";
 import { makeStdTx, StdTx } from "./tx";

packages/launchpad/src/tx.spec.ts

@@ -1,9 +1,8 @@
 /* eslint-disable @typescript-eslint/naming-convention */
-import { StdSignature } from "@cosmjs/amino";
+import { StdFee, StdSignature } from "@cosmjs/amino";
 
 import { coins } from "./coins";
 import { makeSignDoc } from "./encoding";
-import { StdFee } from "./fee";
 import { makeStdTx } from "./tx";
 
 describe("tx", () => {

packages/launchpad/src/tx.ts

@@ -1,6 +1,4 @@
-import { AminoMsg, StdSignature, StdSignDoc } from "@cosmjs/amino";
-
-import { StdFee } from "./fee";
+import { AminoMsg, StdFee, StdSignature, StdSignDoc } from "@cosmjs/amino";
 
 /**
  * A Cosmos SDK StdTx