chore: remove-external-dispute-id

Author: tractorss

kleros-sdk/src/requests/fetchDisputeDetails.ts

@@ -8,7 +8,6 @@ type DisputeDetailsQueryResponse = {
       id: string;
     };
     arbitrableChainId: number;
-    externalDisputeId: number;
     templateId: number;
   };
 };
@@ -20,7 +19,6 @@ const query = gql`
         id
       }
       arbitrableChainId
-      externalDisputeId
       templateId
     }
   }

kleros-sdk/src/utils/getDispute.ts

@@ -41,7 +41,6 @@ export const getDispute = async (disputeParameters: GetDisputeParameters): Promi
   const initialContext = {
     arbitrableAddress: disputeDetails.dispute.arbitrated.id,
     arbitrableChainID: disputeDetails.dispute.arbitrableChainId,
-    externalDisputeID: disputeDetails.dispute.externalDisputeId,
     ...options?.additionalContext,
   };
 

kleros-sdk/test/getDispute.test.ts

@@ -24,7 +24,6 @@ describe("getDispute", () => {
       templateId: 1,
       arbitrated: { id: "0x1234" },
       arbitrableChainId: 1,
-      externalDisputeId: 123,
     },
   };
 

subgraph/core/schema.graphql

@@ -176,7 +176,6 @@ type Dispute @entity {
   disputeKitDispute: [DisputeKitDispute!]! @derivedFrom(field: "coreDispute")
   isCrossChain: Boolean
   arbitrableChainId: BigInt
-  externalDisputeId: BigInt
   templateId: BigInt
   rulingTimestamp: BigInt
   rulingTransactionHash: String

subgraph/core/src/entities/Dispute.ts

@@ -35,20 +35,19 @@ export function createDisputeFromEvent(event: DisputeCreation): void {
 }
 
 // source: contracts/src/arbitration/interfaces/IArbitrableV2.sol
-const DisputeRequest = "DisputeRequest(address,uint256,uint256,uint256,string)";
+const DisputeRequest = "DisputeRequest(address,uint256,uint256)";
 const DisputeRequestSignature = crypto.keccak256(ByteArray.fromUTF8(DisputeRequest));
 
 // note : we are using bytes32 in place of string as strings cannot be decoded and it breaks the function.
 // It is okay for us, as we are only interested in the uint256 in frontend.
-const DisputeRequestTypestring = "(uint256,uint256,bytes32)"; // _externalDisputeId,_templateId,_templateUri
+const DisputeRequestTypestring = "(uint256)"; // _templateId
 
 // source: contracts/src/gateway/interfaces/IHomeGateway.sol
-const CrossChainDisputeIncoming =
-  "CrossChainDisputeIncoming(address,uint256,address,uint256,uint256,uint256,uint256,string)";
+const CrossChainDisputeIncoming = "CrossChainDisputeIncoming(address,uint256,address,uint256,uint256,uint256)";
 const CrossChainDisputeIncomingSignature = crypto.keccak256(ByteArray.fromUTF8(CrossChainDisputeIncoming));
 
 // note : arbitrable is an indexed arg, so it will topic[1]
-const CrossChainDisputeIncomingTypestring = "(address,uint256,uint256,uint256,string)"; // arbitrator, _arbitrableChainId, _externalDisputeId, _templateId, _templateUri
+const CrossChainDisputeIncomingTypestring = "(address,uint256,uint256)"; // arbitrator, _arbitrableChainId, _templateId
 
 export const updateDisputeRequestData = (event: DisputeCreation): void => {
   const dispute = Dispute.load(event.params._disputeID.toString());
@@ -96,8 +95,7 @@ export const updateDisputeRequestData = (event: DisputeCreation): void => {
     if (!decoded) return;
     dispute.isCrossChain = true;
     dispute.arbitrableChainId = decoded.toTuple()[1].toBigInt();
-    dispute.externalDisputeId = decoded.toTuple()[2].toBigInt();
-    dispute.templateId = decoded.toTuple()[3].toBigInt();
+    dispute.templateId = decoded.toTuple()[2].toBigInt();
     dispute.save();
     return;
   } else if (disputeRequestEventIndex !== -1) {
@@ -107,8 +105,7 @@ export const updateDisputeRequestData = (event: DisputeCreation): void => {
     if (!decoded) return;
     dispute.isCrossChain = false;
     dispute.arbitrableChainId = getHomeChainId(dataSource.network());
-    dispute.externalDisputeId = decoded.toTuple()[0].toBigInt();
-    dispute.templateId = decoded.toTuple()[1].toBigInt();
+    dispute.templateId = decoded.toTuple()[0].toBigInt();
     dispute.save();
     return;
   }

web/src/hooks/queries/useDisputeDetailsQuery.ts

@@ -36,7 +36,6 @@ const disputeDetailsQuery = graphql(`
       currentRoundIndex
       isCrossChain
       arbitrableChainId
-      externalDisputeId
       templateId
       rulingTimestamp
       rulingTransactionHash

web/src/hooks/queries/usePopulatedDisputeData.ts

