Add more test cases

immutable · Aug 26, 2024 · 144f688 · 144f688
1 parent 68f26e9
commit 144f688
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 8 deletions.
diff --git a/contracts/mocks/MockFunctions.sol b/contracts/mocks/MockFunctions.sol
@@ -3,6 +3,8 @@
 pragma solidity ^0.8.19;
 
 contract MockFunctions {
+    error RevertWithData(uint256 value);
+
     // solhint-disable-next-line no-empty-blocks
     function succeed() public pure {
         // This function is intentionally left empty to simulate a successful call
@@ -21,4 +23,9 @@ contract MockFunctions {
     function succeedWithUint256(uint256 value) public pure returns (uint256) {
         return value;
     }
+
+    function revertWithData(uint256 value) public pure {
+        // solhint-disable-next-line custom-errors,reason-string
+        revert RevertWithData(value);
+    }
 }
diff --git a/contracts/multicall/GuardedMulticaller2.sol b/contracts/multicall/GuardedMulticaller2.sol
@@ -164,11 +164,13 @@ contract GuardedMulticaller2 is AccessControl, ReentrancyGuard, EIP712 {
             // slither-disable-next-line calls-loop
             (bool success, bytes memory returnData) = _calls[i].target.call(callData);
             if (!success) {
+                // Look for revert reason and bubble it up if present
                 if (returnData.length == 0) {
                     revert FailedCall(_calls[i]);
                 }
                 // solhint-disable-next-line no-inline-assembly
                 assembly {
+                    // The easiest way to bubble the revert reason is using memory via assembly
                     revert(add(returnData, 32), mload(returnData))
                 }
             }

diff --git a/test/multicall/GuardedMulticaller2.t.sol b/test/multicall/GuardedMulticaller2.t.sol
@@ -73,7 +73,7 @@ contract GuardedMulticaller2Test is Test {
         assertTrue(gmc.hasBeenExecuted(ref));
     }
 
-    function test_RevertWhen_Expired() public {
+    function test_RevertWhen_ExecuteExpired() public {
         bytes32 ref = keccak256("ref");
         uint256 deadline = block.timestamp - 1;
         GuardedMulticaller2.Call[] memory calls = new GuardedMulticaller2.Call[](1);
@@ -92,7 +92,7 @@ contract GuardedMulticaller2Test is Test {
         gmc.execute(signer, ref, calls, deadline, signature);
     }
 
-    function test_RevertWhen_InvalidReference() public {
+    function test_RevertWhen_ExecuteInvalidReference() public {
         bytes32 ref = "";
         uint256 deadline = block.timestamp + 1;
         GuardedMulticaller2.Call[] memory calls = new GuardedMulticaller2.Call[](1);
@@ -111,7 +111,7 @@ contract GuardedMulticaller2Test is Test {
         gmc.execute(signer, ref, calls, deadline, signature);
     }
 
-    function test_RevertWhen_ReusedReference() public {
+    function test_RevertWhen_ExecuteReusedReference() public {
         bytes32 ref = "ref";
         uint256 deadline = block.timestamp + 1;
         GuardedMulticaller2.Call[] memory calls = new GuardedMulticaller2.Call[](1);
@@ -131,7 +131,7 @@ contract GuardedMulticaller2Test is Test {
         gmc.execute(signer, ref, calls, deadline, signature);
     }
 
-    function test_RevertWhen_EmptyCallArray() public {
+    function test_RevertWhen_ExecuteEmptyCallArray() public {
         bytes32 ref = "ref";
         uint256 deadline = block.timestamp + 1;
         GuardedMulticaller2.Call[] memory calls = new GuardedMulticaller2.Call[](0);
@@ -145,7 +145,7 @@ contract GuardedMulticaller2Test is Test {
         gmc.execute(signer, ref, calls, deadline, signature);
     }
 
-    function test_RevertWhen_NonContractAddress() public {
+    function test_RevertWhen_ExecuteNonContractAddress() public {
         bytes32 ref = "ref";
         uint256 deadline = block.timestamp + 1;
         GuardedMulticaller2.Call[] memory calls = new GuardedMulticaller2.Call[](1);
@@ -160,7 +160,7 @@ contract GuardedMulticaller2Test is Test {
         gmc.execute(signer, ref, calls, deadline, signature);
     }
 
-    function test_RevertWhen_UnauthorizedSigner() public {
+    function test_RevertWhen_ExecuteUnauthorizedSigner() public {
         (address fakeSigner, uint256 fakeSignerPk) = makeAddrAndKey("fakeSigner");
         bytes32 ref = keccak256("ref");
         uint256 deadline = block.timestamp + 1;
@@ -180,7 +180,7 @@ contract GuardedMulticaller2Test is Test {
         gmc.execute(fakeSigner, ref, calls, deadline, signature);
     }
 
-    function test_RevertWhen_UnauthorizedSignature() public {
+    function test_RevertWhen_ExecuteUnauthorizedSignature() public {
         (, uint256 fakeSignerPk) = makeAddrAndKey("fakeSigner");
         bytes32 ref = keccak256("ref");
         uint256 deadline = block.timestamp + 1;
@@ -200,7 +200,7 @@ contract GuardedMulticaller2Test is Test {
         gmc.execute(signer, ref, calls, deadline, signature);
     }
 
-    function test_RevertWhen_FailedCall() public {
+    function test_RevertWhen_ExecuteFailedCall() public {
         bytes32 ref = keccak256("ref");
         uint256 deadline = block.timestamp + 1;
         GuardedMulticaller2.Call[] memory calls = new GuardedMulticaller2.Call[](1);
@@ -214,4 +214,50 @@ contract GuardedMulticaller2Test is Test {
 
         gmc.execute(signer, ref, calls, deadline, signature);
     }
+
+    function test_RevertWhen_ExecuteRevokeMinterRole() public {
+        bytes32 ref = keccak256("ref");
+        uint256 deadline = block.timestamp + 1;
+        GuardedMulticaller2.Call[] memory calls = new GuardedMulticaller2.Call[](1);
+        calls[0] = GuardedMulticaller2.Call(
+            address(target),
+            "succeedWithUint256(uint256)",
+            abi.encodePacked(uint256(42))
+        );
+
+        bytes32 digest = sigUtils.hashTypedData(ref, calls, deadline);
+        (uint8 v, bytes32 r, bytes32 s) = vm.sign(signerPk, digest);
+        bytes memory signature = abi.encodePacked(r, s, v);
+
+        gmc.execute(signer, ref, calls, deadline, signature);
+
+        vm.startPrank(defaultAdmin);
+        gmc.revokeMulticallSignerRole(signer);
+        vm.stopPrank();
+
+        bytes32 ref1 = keccak256("ref1");
+        bytes32 digest1 = sigUtils.hashTypedData(ref1, calls, deadline);
+        (v, r, s) = vm.sign(signerPk, digest1);
+        bytes memory signature1 = abi.encodePacked(r, s, v);
+
+        vm.expectRevert(abi.encodeWithSelector(GuardedMulticaller2.UnauthorizedSigner.selector, signer));
+        gmc.execute(signer, ref1, calls, deadline, signature1);
+        bool executed = gmc.hasBeenExecuted(ref1);
+        assertFalse(executed);
+    }
+
+    function test_RevertWhen_ExecuteBubbleUpRevertReason() public {
+        bytes32 ref = keccak256("ref");
+        uint256 deadline = block.timestamp + 1;
+        GuardedMulticaller2.Call[] memory calls = new GuardedMulticaller2.Call[](1);
+        calls[0] = GuardedMulticaller2.Call(address(target), "revertWithData(uint256)", abi.encodePacked(uint256(42)));
+
+        bytes32 digest = sigUtils.hashTypedData(ref, calls, deadline);
+        (uint8 v, bytes32 r, bytes32 s) = vm.sign(signerPk, digest);
+        bytes memory signature = abi.encodePacked(r, s, v);
+
+        vm.expectRevert(abi.encodeWithSelector(MockFunctions.RevertWithData.selector, uint256(42)));
+
+        gmc.execute(signer, ref, calls, deadline, signature);
+    }
 }