Merge branch 'master' into chore/remove-crypto-swap-add-hover-effects

Author: kemuru

contracts/src/EscrowUniversal.sol

@@ -37,6 +37,7 @@ contract EscrowUniversal is IEscrow, IArbitrableV2 {
     uint256 public settlementTimeout; // Time in seconds a party can take to accept or propose a settlement before being considered unresponsive.
     Transaction[] public transactions; // List of all created transactions.
     mapping(uint256 => uint256) public disputeIDtoTransactionID; // Naps dispute ID to tx ID.
+    mapping(IERC20 => uint256) public amountCaps; // Caps the amount of the respective token for the Escrow transaction.
 
     // ************************************* //
     // *        Function Modifiers         * //
@@ -47,6 +48,11 @@ contract EscrowUniversal is IEscrow, IArbitrableV2 {
         _;
     }
 
+    modifier shouldNotExceedCap(IERC20 _token, uint256 _amount) {
+        if (amountCaps[_token] != 0 && _amount > amountCaps[_token]) revert AmountExceedsCap();
+        _;
+    }
+
     // ************************************* //
     // *            Constructor            * //
     // ************************************* //
@@ -117,6 +123,10 @@ contract EscrowUniversal is IEscrow, IArbitrableV2 {
         emit ParameterUpdated(feeTimeout, _settlementTimeout, arbitratorExtraData);
     }
 
+    function changeAmountCap(IERC20 _token, uint256 _amountCap) external onlyByGovernor {
+        amountCaps[_token] = _amountCap;
+    }
+
     // ************************************* //
     // *         State Modifiers           * //
     // ************************************* //
@@ -126,7 +136,7 @@ contract EscrowUniversal is IEscrow, IArbitrableV2 {
         uint256 _deadline,
         string memory _transactionUri,
         address payable _seller
-    ) external payable override returns (uint256 transactionID) {
+    ) external payable override shouldNotExceedCap(NATIVE, msg.value) returns (uint256 transactionID) {
         Transaction storage transaction = transactions.push();
         transaction.buyer = payable(msg.sender);
         transaction.seller = _seller;
@@ -153,7 +163,7 @@ contract EscrowUniversal is IEscrow, IArbitrableV2 {
         uint256 _deadline,
         string memory _transactionUri,
         address payable _seller
-    ) external override returns (uint256 transactionID) {
+    ) external override shouldNotExceedCap(_token, _amount) returns (uint256 transactionID) {
         // Transfers token from sender wallet to contract.
         if (!_token.safeTransferFrom(msg.sender, address(this), _amount)) revert TokenTransferFailed();
         Transaction storage transaction = transactions.push();

contracts/src/interfaces/IEscrow.sol

@@ -180,4 +180,5 @@ interface IEscrow {
     error SettlementPeriodNotOver();
     error NotSupported();
     error TokenTransferFailed();
+    error AmountExceedsCap();
 }

web/.env.devnet.public

@@ -2,4 +2,3 @@
 export REACT_APP_DEPLOYMENT=devnet
 export REACT_APP_ARBSEPOLIA_SUBGRAPH=https://api.studio.thegraph.com/query/61738/escrow-v2-devnet/version/latest
 export REACT_APP_STATUS_URL=https://escrow-v2-devnet.betteruptime.com/badge
-export REACT_APP_GENESIS_BLOCK_ARBSEPOLIA=42653663

web/package.json

@@ -34,7 +34,7 @@
     "build-local": "scripts/runEnv.sh local 'yarn generate && vite build'",
     "build-devnet": "scripts/runEnv.sh devnet 'yarn generate && vite build'",
     "build-testnet": "scripts/runEnv.sh testnet 'yarn generate && vite build'",
-    "build-netlify": "scripts/runEnv.sh devnet 'scripts/generateBuildInfo.sh && yarn generate && vite build'",
+    "build-netlify": "scripts/generateBuildInfo.sh && yarn generate && vite build",
     "check-style": "eslint 'src/**/*.{js,jsx,ts,tsx}'",
     "check-types": "tsc --noEmit",
     "generate": "yarn generate:gql && yarn generate:hooks",