fix: exluced proxyAdmin when fuzzing

kilnfi · Dec 5, 2024 · b3f58fb · b3f58fb
1 parent c852012
commit b3f58fb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/src/contracts/StakingContract.sol b/src/contracts/StakingContract.sol
@@ -984,7 +984,6 @@ contract StakingContract {
         address _dispatcher
     ) internal {
         bytes32 publicKeyRoot = _getPubKeyRoot(_publicKey);
-        address withdrawer = _getWithdrawer(publicKeyRoot);
         _revertIfSanctioned(msg.sender);
         bytes32 feeRecipientSalt = sha256(abi.encodePacked(_prefix, publicKeyRoot));
         address implementation = StakingContractStorageLib.getFeeRecipientImplementation();
@@ -1002,7 +1001,7 @@ contract StakingContract {
         }
     }
 
-    function _revertIfSanctionedOrBlocked(address account) internal {
+    function _revertIfSanctionedOrBlocked(address account) internal view {
         address sanctionsOracle = StakingContractStorageLib.getSanctionsOracle();
         if (sanctionsOracle != address(0)) {
             if (ISanctionsOracle(sanctionsOracle).isSanctioned(account)) {
@@ -1014,7 +1013,7 @@ contract StakingContract {
         }
     }
 
-    function _revertIfSanctioned(address account) internal {
+    function _revertIfSanctioned(address account) internal view {
         address sanctionsOracle = StakingContractStorageLib.getSanctionsOracle();
         if (sanctionsOracle != address(0)) {
             if (ISanctionsOracle(sanctionsOracle).isSanctioned(account)) {

diff --git a/src/test/StakingContract.t.sol b/src/test/StakingContract.t.sol
@@ -2051,6 +2051,7 @@ contract StakingContractBehindProxyTest is Test {
 
     SanctionsOracle oracle;
 
+    address internal proxyAdmin = address(42);
     event ExitRequest(address caller, bytes pubkey);
 
     function setUp() public {
@@ -2065,17 +2066,17 @@ contract StakingContractBehindProxyTest is Test {
         address cldImpl = address(new ConsensusLayerFeeDispatcher(1));
         address stakingContractImpl = address(new StakingContract());
 
-        stakingContract = StakingContract(payable(address(new TUPProxy(stakingContractImpl, address(12345), ""))));
+        stakingContract = StakingContract(payable(address(new TUPProxy(stakingContractImpl, proxyAdmin, ""))));
 
         eld = ExecutionLayerFeeDispatcher(
             payable(
-                address(new TUPProxy(eldImpl, address(1), abi.encodeWithSignature("initELD(address)", stakingContract)))
+                address(new TUPProxy(eldImpl, proxyAdmin, abi.encodeWithSignature("initELD(address)", stakingContract)))
             )
         );
 
         cld = ConsensusLayerFeeDispatcher(
             payable(
-                address(new TUPProxy(cldImpl, address(1), abi.encodeWithSignature("initCLD(address)", stakingContract)))
+                address(new TUPProxy(cldImpl, proxyAdmin, abi.encodeWithSignature("initCLD(address)", stakingContract)))
             )
         );
 
@@ -2178,6 +2179,7 @@ contract StakingContractBehindProxyTest is Test {
     }
 
     function test_deposit_withsanctions_senderSanctioned(address user) public {
+        vm.assume(user != proxyAdmin);
         oracle.setSanction(user, true);
 
         vm.prank(admin);
@@ -2192,6 +2194,8 @@ contract StakingContractBehindProxyTest is Test {
     }
 
     function test_deposit_withSanctions_SenderClear(address user) public {
+        vm.assume(user != proxyAdmin);
+
         vm.prank(admin);
         stakingContract.setSanctionsOracle(address(oracle));
 
@@ -2203,6 +2207,8 @@ contract StakingContractBehindProxyTest is Test {
     }
 
     function test_deposit_BlockedUser(address user) public {
+        vm.assume(user != proxyAdmin);
+
         vm.prank(admin);
         stakingContract.blockAccount(user, "");