Refactor config for CCT Foundry

Author: SyedAsadKazmi

ccip/cct/foundry/README.md

@@ -116,7 +116,7 @@ forge script script/AcceptAdminRole.s.sol --rpc-url $RPC_URL --private-key $PRIV
 
 The script pulls the token address from a previously deployed token in a JSON file located in the `script/output/` folder. The `TokenAdminRegistry` address is fetched from the `HelperConfig.s.sol` file.
 
-- **Deployed Token Address**: The token address is read from the output file corresponding to the current chain (e.g., `deployedToken_avalancheFuji.json`).
+- **Deployed Token Address**: The token address is read from the output file corresponding to the current chain (e.g., `deployedToken_avalanche_fuji.json`).
 - **TokenAdminRegistry Address**: The `TokenAdminRegistry` address is retrieved based on the network settings in `HelperConfig.s.sol`.
 
 ### Examples
@@ -197,9 +197,9 @@ forge script script/ApplyChainUpdates.s.sol --rpc-url $RPC_URL --private-key $PR
 
 The script pulls the pool and token addresses from previously deployed pool and token JSON files located in the `script/output/` folder. The cross-chain configuration (e.g., chain selector) is fetched from the `HelperConfig.s.sol` file.
 
-- **Deployed Local Pool Address**: The pool address is read from the output file corresponding to the current chain (e.g., `deployedTokenPool_avalancheFuji.json`).
-- **Deployed Remote Pool Address**: The remote pool address is read from the JSON file corresponding to the remote chain (e.g., `deployedTokenPool_arbitrumSepolia.json`).
-- **Deployed Remote Token Address**: The remote token address is read from the JSON file corresponding to the remote chain (e.g., `deployedToken_arbitrumSepolia.json`).
+- **Deployed Local Pool Address**: The pool address is read from the output file corresponding to the current chain (e.g., `deployedTokenPool_avalanche_fuji.json`).
+- **Deployed Remote Pool Address**: The remote pool address is read from the JSON file corresponding to the remote chain (e.g., `deployedTokenPool_arbitrum_one_sepolia.json`).
+- **Deployed Remote Token Address**: The remote token address is read from the JSON file corresponding to the remote chain (e.g., `deployedToken_arbitrum_one_sepolia.json`).
 - **Remote Chain Selector**: The chain selector for the remote chain is fetched based on the network configuration in `HelperConfig.s.sol`.
 - **Rate Limiter Configuration**: The script allows configuring rate limiting for both inbound and outbound transfers. By default, rate limiting is disabled in this script.
 
@@ -239,7 +239,7 @@ forge script script/ClaimAdmin.s.sol --rpc-url $RPC_URL --private-key $PRIVATE_K
 
 The script pulls the token and admin details from the `config.json` file and the deployed token address from a JSON file located in the `script/output/` folder.
 
-- **Deployed Token Address**: The token address is read from the output file corresponding to the current chain (e.g., `deployedToken_avalancheFuji.json`).
+- **Deployed Token Address**: The token address is read from the output file corresponding to the current chain (e.g., `deployedToken_avalanche_fuji.json`).
 - **Admin Address**: The admin address is read from the `config.json` file (`ccipAdminAddress` field).
 
 ### Examples
@@ -278,7 +278,7 @@ forge script script/DeployBurnMintTokenPool.s.sol --rpc-url $RPC_URL --private-k
 
 The script pulls the token address from a previously deployed token in a JSON file located in the `script/output/` folder. The network configuration (router and RMN proxy addresses) is also fetched from the `HelperConfig.s.sol` file.
 
-- **Deployed Token Address**: The token address is read from the output file corresponding to the current chain (e.g., `deployedToken_avalancheFuji.json`).
+- **Deployed Token Address**: The token address is read from the output file corresponding to the current chain (e.g., `deployedToken_avalanche_fuji.json`).
 - **Router and RMN Proxy**: The router and RMN proxy addresses are retrieved based on the network settings in `HelperConfig.s.sol`.
 
 ### Examples
@@ -317,7 +317,7 @@ forge script script/DeployLockReleaseTokenPool.s.sol --rpc-url $RPC_URL --privat
 
 The script pulls the token address from a previously deployed token in a JSON file located in the `script/output/` folder. The network configuration (router and RMN proxy addresses) is fetched from the `HelperConfig.s.sol` file.
 
