@ensuro/access-managed-proxy 0.1.0

package/contracts/amps/AccessManagedProxyS21.sol

@@ -0,0 +1,143 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+import {AccessManagedProxy} from "../AccessManagedProxy.sol";
+import {IAccessManager} from "@openzeppelin/contracts/access/manager/IAccessManager.sol";
+
+/**
+ * @title AccessManagedProxyS21
+ * @notice Specialization of AccessManagedProxy with pass thru (skips AM) for some messages for gas optimization
+ *
+ * @custom:security-contact security@ensuro.co
+ * @author Ensuro
+ */
+contract AccessManagedProxyS21 is AccessManagedProxy {
+  bytes4 internal immutable PASS_THRU_METHODS_0;
+  bytes4 internal immutable PASS_THRU_METHODS_1;
+  bytes4 internal immutable PASS_THRU_METHODS_2;
+  bytes4 internal immutable PASS_THRU_METHODS_3;
+  bytes4 internal immutable PASS_THRU_METHODS_4;
+  bytes4 internal immutable PASS_THRU_METHODS_5;
+  bytes4 internal immutable PASS_THRU_METHODS_6;
+  bytes4 internal immutable PASS_THRU_METHODS_7;
+  bytes4 internal immutable PASS_THRU_METHODS_8;
+  bytes4 internal immutable PASS_THRU_METHODS_9;
+  bytes4 internal immutable PASS_THRU_METHODS_10;
+  bytes4 internal immutable PASS_THRU_METHODS_11;
+  bytes4 internal immutable PASS_THRU_METHODS_12;
+  bytes4 internal immutable PASS_THRU_METHODS_13;
+  bytes4 internal immutable PASS_THRU_METHODS_14;
+  bytes4 internal immutable PASS_THRU_METHODS_15;
+  bytes4 internal immutable PASS_THRU_METHODS_16;
+  bytes4 internal immutable PASS_THRU_METHODS_17;
+  bytes4 internal immutable PASS_THRU_METHODS_18;
+  bytes4 internal immutable PASS_THRU_METHODS_19;
+  bytes4 internal immutable PASS_THRU_METHODS_20;
+
+  /**
+   * @notice Constructor of the proxy, defining the implementation and the access manager
+   * @dev Initializes the upgradeable proxy with an initial implementation specified by `implementation` and
+   *      with `manager` as the ACCESS_MANAGER that will handle access control.
+   *
+   * @param implementation The initial implementation contract.
+   * @param _data If nonempty, it's used as data in a delegate call to `implementation`. This will typically be an
+   *              encoded function call, and allows initializing the storage of the proxy like a Solidity constructor.
+   * @param manager The access manager that will handle access control
+   * @param passThruMethods The selector of methods that will skip the access control validation, typically used for
+   *                        views and other methods for gas optimization.
+   *
+   * Requirements:
+   *
+   * - If `data` is empty, `msg.value` must be zero.
+   */
+  constructor(
+    address implementation,
+    bytes memory _data,
+    IAccessManager manager,
+    bytes4[21] memory passThruMethods
+  ) payable AccessManagedProxy(implementation, _data, manager) {
+    PASS_THRU_METHODS_0 = passThruMethods[0];
+    PASS_THRU_METHODS_1 = passThruMethods[1];
+    PASS_THRU_METHODS_2 = passThruMethods[2];
+    PASS_THRU_METHODS_3 = passThruMethods[3];
+    PASS_THRU_METHODS_4 = passThruMethods[4];
+    PASS_THRU_METHODS_5 = passThruMethods[5];
+    PASS_THRU_METHODS_6 = passThruMethods[6];
+    PASS_THRU_METHODS_7 = passThruMethods[7];
+    PASS_THRU_METHODS_8 = passThruMethods[8];
+    PASS_THRU_METHODS_9 = passThruMethods[9];
+    PASS_THRU_METHODS_10 = passThruMethods[10];
+    PASS_THRU_METHODS_11 = passThruMethods[11];
+    PASS_THRU_METHODS_12 = passThruMethods[12];
+    PASS_THRU_METHODS_13 = passThruMethods[13];
+    PASS_THRU_METHODS_14 = passThruMethods[14];
+    PASS_THRU_METHODS_15 = passThruMethods[15];
+    PASS_THRU_METHODS_16 = passThruMethods[16];
+    PASS_THRU_METHODS_17 = passThruMethods[17];
+    PASS_THRU_METHODS_18 = passThruMethods[18];
+    PASS_THRU_METHODS_19 = passThruMethods[19];
+    PASS_THRU_METHODS_20 = passThruMethods[20];
+  }
+
+  /*
+   * @notice Skips the access control if the method called is one of the passThruMethods
+   * @dev See {PASS_THRU_METHODS()}
+   * @param selector The selector of the method called
+   * @return Whether the access control using ACCESS_MANAGER should be skipped or not
+   */
+  function _skipAC(bytes4 selector) internal view override returns (bool) {
+    return
+      selector == PASS_THRU_METHODS_0 ||
+      selector == PASS_THRU_METHODS_1 ||
+      selector == PASS_THRU_METHODS_2 ||
+      selector == PASS_THRU_METHODS_3 ||
+      selector == PASS_THRU_METHODS_4 ||
+      selector == PASS_THRU_METHODS_5 ||
+      selector == PASS_THRU_METHODS_6 ||
+      selector == PASS_THRU_METHODS_7 ||
+      selector == PASS_THRU_METHODS_8 ||
+      selector == PASS_THRU_METHODS_9 ||
+      selector == PASS_THRU_METHODS_10 ||
+      selector == PASS_THRU_METHODS_11 ||
+      selector == PASS_THRU_METHODS_12 ||
+      selector == PASS_THRU_METHODS_13 ||
+      selector == PASS_THRU_METHODS_14 ||
+      selector == PASS_THRU_METHODS_15 ||
+      selector == PASS_THRU_METHODS_16 ||
+      selector == PASS_THRU_METHODS_17 ||
+      selector == PASS_THRU_METHODS_18 ||
+      selector == PASS_THRU_METHODS_19 ||
+      selector == PASS_THRU_METHODS_20;
+  }
+
+  /**
+   * @notice Gives observability to the methods that are skipped from access control
+   * @dev This list is fixed and defined on contract construction
+   * @return methods The list of method selectors that skip ACCESS_MANAGER access control
+   */
+  // solhint-disable-next-line func-name-mixedcase
+  function PASS_THRU_METHODS() external view returns (bytes4[] memory methods) {
+    methods = new bytes4[](21);
+    methods[0] = PASS_THRU_METHODS_0;
+    methods[1] = PASS_THRU_METHODS_1;
+    methods[2] = PASS_THRU_METHODS_2;
+    methods[3] = PASS_THRU_METHODS_3;
+    methods[4] = PASS_THRU_METHODS_4;
+    methods[5] = PASS_THRU_METHODS_5;
+    methods[6] = PASS_THRU_METHODS_6;
+    methods[7] = PASS_THRU_METHODS_7;
+    methods[8] = PASS_THRU_METHODS_8;
+    methods[9] = PASS_THRU_METHODS_9;
+    methods[10] = PASS_THRU_METHODS_10;
+    methods[11] = PASS_THRU_METHODS_11;
+    methods[12] = PASS_THRU_METHODS_12;
+    methods[13] = PASS_THRU_METHODS_13;
+    methods[14] = PASS_THRU_METHODS_14;
+    methods[15] = PASS_THRU_METHODS_15;
+    methods[16] = PASS_THRU_METHODS_16;
+    methods[17] = PASS_THRU_METHODS_17;
+    methods[18] = PASS_THRU_METHODS_18;
+    methods[19] = PASS_THRU_METHODS_19;
+    methods[20] = PASS_THRU_METHODS_20;
+  }
+}

