From c55c654bbac68d6c87af0ba0aa39929f0cc619d3 Mon Sep 17 00:00:00 2001
From: abefernan <44572727+abefernan@users.noreply.github.com>
Date: Wed, 14 Jun 2023 20:33:20 +0200
Subject: [PATCH 01/11] Simplify Tx types

---
 types/txMsg.ts | 89 +++++++++++++++++---------------------------------
 1 file changed, 30 insertions(+), 59 deletions(-)

diff --git a/types/txMsg.ts b/types/txMsg.ts
index 469d6f2..3c7afc9 100644
--- a/types/txMsg.ts
+++ b/types/txMsg.ts
@@ -1,65 +1,36 @@
 import { MsgSend } from "cosmjs-types/cosmos/bank/v1beta1/tx";
-import { MsgSetWithdrawAddress, MsgWithdrawDelegatorReward } from "cosmjs-types/cosmos/distribution/v1beta1/tx";
-import { MsgBeginRedelegate, MsgDelegate, MsgUndelegate } from "cosmjs-types/cosmos/staking/v1beta1/tx";
+import {
+  MsgSetWithdrawAddress,
+  MsgWithdrawDelegatorReward,
+} from "cosmjs-types/cosmos/distribution/v1beta1/tx";
+import {
+  MsgBeginRedelegate,
+  MsgDelegate,
+  MsgUndelegate,
+} from "cosmjs-types/cosmos/staking/v1beta1/tx";
 import { MsgCreateVestingAccount } from "cosmjs-types/cosmos/vesting/v1beta1/tx";
 import { MsgTransfer } from "cosmjs-types/ibc/applications/transfer/v1/tx";
 
-export type MsgType =
-  | "send"
-  | "delegate"
-  | "undelegate"
-  | "redelegate"
-  | "claimRewards"
-  | "setWithdrawAddress"
-  | "createVestingAccount"
-  | "msgTransfer";
+export const MsgTypeUrls = {
+  Send: "/cosmos.bank.v1beta1.MsgSend",
+  SetWithdrawAddress: "/cosmos.distribution.v1beta1.MsgSetWithdrawAddress",
+  WithdrawDelegatorReward: "/cosmos.distribution.v1beta1.MsgWithdrawDelegatorReward",
+  BeginRedelegate: "/cosmos.staking.v1beta1.MsgBeginRedelegate",
+  Delegate: "/cosmos.staking.v1beta1.MsgDelegate",
+  Undelegate: "/cosmos.staking.v1beta1.MsgUndelegate",
+  CreateVestingAccount: "/cosmos.vesting.v1beta1.MsgCreateVestingAccount",
+  Transfer: "/ibc.applications.transfer.v1.MsgTransfer",
+} as const;
 
-export type TxMsg =
-  | TxMsgSend
-  | TxMsgDelegate
-  | TxMsgUndelegate
-  | TxMsgRedelegate
-  | TxMsgClaimRewards
-  | TxMsgSetWithdrawAddress
-  | TxMsgCreateVestingAccount
-  | TxMsgTransfer;
+export type MsgTypeUrl = (typeof MsgTypeUrls)[keyof typeof MsgTypeUrls];
 
-export interface TxMsgSend {
-  readonly typeUrl: "/cosmos.bank.v1beta1.MsgSend";
-  readonly value: MsgSend;
-}
-
-export interface TxMsgDelegate {
-  readonly typeUrl: "/cosmos.staking.v1beta1.MsgDelegate";
-  readonly value: MsgDelegate;
-}
-
-export interface TxMsgUndelegate {
-  readonly typeUrl: "/cosmos.staking.v1beta1.MsgUndelegate";
-  readonly value: MsgUndelegate;
-}
-
-export interface TxMsgRedelegate {
-  readonly typeUrl: "/cosmos.staking.v1beta1.MsgBeginRedelegate";
-  readonly value: MsgBeginRedelegate;
-}
-
-export interface TxMsgClaimRewards {
-  readonly typeUrl: "/cosmos.distribution.v1beta1.MsgWithdrawDelegatorReward";
-  readonly value: MsgWithdrawDelegatorReward;
-}
-
-export interface TxMsgSetWithdrawAddress {
-  readonly typeUrl: "/cosmos.distribution.v1beta1.MsgSetWithdrawAddress";
-  readonly value: MsgSetWithdrawAddress;
-}
-
-export interface TxMsgCreateVestingAccount {
-  readonly typeUrl: "/cosmos.vesting.v1beta1.MsgCreateVestingAccount";
-  readonly value: MsgCreateVestingAccount;
-}
-
-export interface TxMsgTransfer {
-  readonly typeUrl: "/ibc.applications.transfer.v1.MsgTransfer";
-  readonly value: MsgTransfer;
-}
+export const MsgCodecs = {
+  [MsgTypeUrls.Send]: MsgSend,
+  [MsgTypeUrls.SetWithdrawAddress]: MsgSetWithdrawAddress,
+  [MsgTypeUrls.WithdrawDelegatorReward]: MsgWithdrawDelegatorReward,
+  [MsgTypeUrls.BeginRedelegate]: MsgBeginRedelegate,
+  [MsgTypeUrls.Delegate]: MsgDelegate,
+  [MsgTypeUrls.Undelegate]: MsgUndelegate,
+  [MsgTypeUrls.CreateVestingAccount]: MsgCreateVestingAccount,
+  [MsgTypeUrls.Transfer]: MsgTransfer,
+};

From 76df022af848412ced36e8f94fbcea30d4428c3d Mon Sep 17 00:00:00 2001
From: abefernan <44572727+abefernan@users.noreply.github.com>
Date: Wed, 14 Jun 2023 20:36:18 +0200
Subject: [PATCH 02/11] Adapt Tx helpers

---
 lib/txMsgHelpers.ts | 159 ++++++++------------------------------------
 1 file changed, 26 insertions(+), 133 deletions(-)

diff --git a/lib/txMsgHelpers.ts b/lib/txMsgHelpers.ts
index bbbcb92..4cee151 100644
--- a/lib/txMsgHelpers.ts
+++ b/lib/txMsgHelpers.ts
@@ -1,153 +1,60 @@
 import { EncodeObject } from "@cosmjs/proto-signing";
-import Long from "long";
 import { DbTransaction } from "../types";
-import {
-  MsgType,
-  TxMsg,
-  TxMsgClaimRewards,
-  TxMsgCreateVestingAccount,
-  TxMsgDelegate,
-  TxMsgRedelegate,
-  TxMsgSend,
-  TxMsgSetWithdrawAddress,
-  TxMsgTransfer,
-  TxMsgUndelegate,
-} from "../types/txMsg";
+import { MsgCodecs, MsgTypeUrl, MsgTypeUrls } from "../types/txMsg";
 
