script: fix switchBack fn

Author: TuDo1403

script/configs/NetworkConfig.sol

@@ -22,6 +22,7 @@ abstract contract NetworkConfig is INetworkConfig {
   string private _deploymentRoot;
   bool private _isForkModeEnabled;
   TNetwork private _currentNetwork;
+  mapping(uint256 forkId => TNetwork) internal _forkId2Network;
   mapping(TNetwork network => NetworkData) internal _networkDataMap;
   mapping(TNetwork network => mapping(uint256 forkBlockNumber => uint256 forkId)) internal _forkMap;
 
@@ -117,6 +118,7 @@ abstract contract NetworkConfig is INetworkConfig {
     NetworkData memory networkData = _networkDataMap[network];
     forkId =
       _forkMap[network][forkBlockNumber] = tryCreateFork(networkData.chainAlias, networkData.network, forkBlockNumber);
+    _forkId2Network[forkId] = network;
   }
 
   function tryCreateFork(string memory chainAlias, TNetwork network, uint256 forkBlockNumber)
@@ -186,12 +188,14 @@ abstract contract NetworkConfig is INetworkConfig {
 
     vm.selectFork(forkId);
     _currentNetwork = network;
+    require(network == _forkId2Network[forkId], "Network Config: Invalid fork network");
 
     _logCurrentForkInfo(_networkDataMap[network].chainAlias);
   }
 
   function switchTo(uint256 forkId) public virtual {
     vm.selectFork(forkId);
+    _currentNetwork = _forkId2Network[forkId];
     this.logCurrentForkInfo();
   }
 

script/extensions/BaseScriptExtended.s.sol

@@ -22,6 +22,10 @@ abstract contract BaseScriptExtended {
     return vme.getForkId(network());
   }
 
+  function forkId(uint256 forkBlockNumber) public view virtual returns (uint256) {
+    return vme.getForkId(network(), forkBlockNumber);
+  }
+
   function sender() public view virtual returns (address payable) {
     return vme.getSender();
   }

script/extensions/ScriptExtended.s.sol

@@ -20,6 +20,8 @@ abstract contract ScriptExtended is BaseScriptExtended, Script, StdAssertions, I
   using StdStyle for *;
   using LibErrorHandler for bool;
 
+  uint256 internal _originForkBlockNumber;
+
   modifier logFn(string memory fnName) {
     logInnerCall(fnName);
     _;
@@ -52,6 +54,7 @@ abstract contract ScriptExtended is BaseScriptExtended, Script, StdAssertions, I
     vme.resolveCommand(command);
 
     IRuntimeConfig.Option memory runtimeConfig = vme.getRuntimeConfig();
+    _originForkBlockNumber = runtimeConfig.forkBlockNumber;
 
     if (runtimeConfig.network != network()) {
       switchTo(runtimeConfig.network, runtimeConfig.forkBlockNumber);
@@ -114,7 +117,7 @@ abstract contract ScriptExtended is BaseScriptExtended, Script, StdAssertions, I
     virtual
     returns (TNetwork prevNetwork, uint256 prevForkId)
   {
-    prevForkId = forkId();
+    prevForkId = forkId(_originForkBlockNumber);
     prevNetwork = network();
 
     vme.createFork(networkType, forkBlockNumber);

script/interfaces/configs/INetworkConfig.sol

@@ -27,6 +27,8 @@ interface INetworkConfig {
 
   function getForkId(TNetwork network) external view returns (uint256 forkId);
 
+  function getForkId(TNetwork, uint256 forkBlockNumber) external view returns (uint256 forkId);
+
   function getAlias(TNetwork network) external view returns (string memory networkAlias);
 
   function switchTo(TNetwork network) external;

soldeer.lock

@@ -1,10 +1,4 @@
 
-[[dependencies]]
-name = "@openzeppelin-contracts"
-version = "4.9.3"
-source = "https://soldeer-revisions.s3.amazonaws.com/@openzeppelin-contracts/4_9_3_22-01-2024_13:13:53_contracts.zip"
-checksum = "95886307069cf73310b41396c49df51801a73f31f18f62e7d05adfc2031e7725"
-
 [[dependencies]]
 name = "forge-std"
 version = "1.8.2"
@@ -16,3 +10,9 @@ name = "solady"
 version = "0.0.206"
 source = "https://soldeer-revisions.s3.amazonaws.com/solady/0_0_206_06-06-2024_05:38:51_solady.zip"
 checksum = "acba3f4e69840ebad8c7fcf01edbf66405015418de6fea119ee46944b9294d6d"
+
+[[dependencies]]
+name = "@openzeppelin-contracts"
+version = "4.9.3"
+source = "https://soldeer-revisions.s3.amazonaws.com/@openzeppelin-contracts/4_9_3_22-01-2024_13:13:53_contracts.zip"
+checksum = "95886307069cf73310b41396c49df51801a73f31f18f62e7d05adfc2031e7725"