package/contracts/amps/AccessManagedProxyS22.sol

@@ -0,0 +1,147 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+import {AccessManagedProxy} from "../AccessManagedProxy.sol";
+import {IAccessManager} from "@openzeppelin/contracts/access/manager/IAccessManager.sol";
+
+/**
+ * @title AccessManagedProxyS22
+ * @notice Specialization of AccessManagedProxy with pass thru (skips AM) for some messages for gas optimization
+ *
+ * @custom:security-contact security@ensuro.co
+ * @author Ensuro
+ */
+contract AccessManagedProxyS22 is AccessManagedProxy {
+  bytes4 internal immutable PASS_THRU_METHODS_0;
+  bytes4 internal immutable PASS_THRU_METHODS_1;
+  bytes4 internal immutable PASS_THRU_METHODS_2;
+  bytes4 internal immutable PASS_THRU_METHODS_3;
+  bytes4 internal immutable PASS_THRU_METHODS_4;
+  bytes4 internal immutable PASS_THRU_METHODS_5;
+  bytes4 internal immutable PASS_THRU_METHODS_6;
+  bytes4 internal immutable PASS_THRU_METHODS_7;
+  bytes4 internal immutable PASS_THRU_METHODS_8;
+  bytes4 internal immutable PASS_THRU_METHODS_9;
+  bytes4 internal immutable PASS_THRU_METHODS_10;
+  bytes4 internal immutable PASS_THRU_METHODS_11;
+  bytes4 internal immutable PASS_THRU_METHODS_12;
+  bytes4 internal immutable PASS_THRU_METHODS_13;
+  bytes4 internal immutable PASS_THRU_METHODS_14;
+  bytes4 internal immutable PASS_THRU_METHODS_15;
+  bytes4 internal immutable PASS_THRU_METHODS_16;
+  bytes4 internal immutable PASS_THRU_METHODS_17;
+  bytes4 internal immutable PASS_THRU_METHODS_18;
+  bytes4 internal immutable PASS_THRU_METHODS_19;
+  bytes4 internal immutable PASS_THRU_METHODS_20;
+  bytes4 internal immutable PASS_THRU_METHODS_21;
+
+  /**
+   * @notice Constructor of the proxy, defining the implementation and the access manager
+   * @dev Initializes the upgradeable proxy with an initial implementation specified by `implementation` and
+   *      with `manager` as the ACCESS_MANAGER that will handle access control.
+   *
+   * @param implementation The initial implementation contract.
+   * @param _data If nonempty, it's used as data in a delegate call to `implementation`. This will typically be an
+   *              encoded function call, and allows initializing the storage of the proxy like a Solidity constructor.
+   * @param manager The access manager that will handle access control
+   * @param passThruMethods The selector of methods that will skip the access control validation, typically used for
+   *                        views and other methods for gas optimization.
+   *
+   * Requirements:
+   *
+   * - If `data` is empty, `msg.value` must be zero.
+   */
+  constructor(
+    address implementation,
+    bytes memory _data,
+    IAccessManager manager,
+    bytes4[22] memory passThruMethods
+  ) payable AccessManagedProxy(implementation, _data, manager) {
+    PASS_THRU_METHODS_0 = passThruMethods[0];
+    PASS_THRU_METHODS_1 = passThruMethods[1];
+    PASS_THRU_METHODS_2 = passThruMethods[2];
+    PASS_THRU_METHODS_3 = passThruMethods[3];
+    PASS_THRU_METHODS_4 = passThruMethods[4];
+    PASS_THRU_METHODS_5 = passThruMethods[5];
+    PASS_THRU_METHODS_6 = passThruMethods[6];
+    PASS_THRU_METHODS_7 = passThruMethods[7];
+    PASS_THRU_METHODS_8 = passThruMethods[8];
+    PASS_THRU_METHODS_9 = passThruMethods[9];
+    PASS_THRU_METHODS_10 = passThruMethods[10];
+    PASS_THRU_METHODS_11 = passThruMethods[11];
+    PASS_THRU_METHODS_12 = passThruMethods[12];
+    PASS_THRU_METHODS_13 = passThruMethods[13];
+    PASS_THRU_METHODS_14 = passThruMethods[14];
+    PASS_THRU_METHODS_15 = passThruMethods[15];
+    PASS_THRU_METHODS_16 = passThruMethods[16];
+    PASS_THRU_METHODS_17 = passThruMethods[17];
+    PASS_THRU_METHODS_18 = passThruMethods[18];
+    PASS_THRU_METHODS_19 = passThruMethods[19];
+    PASS_THRU_METHODS_20 = passThruMethods[20];
+    PASS_THRU_METHODS_21 = passThruMethods[21];
+  }
+
+  /*
+   * @notice Skips the access control if the method called is one of the passThruMethods
+   * @dev See {PASS_THRU_METHODS()}
+   * @param selector The selector of the method called
+   * @return Whether the access control using ACCESS_MANAGER should be skipped or not
+   */
+  function _skipAC(bytes4 selector) internal view override returns (bool) {
+    return
+      selector == PASS_THRU_METHODS_0 ||
+      selector == PASS_THRU_METHODS_1 ||
+      selector == PASS_THRU_METHODS_2 ||
+      selector == PASS_THRU_METHODS_3 ||
+      selector == PASS_THRU_METHODS_4 ||
+      selector == PASS_THRU_METHODS_5 ||
+      selector == PASS_THRU_METHODS_6 ||
+      selector == PASS_THRU_METHODS_7 ||
+      selector == PASS_THRU_METHODS_8 ||
+      selector == PASS_THRU_METHODS_9 ||
+      selector == PASS_THRU_METHODS_10 ||
+      selector == PASS_THRU_METHODS_11 ||
+      selector == PASS_THRU_METHODS_12 ||
+      selector == PASS_THRU_METHODS_13 ||
+      selector == PASS_THRU_METHODS_14 ||
+      selector == PASS_THRU_METHODS_15 ||
+      selector == PASS_THRU_METHODS_16 ||
+      selector == PASS_THRU_METHODS_17 ||
+      selector == PASS_THRU_METHODS_18 ||
+      selector == PASS_THRU_METHODS_19 ||
+      selector == PASS_THRU_METHODS_20 ||
+      selector == PASS_THRU_METHODS_21;
+  }
+
+  /**
+   * @notice Gives observability to the methods that are skipped from access control
+   * @dev This list is fixed and defined on contract construction
+   * @return methods The list of method selectors that skip ACCESS_MANAGER access control
+   */
+  // solhint-disable-next-line func-name-mixedcase
+  function PASS_THRU_METHODS() external view returns (bytes4[] memory methods) {
+    methods = new bytes4[](22);
+    methods[0] = PASS_THRU_METHODS_0;
+    methods[1] = PASS_THRU_METHODS_1;
+    methods[2] = PASS_THRU_METHODS_2;
+    methods[3] = PASS_THRU_METHODS_3;
+    methods[4] = PASS_THRU_METHODS_4;
+    methods[5] = PASS_THRU_METHODS_5;
+    methods[6] = PASS_THRU_METHODS_6;
+    methods[7] = PASS_THRU_METHODS_7;
+    methods[8] = PASS_THRU_METHODS_8;
+    methods[9] = PASS_THRU_METHODS_9;
+    methods[10] = PASS_THRU_METHODS_10;
+    methods[11] = PASS_THRU_METHODS_11;
+    methods[12] = PASS_THRU_METHODS_12;
+    methods[13] = PASS_THRU_METHODS_13;
+    methods[14] = PASS_THRU_METHODS_14;
+    methods[15] = PASS_THRU_METHODS_15;
+    methods[16] = PASS_THRU_METHODS_16;
+    methods[17] = PASS_THRU_METHODS_17;
+    methods[18] = PASS_THRU_METHODS_18;
+    methods[19] = PASS_THRU_METHODS_19;
+    methods[20] = PASS_THRU_METHODS_20;
+    methods[21] = PASS_THRU_METHODS_21;
+  }
+}