-const isTxMsgSend = (msg: TxMsg | EncodeObject): msg is TxMsgSend =>
-  msg.typeUrl === "/cosmos.bank.v1beta1.MsgSend" &&
-  "value" in msg &&
-  "fromAddress" in msg.value &&
-  "toAddress" in msg.value &&
-  "amount" in msg.value &&
-  !!msg.value.fromAddress &&
-  !!msg.value.toAddress &&
-  !!msg.value.amount.length;
-
-const isTxMsgDelegate = (msg: TxMsg | EncodeObject): msg is TxMsgDelegate =>
-  msg.typeUrl === "/cosmos.staking.v1beta1.MsgDelegate" &&
-  "value" in msg &&
-  "delegatorAddress" in msg.value &&
-  "validatorAddress" in msg.value &&
-  "amount" in msg.value &&
-  !!msg.value.delegatorAddress &&
-  !!msg.value.validatorAddress &&
-  !!msg.value.amount;
-
-const isTxMsgUndelegate = (msg: TxMsg | EncodeObject): msg is TxMsgUndelegate =>
-  msg.typeUrl === "/cosmos.staking.v1beta1.MsgUndelegate" &&
-  "value" in msg &&
-  "delegatorAddress" in msg.value &&
-  "validatorAddress" in msg.value &&
-  "amount" in msg.value &&
-  !!msg.value.delegatorAddress &&
-  !!msg.value.validatorAddress &&
-  !!msg.value.amount;
-
-const isTxMsgRedelegate = (msg: TxMsg | EncodeObject): msg is TxMsgRedelegate =>
-  msg.typeUrl === "/cosmos.staking.v1beta1.MsgBeginRedelegate" &&
-  "value" in msg &&
-  "delegatorAddress" in msg.value &&
-  "validatorSrcAddress" in msg.value &&
-  "validatorDstAddress" in msg.value &&
-  "amount" in msg.value &&
-  !!msg.value.delegatorAddress &&
-  !!msg.value.validatorSrcAddress &&
-  !!msg.value.validatorDstAddress &&
-  !!msg.value.amount;
-
-const isTxMsgClaimRewards = (msg: TxMsg | EncodeObject): msg is TxMsgClaimRewards =>
-  msg.typeUrl === "/cosmos.distribution.v1beta1.MsgWithdrawDelegatorReward" &&
-  "value" in msg &&
-  "delegatorAddress" in msg.value &&
-  "validatorAddress" in msg.value &&
-  !!msg.value.delegatorAddress &&
-  !!msg.value.validatorAddress;
-
-const isTxMsgSetWithdrawAddress = (msg: TxMsg | EncodeObject): msg is TxMsgSetWithdrawAddress =>
-  msg.typeUrl === "/cosmos.distribution.v1beta1.MsgSetWithdrawAddress" &&
-  "value" in msg &&
-  "delegatorAddress" in msg.value &&
-  "withdrawAddress" in msg.value &&
-  !!msg.value.delegatorAddress &&
-  !!msg.value.withdrawAddress;
-
-const isTxMsgCreateVestingAccount = (msg: TxMsg | EncodeObject): msg is TxMsgCreateVestingAccount =>
-  msg.typeUrl === "/cosmos.vesting.v1beta1.MsgCreateVestingAccount" &&
-  "value" in msg &&
-  "fromAddress" in msg.value &&
-  "toAddress" in msg.value &&
-  "amount" in msg.value &&
-  "endTime" in msg.value &&
-  "delayed" in msg.value &&
-  !!msg.value.fromAddress &&
-  !!msg.value.toAddress &&
-  !!msg.value.amount.length &&
-  !!msg.value.endTime &&
-  typeof msg.value.delayed === "boolean";
-
-const isTxMsgTransfer = (msg: TxMsg | EncodeObject): msg is TxMsgTransfer =>
-  msg.typeUrl === "/ibc.applications.transfer.v1.MsgTransfer" &&
-  "value" in msg &&
-  "sourcePort" in msg.value &&
-  "sourceChannel" in msg.value &&
-  "sender" in msg.value &&
-  "receiver" in msg.value &&
-  !!msg.value.sourcePort &&
-  !!msg.value.sourceChannel &&
-  !!msg.value.sender &&
-  !!msg.value.receiver;
-
-const gasOfMsg = (msgType: MsgType): number => {
+const gasOfMsg = (msgType: MsgTypeUrl): number => {
   switch (msgType) {
-    case "send":
+    case MsgTypeUrls.Send:
       return 100_000;
-    case "delegate":
+    case MsgTypeUrls.SetWithdrawAddress:
       return 100_000;
-    case "undelegate":
+    case MsgTypeUrls.WithdrawDelegatorReward:
       return 100_000;
-    case "redelegate":
+    case MsgTypeUrls.BeginRedelegate:
       return 100_000;
-    case "claimRewards":
+    case MsgTypeUrls.Delegate:
       return 100_000;
-    case "setWithdrawAddress":
+    case MsgTypeUrls.Undelegate:
       return 100_000;
-    case "createVestingAccount":
+    case MsgTypeUrls.CreateVestingAccount:
       return 100_000;
-    case "msgTransfer":
+    case MsgTypeUrls.Transfer:
       return 100_000;
     default:
       throw new Error("Unknown msg type");
   }
 };
 
-const gasOfTx = (msgTypes: readonly MsgType[]): number => {
+export const gasOfTx = (msgTypes: readonly MsgTypeUrl[]): number => {
   const txFlatGas = 100_000;
   const totalTxGas = msgTypes.reduce((acc, msgType) => acc + gasOfMsg(msgType), txFlatGas);
   return totalTxGas;
 };
 
-const importMsgType = (msg: EncodeObject): EncodeObject => {
-  if (isTxMsgCreateVestingAccount(msg)) {
-    return { ...msg, value: { ...msg.value, endTime: Long.fromValue(msg.value.endTime) } };
-  }
+export const isKnownMsgTypeUrl = (typeUrl: string): typeUrl is MsgTypeUrl =>
+  Object.values(MsgTypeUrls).includes(typeUrl as MsgTypeUrl);
 
-  if (isTxMsgTransfer(msg)) {
-    return {
-      ...msg,
-      value: { ...msg.value, timeoutTimestamp: Long.fromValue(msg.value.timeoutTimestamp) },
-    };
+export const exportMsgToJson = (msg: EncodeObject): EncodeObject => {
+  if (isKnownMsgTypeUrl(msg.typeUrl)) {
+    return { ...msg, value: MsgCodecs[msg.typeUrl].toJSON(msg.value) };
   }
 
   return msg;
 };
 
-const importMsgTypes = (msgs: readonly EncodeObject[]): EncodeObject[] => msgs.map(importMsgType);
+const importMsgFromJson = (msg: EncodeObject): EncodeObject => {
+  if (isKnownMsgTypeUrl(msg.typeUrl)) {
+    const parsedValue = MsgCodecs[msg.typeUrl].fromJSON(msg.value);
+    return { ...msg, value: parsedValue };
+  }
 
-const dbTxFromJson = (txJson: string): DbTransaction | null => {
+  return msg;
+};
+
+export const dbTxFromJson = (txJson: string): DbTransaction | null => {
   try {
     const dbTx: DbTransaction = JSON.parse(txJson);
-    dbTx.msgs = importMsgTypes(dbTx.msgs);
+    dbTx.msgs = dbTx.msgs.map(importMsgFromJson);
 
     return dbTx;
   } catch (error) {
@@ -160,17 +67,3 @@ const dbTxFromJson = (txJson: string): DbTransaction | null => {
     return null;
   }
 };
-
-export {
-  isTxMsgSend,
-  isTxMsgDelegate,
-  isTxMsgUndelegate,
-  isTxMsgRedelegate,
-  isTxMsgClaimRewards,
-  isTxMsgSetWithdrawAddress,
-  isTxMsgCreateVestingAccount,
-  isTxMsgTransfer,
-  gasOfMsg,
-  gasOfTx,
-  dbTxFromJson,
-};

From 6413149f6196755d7486232b2d2cad73d2bd041a Mon Sep 17 00:00:00 2001
From: abefernan <44572727+abefernan@users.noreply.github.com>
Date: Wed, 14 Jun 2023 20:37:12 +0200
Subject: [PATCH 03/11] Adapt details forms

---
 .../TxMsgClaimRewardsDetails.tsx              | 10 ++---
 .../TxMsgCreateVestingAccountDetails.tsx      | 24 +++++------
 .../TransactionInfo/TxMsgDelegateDetails.tsx  | 17 +++++---
 .../TxMsgRedelegateDetails.tsx                | 21 +++++----
 .../TransactionInfo/TxMsgSendDetails.tsx      | 12 +++---
 .../TxMsgSetWithdrawAddressDetails.tsx        | 10 ++---
 .../TransactionInfo/TxMsgTransferDetails.tsx  | 25 ++++++-----
 .../TxMsgUndelegateDetails.tsx                | 17 +++++---
 .../dataViews/TransactionInfo/index.tsx       | 43 +++++++++++--------
 9 files changed, 99 insertions(+), 80 deletions(-)

diff --git a/components/dataViews/TransactionInfo/TxMsgClaimRewardsDetails.tsx b/components/dataViews/TransactionInfo/TxMsgClaimRewardsDetails.tsx
index 9ecdd65..5df2193 100644
--- a/components/dataViews/TransactionInfo/TxMsgClaimRewardsDetails.tsx
+++ b/components/dataViews/TransactionInfo/TxMsgClaimRewardsDetails.tsx
@@ -1,19 +1,19 @@
-import { TxMsgClaimRewards } from "../../../types/txMsg";
+import { MsgWithdrawDelegatorReward } from "cosmjs-types/cosmos/distribution/v1beta1/tx";
 import HashView from "../HashView";
 
 interface TxMsgClaimRewardsDetailsProps {
-  readonly msg: TxMsgClaimRewards;
+  readonly msgValue: MsgWithdrawDelegatorReward;
 }
 
-const TxMsgClaimRewardsDetails = ({ msg }: TxMsgClaimRewardsDetailsProps) => (
+const TxMsgClaimRewardsDetails = ({ msgValue }: TxMsgClaimRewardsDetailsProps) => (
   <>
     <li>
       <h3>MsgWithdrawDelegatorReward</h3>
     </li>
     <li>
       <label>Validator Address:</label>
-      <div title={msg.value.validatorAddress}>
-        <HashView hash={msg.value.validatorAddress} />
+      <div title={msgValue.validatorAddress}>
+        <HashView hash={msgValue.validatorAddress} />
       </div>
     </li>
     <style jsx>{`
diff --git a/components/dataViews/TransactionInfo/TxMsgCreateVestingAccountDetails.tsx b/components/dataViews/TransactionInfo/TxMsgCreateVestingAccountDetails.tsx
index 421e39b..3091831 100644
--- a/components/dataViews/TransactionInfo/TxMsgCreateVestingAccountDetails.tsx
+++ b/components/dataViews/TransactionInfo/TxMsgCreateVestingAccountDetails.tsx
@@ -1,15 +1,15 @@
+import { MsgCreateVestingAccount } from "cosmjs-types/cosmos/vesting/v1beta1/tx";
 import { useAppContext } from "../../../context/AppContext";
 import { printableCoins } from "../../../lib/displayHelpers";
-import { TxMsgCreateVestingAccount } from "../../../types/txMsg";
 import HashView from "../HashView";
 
 interface TxMsgCreateVestingAccountDetailsProps {
-  readonly msg: TxMsgCreateVestingAccount;
+  readonly msgValue: MsgCreateVestingAccount;
 }
 
-const TxMsgCreateVestingAccountDetails = ({ msg }: TxMsgCreateVestingAccountDetailsProps) => {
+const TxMsgCreateVestingAccountDetails = ({ msgValue }: TxMsgCreateVestingAccountDetailsProps) => {
   const { state } = useAppContext();
-  const endTimeDateObj = new Date(msg.value.endTime.multiply(1000).toNumber());
+  const endTimeDateObj = new Date(msgValue.endTime.multiply(1000).toNumber());
   const endTimeDate = endTimeDateObj.toLocaleDateString();
   const endTimeHours = endTimeDateObj.toLocaleTimeString().slice(0, -3);
 
@@ -20,23 +20,23 @@ const TxMsgCreateVestingAccountDetails = ({ msg }: TxMsgCreateVestingAccountDeta
       </li>
       <li>
         <label>Amount:</label>
-        <div>{printableCoins(msg.value.amount, state.chain)}</div>
+        <div>{printableCoins(msgValue.amount, state.chain)}</div>
       </li>
       <li>
         <label>From:</label>
-        <div title={msg.value.fromAddress}>
-          <HashView hash={msg.value.fromAddress} />
+        <div title={msgValue.fromAddress}>
+          <HashView hash={msgValue.fromAddress} />
         </div>
       </li>
       <li>
         <label>To:</label>
-        <div title={msg.value.toAddress}>
-          <HashView hash={msg.value.toAddress} />
+        <div title={msgValue.toAddress}>
+          <HashView hash={msgValue.toAddress} />
         </div>
       </li>
       <li>
         <label>End time:</label>
-        <div title={String(msg.value.endTime)}>
+        <div title={String(msgValue.endTime)}>
           <p>
             {endTimeDate} {endTimeHours}
           </p>
@@ -44,8 +44,8 @@ const TxMsgCreateVestingAccountDetails = ({ msg }: TxMsgCreateVestingAccountDeta
       </li>
       <li>
         <label>Delayed:</label>
-        <div title={String(msg.value.endTime)}>
-          <p>{msg.value.delayed ? "Yes" : "No"}</p>
+        <div title={String(msgValue.endTime)}>
+          <p>{msgValue.delayed ? "Yes" : "No"}</p>
         </div>
       </li>
       <style jsx>{`
diff --git a/components/dataViews/TransactionInfo/TxMsgDelegateDetails.tsx b/components/dataViews/TransactionInfo/TxMsgDelegateDetails.tsx
index 96199a4..0b758a1 100644
--- a/components/dataViews/TransactionInfo/TxMsgDelegateDetails.tsx
+++ b/components/dataViews/TransactionInfo/TxMsgDelegateDetails.tsx
@@ -1,16 +1,19 @@
 import { assert } from "@cosmjs/utils";
+import { MsgDelegate } from "cosmjs-types/cosmos/staking/v1beta1/tx";
 import { useAppContext } from "../../../context/AppContext";
 import { printableCoin } from "../../../lib/displayHelpers";
-import { TxMsgDelegate } from "../../../types/txMsg";
 import HashView from "../HashView";
 
 interface TxMsgDelegateDetailsProps {
-  readonly msg: TxMsgDelegate;
+  readonly msgValue: MsgDelegate;
 }
 
-const TxMsgDelegateDetails = ({ msg }: TxMsgDelegateDetailsProps) => {
+const TxMsgDelegateDetails = ({ msgValue }: TxMsgDelegateDetailsProps) => {
   const { state } = useAppContext();
-  assert(msg.value.amount, "Amount must be set, see https://github.com/osmosis-labs/telescope/issues/386");
+  assert(
+    msgValue.amount,
+    "Amount must be set, see https://github.com/osmosis-labs/telescope/issues/386",
+  );
 
   return (
     <>
@@ -19,12 +22,12 @@ const TxMsgDelegateDetails = ({ msg }: TxMsgDelegateDetailsProps) => {
       </li>
       <li>
         <label>Amount:</label>
-        <div>{printableCoin(msg.value.amount, state.chain)}</div>
+        <div>{printableCoin(msgValue.amount, state.chain)}</div>
       </li>
       <li>
         <label>Validator Address:</label>
-        <div title={msg.value.validatorAddress}>
-          <HashView hash={msg.value.validatorAddress} />
+        <div title={msgValue.validatorAddress}>
+          <HashView hash={msgValue.validatorAddress} />
         </div>
       </li>
       <style jsx>{`
diff --git a/components/dataViews/TransactionInfo/TxMsgRedelegateDetails.tsx b/components/dataViews/TransactionInfo/TxMsgRedelegateDetails.tsx
index 7b2bdf3..4e2a842 100644
--- a/components/dataViews/TransactionInfo/TxMsgRedelegateDetails.tsx
+++ b/components/dataViews/TransactionInfo/TxMsgRedelegateDetails.tsx
@@ -1,16 +1,19 @@
 import { assert } from "@cosmjs/utils";
+import { MsgBeginRedelegate } from "cosmjs-types/cosmos/staking/v1beta1/tx";
 import { useAppContext } from "../../../context/AppContext";
 import { printableCoin } from "../../../lib/displayHelpers";
-import { TxMsgRedelegate } from "../../../types/txMsg";
 import HashView from "../HashView";
 
 interface TxMsgRedelegateDetailsProps {
-  readonly msg: TxMsgRedelegate;
+  readonly msgValue: MsgBeginRedelegate;
 }
 
-const TxMsgRedelegateDetails = ({ msg }: TxMsgRedelegateDetailsProps) => {
+const TxMsgRedelegateDetails = ({ msgValue }: TxMsgRedelegateDetailsProps) => {
   const { state } = useAppContext();
-  assert(msg.value.amount, "Amount must be set, same as https://github.com/osmosis-labs/telescope/issues/386");
+  assert(
+    msgValue.amount,
+    "Amount must be set, same as https://github.com/osmosis-labs/telescope/issues/386",
+  );
 
   return (
     <>
@@ -19,18 +22,18 @@ const TxMsgRedelegateDetails = ({ msg }: TxMsgRedelegateDetailsProps) => {
       </li>
       <li>
         <label>Amount:</label>
-        <div>{printableCoin(msg.value.amount, state.chain)}</div>
+        <div>{printableCoin(msgValue.amount, state.chain)}</div>
       </li>
       <li>
         <label>Src Validator Address:</label>
-        <div title={msg.value.validatorSrcAddress}>
-          <HashView hash={msg.value.validatorSrcAddress} />
+        <div title={msgValue.validatorSrcAddress}>
+          <HashView hash={msgValue.validatorSrcAddress} />
         </div>
       </li>
       <li>
         <label>Dst Validator Address:</label>
-        <div title={msg.value.validatorDstAddress}>
-          <HashView hash={msg.value.validatorDstAddress} />
+        <div title={msgValue.validatorDstAddress}>
+          <HashView hash={msgValue.validatorDstAddress} />
         </div>
       </li>
       <style jsx>{`
diff --git a/components/dataViews/TransactionInfo/TxMsgSendDetails.tsx b/components/dataViews/TransactionInfo/TxMsgSendDetails.tsx
index 9e19ddd..3a34ac0 100644
--- a/components/dataViews/TransactionInfo/TxMsgSendDetails.tsx
+++ b/components/dataViews/TransactionInfo/TxMsgSendDetails.tsx
@@ -1,13 +1,13 @@
+import { MsgSend } from "cosmjs-types/cosmos/bank/v1beta1/tx";
 import { useAppContext } from "../../../context/AppContext";
 import { printableCoins } from "../../../lib/displayHelpers";
-import { TxMsgSend } from "../../../types/txMsg";
 import HashView from "../HashView";
 
 interface TxMsgSendDetailsProps {
-  readonly msg: TxMsgSend;
+  readonly msgValue: MsgSend;
 }
 
-const TxMsgSendDetails = ({ msg }: TxMsgSendDetailsProps) => {
+const TxMsgSendDetails = ({ msgValue }: TxMsgSendDetailsProps) => {
   const { state } = useAppContext();
 
   return (
@@ -17,12 +17,12 @@ const TxMsgSendDetails = ({ msg }: TxMsgSendDetailsProps) => {
       </li>
       <li>
         <label>Amount:</label>
-        <div>{printableCoins(msg.value.amount, state.chain)}</div>
+        <div>{printableCoins(msgValue.amount, state.chain)}</div>
       </li>
       <li>
         <label>To:</label>
-        <div title={msg.value.toAddress}>
-          <HashView hash={msg.value.toAddress} />
+        <div title={msgValue.toAddress}>
+          <HashView hash={msgValue.toAddress} />
         </div>
       </li>
       <style jsx>{`
diff --git a/components/dataViews/TransactionInfo/TxMsgSetWithdrawAddressDetails.tsx b/components/dataViews/TransactionInfo/TxMsgSetWithdrawAddressDetails.tsx
index 4919803..1d6e0d0 100644
--- a/components/dataViews/TransactionInfo/TxMsgSetWithdrawAddressDetails.tsx
+++ b/components/dataViews/TransactionInfo/TxMsgSetWithdrawAddressDetails.tsx
@@ -1,19 +1,19 @@
-import { TxMsgSetWithdrawAddress } from "../../../types/txMsg";
+import { MsgSetWithdrawAddress } from "cosmjs-types/cosmos/distribution/v1beta1/tx";
 import HashView from "../HashView";
 
 interface TxMsgSetWithdrawAddressDetailsProps {
-  readonly msg: TxMsgSetWithdrawAddress;
+  readonly msgValue: MsgSetWithdrawAddress;
 }
 
-const TxMsgSetWithdrawAddressDetails = ({ msg }: TxMsgSetWithdrawAddressDetailsProps) => (
+const TxMsgSetWithdrawAddressDetails = ({ msgValue }: TxMsgSetWithdrawAddressDetailsProps) => (
   <>
     <li>
       <h3>MsgSetWithdrawAddress</h3>
     </li>
     <li>
       <label>Withdraw Address:</label>
-      <div title={msg.value.withdrawAddress}>
-        <HashView hash={msg.value.withdrawAddress} />
+      <div title={msgValue.withdrawAddress}>
+        <HashView hash={msgValue.withdrawAddress} />
       </div>
     </li>
     <style jsx>{`
diff --git a/components/dataViews/TransactionInfo/TxMsgTransferDetails.tsx b/components/dataViews/TransactionInfo/TxMsgTransferDetails.tsx
index ef8c546..ae2e4fd 100644
--- a/components/dataViews/TransactionInfo/TxMsgTransferDetails.tsx
+++ b/components/dataViews/TransactionInfo/TxMsgTransferDetails.tsx
@@ -1,15 +1,18 @@
 import { assert } from "@cosmjs/utils";
+import { MsgTransfer } from "cosmjs-types/ibc/applications/transfer/v1/tx";
 import { thinSpace } from "../../../lib/displayHelpers";
-import { TxMsgTransfer } from "../../../types/txMsg";
 import HashView from "../HashView";
 
 interface TxMsgTransferDetailsProps {
-  readonly msg: TxMsgTransfer;
+  readonly msgValue: MsgTransfer;
 }
 
-const TxMsgTransferDetails = ({ msg }: TxMsgTransferDetailsProps) => {
-  assert(msg.value.token, "Token must be set, same as https://github.com/osmosis-labs/telescope/issues/386");
-  const timeoutDateObj = new Date(msg.value.timeoutTimestamp.divide(1_000_000).toNumber());
+const TxMsgTransferDetails = ({ msgValue }: TxMsgTransferDetailsProps) => {
+  assert(
+    msgValue.token,
+    "Token must be set, same as https://github.com/osmosis-labs/telescope/issues/386",
+  );
+  const timeoutDateObj = new Date(msgValue.timeoutTimestamp.divide(1_000_000).toNumber());
   const timeoutDate = timeoutDateObj.toLocaleDateString();
   const timeoutTime = timeoutDateObj.toLocaleTimeString();
 
@@ -20,20 +23,20 @@ const TxMsgTransferDetails = ({ msg }: TxMsgTransferDetailsProps) => {
       </li>
       <li>
         <label>Source Port:</label>
-        <div>{msg.value.sourcePort}</div>
+        <div>{msgValue.sourcePort}</div>
       </li>
       <li>
         <label>Source Channel:</label>
-        <div>{msg.value.sourceChannel}</div>
+        <div>{msgValue.sourceChannel}</div>
       </li>
       <li>
         <label>Token:</label>
-        <div>{msg.value.token.amount + thinSpace + msg.value.token.denom}</div>
+        <div>{msgValue.token.amount + thinSpace + msgValue.token.denom}</div>
       </li>
       <li>
         <label>To:</label>
-        <div title={msg.value.receiver}>
-          <HashView hash={msg.value.receiver} />
+        <div title={msgValue.receiver}>
+          <HashView hash={msgValue.receiver} />
         </div>
       </li>
       <li>
@@ -44,7 +47,7 @@ const TxMsgTransferDetails = ({ msg }: TxMsgTransferDetailsProps) => {
       </li>
       <li>
         <label>Memo:</label>
-        <div>{msg.value.memo}</div>
+        <div>{msgValue.memo}</div>
       </li>
       <style jsx>{`
         li:not(:has(h3)) {
diff --git a/components/dataViews/TransactionInfo/TxMsgUndelegateDetails.tsx b/components/dataViews/TransactionInfo/TxMsgUndelegateDetails.tsx
index 69ca7f0..df50bfb 100644
--- a/components/dataViews/TransactionInfo/TxMsgUndelegateDetails.tsx
+++ b/components/dataViews/TransactionInfo/TxMsgUndelegateDetails.tsx
@@ -1,16 +1,19 @@
 import { assert } from "@cosmjs/utils";
+import { MsgUndelegate } from "cosmjs-types/cosmos/staking/v1beta1/tx";
 import { useAppContext } from "../../../context/AppContext";
 import { printableCoin } from "../../../lib/displayHelpers";
-import { TxMsgUndelegate } from "../../../types/txMsg";
 import HashView from "../HashView";
 
 interface TxMsgUndelegateDetailsProps {
-  readonly msg: TxMsgUndelegate;
+  readonly msgValue: MsgUndelegate;
 }
 
-const TxMsgUndelegateDetails = ({ msg }: TxMsgUndelegateDetailsProps) => {
+const TxMsgUndelegateDetails = ({ msgValue: msg }: TxMsgUndelegateDetailsProps) => {
   const { state } = useAppContext();
-  assert(msg.value.amount, "Amount must be set, same as https://github.com/osmosis-labs/telescope/issues/386");
+  assert(
+    msg.amount,
+    "Amount must be set, same as https://github.com/osmosis-labs/telescope/issues/386",
+  );
 
   return (
     <>
@@ -19,12 +22,12 @@ const TxMsgUndelegateDetails = ({ msg }: TxMsgUndelegateDetailsProps) => {
       </li>
       <li>
         <label>Amount:</label>
-        <div>{printableCoin(msg.value.amount, state.chain)}</div>
+        <div>{printableCoin(msg.amount, state.chain)}</div>
       </li>
       <li>
         <label>Validator Address:</label>
-        <div title={msg.value.validatorAddress}>
-          <HashView hash={msg.value.validatorAddress} />
+        <div title={msg.validatorAddress}>
+          <HashView hash={msg.validatorAddress} />
         </div>
       </li>
       <style jsx>{`
diff --git a/components/dataViews/TransactionInfo/index.tsx b/components/dataViews/TransactionInfo/index.tsx
index 616884f..776a51f 100644
--- a/components/dataViews/TransactionInfo/index.tsx
+++ b/components/dataViews/TransactionInfo/index.tsx
@@ -1,16 +1,7 @@
 import { useAppContext } from "../../../context/AppContext";
 import { printableCoins } from "../../../lib/displayHelpers";
-import {
-  isTxMsgClaimRewards,
-  isTxMsgCreateVestingAccount,
-  isTxMsgDelegate,
-  isTxMsgRedelegate,
-  isTxMsgSend,
-  isTxMsgSetWithdrawAddress,
-  isTxMsgTransfer,
-  isTxMsgUndelegate,
-} from "../../../lib/txMsgHelpers";
 import { DbTransaction } from "../../../types";
+import { MsgTypeUrls } from "../../../types/txMsg";
 import StackableContainer from "../../layout/StackableContainer";
 import TxMsgClaimRewardsDetails from "./TxMsgClaimRewardsDetails";
 import TxMsgCreateVestingAccountDetails from "./TxMsgCreateVestingAccountDetails";
@@ -55,14 +46,30 @@ const TransactionInfo = ({ tx }: Props) => {
           <StackableContainer lessPadding lessMargin>
             {tx.msgs.map((msg, index) => (
               <StackableContainer key={index} lessPadding lessMargin>
-                {isTxMsgSend(msg) ? <TxMsgSendDetails msg={msg} /> : null}
-                {isTxMsgDelegate(msg) ? <TxMsgDelegateDetails msg={msg} /> : null}
-                {isTxMsgUndelegate(msg) ? <TxMsgUndelegateDetails msg={msg} /> : null}
-                {isTxMsgRedelegate(msg) ? <TxMsgRedelegateDetails msg={msg} /> : null}
-                {isTxMsgClaimRewards(msg) ? <TxMsgClaimRewardsDetails msg={msg} /> : null}
-                {isTxMsgSetWithdrawAddress(msg) ? (<TxMsgSetWithdrawAddressDetails msg={msg} />) : null}
-                {isTxMsgCreateVestingAccount(msg) ? (<TxMsgCreateVestingAccountDetails msg={msg} />) : null}
-                {isTxMsgTransfer(msg) ? <TxMsgTransferDetails msg={msg} /> : null}
+                {MsgTypeUrls.Send === msg.typeUrl ? (
+                  <TxMsgSendDetails msgValue={msg.value} />
+                ) : null}
+                {MsgTypeUrls.Delegate === msg.typeUrl ? (
+                  <TxMsgDelegateDetails msgValue={msg.value} />
+                ) : null}
+                {MsgTypeUrls.Undelegate === msg.typeUrl ? (
+                  <TxMsgUndelegateDetails msgValue={msg.value} />
+                ) : null}
+                {MsgTypeUrls.BeginRedelegate === msg.typeUrl ? (
+                  <TxMsgRedelegateDetails msgValue={msg.value} />
+                ) : null}
+                {MsgTypeUrls.WithdrawDelegatorReward === msg.typeUrl ? (
+                  <TxMsgClaimRewardsDetails msgValue={msg.value} />
+                ) : null}
+                {MsgTypeUrls.SetWithdrawAddress === msg.typeUrl ? (
+                  <TxMsgSetWithdrawAddressDetails msgValue={msg.value} />
+                ) : null}
+                {MsgTypeUrls.CreateVestingAccount === msg.typeUrl ? (
+                  <TxMsgCreateVestingAccountDetails msgValue={msg.value} />
+                ) : null}
+                {MsgTypeUrls.Transfer === msg.typeUrl ? (
+                  <TxMsgTransferDetails msgValue={msg.value} />
+                ) : null}
               </StackableContainer>
             ))}
           </StackableContainer>

From 1eeb26c0a011d59abf54f714d0ec0839b34307ef Mon Sep 17 00:00:00 2001
From: abefernan <44572727+abefernan@users.noreply.github.com>
Date: Wed, 14 Jun 2023 20:37:40 +0200
Subject: [PATCH 04/11] Adapt msg forms

---
 .../MsgForm/MsgClaimRewardsForm.tsx           | 17 ++++++-----
 .../MsgForm/MsgCreateVestingAccountForm.tsx   | 26 ++++++++--------
 .../CreateTxForm/MsgForm/MsgDelegateForm.tsx  | 22 +++++++-------
 .../MsgForm/MsgRedelegateForm.tsx             | 24 +++++++--------
 .../CreateTxForm/MsgForm/MsgSendForm.tsx      | 22 +++++++-------
 .../MsgForm/MsgSetWithdrawAddressForm.tsx     | 15 +++++-----
 .../CreateTxForm/MsgForm/MsgTransferForm.tsx  | 30 +++++++++----------
 .../MsgForm/MsgUndelegateForm.tsx             | 22 +++++++-------
 .../forms/CreateTxForm/MsgForm/index.tsx      | 20 ++++++-------
 9 files changed, 100 insertions(+), 98 deletions(-)

diff --git a/components/forms/CreateTxForm/MsgForm/MsgClaimRewardsForm.tsx b/components/forms/CreateTxForm/MsgForm/MsgClaimRewardsForm.tsx
index 1251886..9ada9e5 100644
--- a/components/forms/CreateTxForm/MsgForm/MsgClaimRewardsForm.tsx
+++ b/components/forms/CreateTxForm/MsgForm/MsgClaimRewardsForm.tsx
@@ -1,10 +1,11 @@
+import { MsgWithdrawDelegatorRewardEncodeObject } from "@cosmjs/stargate";
 import { assert } from "@cosmjs/utils";
+import { MsgWithdrawDelegatorReward } from "cosmjs-types/cosmos/distribution/v1beta1/tx";
 import { useEffect, useState } from "react";
 import { MsgGetter } from "..";
 import { useAppContext } from "../../../../context/AppContext";
 import { checkAddress, exampleAddress } from "../../../../lib/displayHelpers";
-import { isTxMsgClaimRewards } from "../../../../lib/txMsgHelpers";
-import { TxMsg, TxMsgClaimRewards } from "../../../../types/txMsg";
+import { MsgTypeUrls } from "../../../../types/txMsg";
 import Input from "../../../inputs/Input";
 import StackableContainer from "../../../layout/StackableContainer";
 
@@ -29,7 +30,7 @@ const MsgClaimRewardsForm = ({
     try {
       setValidatorAddressError("");
 
-      const isMsgValid = (msg: TxMsg): msg is TxMsgClaimRewards => {
+      const isMsgValid = (): boolean => {
         assert(state.chain.addressPrefix, "addressPrefix missing");
 
         const addressErrorMsg = checkAddress(validatorAddress, state.chain.addressPrefix);
@@ -40,12 +41,14 @@ const MsgClaimRewardsForm = ({
           return false;
         }
 
-        return isTxMsgClaimRewards(msg);
+        return true;
       };
 
-      const msg: TxMsgClaimRewards = {
-        typeUrl: "/cosmos.distribution.v1beta1.MsgWithdrawDelegatorReward",
-        value: { delegatorAddress, validatorAddress },
+      const msgValue: MsgWithdrawDelegatorReward = { delegatorAddress, validatorAddress };
+
+      const msg: MsgWithdrawDelegatorRewardEncodeObject = {
+        typeUrl: MsgTypeUrls.WithdrawDelegatorReward,
+        value: msgValue,
       };
 
       setMsgGetter({ isMsgValid, msg });
diff --git a/components/forms/CreateTxForm/MsgForm/MsgCreateVestingAccountForm.tsx b/components/forms/CreateTxForm/MsgForm/MsgCreateVestingAccountForm.tsx
index 424515d..dc8b2d2 100644
--- a/components/forms/CreateTxForm/MsgForm/MsgCreateVestingAccountForm.tsx
+++ b/components/forms/CreateTxForm/MsgForm/MsgCreateVestingAccountForm.tsx
@@ -1,12 +1,13 @@
 import { Decimal } from "@cosmjs/math";
+import { EncodeObject } from "@cosmjs/proto-signing";
 import { assert } from "@cosmjs/utils";
+import { MsgCreateVestingAccount } from "cosmjs-types/cosmos/vesting/v1beta1/tx";
 import { useEffect, useState } from "react";
 import { MsgGetter } from "..";
 import { useAppContext } from "../../../../context/AppContext";
 import { timestampFromDatetimeLocal } from "../../../../lib/dateHelpers";
 import { checkAddress, exampleAddress } from "../../../../lib/displayHelpers";
-import { isTxMsgCreateVestingAccount } from "../../../../lib/txMsgHelpers";
-import { TxMsg, TxMsgCreateVestingAccount } from "../../../../types/txMsg";
+import { MsgTypeUrls } from "../../../../types/txMsg";
 import Input from "../../../inputs/Input";
 import StackableContainer from "../../../layout/StackableContainer";
 
@@ -66,7 +67,7 @@ const MsgCreateVestingAccountForm = ({
       setAmountError("");
       setEndTimeError("");
 
-      const isMsgValid = (msg: TxMsg): msg is TxMsgCreateVestingAccount => {
+      const isMsgValid = (): boolean => {
         assert(state.chain.addressPrefix, "addressPrefix missing");
 
         const addressErrorMsg = checkAddress(toAddress, state.chain.addressPrefix);
@@ -87,24 +88,23 @@ const MsgCreateVestingAccountForm = ({
           return false;
         }
 
-        return isTxMsgCreateVestingAccount(msg);
+        return true;
       };
 
       const amountInAtomics = amount
         ? Decimal.fromUserInput(amount, Number(state.chain.displayDenomExponent)).atomics
         : "0";
 
-      const msg: TxMsgCreateVestingAccount = {
-        typeUrl: "/cosmos.vesting.v1beta1.MsgCreateVestingAccount",
-        value: {
-          fromAddress,
-          toAddress,
-          amount: [{ amount: amountInAtomics, denom: state.chain.denom }],
-          endTime: timestampFromDatetimeLocal(endTime),
-          delayed,
-        },
+      const msgValue: MsgCreateVestingAccount = {
+        fromAddress,
+        toAddress,
+        amount: [{ amount: amountInAtomics, denom: state.chain.denom }],
+        endTime: timestampFromDatetimeLocal(endTime),
+        delayed,
       };
 
+      const msg: EncodeObject = { typeUrl: MsgTypeUrls.CreateVestingAccount, value: msgValue };
+
       setMsgGetter({ isMsgValid, msg });
     } catch {}
   }, [
diff --git a/components/forms/CreateTxForm/MsgForm/MsgDelegateForm.tsx b/components/forms/CreateTxForm/MsgForm/MsgDelegateForm.tsx
index 6819458..efc7389 100644
--- a/components/forms/CreateTxForm/MsgForm/MsgDelegateForm.tsx
+++ b/components/forms/CreateTxForm/MsgForm/MsgDelegateForm.tsx
@@ -1,11 +1,12 @@
 import { Decimal } from "@cosmjs/math";
+import { MsgDelegateEncodeObject } from "@cosmjs/stargate";
 import { assert } from "@cosmjs/utils";
+import { MsgDelegate } from "cosmjs-types/cosmos/staking/v1beta1/tx";
 import { useEffect, useState } from "react";
 import { MsgGetter } from "..";
 import { useAppContext } from "../../../../context/AppContext";
 import { checkAddress, exampleAddress } from "../../../../lib/displayHelpers";
-import { isTxMsgDelegate } from "../../../../lib/txMsgHelpers";
-import { TxMsg, TxMsgDelegate } from "../../../../types/txMsg";
+import { MsgTypeUrls } from "../../../../types/txMsg";
 import Input from "../../../inputs/Input";
 import StackableContainer from "../../../layout/StackableContainer";
 
@@ -32,7 +33,7 @@ const MsgDelegateForm = ({ delegatorAddress, setMsgGetter, deleteMsg }: MsgDeleg
       setValidatorAddressError("");
       setAmountError("");
 
-      const isMsgValid = (msg: TxMsg): msg is TxMsgDelegate => {
+      const isMsgValid = (): boolean => {
         assert(state.chain.addressPrefix, "addressPrefix missing");
 
         const addressErrorMsg = checkAddress(validatorAddress, state.chain.addressPrefix);
@@ -48,7 +49,7 @@ const MsgDelegateForm = ({ delegatorAddress, setMsgGetter, deleteMsg }: MsgDeleg
           return false;
         }
 
-        return isTxMsgDelegate(msg);
+        return true;
       };
 
       const amountInAtomics = Decimal.fromUserInput(
@@ -56,15 +57,14 @@ const MsgDelegateForm = ({ delegatorAddress, setMsgGetter, deleteMsg }: MsgDeleg
         Number(state.chain.displayDenomExponent),
       ).atomics;
 
-      const msg: TxMsgDelegate = {
-        typeUrl: "/cosmos.staking.v1beta1.MsgDelegate",
-        value: {
-          delegatorAddress,
-          validatorAddress,
-          amount: { amount: amountInAtomics, denom: state.chain.denom },
-        },
+      const msgValue: MsgDelegate = {
+        delegatorAddress,
+        validatorAddress,
+        amount: { amount: amountInAtomics, denom: state.chain.denom },
       };
 
+      const msg: MsgDelegateEncodeObject = { typeUrl: MsgTypeUrls.Delegate, value: msgValue };
+
       setMsgGetter({ isMsgValid, msg });
     } catch {}
   }, [
diff --git a/components/forms/CreateTxForm/MsgForm/MsgRedelegateForm.tsx b/components/forms/CreateTxForm/MsgForm/MsgRedelegateForm.tsx
index 096b270..1f74a4b 100644
--- a/components/forms/CreateTxForm/MsgForm/MsgRedelegateForm.tsx
+++ b/components/forms/CreateTxForm/MsgForm/MsgRedelegateForm.tsx
@@ -1,11 +1,12 @@
 import { Decimal } from "@cosmjs/math";
+import { EncodeObject } from "@cosmjs/proto-signing";
 import { assert } from "@cosmjs/utils";
+import { MsgBeginRedelegate } from "cosmjs-types/cosmos/staking/v1beta1/tx";
 import { useEffect, useState } from "react";
 import { MsgGetter } from "..";
 import { useAppContext } from "../../../../context/AppContext";
 import { checkAddress, exampleAddress } from "../../../../lib/displayHelpers";
-import { isTxMsgRedelegate } from "../../../../lib/txMsgHelpers";
-import { TxMsg, TxMsgRedelegate } from "../../../../types/txMsg";
+import { MsgTypeUrls } from "../../../../types/txMsg";
 import Input from "../../../inputs/Input";
 import StackableContainer from "../../../layout/StackableContainer";
 
@@ -39,7 +40,7 @@ const MsgRedelegateForm = ({
       setValidatorDstAddressError("");
       setAmountError("");
 
-      const isMsgValid = (msg: TxMsg): msg is TxMsgRedelegate => {
+      const isMsgValid = (): boolean => {
         assert(state.chain.addressPrefix, "addressPrefix missing");
 
         const srcAddressErrorMsg = checkAddress(validatorSrcAddress, state.chain.addressPrefix);
@@ -63,7 +64,7 @@ const MsgRedelegateForm = ({
           return false;
         }
 
-        return isTxMsgRedelegate(msg);
+        return true;
       };
 
       const amountInAtomics = Decimal.fromUserInput(
@@ -71,16 +72,15 @@ const MsgRedelegateForm = ({
         Number(state.chain.displayDenomExponent),
       ).atomics;
 
-      const msg: TxMsgRedelegate = {
-        typeUrl: "/cosmos.staking.v1beta1.MsgBeginRedelegate",
-        value: {
-          delegatorAddress,
-          validatorSrcAddress,
-          validatorDstAddress,
-          amount: { amount: amountInAtomics, denom: state.chain.denom },
-        },
+      const msgValue: MsgBeginRedelegate = {
+        delegatorAddress,
+        validatorSrcAddress,
+        validatorDstAddress,
+        amount: { amount: amountInAtomics, denom: state.chain.denom },
       };
 
+      const msg: EncodeObject = { typeUrl: MsgTypeUrls.BeginRedelegate, value: msgValue };
+
       setMsgGetter({ isMsgValid, msg });
     } catch {}
   }, [
diff --git a/components/forms/CreateTxForm/MsgForm/MsgSendForm.tsx b/components/forms/CreateTxForm/MsgForm/MsgSendForm.tsx
index e667cdb..0ce64e3 100644
--- a/components/forms/CreateTxForm/MsgForm/MsgSendForm.tsx
+++ b/components/forms/CreateTxForm/MsgForm/MsgSendForm.tsx
@@ -1,11 +1,12 @@
 import { Decimal } from "@cosmjs/math";
+import { MsgSendEncodeObject } from "@cosmjs/stargate";
 import { assert } from "@cosmjs/utils";
+import { MsgSend } from "cosmjs-types/cosmos/bank/v1beta1/tx";
 import { useEffect, useState } from "react";
 import { MsgGetter } from "..";
 import { useAppContext } from "../../../../context/AppContext";
 import { checkAddress, exampleAddress } from "../../../../lib/displayHelpers";
-import { isTxMsgSend } from "../../../../lib/txMsgHelpers";
-import { TxMsg, TxMsgSend } from "../../../../types/txMsg";
+import { MsgTypeUrls } from "../../../../types/txMsg";
 import Input from "../../../inputs/Input";
 import StackableContainer from "../../../layout/StackableContainer";
 
@@ -32,7 +33,7 @@ const MsgSendForm = ({ fromAddress, setMsgGetter, deleteMsg }: MsgSendFormProps)
       setToAddressError("");
       setAmountError("");
 
-      const isMsgValid = (msg: TxMsg): msg is TxMsgSend => {
+      const isMsgValid = (): boolean => {
         assert(state.chain.addressPrefix, "addressPrefix missing");
 
         const addressErrorMsg = checkAddress(toAddress, state.chain.addressPrefix);
@@ -48,22 +49,21 @@ const MsgSendForm = ({ fromAddress, setMsgGetter, deleteMsg }: MsgSendFormProps)
           return false;
         }
 
-        return isTxMsgSend(msg);
+        return true;
       };
 
       const amountInAtomics = amount
         ? Decimal.fromUserInput(amount, Number(state.chain.displayDenomExponent)).atomics
         : "0";
 
-      const msg: TxMsgSend = {
-        typeUrl: "/cosmos.bank.v1beta1.MsgSend",
-        value: {
-          fromAddress,
-          toAddress,
-          amount: [{ amount: amountInAtomics, denom: state.chain.denom }],
-        },
+      const msgValue: MsgSend = {
+        fromAddress,
+        toAddress,
+        amount: [{ amount: amountInAtomics, denom: state.chain.denom }],
       };
 
+      const msg: MsgSendEncodeObject = { typeUrl: MsgTypeUrls.Send, value: msgValue };
+
       setMsgGetter({ isMsgValid, msg });
     } catch {}
   }, [
diff --git a/components/forms/CreateTxForm/MsgForm/MsgSetWithdrawAddressForm.tsx b/components/forms/CreateTxForm/MsgForm/MsgSetWithdrawAddressForm.tsx
index 530ee56..6d78493 100644
--- a/components/forms/CreateTxForm/MsgForm/MsgSetWithdrawAddressForm.tsx
+++ b/components/forms/CreateTxForm/MsgForm/MsgSetWithdrawAddressForm.tsx
@@ -1,10 +1,11 @@
+import { EncodeObject } from "@cosmjs/proto-signing";
 import { assert } from "@cosmjs/utils";
+import { MsgSetWithdrawAddress } from "cosmjs-types/cosmos/distribution/v1beta1/tx";
 import { useEffect, useState } from "react";
 import { MsgGetter } from "..";
 import { useAppContext } from "../../../../context/AppContext";
 import { checkAddress, exampleAddress } from "../../../../lib/displayHelpers";
-import { isTxMsgSetWithdrawAddress } from "../../../../lib/txMsgHelpers";
-import { TxMsg, TxMsgSetWithdrawAddress } from "../../../../types/txMsg";
+import { MsgTypeUrls } from "../../../../types/txMsg";
 import Input from "../../../inputs/Input";
 import StackableContainer from "../../../layout/StackableContainer";
 
@@ -29,7 +30,7 @@ const MsgSetWithdrawAddressForm = ({
     try {
       setWithdrawAddressError("");
 
-      const isMsgValid = (msg: TxMsg): msg is TxMsgSetWithdrawAddress => {
+      const isMsgValid = (): boolean => {
         assert(state.chain.addressPrefix, "addressPrefix missing");
 
         const addressErrorMsg = checkAddress(withdrawAddress, state.chain.addressPrefix);
@@ -40,13 +41,11 @@ const MsgSetWithdrawAddressForm = ({
           return false;
         }
 
-        return isTxMsgSetWithdrawAddress(msg);
+        return true;
       };
 
-      const msg: TxMsgSetWithdrawAddress = {
-        typeUrl: "/cosmos.distribution.v1beta1.MsgSetWithdrawAddress",
-        value: { delegatorAddress, withdrawAddress },
-      };
+      const msgValue: MsgSetWithdrawAddress = { delegatorAddress, withdrawAddress };
+      const msg: EncodeObject = { typeUrl: MsgTypeUrls.SetWithdrawAddress, value: msgValue };
 
       setMsgGetter({ isMsgValid, msg });
     } catch {}
diff --git a/components/forms/CreateTxForm/MsgForm/MsgTransferForm.tsx b/components/forms/CreateTxForm/MsgForm/MsgTransferForm.tsx
index 726c73f..b0a5d1a 100644
--- a/components/forms/CreateTxForm/MsgForm/MsgTransferForm.tsx
+++ b/components/forms/CreateTxForm/MsgForm/MsgTransferForm.tsx
@@ -1,11 +1,12 @@
+import { MsgTransferEncodeObject } from "@cosmjs/stargate";
 import { assert } from "@cosmjs/utils";
+import { MsgTransfer } from "cosmjs-types/ibc/applications/transfer/v1/tx";
 import Long from "long";
 import { useEffect, useState } from "react";
 import { MsgGetter } from "..";
 import { useAppContext } from "../../../../context/AppContext";
 import { checkAddress, exampleAddress } from "../../../../lib/displayHelpers";
-import { isTxMsgTransfer } from "../../../../lib/txMsgHelpers";
-import { TxMsg, TxMsgTransfer } from "../../../../types/txMsg";
+import { MsgTypeUrls } from "../../../../types/txMsg";
 import Input from "../../../inputs/Input";
 import StackableContainer from "../../../layout/StackableContainer";
 
@@ -54,7 +55,7 @@ const MsgTransferForm = ({ fromAddress, setMsgGetter, deleteMsg }: MsgTransferFo
     setToAddressError("");
     setTimeoutError("");
 
-    const isMsgValid = (msg: TxMsg): msg is TxMsgTransfer => {
+    const isMsgValid = (): boolean => {
       if (!sourcePort) {
         setSourcePortError("Source port is required");
         return false;
@@ -89,7 +90,7 @@ const MsgTransferForm = ({ fromAddress, setMsgGetter, deleteMsg }: MsgTransferFo
         setTimeoutError("Timeout must be a valid timestamp in the future");
       }
 
-      return isTxMsgTransfer(msg);
+      return true;
     };
 
     const timeoutTimestamp = (() => {
@@ -105,19 +106,18 @@ const MsgTransferForm = ({ fromAddress, setMsgGetter, deleteMsg }: MsgTransferFo
       }
     })();
 
-    const msg: TxMsgTransfer = {
-      typeUrl: "/ibc.applications.transfer.v1.MsgTransfer",
-      value: {
-        sender: fromAddress,
-        receiver: toAddress,
-        token: { denom, amount },
-        sourcePort,
-        sourceChannel,
-        timeoutTimestamp,
-        memo,
-      },
+    const msgValue: MsgTransfer = {
+      sender: fromAddress,
+      receiver: toAddress,
+      token: { denom, amount },
+      sourcePort,
+      sourceChannel,
+      timeoutTimestamp,
+      memo,
     };
 
+    const msg: MsgTransferEncodeObject = { typeUrl: MsgTypeUrls.Transfer, value: msgValue };
+
     setMsgGetter({ isMsgValid, msg });
   }, [
     amount,
diff --git a/components/forms/CreateTxForm/MsgForm/MsgUndelegateForm.tsx b/components/forms/CreateTxForm/MsgForm/MsgUndelegateForm.tsx
index fccb754..0b1f586 100644
--- a/components/forms/CreateTxForm/MsgForm/MsgUndelegateForm.tsx
+++ b/components/forms/CreateTxForm/MsgForm/MsgUndelegateForm.tsx
@@ -1,11 +1,12 @@
 import { Decimal } from "@cosmjs/math";
+import { MsgUndelegateEncodeObject } from "@cosmjs/stargate";
 import { assert } from "@cosmjs/utils";
+import { MsgUndelegate } from "cosmjs-types/cosmos/staking/v1beta1/tx";
 import { useEffect, useState } from "react";
 import { MsgGetter } from "..";
 import { useAppContext } from "../../../../context/AppContext";
 import { checkAddress, exampleAddress } from "../../../../lib/displayHelpers";
-import { isTxMsgUndelegate } from "../../../../lib/txMsgHelpers";
-import { TxMsg, TxMsgUndelegate } from "../../../../types/txMsg";
+import { MsgTypeUrls } from "../../../../types/txMsg";
 import Input from "../../../inputs/Input";
 import StackableContainer from "../../../layout/StackableContainer";
 
@@ -36,7 +37,7 @@ const MsgUndelegateForm = ({
       setValidatorAddressError("");
       setAmountError("");
 
-      const isMsgValid = (msg: TxMsg): msg is TxMsgUndelegate => {
+      const isMsgValid = (): boolean => {
         assert(state.chain.addressPrefix, "addressPrefix missing");
 
         const addressErrorMsg = checkAddress(validatorAddress, state.chain.addressPrefix);
@@ -52,7 +53,7 @@ const MsgUndelegateForm = ({
           return false;
         }
 
-        return isTxMsgUndelegate(msg);
+        return true;
       };
 
       const amountInAtomics = Decimal.fromUserInput(
@@ -60,15 +61,14 @@ const MsgUndelegateForm = ({
         Number(state.chain.displayDenomExponent),
       ).atomics;
 
-      const msg: TxMsgUndelegate = {
-        typeUrl: "/cosmos.staking.v1beta1.MsgUndelegate",
-        value: {
-          delegatorAddress,
-          validatorAddress,
-          amount: { amount: amountInAtomics, denom: state.chain.denom },
-        },
+      const msgValue: MsgUndelegate = {
+        delegatorAddress,
+        validatorAddress,
+        amount: { amount: amountInAtomics, denom: state.chain.denom },
       };
 
+      const msg: MsgUndelegateEncodeObject = { typeUrl: MsgTypeUrls.Undelegate, value: msgValue };
+
       setMsgGetter({ isMsgValid, msg });
     } catch {}
   }, [
diff --git a/components/forms/CreateTxForm/MsgForm/index.tsx b/components/forms/CreateTxForm/MsgForm/index.tsx
index 1489fa9..bcd9027 100644
--- a/components/forms/CreateTxForm/MsgForm/index.tsx
+++ b/components/forms/CreateTxForm/MsgForm/index.tsx
@@ -1,5 +1,5 @@
 import { MsgGetter } from "..";
-import { MsgType } from "../../../../types/txMsg";
+import { MsgTypeUrl, MsgTypeUrls } from "../../../../types/txMsg";
 import MsgClaimRewardsForm from "./MsgClaimRewardsForm";
 import MsgCreateVestingAccountForm from "./MsgCreateVestingAccountForm";
 import MsgDelegateForm from "./MsgDelegateForm";
@@ -10,7 +10,7 @@ import MsgTransferForm from "./MsgTransferForm";
 import MsgUndelegateForm from "./MsgUndelegateForm";
 
 interface MsgFormProps {
-  readonly msgType: MsgType;
+  readonly msgType: MsgTypeUrl;
   readonly senderAddress: string;
   readonly setMsgGetter: (msgGetter: MsgGetter) => void;
   readonly deleteMsg: () => void;
@@ -18,21 +18,21 @@ interface MsgFormProps {
 
 const MsgForm = ({ msgType, senderAddress, ...restProps }: MsgFormProps) => {
   switch (msgType) {
-    case "send":
+    case MsgTypeUrls.Send:
       return <MsgSendForm fromAddress={senderAddress} {...restProps} />;
-    case "delegate":
+    case MsgTypeUrls.Delegate:
       return <MsgDelegateForm delegatorAddress={senderAddress} {...restProps} />;
-    case "undelegate":
+    case MsgTypeUrls.Undelegate:
       return <MsgUndelegateForm delegatorAddress={senderAddress} {...restProps} />;
-    case "redelegate":
+    case MsgTypeUrls.BeginRedelegate:
       return <MsgRedelegateForm delegatorAddress={senderAddress} {...restProps} />;
-    case "claimRewards":
+    case MsgTypeUrls.WithdrawDelegatorReward:
       return <MsgClaimRewardsForm delegatorAddress={senderAddress} {...restProps} />;
-    case "setWithdrawAddress":
+    case MsgTypeUrls.SetWithdrawAddress:
       return <MsgSetWithdrawAddressForm delegatorAddress={senderAddress} {...restProps} />;
-    case "createVestingAccount":
+    case MsgTypeUrls.CreateVestingAccount:
       return <MsgCreateVestingAccountForm fromAddress={senderAddress} {...restProps} />;
-    case "msgTransfer":
+    case MsgTypeUrls.Transfer:
       return <MsgTransferForm fromAddress={senderAddress} {...restProps} />;
     default:
       return null;

From c41c23b12e285a3d07c4c44c5d9f42516e031502 Mon Sep 17 00:00:00 2001
From: abefernan <44572727+abefernan@users.noreply.github.com>
Date: Wed, 14 Jun 2023 20:37:59 +0200
Subject: [PATCH 05/11] Adapt CreateTxForm

---
 components/forms/CreateTxForm/index.tsx | 45 +++++++++++++++----------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/components/forms/CreateTxForm/index.tsx b/components/forms/CreateTxForm/index.tsx
index e861838..b3a0a05 100644
--- a/components/forms/CreateTxForm/index.tsx
+++ b/components/forms/CreateTxForm/index.tsx
@@ -1,19 +1,21 @@
+import { EncodeObject } from "@cosmjs/proto-signing";
 import { Account, calculateFee } from "@cosmjs/stargate";
 import { assert } from "@cosmjs/utils";
 import axios from "axios";
 import { NextRouter, withRouter } from "next/router";
 import { useRef, useState } from "react";
 import { useAppContext } from "../../../context/AppContext";
-import { gasOfTx } from "../../../lib/txMsgHelpers";
-import { MsgType, TxMsg } from "../../../types/txMsg";
+import { exportMsgToJson, gasOfTx } from "../../../lib/txMsgHelpers";
+import { DbTransaction } from "../../../types";
+import { MsgTypeUrl, MsgTypeUrls } from "../../../types/txMsg";
 import Button from "../../inputs/Button";
 import Input from "../../inputs/Input";
 import StackableContainer from "../../layout/StackableContainer";
 import MsgForm from "./MsgForm";
 
 export interface MsgGetter {
-  readonly isMsgValid: (msg: TxMsg) => msg is TxMsg;
-  readonly msg: TxMsg;
+  readonly isMsgValid: () => boolean;
+  readonly msg: EncodeObject;
 }
 
 interface CreateTxFormProps {
@@ -26,7 +28,7 @@ const CreateTxForm = ({ router, senderAddress, accountOnChain }: CreateTxFormPro
   const { state } = useAppContext();
 
   const [processing, setProcessing] = useState(false);
-  const [msgTypes, setMsgTypes] = useState<readonly MsgType[]>([]);
+  const [msgTypes, setMsgTypes] = useState<readonly MsgTypeUrl[]>([]);
   const [msgKeys, setMsgKeys] = useState<readonly string[]>([]);
   const msgGetters = useRef<MsgGetter[]>([]);
   const [memo, setMemo] = useState("");
@@ -36,7 +38,7 @@ const CreateTxForm = ({ router, senderAddress, accountOnChain }: CreateTxFormPro
   const gasPrice = state.chain.gasPrice;
   assert(gasPrice, "gasPrice missing");
 
-  const addMsgType = (newMsgType: MsgType) => {
+  const addMsgType = (newMsgType: MsgTypeUrl) => {
     setMsgKeys((oldMsgKeys) => [...oldMsgKeys, crypto.randomUUID()]);
     setMsgTypes((oldMsgTypes) => {
       const newMsgTypes = [...oldMsgTypes, newMsgType];
@@ -49,10 +51,11 @@ const CreateTxForm = ({ router, senderAddress, accountOnChain }: CreateTxFormPro
     try {
       assert(typeof accountOnChain.accountNumber === "number", "accountNumber missing");
       assert(msgGetters.current.length, "form filled incorrectly");
+      assert(state.chain.chainId, "chainId missing");
 
       const msgs = msgGetters.current
-        .filter(({ isMsgValid, msg }) => isMsgValid(msg))
-        .map(({ msg }) => msg);
+        .filter(({ isMsgValid }) => isMsgValid())
+        .map(({ msg }) => exportMsgToJson(msg));
 
       if (!msgs.length || msgs.length !== msgTypes.length) return;
 
@@ -63,7 +66,7 @@ const CreateTxForm = ({ router, senderAddress, accountOnChain }: CreateTxFormPro
 
       setProcessing(true);
 
-      const tx = {
+      const tx: DbTransaction = {
         accountNumber: accountOnChain.accountNumber,
         sequence: accountOnChain.sequence,
         chainId: state.chain.chainId,
@@ -108,7 +111,7 @@ const CreateTxForm = ({ router, senderAddress, accountOnChain }: CreateTxFormPro
               ...oldMsgKeys.slice(index + 1),
             ]);
             setMsgTypes((oldMsgTypes) => {
-              const newMsgTypes: MsgType[] = oldMsgTypes.slice();
+              const newMsgTypes: MsgTypeUrl[] = oldMsgTypes.slice();
               newMsgTypes.splice(index, 1);
               setGasLimit(gasOfTx(newMsgTypes));
               return newMsgTypes;
@@ -143,20 +146,26 @@ const CreateTxForm = ({ router, senderAddress, accountOnChain }: CreateTxFormPro
         />
       </div>
       <StackableContainer>
-        <Button label="Add MsgSend" onClick={() => addMsgType("send")} />
-        <Button label="Add MsgDelegate" onClick={() => addMsgType("delegate")} />
-        <Button label="Add MsgUndelegate" onClick={() => addMsgType("undelegate")} />
-        <Button label="Add MsgBeginRedelegate" onClick={() => addMsgType("redelegate")} />
-        <Button label="Add MsgWithdrawDelegatorReward" onClick={() => addMsgType("claimRewards")} />
+        <Button label="Add MsgSend" onClick={() => addMsgType(MsgTypeUrls.Send)} />
+        <Button label="Add MsgDelegate" onClick={() => addMsgType(MsgTypeUrls.Delegate)} />
+        <Button label="Add MsgUndelegate" onClick={() => addMsgType(MsgTypeUrls.Undelegate)} />
+        <Button
+          label="Add MsgBeginRedelegate"
+          onClick={() => addMsgType(MsgTypeUrls.BeginRedelegate)}
+        />
+        <Button
+          label="Add MsgWithdrawDelegatorReward"
+          onClick={() => addMsgType(MsgTypeUrls.WithdrawDelegatorReward)}
+        />
         <Button
           label="Add MsgSetWithdrawAddress"
-          onClick={() => addMsgType("setWithdrawAddress")}
+          onClick={() => addMsgType(MsgTypeUrls.SetWithdrawAddress)}
         />
         <Button
           label="Add MsgCreateVestingAccount"
-          onClick={() => addMsgType("createVestingAccount")}
+          onClick={() => addMsgType(MsgTypeUrls.CreateVestingAccount)}
         />
-        <Button label="Add MsgTransfer" onClick={() => addMsgType("msgTransfer")} />
+        <Button label="Add MsgTransfer" onClick={() => addMsgType(MsgTypeUrls.Transfer)} />
       </StackableContainer>
       <Button
         label="Create Transaction"

From b0c41ab53859ea27a906c2e51b0b8716fb1dd68b Mon Sep 17 00:00:00 2001
From: abefernan <44572727+abefernan@users.noreply.github.com>
Date: Thu, 15 Jun 2023 14:23:06 +0200
Subject: [PATCH 06/11] Extract TxMsgDetails to use switch

---
 .../dataViews/TransactionInfo/index.tsx       | 53 ++++++++++---------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/components/dataViews/TransactionInfo/index.tsx b/components/dataViews/TransactionInfo/index.tsx
index 776a51f..5986a8e 100644
--- a/components/dataViews/TransactionInfo/index.tsx
+++ b/components/dataViews/TransactionInfo/index.tsx
@@ -1,3 +1,4 @@
+import { EncodeObject } from "@cosmjs/proto-signing";
 import { useAppContext } from "../../../context/AppContext";
 import { printableCoins } from "../../../lib/displayHelpers";
 import { DbTransaction } from "../../../types";
@@ -12,11 +13,34 @@ import TxMsgSetWithdrawAddressDetails from "./TxMsgSetWithdrawAddressDetails";
 import TxMsgTransferDetails from "./TxMsgTransferDetails";
 import TxMsgUndelegateDetails from "./TxMsgUndelegateDetails";
 
-interface Props {
+const TxMsgDetails = ({ typeUrl, value: msgValue }: EncodeObject) => {
+  switch (typeUrl) {
+    case MsgTypeUrls.Send:
+      return <TxMsgSendDetails msgValue={msgValue} />;
+    case MsgTypeUrls.Delegate:
+      return <TxMsgDelegateDetails msgValue={msgValue} />;
+    case MsgTypeUrls.Undelegate:
+      return <TxMsgUndelegateDetails msgValue={msgValue} />;
+    case MsgTypeUrls.BeginRedelegate:
+      return <TxMsgRedelegateDetails msgValue={msgValue} />;
+    case MsgTypeUrls.WithdrawDelegatorReward:
+      return <TxMsgClaimRewardsDetails msgValue={msgValue} />;
+    case MsgTypeUrls.SetWithdrawAddress:
+      return <TxMsgSetWithdrawAddressDetails msgValue={msgValue} />;
+    case MsgTypeUrls.CreateVestingAccount:
+      return <TxMsgCreateVestingAccountDetails msgValue={msgValue} />;
+    case MsgTypeUrls.Transfer:
+      return <TxMsgTransferDetails msgValue={msgValue} />;
+    default:
+      return null;
+  }
+};
+
+interface TransactionInfoProps {
   readonly tx: DbTransaction;
 }
 
-const TransactionInfo = ({ tx }: Props) => {
+const TransactionInfo = ({ tx }: TransactionInfoProps) => {
   const { state } = useAppContext();
 
   return (
@@ -46,30 +70,7 @@ const TransactionInfo = ({ tx }: Props) => {
           <StackableContainer lessPadding lessMargin>
             {tx.msgs.map((msg, index) => (
               <StackableContainer key={index} lessPadding lessMargin>
-                {MsgTypeUrls.Send === msg.typeUrl ? (
-                  <TxMsgSendDetails msgValue={msg.value} />
-                ) : null}
-                {MsgTypeUrls.Delegate === msg.typeUrl ? (
-                  <TxMsgDelegateDetails msgValue={msg.value} />
-                ) : null}
-                {MsgTypeUrls.Undelegate === msg.typeUrl ? (
-                  <TxMsgUndelegateDetails msgValue={msg.value} />
-                ) : null}
-                {MsgTypeUrls.BeginRedelegate === msg.typeUrl ? (
-                  <TxMsgRedelegateDetails msgValue={msg.value} />
-                ) : null}
-                {MsgTypeUrls.WithdrawDelegatorReward === msg.typeUrl ? (
-                  <TxMsgClaimRewardsDetails msgValue={msg.value} />
-                ) : null}
-                {MsgTypeUrls.SetWithdrawAddress === msg.typeUrl ? (
-                  <TxMsgSetWithdrawAddressDetails msgValue={msg.value} />
-                ) : null}
-                {MsgTypeUrls.CreateVestingAccount === msg.typeUrl ? (
-                  <TxMsgCreateVestingAccountDetails msgValue={msg.value} />
-                ) : null}
-                {MsgTypeUrls.Transfer === msg.typeUrl ? (
-                  <TxMsgTransferDetails msgValue={msg.value} />
-                ) : null}
+                <TxMsgDetails {...msg} />
               </StackableContainer>
             ))}
           </StackableContainer>

From 1c78950ac63364cbefa31c8c2c55abc79d5b99eb Mon Sep 17 00:00:00 2001
From: abefernan <44572727+abefernan@users.noreply.github.com>
Date: Thu, 15 Jun 2023 14:23:29 +0200
Subject: [PATCH 07/11] Throw error when unknown typeUrl

---
 lib/txMsgHelpers.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/txMsgHelpers.ts b/lib/txMsgHelpers.ts
index 4cee151..8e776a7 100644
--- a/lib/txMsgHelpers.ts
+++ b/lib/txMsgHelpers.ts
@@ -39,7 +39,7 @@ export const exportMsgToJson = (msg: EncodeObject): EncodeObject => {
     return { ...msg, value: MsgCodecs[msg.typeUrl].toJSON(msg.value) };
   }
 
-  return msg;
+  throw new Error("Unknown msg type");
 };
 
 const importMsgFromJson = (msg: EncodeObject): EncodeObject => {
@@ -48,7 +48,7 @@ const importMsgFromJson = (msg: EncodeObject): EncodeObject => {
     return { ...msg, value: parsedValue };
   }
 
-  return msg;
+  throw new Error("Unknown msg type");
 };
 
 export const dbTxFromJson = (txJson: string): DbTransaction | null => {

From 347c6335dfd0b681e29ec5943490ac3659c52ddb Mon Sep 17 00:00:00 2001
From: abefernan <44572727+abefernan@users.noreply.github.com>
Date: Thu, 15 Jun 2023 14:24:10 +0200
Subject: [PATCH 08/11] Build msgValue with fromPartial()

---
 .../forms/CreateTxForm/MsgForm/MsgClaimRewardsForm.tsx    | 8 +++++---
 .../CreateTxForm/MsgForm/MsgCreateVestingAccountForm.tsx  | 7 +++----
 components/forms/CreateTxForm/MsgForm/MsgDelegateForm.tsx | 7 +++----
 .../forms/CreateTxForm/MsgForm/MsgRedelegateForm.tsx      | 7 +++----
 components/forms/CreateTxForm/MsgForm/MsgSendForm.tsx     | 7 +++----
 .../CreateTxForm/MsgForm/MsgSetWithdrawAddressForm.tsx    | 8 +++++---
 components/forms/CreateTxForm/MsgForm/MsgTransferForm.tsx | 7 +++----
 .../forms/CreateTxForm/MsgForm/MsgUndelegateForm.tsx      | 7 +++----
 8 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/components/forms/CreateTxForm/MsgForm/MsgClaimRewardsForm.tsx b/components/forms/CreateTxForm/MsgForm/MsgClaimRewardsForm.tsx
index 9ada9e5..f68ffde 100644
--- a/components/forms/CreateTxForm/MsgForm/MsgClaimRewardsForm.tsx
+++ b/components/forms/CreateTxForm/MsgForm/MsgClaimRewardsForm.tsx
@@ -1,11 +1,10 @@
 import { MsgWithdrawDelegatorRewardEncodeObject } from "@cosmjs/stargate";
 import { assert } from "@cosmjs/utils";
-import { MsgWithdrawDelegatorReward } from "cosmjs-types/cosmos/distribution/v1beta1/tx";
 import { useEffect, useState } from "react";
 import { MsgGetter } from "..";
 import { useAppContext } from "../../../../context/AppContext";
 import { checkAddress, exampleAddress } from "../../../../lib/displayHelpers";
-import { MsgTypeUrls } from "../../../../types/txMsg";
+import { MsgCodecs, MsgTypeUrls } from "../../../../types/txMsg";
 import Input from "../../../inputs/Input";
 import StackableContainer from "../../../layout/StackableContainer";
 
@@ -44,7 +43,10 @@ const MsgClaimRewardsForm = ({
         return true;
       };
 
-      const msgValue: MsgWithdrawDelegatorReward = { delegatorAddress, validatorAddress };
+      const msgValue = MsgCodecs[MsgTypeUrls.WithdrawDelegatorReward].fromPartial({
+        delegatorAddress,
+        validatorAddress,
+      });
 
       const msg: MsgWithdrawDelegatorRewardEncodeObject = {
         typeUrl: MsgTypeUrls.WithdrawDelegatorReward,
diff --git a/components/forms/CreateTxForm/MsgForm/MsgCreateVestingAccountForm.tsx b/components/forms/CreateTxForm/MsgForm/MsgCreateVestingAccountForm.tsx
index dc8b2d2..c2027b2 100644
--- a/components/forms/CreateTxForm/MsgForm/MsgCreateVestingAccountForm.tsx
+++ b/components/forms/CreateTxForm/MsgForm/MsgCreateVestingAccountForm.tsx
@@ -1,13 +1,12 @@
 import { Decimal } from "@cosmjs/math";
 import { EncodeObject } from "@cosmjs/proto-signing";
 import { assert } from "@cosmjs/utils";
-import { MsgCreateVestingAccount } from "cosmjs-types/cosmos/vesting/v1beta1/tx";
 import { useEffect, useState } from "react";
 import { MsgGetter } from "..";
 import { useAppContext } from "../../../../context/AppContext";
 import { timestampFromDatetimeLocal } from "../../../../lib/dateHelpers";
 import { checkAddress, exampleAddress } from "../../../../lib/displayHelpers";
-import { MsgTypeUrls } from "../../../../types/txMsg";
+import { MsgCodecs, MsgTypeUrls } from "../../../../types/txMsg";
 import Input from "../../../inputs/Input";
 import StackableContainer from "../../../layout/StackableContainer";
 
@@ -95,13 +94,13 @@ const MsgCreateVestingAccountForm = ({
         ? Decimal.fromUserInput(amount, Number(state.chain.displayDenomExponent)).atomics
         : "0";
 
-      const msgValue: MsgCreateVestingAccount = {
+      const msgValue = MsgCodecs[MsgTypeUrls.CreateVestingAccount].fromPartial({
         fromAddress,
         toAddress,
         amount: [{ amount: amountInAtomics, denom: state.chain.denom }],
         endTime: timestampFromDatetimeLocal(endTime),
         delayed,
-      };
+      });
 
       const msg: EncodeObject = { typeUrl: MsgTypeUrls.CreateVestingAccount, value: msgValue };
 
diff --git a/components/forms/CreateTxForm/MsgForm/MsgDelegateForm.tsx b/components/forms/CreateTxForm/MsgForm/MsgDelegateForm.tsx
index efc7389..88c2afd 100644
--- a/components/forms/CreateTxForm/MsgForm/MsgDelegateForm.tsx
+++ b/components/forms/CreateTxForm/MsgForm/MsgDelegateForm.tsx
@@ -1,12 +1,11 @@
 import { Decimal } from "@cosmjs/math";
 import { MsgDelegateEncodeObject } from "@cosmjs/stargate";
 import { assert } from "@cosmjs/utils";
-import { MsgDelegate } from "cosmjs-types/cosmos/staking/v1beta1/tx";
 import { useEffect, useState } from "react";
 import { MsgGetter } from "..";
 import { useAppContext } from "../../../../context/AppContext";
 import { checkAddress, exampleAddress } from "../../../../lib/displayHelpers";
-import { MsgTypeUrls } from "../../../../types/txMsg";
+import { MsgCodecs, MsgTypeUrls } from "../../../../types/txMsg";
 import Input from "../../../inputs/Input";
 import StackableContainer from "../../../layout/StackableContainer";
 
@@ -57,11 +56,11 @@ const MsgDelegateForm = ({ delegatorAddress, setMsgGetter, deleteMsg }: MsgDeleg
         Number(state.chain.displayDenomExponent),
       ).atomics;
 
-      const msgValue: MsgDelegate = {
+      const msgValue = MsgCodecs[MsgTypeUrls.Delegate].fromPartial({
         delegatorAddress,
         validatorAddress,
         amount: { amount: amountInAtomics, denom: state.chain.denom },
-      };
+      });
 
       const msg: MsgDelegateEncodeObject = { typeUrl: MsgTypeUrls.Delegate, value: msgValue };
 
diff --git a/components/forms/CreateTxForm/MsgForm/MsgRedelegateForm.tsx b/components/forms/CreateTxForm/MsgForm/MsgRedelegateForm.tsx
index 1f74a4b..64ff72d 100644
--- a/components/forms/CreateTxForm/MsgForm/MsgRedelegateForm.tsx
+++ b/components/forms/CreateTxForm/MsgForm/MsgRedelegateForm.tsx
@@ -1,12 +1,11 @@
 import { Decimal } from "@cosmjs/math";
 import { EncodeObject } from "@cosmjs/proto-signing";
 import { assert } from "@cosmjs/utils";
-import { MsgBeginRedelegate } from "cosmjs-types/cosmos/staking/v1beta1/tx";
 import { useEffect, useState } from "react";
 import { MsgGetter } from "..";
 import { useAppContext } from "../../../../context/AppContext";
 import { checkAddress, exampleAddress } from "../../../../lib/displayHelpers";
-import { MsgTypeUrls } from "../../../../types/txMsg";
+import { MsgCodecs, MsgTypeUrls } from "../../../../types/txMsg";
 import Input from "../../../inputs/Input";
 import StackableContainer from "../../../layout/StackableContainer";
 
@@ -72,12 +71,12 @@ const MsgRedelegateForm = ({
         Number(state.chain.displayDenomExponent),
       ).atomics;
 
-      const msgValue: MsgBeginRedelegate = {
+      const msgValue = MsgCodecs[MsgTypeUrls.BeginRedelegate].fromPartial({
         delegatorAddress,
         validatorSrcAddress,
         validatorDstAddress,
         amount: { amount: amountInAtomics, denom: state.chain.denom },
-      };
+      });
 
       const msg: EncodeObject = { typeUrl: MsgTypeUrls.BeginRedelegate, value: msgValue };
 
diff --git a/components/forms/CreateTxForm/MsgForm/MsgSendForm.tsx b/components/forms/CreateTxForm/MsgForm/MsgSendForm.tsx
index 0ce64e3..dda14ff 100644
--- a/components/forms/CreateTxForm/MsgForm/MsgSendForm.tsx
+++ b/components/forms/CreateTxForm/MsgForm/MsgSendForm.tsx
@@ -1,12 +1,11 @@
 import { Decimal } from "@cosmjs/math";
 import { MsgSendEncodeObject } from "@cosmjs/stargate";
 import { assert } from "@cosmjs/utils";
-import { MsgSend } from "cosmjs-types/cosmos/bank/v1beta1/tx";
 import { useEffect, useState } from "react";
 import { MsgGetter } from "..";
 import { useAppContext } from "../../../../context/AppContext";
 import { checkAddress, exampleAddress } from "../../../../lib/displayHelpers";
-import { MsgTypeUrls } from "../../../../types/txMsg";
+import { MsgCodecs, MsgTypeUrls } from "../../../../types/txMsg";
 import Input from "../../../inputs/Input";
 import StackableContainer from "../../../layout/StackableContainer";
 
@@ -56,11 +55,11 @@ const MsgSendForm = ({ fromAddress, setMsgGetter, deleteMsg }: MsgSendFormProps)
         ? Decimal.fromUserInput(amount, Number(state.chain.displayDenomExponent)).atomics
         : "0";
 
-      const msgValue: MsgSend = {
+      const msgValue = MsgCodecs[MsgTypeUrls.Send].fromPartial({
         fromAddress,
         toAddress,
         amount: [{ amount: amountInAtomics, denom: state.chain.denom }],
-      };
+      });
 
       const msg: MsgSendEncodeObject = { typeUrl: MsgTypeUrls.Send, value: msgValue };
 
diff --git a/components/forms/CreateTxForm/MsgForm/MsgSetWithdrawAddressForm.tsx b/components/forms/CreateTxForm/MsgForm/MsgSetWithdrawAddressForm.tsx
index 6d78493..51074c4 100644
--- a/components/forms/CreateTxForm/MsgForm/MsgSetWithdrawAddressForm.tsx
+++ b/components/forms/CreateTxForm/MsgForm/MsgSetWithdrawAddressForm.tsx
@@ -1,11 +1,10 @@
 import { EncodeObject } from "@cosmjs/proto-signing";
 import { assert } from "@cosmjs/utils";
-import { MsgSetWithdrawAddress } from "cosmjs-types/cosmos/distribution/v1beta1/tx";
 import { useEffect, useState } from "react";
 import { MsgGetter } from "..";
 import { useAppContext } from "../../../../context/AppContext";
 import { checkAddress, exampleAddress } from "../../../../lib/displayHelpers";
-import { MsgTypeUrls } from "../../../../types/txMsg";
+import { MsgCodecs, MsgTypeUrls } from "../../../../types/txMsg";
 import Input from "../../../inputs/Input";
 import StackableContainer from "../../../layout/StackableContainer";
 
@@ -44,7 +43,10 @@ const MsgSetWithdrawAddressForm = ({
         return true;
       };
 
-      const msgValue: MsgSetWithdrawAddress = { delegatorAddress, withdrawAddress };
+      const msgValue = MsgCodecs[MsgTypeUrls.SetWithdrawAddress].fromPartial({
+        delegatorAddress,
+        withdrawAddress,
+      });
       const msg: EncodeObject = { typeUrl: MsgTypeUrls.SetWithdrawAddress, value: msgValue };
 
       setMsgGetter({ isMsgValid, msg });
diff --git a/components/forms/CreateTxForm/MsgForm/MsgTransferForm.tsx b/components/forms/CreateTxForm/MsgForm/MsgTransferForm.tsx
index b0a5d1a..2be611f 100644
--- a/components/forms/CreateTxForm/MsgForm/MsgTransferForm.tsx
+++ b/components/forms/CreateTxForm/MsgForm/MsgTransferForm.tsx
@@ -1,12 +1,11 @@
 import { MsgTransferEncodeObject } from "@cosmjs/stargate";
 import { assert } from "@cosmjs/utils";
-import { MsgTransfer } from "cosmjs-types/ibc/applications/transfer/v1/tx";
 import Long from "long";
 import { useEffect, useState } from "react";
 import { MsgGetter } from "..";
 import { useAppContext } from "../../../../context/AppContext";
 import { checkAddress, exampleAddress } from "../../../../lib/displayHelpers";
-import { MsgTypeUrls } from "../../../../types/txMsg";
+import { MsgCodecs, MsgTypeUrls } from "../../../../types/txMsg";
 import Input from "../../../inputs/Input";
 import StackableContainer from "../../../layout/StackableContainer";
 
@@ -106,7 +105,7 @@ const MsgTransferForm = ({ fromAddress, setMsgGetter, deleteMsg }: MsgTransferFo
       }
     })();
 
-    const msgValue: MsgTransfer = {
+    const msgValue = MsgCodecs[MsgTypeUrls.Transfer].fromPartial({
       sender: fromAddress,
       receiver: toAddress,
       token: { denom, amount },
@@ -114,7 +113,7 @@ const MsgTransferForm = ({ fromAddress, setMsgGetter, deleteMsg }: MsgTransferFo
       sourceChannel,
       timeoutTimestamp,
       memo,
-    };
+    });
 
     const msg: MsgTransferEncodeObject = { typeUrl: MsgTypeUrls.Transfer, value: msgValue };
 
diff --git a/components/forms/CreateTxForm/MsgForm/MsgUndelegateForm.tsx b/components/forms/CreateTxForm/MsgForm/MsgUndelegateForm.tsx
index 0b1f586..890ea4f 100644
--- a/components/forms/CreateTxForm/MsgForm/MsgUndelegateForm.tsx
+++ b/components/forms/CreateTxForm/MsgForm/MsgUndelegateForm.tsx
@@ -1,12 +1,11 @@
 import { Decimal } from "@cosmjs/math";
 import { MsgUndelegateEncodeObject } from "@cosmjs/stargate";
 import { assert } from "@cosmjs/utils";
-import { MsgUndelegate } from "cosmjs-types/cosmos/staking/v1beta1/tx";
 import { useEffect, useState } from "react";
 import { MsgGetter } from "..";
 import { useAppContext } from "../../../../context/AppContext";
 import { checkAddress, exampleAddress } from "../../../../lib/displayHelpers";
-import { MsgTypeUrls } from "../../../../types/txMsg";
+import { MsgCodecs, MsgTypeUrls } from "../../../../types/txMsg";
 import Input from "../../../inputs/Input";
 import StackableContainer from "../../../layout/StackableContainer";
 
@@ -61,11 +60,11 @@ const MsgUndelegateForm = ({
         Number(state.chain.displayDenomExponent),
       ).atomics;
 
-      const msgValue: MsgUndelegate = {
+      const msgValue = MsgCodecs[MsgTypeUrls.Undelegate].fromPartial({
         delegatorAddress,
         validatorAddress,
         amount: { amount: amountInAtomics, denom: state.chain.denom },
-      };
+      });
 
       const msg: MsgUndelegateEncodeObject = { typeUrl: MsgTypeUrls.Undelegate, value: msgValue };
 

From b947f48e91af58b2b1fbcdf4d0fd4fb37726b53a Mon Sep 17 00:00:00 2001
From: abefernan <44572727+abefernan@users.noreply.github.com>
Date: Thu, 15 Jun 2023 14:24:25 +0200
Subject: [PATCH 09/11] Increase staking gas limits

---
 lib/txMsgHelpers.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/txMsgHelpers.ts b/lib/txMsgHelpers.ts
index 8e776a7..f25a199 100644
--- a/lib/txMsgHelpers.ts
+++ b/lib/txMsgHelpers.ts
@@ -11,11 +11,11 @@ const gasOfMsg = (msgType: MsgTypeUrl): number => {
     case MsgTypeUrls.WithdrawDelegatorReward:
       return 100_000;
     case MsgTypeUrls.BeginRedelegate:
-      return 100_000;
+      return 150_000;
     case MsgTypeUrls.Delegate:
-      return 100_000;
+      return 150_000;
     case MsgTypeUrls.Undelegate:
-      return 100_000;
+      return 150_000;
     case MsgTypeUrls.CreateVestingAccount:
       return 100_000;
     case MsgTypeUrls.Transfer:

From 58eaec21503e5fb5ade0670c9285002ce4ac6c5b Mon Sep 17 00:00:00 2001
From: abefernan <44572727+abefernan@users.noreply.github.com>
Date: Thu, 15 Jun 2023 14:24:41 +0200
Subject: [PATCH 10/11] Remove dangling console.logs

---
 components/forms/TransactionSigning.tsx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/components/forms/TransactionSigning.tsx b/components/forms/TransactionSigning.tsx
index 9a361d4..78bc9bc 100644
--- a/components/forms/TransactionSigning.tsx
+++ b/components/forms/TransactionSigning.tsx
@@ -155,8 +155,6 @@ const TransactionSigning = (props: Props) => {
         chainId: state.chain.chainId,
       };
 
-      console.log({ msgs: props.tx.msgs });
-
       const { bodyBytes, signatures } = await signingClient.sign(
         signerAddress,
         props.tx.msgs,
@@ -165,8 +163,6 @@ const TransactionSigning = (props: Props) => {
         signerData,
       );
 
-      console.log({ bodyBytes: toHex(bodyBytes) });
-
       // check existing signatures
       const bases64EncodedSignature = toBase64(signatures[0]);
       const bases64EncodedBodyBytes = toBase64(bodyBytes);

From 649d9d0a841629b1b0536c69dbf26899e366a8b0 Mon Sep 17 00:00:00 2001
From: abefernan <44572727+abefernan@users.noreply.github.com>
Date: Thu, 15 Jun 2023 14:27:32 +0200
Subject: [PATCH 11/11] Remove toHex import

---
 components/forms/TransactionSigning.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/forms/TransactionSigning.tsx b/components/forms/TransactionSigning.tsx
index 78bc9bc..accc20d 100644
--- a/components/forms/TransactionSigning.tsx
+++ b/components/forms/TransactionSigning.tsx
@@ -1,5 +1,5 @@
 import { MultisigThresholdPubkey, makeCosmoshubPath } from "@cosmjs/amino";
-import { toBase64, toHex } from "@cosmjs/encoding";
+import { toBase64 } from "@cosmjs/encoding";
 import { LedgerSigner } from "@cosmjs/ledger-amino";
 import { SigningStargateClient } from "@cosmjs/stargate";
 import { assert } from "@cosmjs/utils";