Merge branch 'dev' into chore(web)/standard-ipfs-url

Author: alcercu

kleros-sdk/config/v2-disputetemplate/reality/example4/DisputeMappings.json.mustache

@@ -0,0 +1,40 @@
+[
+    {
+        "type": "graphql",
+        "endpoint": "https://api.thegraph.com/subgraphs/name/kemuru/escrow-v2-devnet",
+        "query": "query GetTransaction($transactionId: ID!) { escrow(id: $transactionId) { transactionUri buyer seller amount asset deadline } }",
+        "variables": {
+            "transactionId": "{{externalDisputeID}}"
+        },
+        "seek": [
+            "escrow.transactionUri",
+            "escrow.buyer",
+            "escrow.seller",
+            "escrow.amount",
+            "escrow.asset",
+            "escrow.deadline"
+        ],
+        "populate": [
+            "transactionUri",
+            "address",
+            "sendingRecipientAddress",
+            "amount",
+            "asset",
+            "deadline"
+        ]
+    },
+    {
+        "type": "fetch/ipfs/json",
+        "ipfsUri": "{{transactionUri}}",
+        "seek": [
+            "title",
+            "description",
+            "extraDescriptionUri"
+        ],
+        "populate": [
+            "escrowTitle",
+            "deliverableText",
+            "extraDescriptionUri"
+        ]
+    }
+]

kleros-sdk/config/v2-disputetemplate/reality/example4/DisputeTemplate.json.mustache

@@ -0,0 +1,40 @@
+{
+    "title": "{{escrowTitle}}",
+    "description": "{{deliverableText}}",
+    "question": "Which party abided by the terms of the contract?",
+    "answers": [
+        {
+            "title": "Refund the Buyer",
+            "description": "Select this to return the funds to the Buyer."
+        },
+        {
+            "title": "Pay the Seller",
+            "description": "Select this to release the funds to the Seller."
+        }
+    ],
+    "policyURI": "ipfs://TODO",
+    "attachment": {
+        "label": "Transaction Terms",
+        "uri": "{{extraDescriptionUri}}"
+    },
+    "frontendUrl": "https://escrow-v2.kleros.builders/#/myTransactions/{{externalDisputeID}}",
+    "arbitrableChainID": "421614",
+    "arbitrableAddress": "{{arbitrator}}",
+    "arbitratorChainID": "421614",
+    "arbitratorAddress": "{{arbitrable}}",
+    "metadata": {
+        "buyer": "{{address}}",
+        "seller": "{{sendingRecipientAddress}}",
+        "amount": "{{sendingQuantity}}",
+        "asset": "{{asset}}",
+        "deadline": "{{deadline}}",
+        "transactionUri": "{{transactionUri}}"
+    },
+    "category": "Escrow",
+    "specification": "KIPXXX",
+    "aliases": {
+        "Buyer": "{{address}}",
+        "Seller": "{{sendingRecipientAddress}}"
+    },
+    "version": "1.0"
+}

kleros-sdk/src/dataMappings/utils/actionTypeValidators.ts

@@ -9,7 +9,7 @@ import {
 } from "./actionTypes";
 
 export const validateSubgraphMapping = (mapping: ActionMapping) => {
-  if ((mapping as SubgraphMapping).endpoint !== undefined) {
+  if ((mapping as SubgraphMapping).endpoint === undefined) {
     throw new Error("Invalid mapping for graphql action.");
   }
   return mapping as SubgraphMapping;

kleros-sdk/src/dataMappings/utils/createResultObject.ts

@@ -1,12 +1,26 @@
 // Can this be replaced by Mustache ?
 export const createResultObject = (sourceData, seek, populate) => {
   const result = {};
+
   seek.forEach((key, idx) => {
-    let foundValue;
-    if (typeof sourceData !== "object" || key === "0") {
-      foundValue = sourceData;
+    let foundValue = sourceData;
+
+    if (key.includes(".")) {
+      const keyParts = key.split(".");
+      for (const part of keyParts) {
+        if (foundValue[part] !== undefined) {
+          foundValue = foundValue[part];
+        } else {
+          foundValue = undefined;
+          break;
+        }
+      }
     } else {
-      foundValue = sourceData[key];
+      if (typeof sourceData !== "object" || key === "0") {
+        foundValue = sourceData;
+      } else {
+        foundValue = sourceData[key];
+      }
     }
 
     console.log(`Seek key: ${key}, Found value:`, foundValue);

subgraph/core/schema.graphql

@@ -305,6 +305,7 @@ type ClassicContribution implements Contribution @entity {
 
   localRound: ClassicRound!
   amount: BigInt!
+  rewardAmount: BigInt
   choice: BigInt!
   rewardWithdrawn: Boolean!
 }

subgraph/core/src/DisputeKitClassic.ts

@@ -126,5 +126,6 @@ export function handleWithdrawal(event: Withdrawal): void {
   const contribution = ensureClassicContributionFromEvent(event);
   if (!contribution) return;
   contribution.rewardWithdrawn = true;
+  contribution.rewardAmount = event.params._amount;
   contribution.save();
 }

subgraph/core/src/entities/ClassicContribution.ts

@@ -3,9 +3,7 @@ import { Contribution as ContributionEvent, Withdrawal } from "../../generated/D
 import { DISPUTEKIT_ID } from "../DisputeKitClassic";
 
 export function ensureClassicContributionFromEvent<T>(event: T): ClassicContribution | null {
-  if (!(event instanceof ContributionEvent) && !(event instanceof Withdrawal)) {
-    return null;
-  }
+  if (!(event instanceof ContributionEvent) && !(event instanceof Withdrawal)) return null;
   const coreDisputeID = event.params._coreDisputeID.toString();
   const coreRoundIndex = event.params._coreRoundID.toString();
   const roundID = `${DISPUTEKIT_ID}-${coreDisputeID}-${coreRoundIndex}`;
@@ -25,9 +23,11 @@ export function ensureClassicContributionFromEvent<T>(event: T): ClassicContribu
     classicContribution.rewardWithdrawn = false;
   } else {
     const currentAmount = classicContribution.amount;
-    classicContribution.amount = currentAmount.plus(event.params._amount);
+    // we dont want to increase amount on withdraw event, the amount in that event is reward/reimburse amount
+    if (event instanceof ContributionEvent) {
+      classicContribution.amount = currentAmount.plus(event.params._amount);
+    }
   }
-
   classicContribution.save();
   return classicContribution;
 }

subgraph/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kleros/kleros-v2-subgraph",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "license": "MIT",
   "scripts": {
     "update:core:arbitrum-sepolia-devnet": "./scripts/update.sh arbitrumSepoliaDevnet arbitrum-sepolia core/subgraph.yaml",