package/contracts/amps/AccessManagedProxyS23.sol

@@ -0,0 +1,151 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+import {AccessManagedProxy} from "../AccessManagedProxy.sol";
+import {IAccessManager} from "@openzeppelin/contracts/access/manager/IAccessManager.sol";
+
+/**
+ * @title AccessManagedProxyS23
+ * @notice Specialization of AccessManagedProxy with pass thru (skips AM) for some messages for gas optimization
+ *
+ * @custom:security-contact security@ensuro.co
+ * @author Ensuro
+ */
+contract AccessManagedProxyS23 is AccessManagedProxy {
+  bytes4 internal immutable PASS_THRU_METHODS_0;
+  bytes4 internal immutable PASS_THRU_METHODS_1;
+  bytes4 internal immutable PASS_THRU_METHODS_2;
+  bytes4 internal immutable PASS_THRU_METHODS_3;
+  bytes4 internal immutable PASS_THRU_METHODS_4;
+  bytes4 internal immutable PASS_THRU_METHODS_5;
+  bytes4 internal immutable PASS_THRU_METHODS_6;
+  bytes4 internal immutable PASS_THRU_METHODS_7;
+  bytes4 internal immutable PASS_THRU_METHODS_8;
+  bytes4 internal immutable PASS_THRU_METHODS_9;
+  bytes4 internal immutable PASS_THRU_METHODS_10;
+  bytes4 internal immutable PASS_THRU_METHODS_11;
+  bytes4 internal immutable PASS_THRU_METHODS_12;
+  bytes4 internal immutable PASS_THRU_METHODS_13;
+  bytes4 internal immutable PASS_THRU_METHODS_14;
+  bytes4 internal immutable PASS_THRU_METHODS_15;
+  bytes4 internal immutable PASS_THRU_METHODS_16;
+  bytes4 internal immutable PASS_THRU_METHODS_17;
+  bytes4 internal immutable PASS_THRU_METHODS_18;
+  bytes4 internal immutable PASS_THRU_METHODS_19;
+  bytes4 internal immutable PASS_THRU_METHODS_20;
+  bytes4 internal immutable PASS_THRU_METHODS_21;
+  bytes4 internal immutable PASS_THRU_METHODS_22;
+
+  /**
+   * @notice Constructor of the proxy, defining the implementation and the access manager
+   * @dev Initializes the upgradeable proxy with an initial implementation specified by `implementation` and
+   *      with `manager` as the ACCESS_MANAGER that will handle access control.
+   *
+   * @param implementation The initial implementation contract.
+   * @param _data If nonempty, it's used as data in a delegate call to `implementation`. This will typically be an
+   *              encoded function call, and allows initializing the storage of the proxy like a Solidity constructor.
+   * @param manager The access manager that will handle access control
+   * @param passThruMethods The selector of methods that will skip the access control validation, typically used for
+   *                        views and other methods for gas optimization.
+   *
+   * Requirements:
+   *
+   * - If `data` is empty, `msg.value` must be zero.
+   */
+  constructor(
+    address implementation,
+    bytes memory _data,
+    IAccessManager manager,
+    bytes4[23] memory passThruMethods
+  ) payable AccessManagedProxy(implementation, _data, manager) {
+    PASS_THRU_METHODS_0 = passThruMethods[0];
+    PASS_THRU_METHODS_1 = passThruMethods[1];
+    PASS_THRU_METHODS_2 = passThruMethods[2];
+    PASS_THRU_METHODS_3 = passThruMethods[3];
+    PASS_THRU_METHODS_4 = passThruMethods[4];
+    PASS_THRU_METHODS_5 = passThruMethods[5];
+    PASS_THRU_METHODS_6 = passThruMethods[6];
+    PASS_THRU_METHODS_7 = passThruMethods[7];
+    PASS_THRU_METHODS_8 = passThruMethods[8];
+    PASS_THRU_METHODS_9 = passThruMethods[9];
+    PASS_THRU_METHODS_10 = passThruMethods[10];
+    PASS_THRU_METHODS_11 = passThruMethods[11];
+    PASS_THRU_METHODS_12 = passThruMethods[12];
+    PASS_THRU_METHODS_13 = passThruMethods[13];
+    PASS_THRU_METHODS_14 = passThruMethods[14];
+    PASS_THRU_METHODS_15 = passThruMethods[15];
+    PASS_THRU_METHODS_16 = passThruMethods[16];
+    PASS_THRU_METHODS_17 = passThruMethods[17];
+    PASS_THRU_METHODS_18 = passThruMethods[18];
+    PASS_THRU_METHODS_19 = passThruMethods[19];
+    PASS_THRU_METHODS_20 = passThruMethods[20];
+    PASS_THRU_METHODS_21 = passThruMethods[21];
+    PASS_THRU_METHODS_22 = passThruMethods[22];
+  }
+
+  /*
+   * @notice Skips the access control if the method called is one of the passThruMethods
+   * @dev See {PASS_THRU_METHODS()}
+   * @param selector The selector of the method called
+   * @return Whether the access control using ACCESS_MANAGER should be skipped or not
+   */
+  function _skipAC(bytes4 selector) internal view override returns (bool) {
+    return
+      selector == PASS_THRU_METHODS_0 ||
+      selector == PASS_THRU_METHODS_1 ||
+      selector == PASS_THRU_METHODS_2 ||
+      selector == PASS_THRU_METHODS_3 ||
+      selector == PASS_THRU_METHODS_4 ||
+      selector == PASS_THRU_METHODS_5 ||
+      selector == PASS_THRU_METHODS_6 ||
+      selector == PASS_THRU_METHODS_7 ||
+      selector == PASS_THRU_METHODS_8 ||
+      selector == PASS_THRU_METHODS_9 ||
+      selector == PASS_THRU_METHODS_10 ||
+      selector == PASS_THRU_METHODS_11 ||
+      selector == PASS_THRU_METHODS_12 ||
+      selector == PASS_THRU_METHODS_13 ||
+      selector == PASS_THRU_METHODS_14 ||
+      selector == PASS_THRU_METHODS_15 ||
+      selector == PASS_THRU_METHODS_16 ||
+      selector == PASS_THRU_METHODS_17 ||
+      selector == PASS_THRU_METHODS_18 ||
+      selector == PASS_THRU_METHODS_19 ||
+      selector == PASS_THRU_METHODS_20 ||
+      selector == PASS_THRU_METHODS_21 ||
+      selector == PASS_THRU_METHODS_22;
+  }
+
+  /**
+   * @notice Gives observability to the methods that are skipped from access control
+   * @dev This list is fixed and defined on contract construction
+   * @return methods The list of method selectors that skip ACCESS_MANAGER access control
+   */
+  // solhint-disable-next-line func-name-mixedcase
+  function PASS_THRU_METHODS() external view returns (bytes4[] memory methods) {
+    methods = new bytes4[](23);
+    methods[0] = PASS_THRU_METHODS_0;
+    methods[1] = PASS_THRU_METHODS_1;
+    methods[2] = PASS_THRU_METHODS_2;
+    methods[3] = PASS_THRU_METHODS_3;
+    methods[4] = PASS_THRU_METHODS_4;
+    methods[5] = PASS_THRU_METHODS_5;
+    methods[6] = PASS_THRU_METHODS_6;
+    methods[7] = PASS_THRU_METHODS_7;
+    methods[8] = PASS_THRU_METHODS_8;
+    methods[9] = PASS_THRU_METHODS_9;
+    methods[10] = PASS_THRU_METHODS_10;
+    methods[11] = PASS_THRU_METHODS_11;
+    methods[12] = PASS_THRU_METHODS_12;
+    methods[13] = PASS_THRU_METHODS_13;
+    methods[14] = PASS_THRU_METHODS_14;
+    methods[15] = PASS_THRU_METHODS_15;
+    methods[16] = PASS_THRU_METHODS_16;
+    methods[17] = PASS_THRU_METHODS_17;
+    methods[18] = PASS_THRU_METHODS_18;
+    methods[19] = PASS_THRU_METHODS_19;
+    methods[20] = PASS_THRU_METHODS_20;
+    methods[21] = PASS_THRU_METHODS_21;
+    methods[22] = PASS_THRU_METHODS_22;
+  }
+}

