fixes-and-improvements

Author: SyedAsadKazmi

ccip/cct/hardhat/config/networks.ts

@@ -26,7 +26,7 @@ const networks: Networks = {
     nonce: undefined,
     accounts,
   },
-  [EVMChains.sepolia]: {
+  [EVMChains.ethereumSepolia]: {
     type: "http",
     ...configData.ethereumSepolia,
     url: process.env.ETHEREUM_SEPOLIA_RPC_URL || "https://UNSET-PLEASE-SET-ETHEREUM_SEPOLIA_RPC_URL",

ccip/cct/hardhat/config/types.ts

@@ -40,7 +40,7 @@ export interface EVMChainConfig {
 export enum Chains {
   avalancheFuji = "avalancheFuji",
   arbitrumSepolia = "arbitrumSepolia",
-  sepolia = "sepolia",
+  ethereumSepolia = "ethereumSepolia",
   baseSepolia = "baseSepolia",
   solanaDevnet = "solanaDevnet",
   polygonAmoy = "polygonAmoy",
@@ -50,7 +50,7 @@ export enum Chains {
 export enum EVMChains {
   avalancheFuji = "avalancheFuji",
   arbitrumSepolia = "arbitrumSepolia",
-  sepolia = "sepolia",
+  ethereumSepolia = "ethereumSepolia",
   baseSepolia = "baseSepolia",
   polygonAmoy = "polygonAmoy",
 }
@@ -93,6 +93,7 @@ export interface EtherscanConfig {
 
 export enum TokenContractName {
   BurnMintERC20 = "BurnMintERC20",
+  ERC20 = "ERC20",
 }
 
 export enum TokenPoolContractName {
@@ -107,6 +108,8 @@ export enum CCIPContractName {
   Router = "IRouterClient",
   OnRamp = "OnRamp",
   OwnerIsCreator = "OwnerIsCreator",
+  RateLimiter = "RateLimiter",
+  Client = "Client",
 }
 
 export enum PoolType {

ccip/cct/hardhat/tasks/applyChainUpdates.ts

@@ -182,11 +182,8 @@ export const applyChainUpdates = task(
         .split(",")
         .map((addr) => addr.trim());
 
-        console.log(remotePoolAddresses)
-
       try {
         for (const addr of remotePoolAddresses) {
-          console.log(addr, remoteChainFamily);
           validateChainAddressOrThrow(addr, remoteChainFamily);
         }
 
@@ -260,7 +257,7 @@ export const applyChainUpdates = task(
           [[], [chainUpdate]],
           { account: wallet.account.address }
         );
-        logger.info(`� TX sent: ${txHash}`);
+        logger.info(`📤 TX sent: ${txHash}`);
 
         const { confirmations } = networkConfig;
         if (confirmations === undefined)

ccip/cct/hardhat/tasks/checkTokenBalance.ts

@@ -0,0 +1,79 @@
+import { task } from "hardhat/config";
+import { HardhatRuntimeEnvironment } from "hardhat/types/hre";
+import { isAddress, formatUnits } from "viem";
+import {
+  Chains,
+  TokenContractName,
+  logger,
+  getEVMNetworkConfig,
+} from "../config";
+
+/**
+ * Checks the token balance of the wallet.
+ *
+ * Example:
+ * npx hardhat checkTokenBalance \
+ *   --tokenaddress 0xYourTokenAddress \
+ *   --network sepolia
+ */
+export const checkTokenBalance = task(
+  "checkTokenBalance",
+  "Checks the token balance of the wallet"
+)
+  .addOption({
+    name: "tokenaddress",
+    description: "The token address",
+    defaultValue: "",
+  })
+  .setAction(async () => ({
+    default: async (
+      {
+        tokenaddress,
+      }: {
+        tokenaddress: string;
+      },
+      hre: HardhatRuntimeEnvironment
+    ) => {
+      // Validate token address is provided
+      if (!tokenaddress) {
+        throw new Error("Token address is required (--tokenaddress)");
+      }
+
+      // Connect to network first
+      const networkConnection = await hre.network.connect();
+      const { viem } = networkConnection;
+      const networkName = networkConnection.networkName as Chains;
+
+      const networkConfig = getEVMNetworkConfig(networkName);
+      if (!networkConfig)
+        throw new Error(`Network ${networkName} not found in config`);
+
+      // Validate token address format
+      if (!isAddress(tokenaddress))
+        throw new Error(`Invalid token address: ${tokenaddress}`);
+
+      const [wallet] = await viem.getWalletClients();
+
+      try {
+        // Connect to token contract
+        const token = await viem.getContractAt(
+          TokenContractName.BurnMintERC20,
+          tokenaddress as `0x${string}`
+        );
+
+        const symbol = await token.read.symbol();
+        const decimals = await token.read.decimals();
+        const balance = await token.read.balanceOf([wallet.account.address]);
+
+        logger.info(`🔍 Token Balance Check`);
+        logger.info(`   Token Address: ${tokenaddress}`);
+        logger.info(`   Token Symbol: ${symbol}`);
+        logger.info(`   Wallet Address: ${wallet.account.address}`);
+        logger.info(`   Balance: ${balance.toString()} (${formatUnits(balance, Number(decimals))} ${symbol})`);
+      } catch (error) {
+        logger.error("❌ Failed to check token balance:", error);
+        throw error;
+      }
+    },
+  }))
+  .build();

ccip/cct/hardhat/tasks/index.ts

@@ -1,6 +1,7 @@
 import { deployToken } from "./deployToken";
 import { deployTokenPool } from "./deployTokenPool";
 import { mintTokens } from "./mintTokens";
+import { checkTokenBalance } from "./checkTokenBalance";
 import {claimAdmin} from "./claimAdmin";
 import {acceptAdminRole} from "./acceptAdminRole";
 import { transferTokenAdminRole } from "./transferTokenAdminRole";
@@ -20,6 +21,7 @@ export const tasks = [
     deployToken, 
     deployTokenPool, 
     mintTokens, 
+    checkTokenBalance,
     claimAdmin, 
     acceptAdminRole,
     transferTokenAdminRole,
@@ -44,7 +46,10 @@ export const npmFilesToBuild = [
       "@chainlink/contracts-ccip/contracts/tokenAdminRegistry/RegistryModuleOwnerCustom.sol",
       "@chainlink/contracts-ccip/contracts/tokenAdminRegistry/TokenAdminRegistry.sol",
       "@chainlink/contracts-ccip/contracts/interfaces/IRouterClient.sol",
-      "@chainlink/contracts/src/v0.8/shared/access/OwnerIsCreator.sol"
+      "@chainlink/contracts/src/v0.8/shared/access/OwnerIsCreator.sol",
+      "@chainlink/contracts-ccip/contracts/libraries/RateLimiter.sol",
+      "@chainlink/contracts-ccip/contracts/libraries/Client.sol",
+      "@openzeppelin/contracts/token/ERC20/ERC20.sol",
 ];
 
 console.log("✅ Tasks loaded from /tasks/index.ts");

ccip/cct/hardhat/tasks/safe-multisig/deploySafe.ts

@@ -102,7 +102,7 @@ export const deploySafe = task("deploySafe", "Deploys a new Safe multisig contra
         logger.info(`   Salt nonce: ${saltNonce}`);
         logger.info(`   Deploying Safe contract...`);
 
-        // ✅ Deploy the Safe using Safe.init() with predictedSafe configuration
+        // ✅ Initialize Safe with predictedSafe configuration
         const protocolKit = await SafeDefault.init({
           provider: rpcUrl,
           signer: privateKey,
@@ -117,11 +117,39 @@ export const deploySafe = task("deploySafe", "Deploys a new Safe multisig contra
           },
         });
 
-        const safeAddress = await protocolKit.getAddress();
+        const predictedAddress = await protocolKit.getAddress();
+        logger.info(`   Predicted Safe address: ${predictedAddress}`);
 
-        logger.info(`✅ Safe deployed successfully`);
-        logger.info(`   Safe address: ${safeAddress}`);
-        logger.info(`   Network: ${networkName}`);
+        // Check if Safe is already deployed
+        const isSafeDeployed = await protocolKit.isSafeDeployed();
+        
+        if (isSafeDeployed) {
+          logger.info(`ℹ️  Safe already deployed at ${predictedAddress}`);
+          logger.info(`   Network: ${networkName}`);
+        } else {
+          logger.info(`   Deploying Safe contract on-chain...`);
+          
+          // Actually deploy the Safe using viem wallet client
+          const deploymentTransaction = await protocolKit.createSafeDeploymentTransaction();
+          const [wallet] = await viem.getWalletClients();
+          const publicClient = await viem.getPublicClient();
+          
+          const txHash = await wallet.sendTransaction({
+            to: deploymentTransaction.to as `0x${string}`,
+            value: BigInt(deploymentTransaction.value),
+            data: deploymentTransaction.data as `0x${string}`,
+          });
+          
+          logger.info(`   Deployment transaction: ${txHash}`);
+          logger.info(`   Waiting for confirmation...`);
+          
+          // Wait for transaction confirmation
+          await publicClient.waitForTransactionReceipt({ hash: txHash });
+          
+          logger.info(`✅ Safe deployed successfully`);
+          logger.info(`   Safe address: ${predictedAddress}`);
+          logger.info(`   Network: ${networkName}`);
+        }
 
       } catch (error) {
         logger.error("❌ Safe deployment failed:", error);