Upgrade cosmos and thorchain to use 0.42.14 cosmos-client

packages/xchain-cosmos/src/cosmos/sdk-client.ts

@@ -1,5 +1,6 @@
-import { TxHistoryParams } from '@xchainjs/xchain-client'
+import { TxHash, TxHistoryParams } from '@xchainjs/xchain-client'
 import * as xchainCrypto from '@xchainjs/xchain-crypto'
+import { baseAmount } from '@xchainjs/xchain-util/lib'
 import axios from 'axios'
 import * as BIP32 from 'bip32'
 import { cosmosclient, proto, rest } from 'cosmos-client'
@@ -19,6 +20,7 @@ import {
   TxResponse,
 } from './types'
 
+const DEFAULT_GAS_VALUE = baseAmount('200000', 8)
 export class CosmosSDKClient {
   sdk: cosmosclient.CosmosSDK
 
@@ -194,7 +196,15 @@ export class CosmosSDKClient {
     return (await axios.get<TxResponse>(`${this.server}/txs/${hash}`)).data
   }
 
-  async transfer({ privkey, from, to, amount, asset, memo = '', fee = '200000' }: TransferParams): Promise<string> {
+  async transfer({
+    privkey,
+    from,
+    to,
+    amount,
+    asset,
+    memo = '',
+    gasLimit = DEFAULT_GAS_VALUE,
+  }: TransferParams): Promise<TxHash> {
     this.setPrefix()
 
     const msgSend = new proto.cosmos.bank.v1beta1.MsgSend({
@@ -228,7 +238,7 @@ export class CosmosSDKClient {
         },
       ],
       fee: {
-        gas_limit: cosmosclient.Long.fromString(fee),
+        gas_limit: cosmosclient.Long.fromString(gasLimit.amount.toString()),
       },
     })
 
@@ -260,6 +270,9 @@ export class CosmosSDKClient {
       tx_bytes: txBuilder.txBytes(),
       mode: rest.cosmos.tx.BroadcastTxMode.Block,
     })
-    return res.data.tx_response?.txhash || 'unknown'
+    if (!res?.data?.tx_response?.txhash) {
+      throw new Error('No tx id returned from broadcast')
+    }
+    return res.data.tx_response.txhash
   }
 }

packages/xchain-cosmos/src/cosmos/types.ts

@@ -1,3 +1,4 @@
+import { BaseAmount } from '@xchainjs/xchain-util/lib'
 import { BigSource } from 'big.js'
 import { proto } from 'cosmos-client'
 import { StdTx } from 'cosmos-client/cjs/openapi/api'