package/contracts/amps/AccessManagedProxyS24.sol

@@ -0,0 +1,155 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+import {AccessManagedProxy} from "../AccessManagedProxy.sol";
+import {IAccessManager} from "@openzeppelin/contracts/access/manager/IAccessManager.sol";
+
+/**
+ * @title AccessManagedProxyS24
+ * @notice Specialization of AccessManagedProxy with pass thru (skips AM) for some messages for gas optimization
+ *
+ * @custom:security-contact security@ensuro.co
+ * @author Ensuro
+ */
+contract AccessManagedProxyS24 is AccessManagedProxy {
+  bytes4 internal immutable PASS_THRU_METHODS_0;
+  bytes4 internal immutable PASS_THRU_METHODS_1;
+  bytes4 internal immutable PASS_THRU_METHODS_2;
+  bytes4 internal immutable PASS_THRU_METHODS_3;
+  bytes4 internal immutable PASS_THRU_METHODS_4;
+  bytes4 internal immutable PASS_THRU_METHODS_5;
+  bytes4 internal immutable PASS_THRU_METHODS_6;
+  bytes4 internal immutable PASS_THRU_METHODS_7;
+  bytes4 internal immutable PASS_THRU_METHODS_8;
+  bytes4 internal immutable PASS_THRU_METHODS_9;
+  bytes4 internal immutable PASS_THRU_METHODS_10;
+  bytes4 internal immutable PASS_THRU_METHODS_11;
+  bytes4 internal immutable PASS_THRU_METHODS_12;
+  bytes4 internal immutable PASS_THRU_METHODS_13;
+  bytes4 internal immutable PASS_THRU_METHODS_14;
+  bytes4 internal immutable PASS_THRU_METHODS_15;
+  bytes4 internal immutable PASS_THRU_METHODS_16;
+  bytes4 internal immutable PASS_THRU_METHODS_17;
+  bytes4 internal immutable PASS_THRU_METHODS_18;
+  bytes4 internal immutable PASS_THRU_METHODS_19;
+  bytes4 internal immutable PASS_THRU_METHODS_20;
+  bytes4 internal immutable PASS_THRU_METHODS_21;
+  bytes4 internal immutable PASS_THRU_METHODS_22;
+  bytes4 internal immutable PASS_THRU_METHODS_23;
+
+  /**
+   * @notice Constructor of the proxy, defining the implementation and the access manager
+   * @dev Initializes the upgradeable proxy with an initial implementation specified by `implementation` and
+   *      with `manager` as the ACCESS_MANAGER that will handle access control.
+   *
+   * @param implementation The initial implementation contract.
+   * @param _data If nonempty, it's used as data in a delegate call to `implementation`. This will typically be an
+   *              encoded function call, and allows initializing the storage of the proxy like a Solidity constructor.
+   * @param manager The access manager that will handle access control
+   * @param passThruMethods The selector of methods that will skip the access control validation, typically used for
+   *                        views and other methods for gas optimization.
+   *
+   * Requirements:
+   *
+   * - If `data` is empty, `msg.value` must be zero.
+   */
+  constructor(
+    address implementation,
+    bytes memory _data,
+    IAccessManager manager,
+    bytes4[24] memory passThruMethods
+  ) payable AccessManagedProxy(implementation, _data, manager) {
+    PASS_THRU_METHODS_0 = passThruMethods[0];
+    PASS_THRU_METHODS_1 = passThruMethods[1];
+    PASS_THRU_METHODS_2 = passThruMethods[2];
+    PASS_THRU_METHODS_3 = passThruMethods[3];
+    PASS_THRU_METHODS_4 = passThruMethods[4];
+    PASS_THRU_METHODS_5 = passThruMethods[5];
+    PASS_THRU_METHODS_6 = passThruMethods[6];
+    PASS_THRU_METHODS_7 = passThruMethods[7];
+    PASS_THRU_METHODS_8 = passThruMethods[8];
+    PASS_THRU_METHODS_9 = passThruMethods[9];
+    PASS_THRU_METHODS_10 = passThruMethods[10];
+    PASS_THRU_METHODS_11 = passThruMethods[11];
+    PASS_THRU_METHODS_12 = passThruMethods[12];
+    PASS_THRU_METHODS_13 = passThruMethods[13];
+    PASS_THRU_METHODS_14 = passThruMethods[14];
+    PASS_THRU_METHODS_15 = passThruMethods[15];
+    PASS_THRU_METHODS_16 = passThruMethods[16];
+    PASS_THRU_METHODS_17 = passThruMethods[17];
+    PASS_THRU_METHODS_18 = passThruMethods[18];
+    PASS_THRU_METHODS_19 = passThruMethods[19];
+    PASS_THRU_METHODS_20 = passThruMethods[20];
+    PASS_THRU_METHODS_21 = passThruMethods[21];
+    PASS_THRU_METHODS_22 = passThruMethods[22];
+    PASS_THRU_METHODS_23 = passThruMethods[23];
+  }
+
+  /*
+   * @notice Skips the access control if the method called is one of the passThruMethods
+   * @dev See {PASS_THRU_METHODS()}
+   * @param selector The selector of the method called
+   * @return Whether the access control using ACCESS_MANAGER should be skipped or not
+   */
+  function _skipAC(bytes4 selector) internal view override returns (bool) {
+    return
+      selector == PASS_THRU_METHODS_0 ||
+      selector == PASS_THRU_METHODS_1 ||
+      selector == PASS_THRU_METHODS_2 ||
+      selector == PASS_THRU_METHODS_3 ||
+      selector == PASS_THRU_METHODS_4 ||
+      selector == PASS_THRU_METHODS_5 ||
+      selector == PASS_THRU_METHODS_6 ||
+      selector == PASS_THRU_METHODS_7 ||
+      selector == PASS_THRU_METHODS_8 ||
+      selector == PASS_THRU_METHODS_9 ||
+      selector == PASS_THRU_METHODS_10 ||
+      selector == PASS_THRU_METHODS_11 ||
+      selector == PASS_THRU_METHODS_12 ||
+      selector == PASS_THRU_METHODS_13 ||
+      selector == PASS_THRU_METHODS_14 ||
+      selector == PASS_THRU_METHODS_15 ||
+      selector == PASS_THRU_METHODS_16 ||
+      selector == PASS_THRU_METHODS_17 ||
+      selector == PASS_THRU_METHODS_18 ||
+      selector == PASS_THRU_METHODS_19 ||
+      selector == PASS_THRU_METHODS_20 ||
+      selector == PASS_THRU_METHODS_21 ||
+      selector == PASS_THRU_METHODS_22 ||
+      selector == PASS_THRU_METHODS_23;
+  }
+
+  /**
+   * @notice Gives observability to the methods that are skipped from access control
+   * @dev This list is fixed and defined on contract construction
+   * @return methods The list of method selectors that skip ACCESS_MANAGER access control
+   */
+  // solhint-disable-next-line func-name-mixedcase
+  function PASS_THRU_METHODS() external view returns (bytes4[] memory methods) {
+    methods = new bytes4[](24);
+    methods[0] = PASS_THRU_METHODS_0;
+    methods[1] = PASS_THRU_METHODS_1;
+    methods[2] = PASS_THRU_METHODS_2;
+    methods[3] = PASS_THRU_METHODS_3;
+    methods[4] = PASS_THRU_METHODS_4;
+    methods[5] = PASS_THRU_METHODS_5;
+    methods[6] = PASS_THRU_METHODS_6;
+    methods[7] = PASS_THRU_METHODS_7;
+    methods[8] = PASS_THRU_METHODS_8;
+    methods[9] = PASS_THRU_METHODS_9;
+    methods[10] = PASS_THRU_METHODS_10;
+    methods[11] = PASS_THRU_METHODS_11;
+    methods[12] = PASS_THRU_METHODS_12;
+    methods[13] = PASS_THRU_METHODS_13;
+    methods[14] = PASS_THRU_METHODS_14;
+    methods[15] = PASS_THRU_METHODS_15;
+    methods[16] = PASS_THRU_METHODS_16;
+    methods[17] = PASS_THRU_METHODS_17;
+    methods[18] = PASS_THRU_METHODS_18;
+    methods[19] = PASS_THRU_METHODS_19;
+    methods[20] = PASS_THRU_METHODS_20;
+    methods[21] = PASS_THRU_METHODS_21;
+    methods[22] = PASS_THRU_METHODS_22;
+    methods[23] = PASS_THRU_METHODS_23;
+  }
+}

