From 2ebd85b847992afddd8287575dc64f5a81f2b1f4 Mon Sep 17 00:00:00 2001
From: abefernan <44572727+abefernan@users.noreply.github.com>
Date: Mon, 10 Jun 2024 18:17:42 +0200
Subject: [PATCH] Change multisig fetches

---
 components/forms/FindMultisigForm.tsx           |  5 ++---
 .../[address]/transaction/[transactionID].tsx   | 14 +++++++++-----
 pages/[chainName]/[address]/transaction/new.tsx | 17 +++++++++++------
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/components/forms/FindMultisigForm.tsx b/components/forms/FindMultisigForm.tsx
index dc544d5..cec52f3 100644
--- a/components/forms/FindMultisigForm.tsx
+++ b/components/forms/FindMultisigForm.tsx
@@ -18,13 +18,12 @@ import { useForm } from "react-hook-form";
 import { z } from "zod";
 import { useChains } from "../../context/ChainsContext";
 import { exampleAddress } from "../../lib/displayHelpers";
-import { getMultisigAccount } from "../../lib/multisigHelpers";
 
 const existsMultisigAccount = async (chain: ChainInfo, address: string) => {
   try {
     const client = await StargateClient.connect(chain.nodeAddress);
-    const [, account] = await getMultisigAccount(address, chain.addressPrefix, client);
-    return account !== null;
+    const accountOnChain = await client.getAccount(address);
+    return accountOnChain !== null;
   } catch {
     return false;
   }
diff --git a/pages/[chainName]/[address]/transaction/[transactionID].tsx b/pages/[chainName]/[address]/transaction/[transactionID].tsx
index 4ec7640..c3ab6b4 100644
--- a/pages/[chainName]/[address]/transaction/[transactionID].tsx
+++ b/pages/[chainName]/[address]/transaction/[transactionID].tsx
@@ -17,7 +17,7 @@ import Page from "../../../../components/layout/Page";
 import StackableContainer from "../../../../components/layout/StackableContainer";
 import { useChains } from "../../../../context/ChainsContext";
 import { findTransactionByID } from "../../../../lib/graphqlHelpers";
-import { getMultisigAccount } from "../../../../lib/multisigHelpers";
+import { isAccount, getHostedMultisig } from "../../../../lib/multisigHelpers";
 import { requestJson } from "../../../../lib/request";
 import { dbTxFromJson } from "../../../../lib/txMsgHelpers";
 import { DbSignature } from "../../../../types";
@@ -90,11 +90,15 @@ const TransactionPage = ({
           return;
         }
 
-        const client = await StargateClient.connect(chain.nodeAddress);
-        const result = await getMultisigAccount(multisigAddress, chain.addressPrefix, client);
+        const hostedMultisig = await getHostedMultisig(multisigAddress, chain);
 
-        setPubkey(result[0]);
-        setAccountOnChain(result[1]);
+        assert(
+          hostedMultisig.hosted === "db+chain" && isAccount(hostedMultisig.accountOnChain),
+          "Multisig address could not be found",
+        );
+
+        setPubkey(hostedMultisig.pubkeyOnDb);
+        setAccountOnChain(hostedMultisig.accountOnChain);
       } catch (e) {
         console.error("Failed to find multisig address:", e);
         toastError({
diff --git a/pages/[chainName]/[address]/transaction/new.tsx b/pages/[chainName]/[address]/transaction/new.tsx
index 8532ff4..2302ef1 100644
--- a/pages/[chainName]/[address]/transaction/new.tsx
+++ b/pages/[chainName]/[address]/transaction/new.tsx
@@ -1,12 +1,13 @@
 import { isChainInfoFilled } from "@/context/ChainsContext/helpers";
-import { Account, StargateClient } from "@cosmjs/stargate";
+import { Account } from "@cosmjs/stargate";
+import { assert } from "@cosmjs/utils";
 import { useRouter } from "next/router";
 import { useEffect, useState } from "react";
 import CreateTxForm from "../../../../components/forms/CreateTxForm";
 import Page from "../../../../components/layout/Page";
 import StackableContainer from "../../../../components/layout/StackableContainer";
 import { useChains } from "../../../../context/ChainsContext";
-import { getMultisigAccount } from "../../../../lib/multisigHelpers";
+import { isAccount, getHostedMultisig } from "../../../../lib/multisigHelpers";
 
 const NewTransactionPage = () => {
   const { chain } = useChains();
@@ -16,16 +17,20 @@ const NewTransactionPage = () => {
   const multisigAddress = router.query.address?.toString();
 
   useEffect(() => {
-    (async function fetchMultisig() {
+    (async function fetchAccount() {
       try {
         if (!multisigAddress || !isChainInfoFilled(chain) || !chain.nodeAddress) {
           return;
         }
 
-        const client = await StargateClient.connect(chain.nodeAddress);
-        const result = await getMultisigAccount(multisigAddress, chain.addressPrefix, client);
+        const hostedMultisig = await getHostedMultisig(multisigAddress, chain);
 
-        setAccountOnChain(result[1]);
+        assert(
+          hostedMultisig.hosted === "db+chain" && isAccount(hostedMultisig.accountOnChain),
+          "Multisig address could not be found",
+        );
+
+        setAccountOnChain(hostedMultisig.accountOnChain);
         setHasAccountError(false);
       } catch (error: unknown) {
         setHasAccountError(true);