add HybridProxy

Author: Amxx

contracts/access/AccessManagerLight.sol

@@ -2,8 +2,8 @@
 
 pragma solidity ^0.8.20;
 
-import { IAuthority      } from "@openzeppelin/contracts/access/manager/IAuthority.sol";
-import { Masks           } from "../utils/Masks.sol";
+import { IAuthority } from "@openzeppelin/contracts/access/manager/IAuthority.sol";
+import { Masks } from "../utils/Masks.sol";
 
 contract AccessManagerLight is IAuthority {
     using Masks for *;

contracts/proxy/HybridProxy.sol

@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.20;
+
+import {IBeacon} from "@openzeppelin/contracts/proxy/beacon/IBeacon.sol";
+import {ERC1967Utils} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Utils.sol";
+import {Proxy} from "@openzeppelin/contracts/proxy/Proxy.sol";
+import {Address} from "@openzeppelin/contracts/utils/Address.sol";
+
+contract HybridProxy is Proxy {
+    constructor(address implementation, bytes memory data)
+    {
+        ERC1967Utils.upgradeToAndCall(implementation, "");
+        if (data.length > 0) {
+            Address.functionDelegateCall(_implementation(), data);
+        }
+    }
+
+    function _implementation()
+        internal
+        view
+        override
+        returns (address)
+    {
+        address implementation = ERC1967Utils.getImplementation();
+        try IBeacon(implementation).implementation() returns (address result) {
+            return result;
+        } catch {
+            return implementation;
+        }
+    }
+}