@@ -26,7 +27,7 @@ export type TransferParams = {
   amount: BigSource
   asset: string
   memo?: string
-  fee?: string
+  gasLimit?: BaseAmount
 }
 
 export type BaseAccountResponse = {

packages/xchain-cosmos/src/util.ts

@@ -17,20 +17,18 @@ export const DECIMAL = 6
  * @param {Msg} msg
  * @returns {boolean} `true` or `false`.
  */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const isMsgSend = (msg: any): msg is proto.cosmos.bank.v1beta1.MsgSend =>
+export const isMsgSend = (msg: unknown): msg is proto.cosmos.bank.v1beta1.MsgSend =>
   (msg as proto.cosmos.bank.v1beta1.MsgSend)?.amount !== undefined &&
   (msg as proto.cosmos.bank.v1beta1.MsgSend)?.from_address !== undefined &&
-  (msg as unknown as proto.cosmos.bank.v1beta1.MsgSend)?.to_address !== undefined
+  ((msg as unknown) as proto.cosmos.bank.v1beta1.MsgSend)?.to_address !== undefined
 
 /**
  * Type guard for MsgMultiSend
  *
  * @param {Msg} msg
  * @returns {boolean} `true` or `false`.
  */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const isMsgMultiSend = (msg: any): msg is proto.cosmos.bank.v1beta1.MsgMultiSend =>
+export const isMsgMultiSend = (msg: unknown): msg is proto.cosmos.bank.v1beta1.MsgMultiSend =>
   (msg as proto.cosmos.bank.v1beta1.MsgMultiSend)?.inputs !== undefined &&
   (msg as proto.cosmos.bank.v1beta1.MsgMultiSend)?.outputs !== undefined
 
@@ -75,7 +73,7 @@ const getCoinAmount = (coins?: proto.cosmos.base.v1beta1.ICoin[]) => {
 export const getTxsFromHistory = (txs: TxResponse[], mainAsset: Asset): Tx[] => {
   return txs.reduce((acc, tx) => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    let msgs: any[]
+    let msgs: Array<proto.cosmos.bank.v1beta1.MsgSend | proto.cosmos.bank.v1beta1.MsgMultiSend>
     if ((tx.tx as RawTxResponse).body === undefined) {
       msgs = codec.packCosmosAny(tx.tx).msg
     } else {
@@ -86,18 +84,18 @@ export const getTxsFromHistory = (txs: TxResponse[], mainAsset: Asset): Tx[] =>
     const to: TxTo[] = []
     msgs.map((msg) => {
       if (isMsgSend(msg)) {
-        const msgSend = msg as proto.cosmos.bank.v1beta1.MsgSend
+        const msgSend = msg
         const amount = getCoinAmount(msgSend.amount)
 
         let from_index = -1
 
         from.forEach((value, index) => {
-          if (value.from === msgSend.from_address.toString()) from_index = index
+          if (value.from === msgSend.from_address) from_index = index
         })
 
         if (from_index === -1) {
           from.push({
-            from: msgSend.from_address.toString(),
+            from: msgSend.from_address,
             amount,
           })
         } else {
@@ -107,19 +105,19 @@ export const getTxsFromHistory = (txs: TxResponse[], mainAsset: Asset): Tx[] =>
         let to_index = -1
 
         to.forEach((value, index) => {
-          if (value.to === msgSend.to_address.toString()) to_index = index
+          if (value.to === msgSend.to_address) to_index = index
         })
 
         if (to_index === -1) {
           to.push({
-            to: msgSend.to_address.toString(),
+            to: msgSend.to_address,
             amount,
           })
         } else {
           to[to_index].amount = baseAmount(to[to_index].amount.amount().plus(amount.amount()), 6)
         }
       } else if (isMsgMultiSend(msg)) {
-        const msgMultiSend = msg as proto.cosmos.bank.v1beta1.MsgMultiSend
+        const msgMultiSend = msg
 
         msgMultiSend.inputs.map((input) => {
           const amount = getCoinAmount(input.coins || [])

packages/xchain-ethereum/src/client.ts

@@ -715,12 +715,8 @@ export default class Client extends BaseXChainClient implements XChainClient, Et
         [FeeOption.Fastest]: baseAmount(ratesInGwei[FeeOption.Fastest] * 10 ** 9, ETH_DECIMAL),
       }
     } catch (error) {}
-    //should only get here if thor fails
-    // try {
+
     return await this.estimateGasPricesFromEtherscan()
-    // } catch (error) {
-    //   throw new Error(`Failed to estimate gas price: ${error.msg ?? error.toString()}`)
-    // }
   }
 
   /**

packages/xchain-thorchain/src/client.ts

@@ -242,8 +242,6 @@ class Client extends BaseXChainClient implements ThorchainClient, XChainClient {
     const txMinHeight = undefined
     const txMaxHeight = undefined
 
-    // registerCodecs(getPrefix(this.network))
-
     const txIncomingHistory = (
       await this.cosmosClient.searchTxFromRPC({
         rpcEndpoint: this.getClientUrl().rpc,
@@ -421,8 +419,6 @@ class Client extends BaseXChainClient implements ThorchainClient, XChainClient {
    * @returns {TxHash} The transaction hash.
    */
   async transfer({ walletIndex = 0, asset = AssetRuneNative, amount, recipient, memo }: TxParams): Promise<TxHash> {
-    // registerCodecs(getPrefix(this.network))
-
     const assetBalance = await this.getBalance(this.getAddress(walletIndex), [asset])
     const fee = await this.getFees()
     if (
@@ -439,7 +435,7 @@ class Client extends BaseXChainClient implements ThorchainClient, XChainClient {
       amount: amount.amount().toString(),
       asset: getDenom(asset),
       memo,
-      fee: DEFAULT_GAS_VALUE,
+      gasLimit: fee.fast,
     })
 
     if (!hash) {

packages/xchain-thorchain/src/types/messages.ts

@@ -5,7 +5,6 @@ export type MsgCoin = {
   asset: string
   amount: string
 }
-export class Msg {}
 
 export type StdSignature = {
   pub_key: cosmosclient.PubKey
@@ -16,14 +15,12 @@ export interface StdTxFee {
   amount?: Array<Coin>
 }
 
-export class MsgNativeTx extends Msg {
+export class MsgNativeTx {
   coins: MsgCoin[]
   memo: string
   signer: cosmosclient.AccAddress
 
   constructor(coins: MsgCoin[], memo: string, signer: cosmosclient.AccAddress) {
-    super()
-
     this.coins = coins
     this.memo = memo
     this.signer = signer

packages/xchain-thorchain/src/util.ts

@@ -83,13 +83,7 @@ export const getChainId = () => 'thorchain'
  */
 
 export const registerCodecs = async (): Promise<void> => {
-  // const root = await protobuf.load('bundle.json')
-  // const MsgDeposit = root.lookupType('thorchain/MsgDeposit')
-  // console.log(MsgDeposit)
-  // proto.cosmos.bank.v1beta1.
   codec.register('thorchain/MsgDeposit', types.types.MsgDeposit)
-  //  )
-  // codec.register('thorchain/MsgMultiSend', MsgMultiSend, MsgMultiSend.fromJSON)
 }
 
 /**
@@ -182,13 +176,13 @@ export const buildDepositTx = async (msgNativeTx: MsgNativeTx, nodeUrl: string):
 
   const fee: StdTxFee = response.value?.fee ?? { amount: [] }
 
-  const unsignedStdTx = {
+  const unsignedStdTx = ({
     msg: response.value.msg,
     // override fee
     fee: { ...fee, gas: DEPOSIT_GAS_VALUE },
     signature: [],
     memo: '',
-  } as unknown as StdTx
+  } as unknown) as StdTx
 
   return unsignedStdTx
 }