add isContract check when reading contract addresses from config files

config/across.json

@@ -117,9 +117,7 @@
     "chainId": 1135,
     "acrossSpokePool": "0x9552a0a6624A23B848060AE5901659CDDa1f83f8",
     "weth": "0x4200000000000000000000000000000000000006",
-    "tokensToApprove": [
-      "0x4200000000000000000000000000000000000006"
-    ]
+    "tokensToApprove": ["0x4200000000000000000000000000000000000006"]
   },
   "blast": {
     "chainId": 81457,
@@ -146,8 +144,6 @@
     "chainId": 480,
     "acrossSpokePool": "0x09aea4b2242abC8bb4BB78D537A67a245A7bEC64",
     "weth": "0x4200000000000000000000000000000000000006",
-    "tokensToApprove": [
-      "0x4200000000000000000000000000000000000006"
-    ]
+    "tokensToApprove": ["0x4200000000000000000000000000000000000006"]
   }
-}
+}

deployments/optimism.json

@@ -56,4 +56,4 @@
   "GasZipPeriphery": "0x9a21E33F1a78b17DAd32010CeDB9Fd2F071C17d3",
   "RelayFacet": "0x424BDbbaEda89732443fb1B737b6Dc194a6Ddbd5",
   "DeBridgeDlnFacet": "0x18C85B940c29ECC3c210Ea40a5B6d91F5aeE2803"
-}
+}

script/deploy/facets/DeployAcrossFacet.s.sol

