fix: hardcoded block number for filter queries

Author: jaybuidl

contracts/.gitignore

@@ -179,3 +179,8 @@ tags
 # .pnp.*
 
 # End of https://www.toptal.com/developers/gitignore/api/vim,node,visualstudiocode,yarn
+
+.env*
+.flaskenv*
+!.env.project
+!.env.vault

contracts/.npmignore

@@ -9,3 +9,8 @@
 # Except this
 /deployments/localhost/
 **/.DS_Store
+
+.env*
+.flaskenv*
+!.env.project
+!.env.vault

web/.env.devnet.public

@@ -2,4 +2,5 @@
 export REACT_APP_DEPLOYMENT=devnet
 export REACT_APP_CORE_SUBGRAPH=https://api.studio.thegraph.com/query/61738/kleros-v2-core-devnet/v0.0.1
 export REACT_APP_DRT_ARBSEPOLIA_SUBGRAPH=https://api.studio.thegraph.com/query/61738/kleros-v2-drt-arbisep-devnet/v0.0.1
-export REACT_APP_STATUS_URL=https://kleros-v2-devnet.betteruptime.com/badge
+export REACT_APP_STATUS_URL=https://kleros-v2-devnet.betteruptime.com/badge
+export REACT_APP_GENESIS_BLOCK_ARBSEPOLIA=3084598

web/src/consts/index.ts

@@ -18,4 +18,6 @@ export const TELEGRAM_REGEX = /^@\w{5,32}$/;
 export const ETH_ADDRESS_REGEX = /^0x[a-fA-F0-9]{40}$/;
 export const ETH_SIGNATURE_REGEX = /^0x[a-fA-F0-9]{130}$/;
 
+export const GENESIS_BLOCK_ARBSEPOLIA = BigInt(process.env.REACT_APP_GENESIS_BLOCK_ARBSEPOLIA ?? 0);
+
 export const isProductionDeployment = () => process.env.REACT_APP_DEPLOYMENT !== "mainnet";

web/src/hooks/queries/useDisputeTemplate.ts

@@ -3,10 +3,10 @@ import { graphql } from "src/graphql";
 import { PublicClient } from "viem";
 import { usePublicClient } from "wagmi";
 import { getIArbitrableV2 } from "hooks/contracts/generated";
-import { DisputeTemplateQuery } from "src/graphql/graphql";
 import { isUndefined } from "utils/index";
-import { graphqlQueryFnHelper } from "utils/graphqlQueryFnHelper";
+import { graphqlQueryFnHelper, graphqlUrl } from "utils/graphqlQueryFnHelper";
 import { useIsCrossChainDispute } from "../useIsCrossChainDispute";
+import { GENESIS_BLOCK_ARBSEPOLIA } from "consts/index";
 
 const disputeTemplateQuery = graphql(`
   query DisputeTemplate($id: ID!) {
@@ -62,7 +62,7 @@ const getTemplateId = async (
       _arbitrableDisputeID: BigInt(disputeID),
     },
     {
-      fromBlock: 27808516n,
+      fromBlock: GENESIS_BLOCK_ARBSEPOLIA,
       toBlock: "latest",
     }
   );

web/src/hooks/queries/useEvidenceGroup.ts

@@ -2,6 +2,7 @@ import { useQuery } from "@tanstack/react-query";
 import { getIArbitrableV2 } from "hooks/contracts/generated";
 import { usePublicClient } from "wagmi";
 import { isUndefined } from "utils/index";
+import { GENESIS_BLOCK_ARBSEPOLIA } from "consts/index";
 
 export const useEvidenceGroup = (disputeID?: string, arbitrableAddress?: `0x${string}`) => {
   const isEnabled = !isUndefined(arbitrableAddress);
@@ -20,7 +21,7 @@ export const useEvidenceGroup = (disputeID?: string, arbitrableAddress?: `0x${st
             _arbitrableDisputeID: BigInt(disputeID),
           },
           {
-            fromBlock: 27808516n,
+            fromBlock: GENESIS_BLOCK_ARBSEPOLIA,
             toBlock: "latest",
           }
         );

web/src/hooks/useIsCrossChainDispute.ts

@@ -2,6 +2,7 @@ import { useQuery } from "@tanstack/react-query";
 import { usePublicClient } from "wagmi";
 import { getIHomeGateway } from "hooks/contracts/generated";
 import { isUndefined } from "utils/index";
+import { GENESIS_BLOCK_ARBSEPOLIA } from "consts";
 
 interface IIsCrossChainDispute {
   isCrossChainDispute: boolean;
@@ -27,7 +28,7 @@ export const useIsCrossChainDispute = (disputeID?: string, arbitrableAddress?: `
             _arbitratorDisputeID: BigInt(disputeID),
           },
           {
-            fromBlock: 27808516n,
+            fromBlock: GENESIS_BLOCK_ARBSEPOLIA,
             toBlock: "latest",
           }
         );

web/src/utils/graphqlQueryFnHelper.ts

@@ -1,12 +1,13 @@
 import request from "graphql-request";
+import { arbitrumSepolia } from "wagmi/chains";
 import { TypedDocumentNode } from "@graphql-typed-document-node/core";
 
 const CHAINID_TO_DISPUTE_TEMPLATE_SUBGRAPH = {
-  421614:
+  [arbitrumSepolia.id]:
     process.env.REACT_APP_DRT_ARBSEPOLIA_SUBGRAPH ?? "Wrong Subgraph URL. Please check the environment variables.",
 };
 
-export const graphqlUrl = (isDisputeTemplate = false, chainId = 421614) => {
+export const graphqlUrl = (isDisputeTemplate = false, chainId = arbitrumSepolia.id) => {
   const coreUrl = process.env.REACT_APP_CORE_SUBGRAPH ?? "Wrong Subgraph URL. Please check the environment variables.";
   return isDisputeTemplate ? CHAINID_TO_DISPUTE_TEMPLATE_SUBGRAPH[chainId] : coreUrl;
 };
@@ -15,7 +16,7 @@ export const graphqlQueryFnHelper = async (
   query: TypedDocumentNode<any, any>,
   parametersObject: Record<string, any>,
   isDisputeTemplate = false,
-  chainId = 421614
+  chainId = arbitrumSepolia.id
 ) => {
   const url = graphqlUrl(isDisputeTemplate, chainId);
   return request(url, query, parametersObject);