Merge pull request #136 from VenusProtocol/feat/berachain-deployment

VenusProtocol · Mar 4, 2025 · 96ee957 · 96ee957
2 parents 0937286 + 18b9bca
commit 96ee957
Show file tree

Hide file tree

Showing 21 changed files with 5,717 additions and 79 deletions.
diff --git a/.env.example b/.env.example
@@ -24,6 +24,7 @@ DEPLOYER_PRIVATE_KEY=
 #ARCHIVE_NODE_basemainnet=https://open-platform.nodereal.io/<YOUR_KEY_HERE>/base
 #ARCHIVE_NODE_unichainsepolia=https://unichain-sepolia.g.alchemy.com/v2/<YOUR_KEY_HERE>
 #ARCHIVE_NODE_unichainmainnet=https://unichain-mainnet.g.alchemy.com/v2/<YOUR_KEY_HERE>
+#ARCHIVE_NODE_berachainbartio=https://berachain-bartio.g.alchemy.com/v2/<YOUR_KEY_HERE>
 
 ETHERSCAN_API_KEY=
 REPORT_GAS=
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -137,7 +137,7 @@ jobs:
 
       - name: Export deployments
         run: |
-          for NETWORK in bsctestnet bscmainnet ethereum sepolia opbnbmainnet opbnbtestnet arbitrumsepolia arbitrumone opsepolia opmainnet basesepolia basemainnet unichainsepolia unichainmainnet; do
+          for NETWORK in bsctestnet bscmainnet ethereum sepolia opbnbmainnet opbnbtestnet arbitrumsepolia arbitrumone opsepolia opmainnet basesepolia basemainnet unichainsepolia unichainmainnet berachainbartio; do
             EXPORT=true yarn hardhat export --network ${NETWORK} --export ./deployments/${NETWORK}.json
             jq -M '{name, chainId, addresses: .contracts | map_values(.address)}' ./deployments/${NETWORK}.json > ./deployments/${NETWORK}_addresses.json
           done

diff --git a/deploy/000-psr.ts b/deploy/000-psr.ts
@@ -2,11 +2,11 @@ import { ethers } from "hardhat";
 import { DeployFunction } from "hardhat-deploy/types";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 
-import { ADDRESS_ONE, multisigs } from "../helpers/utils";
+import { ADDRESS_ONE } from "../helpers/utils";
 
 const func: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
   const {
-    network: { live, name },
+    network: { live },
     getNamedAccounts,
     deployments,
   } = hre;
@@ -24,8 +24,8 @@ const func: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
   }
 
   const WBNBAddress = (await ethers.getContractOrNull("WBNB"))?.address || ADDRESS_ONE;