package/contracts/amps/AccessManagedProxyS3.sol

@@ -0,0 +1,71 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+import {AccessManagedProxy} from "../AccessManagedProxy.sol";
+import {IAccessManager} from "@openzeppelin/contracts/access/manager/IAccessManager.sol";
+
+/**
+ * @title AccessManagedProxyS3
+ * @notice Specialization of AccessManagedProxy with pass thru (skips AM) for some messages for gas optimization
+ *
+ * @custom:security-contact security@ensuro.co
+ * @author Ensuro
+ */
+contract AccessManagedProxyS3 is AccessManagedProxy {
+  bytes4 internal immutable PASS_THRU_METHODS_0;
+  bytes4 internal immutable PASS_THRU_METHODS_1;
+  bytes4 internal immutable PASS_THRU_METHODS_2;
+
+  /**
+   * @notice Constructor of the proxy, defining the implementation and the access manager
+   * @dev Initializes the upgradeable proxy with an initial implementation specified by `implementation` and
+   *      with `manager` as the ACCESS_MANAGER that will handle access control.
+   *
+   * @param implementation The initial implementation contract.
+   * @param _data If nonempty, it's used as data in a delegate call to `implementation`. This will typically be an
+   *              encoded function call, and allows initializing the storage of the proxy like a Solidity constructor.
+   * @param manager The access manager that will handle access control
+   * @param passThruMethods The selector of methods that will skip the access control validation, typically used for
+   *                        views and other methods for gas optimization.
+   *
+   * Requirements:
+   *
+   * - If `data` is empty, `msg.value` must be zero.
+   */
+  constructor(
+    address implementation,
+    bytes memory _data,
+    IAccessManager manager,
+    bytes4[3] memory passThruMethods
+  ) payable AccessManagedProxy(implementation, _data, manager) {
+    PASS_THRU_METHODS_0 = passThruMethods[0];
+    PASS_THRU_METHODS_1 = passThruMethods[1];
+    PASS_THRU_METHODS_2 = passThruMethods[2];
+  }
+
+  /*
+   * @notice Skips the access control if the method called is one of the passThruMethods
+   * @dev See {PASS_THRU_METHODS()}
+   * @param selector The selector of the method called
+   * @return Whether the access control using ACCESS_MANAGER should be skipped or not
+   */
+  function _skipAC(bytes4 selector) internal view override returns (bool) {
+    return
+      selector == PASS_THRU_METHODS_0 ||
+      selector == PASS_THRU_METHODS_1 ||
+      selector == PASS_THRU_METHODS_2;
+  }
+
+  /**
+   * @notice Gives observability to the methods that are skipped from access control
+   * @dev This list is fixed and defined on contract construction
+   * @return methods The list of method selectors that skip ACCESS_MANAGER access control
+   */
+  // solhint-disable-next-line func-name-mixedcase
+  function PASS_THRU_METHODS() external view returns (bytes4[] memory methods) {
+    methods = new bytes4[](3);
+    methods[0] = PASS_THRU_METHODS_0;
+    methods[1] = PASS_THRU_METHODS_1;
+    methods[2] = PASS_THRU_METHODS_2;
+  }
+}