Merge branch 'master' into feat/pay-improvement

contracts/README.md

@@ -18,7 +18,7 @@ Refresh the list of deployed contracts by running `./scripts/generateDeployments
 
 - [Escrow](https://sepolia.arbiscan.io/address/0x250AB0477346aDFC010585b58FbF61cff1d8f3ea)
 - [EscrowToken](https://sepolia.arbiscan.io/address/0xe7B52a7Bc50cb4Ff13d057629082844780b6E28D)
-- [EscrowUniversal](https://sepolia.arbiscan.io/address/0x5c4B2Cff2998529f9d405A9b6EbB44BC537c8D7F)
+- [EscrowUniversal](https://sepolia.arbiscan.io/address/0xBa2cC03e2e34C5DEDaEbC481b2531e06946353De)
 
 #### Sepolia
 

contracts/src/Escrow.sol

@@ -114,7 +114,7 @@ contract Escrow is IEscrow, IArbitrableV2 {
 
     /// @inheritdoc IEscrow
     function createNativeTransaction(
-        uint256 _timeoutPayment,
+        uint256 _deadline,
         string memory _transactionUri,
         address payable _seller,
         string memory _templateData,
@@ -124,7 +124,7 @@ contract Escrow is IEscrow, IArbitrableV2 {
         transaction.buyer = payable(msg.sender);
         transaction.seller = _seller;
         transaction.amount = msg.value;
-        transaction.deadline = block.timestamp + _timeoutPayment;
+        transaction.deadline = _deadline;
         transaction.templateData = _templateData;
         transaction.templateDataMappings = _templateDataMappings;
 

contracts/src/EscrowToken.sol

@@ -135,7 +135,7 @@ contract EscrowToken is IEscrow, IArbitrableV2 {
     function createERC20Transaction(
         uint256 _amount,
         IERC20 _token,
-        uint256 _timeoutPayment,
+        uint256 _deadline,
         string memory _transactionUri,
         address payable _seller,
         string memory _templateData,
@@ -149,7 +149,7 @@ contract EscrowToken is IEscrow, IArbitrableV2 {
         transaction.amount = _amount;
         transaction.token = _token;
         // transaction.paymentType = PaymentType.ERC20;
-        transaction.deadline = block.timestamp + _timeoutPayment;
+        transaction.deadline = _deadline;
         transaction.templateData = _templateData;
         transaction.templateDataMappings = _templateDataMappings;
 

contracts/src/EscrowUniversal.sol

@@ -123,7 +123,7 @@ contract EscrowUniversal is IEscrow, IArbitrableV2 {
 
     /// @inheritdoc IEscrow
     function createNativeTransaction(
-        uint256 _timeoutPayment,
+        uint256 _deadline,
         string memory _transactionUri,
         address payable _seller,
         string memory _templateData,
@@ -134,7 +134,7 @@ contract EscrowUniversal is IEscrow, IArbitrableV2 {
         transaction.seller = _seller;
         transaction.amount = msg.value;
         transaction.token = NATIVE;
-        transaction.deadline = block.timestamp + _timeoutPayment;
+        transaction.deadline = _deadline;
         transaction.templateData = _templateData;
         transaction.templateDataMappings = _templateDataMappings;
 
@@ -154,7 +154,7 @@ contract EscrowUniversal is IEscrow, IArbitrableV2 {
     function createERC20Transaction(
         uint256 _amount,
         IERC20 _token,
-        uint256 _timeoutPayment,
+        uint256 _deadline,
         string memory _transactionUri,
         address payable _seller,
         string memory _templateData,
@@ -167,7 +167,7 @@ contract EscrowUniversal is IEscrow, IArbitrableV2 {
         transaction.seller = _seller;
         transaction.amount = _amount;
         transaction.token = _token;
-        transaction.deadline = block.timestamp + _timeoutPayment;
+        transaction.deadline = _deadline;
         transaction.templateData = _templateData;
         transaction.templateDataMappings = _templateDataMappings;
 

contracts/src/interfaces/IEscrow.sol

@@ -74,14 +74,14 @@ interface IEscrow {
     // ************************************* //
 
     /// @dev Create a transaction.
-    /// @param _timeoutPayment Time after which a party can automatically execute the arbitrable transaction.
+    /// @param _deadline Time after which a party can automatically execute the arbitrable transaction.
     /// @param _transactionUri The IPFS Uri Hash of the transaction.
     /// @param _seller The recipient of the transaction.
     /// @param _templateData The dispute template data.
     /// @param _templateDataMappings The dispute template data mappings.
     /// @return transactionID The index of the transaction.
     function createNativeTransaction(
-        uint256 _timeoutPayment,
+        uint256 _deadline,
         string memory _transactionUri,
         address payable _seller,
         string memory _templateData,
@@ -91,7 +91,7 @@ interface IEscrow {
     /// @dev Create a transaction.
     /// @param _amount The amount of tokens in this transaction.
     /// @param _token The ERC20 token contract.
-    /// @param _timeoutPayment Time after which a party can automatically execute the arbitrable transaction.
+    /// @param _deadline Time after which a party can automatically execute the arbitrable transaction.
     /// @param _transactionUri The IPFS Uri Hash of the transaction.
     /// @param _seller The recipient of the transaction.
     /// @param _templateData The dispute template data.
@@ -100,7 +100,7 @@ interface IEscrow {
     function createERC20Transaction(
         uint256 _amount,
         IERC20 _token,
-        uint256 _timeoutPayment,
+        uint256 _deadline,
         string memory _transactionUri,
         address payable _seller,
         string memory _templateData,

subgraph/mappings/escrow.ts

@@ -22,7 +22,7 @@ import {
 } from "../generated/EscrowUniversal/EscrowUniversal";
 import { ZERO, ONE } from "./utils";
 
-function createEscrow(id: string): Escrow {
+function createEscrow(id: string, transactionHash: Bytes): Escrow {
   let escrow = new Escrow(id);
   escrow.buyer = Bytes.empty();
   escrow.seller = Bytes.empty();
@@ -34,6 +34,7 @@ function createEscrow(id: string): Escrow {
   escrow.templateData = "";
   escrow.templateDataMappings = "";
   escrow.status = "NoDispute";
+  escrow.transactionHash = transactionHash;
   return escrow;
 }
 
@@ -95,7 +96,7 @@ export function handleHasToPayFee(event: HasToPayFeeEvent): void {
   let escrow = Escrow.load(escrowId);
 
   if (!escrow) {
-    escrow = createEscrow(escrowId);
+    return;
   }
 
   let seller = getUser(escrow.seller.toHex());
@@ -131,7 +132,7 @@ export function handleHasToPayFee(event: HasToPayFeeEvent): void {
 
 export function handleNativeTransactionCreated(event: NativeTransactionCreatedEvent): void {
   let escrowId = event.params._transactionID.toString();
-  let escrow = Escrow.load(escrowId) || createEscrow(escrowId);
+  let escrow = Escrow.load(escrowId) || createEscrow(escrowId, event.transaction.hash);
 
   escrow!.buyer = event.params._buyer;
   escrow!.seller = event.params._seller;
@@ -163,7 +164,7 @@ export function handleNativeTransactionCreated(event: NativeTransactionCreatedEv
 
 export function handleERC20TransactionCreated(event: ERC20TransactionCreatedEvent): void {
   let escrowId = event.params._transactionID.toString();
-  let escrow = Escrow.load(escrowId) || createEscrow(escrowId);
+  let escrow = Escrow.load(escrowId) || createEscrow(escrowId, event.transaction.hash);
 
   escrow!.buyer = event.params._buyer;
   escrow!.seller = event.params._seller;
@@ -199,7 +200,7 @@ export function handleTransactionResolved(event: TransactionResolvedEvent): void
   let escrow = Escrow.load(escrowId);
 
   if (!escrow) {
-    escrow = createEscrow(escrowId);
+    return;
   }
 
   let transactionResolvedId = event.transaction.hash.toHex() + "-" + event.logIndex.toString();
@@ -248,7 +249,7 @@ export function handleDisputeRequest(event: DisputeRequestEvent): void {
 
   let escrow = Escrow.load(transactionID);
   if (!escrow) {
-    escrow = createEscrow(transactionID);
+    return;
   }
 
   disputeRequest.escrow = escrow.id;
@@ -284,7 +285,7 @@ export function handleSettlementProposed(event: SettlementProposedEvent): void {
 
   let escrow = Escrow.load(transactionID);
   if (!escrow) {
-    escrow = createEscrow(transactionID);
+    return;
   }
   escrow.lastFeePaymentTime = event.block.timestamp;
 

subgraph/package.json

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

subgraph/schema.graphql

@@ -41,6 +41,7 @@ type Escrow @entity {
   token: Bytes
   status: Status
   timestamp: BigInt
+  transactionHash: Bytes!
   payments: [Payment!]! @derivedFrom(field: "escrow")
   hasToPayFees: [HasToPayFee!]! @derivedFrom(field: "escrow")
   createdEvents: [TransactionCreated!]! @derivedFrom(field: "escrow")

subgraph/subgraph.yaml

@@ -6,9 +6,9 @@ dataSources:
     name: EscrowUniversal
     network: arbitrum-sepolia
     source:
-      address: '0x5c4B2Cff2998529f9d405A9b6EbB44BC537c8D7F'
+      address: '0xBa2cC03e2e34C5DEDaEbC481b2531e06946353De'
       abi: EscrowUniversal
-      startBlock: 42653663
+      startBlock: 53588833
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.6