@@ -33,11 +33,10 @@ export const usePopulatedDisputeData = (disputeID?: string, arbitrableAddress?:
     !isUndefined(disputeData) &&
     !isUndefined(disputeData?.dispute) &&
     !isUndefined(disputeData.dispute?.arbitrableChainId) &&
-    !isUndefined(disputeData.dispute?.externalDisputeId) &&
     !isUndefined(disputeData.dispute?.templateId);
 
   return useQuery<DisputeDetails>({
-    queryKey: [`DisputeTemplate${disputeID}${arbitrableAddress}${disputeData?.dispute?.externalDisputeId}`],
+    queryKey: [`DisputeTemplate`, disputeID],
     enabled: isEnabled,
     staleTime: Infinity,
     queryFn: async () => {
@@ -60,7 +59,6 @@ export const usePopulatedDisputeData = (disputeID?: string, arbitrableAddress?:
             arbitrableChainID: disputeData.dispute?.arbitrableChainId,
             graphApiKey: import.meta.env.REACT_APP_GRAPH_API_KEY,
             alchemyApiKey: import.meta.env.ALCHEMY_API_KEY,
-            externalDisputeID: disputeData.dispute?.externalDisputeId,
           };
 
           const data = dataMappings ? await executeActions(JSON.parse(dataMappings), initialContext) : {};

web/src/pages/Cases/CaseDetails/Evidence/EvidenceSearch.tsx

@@ -1,6 +1,7 @@
 import React, { useState } from "react";
 import styled from "styled-components";
 
+import { useParams } from "react-router-dom";
 import { useAccount } from "wagmi";
 
 import { Button, Searchbar } from "@kleros/ui-components-library";
@@ -33,17 +34,17 @@ const StyledButton = styled(Button)`
 interface IEvidenceSearch {
   search?: string;
   setSearch: (search: string) => void;
-  evidenceGroup?: bigint;
 }
 
-const EvidenceSearch: React.FC<IEvidenceSearch> = ({ search, setSearch, evidenceGroup }) => {
+const EvidenceSearch: React.FC<IEvidenceSearch> = ({ search, setSearch }) => {
+  const { id: disputeId } = useParams();
   const [isModalOpen, setIsModalOpen] = useState(false);
   const { address } = useAccount();
 
   return (
     <>
-      {!isUndefined(evidenceGroup) && (
-        <SubmitEvidenceModal isOpen={isModalOpen} close={() => setIsModalOpen(false)} {...{ evidenceGroup }} />
+      {!isUndefined(disputeId) && (
+        <SubmitEvidenceModal isOpen={isModalOpen} close={() => setIsModalOpen(false)} {...{ disputeId }} />
       )}
 
       <SearchContainer>

web/src/pages/Cases/CaseDetails/Evidence/SubmitEvidenceModal.tsx

@@ -58,9 +58,9 @@ const ButtonArea = styled.div`
 
 const SubmitEvidenceModal: React.FC<{
   isOpen: boolean;
-  evidenceGroup: bigint;
+  disputeId: string;
   close: () => void;
-}> = ({ isOpen, evidenceGroup, close }) => {
+}> = ({ isOpen, disputeId, close }) => {
   const { data: walletClient } = useWalletClient();
   const publicClient = usePublicClient();
   const wagmiConfig = useConfig();
@@ -77,7 +77,7 @@ const SubmitEvidenceModal: React.FC<{
       const evidenceJSON = await constructEvidence(uploadFile, message, file);
 
       const { request } = await simulateEvidenceModuleSubmitEvidence(wagmiConfig, {
-        args: [BigInt(evidenceGroup), JSON.stringify(evidenceJSON)],
+        args: [BigInt(disputeId), JSON.stringify(evidenceJSON)],
       });
 
       if (!walletClient || !publicClient) return;
@@ -92,7 +92,7 @@ const SubmitEvidenceModal: React.FC<{
       errorToast("Failed to submit evidence.");
       console.error("Error in submitEvidence:", error);
     }
-  }, [publicClient, wagmiConfig, walletClient, close, evidenceGroup, file, message, setIsSending, uploadFile]);
+  }, [publicClient, wagmiConfig, walletClient, close, disputeId, file, message, setIsSending, uploadFile]);
 
   return (
     <StyledModal {...{ isOpen }} shouldCloseOnEsc shouldCloseOnOverlayClick onRequestClose={close}>

web/src/pages/Cases/CaseDetails/Evidence/index.tsx

@@ -10,7 +10,6 @@ import DownArrow from "svgs/icons/arrow-down.svg";
 
 import { useSpamEvidence } from "hooks/useSpamEvidence";
 
-import { useDisputeDetailsQuery } from "queries/useDisputeDetailsQuery";
 import { useEvidences } from "queries/useEvidences";
 
 import { landscapeStyle } from "styles/landscapeStyle";
@@ -80,7 +79,6 @@ const SpamLabel = styled.label`
 
 const Evidence: React.FC = () => {
   const { id } = useParams();
-  const { data: disputeData } = useDisputeDetailsQuery(id);
   const ref = useRef<HTMLDivElement>(null);
   const [search, setSearch] = useState<string>();
   const [debouncedSearch, setDebouncedSearch] = useState<string>();
@@ -116,7 +114,7 @@ const Evidence: React.FC = () => {
 
   return (
     <Container ref={ref}>
-      <EvidenceSearch {...{ search, setSearch, evidenceGroup: disputeData?.dispute?.externalDisputeId }} />
+      <EvidenceSearch {...{ search, setSearch }} />
       <ScrollButton small Icon={DownArrow} text="Scroll to latest" onClick={scrollToLatest} />
       {evidences?.realEvidences ? (
         <>