Merge pull request #49 from axieinfinity/feature/refactor

feat: allow backward compatible with forge ca67d15 and minor refactor
axieinfinity · Dec 28, 2023 · a1c4d62 · a1c4d62
2 parents 60c6a1b + fcd8e42
commit a1c4d62
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 44 deletions.
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/lib/solady b/lib/solady
diff --git a/script/SignUtil.s.sol b/script/SignUtil.s.sol
diff --git a/script/configs/ContractConfig.sol b/script/configs/ContractConfig.sol
@@ -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);

diff --git a/script/extensions/ScriptExtended.s.sol b/script/extensions/ScriptExtended.s.sol
@@ -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);
   }
 }
diff --git a/script/utils/DefaultContract.sol b/script/utils/DefaultContract.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;
+1 −0		.gitattributes
+1 −1		package.json
+666 −0		scripts/vm.py
+734 −472		src/Vm.sol
+3 −1		test/StdError.t.sol
+2 −2		test/Vm.t.sol
+455 −437		.gas-snapshot
+10 −0		.github/issue_template.md
+1 −0		.github/workflows/ci-all-via-ir.yml
+4 −3		.github/workflows/ci.yml
+1 −1		README.md
+1 −1		foundry.toml
+7 −7		js/solady.js
+1 −1		package.json
+26 −1		src/accounts/ERC4337.sol
+1 −1		src/accounts/ERC4337Factory.sol
+1 −1		src/accounts/ERC6551.sol
+1 −1		src/accounts/ERC6551Proxy.sol
+0 −1		src/utils/ERC1967Factory.sol
+169 −87		src/utils/FixedPointMathLib.sol
+17 −22		src/utils/LibBit.sol
+0 −4		src/utils/LibClone.sol
+26 −0		src/utils/LibPRNG.sol
+50 −19		src/utils/LibString.sol
+10 −13		src/utils/LibZip.sol
+13 −0		src/utils/Multicallable.sol
+7 −0		test/ERC4337.t.sol
+3 −0		test/ERC6909.t.sol
+107 −16		test/FixedPointMathLib.t.sol
+22 −0		test/LibBit.t.sol
+33 −0		test/LibPRNG.t.sol
+50 −0		test/LibString.t.sol