SendReentrancyGuard namespace storage

ava-labs · Jul 10, 2024 · fcc172b · fcc172b
1 parent 7fb63df
commit fcc172b
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 6 deletions.
diff --git a/contracts/src/utils/SendReentrancyGuard.sol b/contracts/src/utils/SendReentrancyGuard.sol
@@ -20,20 +20,44 @@ import {Initializable} from
  * @custom:security-contact https://github.com/ava-labs/avalanche-interchain-token-transfer/blob/main/SECURITY.md
  */
 abstract contract SendReentrancyGuard is Initializable {
+    /// @custom:storage-location erc7201:avalanche-ictt.storage.SendReentrancyGuard
+    struct SendReentrancyGuardStorage {
+        uint256 _sendEntered;
+    }
+
+    // keccak256(abi.encode(uint256(keccak256("avalanche-ictt.storage.SendReentrancyGuard")) - 1)) & ~bytes32(uint256(0xff));
+    bytes32 private constant SendReentrancyGuardStorageLocation =
+        0xd2f1ed38b7d242bfb8b41862afb813a15193219a4bc717f2056607593e6c7500;
+
+    function _getSendReentrancyGuardStorage()
+        private
+        pure
+        returns (SendReentrancyGuardStorage storage $)
+    {
+        assembly {
+            $.slot := SendReentrancyGuardStorageLocation
+        }
+    }
+
     uint256 internal constant _NOT_ENTERED = 1;
     uint256 internal constant _ENTERED = 2;
-    uint256 private _sendEntered;
 
     // sendNonReentrant modifier makes sure there is not reentry between {_send} or {_sendAndCall} calls.
     modifier sendNonReentrant() {
-        require(_sendEntered == _NOT_ENTERED, "SendReentrancyGuard: send reentrancy");
-        _sendEntered = _ENTERED;
+        SendReentrancyGuardStorage storage $ = _getSendReentrancyGuardStorage();
+        require($._sendEntered == _NOT_ENTERED, "SendReentrancyGuard: send reentrancy");
+        $._sendEntered = _ENTERED;
         _;
-        _sendEntered = _NOT_ENTERED;
+        $._sendEntered = _NOT_ENTERED;
     }
 
     //solhint-disable-next-line func-name-mixedcase
     function __SendReentrancyGuard_init() internal onlyInitializing {
-        _sendEntered = _NOT_ENTERED;
+        __SendReentrnacyGuard_init_unchained();
+    }
+
+    function __SendReentrnacyGuard_init_unchained() internal {
+        SendReentrancyGuardStorage storage $ = _getSendReentrancyGuardStorage();
+        $._sendEntered = _NOT_ENTERED;
     }
 }
diff --git a/contracts/test/ComputeSlotTests.t.sol b/contracts/test/ComputeSlotTests.t.sol
@@ -11,7 +11,7 @@ import {console2} from "forge-std/Console2.sol";
 contract ComputeSlotTest is Test {
     function testTokenHomeSlot() public {
         bytes32 slot = keccak256(
-            abi.encode(uint256(keccak256("avalanche-ictt.storage.NativeTokenRemote")) - 1)
+            abi.encode(uint256(keccak256("avalanche-ictt.storage.SendReentrancyGuard")) - 1)
         ) & ~bytes32(uint256(0xff));
         console2.logBytes32(slot);
     }