Merge branch 'dev' into feat(web)/commit-reveal

Author: jaybuidl

contracts/README.md

@@ -4,7 +4,7 @@ Smart contracts for Kleros v2
 
 ## Deployments
 
-Refresh the list of deployed contracts by running `./scripts/generateDeploymentsMarkdown.sh`.
+Refresh the list of deployed contracts by running `./scripts/generateDeploymentsMarkdown.sh` or `./scripts/populateReadme.sh`.
 
 ### Official Testnet
 
@@ -57,7 +57,7 @@ Refresh the list of deployed contracts by running `./scripts/generateDeployments
 - [DisputeKitClassic: proxy](https://sepolia.arbiscan.io/address/0x9426F127116C3652A262AE1eA48391AC8F44D35b), [implementation](https://sepolia.arbiscan.io/address/0x692CC78F2570181FFB99297965FeAA8352ab12E8)
 - [DisputeResolver](https://sepolia.arbiscan.io/address/0xB8B36CC43f852f9F0484f53Eb38CaBBA28a81bF6)
 - [DisputeTemplateRegistry: proxy](https://sepolia.arbiscan.io/address/0x596D3B09E684D62217682216e9b7a0De75933391), [implementation](https://sepolia.arbiscan.io/address/0xc53b813ed94AaEb6F5518D60bf6a8109954bE3f6)
-- [Escrow](https://sepolia.arbiscan.io/address/0xdaf749DABE7be6C6894950AE69af35c20a00ABd9)
+- [Escrow](https://sepolia.arbiscan.io/address/0x10f7A6f42Af606553883415bc8862643A6e63fdA)
 - [EvidenceModule: proxy](https://sepolia.arbiscan.io/address/0x57fd453FB0d16f8ca174E7386102D7170E17Be09), [implementation](https://sepolia.arbiscan.io/address/0x05AD81f245209b7f91885fd96e57c9da90554824)
 - [KlerosCore: proxy](https://sepolia.arbiscan.io/address/0xA54e7A16d7460e38a8F324eF46782FB520d58CE8), [implementation](https://sepolia.arbiscan.io/address/0x91a373BBdE0532F86410682F362e2Cf685e95085)
 - [PNKFaucet](https://sepolia.arbiscan.io/address/0x7EFE468003Ad6A858b5350CDE0A67bBED58739dD)

contracts/deployments/arbitrumSepoliaDevnet/Escrow.json

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
+
+if [ ! -x "$(command -v envsubst)" ]; then
+    echo >&2 "error: envsubst not installed"
+    exit 1
+fi
+
+deployments="$($SCRIPT_DIR/generateDeploymentsMarkdown.sh)" \
+  envsubst '$deployments' \
+  < README.md.template \
+  > README.md

contracts/scripts/populateReadme.sh

@@ -84,14 +84,20 @@ contract Escrow is IArbitrableV2 {
 
     /// @dev Emitted when a transaction is created.
     /// @param _transactionID The index of the transaction.
+    /// @param _transactionUri The IPFS Uri Hash of the transaction.
     /// @param _buyer The address of the buyer.
     /// @param _seller The address of the seller.
     /// @param _amount The initial amount in the transaction.
+    /// @param _asset The asset used ("native" for native chain token).
+    /// @param _deadline The deadline of the transaction.
     event TransactionCreated(
         uint256 indexed _transactionID,
+        string _transactionUri,
         address indexed _buyer,
         address indexed _seller,
-        uint256 _amount
+        uint256 _amount,
+        string _asset,
+        uint256 _deadline
     );
 
     /// @dev To be emitted when a transaction is resolved, either by its
@@ -166,12 +172,14 @@ contract Escrow is IArbitrableV2 {
 
     /// @dev Create a transaction.
     /// @param _timeoutPayment 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 createTransaction(
         uint256 _timeoutPayment,
+        string memory _transactionUri,
         address payable _seller,
         string memory _templateData,
         string memory _templateDataMappings
@@ -186,7 +194,15 @@ contract Escrow is IArbitrableV2 {
 
         transactionID = transactions.length - 1;
 
-        emit TransactionCreated(transactionID, msg.sender, _seller, msg.value);
+        emit TransactionCreated(
+            transactionID,
+            _transactionUri,
+            msg.sender,
+            _seller,
+            msg.value,
+            "native",
+            transaction.deadline
+        );
     }
 
     /// @dev Pay seller. To be called if the good or service is provided.

contracts/src/arbitration/arbitrables/Escrow.sol

@@ -14,6 +14,8 @@ import Cases from "./pages/Cases";
 import Dashboard from "./pages/Dashboard";
 import Courts from "./pages/Courts";
 import DisputeTemplateView from "./pages/DisputeTemplateView";
+import DisputeResolver from "./pages/Resolver";
+import { NewDisputeProvider } from "./context/NewDisputeContext";
 
 const App: React.FC = () => {
   return (
@@ -22,16 +24,19 @@ const App: React.FC = () => {
         <RefetchOnBlock />
         <Web3Provider>
           <IsListProvider>
-            <SentryRoutes>
-              <Route path="/" element={<Layout />}>
-                <Route index element={<Home />} />
-                <Route path="cases/*" element={<Cases />} />
-                <Route path="courts/*" element={<Courts />} />
-                <Route path="dashboard/:page/:order/:filter" element={<Dashboard />} />
-                <Route path="disputeTemplate" element={<DisputeTemplateView />} />
-                <Route path="*" element={<h1>Justice not found here ¯\_( ͡° ͜ʖ ͡°)_/¯</h1>} />
-              </Route>
-            </SentryRoutes>
+            <NewDisputeProvider>
+              <SentryRoutes>
+                <Route path="/" element={<Layout />}>
+                  <Route index element={<Home />} />
+                  <Route path="cases/*" element={<Cases />} />
+                  <Route path="courts/*" element={<Courts />} />
+                  <Route path="dashboard/:page/:order/:filter" element={<Dashboard />} />
+                  <Route path="disputeTemplate" element={<DisputeTemplateView />} />
+                  <Route path="resolver/*" element={<DisputeResolver />} />
+                  <Route path="*" element={<h1>Justice not found here ¯\_( ͡° ͜ʖ ͡°)_/¯</h1>} />
+                </Route>
+              </SentryRoutes>
+            </NewDisputeProvider>
           </IsListProvider>
         </Web3Provider>
       </QueryClientProvider>

web/src/app.tsx

@@ -4,6 +4,7 @@ import { landscapeStyle } from "styles/landscapeStyle";
 import { useAccount, useNetwork, useEnsAvatar, useEnsName } from "wagmi";
 import Identicon from "react-identicons";
 import { shortenAddress } from "utils/shortenAddress";
+import { isAddress } from "viem";
 
 const Container = styled.div`
   display: flex;
@@ -134,7 +135,7 @@ export const AddressOrName: React.FC<IAddressOrName> = ({ address: propAddress }
     chainId: 1,
   });
 
-  return <label>{data ?? (address && shortenAddress(address))}</label>;
+  return <label>{data ?? (isAddress(address) ? shortenAddress(address) : address)}</label>;
 };
 
 export const ChainDisplay: React.FC = () => {