Merge pull request #49 from axieinfinity/feature/refactor

feat: allow backward compatible with forge ca67d15 and minor refactor

Author: TuDo1403

lib/forge-std

@@ -125,11 +125,27 @@ abstract contract ContractConfig is IContractConfig {
   }
 
   function _storeDeploymentData(string memory deploymentRoot) internal virtual {
-    if (!vm.exists(deploymentRoot)) {
+    VmSafe.DirEntry[] memory deployments;
+    try vm.exists(deploymentRoot) returns (bool exists) {
+      if (!exists) {
+        console.log("ContractConfig:", "No deployments folder, skip loading");
+        return;
+      }
+    } catch {
+      try vm.readDir(deploymentRoot) returns (VmSafe.DirEntry[] memory res) {
+        deployments = res;
+      } catch {
+        console.log("ContractConfig:", "No deployments folder, skip loading");
+        return;
+      }
+    }
+
+    try vm.readDir(deploymentRoot) returns (VmSafe.DirEntry[] memory res) {
+      deployments = res;
+    } catch {
       console.log("ContractConfig:", "No deployments folder, skip loading");
       return;
     }
-    VmSafe.DirEntry[] memory deployments = vm.readDir(deploymentRoot);
 
     for (uint256 i; i < deployments.length;) {
       VmSafe.DirEntry[] memory entries = vm.readDir(deployments[i].path);

lib/solady

@@ -27,9 +27,9 @@ abstract contract ScriptExtended is Script, StdAssertions, IScriptExtended {
   }
 
   modifier onNetwork(TNetwork networkType) {
-    TNetwork currentNetwork = _before(networkType);
+    TNetwork currentNetwork = _switchTo(networkType);
     _;
-    _after(currentNetwork);
+    _swichBack(currentNetwork);
   }
 
   function setUp() public virtual {
@@ -101,13 +101,13 @@ abstract contract ScriptExtended is Script, StdAssertions, IScriptExtended {
     require(network() == networkType, string.concat("ScriptExtended: Only allowed on ", CONFIG.getAlias(networkType)));
   }
 
-  function _before(TNetwork networkType) private returns (TNetwork currentNetwork) {
+  function _switchTo(TNetwork networkType) private returns (TNetwork currentNetwork) {
     currentNetwork = network();
     CONFIG.createFork(networkType);
     CONFIG.switchTo(networkType);
   }
 
-  function _after(TNetwork currentNetwork) private {
+  function _swichBack(TNetwork currentNetwork) private {
     CONFIG.switchTo(currentNetwork);
   }
 }

script/SignUtil.s.sol

@@ -4,7 +4,9 @@ pragma solidity ^0.8.19;
 import { LibString } from "../../lib/solady/src/utils/LibString.sol";
 import { TContract } from "../types/Types.sol";
 
-enum DefaultContract { ProxyAdmin }
+enum DefaultContract {
+  ProxyAdmin
+}
 
 using { key, name } for DefaultContract global;