@@ -21,12 +21,15 @@ contract DeployScript is DeployScriptBase {
 
     function getConstructorArgs() internal override returns (bytes memory) {
         string memory path = string.concat(root, "/config/across.json");
-        string memory json = vm.readFile(path);
 
-        address acrossSpokePool = json.readAddress(
+        address acrossSpokePool = _getConfigContractAddress(
+            path,
             string.concat(".", network, ".acrossSpokePool")
         );
-        address weth = json.readAddress(string.concat(".", network, ".weth"));
+        address weth = _getConfigContractAddress(
+            path,
+            string.concat(".", network, ".weth")
+        );
 
         return abi.encode(acrossSpokePool, weth);
     }

script/deploy/facets/DeployAcrossFacetPacked.s.sol

@@ -23,15 +23,16 @@ contract DeployScript is DeployScriptBase {
 
     function getConstructorArgs() internal override returns (bytes memory) {
         string memory path = string.concat(root, "/config/across.json");
-        string memory json = vm.readFile(path);
 
-        address spokePool = json.readAddress(
+        address acrossSpokePool = _getConfigContractAddress(
+            path,
             string.concat(".", network, ".acrossSpokePool")
         );
-        address wrappedNative = json.readAddress(
+        address weth = _getConfigContractAddress(
+            path,
             string.concat(".", network, ".weth")
         );
 
-        return abi.encode(spokePool, wrappedNative, deployerAddress);
+        return abi.encode(acrossSpokePool, weth, deployerAddress);
     }
 }

script/deploy/facets/DeployAcrossFacetPackedV3.s.sol

@@ -23,15 +23,16 @@ contract DeployScript is DeployScriptBase {
 
     function getConstructorArgs() internal override returns (bytes memory) {
         string memory path = string.concat(root, "/config/across.json");
-        string memory json = vm.readFile(path);
 
-        address spokePool = json.readAddress(
+        address acrossSpokePool = _getConfigContractAddress(
+            path,
             string.concat(".", network, ".acrossSpokePool")
         );
-        address wrappedNative = json.readAddress(
+        address weth = _getConfigContractAddress(
+            path,
             string.concat(".", network, ".weth")
         );
 
-        return abi.encode(spokePool, wrappedNative, deployerAddress);
+        return abi.encode(acrossSpokePool, weth, deployerAddress);
     }
 }

script/deploy/facets/DeployAcrossFacetV3.s.sol

@@ -21,12 +21,15 @@ contract DeployScript is DeployScriptBase {
 
     function getConstructorArgs() internal override returns (bytes memory) {
         string memory path = string.concat(root, "/config/across.json");
-        string memory json = vm.readFile(path);
 
-        address acrossSpokePool = json.readAddress(
+        address acrossSpokePool = _getConfigContractAddress(
+            path,
             string.concat(".", network, ".acrossSpokePool")
         );
-        address weth = json.readAddress(string.concat(".", network, ".weth"));
+        address weth = _getConfigContractAddress(
+            path,
+            string.concat(".", network, ".weth")
+        );
 
         return abi.encode(acrossSpokePool, weth);
     }

script/deploy/facets/DeployAllBridgeFacet.s.sol

@@ -21,9 +21,9 @@ contract DeployScript is DeployScriptBase {
 
     function getConstructorArgs() internal override returns (bytes memory) {
         string memory path = string.concat(root, "/config/allbridge.json");
-        string memory json = vm.readFile(path);
 
-        address allBridge = json.readAddress(
+        address allBridge = _getConfigContractAddress(
+            path,
             string.concat(".", network, ".allBridge")
         );
 

script/deploy/facets/DeployAmarokFacet.s.sol

@@ -21,9 +21,9 @@ contract DeployScript is DeployScriptBase {
 
     function getConstructorArgs() internal override returns (bytes memory) {
         string memory path = string.concat(root, "/config/amarok.json");
-        string memory json = vm.readFile(path);
 
-        address connextHandler = json.readAddress(
+        address connextHandler = _getConfigContractAddress(
+            path,
             string.concat(".", network, ".connextHandler")
         );
 

script/deploy/facets/DeployAmarokFacetPacked.s.sol

@@ -23,9 +23,9 @@ contract DeployScript is DeployScriptBase {
 
     function getConstructorArgs() internal override returns (bytes memory) {
         string memory path = string.concat(root, "/config/amarok.json");
-        string memory json = vm.readFile(path);
 
-        address connextHandler = json.readAddress(
+        address connextHandler = _getConfigContractAddress(
+            path,
             string.concat(".", network, ".connextHandler")
         );
 

script/deploy/facets/DeployArbitrumBridgeFacet.s.sol

@@ -23,12 +23,13 @@ contract DeployScript is DeployScriptBase {
 
     function getConstructorArgs() internal override returns (bytes memory) {
         string memory path = string.concat(root, "/config/arbitrum.json");
-        string memory json = vm.readFile(path);
 
-        address gatewayRouter = json.readAddress(
+        address gatewayRouter = _getConfigContractAddress(
+            path,
             string.concat(".", network, ".gatewayRouter")
         );
-        address inbox = json.readAddress(
+        address inbox = _getConfigContractAddress(
+            path,
             string.concat(".", network, ".inbox")
         );
 

script/deploy/facets/DeployCBridgeFacet.s.sol

@@ -21,9 +21,9 @@ contract DeployScript is DeployScriptBase {
 
     function getConstructorArgs() internal override returns (bytes memory) {
         string memory path = string.concat(root, "/config/cbridge.json");
-        string memory json = vm.readFile(path);
 
-        address cBridge = json.readAddress(
+        address cBridge = _getConfigContractAddress(
+            path,
             string.concat(".", network, ".cBridge")
         );
 

script/deploy/facets/DeployCBridgeFacetPacked.s.sol

@@ -23,9 +23,9 @@ contract DeployScript is DeployScriptBase {
 
     function getConstructorArgs() internal override returns (bytes memory) {
         string memory path = string.concat(root, "/config/cbridge.json");
-        string memory json = vm.readFile(path);
 
-        address cBridge = json.readAddress(
+        address cBridge = _getConfigContractAddress(
+            path,
             string.concat(".", network, ".cBridge")
         );
 

script/deploy/facets/DeployCelerCircleBridgeFacet.s.sol

@@ -23,12 +23,15 @@ contract DeployScript is DeployScriptBase {
 
     function getConstructorArgs() internal override returns (bytes memory) {
         string memory path = string.concat(root, "/config/celerCircle.json");
-        string memory json = vm.readFile(path);
 
-        address circleBridgeProxy = json.readAddress(
+        address circleBridgeProxy = _getConfigContractAddress(
+            path,
             string.concat(".", network, ".circleBridgeProxy")
         );
-        address usdc = json.readAddress(string.concat(".", network, ".usdc"));
+        address usdc = _getConfigContractAddress(
+            path,
+            string.concat(".", network, ".usdc")
+        );
 
         return abi.encode(circleBridgeProxy, usdc);
     }

script/deploy/facets/DeployCelerIMFacet.s.sol

@@ -38,18 +38,20 @@ contract DeployScript is DeployScriptBase {
     function getConstructorArgs() internal override returns (bytes memory) {
         // get messageBus address
         string memory path = string.concat(root, "/config/cbridge.json");
-        string memory json = vm.readFile(path);
 
-        address messageBus = json.readAddress(
+        address messageBus = _getConfigContractAddress(
+            path,
             string.concat(".", network, ".messageBus")
         );
 
+        // get address of cfUSDC token (required for mainnet only, otherwise address(0))
         address cfUSDCAddress;
         if (
             keccak256(abi.encodePacked(network)) ==
             keccak256(abi.encodePacked("mainnet"))
         ) {
-            cfUSDCAddress = json.readAddress(
+            cfUSDCAddress = _getConfigContractAddress(
+                path,
                 string.concat(".", network, ".cfUSDC")
             );
         }
@@ -63,7 +65,6 @@ contract DeployScript is DeployScriptBase {
             fileSuffix,
             "json"
         );
-        json = vm.readFile(path);
 
         // check which diamond to use (from env variable)
         string memory diamondType = vm.envString("DIAMOND_TYPE");
@@ -73,8 +74,8 @@ contract DeployScript is DeployScriptBase {
 
         // get address of the correct diamond contract from network log file
         address diamondAddress = deployMutable
-            ? json.readAddress(".LiFiDiamond")
-            : json.readAddress(".LiFiDiamondImmutable");
+            ? _getConfigContractAddress(path, ".LiFiDiamond")
+            : _getConfigContractAddress(path, ".LiFiDiamondImmutable");
 
         // get path of global config file
         string memory globalConfigPath = string.concat(

script/deploy/facets/DeployDeBridgeDlnFacet.s.sol

@@ -23,9 +23,9 @@ contract DeployScript is DeployScriptBase {
 
     function getConstructorArgs() internal override returns (bytes memory) {
         string memory path = string.concat(root, "/config/dln.json");
-        string memory json = vm.readFile(path);
 
-        address dlnSource = json.readAddress(
+        address dlnSource = _getConfigContractAddress(
+            path,
             string.concat(".networks.", network, ".dlnSource")
         );
 

script/deploy/facets/DeployExecutor.s.sol

@@ -28,9 +28,8 @@ contract DeployScript is DeployScriptBase {
             fileSuffix,
             "json"
         );
-        string memory json = vm.readFile(path);
 
-        address erc20Proxy = json.readAddress(".ERC20Proxy");
+        address erc20Proxy = _getConfigContractAddress(path, ".ERC20Proxy");
 
         return abi.encode(erc20Proxy);
     }

script/deploy/facets/DeployGasZipFacet.s.sol

@@ -20,14 +20,10 @@ contract DeployScript is DeployScriptBase {
     }
 
     function getConstructorArgs() internal override returns (bytes memory) {
-        string memory gasZipConfig = string.concat(
-            root,
-            "/config/gaszip.json"
-        );
-
-        string memory gasZipConfigJson = vm.readFile(gasZipConfig);
+        string memory path = string.concat(root, "/config/gaszip.json");
 
-        address gasZipRouter = gasZipConfigJson.readAddress(
+        address gasZipRouter = _getConfigContractAddress(
+            path,
             string.concat(".gasZipRouters.", network)
         );
 

script/deploy/facets/DeployGasZipPeriphery.s.sol

@@ -21,36 +21,33 @@ contract DeployScript is DeployScriptBase {
 
     function getConstructorArgs() internal override returns (bytes memory) {
         // get gasZipRouter address
-        string memory gasZipConfig = string.concat(
-            root,
-            "/config/gaszip.json"
-        );
-
-        string memory gasZipConfigJson = vm.readFile(gasZipConfig);
+        string memory path = string.concat(root, "/config/gaszip.json");
 
-        address gasZipRouter = gasZipConfigJson.readAddress(
+        address gasZipRouter = _getConfigContractAddress(
+            path,
             string.concat(".gasZipRouters.", network)
         );
 
         // get LiFiDEXAggregator address
-        string memory deployLog = string.concat(
+        path = string.concat(
             root,
             "/deployments/",
             network,
             ".",
             fileSuffix,
             "json"
         );
-        string memory json = vm.readFile(deployLog);
 
-        address liFiDEXAggregator = json.readAddress(".LiFiDEXAggregator");
+        address liFiDEXAggregator = _getConfigContractAddress(
+            path,
+            ".LiFiDEXAggregator"
+        );
 
         // get network's SAFE address to become contract owner for potential fund withdrawals
-        string memory networks = string.concat(root, "/config/networks.json");
-
-        string memory networksJson = vm.readFile(networks);
+        path = string.concat(root, "/config/networks.json");
 
-        address safeAddress = networksJson.readAddress(
+        address safeAddress = _getConfigContractAddress(
+            path,
             string.concat(".", network, ".safeAddress")
         );
 

script/deploy/facets/DeployGenericSwapFacetV3.s.sol

@@ -25,11 +25,9 @@ contract DeployScript is DeployScriptBase {
         // get path of global config file
         string memory path = string.concat(root, "/config/networks.json");
 
-        // read file into json variable
-        string memory json = vm.readFile(path);
-
         // extract network's native address
-        address nativeAddress = json.readAddress(
+        address nativeAddress = _getConfigContractAddress(
+            path,
             string.concat(".", network, ".nativeAddress")
         );
 

script/deploy/facets/DeployGnosisBridgeFacet.s.sol

@@ -23,9 +23,9 @@ contract DeployScript is DeployScriptBase {
 
     function getConstructorArgs() internal override returns (bytes memory) {
         string memory path = string.concat(root, "/config/gnosis.json");
-        string memory json = vm.readFile(path);
 
-        address xDaiBridge = json.readAddress(
+        address xDaiBridge = _getConfigContractAddress(
+            path,
             string.concat(".", network, ".xDaiBridge")
         );
 

script/deploy/facets/DeployLiFiDiamond.s.sol

@@ -28,9 +28,10 @@ contract DeployScript is DeployScriptBase {
             fileSuffix,
             "json"
         );
-        string memory json = vm.readFile(path);
-
-        address diamondCut = json.readAddress(".DiamondCutFacet");
+        address diamondCut = _getConfigContractAddress(
+            path,
+            ".DiamondCutFacet"
+        );
 
         return abi.encode(deployerAddress, diamondCut);
     }

script/deploy/facets/DeployMayanFacet.s.sol

@@ -22,9 +22,9 @@ contract DeployScript is DeployScriptBase {
     function getConstructorArgs() internal override returns (bytes memory) {
         // If you don't have a constructor or it doesn't take any arguments, you can remove this function
         string memory path = string.concat(root, "/config/mayan.json");
-        string memory json = vm.readFile(path);
 
-        address bridge = json.readAddress(
+        address bridge = _getConfigContractAddress(
+            path,
             string.concat(".bridges.", network, ".bridge")
         );