From 48e4223ca0c67c00fbd32ecd0aa0f0cf1c47f124 Mon Sep 17 00:00:00 2001
From: willclarktech <willclarktech@users.noreply.github.com>
Date: Wed, 24 Mar 2021 13:26:02 +0100
Subject: [PATCH] launchpad: Use Coin and StdFee from amino

---
 packages/launchpad/src/coins.ts                    | 6 +-----
 packages/launchpad/src/cosmosclient.spec.ts        | 2 +-
 packages/launchpad/src/cosmosclient.ts             | 3 +--
 packages/launchpad/src/encoding.ts                 | 4 +---
 packages/launchpad/src/fee.ts                      | 8 ++------
 packages/launchpad/src/index.ts                    | 7 ++++---
 packages/launchpad/src/lcdapi/auth.ts              | 3 +--
 packages/launchpad/src/lcdapi/bank.ts              | 3 ++-
 packages/launchpad/src/lcdapi/distribution.ts      | 3 ++-
 packages/launchpad/src/lcdapi/gov.ts               | 3 ++-
 packages/launchpad/src/lcdapi/lcdclient.spec.ts    | 3 +--
 packages/launchpad/src/lcdapi/staking.ts           | 3 ++-
 packages/launchpad/src/lcdapi/supply.ts            | 3 ++-
 packages/launchpad/src/msgs.ts                     | 4 +---
 packages/launchpad/src/signingcosmosclient.spec.ts | 3 ++-
 packages/launchpad/src/signingcosmosclient.ts      | 5 ++---
 packages/launchpad/src/tx.spec.ts                  | 3 +--
 packages/launchpad/src/tx.ts                       | 4 +---
 18 files changed, 29 insertions(+), 41 deletions(-)

diff --git a/packages/launchpad/src/coins.ts b/packages/launchpad/src/coins.ts
index 6f7b5321..e62617c8 100644
--- a/packages/launchpad/src/coins.ts
+++ b/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 };
diff --git a/packages/launchpad/src/cosmosclient.spec.ts b/packages/launchpad/src/cosmosclient.spec.ts
index 768b27b6..56d7933f 100644
--- a/packages/launchpad/src/cosmosclient.spec.ts
+++ b/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";
diff --git a/packages/launchpad/src/cosmosclient.ts b/packages/launchpad/src/cosmosclient.ts
index 9bb2764e..25fcce92 100644
--- a/packages/launchpad/src/cosmosclient.ts
+++ b/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,
diff --git a/packages/launchpad/src/encoding.ts b/packages/launchpad/src/encoding.ts
index 210701f6..00690962 100644
--- a/packages/launchpad/src/encoding.ts
+++ b/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;
diff --git a/packages/launchpad/src/fee.ts b/packages/launchpad/src/fee.ts
index 027d7554..1703792f 100644
--- a/packages/launchpad/src/fee.ts
+++ b/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>;
 
diff --git a/packages/launchpad/src/index.ts b/packages/launchpad/src/index.ts
index e03f05ad..0cd39b82 100644
--- a/packages/launchpad/src/index.ts
+++ b/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,
diff --git a/packages/launchpad/src/lcdapi/auth.ts b/packages/launchpad/src/lcdapi/auth.ts
index 947ff1da..bea6e46b 100644
--- a/packages/launchpad/src/lcdapi/auth.ts
+++ b/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";
 
 /**
diff --git a/packages/launchpad/src/lcdapi/bank.ts b/packages/launchpad/src/lcdapi/bank.ts
index f8b7d14e..552db8e8 100644
--- a/packages/launchpad/src/lcdapi/bank.ts
+++ b/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 {
diff --git a/packages/launchpad/src/lcdapi/distribution.ts b/packages/launchpad/src/lcdapi/distribution.ts
index 36efd792..209e85c0 100644
--- a/packages/launchpad/src/lcdapi/distribution.ts
+++ b/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 {
diff --git a/packages/launchpad/src/lcdapi/gov.ts b/packages/launchpad/src/lcdapi/gov.ts
index f7b46635..7c05c0c3 100644
--- a/packages/launchpad/src/lcdapi/gov.ts
+++ b/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 {
diff --git a/packages/launchpad/src/lcdapi/lcdclient.spec.ts b/packages/launchpad/src/lcdapi/lcdclient.spec.ts
index ff7495c7..bc3e7d3c 100644
--- a/packages/launchpad/src/lcdapi/lcdclient.spec.ts
+++ b/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";
diff --git a/packages/launchpad/src/lcdapi/staking.ts b/packages/launchpad/src/lcdapi/staking.ts
index 604e7047..219e803a 100644
--- a/packages/launchpad/src/lcdapi/staking.ts
+++ b/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";
 
diff --git a/packages/launchpad/src/lcdapi/supply.ts b/packages/launchpad/src/lcdapi/supply.ts
index 7ddfc883..302a1c00 100644
--- a/packages/launchpad/src/lcdapi/supply.ts
+++ b/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 {
diff --git a/packages/launchpad/src/msgs.ts b/packages/launchpad/src/msgs.ts
index e3eec942..f1a4a1f3 100644
--- a/packages/launchpad/src/msgs.ts
+++ b/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
 
diff --git a/packages/launchpad/src/signingcosmosclient.spec.ts b/packages/launchpad/src/signingcosmosclient.spec.ts
index 307243a9..12fe1893 100644
--- a/packages/launchpad/src/signingcosmosclient.spec.ts
+++ b/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";
diff --git a/packages/launchpad/src/signingcosmosclient.ts b/packages/launchpad/src/signingcosmosclient.ts
index e43fb9c3..3572d748 100644
--- a/packages/launchpad/src/signingcosmosclient.ts
+++ b/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";
diff --git a/packages/launchpad/src/tx.spec.ts b/packages/launchpad/src/tx.spec.ts
index 894a8069..b79da7ca 100644
--- a/packages/launchpad/src/tx.spec.ts
+++ b/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", () => {
diff --git a/packages/launchpad/src/tx.ts b/packages/launchpad/src/tx.ts
index ff4b4a52..57bf5232 100644
--- a/packages/launchpad/src/tx.ts
+++ b/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