Fix R-04

OpenZeppelin · Aug 2, 2023 · 5338503 · 5338503
1 parent f220f12
commit 5338503
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/contracts/proxy/transparent/TransparentUpgradeableProxy.sol b/contracts/proxy/transparent/TransparentUpgradeableProxy.sol
@@ -78,14 +78,21 @@ contract TransparentUpgradeableProxy is ERC1967Proxy {
     constructor(address _logic, address initialOwner, bytes memory _data) payable ERC1967Proxy(_logic, _data) {
         _admin = address(new ProxyAdmin(initialOwner));
         // Set the storage value and emit an event for ERC-1967 compatibility
-        ERC1967Utils.changeAdmin(_admin);
+        ERC1967Utils.changeAdmin(_admin());
+    }
+
+    /**
+     * @dev Returns the admin of this proxy.
+     */
+    function _admin() internal virtual {
+        return _admin;
     }
 
     /**
      * @dev If caller is the admin process the call internally, otherwise transparently fallback to the proxy behavior.
      */
     function _fallback() internal virtual override {
-        if (msg.sender == _admin) {
+        if (msg.sender == _admin()) {
             if (msg.sig == ITransparentUpgradeableProxy.upgradeToAndCall.selector) {
                 _dispatchUpgradeToAndCall();
             } else {