feat: add timeout

sismo-core · Jul 16, 2023 · e9cb9cb · e9cb9cb
1 parent 3d6fd35
commit e9cb9cb
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 40 deletions.
diff --git a/front/src/app/page.tsx b/front/src/app/page.tsx
@@ -2,25 +2,20 @@
 
 import { useState } from "react";
 import Header from "./components/Header";
-import {
-  useAccount,
-  useNetwork,
-  useSwitchNetwork,
-} from "wagmi";
+import { useAccount, useNetwork, useSwitchNetwork } from "wagmi";
 import { useConnectModal } from "@rainbow-me/rainbowkit";
-import { getProofDataForAuth, getProofDataForClaim, getuserIdFromHex, signMessage } from "@/utils/misc";
+import {
+  getProofDataForAuth,
+  getProofDataForClaim,
+  getuserIdFromHex,
+  signMessage,
+} from "@/utils/misc";
 import { mumbaiFork } from "@/utils/wagmi";
 import {
   SismoConnectButton, // the Sismo Connect React button displayed below
 } from "@sismo-core/sismo-connect-react";
 import { fundMyAccountOnLocalFork } from "@/utils/fundMyAccountOnLocalFork";
-import {
-  AUTHS,
-  CLAIMS,
-  CONFIG,
-  AuthType,
-  ClaimType,
-} from "@/app/sismo-connect-config";
+import { AUTHS, CLAIMS, CONFIG, AuthType, ClaimType } from "@/app/sismo-connect-config";
 import useContract from "@/utils/useContract";
 
 /* ********************  Defines the chain to use *************************** */
@@ -116,7 +111,7 @@ export default function Home() {
             </div>
             {isConnected && !amountClaimed && error && (
               <>
-                <p>{error}</p>
+                <p style={{ color: "#ff6347" }}>{error}</p>
                 {error.slice(0, 16) === "Please switch to" && (
                   <button onClick={() => switchNetwork?.(CHAIN.id)}>Switch chain</button>
                 )}
@@ -281,4 +276,3 @@ export default function Home() {
     </>
   );
 }
-
diff --git a/front/src/utils/useContract.tsx b/front/src/utils/useContract.tsx
@@ -1,11 +1,10 @@
 import { useEffect, useState } from "react";
-import { Chain, formatEther } from "viem";
+import { Chain, TransactionReceipt, formatEther } from "viem";
 import {
   useAccount,
   useContractWrite,
   useNetwork,
   usePrepareContractWrite,
-  usePublicClient,
   useSwitchNetwork,
 } from "wagmi";
 import { waitForTransaction, readContract } from "@wagmi/core";
@@ -40,9 +39,6 @@ export default function useContract({
   const [verifiedClaims, setVerifiedClaims] = useState<VerifiedClaim[]>();
   const [verifiedAuths, setVerifiedAuths] = useState<VerifiedAuth[]>();
   const [verifiedSignedMessage, setVerifiedSignedMessage] = useState<string>();
-  const [nonce, setNonce] = useState<number | null>(null);
-
-  const publicClient = usePublicClient();
   const { chain: currentChain } = useNetwork();
   const { isConnected, address } = useAccount({
     onConnect: async ({ address }) => address && (await fundMyAccountOnLocalFork(address)),
@@ -54,8 +50,7 @@ export default function useContract({
     functionName: "claimWithSismo",
     args: [responseBytes],
     chain,
-    nonce: nonce || undefined,
-    enabled: Boolean(responseBytes) && Boolean(typeof nonce === "number"),
+    enabled: Boolean(responseBytes),
   };
   const { config, error: wagmiSimulateError } = usePrepareContractWrite(contractCallInputs);
   const { writeAsync } = useContractWrite(config);
@@ -65,21 +60,6 @@ export default function useContract({
     setPageState("responseReceived");
   }, [responseBytes]);
 
-  useEffect(() => {
-    if (!address) return;
-    if (currentChain?.id !== chain?.id) return;
-
-    const fetchNonce = async () => {
-      const nonce = await publicClient.getTransactionCount({
-        address: address || "0x00",
-        blockTag: "latest",
-      });
-      setNonce(nonce);
-    };
-
-    fetchNonce();
-  }, [address, chain, currentChain]);
-
   /* *************  Handle simulateContract call & chain errors ************ */
   useEffect(() => {
     if (currentChain?.id !== chain.id) return setError(`Please switch to ${chain.name} network`);
@@ -101,7 +81,25 @@ export default function useContract({
       setPageState("confirmingTransaction");
       const tx = await writeAsync?.();
       setPageState("verifying");
-      const txReceipt = tx && (await waitForTransaction({ hash: tx.hash }));
+      let txReceipt: TransactionReceipt | undefined;
+      if (chain.id === 5151111) {
+        const timeout = new Promise((_, reject) =>
+          setTimeout(
+            () =>
+              reject(
+                new Error(
+                  "Local fork error: operation timed out after 15 seconds, if you are running a local fork on Anvil please make sure to reset your wallet nonce."
+                )
+              ),
+            15000
+          )
+        );
+        const txReceiptPromise = tx && waitForTransaction({ hash: tx.hash });
+        const race = await Promise.race([txReceiptPromise, timeout]);
+        txReceipt = race as TransactionReceipt;
+      } else {
+        txReceipt = tx && (await waitForTransaction({ hash: tx.hash }));
+      }
       if (txReceipt?.status === "success") {
         setAmountClaimed(
           formatEther((await readAirdropContract("balanceOf", [address])) as unknown as bigint)
@@ -113,8 +111,6 @@ export default function useContract({
       }
     } catch (e: any) {
       setError(formatError(e));
-    } finally {
-      setNonce(null);
     }
   }