-- **Deployed Token Address**: The token address is read from the output file corresponding to the current chain (e.g., `deployedToken_avalancheFuji.json`).
+- **Deployed Token Address**: The token address is read from the output file corresponding to the current chain (e.g., `deployedToken_avalanche_fuji.json`).
 - **Router and RMN Proxy**: The router and RMN proxy addresses are retrieved based on the network settings in `HelperConfig.s.sol`.
 
 ### Examples
@@ -527,7 +527,7 @@ forge script script/MintTokens.s.sol --rpc-url $RPC_URL --private-key $PRIVATE_K
 
 The script pulls the token address from a previously deployed token in a JSON file located in the `script/output/` folder. The mint amount is specified in the `config.json` file.
 
-- **Deployed Token Address**: The token address is read from the output file corresponding to the current chain (e.g., `deployedToken_avalancheFuji.json`).
+- **Deployed Token Address**: The token address is read from the output file corresponding to the current chain (e.g., `deployedToken_avalanche_fuji.json`).
 - **Mint Amount**: The amount of tokens to mint is read from the `config.json` file (`tokenAmountToMint` field).
 
 ### Examples
@@ -611,8 +611,8 @@ forge script script/SetPool.s.sol --rpc-url $RPC_URL --private-key $PRIVATE_KEY
 
 The script pulls the token and pool addresses from previously deployed token and pool JSON files located in the `script/output/` folder. The `TokenAdminRegistry` address is retrieved from the `HelperConfig.s.sol` file.
 
-- **Deployed Token Address**: The token address is read from the output file corresponding to the current chain (e.g., `deployedToken_avalancheFuji.json`).
-- **Deployed Pool Address**: The pool address is read from the output file corresponding to the current chain (e.g., `deployedTokenPool_avalancheFuji.json`).
+- **Deployed Token Address**: The token address is read from the output file corresponding to the current chain (e.g., `deployedToken_avalanche_fuji.json`).
+- **Deployed Pool Address**: The pool address is read from the output file corresponding to the current chain (e.g., `deployedTokenPool_avalanche_fuji.json`).
 - **TokenAdminRegistry Address**: The `TokenAdminRegistry` address is retrieved based on the network settings in `HelperConfig.s.sol`.
 
 ### Examples
@@ -736,7 +736,7 @@ forge script script/TransferTokens.s.sol --rpc-url $RPC_URL --private-key $PRIVA
 
 The script pulls the token address, transfer amount, and fee type from the `config.json` file. It also reads the destination chain information from the same file.
 
-- **Deployed Token Address**: The token address is read from the output file corresponding to the current chain (e.g., `deployedToken_avalancheFuji.json`).
+- **Deployed Token Address**: The token address is read from the output file corresponding to the current chain (e.g., `deployedToken_avalanche_fuji.json`).
 - **Transfer Amount**: The amount of tokens to transfer is read from `config.json` (`tokenAmountToTransfer` field).
 - **Fee Type**: The fee type is specified in the `config.json` file as either `"native"` (e.g., ETH, AVAX) or `"link"` (to pay fees in LINK tokens).
 - **Destination Chain**: The destination chain ID is determined based on the current chain ID and the `remoteChains` field in `config.json`.

ccip/cct/foundry/script/AcceptAdminRole.s.sol

