Merge pull request #67 from kleros/chore/update-mappings-in-create-transaction-flow

chore: update mappings in create transaction flow

Author: jaybuidl

contracts/README.md

@@ -16,7 +16,7 @@ Refresh the list of deployed contracts by running `./scripts/generateDeployments
 ### Devnet
 #### Arbitrum Sepolia
 
-- [EscrowUniversal](https://sepolia.arbiscan.io/address/0xd3d61eB06c96F69D03B285392C269d5577ff2342)
+- [EscrowUniversal](https://sepolia.arbiscan.io/address/0x9B56c711C54F00276787574B6CEE97C33e690BCb)
 
 #### Sepolia
 

contracts/deploy/00-escrow.ts

@@ -20,7 +20,7 @@ const disputeTemplate = `{
   "policyURI": "/ipfs/XxxxxXXX/escrow-general-policy.pdf", 
   "attachment": { 
     "label": "Transaction Terms",
-    "uri": "{{extraDescriptionUri}}"
+    "uri": "{{{extraDescriptionUri}}}"
   },
   "frontendUrl": "https://escrow-v2.kleros.builders/#/transactions/{{externalDisputeID}}", 
   "arbitrableChainID": "421614",
@@ -33,7 +33,7 @@ const disputeTemplate = `{
     "amount": "{{amount}}",
     "token": "{{token}}",
     "deadline": "{{deadline}}",
-    "transactionUri": "{{transactionUri}}" 
+    "transactionUri": "{{{transactionUri}}}" 
   },
   "category": "Escrow",
   "specification": "KIPXXX",
@@ -66,7 +66,7 @@ const mapping = `[
 
 // General court, 3 jurors
 const extraData =
-    "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003";
+  "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003";
 
 const deploy: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
   const { deployments, getNamedAccounts, getChainId } = hre;
@@ -81,7 +81,7 @@ const deploy: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
   const disputeTemplateRegistry = await deployments.get("DisputeTemplateRegistry");
   const feeTimeout = 600; // 10 minutes
   const settlementTimeout = 600; // 10 minutes
-  
+
   await deploy("EscrowUniversal", {
     from: deployer,
     args: [

contracts/deployments/arbitrumSepoliaDevnet/EscrowUniversal.json

@@ -135,8 +135,6 @@ contract EscrowUniversal is IEscrow, IArbitrableV2 {
         transaction.amount = msg.value;
         transaction.token = NATIVE;
         transaction.deadline = _deadline;
-        transaction.templateData = _templateData;
-        transaction.templateDataMappings = _templateDataMappings;
 
         transactionID = transactions.length - 1;
 
@@ -168,8 +166,6 @@ contract EscrowUniversal is IEscrow, IArbitrableV2 {
         transaction.amount = _amount;
         transaction.token = _token;
         transaction.deadline = _deadline;
-        transaction.templateData = _templateData;
-        transaction.templateDataMappings = _templateDataMappings;
 
         transactionID = transactions.length - 1;
 

contracts/src/EscrowUniversal.sol

@@ -40,8 +40,6 @@ struct Transaction {
     uint256 buyerFee; // Total fees paid by the buyer.
     uint256 sellerFee; // Total fees paid by the seller.
     uint256 lastFeePaymentTime; // Last time the dispute fees were paid by either party or settlement proposed.
-    string templateData;
-    string templateDataMappings;
     Status status;
     IERC20 token; // Token to pay the seller with.
 }

contracts/src/interfaces/Types.sol

@@ -31,8 +31,6 @@ function createEscrow(id: string, transactionHash: Bytes): Escrow {
   escrow.buyerFee = ZERO;
   escrow.sellerFee = ZERO;
   escrow.lastFeePaymentTime = ZERO;
-  escrow.templateData = "";
-  escrow.templateDataMappings = "";
   escrow.status = "NoDispute";
   escrow.transactionHash = transactionHash;
   return escrow;

subgraph/mappings/escrow.ts

@@ -1,6 +1,6 @@
 {
   "name": "@kleros/escrow-v2-subgraph",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "license": "MIT",
   "scripts": {
     "update:arbitrum-sepolia-devnet": "./scripts/update.sh arbitrumSepoliaDevnet arbitrum-sepolia",

subgraph/package.json

@@ -36,8 +36,6 @@ type Escrow @entity {
   feeTimeout: BigInt
   settlementTimeout: BigInt
   arbitratorExtraData: Bytes
-  templateData: String
-  templateDataMappings: String
   token: Bytes
   status: Status
   timestamp: BigInt

subgraph/schema.graphql

@@ -6,9 +6,9 @@ dataSources:
     name: EscrowUniversal
     network: arbitrum-sepolia
     source:
-      address: '0xd3d61eB06c96F69D03B285392C269d5577ff2342'
+      address: '0x9B56c711C54F00276787574B6CEE97C33e690BCb'
       abi: EscrowUniversal
-      startBlock: 56637255
+      startBlock: 58521526
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.6

subgraph/subgraph.yaml

@@ -17,8 +17,6 @@ export const transactionFragment = graphql(`
     buyerFee
     sellerFee
     lastFeePaymentTime
-    templateData
-    templateDataMappings
     status
     transactionHash
     payments {

web/src/hooks/queries/useTransactionsQuery.ts

@@ -74,66 +74,9 @@ const DepositPaymentButton: React.FC = () => {
     }
   }, [allowance, transactionValue]);
 
-  const templateData = useMemo(
-    () =>
-      JSON.stringify({
-        $schema: "../NewDisputeTemplate.schema.json",
-        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/#/transactions/%s`,
-        arbitrableChainID: "421614",
-        arbitrableAddress: "0x250AB0477346aDFC010585b58FbF61cff1d8f3ea",
-        arbitratorChainID: "421614",
-        arbitratorAddress: "0xA54e7A16d7460e38a8F324eF46782FB520d58CE8",
-        metadata: {
-          buyer: address,
-          seller: sellerAddress,
-          amount: sendingQuantity,
-          token: isNativeTransaction ? "native" : sendingToken?.address,
-          deadline: deadlineTimestamp.toString(),
-          transactionUri: transactionUri,
-        },
-        category: "Escrow",
-        specification: "KIPXXX",
-        aliases: {
-          Buyer: address,
-          Seller: sellerAddress,
-        },
-        version: "1.0",
-      }),
-    [
-      escrowTitle,
-      deliverableText,
-      extraDescriptionUri,
-      sendingQuantity,
-      sellerAddress,
-      address,
-      isNativeTransaction,
-      sendingToken?.address,
-      deadlineTimestamp,
-      transactionUri,
-    ]
-  );
-
   const { config: createNativeTransactionConfig } = usePrepareEscrowUniversalCreateNativeTransaction({
     enabled: isNativeTransaction && ethAddressPattern.test(finalRecipientAddress),
-    args: [deadlineTimestamp, transactionUri, finalRecipientAddress, templateData, ""],
+    args: [deadlineTimestamp, transactionUri, finalRecipientAddress],
     value: transactionValue,
   });
 
@@ -149,8 +92,6 @@ const DepositPaymentButton: React.FC = () => {
       deadlineTimestamp,
       transactionUri,
       finalRecipientAddress,
-      templateData,
-      "",
     ],
   });