feat: remove custom proxy admin

src/contracts/transparent-proxy/TransparentProxyFactoryBase.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.8.0;
 
+import {TransparentUpgradeableProxy} from 'openzeppelin-contracts/contracts/proxy/transparent/TransparentUpgradeableProxy.sol';
+import {ProxyAdmin} from 'openzeppelin-contracts/contracts/proxy/transparent/ProxyAdmin.sol';
 import {ITransparentProxyFactory} from './interfaces/ITransparentProxyFactory.sol';
-import {TransparentUpgradeableProxy} from './TransparentUpgradeableProxy.sol';
-import {ProxyAdmin} from './ProxyAdmin.sol';
 
 /**
  * @title TransparentProxyFactory
@@ -15,10 +15,14 @@ import {ProxyAdmin} from './ProxyAdmin.sol';
  **/
 abstract contract TransparentProxyFactoryBase is ITransparentProxyFactory {
   /// @inheritdoc ITransparentProxyFactory
-  function create(address logic, ProxyAdmin admin, bytes calldata data) external returns (address) {
-    address proxy = address(new TransparentUpgradeableProxy(logic, admin, data));
+  function create(
+    address logic,
+    address adminOwner,
+    bytes calldata data
+  ) external returns (address) {
+    address proxy = address(new TransparentUpgradeableProxy(logic, adminOwner, data));
 
-    emit ProxyCreated(proxy, logic, address(admin));
+    emit ProxyCreated(proxy, logic, address(adminOwner));
     return proxy;
   }
 
@@ -33,13 +37,13 @@ abstract contract TransparentProxyFactoryBase is ITransparentProxyFactory {
   /// @inheritdoc ITransparentProxyFactory
   function createDeterministic(
     address logic,
-    ProxyAdmin admin,
+    address adminOwner,
     bytes calldata data,
     bytes32 salt
   ) external returns (address) {
-    address proxy = address(new TransparentUpgradeableProxy{salt: salt}(logic, admin, data));
+    address proxy = address(new TransparentUpgradeableProxy{salt: salt}(logic, adminOwner, data));
 
-    emit ProxyDeterministicCreated(proxy, logic, address(admin), salt);
+    emit ProxyDeterministicCreated(proxy, logic, address(adminOwner), salt);
     return proxy;
   }
 
@@ -57,7 +61,7 @@ abstract contract TransparentProxyFactoryBase is ITransparentProxyFactory {
   /// @inheritdoc ITransparentProxyFactory
   function predictCreateDeterministic(
     address logic,
-    ProxyAdmin admin,
+    address admin,
     bytes calldata data,
     bytes32 salt
   ) public view returns (address) {
@@ -66,7 +70,7 @@ abstract contract TransparentProxyFactoryBase is ITransparentProxyFactory {
         address(this),
         salt,
         type(TransparentUpgradeableProxy).creationCode,
-        abi.encode(logic, address(admin), data)
+        abi.encode(logic, admin, data)
       );
   }
 

src/contracts/transparent-proxy/interfaces/IProxyAdminOzV4.sol

@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.10;
+
+/**
+ * The package relies on OZ-v5, some legacy contracts rely on the oz v4 versions of `TransparentUpgradeableProxy` and `ProxyAdmin`.
+ * While we no longer recommend deploying new instances of these, we expose the interface to allow interacting with existing contracts.
+ */
+
+interface IProxyAdminOzV4 {
+  function changeProxyAdmin(address proxy, address newAdmin) external;
+
+  function upgrade(address proxy, address implementation) external;
+
+  function upgradeAndCall(address proxy, address implementation, bytes memory data) external;
+}

src/contracts/transparent-proxy/interfaces/ITransparentProxyFactory.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.8.0;
 
-import {ProxyAdmin} from '../ProxyAdmin.sol';
+import {ProxyAdmin} from 'openzeppelin-contracts/contracts/proxy/transparent/ProxyAdmin.sol';
 
 interface ITransparentProxyFactory {
   event ProxyCreated(address proxy, address indexed logic, address indexed proxyAdmin);
@@ -28,7 +28,7 @@ interface ITransparentProxyFactory {
    *             for an `initialize` function being `function initialize(uint256 foo) external initializer;`
    * @return address The address of the proxy deployed
    **/
-  function create(address logic, ProxyAdmin admin, bytes memory data) external returns (address);
+  function create(address logic, address admin, bytes memory data) external returns (address);
 
   /**
    * @notice Creates a proxyAdmin instance, and transfers ownership to provided owner
@@ -51,7 +51,7 @@ interface ITransparentProxyFactory {
    **/
   function createDeterministic(
     address logic,
-    ProxyAdmin admin,
+    address admin,
     bytes memory data,
     bytes32 salt
   ) external returns (address);
@@ -80,7 +80,7 @@ interface ITransparentProxyFactory {
    **/
   function predictCreateDeterministic(
     address logic,
-    ProxyAdmin admin,
+    address admin,
     bytes calldata data,
     bytes32 salt
   ) external view returns (address);

test/PermissionlessRescuable.t.sol

@@ -60,7 +60,7 @@ contract PermissionlessRescuableTest is Test {
     rescuable = new PermissionlessRescuable(fundsReceiver, address(restrictedMockToken));
   }
 
-  function test_whoShouldReceiveFunds() public {
+  function test_whoShouldReceiveFunds() public view {
     assertEq(rescuable.whoShouldReceiveFunds(), fundsReceiver);
   }
 

test/TransparentProxyFactory.t.sol

@@ -3,9 +3,9 @@ pragma solidity ^0.8.0;
 
 import 'forge-std/Test.sol';
 import {Ownable} from 'openzeppelin-contracts/contracts/access/Ownable.sol';
-import {ProxyAdmin} from '../src/contracts/transparent-proxy/ProxyAdmin.sol';
+import {TransparentUpgradeableProxy} from 'openzeppelin-contracts/contracts/proxy/transparent/TransparentUpgradeableProxy.sol';
+import {ProxyAdmin} from 'openzeppelin-contracts/contracts/proxy/transparent/ProxyAdmin.sol';
 import {TransparentProxyFactory} from '../src/contracts/transparent-proxy/TransparentProxyFactory.sol';
-import {TransparentUpgradeableProxy} from '../src/contracts/transparent-proxy/TransparentUpgradeableProxy.sol';
 import {MockImpl} from '../src/mocks/MockImpl.sol';
 
 contract TestTransparentProxyFactory is Test {
@@ -26,12 +26,12 @@ contract TestTransparentProxyFactory is Test {
 
     address predictedAddress1 = factory.predictCreateDeterministic(
       address(mockImpl),
-      ProxyAdmin(admin),
+      admin,
       data,
       salt
     );
 
-    address proxy1 = factory.createDeterministic(address(mockImpl), ProxyAdmin(admin), data, salt);
+    address proxy1 = factory.createDeterministic(address(mockImpl), admin, data, salt);
 
     assertEq(predictedAddress1, proxy1);
     assertEq(MockImpl(proxy1).getFoo(), FOO);
@@ -53,14 +53,14 @@ contract TestTransparentProxyFactory is Test {
 
     address predictedAddress1 = factory.predictCreateDeterministic(
       address(mockImpl),
-      ProxyAdmin(deterministicProxyAdmin),
+      deterministicProxyAdmin,
       data,
       proxySalt
     );
 
     address proxy1 = factory.createDeterministic(
       address(mockImpl),
-      ProxyAdmin(deterministicProxyAdmin),
+      deterministicProxyAdmin,
       data,
       proxySalt
     );

test/UpgradeableOwnableWithGuardian.t.sol

@@ -26,7 +26,7 @@ contract TestOfUpgradableOwnableWithGuardian is Test {
     ImplOwnableWithGuardian(address(withGuardian)).initialize(owner, guardian);
   }
 
-  function test_initializer() external {
+  function test_initializer() external view {
     assertEq(withGuardian.owner(), owner);
     assertEq(withGuardian.guardian(), guardian);
   }