@@ -9,7 +9,7 @@ import {TokenAdminRegistry} from "@chainlink/contracts-ccip/contracts/tokenAdmin
 contract AcceptAdminRole is Script {
     function run() external {
         // Get the chain name based on the current chain ID
-        string memory chainName = HelperUtils.getChainName(block.chainid);
+        string memory chainName = getChain(block.chainid).chainAlias;
 
         // Construct the path to the deployed token JSON file
         string memory root = vm.projectRoot();

ccip/cct/foundry/script/AddRemotePool.s.sol

@@ -2,15 +2,14 @@
 pragma solidity 0.8.24;
 
 import {Script, console} from "forge-std/Script.sol";
-import {HelperUtils} from "./utils/HelperUtils.s.sol"; // Utility functions for JSON parsing and chain info
 import {HelperConfig} from "./HelperConfig.s.sol"; // Network configuration helper
 import {TokenPool} from "@chainlink/contracts-ccip/contracts/pools/TokenPool.sol";
 
 contract AddRemotePool is Script {
     function run(address poolAddress, uint256 remoteChainId, address remotePoolAddress) external {
         HelperConfig helperConfig = new HelperConfig();
         HelperConfig.NetworkConfig memory remoteNetworkConfig =
-            HelperUtils.getNetworkConfig(helperConfig, remoteChainId);
+            helperConfig.getNetworkConfig(remoteChainId);
 
         // Validate that configurations exist
         require(remoteNetworkConfig.chainSelector != 0, "Remote network configuration not found");

ccip/cct/foundry/script/ApplyChainUpdates.s.sol

@@ -10,7 +10,7 @@ import {RateLimiter} from "@chainlink/contracts-ccip/contracts/libraries/RateLim
 contract ApplyChainUpdates is Script {
     function run() external {
         // Get the current chain name based on the chain ID
-        string memory chainName = HelperUtils.getChainName(block.chainid);
+        string memory chainName = getChain(block.chainid).chainAlias;
 
         // Construct paths to the configuration and local pool JSON files
         string memory root = vm.projectRoot();
@@ -23,7 +23,7 @@ contract ApplyChainUpdates is Script {
         );
 
         // Get the remote chain name based on the remoteChainId
-        string memory remoteChainName = HelperUtils.getChainName(remoteChainId);
+        string memory remoteChainName = getChain(remoteChainId).chainAlias;
         string memory remotePoolPath =
             string.concat(root, "/script/output/deployedTokenPool_", remoteChainName, ".json");
         string memory remoteTokenPath = string.concat(root, "/script/output/deployedToken_", remoteChainName, ".json");
@@ -43,7 +43,7 @@ contract ApplyChainUpdates is Script {
         // Fetch the remote network configuration to get the chain selector
         HelperConfig helperConfig = new HelperConfig();
         HelperConfig.NetworkConfig memory remoteNetworkConfig =
-            HelperUtils.getNetworkConfig(helperConfig, remoteChainId);
+            helperConfig.getNetworkConfig(remoteChainId);
 
         uint64 remoteChainSelector = remoteNetworkConfig.chainSelector;
 

ccip/cct/foundry/script/ClaimAdmin.s.sol

@@ -12,7 +12,7 @@ import {BurnMintERC20} from "@chainlink/contracts/src/v0.8/shared/token/ERC20/Bu
 contract ClaimAdmin is Script {
     function run() external {
         // Get the chain name based on the current chain ID
-        string memory chainName = HelperUtils.getChainName(block.chainid);
+        string memory chainName = getChain(block.chainid).chainAlias;
 
         // Define paths to the necessary JSON files
         string memory root = vm.projectRoot();

ccip/cct/foundry/script/DeployBurnMintTokenPool.s.sol

@@ -11,7 +11,7 @@ import {IBurnMintERC20} from "@chainlink/contracts/src/v0.8/shared/token/ERC20/I
 contract DeployBurnMintTokenPool is Script {
     function run() external {
         // Get the chain name based on the current chain ID
-        string memory chainName = HelperUtils.getChainName(block.chainid);
+        string memory chainName = getChain(block.chainid).chainAlias;
 
         // Construct the path to the deployed token JSON file
         string memory root = vm.projectRoot();

ccip/cct/foundry/script/DeployLockReleaseTokenPool.s.sol

@@ -10,7 +10,7 @@ import {IERC20} from "@openzeppelin/[email protected]/token/ERC20/IERC20.sol";
 contract DeployLockReleaseTokenPool is Script {
     function run() external {
         // Get the chain name based on the current chain ID
-        string memory chainName = HelperUtils.getChainName(block.chainid);
+        string memory chainName = getChain(block.chainid).chainAlias;
 
         // Construct the path to the deployed token JSON file
         string memory root = vm.projectRoot();

ccip/cct/foundry/script/DeployToken.s.sol

@@ -8,7 +8,7 @@ import {BurnMintERC20} from "@chainlink/contracts/src/v0.8/shared/token/ERC20/Bu
 contract DeployToken is Script {
     function run() external {
         // Get the chain name based on the current chain ID
-        string memory chainName = HelperUtils.getChainName(block.chainid);
+        string memory chainName = getChain(block.chainid).chainAlias;
 
         // Define the path to the config.json file
         string memory root = vm.projectRoot();

ccip/cct/foundry/script/GetCurrentRateLimits.s.sol

@@ -3,7 +3,6 @@ pragma solidity 0.8.24;
 
 import {Script, console} from "forge-std/Script.sol";
 import {HelperConfig} from "./HelperConfig.s.sol";
-import {HelperUtils} from "./utils/HelperUtils.s.sol";
 
 library RateLimiter {
     struct State {
@@ -32,9 +31,9 @@ contract GetCurrentRateLimits is Script {
         // Instantiate HelperConfig
         HelperConfig helperConfig = new HelperConfig();
 
-        // Retrieve the remote network configuration using HelperUtils
+        // Retrieve the remote network configuration using HelperConfig
         HelperConfig.NetworkConfig memory remoteNetworkConfig =
-            HelperUtils.getNetworkConfig(helperConfig, remoteChainId);
+            helperConfig.getNetworkConfig(remoteChainId);
 
         // Ensure that configurations exist
         require(remoteNetworkConfig.chainSelector != 0, "Remote network configuration not found");

ccip/cct/foundry/script/HelperConfig.s.sol

@@ -26,10 +26,18 @@ contract HelperConfig is Script {
             activeNetworkConfig = getAvalancheFujiConfig();
         } else if (block.chainid == 84532) {
             activeNetworkConfig = getBaseSepoliaConfig();
+        } else if (block.chainid == 11155420) {
+            activeNetworkConfig = getOptimismSepoliaConfig();
+        } else {
+            revert("Unsupported network");
         }
     }
 
-    function getEthereumSepoliaConfig() public pure returns (NetworkConfig memory) {
+    function getEthereumSepoliaConfig()
+        public
+        pure
+        returns (NetworkConfig memory)
+    {
         NetworkConfig memory ethereumSepoliaConfig = NetworkConfig({
             chainSelector: 16015286601757825753,
             router: 0x0BF3dE8c5D3e8A2B34D2BEeB17ABfCeBaf363A59,
@@ -57,7 +65,11 @@ contract HelperConfig is Script {
         return arbitrumSepoliaConfig;
     }
 
-    function getAvalancheFujiConfig() public pure returns (NetworkConfig memory) {
+    function getAvalancheFujiConfig()
+        public
+        pure
+        returns (NetworkConfig memory)
+    {
         NetworkConfig memory avalancheFujiConfig = NetworkConfig({
             chainSelector: 14767482510784806043,
             router: 0xF694E193200268f9a4868e4Aa017A0118C9a8177,
@@ -84,4 +96,42 @@ contract HelperConfig is Script {
         });
         return baseSepoliaConfig;
     }
+
+    function getOptimismSepoliaConfig()
+        public
+        pure
+        returns (NetworkConfig memory)
+    {
+        NetworkConfig memory optimismSepoliaConfig = NetworkConfig({
+            chainSelector: 5224473277236331295,
+            router: 0x114A20A10b43D4115e5aeef7345a1A71d2a60C57,
+            rmnProxy: 0xb40A3109075965cc09E93719e33E748abf680dAe,
+            tokenAdminRegistry: 0x1d702b1FA12F347f0921C722f9D9166F00DEB67A,
+            registryModuleOwnerCustom: 0x49c4ba01dc6F5090f9df43Ab8F79449Db91A0CBB,
+            link: 0xE4aB69C077896252FAFBD49EFD26B5D171A32410,
+            confirmations: 2,
+            nativeCurrencySymbol: "ETH"
+        });
+        return optimismSepoliaConfig;
+    }
+
+    function getNetworkConfig(uint256 chainId)
+        public
+        pure
+        returns (NetworkConfig memory)
+    {
+        if (chainId == 43113) {
+            return getAvalancheFujiConfig();
+        } else if (chainId == 11155111) {
+            return getEthereumSepoliaConfig();
+        } else if (chainId == 421614) {
+            return getArbitrumSepolia();
+        } else if (chainId == 84532) {
+            return getBaseSepoliaConfig();
+        } else if (chainId == 11155420) {
+            return getOptimismSepoliaConfig();
+        } else {
+            revert("Unsupported chain ID");
+        }
+    }
 }