Fixed script that use the contracts script

Author: fusmanii

script/DeployEthereumSpokePool.s.sol

@@ -33,8 +33,8 @@ contract DeployEthereumSpokePool is Script, Test, Constants, DeploymentUtils {
         // Prepare constructor arguments for Ethereum_SpokePool
         bytes memory constructorArgs = abi.encode(
             address(weth), // _weth
-            QUOTE_TIME_BUFFER, // _quoteTimeBuffer
-            FILL_DEADLINE_BUFFER // _fillDeadlineBuffer
+            QUOTE_TIME_BUFFER(), // _quoteTimeBuffer
+            FILL_DEADLINE_BUFFER() // _fillDeadlineBuffer
         );
 
         // Initialize deposit counter to very high number of deposits to avoid duplicate deposit ID's

script/DeployHubPool.s.sol

@@ -35,7 +35,7 @@ contract DeployHubPool is Script, Test, Constants {
         LpTokenFactory lpTokenFactory = new LpTokenFactory();
 
         // Deploy HubPool with the LpTokenFactory address
-        HubPool hubPool = new HubPool(lpTokenFactory, finder, weth, ZERO_ADDRESS);
+        HubPool hubPool = new HubPool(lpTokenFactory, finder, weth, ZERO_ADDRESS());
 
         // Log the deployed addresses
         console.log("Chain ID:", chainId);

script/DeployedAddresses.sol

@@ -15,7 +15,7 @@ contract DeployedAddresses is Test {
     using stdJson for string;
 
     // Path to the JSON file containing deployed addresses
-    string private constant JSON_PATH = "../broadcast/deployed-addresses.json";
+    string private constant JSON_PATH = "./broadcast/deployed-addresses.json";
 
     /**
      * @notice Get contract address by chain ID and contract name
@@ -32,6 +32,11 @@ contract DeployedAddresses is Test {
             contractName,
             '"].address'
         );
+
+        if (!vm.keyExists(jsonData, path)) {
+            return address(0);
+        }
+
         return jsonData.readAddress(path);
     }
 
@@ -99,8 +104,8 @@ contract DeployedAddresses is Test {
      */
     function getContractNames(uint256 chainId) public view returns (string[] memory) {
         string memory jsonData = vm.readFile(JSON_PATH);
-        string memory path = string.concat('.chains["', vm.toString(chainId), '"].contracts | keys');
-        return jsonData.readStringArray(path);
+        string memory path = string.concat('.chains["', vm.toString(chainId), '"].contracts');
+        return vm.parseJsonKeys(jsonData, path);
     }
 
     /**
@@ -109,7 +114,7 @@ contract DeployedAddresses is Test {
      */
     function getChainIds() public view returns (uint256[] memory) {
         string memory jsonData = vm.readFile(JSON_PATH);
-        string[] memory chainIdStrings = jsonData.readStringArray(".chains | keys");
+        string[] memory chainIdStrings = vm.parseJsonKeys(jsonData, ".chains");
         uint256[] memory chainIds = new uint256[](chainIdStrings.length);
         for (uint256 i = 0; i < chainIdStrings.length; i++) {
             chainIds[i] = vm.parseUint(chainIdStrings[i]);

script/DeploymentUtils.sol

@@ -41,13 +41,13 @@ contract DeploymentUtils is Script, Test, Constants, DeployedAddresses {
 
         // Determine hub chain ID based on spoke chain ID
         uint256 hubChainId;
-        if (spokeChainId == MAINNET) {
-            hubChainId = MAINNET;
-        } else if (spokeChainId == SEPOLIA) {
-            hubChainId = SEPOLIA;
+        if (spokeChainId == MAINNET()) {
+            hubChainId = MAINNET();
+        } else if (spokeChainId == SEPOLIA()) {
+            hubChainId = SEPOLIA();
         } else {
             // For L2 chains, hub is typically mainnet or sepolia
-            hubChainId = isTestnet(spokeChainId) ? SEPOLIA : MAINNET;
+            hubChainId = isTestnet(spokeChainId) ? SEPOLIA() : MAINNET();
         }
 
         // If hubPoolAddress is not provided, try to get it from environment
@@ -173,20 +173,20 @@ contract DeploymentUtils is Script, Test, Constants, DeployedAddresses {
      * @param chainId Chain ID to check
      * @return bool True if testnet
      */
-    function isTestnet(uint256 chainId) internal pure returns (bool) {
+    function isTestnet(uint256 chainId) internal view returns (bool) {
         return
-            chainId == SEPOLIA ||
-            chainId == ARBITRUM_SEPOLIA ||
-            chainId == OPTIMISM_SEPOLIA ||
-            chainId == BASE_SEPOLIA ||
-            chainId == POLYGON_AMOY ||
-            chainId == LENS_TESTNET ||
-            chainId == LINEA_SEPOLIA ||
-            chainId == SCROLL_SEPOLIA ||
-            chainId == UNICHAIN_SEPOLIA ||
-            chainId == BLAST_SEPOLIA ||
-            chainId == INK_SEPOLIA ||
-            chainId == LISK_SEPOLIA ||
-            chainId == MODE_SEPOLIA;
+            chainId == SEPOLIA() ||
+            chainId == ARBITRUM_SEPOLIA() ||
+            chainId == OPTIMISM_SEPOLIA() ||
+            chainId == BASE_SEPOLIA() ||
+            chainId == POLYGON_AMOY() ||
+            chainId == LENS_TESTNET() ||
+            chainId == LINEA_SEPOLIA() ||
+            chainId == SCROLL_SEPOLIA() ||
+            chainId == UNICHAIN_SEPOLIA() ||
+            chainId == BLAST_SEPOLIA() ||
+            chainId == INK_SEPOLIA() ||
+            chainId == LISK_SEPOLIA() ||
+            chainId == MODE_SEPOLIA();
     }
 }