feat: upgrade transparent proxy

.github/workflows/tests.yml

@@ -30,9 +30,11 @@ jobs:
           ZKSYNC: 'true'
 
       - name: Run Forge tests
+        id: test
         uses: bgd-labs/github-workflows/.github/actions/foundry-test@main
 
       - name: Run ZK tests
+        id: zktest
         uses: bgd-labs/github-workflows/.github/actions/foundry-test@main
         with:
           ZKSYNC: true
@@ -43,23 +45,12 @@ jobs:
       - name: Run Lcov report
         uses: bgd-labs/github-workflows/.github/actions/foundry-lcov-report@main
 
-      - name: Save PR number
-        if: github.event_name == 'pull_request' || github.event_name == 'pull_request_target'
-        env:
-          PR_NUMBER: ${{ github.event.number }}
-        run: |
-          mkdir -p ./pr
-          echo $PR_NUMBER > /tmp/content/pr_number.txt
-
-      - uses: actions/upload-artifact@v4
-        if: github.event_name == 'pull_request' || github.event_name == 'pull_request_target'
-        with:
-          name: content
-          path: /tmp/content
+      - name: Run Forge tests
+        uses: bgd-labs/github-workflows/.github/actions/comment-artifact@main
 
       # we let failing tests pass so we can log them in the comment, still we want the ci to fail
       - name: Post test
-        if: ${{ env.testStatus != 0 }}
+        if: ${{ steps.test.outputs.testStatus != 0 || steps.zktest.outputs.testStatus != 0 }}
         run: |
           echo "tests failed"
           exit 1

src/contracts/transparent-proxy/ProxyAdmin.sol

@@ -1,93 +1,42 @@
 // SPDX-License-Identifier: MIT
+// OpenZeppelin Contracts (last updated v5.0.0) (proxy/transparent/ProxyAdmin.sol)
 
-/**
- * @dev OpenZeppelin Contracts v4.4.1 (proxy/transparent/ProxyAdmin.sol)
- * From https://github.com/OpenZeppelin/openzeppelin-contracts/tree/8b778fa20d6d76340c5fac1ed66c80273f05b95a
- *
- * BGD Labs adaptations:
- * - Linting
- */
+pragma solidity ^0.8.20;
 
-pragma solidity ^0.8.0;
-
-import './TransparentUpgradeableProxy.sol';
-import '../oz-common/Ownable.sol';
+import {ITransparentUpgradeableProxy} from './TransparentUpgradeableProxy.sol';
+import {Ownable} from 'openzeppelin-contracts/contracts/access/Ownable.sol';
 
 /**
  * @dev This is an auxiliary contract meant to be assigned as the admin of a {TransparentUpgradeableProxy}. For an
  * explanation of why you would want to use this see the documentation for {TransparentUpgradeableProxy}.
  */
 contract ProxyAdmin is Ownable {
   /**
-   * @dev Returns the current implementation of `proxy`.
-   *
-   * Requirements:
-   *
-   * - This contract must be the admin of `proxy`.
-   */
-  function getProxyImplementation(
-    TransparentUpgradeableProxy proxy
-  ) public view virtual returns (address) {
-    // We need to manually run the static call since the getter cannot be flagged as view
-    // bytes4(keccak256("implementation()")) == 0x5c60da1b
-    (bool success, bytes memory returndata) = address(proxy).staticcall(hex'5c60da1b');
-    require(success);
-    return abi.decode(returndata, (address));
-  }
-
-  /**
-   * @dev Returns the current admin of `proxy`.
-   *
-   * Requirements:
-   *
-   * - This contract must be the admin of `proxy`.
-   */
-  function getProxyAdmin(TransparentUpgradeableProxy proxy) public view virtual returns (address) {
-    // We need to manually run the static call since the getter cannot be flagged as view
-    // bytes4(keccak256("admin()")) == 0xf851a440
-    (bool success, bytes memory returndata) = address(proxy).staticcall(hex'f851a440');
-    require(success);
-    return abi.decode(returndata, (address));
-  }
-
-  /**
-   * @dev Changes the admin of `proxy` to `newAdmin`.
-   *
-   * Requirements:
-   *
-   * - This contract must be the current admin of `proxy`.
+   * @dev The version of the upgrade interface of the contract. If this getter is missing, both `upgrade(address)`
+   * and `upgradeAndCall(address,bytes)` are present, and `upgradeTo` must be used if no function should be called,
+   * while `upgradeAndCall` will invoke the `receive` function if the second argument is the empty byte string.
+   * If the getter returns `"5.0.0"`, only `upgradeAndCall(address,bytes)` is present, and the second argument must
+   * be the empty byte string if no function should be called, making it impossible to invoke the `receive` function
+   * during an upgrade.
    */
-  function changeProxyAdmin(
-    TransparentUpgradeableProxy proxy,
-    address newAdmin
-  ) public virtual onlyOwner {
-    proxy.changeAdmin(newAdmin);
-  }
+  string public constant UPGRADE_INTERFACE_VERSION = '5.0.0';
 
   /**
-   * @dev Upgrades `proxy` to `implementation`. See {TransparentUpgradeableProxy-upgradeTo}.
-   *
-   * Requirements:
-   *
-   * - This contract must be the admin of `proxy`.
+   * @dev Sets the initial owner who can perform upgrades.
    */
-  function upgrade(
-    TransparentUpgradeableProxy proxy,
-    address implementation
-  ) public virtual onlyOwner {
-    proxy.upgradeTo(implementation);
-  }
+  constructor(address initialOwner) Ownable(initialOwner) {}
 
   /**
-   * @dev Upgrades `proxy` to `implementation` and calls a function on the new implementation. See
-   * {TransparentUpgradeableProxy-upgradeToAndCall}.
+   * @dev Upgrades `proxy` to `implementation` and calls a function on the new implementation.
+   * See {TransparentUpgradeableProxy-_dispatchUpgradeToAndCall}.
    *
    * Requirements:
    *
    * - This contract must be the admin of `proxy`.
+   * - If `data` is empty, `msg.value` must be zero.
    */
   function upgradeAndCall(
-    TransparentUpgradeableProxy proxy,
+    ITransparentUpgradeableProxy proxy,
     address implementation,
     bytes memory data
   ) public payable virtual onlyOwner {