Merge pull request #4 from umee-network/matt/add-wallet-error-handling

Matt/add wallet error handling
umee-network · Feb 24, 2022 · 299ec88 · 299ec88 · vercel · Feb 24, 2022
2 parents d615b41 + d12f026
commit 299ec88
Show file tree

Hide file tree

Showing 6 changed files with 89 additions and 80 deletions.
diff --git a/components/forms/MultisigForm.js b/components/forms/MultisigForm.js
@@ -93,18 +93,13 @@ const MultiSigForm = (props) => {
   const handleCreate = async () => {
     setProcessing(true);
     const compressedPubkeys = pubkeys.map((item) => item.compressedPubkey);
-    let multisigAddress;
-    try {
-      multisigAddress = await createMultisigFromCompressedSecp256k1Pubkeys(
-        compressedPubkeys,
-        parseInt(threshold, 10),
-        state.chain.addressPrefix,
-        state.chain.chainId,
-      );
-      props.router.push(`/multi/${multisigAddress}`);
-    } catch (error) {
-      console.log("Failed to creat multisig: ", error);
-    }
+    const multisigAddress = await createMultisigFromCompressedSecp256k1Pubkeys(
+      compressedPubkeys,
+      parseInt(threshold, 10),
+      state.chain.addressPrefix,
+      state.chain.chainId,
+    );
+    props.router.push(`/multi/${multisigAddress}`);
   };
 
   const togglePubkey = (index) => {

diff --git a/components/forms/TransactionSigning.js b/components/forms/TransactionSigning.js
@@ -16,69 +16,61 @@ const TransactionSigning = (props) => {
 
   useEffect(() => {
     connectWallet();
+    window.addEventListener("keplr_keystorechange", connectWallet);
   }, []);
 
   const connectWallet = async () => {
-    try {
-      await window.keplr.enable(state.chain.chainId);
-      const tempWalletAccount = await window.keplr.getKey(state.chain.chainId);
-      const tempHasSigned = props.signatures.some(
-        (sig) => sig.address === tempWalletAccount.bech32Address,
-      );
-      setWalletAccount(tempWalletAccount);
-      setHasSigned(tempHasSigned);
-    } catch (e) {
-      console.log("enable err: ", e);
-    }
+    await window.keplr.enable(state.chain.chainId);
+    const tempWalletAccount = await window.keplr.getKey(state.chain.chainId);
+    const tempHasSigned = props.signatures.some(
+      (sig) => sig.address === tempWalletAccount.bech32Address,
+    );
+    setWalletAccount(tempWalletAccount);
+    setHasSigned(tempHasSigned);
+    console.log("wallet connected:", tempWalletAccount);
+    window.keplr_wallet = tempWalletAccount;
   };
 
   const signTransaction = async () => {
-    try {
-      window.keplr.defaultOptions = {
-        sign: {
-          preferNoSetMemo: true,
-          preferNoSetFee: true,
-          disableBalanceCheck: true,
-        },
-      };
-      const offlineSigner = window.getOfflineSignerOnlyAmino(state.chain.chainId);
-      const signingClient = await SigningStargateClient.offline(offlineSigner);
-      const signerData = {
-        accountNumber: props.tx.accountNumber,
-        sequence: props.tx.sequence,
-        chainId: state.chain.chainId,
-      };
-      const { bodyBytes, signatures } = await signingClient.sign(
-        walletAccount.bech32Address,
-        props.tx.msgs,
-        props.tx.fee,
-        props.tx.memo,
-        signerData,
-      );
-      // check existing signatures
-      const bases64EncodedSignature = toBase64(signatures[0]);
-      const bases64EncodedBodyBytes = toBase64(bodyBytes);
-      const prevSigMatch = props.signatures.findIndex(
-        (signature) => signature.signature === bases64EncodedSignature,
-      );
+    window.keplr.defaultOptions = {
+      sign: {
+        preferNoSetMemo: true,
+        preferNoSetFee: true,
+        disableBalanceCheck: true,
+      },
+    };
+    const offlineSigner = window.getOfflineSignerOnlyAmino(state.chain.chainId);
+    const signingClient = await SigningStargateClient.offline(offlineSigner);
+    const signerData = {
+      accountNumber: props.tx.accountNumber,
+      sequence: props.tx.sequence,
+      chainId: state.chain.chainId,
+    };
+    const { bodyBytes, signatures } = await signingClient.sign(
+      walletAccount.bech32Address,
+      props.tx.msgs,
+      props.tx.fee,
+      props.tx.memo,
+      signerData,
+    );
+    // check existing signatures
+    const bases64EncodedSignature = toBase64(signatures[0]);
+    const bases64EncodedBodyBytes = toBase64(bodyBytes);
+    const prevSigMatch = props.signatures.findIndex(
+      (signature) => signature.signature === bases64EncodedSignature,
+    );
 
-      if (prevSigMatch > -1) {
-        setSigError("This account has already signed.");
-      } else {
-        const signature = {
-          bodyBytes: bases64EncodedBodyBytes,
-          signature: bases64EncodedSignature,
-          address: walletAccount.bech32Address,
-        };
-        const _res = await axios.post(
-          `/api/transaction/${props.transactionID}/signature`,
-          signature,
-        );
-        props.addSignature(signature);
-        setHasSigned(true);
-      }
-    } catch (error) {
-      console.log("Error creating signature:", error);
+    if (prevSigMatch > -1) {
+      setSigError("This account has already signed.");
+    } else {
+      const signature = {
+        bodyBytes: bases64EncodedBodyBytes,
+        signature: bases64EncodedSignature,
+        address: walletAccount.bech32Address,
+      };
+      const _res = await axios.post(`/api/transaction/${props.transactionID}/signature`, signature);
+      props.addSignature(signature);
+      setHasSigned(true);
     }
   };
 

diff --git a/components/messages/MsgVote.js b/components/messages/MsgVote.js
@@ -3,7 +3,7 @@ import React, { useState, useEffect } from "react";
 import { useAppContext } from "../../context/AppContext";
 import Input from "../../components/inputs/Input";
 import Select from "../../components/inputs/Select";
-import { checkAddress, exampleAddress } from "../../lib/displayHelpers";
+import { checkAddress, checkProposalId } from "../../lib/displayHelpers";
 
 // https://docs.cosmos.network/v0.44/core/proto-docs.html#cosmos.gov.v1beta1.VoteOption
 const voteOptions = [
@@ -19,6 +19,7 @@ const MsgVote = (props) => {
   const onCheck = props.onCheck || (() => {});
   const { state } = useAppContext();
   const [voterError, setVoterError] = useState("");
+  const [proposalIdError, setProposalIdError] = useState("");
 
   // const [amountError, setAmountError] = useState("");
 
@@ -41,6 +42,20 @@ const MsgVote = (props) => {
       }
     }
 
+    const toProposalIdError = checkProposalId(v.proposalId);
+    if (updateInternalErrors) {
+      if (toProposalIdError) {
+        const errorMsg = `Invalid proposal_id for network ${state.chain.chainId}: ${toProposalIdError}`;
+        setProposalIdError(errorMsg);
+      } else {
+        setProposalIdError("");
+      }
+    }
+
+    if (toVoterError || toProposalIdError) {
+      return false;
+    }
+
     return true;
   }
 
@@ -82,6 +97,7 @@ const MsgVote = (props) => {
           type="number"
           value={props.msg.value.proposalId}
           onChange={(e) => checkAndSetProposalId(e.target.value)}
+          error={proposalIdError}
         />
       </div>
       <div className="form-item">

diff --git a/lib/displayHelpers.js b/lib/displayHelpers.js
@@ -123,6 +123,21 @@ const checkAddress = (input, chainAddressPrefix) => {
   return null;
 };
 
+const checkProposalId = (input) => {
+  if (!input) return "Empty";
+  const n = parseInt(input, 10);
+
+  if (isNaN(n)) {
+    return "Expected an integer";
+  }
+
+  if (n < 0) {
+    return "Expected a non-negative number";
+  }
+
+  return null;
+};
+
 /**
  * Returns a link to a transaction in an explorer if an explorer is configured
  * for transactions. Returns null otherwise.
@@ -141,5 +156,6 @@ export {
   exampleAddress,
   examplePubkey,
   checkAddress,
+  checkProposalId,
   explorerLinkTx,
 };
diff --git a/lib/multisigHelpers.js b/lib/multisigHelpers.js
@@ -51,22 +51,15 @@ const getMultisigAccount = async (address, client) => {
   // is new, and has never submitted a transaction its pubkeys will not be
   // available from a node. If the multisig was created with this instance
   // of this tool its pubkey will be available in the fauna datastore
-  let accountOnChain = await client.getAccount(address);
+  const accountOnChain = await client.getAccount(address);
   const chainId = await client.getChainId();
 
   if (!accountOnChain || !accountOnChain.pubkey) {
-    console.log("No pubkey on chain for: ", address);
     const res = await axios.get(`/api/chain/${chainId}/multisig/${address}`);
 
     if (res.status !== 200) {
       throw new Error("Multisig has no pubkey on node, and was not created using this tool.");
     }
-    const pubkey = JSON.parse(res.data.pubkeyJSON);
-
-    if (!accountOnChain) {
-      accountOnChain = {};
-    }
-    accountOnChain.pubkey = pubkey;
   }
   return accountOnChain;
 };

diff --git a/pages/multi/[address]/index.js b/pages/multi/[address]/index.js
@@ -23,12 +23,9 @@ function participantAddressesFromMultisig(multisigPubkey, addressPrefix) {
   );
 }
 
-const msgKinds = ["/cosmos.bank.v1beta1.MsgSend", "/cosmos.staking.v1beta1.MsgDelegate"];
-
 const multipage = (_props) => {
   const { state } = useAppContext();
   const [showTxForm, setShowTxForm] = useState(false);
-  const [msgKind, setMsgKind] = useState("/cosmos.bank.v1beta1.MsgSend");
   const [holdings, setHoldings] = useState("");
   const [accountOnChain, setAccountOnChain] = useState(null);
   const [accountError, setAccountError] = useState(null);