Make TransparentUpgradeableProxy deploy its ProxyAdmin and optimize proxy interfaces

contracts/proxy/transparent/ProxyAdmin.sol

@@ -12,6 +12,8 @@ import {Address} from "../../utils/Address.sol";
  * explanation of why you would want to use this see the documentation for {TransparentUpgradeableProxy}.
  */
 contract ProxyAdmin is Ownable {
+    uint256 public immutable PROXY_ADMIN_VERSION = 2;
+
     /**
      * @dev Sets the initial owner who can perform upgrades.
      */
@@ -29,32 +31,7 @@ contract ProxyAdmin is Ownable {
         ITransparentUpgradeableProxy proxy,
         address implementation,
         bytes memory data
-    ) public payable virtual {
-        // Owner checked by _upgrade
-        _upgrade(proxy, implementation);
-        Address.functionCallWithValue(address(proxy), data, msg.value);
-    }
-
-    /**
-     * @dev Upgrades `proxy` to `implementation`. See {TransparentUpgradeableProxy-_dispatchUpgradeTo}.
-     *
-     * Requirements:
-     *
-     * - This contract must be the admin of `proxy`.
-     */
-    function upgrade(ITransparentUpgradeableProxy proxy, address implementation) public virtual {
-        // Owner checked by _upgrade
-        _upgrade(proxy, implementation);
-    }
-
-    /**
-     * @dev Upgrades `proxy` to `implementation`.
-     *
-     * Requirements:
-     *
-     * - This contract must be the admin of `proxy`.
-     */
-    function _upgrade(ITransparentUpgradeableProxy proxy, address implementation) internal onlyOwner {
-        proxy.upgradeTo(implementation);
+    ) public payable virtual onlyOwner {
+        proxy.upgradeToAndCall{ value: msg.value }(implementation, data);
     }
 }

contracts/proxy/transparent/TransparentUpgradeableProxy.sol

@@ -15,7 +15,7 @@ import {ProxyAdmin} from "./ProxyAdmin.sol";
  * include them in the ABI so this interface must be used to interact with it.
  */
 interface ITransparentUpgradeableProxy is IERC1967 {
-    function upgradeTo(address) external payable;
+    function upgradeToAndCall(address, bytes calldata) external payable;
 }
 
 /**
@@ -90,8 +90,8 @@ contract TransparentUpgradeableProxy is ERC1967Proxy {
         if (msg.sender == _admin) {
             bytes memory ret;
             bytes4 selector = msg.sig;
-            if (selector == ITransparentUpgradeableProxy.upgradeTo.selector) {
-                ret = _dispatchUpgradeTo();
+            if (selector == ITransparentUpgradeableProxy.upgradeToAndCall.selector) {
+                ret = _dispatchUpgradeToAndCall();
             } else {
                 revert ProxyDeniedAdminAccess();
             }
@@ -106,11 +106,11 @@ contract TransparentUpgradeableProxy is ERC1967Proxy {
     /**
      * @dev Upgrade the implementation of the proxy.
      */
