Berachain Deployment

deploy/002-access-control.ts

@@ -3,7 +3,6 @@ import { DeployFunction } from "hardhat-deploy/types";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 
 import { SUPPORTED_NETWORKS } from "../helpers/deploy/constants";
-import { getAcmAdminAccount } from "../helpers/deploy/deploymentUtils";
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const { deployments, getNamedAccounts } = hre;
@@ -15,14 +14,15 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     args: [],
     log: true,
     autoMine: true,
+    skipIfAlreadyDeployed: true,
   });
 
   const acm = await ethers.getContractAt("AccessControlManager", acmDeployment.address);
   if (hre.network.live) {
     const networkName = hre.network.name as SUPPORTED_NETWORKS;
-    const adminAccount = await getAcmAdminAccount(networkName);
-    console.log(`Granting DEFAULT_ADMIN_ROLE to ${adminAccount} for ${networkName} network`);
-    await acm.grantRole(acm.DEFAULT_ADMIN_ROLE(), adminAccount);
+    const normalTimelock = await ethers.getContract("NormalTimelock");
+    console.log(`Granting DEFAULT_ADMIN_ROLE to ${normalTimelock.address} for ${networkName} network`);
+    await acm.grantRole(acm.DEFAULT_ADMIN_ROLE(), normalTimelock.address);
 
     console.log(`Renouncing DEFAULT_ADMIN_ROLE from deployer (${deployer}) for ${hre.network.name} network`);
     await acm.renounceRole(acm.DEFAULT_ADMIN_ROLE(), deployer);

deploy/005-remote-timelock.ts

@@ -15,6 +15,7 @@ export enum REMOTE_NETWORKS {
   OPMAINNET = "opmainnet",
   BASESEPOLIA = "basesepolia",
   BASEMAINNET = "basemainnet",
+  BERACHAINBARTIO = "berachainbartio",
   HARDHAT = "hardhat",
 }
 type DelayTypes = {
@@ -92,6 +93,11 @@ export const delayConfig: DelayConfig = {
     fast: 21600,
     critical: 3600,
   },
+  berachainbartio: {
+    normal: 600,
+    fast: 300,
+    critical: 100,
+  },
 };
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {

deploy/006-omnichain-executorOwner-remote.ts

@@ -19,7 +19,7 @@
   contract: string;
   signature: string;
   argTypes: string[];
   parameters: any[];
   value: BigNumberish;
 }
 
@@ -102,13 +102,15 @@
     "hardhat-deploy/solc_0.8/openzeppelin/proxy/transparent/ProxyAdmin.sol:ProxyAdmin",
   );
 
+  const normalTimelock = await ethers.getContract("NormalTimelock");
+
   const omnichainGovernanceExecutorAddress = (await ethers.getContract("OmnichainGovernanceExecutor")).address;
   const OmnichainExecutorOwner = await deploy("OmnichainExecutorOwner", {
     from: deployer,
     args: [omnichainGovernanceExecutorAddress],
     contract: "OmnichainExecutorOwner",
     proxy: {
-      owner: hre.network.live ? Guardian : deployer, // Guardian will be replaced by normalTimelock once ownership of DefaultProxyAdmin is transferred to normalTimelock.
+      owner: hre.network.live ? normalTimelock.address : deployer,
       proxyContract: "OptimizedTransparentUpgradeableProxy",
       execute: {
         methodName: "initialize",
@@ -122,6 +124,7 @@
     },
     log: true,
     autoMine: true,
+    skipIfAlreadyDeployed: true,
   });
   const omnichainExecutorOwner = await ethers.getContractAt(
     "OmnichainExecutorOwner",

deployments/berachainbartio/.chainId

@@ -0,0 +1 @@
+80084