fix: merge

concero · Sep 20, 2024 · 1fce499 · 1fce499
1 parent f15c172
commit 1fce499
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 13 deletions.
diff --git a/packages/hardhat/tasks/concero/deployInfra/deployInfra.ts b/packages/hardhat/tasks/concero/deployInfra/deployInfra.ts
@@ -3,24 +3,15 @@ import CNetworks, { conceroChains, networkTypes, ProxyEnum } from "../../../cons
 import { setConceroProxyDstContracts, setContractVariables } from "./setContractVariables";
 import { CNetwork } from "../../../types/CNetwork";
 import uploadDonSecrets from "../../CLF/donSecrets/upload";
-import deployConcero from "../../../deploy/04_ConceroBridge";
-import deployConceroDexSwap from "../../../deploy/03_ConceroDexSwap";
-import deployConceroOrchestrator from "../../../deploy/05_ConceroOrchestrator";
 import deployConcero from "../../../deploy/ConceroBridge";
-import { conceroChains } from "../liveChains";
 import deployConceroDexSwap from "../../../deploy/ConceroDexSwap";
 import deployConceroOrchestrator from "../../../deploy/ConceroOrchestrator";
 import addCLFConsumer from "../../CLF/subscriptions/add";
 import { compileContracts, getEnvAddress } from "../../../utils";
-import deployProxyAdmin from "../../../deploy/10_ConceroProxyAdmin";
-import deployTransparentProxy from "../../../deploy/11_TransparentProxy";
-import { getEnvAddress } from "../../../utils/getEnvVar";
 import deployProxyAdmin from "../../../deploy/ConceroProxyAdmin";
 import deployTransparentProxy from "../../../deploy/TransparentProxy";
 import { upgradeProxyImplementation } from "../upgradeProxyImplementation";
 import { DeployInfraParams } from "./types";
-import { deployerTargetBalances } from "../../../constants/targetBalances";
-import { ProxyType } from "../../../constants/deploymentVariables";
 import { CLF_SECRETS_MAINNET_EXPIRATION, CLF_SECRETS_TESTNET_EXPIRATION } from "../../../constants/CLFSecretsConfig";
 
 task("deploy-infra", "Deploy the CCIP infrastructure")

diff --git a/packages/hardhat/tasks/concero/deployPool/deployParentPool.ts b/packages/hardhat/tasks/concero/deployPool/deployParentPool.ts
@@ -7,13 +7,10 @@ import uploadDonSecrets from "../../CLF/donSecrets/upload";
 import { CNetwork } from "../../../types/CNetwork";
 import { setParentPoolVariables } from "./setParentPoolVariables";
 import deployTransparentProxy from "../../../deploy/TransparentProxy";
-import { compileContracts } from "../../../utils/compileContracts";
-import deployTransparentProxy from "../../../deploy/11_TransparentProxy";
 import { upgradeProxyImplementation } from "../upgradeProxyImplementation";
 import deployParentPool from "../../../deploy/ParentPool";
 import deployProxyAdmin from "../../../deploy/ConceroProxyAdmin";
 import { zeroAddress } from "viem";
-import { ProxyType } from "../../../constants/deploymentVariables";
 import deployParentPoolCLFCLA from "../../../deploy/ParenPoolCLFCLA";
 import { CLF_SECRETS_MAINNET_EXPIRATION, CLF_SECRETS_TESTNET_EXPIRATION } from "../../../constants/CLFSecretsConfig";
 
@@ -31,7 +28,6 @@ task("deploy-parent-pool", "Deploy the pool")
     const slotId = parseInt(taskArgs.slotid);
     const { name } = hre.network;
     const deployableChains: CNetwork[] = [cNetworks[hre.network.name]];
-    const deployableChains: CNetwork[] = [CNetworks[hre.network.name]];
     const isTestnet = deployableChains[0].type === "testnet";
 
     if (taskArgs.deployproxy) {