Merge pull request #111 from cosmos/feat/not-in-multisig

Warn if user not in multisig

components/forms/TransactionSigning.tsx

@@ -1,4 +1,4 @@
-import { makeCosmoshubPath } from "@cosmjs/amino";
+import { MultisigThresholdPubkey, makeCosmoshubPath } from "@cosmjs/amino";
 import { toBase64 } from "@cosmjs/encoding";
 import { LedgerSigner } from "@cosmjs/ledger-amino";
 import { SigningStargateClient } from "@cosmjs/stargate";
@@ -12,6 +12,8 @@ import HashView from "../dataViews/HashView";
 import Button from "../inputs/Button";
 import StackableContainer from "../layout/StackableContainer";
 
+type SigningStatus = "not_signed" | "not_a_member" | "signed";
+
 interface LoadingStates {
   readonly signing?: boolean;
   readonly keplr?: boolean;
@@ -21,15 +23,18 @@ interface LoadingStates {
 interface Props {
   signatures: DbSignature[];
   tx: DbTransaction;
+  pubkey: MultisigThresholdPubkey;
   transactionID: string;
   addSignature: (signature: DbSignature) => void;
 }
 
 const TransactionSigning = (props: Props) => {
+  const memberPubkeys = props.pubkey.value.pubkeys.map(({ value }) => value);
+
   const { state } = useAppContext();
   const [walletAccount, setWalletAccount] = useState<WalletAccount>();
   const [sigError, setSigError] = useState("");
-  const [hasSigned, setHasSigned] = useState(false);
+  const [signing, setSigning] = useState<SigningStatus>("not_signed");
   const [walletType, setWalletType] = useState<"Keplr" | "Ledger">();
   const [ledgerSigner, setLedgerSigner] = useState({});
   const [loading, setLoading] = useState<LoadingStates>({});
@@ -44,12 +49,23 @@ const TransactionSigning = (props: Props) => {
         sign: { preferNoSetFee: true, preferNoSetMemo: true, disableBalanceCheck: true },
       };
       const tempWalletAccount = await window.keplr.getKey(state.chain.chainId);
-      console.log(tempWalletAccount);
-      const tempHasSigned = props.signatures.some(
-        (sig) => sig.address === tempWalletAccount.bech32Address,
-      );
       setWalletAccount(tempWalletAccount);
-      setHasSigned(tempHasSigned);
+
+      const pubkey = toBase64(tempWalletAccount.pubKey);
+      const isMember = memberPubkeys.includes(pubkey);
+      const hasSigned = isMember
+        ? props.signatures.some((sig) => sig.address === tempWalletAccount.bech32Address)
+        : false;
+      if (!isMember) {
+        setSigning("not_a_member");
+      } else {
+        if (hasSigned) {
+          setSigning("signed");
+        } else {
+          setSigning("not_signed");
+        }
+      }
+
       setWalletType("Keplr");
     } catch (e) {
       console.log("enable keplr err: ", e);
@@ -71,20 +87,29 @@ const TransactionSigning = (props: Props) => {
         hdPaths: [makeCosmoshubPath(0)],
         prefix: state.chain.addressPrefix,
       });
-      console.log(offlineSigner);
       const accounts = await offlineSigner.getAccounts();
-      console.log(accounts);
       const tempWalletAccount: WalletAccount = {
         bech32Address: accounts[0].address,
-        pubkey: accounts[0].pubkey,
+        pubKey: accounts[0].pubkey,
         algo: accounts[0].algo,
       };
-
-      const tempHasSigned = props.signatures.some(
-        (sig) => sig.address === tempWalletAccount.bech32Address,
-      );
       setWalletAccount(tempWalletAccount);
-      setHasSigned(tempHasSigned);
+
+      const pubkey = toBase64(tempWalletAccount.pubKey);
+      const isMember = memberPubkeys.includes(pubkey);
+      const hasSigned = isMember
+        ? props.signatures.some((sig) => sig.address === tempWalletAccount.bech32Address)
+        : false;
+      if (!isMember) {
+        setSigning("not_a_member");
+      } else {
+        if (hasSigned) {
+          setSigning("signed");
+        } else {
+          setSigning("not_signed");
+        }
+      }
+
       setLedgerSigner(offlineSigner);
       setWalletType("Ledger");
     } catch (e) {
@@ -142,7 +167,7 @@ const TransactionSigning = (props: Props) => {
           signature,
         );
         props.addSignature(signature);
-        setHasSigned(true);
+        setSigning("signed");
       }
     } catch (e) {
       console.log("signing err: ", e);
@@ -153,7 +178,7 @@ const TransactionSigning = (props: Props) => {
 
   return (
     <StackableContainer lessPadding lessMargin>
-      {hasSigned ? (
+      {signing === "signed" ? (
         <StackableContainer lessPadding lessMargin lessRadius>
           <div className="confirmation">
             <svg viewBox="0 0 77 60" fill="none" xmlns="http://www.w3.org/2000/svg">
@@ -162,7 +187,15 @@ const TransactionSigning = (props: Props) => {
             <p>You've signed this transaction.</p>
           </div>
         </StackableContainer>
-      ) : (
+      ) : null}
+      {signing === "not_a_member" ? (
+        <StackableContainer lessPadding lessMargin lessRadius>
+          <div className="multisig-error">
+            <p>You don't belong to this multisig.</p>
+          </div>
+        </StackableContainer>
+      ) : null}
+      {signing === "not_signed" ? (
         <>
           <h2>Sign this transaction</h2>
           <StackableContainer lessPadding lessMargin lessRadius>
@@ -190,7 +223,7 @@ const TransactionSigning = (props: Props) => {
             )}
           </StackableContainer>
         </>
-      )}
+      ) : null}
       {sigError && (
         <StackableContainer lessPadding lessRadius lessMargin>
           <div className="signature-error">
@@ -241,6 +274,10 @@ const TransactionSigning = (props: Props) => {
           height: 0.8em;
           margin-right: 0.5em;
         }
+        .multisig-error p {
+          color: red;
+          font-size: 16px;
+        }
       `}</style>
     </StackableContainer>
   );

pages/multi/[address]/transaction/[transactionID].tsx

@@ -168,10 +168,11 @@ const TransactionPage = ({
               {broadcastError && <div className="broadcast-error">{broadcastError}</div>}
             </>
           )}
-        {!transactionHash && (
+        {!transactionHash && !!pubkey && (
           <TransactionSigning
             tx={txInfo}
             transactionID={transactionID}
+            pubkey={pubkey}
             signatures={currentSignatures}
             addSignature={addSignature}
           />

types/index.ts

@@ -39,7 +39,7 @@ export interface DbAccount {
 
 export interface WalletAccount {
   address?: Uint8Array;
-  pubkey: Uint8Array;
+  pubKey: Uint8Array;
   algo: string;
   bech32Address: string;
   isNanoLedger?: boolean;