Merge pull request #190 from cosmos/fix/validate-microcoin

Validate macrocoin, allow empty funds and IBC
cosmos · Feb 8, 2024 · 85cd225 · 85cd225
2 parents c3846ca + f8035a5
commit 85cd225
Show file tree

Hide file tree

Showing 16 changed files with 164 additions and 59 deletions.
diff --git a/components/dataViews/TransactionInfo/TxMsgCreateVestingAccountDetails.tsx b/components/dataViews/TransactionInfo/TxMsgCreateVestingAccountDetails.tsx
@@ -20,7 +20,7 @@ const TxMsgCreateVestingAccountDetails = ({ msgValue }: TxMsgCreateVestingAccoun
       </li>
       <li>
         <label>Amount:</label>
-        <div>{printableCoins(msgValue.amount, chain)}</div>
+        <div>{printableCoins(msgValue.amount, chain) || "None"}</div>
       </li>
       <li>
         <label>From:</label>

diff --git a/components/dataViews/TransactionInfo/TxMsgExecuteContractDetails.tsx b/components/dataViews/TransactionInfo/TxMsgExecuteContractDetails.tsx
@@ -43,7 +43,7 @@ const TxMsgExecuteContractDetails = ({ msgValue }: TxMsgExecuteContractDetailsPr
       </li>
       <li>
         <label>Funds:</label>
-        <div>{printableCoins(msgValue.funds, chain)}</div>
+        <div>{printableCoins(msgValue.funds, chain) || "None"}</div>
       </li>
       {parseError ? (
         <li className="parse-error">

diff --git a/components/dataViews/TransactionInfo/TxMsgInstantiateContract2Details.tsx b/components/dataViews/TransactionInfo/TxMsgInstantiateContract2Details.tsx
@@ -59,7 +59,7 @@ const TxMsgInstantiateContract2Details = ({ msgValue }: TxMsgInstantiateContract
       </li>
       <li>
         <label>Funds:</label>
-        <div>{printableCoins(msgValue.funds, chain)}</div>
+        <div>{printableCoins(msgValue.funds, chain) || "None"}</div>
       </li>
       {parseError ? (
         <li className="parse-error">

diff --git a/components/dataViews/TransactionInfo/TxMsgInstantiateContractDetails.tsx b/components/dataViews/TransactionInfo/TxMsgInstantiateContractDetails.tsx
@@ -55,7 +55,7 @@ const TxMsgInstantiateContractDetails = ({ msgValue }: TxMsgInstantiateContractD
       </li>
       <li>
         <label>Funds:</label>
-        <div>{printableCoins(msgValue.funds, chain)}</div>
+        <div>{printableCoins(msgValue.funds, chain) || "None"}</div>
       </li>
       {parseError ? (
         <li className="parse-error">

diff --git a/components/dataViews/TransactionInfo/TxMsgSendDetails.tsx b/components/dataViews/TransactionInfo/TxMsgSendDetails.tsx
@@ -17,7 +17,7 @@ const TxMsgSendDetails = ({ msgValue }: TxMsgSendDetailsProps) => {
       </li>
       <li>
         <label>Amount:</label>
-        <div>{printableCoins(msgValue.amount, chain)}</div>
+        <div>{printableCoins(msgValue.amount, chain) || "None"}</div>
       </li>
       <li>
         <label>To:</label>

diff --git a/components/dataViews/TransactionInfo/index.tsx b/components/dataViews/TransactionInfo/index.tsx
@@ -68,7 +68,7 @@ const TransactionInfo = ({ tx }: TransactionInfoProps) => {
                 </li>
                 <li>
                   <label>Fee:</label>
-                  <div>{printableCoins(tx.fee.amount, chain)}</div>
+                  <div>{printableCoins(tx.fee.amount, chain) || "None"}</div>
                 </li>
               </>
             ) : null}

diff --git a/components/forms/CreateTxForm/MsgForm/MsgCreateVestingAccountForm.tsx b/components/forms/CreateTxForm/MsgForm/MsgCreateVestingAccountForm.tsx
@@ -2,7 +2,7 @@ import { EncodeObject } from "@cosmjs/proto-signing";
 import { useEffect, useState } from "react";
 import { MsgGetter } from "..";
 import { useChains } from "../../../../context/ChainsContext";
-import { macroCoinToMicroCoin } from "../../../../lib/coinHelpers";
+import { displayCoinToBaseCoin } from "../../../../lib/coinHelpers";
 import {
   datetimeLocalFromTimestamp,
   timestampFromDatetimeLocal,
@@ -58,6 +58,13 @@ const MsgCreateVestingAccountForm = ({
         return false;
       }
 
+      try {
+        displayCoinToBaseCoin({ denom: chain.displayDenom, amount }, chain.assets);
+      } catch (e: unknown) {
+        setAmountError(e instanceof Error ? e.message : "Could not set decimals");
+        return false;
+      }
+
       const timeoutDate = new Date(Number(timestampFromDatetimeLocal(endTime, "ms")));
       if (timeoutDate <= new Date()) {
         setEndTimeError("End time must be a date in the future");
@@ -69,16 +76,20 @@ const MsgCreateVestingAccountForm = ({
 
     const microCoin = (() => {
       try {
-        return macroCoinToMicroCoin({ denom: chain.displayDenom, amount }, chain.assets);
+        if (!amount || amount === "0") {
+          return null;
+        }
+
+        return displayCoinToBaseCoin({ denom: chain.displayDenom, amount }, chain.assets);
       } catch {
-        return { denom: chain.displayDenom, amount: "0" };
+        return null;
       }
     })();
 
     const msgValue = MsgCodecs[MsgTypeUrls.CreateVestingAccount].fromPartial({
       fromAddress,
       toAddress,
-      amount: [microCoin],
+      amount: microCoin ? [microCoin] : [],
       endTime: timestampFromDatetimeLocal(endTime, "s"),
       delayed,
     });

diff --git a/components/forms/CreateTxForm/MsgForm/MsgDelegateForm.tsx b/components/forms/CreateTxForm/MsgForm/MsgDelegateForm.tsx
@@ -2,7 +2,7 @@ import { MsgDelegateEncodeObject } from "@cosmjs/stargate";
 import { useEffect, useState } from "react";
 import { MsgGetter } from "..";
 import { useChains } from "../../../../context/ChainsContext";
-import { macroCoinToMicroCoin } from "../../../../lib/coinHelpers";
+import { displayCoinToBaseCoin } from "../../../../lib/coinHelpers";
 import { checkAddress, exampleAddress, trimStringsObj } from "../../../../lib/displayHelpers";
 import { MsgCodecs, MsgTypeUrls } from "../../../../types/txMsg";
 import Input from "../../../inputs/Input";
@@ -46,12 +46,19 @@ const MsgDelegateForm = ({ delegatorAddress, setMsgGetter, deleteMsg }: MsgDeleg
         return false;
       }
 
+      try {
+        displayCoinToBaseCoin({ denom: chain.displayDenom, amount }, chain.assets);
+      } catch (e: unknown) {
+        setAmountError(e instanceof Error ? e.message : "Could not set decimals");
+        return false;
+      }
+
       return true;
     };
 
     const microCoin = (() => {
       try {
-        return macroCoinToMicroCoin({ denom: chain.displayDenom, amount }, chain.assets);
+        return displayCoinToBaseCoin({ denom: chain.displayDenom, amount }, chain.assets);
       } catch {
         return { denom: chain.displayDenom, amount: "0" };
       }

diff --git a/components/forms/CreateTxForm/MsgForm/MsgExecuteContractForm.tsx b/components/forms/CreateTxForm/MsgForm/MsgExecuteContractForm.tsx
@@ -5,7 +5,7 @@ import { useEffect, useRef, useState } from "react";
 import { MsgGetter } from "..";
 import { useChains } from "../../../../context/ChainsContext";
 import { ChainInfo } from "../../../../context/ChainsContext/types";
-import { macroCoinToMicroCoin } from "../../../../lib/coinHelpers";
+import { displayCoinToBaseCoin } from "../../../../lib/coinHelpers";
 import { checkAddress, exampleAddress, trimStringsObj } from "../../../../lib/displayHelpers";
 import { MsgCodecs, MsgTypeUrls } from "../../../../types/txMsg";
 import Input from "../../../inputs/Input";
@@ -55,6 +55,8 @@ const MsgExecuteContractForm = ({
   useEffect(() => {
     // eslint-disable-next-line no-shadow
     const { contractAddress, customDenom, amount } = trimmedInputs;
+    const denom =
+      selectedDenom.value === customDenomOption.value ? customDenom : selectedDenom.value.symbol;
 
     const isMsgValid = (): boolean => {
       setContractAddressError("");
@@ -71,7 +73,12 @@ const MsgExecuteContractForm = ({
         return false;
       }
 
-      if (selectedDenom.value === customDenomOption.value && !customDenom) {
+      if (
+        selectedDenom.value === customDenomOption.value &&
+        !customDenom &&
+        amount &&
+        amount !== "0"
+      ) {
         setCustomDenomError("Custom denom must be set because of selection above");
         return false;
       }
@@ -86,17 +93,27 @@ const MsgExecuteContractForm = ({
         return false;
       }
 
+      if (denom && amount) {
+        try {
+          displayCoinToBaseCoin({ denom, amount }, chain.assets);
+        } catch (e: unknown) {
+          setAmountError(e instanceof Error ? e.message : "Could not set decimals");
+          return false;
+        }
+      }
+
       return true;
     };
 
-    const denom =
-      selectedDenom.value === customDenomOption.value ? customDenom : selectedDenom.value.symbol;
-
     const microCoin = (() => {
       try {
-        return macroCoinToMicroCoin({ denom, amount }, chain.assets);
+        if (!denom || !amount || amount === "0") {
+          return null;
+        }
+
+        return displayCoinToBaseCoin({ denom, amount }, chain.assets);
       } catch {
-        return { denom, amount: "0" };
+        return null;
       }
     })();
 
@@ -113,7 +130,7 @@ const MsgExecuteContractForm = ({
       sender: fromAddress,
       contract: contractAddress,
       msg: msgContentUtf8Array,
-      funds: [microCoin],
+      funds: microCoin ? [microCoin] : [],
     });
 
     const msg: MsgExecuteContractEncodeObject = { typeUrl: MsgTypeUrls.Execute, value: msgValue };

diff --git a/components/forms/CreateTxForm/MsgForm/MsgInstantiateContract2Form.tsx b/components/forms/CreateTxForm/MsgForm/MsgInstantiateContract2Form.tsx
@@ -5,7 +5,7 @@ import { useEffect, useRef, useState } from "react";
 import { MsgGetter } from "..";
 import { useChains } from "../../../../context/ChainsContext";
 import { ChainInfo } from "../../../../context/ChainsContext/types";
-import { macroCoinToMicroCoin } from "../../../../lib/coinHelpers";
+import { displayCoinToBaseCoin } from "../../../../lib/coinHelpers";
 import { checkAddress, exampleAddress, trimStringsObj } from "../../../../lib/displayHelpers";
 import { MsgCodecs, MsgTypeUrls } from "../../../../types/txMsg";
 import Input from "../../../inputs/Input";
@@ -101,7 +101,12 @@ const MsgInstantiateContract2Form = ({
         return false;
       }
 
-      if (selectedDenom.value === customDenomOption.value && !customDenom) {
+      if (
+        selectedDenom.value === customDenomOption.value &&
+        !customDenom &&
+        amount &&
+        amount !== "0"
+      ) {
         setCustomDenomError("Custom denom must be set because of selection above");
         return false;
       }
@@ -116,6 +121,13 @@ const MsgInstantiateContract2Form = ({
         return false;
       }
 
+      try {
+        displayCoinToBaseCoin({ denom, amount }, chain.assets);
+      } catch (e: unknown) {
+        setAmountError(e instanceof Error ? e.message : "Could not set decimals");
+        return false;
+      }
+
       return true;
     };
 
@@ -124,9 +136,13 @@ const MsgInstantiateContract2Form = ({
 
     const microCoin = (() => {
       try {
-        return macroCoinToMicroCoin({ denom, amount }, chain.assets);
+        if (!denom || !amount || amount === "0") {
+          return null;
+        }
+
+        return displayCoinToBaseCoin({ denom, amount }, chain.assets);
       } catch {
-        return { denom, amount: "0" };
+        return null;
       }
     })();
 
@@ -155,7 +171,7 @@ const MsgInstantiateContract2Form = ({
       fixMsg: false,
       salt: hexSalt,
       msg: msgContentUtf8Array,
-      funds: [microCoin],
+      funds: microCoin ? [microCoin] : [],
     });
 
     const msg: MsgInstantiateContract2EncodeObject = {

diff --git a/components/forms/CreateTxForm/MsgForm/MsgInstantiateContractForm.tsx b/components/forms/CreateTxForm/MsgForm/MsgInstantiateContractForm.tsx
@@ -5,7 +5,7 @@ import { useEffect, useRef, useState } from "react";
 import { MsgGetter } from "..";
 import { useChains } from "../../../../context/ChainsContext";
 import { ChainInfo } from "../../../../context/ChainsContext/types";
-import { macroCoinToMicroCoin } from "../../../../lib/coinHelpers";
+import { displayCoinToBaseCoin } from "../../../../lib/coinHelpers";
 import { checkAddress, exampleAddress, trimStringsObj } from "../../../../lib/displayHelpers";
 import { MsgCodecs, MsgTypeUrls } from "../../../../types/txMsg";
 import Input from "../../../inputs/Input";
@@ -87,7 +87,12 @@ const MsgInstantiateContractForm = ({
         return false;
       }
 
-      if (selectedDenom.value === customDenomOption.value && !customDenom) {
+      if (
+        selectedDenom.value === customDenomOption.value &&
+        !customDenom &&
+        amount &&
+        amount !== "0"
+      ) {
         setCustomDenomError("Custom denom must be set because of selection above");
         return false;
       }
@@ -102,6 +107,13 @@ const MsgInstantiateContractForm = ({
         return false;
       }
 
+      try {
+        displayCoinToBaseCoin({ denom, amount }, chain.assets);
+      } catch (e: unknown) {
+        setAmountError(e instanceof Error ? e.message : "Could not set decimals");
+        return false;
+      }
+
       return true;
     };
 
@@ -110,9 +122,13 @@ const MsgInstantiateContractForm = ({
 
     const microCoin = (() => {
       try {
-        return macroCoinToMicroCoin({ denom, amount }, chain.assets);
+        if (!denom || !amount || amount === "0") {
+          return null;
+        }
+
+        return displayCoinToBaseCoin({ denom, amount }, chain.assets);
       } catch {
-        return { denom, amount: "0" };
+        return null;
       }
     })();
 
@@ -131,7 +147,7 @@ const MsgInstantiateContractForm = ({
       label,
       admin: adminAddress,
       msg: msgContentUtf8Array,
-      funds: [microCoin],
+      funds: microCoin ? [microCoin] : [],
     });
 
     const msg: MsgInstantiateContractEncodeObject = {

diff --git a/components/forms/CreateTxForm/MsgForm/MsgRedelegateForm.tsx b/components/forms/CreateTxForm/MsgForm/MsgRedelegateForm.tsx
@@ -2,7 +2,7 @@ import { EncodeObject } from "@cosmjs/proto-signing";
 import { useEffect, useState } from "react";
 import { MsgGetter } from "..";
 import { useChains } from "../../../../context/ChainsContext";
-import { macroCoinToMicroCoin } from "../../../../lib/coinHelpers";
+import { displayCoinToBaseCoin } from "../../../../lib/coinHelpers";
 import { checkAddress, exampleAddress, trimStringsObj } from "../../../../lib/displayHelpers";
 import { MsgCodecs, MsgTypeUrls } from "../../../../types/txMsg";
 import Input from "../../../inputs/Input";
@@ -61,12 +61,19 @@ const MsgRedelegateForm = ({
         return false;
       }
 
+      try {
+        displayCoinToBaseCoin({ denom: chain.displayDenom, amount }, chain.assets);
+      } catch (e: unknown) {
+        setAmountError(e instanceof Error ? e.message : "Could not set decimals");
+        return false;
+      }
+
       return true;
     };
 
     const microCoin = (() => {
       try {
-        return macroCoinToMicroCoin({ denom: chain.displayDenom, amount }, chain.assets);
+        return displayCoinToBaseCoin({ denom: chain.displayDenom, amount }, chain.assets);
       } catch {
         return { denom: chain.displayDenom, amount: "0" };
       }