registry: emit index/update from escrow

Author: natalya-bbr

src/escrow/SafeBaseEscrowV1.sol

@@ -8,6 +8,18 @@ import {PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/Pau
 import {Treasury} from "../Treasury.sol";
 import {IERC20} from "../IERC20.sol";
 
+interface IRegistry {
+    function indexEscrow(
+        uint256 escrowId,
+        address buyer,
+        address seller,
+        uint256 amount,
+        uint256 createdAt
+    ) external;
+
+    function updateEscrowState(uint256 escrowId, uint8 state) external;
+}
+
 interface IRulesEngine {
     function canRelease(
         uint256 ruleSetId,
@@ -143,6 +155,10 @@ contract SafeBaseEscrowV1 is
 
         emit EscrowCreated(escrowId, msg.sender, _seller, _token, _amount, _deadline);
 
+        if (registry != address(0)) {
+            IRegistry(registry).indexEscrow(escrowId, msg.sender, _seller, _amount, block.timestamp);
+        }
+
         return escrowId;
     }
 
@@ -162,6 +178,7 @@ contract SafeBaseEscrowV1 is
         }
 
         escrow.state = EscrowState.Funded;
+        _updateRegistryState(_escrowId);
         emit EscrowFunded(_escrowId, escrow.amount);
     }
 
@@ -173,6 +190,7 @@ contract SafeBaseEscrowV1 is
         escrow.paymentId = _paymentId;
         paymentIdToEscrow[_paymentId] = _escrowId;
 
+        _updateRegistryState(_escrowId);
         emit EscrowFunded(_escrowId, escrow.amount);
         emit BasePayFundingReceived(_escrowId, _paymentId);
     }
@@ -235,6 +253,7 @@ contract SafeBaseEscrowV1 is
         treasury.approveWithdrawal(requestId);
         treasury.executeWithdrawal(requestId);
 
+        _updateRegistryState(_escrowId);
         emit EscrowReleased(_escrowId, escrow.seller);
     }
 
@@ -276,6 +295,7 @@ contract SafeBaseEscrowV1 is
         treasury.approveWithdrawal(requestId);
         treasury.executeWithdrawal(requestId);
 
+        _updateRegistryState(_escrowId);
         emit EscrowPartialReleased(_escrowId, escrow.seller, _amount);
     }
 
@@ -309,6 +329,7 @@ contract SafeBaseEscrowV1 is
         treasury.approveWithdrawal(requestId);
         treasury.executeWithdrawal(requestId);
 
+        _updateRegistryState(_escrowId);
         emit EscrowRefunded(_escrowId, escrow.buyer);
     }
 
@@ -319,6 +340,7 @@ contract SafeBaseEscrowV1 is
         if (escrow.mediator == address(0)) revert Unauthorized();
 
         escrow.state = EscrowState.Disputed;
+        _updateRegistryState(_escrowId);
         emit EscrowDisputed(_escrowId, msg.sender);
     }
 
@@ -328,6 +350,7 @@ contract SafeBaseEscrowV1 is
         if (msg.sender != escrow.buyer) revert Unauthorized();
 
         escrow.state = EscrowState.Cancelled;
+        _updateRegistryState(_escrowId);
         emit EscrowCancelled(_escrowId);
     }
 
@@ -345,5 +368,11 @@ contract SafeBaseEscrowV1 is
 
     function _authorizeUpgrade(address newImplementation) internal override onlyOwner {}
 
+    function _updateRegistryState(uint256 _escrowId) internal {
+        if (registry != address(0)) {
+            IRegistry(registry).updateEscrowState(_escrowId, uint8(escrows[_escrowId].state));
+        }
+    }
+
     uint256[50] private __gap;
 }

test/SafeBaseEscrowV1.t.sol

@@ -6,11 +6,13 @@ import {SafeBaseEscrowV1} from "../src/escrow/SafeBaseEscrowV1.sol";
 import {Treasury} from "../src/Treasury.sol";
 import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
 import {MockERC20} from "./mocks/MockERC20.sol";
+import {MockRegistry} from "./mocks/MockRegistry.sol";
 
 contract SafeBaseEscrowV1Test is Test {
     SafeBaseEscrowV1 public escrow;
     Treasury public treasury;
     MockERC20 public token;
+    MockRegistry public registry;
 
     address public owner = address(1);
     address public buyer = address(2);
@@ -36,6 +38,7 @@ contract SafeBaseEscrowV1Test is Test {
 
     function setUp() public {
         token = new MockERC20("Test Token", "TEST", 18);
+        registry = new MockRegistry();
 
         Treasury treasuryImpl = new Treasury();
         bytes memory treasuryData = abi.encodeWithSelector(
@@ -58,6 +61,7 @@ contract SafeBaseEscrowV1Test is Test {
         vm.startPrank(owner);
         treasury.addAdmin(address(escrow));
         treasury.addExecutor(address(escrow));
+        escrow.setRegistry(address(registry));
         vm.stopPrank();
 
         vm.deal(buyer, 100 ether);
@@ -209,6 +213,30 @@ contract SafeBaseEscrowV1Test is Test {
         escrow.fundEscrow{value: 0.5 ether}(escrowId);
     }
 
+    function testRegistryIndexAndUpdateOnFund() public {
+        vm.prank(buyer);
+        uint256 escrowId = escrow.createEscrow(
+            seller,
+            mediator,
+            address(0),
+            1 ether,
+            block.timestamp + 1 days,
+            0
+        );
+
+        MockRegistry.Indexed memory meta = registry.indexed(escrowId);
+        assertEq(meta.buyer, buyer);
+        assertEq(meta.seller, seller);
+        assertEq(meta.amount, 1 ether);
+        assertEq(meta.createdAt, block.timestamp);
+
+        vm.prank(buyer);
+        escrow.fundEscrow{value: 1 ether}(escrowId);
+
+        assertEq(registry.lastEscrowId(), escrowId);
+        assertEq(registry.lastState(), uint8(SafeBaseEscrowV1.EscrowState.Funded));
+    }
+
     function testFundEscrowERC20() public {
         vm.prank(buyer);
         uint256 escrowId = escrow.createEscrow(
@@ -568,6 +596,8 @@ contract SafeBaseEscrowV1Test is Test {
         SafeBaseEscrowV1.EscrowData memory escrowData = escrow.getEscrow(escrowId);
         assertTrue(escrowData.state == SafeBaseEscrowV1.EscrowState.Refunded);
         assertEq(buyer.balance, buyerBalanceBefore + 1 ether);
+        assertEq(registry.lastEscrowId(), escrowId);
+        assertEq(registry.lastState(), uint8(SafeBaseEscrowV1.EscrowState.Refunded));
     }
 
     function testRefundToBuyerMediator() public {

test/mocks/MockRegistry.sol

@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.28;
+
+contract MockRegistry {
+    uint256 public lastEscrowId;
+    uint8 public lastState;
+    struct Indexed {
+        address buyer;
+        address seller;
+        uint256 amount;
+        uint256 createdAt;
+    }
+    mapping(uint256 => Indexed) public indexed;
+
+    function indexEscrow(
+        uint256 escrowId,
+        address buyer,
+        address seller,
+        uint256 amount,
+        uint256 createdAt
+    ) external {
+        indexed[escrowId] = Indexed(buyer, seller, amount, createdAt);
+        lastEscrowId = escrowId;
+    }
+
+    function updateEscrowState(uint256 escrowId, uint8 state) external {
+        lastEscrowId = escrowId;
+        lastState = state;
+    }
+}
+