Merge branch 'dev' into feat/case-dev-buttons

kemuru · web-flow · commit c99ea3a9022f · 2024-07-15T15:57:12.000+02:00
diff --git a/web/netlify/functions/authUser.ts b/web/netlify/functions/authUser.ts
@@ -1,10 +1,11 @@
 import middy from "@middy/core";
 import jsonBodyParser from "@middy/http-json-body-parser";
 import { createClient } from "@supabase/supabase-js";
+import { ethers } from "ethers";
 import * as jwt from "jose";
 import { SiweMessage } from "siwe";
 
-import { ETH_SIGNATURE_REGEX, DEFAULT_CHAIN } from "consts/processEnvConsts";
+import { ETH_SIGNATURE_REGEX, DEFAULT_CHAIN, isProductionDeployment } from "consts/processEnvConsts";
 
 import { netlifyUri, netlifyDeployUri, netlifyDeployPrimeUri } from "src/generatedNetlifyInfo.json";
 import { Database } from "src/types/supabase-notification";
@@ -73,9 +74,14 @@ const authUser = async (event) => {
     }
 
     try {
-      await siweMessage.verify({ signature, nonce: nonceData.nonce, time: new Date().toISOString() });
+      // If the main Alchemy API key is permissioned, it won't work in a Netlify Function so we use a dedicated API key
+      const alchemyApiKey = process.env.ALCHEMY_FUNCTIONS_API_KEY ?? process.env.ALCHEMY_API_KEY;
+      const alchemyChain = isProductionDeployment() ? "arb-mainnet" : "arb-sepolia";
+      const alchemyRpcURL = `https://${alchemyChain}.g.alchemy.com/v2/${alchemyApiKey}`;
+      const provider = new ethers.providers.JsonRpcProvider(alchemyRpcURL);
+      await siweMessage.verify({ signature, nonce: nonceData.nonce, time: new Date().toISOString() }, { provider });
     } catch (err) {
-      throw new Error("Invalid signer");
+      throw new Error("Invalid signer: " + JSON.stringify(err));
     }
 
     const { error } = await supabase.from("user-nonce").delete().match({ address: lowerCaseAddress });
diff --git a/web/src/consts/chains.ts b/web/src/consts/chains.ts
@@ -1,16 +1,18 @@
 import { extractChain } from "viem";
-import { Chain, arbitrum, mainnet, arbitrumSepolia, gnosisChiado } from "viem/chains";
+import { Chain, arbitrum, mainnet, arbitrumSepolia, gnosis, gnosisChiado } from "viem/chains";
 
 import { isProductionDeployment } from "./index";
 
 export const DEFAULT_CHAIN = isProductionDeployment() ? arbitrum.id : arbitrumSepolia.id;
 
+// Read/Write
 export const SUPPORTED_CHAINS: Record<number, Chain> = {
   [isProductionDeployment() ? arbitrum.id : arbitrumSepolia.id]: isProductionDeployment() ? arbitrum : arbitrumSepolia,
 };
 
+// Read Only
 export const QUERY_CHAINS: Record<number, Chain> = {
-  [gnosisChiado.id]: gnosisChiado,
+  [isProductionDeployment() ? gnosis.id : gnosisChiado.id]: isProductionDeployment() ? gnosis : gnosisChiado,
   [mainnet.id]: mainnet,
 };
 
diff --git a/web/src/context/Web3Provider.tsx b/web/src/context/Web3Provider.tsx
@@ -3,34 +3,59 @@ import React from "react";
 import { createWeb3Modal } from "@web3modal/wagmi/react";
 import { type Chain } from "viem";
 import { createConfig, fallback, http, WagmiProvider, webSocket } from "wagmi";
-import { mainnet, arbitrumSepolia, arbitrum, gnosisChiado } from "wagmi/chains";
+import { mainnet, arbitrumSepolia, arbitrum, gnosisChiado, gnosis, sepolia } from "wagmi/chains";
 import { walletConnect } from "wagmi/connectors";
 
-import { ALL_CHAINS } from "consts/chains";
+import { ALL_CHAINS, DEFAULT_CHAIN } from "consts/chains";
 import { isProductionDeployment } from "consts/index";
 
 import { lightTheme } from "styles/themes";
 
-const projectId = import.meta.env.WALLETCONNECT_PROJECT_ID ?? "";
-export const alchemyApiKey = import.meta.env.ALCHEMY_API_KEY ?? "";
+const alchemyApiKey = import.meta.env.ALCHEMY_API_KEY ?? "";
+const isProduction = isProductionDeployment();
 
