feat: added a simple dispute template, moved IMetaEvidence to the v1 folder

And removed intermediate interfaces

Author: jaybuidl

contracts/src/arbitration/IArbitrable.sol

@@ -2,23 +2,42 @@
 
 pragma solidity 0.8.18;
 
-import "../arbitration/IArbitrator.sol";
+/**
+ * @authors: [@ferittuncer, @hbarcelos]
+ * @reviewers: []
+ * @auditors: []
+ * @bounties: []
+ * @deployments: []
+ */
+import "./IArbitratorV1.sol";
 
 /// @title IMetaEvidence
 /// ERC-1497: Evidence Standard excluding evidence emission as it will be handled by the arbitrator.
-interface IMetaEvidence {
+interface IEvidenceV1 {
     /// @dev To be emitted when meta-evidence is submitted.
     /// @param _metaEvidenceID Unique identifier of meta-evidence.
     /// @param _evidence IPFS path to metaevidence, example: '/ipfs/Qmarwkf7C9RuzDEJNnarT3WZ7kem5bk8DZAzx78acJjMFH/metaevidence.json'
     event MetaEvidence(uint256 indexed _metaEvidenceID, string _evidence);
 
+    /// @dev To be raised when evidence is submitted. Should point to the resource (evidences are not to be stored on chain due to gas considerations).
+    /// @param _arbitrator The arbitrator of the contract.
+    /// @param _evidenceGroupID Unique identifier of the evidence group the evidence belongs to.
+    /// @param _party The address of the party submiting the evidence. Note that 0x0 refers to evidence not submitted by any party.
+    /// @param _evidence IPFS path to evidence, example: '/ipfs/Qmarwkf7C9RuzDEJNnarT3WZ7kem5bk8DZAzx78acJjMFH/evidence.json'
+    event Evidence(
+        IArbitratorV1 indexed _arbitrator,
+        uint256 indexed _evidenceGroupID,
+        address indexed _party,
+        string _evidence
+    );
+
     /// @dev To be emitted when a dispute is created to link the correct meta-evidence to the disputeID.
     /// @param _arbitrator The arbitrator of the contract.
     /// @param _disputeID ID of the dispute in the Arbitrator contract.
     /// @param _metaEvidenceID Unique identifier of meta-evidence.
     /// @param _evidenceGroupID Unique identifier of the evidence group that is linked to this dispute.
     event Dispute(
-        IArbitrator indexed _arbitrator,
+        IArbitratorV1 indexed _arbitrator,
         uint256 indexed _disputeID,
         uint256 _metaEvidenceID,
         uint256 _evidenceGroupID

contracts/src/arbitration/IArbitrator.sol

@@ -65,7 +65,7 @@ describe("Integration tests", async () => {
 
   it("Resolves a dispute on the home chain with no appeal", async () => {
     const arbitrationCost = ONE_TENTH_ETH.mul(3);
-    const [bridger, challenger, relayer] = await ethers.getSigners();
+    const [, , relayer] = await ethers.getSigners();
 
     await pnk.approve(core.address, ONE_THOUSAND_PNK.mul(100));
 

contracts/src/evidence/IMetaEvidence.sol renamed to contracts/src/kleros-v1/interfaces/IEvidenceV1.sol

@@ -0,0 +1,23 @@
+{
+  "$schema": "../NewDisputeTemplate.schema.json",
+  "title": "Let's do this",
+  "description": "We want to do this: %s",
+  "question": "Does it comply with the policy?",
+  "answers": [
+    {
+      "title": "Yes",
+      "description": "Select this if you agree that it must be done."
+    },
+    {
+      "title": "No",
+      "description": "Select this if you do not agree that it must be done."
+    }
+  ],
+  "policyURI": "/ipfs/Qmdvk...rSD6cE/policy.pdf",
+  "frontendUrl": "https://kleros-v2.netlify.app/#/cases/%s/overview",
+  "arbitratorChainID": "421613",
+  "arbitratorAddress": "0xD08Ab99480d02bf9C092828043f611BcDFEA917b",
+  "category": "Others",
+  "specification": "KIP001",
+  "lang": "en_US"
+}

contracts/test/integration/index.ts

@@ -0,0 +1,44 @@
+{
+  "title": "Let's do this",
+  "description": "We want to do this: airdrop magic money",
+  "question": "Does it comply with the policy?",
+  "type": "single-select",
+  "answers": [
+    {
+      "id": "0x00",
+      "title": "Invalid/Refuse to Arbitrate",
+      "reserved": true
+    },
+    {
+      "id": "0x01",
+      "title": "Yes",
+      "description": "Select this if you agree that it must be done.",
+      "reserved": false
+    },
+    {
+      "id": "0x02",
+      "title": "No",
+      "description": "Select this if you do not agree that it must be done.",
+      "reserved": false
+    }
+  ],
+  "policyURI": "/ipfs/Qmdvk...rSD6cE/policy.pdf",
+  "frontendUrl": "https://kleros-v2.netlify.app/#/cases/%s/overview",
+  "arbitrableChainID": "10200", // Chiado
+  "arbitrableAddress": "0x22f40371b1d1bd7e6229e33b832cbe00d0b991b2",
+  "arbitratorChainID": "421613", // ArbitrumGoerli
+  "arbitratorAddress": "0xD08Ab99480d02bf9C092828043f611BcDFEA917b", // KlerosCore
+  "category": "Others",
+  "specification": "KIP001",
+  "lang": "en_US",
+  "metadata": {
+    "aliases": {
+      "submitter": "0x5B0EdFcD1038746Cc1C1eE3aCdb31feD910B13f4"
+    }
+  },
+  "externalDisputeID": "13", // hash(action)
+  "arbitrableDisputeID": "3",
+  "arbitratorDisputeID": "4564",
+  "disputeTemplateID": "1",
+  "disputeTemplateHash": "0xD1u9...2254"
+}

kleros-sdk/config/v2-disputetemplate/simple/NewDisputeTemplate.simple.json

@@ -0,0 +1,2 @@
+airdrop magic money
+3

kleros-sdk/config/v2-disputetemplate/simple/example/DisputeDetails.simple.jsonc

@@ -0,0 +1,8 @@
+{
+  "externalDisputeID": "ea6ed15a0867e22f40371b1d1bd7e6229e33b832cbe00d0b991b2da19d4f951a",
+  "arbitrableDisputeID": "3",
+  "templateID": "1"
+}
+
+// action = "airdrop magic money"
+// externalDisputeID = hash(action) = 0xea6ed15a0867e22f40371b1d1bd7e6229e33b832cbe00d0b991b2da19d4f951a