-    function _dispatchUpgradeTo() private returns (bytes memory) {
-        _requireZeroValue();
+    function _dispatchUpgradeToAndCall() private returns (bytes memory) {
+        bool forceCall = msg.value > 0;
 
-        (address newImplementation) = abi.decode(msg.data[4:], (address));
-        ERC1967Utils.upgradeTo(newImplementation);
+        (address newImplementation, bytes memory data) = abi.decode(msg.data[4:], (address, bytes));
+        ERC1967Utils.upgradeToAndCall(newImplementation, data, forceCall);
 
         return "";
     }

contracts/proxy/utils/UUPSUpgradeable.sol

@@ -109,7 +109,7 @@ abstract contract UUPSUpgradeable is IERC1822Proxiable {
      * Normally, this function will use an xref:access.adoc[access control] modifier such as {Ownable-onlyOwner}.
      *
      * ```solidity
-     * function _authorizeUpgrade(address) internal  onlyOwner {}
+     * function _authorizeUpgrade(address) internal onlyOwner {}
      * ```
      */
     function _authorizeUpgrade(address newImplementation) internal virtual;

test/proxy/ERC1967/ERC1967Proxy.test.js

@@ -9,5 +9,5 @@ contract('ERC1967Proxy', function (accounts) {
     return ERC1967Proxy.new(implementation, initData, opts);
   };
 
-  shouldBehaveLikeProxy(createProxy, undefined, proxyAdminOwner);
+  shouldBehaveLikeProxy(createProxy, proxyAdminOwner);
 });

test/proxy/Proxy.behaviour.js

@@ -5,12 +5,12 @@ const { expect } = require('chai');
 
 const DummyImplementation = artifacts.require('DummyImplementation');
 
-module.exports = function shouldBehaveLikeProxy(createProxy, proxyAdminAddress, proxyCreator) {
+module.exports = function shouldBehaveLikeProxy(createProxy, proxyCreator) {
   it('cannot be initialized with a non-contract address', async function () {
     const nonContractAddress = proxyCreator;
     const initializeData = Buffer.from('');
     await expectRevert.unspecified(
-      createProxy(nonContractAddress, proxyAdminAddress, initializeData, {
+      createProxy(nonContractAddress, initializeData, {
         from: proxyCreator,
       }),
     );
@@ -43,7 +43,7 @@ module.exports = function shouldBehaveLikeProxy(createProxy, proxyAdminAddress,
     describe('when not sending balance', function () {
       beforeEach('creating proxy', async function () {
         this.proxy = (
-          await createProxy(this.implementation, proxyAdminAddress, initializeData, {
+          await createProxy(this.implementation, initializeData, {
             from: proxyCreator,
           })
         ).address;
@@ -57,7 +57,7 @@ module.exports = function shouldBehaveLikeProxy(createProxy, proxyAdminAddress,
 
       beforeEach('creating proxy', async function () {
         this.proxy = (
-          await createProxy(this.implementation, proxyAdminAddress, initializeData, {
+          await createProxy(this.implementation, initializeData, {
             from: proxyCreator,
             value,
           })
@@ -76,7 +76,7 @@ module.exports = function shouldBehaveLikeProxy(createProxy, proxyAdminAddress,
       describe('when not sending balance', function () {
         beforeEach('creating proxy', async function () {
           this.proxy = (
-            await createProxy(this.implementation, proxyAdminAddress, initializeData, {
+            await createProxy(this.implementation, initializeData, {
               from: proxyCreator,
             })
           ).address;
@@ -93,7 +93,7 @@ module.exports = function shouldBehaveLikeProxy(createProxy, proxyAdminAddress,
 
         it('reverts', async function () {
           await expectRevert.unspecified(
-            createProxy(this.implementation, proxyAdminAddress, initializeData, { from: proxyCreator, value }),
+            createProxy(this.implementation, initializeData, { from: proxyCreator, value }),
           );
         });
       });
@@ -106,7 +106,7 @@ module.exports = function shouldBehaveLikeProxy(createProxy, proxyAdminAddress,
       describe('when not sending balance', function () {
         beforeEach('creating proxy', async function () {
           this.proxy = (
-            await createProxy(this.implementation, proxyAdminAddress, initializeData, {
+            await createProxy(this.implementation, initializeData, {
               from: proxyCreator,
             })
           ).address;
@@ -123,7 +123,7 @@ module.exports = function shouldBehaveLikeProxy(createProxy, proxyAdminAddress,
 
         beforeEach('creating proxy', async function () {
           this.proxy = (
-            await createProxy(this.implementation, proxyAdminAddress, initializeData, {
+            await createProxy(this.implementation, initializeData, {
               from: proxyCreator,
               value,
             })
@@ -148,7 +148,7 @@ module.exports = function shouldBehaveLikeProxy(createProxy, proxyAdminAddress,
       describe('when not sending balance', function () {
         beforeEach('creating proxy', async function () {
           this.proxy = (
-            await createProxy(this.implementation, proxyAdminAddress, initializeData, {
+            await createProxy(this.implementation, initializeData, {
               from: proxyCreator,
             })
           ).address;
@@ -165,7 +165,7 @@ module.exports = function shouldBehaveLikeProxy(createProxy, proxyAdminAddress,
 
         it('reverts', async function () {
           await expectRevert.unspecified(
-            createProxy(this.implementation, proxyAdminAddress, initializeData, { from: proxyCreator, value }),
+            createProxy(this.implementation, initializeData, { from: proxyCreator, value }),
           );
         });
       });
@@ -180,7 +180,7 @@ module.exports = function shouldBehaveLikeProxy(createProxy, proxyAdminAddress,
       describe('when not sending balance', function () {
         beforeEach('creating proxy', async function () {
           this.proxy = (
-            await createProxy(this.implementation, proxyAdminAddress, initializeData, {
+            await createProxy(this.implementation, initializeData, {
               from: proxyCreator,
             })
           ).address;
@@ -197,7 +197,7 @@ module.exports = function shouldBehaveLikeProxy(createProxy, proxyAdminAddress,
 
         beforeEach('creating proxy', async function () {
           this.proxy = (
-            await createProxy(this.implementation, proxyAdminAddress, initializeData, {
+            await createProxy(this.implementation, initializeData, {
               from: proxyCreator,
               value,
             })
@@ -216,7 +216,7 @@ module.exports = function shouldBehaveLikeProxy(createProxy, proxyAdminAddress,
 
       it('reverts', async function () {
         await expectRevert(
-          createProxy(this.implementation, proxyAdminAddress, initializeData, { from: proxyCreator }),
+          createProxy(this.implementation, initializeData, { from: proxyCreator }),
           'DummyImplementation reverted',
         );
       });