Absolute tx deadline

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/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/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

web/src/pages/NewTransaction/NavigationButtons/DepositPaymentButton.tsx

@@ -40,7 +40,6 @@ const DepositPaymentButton: React.FC = () => {
     resetContext,
   } = useNewTransactionContext();
 
-  const [currentTime, setCurrentTime] = useState(Date.now());
   const [finalRecipientAddress, setFinalRecipientAddress] = useState(sellerAddress);
   const publicClient = usePublicClient();
   const navigateAndScrollTop = useNavigateAndScrollTop();
@@ -50,32 +49,19 @@ const DepositPaymentButton: React.FC = () => {
   const { address } = useAccount();
   const { chain } = useNetwork();
   const ensResult = useEnsAddress({ name: sellerAddress, chainId: 1 });
-  const deadlineTimestamp = useMemo(() => new Date(deadline).getTime(), [deadline]);
-  const timeoutPayment = useMemo(() => (deadlineTimestamp - currentTime) / 1000, [deadlineTimestamp, currentTime]);
+  const deadlineTimestamp = useMemo(() => BigInt(Math.floor(new Date(deadline).getTime() / 1000)), [deadline]);
   const isNativeTransaction = sendingToken?.address === "native";
   const transactionValue = useMemo(
     () => (isNativeTransaction ? parseEther(sendingQuantity) : parseUnits(sendingQuantity, 18)),
     [isNativeTransaction, sendingQuantity]
   );
-  const isDeadlinePassed = currentTime >= deadlineTimestamp;
-
-  useEffect(() => {
-    if (isDeadlinePassed) {
-      navigateAndScrollTop("/new-transaction/deadline");
-    }
-  }, [isDeadlinePassed, navigateAndScrollTop]);
-
-  useEffect(() => {
-    const intervalId = setInterval(() => setCurrentTime(Date.now()), 1000);
-    return () => clearInterval(intervalId);
-  }, []);
 
   useEffect(() => {
     setFinalRecipientAddress(ensResult.data || sellerAddress);
   }, [sellerAddress, ensResult.data]);
 
-  const { data: allowance } = useContractRead({
-    enabled: !isNativeTransaction && !isDeadlinePassed,
+  const { data: allowance, refetch: refetchAllowance } = useContractRead({
+    enabled: !isNativeTransaction,
     address: sendingToken?.address,
     abi: erc20ABI,
     functionName: "allowance",
@@ -120,7 +106,7 @@ const DepositPaymentButton: React.FC = () => {
           seller: sellerAddress,
           amount: sendingQuantity,
           token: isNativeTransaction ? "native" : sendingToken?.address,
-          timeoutPayment: timeoutPayment,
+          deadline: deadlineTimestamp.toString(),
           transactionUri: transactionUri,
         },
         category: "Escrow",
@@ -140,14 +126,14 @@ const DepositPaymentButton: React.FC = () => {
       address,
       isNativeTransaction,
       sendingToken?.address,
-      timeoutPayment,
+      deadlineTimestamp,
       transactionUri,
     ]
   );
 
   const { config: createNativeTransactionConfig } = usePrepareEscrowUniversalCreateNativeTransaction({
-    enabled: isNativeTransaction && ethAddressPattern.test(finalRecipientAddress) && !isDeadlinePassed,
-    args: [BigInt(Math.floor(timeoutPayment)), transactionUri, finalRecipientAddress, templateData, ""],
+    enabled: isNativeTransaction && ethAddressPattern.test(finalRecipientAddress),
+    args: [deadlineTimestamp, transactionUri, finalRecipientAddress, templateData, ""],
     value: transactionValue,
   });
 
@@ -156,12 +142,11 @@ const DepositPaymentButton: React.FC = () => {
       !isNativeTransaction &&
       !isUndefined(allowance) &&
       allowance >= transactionValue &&
-      ethAddressPattern.test(finalRecipientAddress) &&
-      !isDeadlinePassed,
+      ethAddressPattern.test(finalRecipientAddress),
     args: [
       transactionValue,
       sendingToken?.address,
-      BigInt(Math.floor(timeoutPayment)),
+      deadlineTimestamp,
       transactionUri,
       finalRecipientAddress,
       templateData,
@@ -174,7 +159,7 @@ const DepositPaymentButton: React.FC = () => {
   const { writeAsync: createERC20Transaction } = useEscrowUniversalCreateErc20Transaction(createERC20TransactionConfig);
 
   const { config: approveConfig } = usePrepareContractWrite({
-    enabled: !isNativeTransaction && !isDeadlinePassed,
+    enabled: !isNativeTransaction,
     address: sendingToken?.address,
     abi: erc20ABI,
     functionName: "approve",
@@ -192,6 +177,7 @@ const DepositPaymentButton: React.FC = () => {
           publicClient
         );
         setIsApproved(wrapResult.status);
+        await refetchAllowance();
       } catch (error) {
         console.error("Approval failed:", error);
         setIsApproved(false);
@@ -226,7 +212,7 @@ const DepositPaymentButton: React.FC = () => {
   return (
     <StyledButton
       isLoading={isSending}
-      disabled={isSending || isDeadlinePassed}
+      disabled={isSending}
       text={isNativeTransaction || isApproved ? "Deposit the Payment" : "Approve Token"}
       onClick={isNativeTransaction || isApproved ? handleCreateTransaction : handleApproveToken}
     />