feat: upgrade and use local oz

Author: DhairyaSethi

contracts/foundry.toml

@@ -11,7 +11,6 @@ libs = ['node_modules', 'foundry-lib']
 bytecode_hash = "none"
 ffi = false
 allow_internal_expect_revert = true
-
 # default is zero, using a non-zero amount enables us to test e.g. billing based on gas prices.
 gas_price = 1
 block_timestamp = 1234567890

contracts/package.json

@@ -125,8 +125,8 @@
     "@changesets/cli": "~2.27.7",
     "@eth-optimism/contracts": "0.6.0",
     "@matterlabs/hardhat-zksync-verify": "^1.6.0",
-    "@openzeppelin/contracts": "4.9.3",
-    "@openzeppelin/contracts-upgradeable": "4.9.3",
+    "@openzeppelin/contracts": "5.1.0",
+    "@openzeppelin/contracts-upgradeable": "5.1.0",
     "@scroll-tech/contracts": "0.1.0",
     "@zksync/contracts": "git+https://github.com/matter-labs/era-contracts.git#446d391d34bdb48255d5f8fef8a8248925fc98b9",
     "semver": "^7.6.3"

contracts/pnpm-lock.yaml

@@ -1,13 +1,14 @@
 forge-std/=src/v0.8/vendor/forge-std/src/
 
-@openzeppelin/=node_modules/@openzeppelin/
+@oz/=node_modules/@openzeppelin/
 @arbitrum/=node_modules/@arbitrum/
 hardhat/=node_modules/hardhat/
 @eth-optimism/=node_modules/@eth-optimism/
 @scroll-tech/=node_modules/@scroll-tech/
 @zksync/=node_modules/@zksync/
 
 @aave/=foundry-lib/gho-core/lib/aave-token/
+@openzeppelin/=foundry-lib/gho-core/lib/openzeppelin-contracts/
 @aave-gho-core/=foundry-lib/gho-core/src/contracts/
 @aave/core-v3/=foundry-lib/gho-core/lib/aave-v3-core/
 @aave/periphery-v3/=foundry-lib/gho-core/lib/aave-v3-periphery/

contracts/remappings.txt

@@ -5,26 +5,22 @@ import {Script} from "forge-std/Script.sol";
 import {console2 as console} from "forge-std/console2.sol";
 import {stdJson} from "forge-std/StdJson.sol";
 
+import {TransparentUpgradeableProxy, ProxyAdmin} from "@oz/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
 import {UpgradeableBurnMintTokenPool} from "./../src/v0.8/ccip/pools/GHO/UpgradeableBurnMintTokenPool.sol";
-import {ITypeAndVersion} from "./../src/v0.8/shared/interfaces/ITypeAndVersion.sol";
-import {ITransparentProxyFactory} from "solidity-utils/contracts/transparent-proxy/interfaces/ITransparentProxyFactory.sol";
-import {IERC20Metadata} from "solidity-utils/contracts/oz-common/interfaces/IERC20Metadata.sol";
 
-interface IProxyAdmin {
-  function UPGRADE_INTERFACE_VERSION() external view returns (string memory);
-}
+import {IERC20Metadata} from "solidity-utils/contracts/oz-common/interfaces/IERC20Metadata.sol";
+import {ITypeAndVersion} from "./../src/v0.8/shared/interfaces/ITypeAndVersion.sol";
 
 struct Config {
   address GHO_TOKEN;
   address OWNER;
-  address PROXY_FACTORY;
   address RMN_PROXY;
   address ROUTER;
 }
 
 /// @notice Deploys UpgradeableBurnMintTokenPool behind a transparent upgradable proxy for GHO.
 /// Pre-requisite: add parameters to config.json, the with key as `chainId` of the target network.