-const chains = ALL_CHAINS as [Chain, ...Chain[]];
+// https://github.com/alchemyplatform/alchemy-sdk-js/blob/96b3f62/src/types/types.ts#L98-L119
+const alchemyToViemChain = {
+  [arbitrum.id]: "arb-mainnet",
+  [arbitrumSepolia.id]: "arb-sepolia",
+  [mainnet.id]: "eth-mainnet",
+  [sepolia.id]: "eth-sepolia",
+};
 
 type AlchemyProtocol = "https" | "wss";
-type AlchemyChain = "arb-sepolia" | "eth-mainnet" | "arb";
-const alchemyURL = (protocol: AlchemyProtocol, chain: AlchemyChain) =>
-  `${protocol}://${chain}.g.alchemy.com/v2/${alchemyApiKey}`;
-const alchemyTransport = (chain: AlchemyChain) =>
-  fallback([webSocket(alchemyURL("wss", chain)), http(alchemyURL("https", chain))]);
-
-const transports = {
-  [isProductionDeployment() ? arbitrum.id : arbitrumSepolia.id]: isProductionDeployment()
-    ? alchemyTransport("arb")
-    : alchemyTransport("arb-sepolia"),
-  [mainnet.id]: alchemyTransport("eth-mainnet"),
-  [gnosisChiado.id]: fallback([webSocket("wss://rpc.chiadochain.net/wss"), http("https://rpc.chiadochain.net")]),
+
+// https://github.com/alchemyplatform/alchemy-sdk-js/blob/96b3f62/src/util/const.ts#L16-L18
+const alchemyURL = (protocol: AlchemyProtocol, chainId: number) =>
+  `${protocol}://${alchemyToViemChain[chainId]}.g.alchemy.com/v2/${alchemyApiKey}`;
+
+export const getChainRpcUrl = (protocol: AlchemyProtocol, chainId: number) => {
+  return alchemyURL(protocol, chainId);
+};
+
+export const getDefaultChainRpcUrl = (protocol: AlchemyProtocol) => {
+  return getChainRpcUrl(protocol, DEFAULT_CHAIN);
+};
+
+export const getTransports = () => {
+  const alchemyTransport = (chain: Chain) =>
+    fallback([http(alchemyURL("https", chain.id)), webSocket(alchemyURL("wss", chain.id))]);
+  const defaultTransport = (chain: Chain) =>
+    fallback([http(chain.rpcUrls.default?.http?.[0]), webSocket(chain.rpcUrls.default?.webSocket?.[0])]);
+
+  return {
+    [isProduction ? arbitrum.id : arbitrumSepolia.id]: isProduction
+      ? alchemyTransport(arbitrum)
+      : alchemyTransport(arbitrumSepolia),
+    [isProduction ? gnosis.id : gnosisChiado.id]: isProduction
+      ? defaultTransport(gnosis)
+      : defaultTransport(gnosisChiado),
+    [mainnet.id]: alchemyTransport(mainnet), // Always enabled for ENS resolution
+  };
 };
 
+const chains = ALL_CHAINS as [Chain, ...Chain[]];
+const transports = getTransports();
+const projectId = import.meta.env.WALLETCONNECT_PROJECT_ID ?? "";
 const wagmiConfig = createConfig({
   chains,
   transports,
diff --git a/web/src/hooks/queries/useClassicAppealQuery.ts b/web/src/hooks/queries/useClassicAppealQuery.ts
@@ -1,5 +1,6 @@
 import { useQuery } from "@tanstack/react-query";
 
+import { REFETCH_INTERVAL } from "consts/index";
 import { useGraphqlBatcher } from "context/GraphqlBatcher";
 
 import { graphql } from "src/graphql";
@@ -38,8 +39,9 @@ export const useClassicAppealQuery = (id?: string | number) => {
   const { graphqlBatcher } = useGraphqlBatcher();
 
   return useQuery<ClassicAppealQuery>({
-    queryKey: ["refetchOnBlock", `classicAppealQuery${id}`],
+    queryKey: [`classicAppealQuery${id}`],
     enabled: isEnabled,
+    refetchInterval: REFETCH_INTERVAL,
     queryFn: async () =>
       isEnabled
         ? await graphqlBatcher.fetch({
diff --git a/web/src/hooks/queries/useCourtDetails.ts b/web/src/hooks/queries/useCourtDetails.ts
@@ -1,5 +1,6 @@
 import { useQuery } from "@tanstack/react-query";
 
+import { REFETCH_INTERVAL } from "consts/index";
 import { useGraphqlBatcher } from "context/GraphqlBatcher";
 
 import { graphql } from "src/graphql";
@@ -29,8 +30,9 @@ export const useCourtDetails = (id?: string) => {
   const { graphqlBatcher } = useGraphqlBatcher();
 
   return useQuery<CourtDetailsQuery>({
-    queryKey: ["refetchOnBlock", `courtDetails${id}`],
+    queryKey: [`courtDetails${id}`],
     enabled: isEnabled,
+    refetchInterval: REFETCH_INTERVAL,
     queryFn: async () =>
       await graphqlBatcher.fetch({ id: crypto.randomUUID(), document: courtDetailsQuery, variables: { id } }),
   });
diff --git a/web/src/hooks/queries/useDisputeDetailsQuery.ts b/web/src/hooks/queries/useDisputeDetailsQuery.ts
@@ -1,5 +1,6 @@
 import { useQuery } from "@tanstack/react-query";
 
+import { REFETCH_INTERVAL } from "consts/index";
 import { useGraphqlBatcher } from "context/GraphqlBatcher";
 
 import { graphql } from "src/graphql";
@@ -38,8 +39,9 @@ export const useDisputeDetailsQuery = (id?: string | number) => {
   const { graphqlBatcher } = useGraphqlBatcher();
 
   return useQuery<DisputeDetailsQuery>({
-    queryKey: ["refetchOnBlock", `disputeDetailsQuery${id}`],
+    queryKey: [`disputeDetailsQuery${id}`],
     enabled: isEnabled,
+    refetchInterval: REFETCH_INTERVAL,
     queryFn: async () =>
       await graphqlBatcher.fetch({
         id: crypto.randomUUID(),
diff --git a/web/src/hooks/queries/useEvidences.ts b/web/src/hooks/queries/useEvidences.ts
@@ -1,5 +1,6 @@
 import { useQuery } from "@tanstack/react-query";
 
+import { REFETCH_INTERVAL } from "consts/index";
 import { useGraphqlBatcher } from "context/GraphqlBatcher";
 
 import { graphql } from "src/graphql";
@@ -24,8 +25,9 @@ export const useEvidences = (evidenceGroup?: string) => {
   const { graphqlBatcher } = useGraphqlBatcher();
 
   return useQuery({
-    queryKey: ["refetchOnBlock", `evidencesQuery${evidenceGroup}`],
+    queryKey: [`evidencesQuery${evidenceGroup}`],
     enabled: isEnabled,
+    refetchInterval: REFETCH_INTERVAL,
     queryFn: async () =>
       await graphqlBatcher.fetch({
         id: crypto.randomUUID(),
diff --git a/web/src/hooks/queries/useJurorStakeDetailsQuery.ts b/web/src/hooks/queries/useJurorStakeDetailsQuery.ts
@@ -1,5 +1,6 @@
 import { useQuery } from "@tanstack/react-query";
 
+import { REFETCH_INTERVAL } from "consts/index";
 import { useGraphqlBatcher } from "context/GraphqlBatcher";
 
 import { graphql } from "src/graphql";
@@ -24,8 +25,9 @@ export const useJurorStakeDetailsQuery = (userId?: string) => {
   const { graphqlBatcher } = useGraphqlBatcher();
 
   return useQuery<JurorStakeDetailsQuery>({
-    queryKey: ["refetchOnBlock", `jurorStakeDetails${userId}`],
+    queryKey: [`jurorStakeDetails${userId}`],
     enabled: isEnabled,
+    refetchInterval: REFETCH_INTERVAL,
     queryFn: async () =>
       await graphqlBatcher.fetch({ id: crypto.randomUUID(), document: jurorStakeDetailsQuery, variables: { userId } }),
   });
diff --git a/web/src/hooks/queries/useVotingHistory.ts b/web/src/hooks/queries/useVotingHistory.ts
@@ -1,5 +1,6 @@
 import { useQuery } from "@tanstack/react-query";
 
+import { REFETCH_INTERVAL } from "consts/index";
 import { useGraphqlBatcher } from "context/GraphqlBatcher";
 
 import { graphql } from "src/graphql";
@@ -49,8 +50,9 @@ export const useVotingHistory = (disputeID?: string) => {
   const { graphqlBatcher } = useGraphqlBatcher();
 
   return useQuery<VotingHistoryQuery>({
-    queryKey: ["refetchOnBlock", `VotingHistory${disputeID}`],
+    queryKey: [`VotingHistory${disputeID}`],
     enabled: isEnabled,
+    refetchInterval: REFETCH_INTERVAL,
     queryFn: async () =>
       await graphqlBatcher.fetch({ id: crypto.randomUUID(), document: votingHistoryQuery, variables: { disputeID } }),
   });