-  const timelockAddress = (await ethers.getContract("NormalTimelock"))?.address || multisigs[name];
-  const acmAddress = (await ethers.getContract("AccessControlManager"))?.address;
+  const timelockAddress = (await ethers.getContract("NormalTimelock")).address;
+  const acmAddress = (await ethers.getContract("AccessControlManager")).address;
   const loopsLimit = 20;
 
   const defaultProxyAdmin = await hre.artifacts.readArtifact(

diff --git a/deploy/001-risk-fund-v2.ts b/deploy/001-risk-fund-v2.ts
@@ -2,10 +2,8 @@ import { ethers } from "hardhat";
 import { DeployFunction } from "hardhat-deploy/types";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 
-import { multisigs } from "../helpers/utils";
-
 const func: DeployFunction = async ({
-  network: { name, live },
+  network: { live },
   getNamedAccounts,
   deployments,
 }: HardhatRuntimeEnvironment) => {
@@ -33,7 +31,7 @@ const func: DeployFunction = async ({
   });
 
   if (live) {
-    const targetOwner = (await ethers.getContractOrNull("NormalTimelock"))?.address || multisigs[name];
+    const targetOwner = (await ethers.getContract("NormalTimelock")).address;
 
     const contract = await ethers.getContract("RiskFundV2");
     if ((await contract.owner()) !== targetOwner && (await contract.pendingOwner()) !== targetOwner) {

diff --git a/deploy/002-risk-fund-converter.ts b/deploy/002-risk-fund-converter.ts
@@ -3,7 +3,7 @@ import { ethers } from "hardhat";
 import { DeployFunction } from "hardhat-deploy/types";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 
-import { ADDRESS_ONE, multisigs } from "../helpers/utils";
+import { ADDRESS_ONE } from "../helpers/utils";
 
 const MIN_AMOUNT_TO_CONVERT = parseUnits("10", 18);
 
@@ -12,7 +12,7 @@ const getTokenOrMockName = (name: string, live: boolean) => {
 };
 
 const func: DeployFunction = async ({
-  network: { live, name },
+  network: { live },
   getNamedAccounts,
   deployments,
 }: HardhatRuntimeEnvironment) => {
@@ -31,7 +31,7 @@ const func: DeployFunction = async ({
   const riskFundAddress = (await ethers.getContract("RiskFundV2"))?.address;
   const poolRegistryAddress = (await ethers.getContract("PoolRegistry"))?.address;
   let comptrollers;
-  const timelockAddress = (await ethers.getContract("NormalTimelock"))?.address || multisigs[name];
+  const timelockAddress = (await ethers.getContract("NormalTimelock")).address;
   if (live) {
     const poolDeFiAddress = (await ethers.getContract("Comptroller_DeFi"))?.address;
     const poolGameFiAddress = (await ethers.getContract("Comptroller_GameFi"))?.address;

diff --git a/deploy/003-xvs-vault-treasury.ts b/deploy/003-xvs-vault-treasury.ts
@@ -1,14 +1,12 @@
 import { ethers } from "hardhat";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 
-import { multisigs } from "../helpers/utils";
-
-const func = async ({ network: { live, name }, getNamedAccounts, deployments }: HardhatRuntimeEnvironment) => {
+const func = async ({ network: { live }, getNamedAccounts, deployments }: HardhatRuntimeEnvironment) => {
   const { deploy } = deployments;
   const { deployer } = await getNamedAccounts();
 
   const xvsAddress = (await ethers.getContract("XVS"))?.address;
-  const proxyOwnerAddress = (await ethers.getContractOrNull("NormalTimelock"))?.address || multisigs[name];
+  const proxyOwnerAddress = (await ethers.getContract("NormalTimelock")).address;
   const acmAddress = (await ethers.getContract("AccessControlManager"))?.address;
   const xvsVaultAddress = (await ethers.getContract("XVSVaultProxy"))?.address;
 

diff --git a/deploy/004-single-token-converter.ts b/deploy/004-single-token-converter.ts
@@ -4,8 +4,6 @@ import { DeployResult } from "hardhat-deploy/dist/types";
 import { DeployFunction } from "hardhat-deploy/types";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 
-import { multisigs } from "../helpers/utils";
-
 type NETWORK = "hardhat" | "bsctestnet" | "bscmainnet" | "sepolia" | "ethereum";
 
 interface BaseAssets {
@@ -81,7 +79,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
 
   const acmAddress = (await ethers.getContract("AccessControlManager"))?.address;
   const oracleAddress = (await ethers.getContract("ResilientOracle"))?.address;
-  const proxyOwnerAddress = (await ethers.getContract("NormalTimelock"))?.address || multisigs[networkName];
+  const proxyOwnerAddress = (await ethers.getContract("NormalTimelock")).address;
 
   const singleTokenConverterImp: DeployResult = await deploy("SingleTokenConverterImp", {
     contract: "SingleTokenConverter",

diff --git a/deploy/005-converter-network.ts b/deploy/005-converter-network.ts
@@ -1,15 +1,13 @@
 import { ethers } from "hardhat";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 
-import { multisigs } from "../helpers/utils";
-
 const MAX_LOOPS_LIMIT = 20;
 
-const func = async ({ network: { live, name }, getNamedAccounts, deployments }: HardhatRuntimeEnvironment) => {
+const func = async ({ network: { live }, getNamedAccounts, deployments }: HardhatRuntimeEnvironment) => {
   const { deploy } = deployments;
   const { deployer } = await getNamedAccounts();
 
-  const timelockAddress = (await ethers.getContractOrNull("NormalTimelock"))?.address || multisigs[name];
+  const timelockAddress = (await ethers.getContract("NormalTimelock")).address;
   const acmAddress = (await ethers.getContract("AccessControlManager"))?.address;
 
   await deploy("ConverterNetwork", {