-/// Usage: forge script DeployUpgradableBurnMintTokenPool --rpc-url <RPC_URL> --private-key <PRIVATE_KEY> --broadcast --verify --etherscan-api-key <ETHERSCAN_API_KEY>
+/// Usage: FOUNDRY_PROFILE=ccip forge script DeployUpgradableBurnMintTokenPool --rpc-url <RPC_URL> --private-key <PRIVATE_KEY> --broadcast --verify --etherscan-api-key <ETHERSCAN_API_KEY>
 contract DeployUpgradableBurnMintTokenPool is Script {
   using stdJson for string;
 
@@ -39,15 +35,17 @@ contract DeployUpgradableBurnMintTokenPool is Script {
     address tokenPool = address(
       new UpgradeableBurnMintTokenPool(config.GHO_TOKEN, TOKEN_DECIMALS, config.RMN_PROXY, ALLOW_LIST_ENABLED)
     );
-    address tokenPoolProxy = ITransparentProxyFactory(config.PROXY_FACTORY).create(
-      tokenPool,
-      config.OWNER,
-      abi.encodeCall(UpgradeableBurnMintTokenPool.initialize, (config.OWNER, ALLOW_LIST, config.ROUTER))
+    address tokenPoolProxy = address(
+      new TransparentUpgradeableProxy({
+        _logic: tokenPool,
+        initialOwner: config.OWNER,
+        _data: abi.encodeCall(UpgradeableBurnMintTokenPool.initialize, (config.OWNER, ALLOW_LIST, config.ROUTER))
+      })
     );
     vm.stopBroadcast();
 
-    console.log("tokenPoolProxy: ", tokenPoolProxy);
-    console.log("tokenPool:      ", tokenPool);
+    console.log("tokenPoolProxy          ", tokenPoolProxy);
+    console.log("tokenPoolImplementation ", tokenPool);
 
     _validateProxyAdminVersion(tokenPoolProxy);
   }
@@ -59,7 +57,6 @@ contract DeployUpgradableBurnMintTokenPool is Script {
 
   function _validate(Config memory config) internal view returns (Config memory) {
     require(address(config.OWNER) != address(0), "InvalidOwner");
-    require(address(config.PROXY_FACTORY) != address(0), "InvalidProxyFactory");
     require(_cmp(IERC20Metadata(config.GHO_TOKEN).name(), "Gho Token"), "InvalidToken");
     require(_cmp(IERC20Metadata(config.GHO_TOKEN).symbol(), "GHO"), "InvalidToken");
     require(_cmp(ITypeAndVersion(config.RMN_PROXY).typeAndVersion(), "ARMProxy 1.0.0"), "InvalidRmnProxy");
@@ -68,14 +65,12 @@ contract DeployUpgradableBurnMintTokenPool is Script {
   }
 
   function _validateProxyAdminVersion(address proxy) internal view {
-    IProxyAdmin proxyAdmin = _getProxyAdmin(proxy);
-    require(address(proxyAdmin) != address(0), "InvalidProxyAdmin");
-    require(_cmp(proxyAdmin.UPGRADE_INTERFACE_VERSION(), "5.0.0"), "InvalidProxyAdminVersion");
+    require(_cmp(_getProxyAdmin(proxy).UPGRADE_INTERFACE_VERSION(), "5.0.0"), "InvalidProxyAdminVersion");
   }
 
-  function _getProxyAdmin(address proxy) internal view returns (IProxyAdmin) {
+  function _getProxyAdmin(address proxy) internal view returns (ProxyAdmin) {
     bytes32 slot = bytes32(uint256(keccak256("eip1967.proxy.admin")) - 1);
-    return IProxyAdmin(address(uint160(uint256(vm.load(proxy, slot)))));
+    return ProxyAdmin(address(uint160(uint256(vm.load(proxy, slot)))));
   }
 
   function _cmp(string memory a, string memory b) internal pure returns (bool) {

contracts/script/DeployUpgradableBurnMintTokenPool.s.sol

@@ -2,14 +2,12 @@
     "42161": {
         "GHO_TOKEN": "0x7dfF72693f6A4149b17e7C6314655f6A9F7c8B33",
         "OWNER": "0xFF1137243698CaA18EE364Cc966CF0e02A4e6327",
-        "PROXY_FACTORY": "0xEB0682d148e874553008730f0686ea89db7DA412",
         "RMN_PROXY": "0xC311a21e6fEf769344EB1515588B9d535662a145",
         "ROUTER": "0x141fa059441E0ca23ce184B6A78bafD2A517DdE8"
     },
     "8453": {
         "GHO_TOKEN": "0x6Bb7a212910682DCFdbd5BCBb3e28FB4E8da10Ee",
         "OWNER": "0x9390B1735def18560c509E2d0bc090E9d6BA257a",
-        "PROXY_FACTORY": "0xEB0682d148e874553008730f0686ea89db7DA412",
         "RMN_PROXY": "0xC842c69d54F83170C42C4d556B4F6B2ca53Dd3E8",
         "ROUTER": "0x881e3A65B4d4a04dD529061dd0071cf975F58bCD"
     }