Merge pull request #124 from axieinfinity/feature/upgrade-proxy

feat: Upgrade proxy with logic constructor param

Author: huyhuynh3103

script/BaseMigration.s.sol

@@ -139,7 +139,8 @@ abstract contract BaseMigration is ScriptExtended {
     string memory contractName = CONFIG.getContractName(contractType);
 
     address logic = _deployLogic(contractType, argsLogicConstructor);
-    string memory proxyAbsolutePath = "./out/transparent/TransparentUpgradeableProxy.sol/TransparentUpgradeableProxy.json";
+    string memory proxyAbsolutePath =
+      "./out/transparent/TransparentUpgradeableProxy.sol/TransparentUpgradeableProxy.json";
     uint256 proxyNonce = vm.getNonce(sender());
     address proxyAdmin = _getProxyAdmin();
     assertTrue(proxyAdmin != address(0x0), "BaseMigration: Null ProxyAdmin");
@@ -201,13 +202,17 @@ abstract contract BaseMigration is ScriptExtended {
     proxy = _upgradeProxy(contractType, arguments());
   }
 
-  function _upgradeProxy(TContract contractType, bytes memory args)
+  function _upgradeProxy(TContract contractType, bytes memory args) internal virtual returns (address payable proxy) {
+    proxy = _upgradeProxy(contractType, args, EMPTY_ARGS);
+  }
+
+  function _upgradeProxy(TContract contractType, bytes memory args, bytes memory argsLogicConstructor)
     internal
     virtual
     logFn(string.concat("_upgradeProxy ", TContract.unwrap(contractType).unpackOne()))
     returns (address payable proxy)
   {
-    address logic = _deployLogic(contractType);
+    address logic = _deployLogic(contractType, argsLogicConstructor);
     proxy = CONFIG.getAddress(network(), contractType);
     _upgradeRaw(proxy.getProxyAdmin(), proxy, logic, args);
   }
@@ -252,7 +257,7 @@ abstract contract BaseMigration is ScriptExtended {
   }
 
   function _upgradeRaw(address proxyAdmin, address payable proxy, address logic, bytes memory args) internal virtual {
-    if (logic.codehash == payable(proxyAdmin).getProxyImplementation({ nullCheck: true }).codehash) {
+    if (logic.codehash == payable(proxy).getProxyImplementation({ nullCheck: true }).codehash) {
       console.log("BaseMigration: Logic is already upgraded!".yellow());
       return;
     }