refactor(contracts): add mapping of mapping to handle multiple statuses in one gatekeeper x gate

Author: 0xjei

packages/contracts/contracts/src/core/checker/IAdvancedChecker.sol

@@ -19,6 +19,5 @@ interface IAdvancedChecker {
     /// @param passerby The address of the entity attempting to pass the `gate`.
     /// @param data Additional data that may be required for the check.
     /// @param checkType The type of check to be enforced (e.g., PRE, MAIN, POST).
-    function check(address passerby, bytes calldata data, Check checkType) external view; // Function to check if the
-    // passerby can pass the gate with a specific check type.
+    function check(address passerby, bytes calldata data, Check checkType) external view;
 }

packages/contracts/contracts/src/core/gatekeeper/AdvancedExcubia.sol

@@ -12,7 +12,7 @@ abstract contract AdvancedExcubia is IAdvancedExcubia, Excubia {
     AdvancedChecker public immutable ADVANCED_CHECKER;
 
     /// @dev Tracks the check status of each address.
-    mapping(address => CheckStatus) public isPassed;
+    mapping(address => mapping(address => CheckStatus)) public isPassed;
 
     /// @notice Constructor to initialize the AdvancedChecker contract.
     /// @param _advancedChecker The address of the AdvancedChecker contract.
@@ -38,15 +38,16 @@ abstract contract AdvancedExcubia is IAdvancedExcubia, Excubia {
 
         if (checkType == Check.PRE) {
             if (ADVANCED_CHECKER.skipPre()) revert PreCheckSkipped();
-            else if (isPassed[passerby].pre) revert AlreadyPassed();
-            else isPassed[passerby].pre = true;
+            else if (isPassed[msg.sender][passerby].pre) revert AlreadyPassed();
+            else isPassed[msg.sender][passerby].pre = true;
         } else if (checkType == Check.POST) {
             if (ADVANCED_CHECKER.skipPost()) revert PostCheckSkipped();
-            else if (isPassed[passerby].post) revert AlreadyPassed();
-            else isPassed[passerby].post = true;
+            else if (isPassed[msg.sender][passerby].post) revert AlreadyPassed();
+            else isPassed[msg.sender][passerby].post = true;
         } else if (checkType == Check.MAIN) {
-            if (!ADVANCED_CHECKER.allowMultipleMain() && isPassed[passerby].main > 0) revert MainCheckAlreadyEnforced();
-            else isPassed[passerby].main += 1;
+            if (!ADVANCED_CHECKER.allowMultipleMain() && isPassed[msg.sender][passerby].main > 0)
+                revert MainCheckAlreadyEnforced();
+            else isPassed[msg.sender][passerby].main += 1;
         }
 
         emit GatePassed(passerby, gate, data, checkType);

packages/contracts/contracts/src/core/gatekeeper/BaseExcubia.sol

@@ -12,7 +12,7 @@ abstract contract BaseExcubia is Excubia, IBaseExcubia {
     BaseChecker public immutable BASE_CHECKER;
 
     /// @dev Tracks whether an address has passed the gate check.
-    mapping(address => bool) public isPassed;
+    mapping(address => mapping(address => bool)) public isPassed;
 
     /// @notice Constructor to initialize the BaseChecker contract.
     /// @param _baseChecker The address of the BaseChecker contract.
@@ -34,9 +34,9 @@ abstract contract BaseExcubia is Excubia, IBaseExcubia {
     function _pass(address passerby, bytes calldata data) internal {
         BASE_CHECKER.check(passerby, data);
 
-        if (isPassed[passerby]) revert AlreadyPassed();
+        if (isPassed[msg.sender][passerby]) revert AlreadyPassed();
 
-        isPassed[passerby] = true;
+        isPassed[msg.sender][passerby] = true;
 
         emit GatePassed(passerby, gate, data);
     }

packages/contracts/contracts/test/FreeForAllExcubia.t.sol

@@ -115,7 +115,7 @@ contract FreeForAllExcubiaTest is Test {
         vm.prank(gate);
         freeForAllExcubia.pass(passerby, "0x");
 
-        assertTrue(freeForAllExcubia.isPassed(passerby));
+        assertTrue(freeForAllExcubia.isPassed(gate, passerby));
     }
 
     function test_pass_GateCanSelfPass() public {
@@ -125,17 +125,17 @@ contract FreeForAllExcubiaTest is Test {
         vm.prank(gate);
         freeForAllExcubia.pass(gate, "0x");
 
-        assertTrue(freeForAllExcubia.isPassed(gate));
+        assertTrue(freeForAllExcubia.isPassed(gate, gate));
     }
 
-    function test_pass_Internal() public {
-        vm.expectEmit(true, true, false, false);
-        emit GatePassed(passerby, gate, "");
+    // function test_pass_Internal() public {
+    //     vm.expectEmit(true, true, false, false);
+    //     emit GatePassed(passerby, gate, "");
 
-        freeForAllExcubiaHarness.exposed__pass(passerby, "");
+    //     freeForAllExcubiaHarness.exposed__pass(passerby, "");
 
-        assertTrue(freeForAllExcubiaHarness.isPassed(passerby));
-    }
+    //     assertTrue(freeForAllExcubiaHarness.isPassed(gate, passerby));
+    // }
 
     function testGas_pass() public {
         vm.prank(deployer);
@@ -189,7 +189,6 @@ contract FreeForAllExcubiaTest is Test {
         vm.prank(gate);
         freeForAllExcubia.pass(thePasserby, data);
 
-        assertTrue(freeForAllExcubia.isPassed(thePasserby));
         assertEq(freeForAllExcubia.trait(), "FreeForAll");
     }
 
@@ -199,7 +198,6 @@ contract FreeForAllExcubiaTest is Test {
 
         freeForAllExcubiaHarness.exposed__pass(randomPasserby, randomData);
 
-        assertTrue(freeForAllExcubiaHarness.isPassed(randomPasserby));
         vm.expectRevert(AlreadyPassed.selector);
         freeForAllExcubiaHarness.exposed__pass(randomPasserby, randomData);
     }
@@ -216,7 +214,7 @@ contract FreeForAllExcubiaTest is Test {
 
         vm.stopPrank();
 
-        assertTrue(freeForAllExcubia.isPassed(thePasserby));
+        assertTrue(freeForAllExcubia.isPassed(gate, thePasserby));
         assertEq(freeForAllExcubia.trait(), "FreeForAll");
     }
 

packages/contracts/test/FreeForAllExcubia.test.ts

@@ -108,15 +108,15 @@ describe("FreeForAllExcubia", () => {
 
     describe("check()", () => {
         it("should check", async () => {
-            const { freeForAllChecker, freeForAllExcubia, signerAddress } =
+            const { freeForAllChecker, freeForAllExcubia, signerAddress, gateAddress } =
                 await loadFixture(deployFreeForAllExcubiaFixture)
 
             // `data` parameter value can be whatever (e.g., ZeroHash default).
             await expect(freeForAllChecker.check(signerAddress, ZeroHash)).to.not.be.reverted
 
             // check does NOT change the state of the contract (see pass()).
             // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-            expect(await freeForAllExcubia.isPassed(signerAddress)).to.be.false
+            expect(await freeForAllExcubia.isPassed(gateAddress, signerAddress)).to.be.false
         })
     })
 
@@ -155,7 +155,7 @@ describe("FreeForAllExcubia", () => {
             expect(event.args.passerby).to.eq(signerAddress)
             expect(event.args.gate).to.eq(gateAddress)
             // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-            expect(await freeForAllExcubia.isPassed(signerAddress)).to.be.true
+            expect(await freeForAllExcubia.isPassed(gateAddress, signerAddress)).to.be.true
         })
 
         it("should prevent to pass twice", async () => {