@venusprotocol/isolated-pools 3.7.0 → 3.8.0-dev.1

package/README.md

@@ -127,6 +127,16 @@ npx hardhat deploy
   - In the deployment scripts you have added `tags` for example: - `func.tags = ["MockTokens"];`
   - Once this is done, adding `--tags "<tag_name>,<tag_name>..."` to the deployment command will execute only the scripts containing the tags.
 
+### Dry Run / Forked Deployments
+
+To simulate what contracts would be deployed on a given network the deployment scripts support running on a forked network. To run the deployment scripts on a forked network the `HARDHAT_FORK_NETWORK` env variable needs to be set.
+
+For example
+
+```bash
+HARDHAT_FORK_NETWORK=ethereum npx hardhat deploy
+```
+
 ### Deployed Contracts
 
 Deployed contract abis and addresses are exported in the `deployments` directory. To create a summary export of all contracts deployed to a network run

package/dist/deploy/001-deploy-mock-tokens.js

@@ -5,7 +5,7 @@ const func = async function (hre) {
     const { deployments, getNamedAccounts } = hre;
     const { deploy } = deployments;
     const { deployer } = await getNamedAccounts();
-    const { tokensConfig } = await (0, deploymentConfig_1.getConfig)(hre.network.name);
+    const { tokensConfig } = await (0, deploymentConfig_1.getConfig)(hre.getNetworkName());
     for (const token of tokensConfig) {
         if (token.isMock) {
             const contractName = `Mock${token.symbol}`;
@@ -21,4 +21,5 @@ const func = async function (hre) {
     }
 };
 func.tags = ["MockTokens"];
+func.skip = async (hre) => hre.network.live;
 exports.default = func;

package/dist/deploy/004-swap-router.js

@@ -15,7 +15,7 @@ const func = async function (hre) {
     const wBNBAddress = (await deployments.get("WBNB")).address;
     const vbnbAddress = (await deployments.get("vBNB")).address;
     // Pancake Factory doesn't exist on hardhat so we are using the testnet address
-    const pancakeFactoryAddress = hre.network.name === "bscmainnet"
+    const pancakeFactoryAddress = hre.getNetworkName() === "bscmainnet"
         ? bscmainnet_json_1.default.contracts.pancakeFactory.address
         : bsctestnet_json_1.default.contracts.pancakeFactory.address;
     await deploy("SwapRouter_DeFi", {
@@ -44,7 +44,7 @@ const func = async function (hre) {
         autoMine: true,
         skipIfAlreadyDeployed: true,
     });
-    if (hre.network.name !== "bsctestnet") {
+    if (hre.getNetworkName() !== "bsctestnet") {
         const comptrollerStablecoinsAddresses = (await deployments.get("Comptroller_Stablecoins")).address;
         await deploy("SwapRouter_Stablecoins", {
             contract: "SwapRouter",
@@ -86,9 +86,9 @@ const func = async function (hre) {
 func.tags = ["SwapRouter", "il"];
 // deploySwapRouter.skip = async (hre: HardhatRuntimeEnvironment) => hre.network.live;
 // Pancake Factory is not deployed on the local network
-func.skip = async (hre) => hre.network.name === "sepolia" ||
-    hre.network.name === "hardhat" ||
-    hre.network.name === "opbnbtestnet" ||
-    hre.network.name === "opbnbmainnet" ||
-    hre.network.name === "ethereum";
+func.skip = async (hre) => hre.getNetworkName() === "sepolia" ||
+    hre.getNetworkName() === "hardhat" ||
+    hre.getNetworkName() === "opbnbtestnet" ||
+    hre.getNetworkName() === "opbnbmainnet" ||
+    hre.getNetworkName() === "ethereum";
 exports.default = func;

package/dist/deploy/006-deploy-pool-registry.js

@@ -6,9 +6,9 @@ const func = async function (hre) {
     const { deployments, getNamedAccounts } = hre;
     const { deploy } = deployments;
     const { deployer } = await getNamedAccounts();
-    const { preconfiguredAddresses } = await (0, deploymentConfig_1.getConfig)(hre.network.name);
-    const accessControlManagerAddress = await (0, deploymentUtils_1.toAddress)(preconfiguredAddresses.AccessControlManager || "AccessControlManager", hre);
-    const proxyOwnerAddress = await (0, deploymentUtils_1.toAddress)(preconfiguredAddresses.NormalTimelock || "account:deployer", hre);
+    const { preconfiguredAddresses } = await (0, deploymentConfig_1.getConfig)(hre.getNetworkName());
+    const accessControlManagerAddress = await (0, deploymentUtils_1.toAddress)(preconfiguredAddresses.AccessControlManager || "AccessControlManager");
+    const proxyOwnerAddress = await (0, deploymentUtils_1.toAddress)(preconfiguredAddresses.NormalTimelock || "account:deployer");
     // The reason for this is that the contracts `OptimizedTransparentUpgradeableProxy` and `DefaultProxyAdmin` that the hardhat-deploy
     // plugin fetches from the artifact is not zk compatible causing the deployments to fail. So we bought it one level up to our repo,
     // added them to compile using zksync compiler. It is compatible for all networks.

package/dist/deploy/007-deploy-pool-lens.js

@@ -5,7 +5,7 @@ const func = async function (hre) {
     const { deployments, getNamedAccounts } = hre;
     const { deploy } = deployments;
     const { deployer } = await getNamedAccounts();
-    const { isTimeBased, blocksPerYear } = (0, deploymentUtils_1.getBlockOrTimestampBasedDeploymentInfo)(hre.network.name);
+    const { isTimeBased, blocksPerYear } = (0, deploymentUtils_1.getBlockOrTimestampBasedDeploymentInfo)(hre.getNetworkName());
     await deploy("PoolLens", {
         from: deployer,
         args: [isTimeBased, blocksPerYear],

package/dist/deploy/008-deploy-comptrollers.js

@@ -7,10 +7,10 @@ const func = async function (hre) {
     const { deployments, getNamedAccounts } = hre;
     const { deploy } = deployments;
     const { deployer } = await getNamedAccounts();
-    const deploymentConfig = await (0, deploymentConfig_1.getConfig)(hre.network.name);
+    const deploymentConfig = await (0, deploymentConfig_1.getConfig)(hre.getNetworkName());
     const { poolConfig, preconfiguredAddresses } = deploymentConfig;
     const poolRegistry = await hardhat_1.ethers.getContract("PoolRegistry");
-    const accessControlManagerAddress = await (0, deploymentUtils_1.toAddress)(preconfiguredAddresses.AccessControlManager || "AccessControlManager", hre);
+    const accessControlManagerAddress = await (0, deploymentUtils_1.toAddress)(preconfiguredAddresses.AccessControlManager || "AccessControlManager");
     const maxLoopsLimit = 100;
     const comptrollerImpl = await deploy("ComptrollerImpl", {
         contract: "Comptroller",
@@ -28,11 +28,10 @@ const func = async function (hre) {
         autoMine: true,
         skipIfAlreadyDeployed: true,
     });
-    const unregisteredPools = await (0, deploymentUtils_1.getUnregisteredPools)(poolConfig, hre);
+    const unregisteredPools = await (0, deploymentUtils_1.getUnregisteredPools)(poolConfig);
     for (const pool of unregisteredPools) {
-        // Deploying a proxy for Comptroller
-        console.log(`Deploying a proxy for Comptroller of the pool ${pool.name}`);
         const Comptroller = await hardhat_1.ethers.getContractFactory("Comptroller");
+        // Deploying a proxy for Comptroller
         await deploy(`Comptroller_${pool.id}`, {
             from: deployer,
             contract: "BeaconProxy",

package/dist/deploy/009-deploy-vtokens.js

@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const _001_psr_1 = __importDefault(require("@venusprotocol/protocol-reserve/dist/deploy/001-psr"));
+const _001_source_timelocks_1 = __importDefault(require("@venusprotocol/governance-contracts/dist/deploy/001-source-timelocks"));
+const _000_psr_1 = __importDefault(require("@venusprotocol/protocol-reserve/dist/deploy/000-psr"));
 const ethers_1 = require("ethers");
 const utils_1 = require("ethers/lib/utils");
 const hardhat_1 = require("hardhat");
@@ -18,10 +19,11 @@ const func = async function (hre) {
     const { deployments, getNamedAccounts } = hre;
     const { deploy } = deployments;
     const { deployer } = await getNamedAccounts();
-    const { tokensConfig, poolConfig, preconfiguredAddresses } = await (0, deploymentConfig_1.getConfig)(hre.network.name);
+    const { tokensConfig, poolConfig, preconfiguredAddresses } = await (0, deploymentConfig_1.getConfig)(hre.getNetworkName());
     const { isTimeBased, blocksPerYear } = (0, deploymentUtils_1.getBlockOrTimestampBasedDeploymentInfo)(hre.network.name);
     const maxBorrowRateMantissa = (0, deploymentConfig_1.getMaxBorrowRateMantissa)(hre.network.name);
-    const accessControlManagerAddress = await (0, deploymentUtils_1.toAddress)(preconfiguredAddresses.AccessControlManager || "AccessControlManager", hre);
+    await (0, _001_source_timelocks_1.default)(hre);
+    const accessControlManagerAddress = await (0, deploymentUtils_1.toAddress)(preconfiguredAddresses.AccessControlManager || "AccessControlManager");
     // VToken Beacon
     const vTokenImpl = await deploy("VTokenImpl", {
         contract: "VToken",
@@ -39,7 +41,7 @@ const func = async function (hre) {
         autoMine: true,
         skipIfAlreadyDeployed: true,
     });
-    const poolsWithUnregisteredVTokens = await (0, deploymentUtils_1.getUnregisteredVTokens)(poolConfig, hre);
+    const poolsWithUnregisteredVTokens = await (0, deploymentUtils_1.getUnregisteredVTokens)(poolConfig);
     for (const pool of poolsWithUnregisteredVTokens) {
         const comptrollerProxy = await hardhat_1.ethers.getContract(`Comptroller_${pool.id}`);
         // Deploy Markets
@@ -57,7 +59,6 @@ const func = async function (hre) {
             if (rateModel === deploymentConfig_2.InterestRateModels.JumpRate.toString()) {
                 const [b, m, j, k] = [baseRatePerYear, multiplierPerYear, jumpMultiplierPerYear, kink_].map(mantissaToBps);
                 const rateModelName = `JumpRateModelV2_base${b}bps_slope${m}bps_jump${j}bps_kink${k}bps`;
-                console.log(`Deploying interest rate model ${rateModelName}`);
                 const result = await deploy(rateModelName, {
                     from: deployer,
                     contract: "JumpRateModelV2",
@@ -79,7 +80,6 @@ const func = async function (hre) {
             else {
                 const [b, m] = [baseRatePerYear, multiplierPerYear].map(mantissaToBps);
                 const rateModelName = `WhitePaperInterestRateModel_base${b}bps_slope${m}bps`;
-                console.log(`Deploying interest rate model ${rateModelName}`);
                 const result = await deploy(rateModelName, {
                     from: deployer,
                     contract: "WhitePaperInterestRateModel",
@@ -90,7 +90,6 @@ const func = async function (hre) {
                 });
                 rateModelAddress = result.address;
             }
-            console.log(`Deploying VToken proxy for ${symbol}`);
             const VToken = await hardhat_1.ethers.getContractFactory("VToken");
             const underlyingDecimals = Number(await tokenContract.decimals());
             const vTokenDecimals = 8;
@@ -101,7 +100,7 @@ const func = async function (hre) {
             catch (e) {
                 if (!hre.network.live) {
                     console.warn("ProtocolShareReserve contract not found. Deploying address");
-                    await (0, _001_psr_1.default)(hre);
+                    await (0, _000_psr_1.default)(hre);
                     protocolShareReserveAddress = (await hardhat_1.ethers.getContract("ProtocolShareReserve")).address;
                 }
                 else {

package/dist/deploy/010-deploy-reward-distributors.js

@@ -8,12 +8,12 @@ const func = async function (hre) {
     const { deploy } = deployments;
     const { deployer } = await getNamedAccounts();
     const maxLoopsLimit = 100;
-    const { tokensConfig, poolConfig, preconfiguredAddresses } = await (0, deploymentConfig_1.getConfig)(hre.network.name);
-    const { isTimeBased, blocksPerYear } = (0, deploymentUtils_1.getBlockOrTimestampBasedDeploymentInfo)(hre.network.name);
-    const accessControlAddress = await (0, deploymentUtils_1.toAddress)(preconfiguredAddresses.AccessControlManager || "AccessControlManager", hre);
-    const proxyOwnerAddress = await (0, deploymentUtils_1.toAddress)(preconfiguredAddresses.NormalTimelock || "account:deployer", hre);
+    const { tokensConfig, poolConfig, preconfiguredAddresses } = await (0, deploymentConfig_1.getConfig)(hre.getNetworkName());
+    const { isTimeBased, blocksPerYear } = (0, deploymentUtils_1.getBlockOrTimestampBasedDeploymentInfo)(hre.getNetworkName());
+    const accessControlAddress = await (0, deploymentUtils_1.toAddress)(preconfiguredAddresses.AccessControlManager || "AccessControlManager");
+    const proxyOwnerAddress = await (0, deploymentUtils_1.toAddress)(preconfiguredAddresses.NormalTimelock || "account:deployer");
     const defaultProxyAdmin = await hre.artifacts.readArtifact("hardhat-deploy/solc_0.8/openzeppelin/proxy/transparent/ProxyAdmin.sol:ProxyAdmin");
-    const pools = await (0, deploymentUtils_1.getUnregisteredRewardsDistributors)(poolConfig, hre);
+    const pools = await (0, deploymentUtils_1.getUnregisteredRewardsDistributors)(poolConfig);
     await deploy("RewardsDistributorImpl", {
         contract: "RewardsDistributor",
         from: deployer,

package/dist/deploy/011-initial-liquidity.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const ethers_1 = require("ethers");
+const hardhat_1 = require("hardhat");
 const deploymentConfig_1 = require("../helpers/deploymentConfig");
 const deploymentUtils_1 = require("../helpers/deploymentUtils");
 const sumAmounts = async (tokens) => {
@@ -10,9 +11,9 @@ const sumAmounts = async (tokens) => {
     }
     return amounts;
 };
-const faucetTokens = async (deploymentConfig, hre) => {
+const faucetTokens = async (deploymentConfig) => {
     const { poolConfig, tokensConfig } = deploymentConfig;
-    const unregisteredVTokens = await (0, deploymentUtils_1.getUnregisteredVTokens)(poolConfig, hre);
+    const unregisteredVTokens = await (0, deploymentUtils_1.getUnregisteredVTokens)(poolConfig);
     const vTokenConfigs = unregisteredVTokens.map((p) => p.vtokens).flat();
     const assetsToFaucet = vTokenConfigs
         .map((v) => (0, deploymentConfig_1.getTokenConfig)(v.asset, tokensConfig))
@@ -30,15 +31,14 @@ const faucetTokens = async (deploymentConfig, hre) => {
         const tx = await tokenContract.faucet(amount, { gasLimit: 5000000 });
         await tx.wait(1);
     }
+    return vTokensToFaucet;
 };
-const sendInitialLiquidityToTreasury = async (deploymentConfig, hre) => {
-    if (hre.network.name == "bscmainnet" || hre.network.name == "ethereum") {
+const sendInitialLiquidityToTreasury = async (deploymentConfig, tokensToFaucet) => {
+    if ((0, hardhat_1.getNetworkName)() == "bscmainnet" || (0, hardhat_1.getNetworkName)() == "ethereum") {
         return;
     }
-    const { poolConfig, tokensConfig, preconfiguredAddresses } = deploymentConfig;
-    const unregisteredVTokens = await (0, deploymentUtils_1.getUnregisteredVTokens)(poolConfig, hre);
-    const vTokenConfigs = unregisteredVTokens.map((p) => p.vtokens).flat();
-    const amounts = vTokenConfigs.map((token) => ({
+    const { tokensConfig, preconfiguredAddresses } = deploymentConfig;
+    const amounts = tokensToFaucet.map((token) => ({
         symbol: token.asset,
         amount: ethers_1.BigNumber.from(token.initialSupply),
     }));
@@ -46,18 +46,15 @@ const sendInitialLiquidityToTreasury = async (deploymentConfig, hre) => {
     for (const [symbol, amount] of Object.entries(totalAmounts)) {
         const tokenContract = await (0, deploymentUtils_1.getUnderlyingToken)(symbol, tokensConfig);
         console.log(`Sending ${amount} ${symbol} to VTreasury`);
-        console.log(`Token Contract: ${tokenContract.address}`);
-        console.log(`Token Contract: ${amount.toString()}`);
-        const treasuryAddress = await (0, deploymentUtils_1.toAddress)(preconfiguredAddresses.VTreasury || "VTreasury", hre);
-        console.log(`Token Contract: ${treasuryAddress}`);
+        const treasuryAddress = await (0, deploymentUtils_1.toAddress)(preconfiguredAddresses.VTreasury || "VTreasury");
         const tx = await tokenContract.transfer(treasuryAddress, amount, { gasLimit: 5000000 });
         await tx.wait(1);
     }
 };
 const func = async function (hre) {
-    const deploymentConfig = await (0, deploymentConfig_1.getConfig)(hre.network.name);
-    await faucetTokens(deploymentConfig, hre);
-    await sendInitialLiquidityToTreasury(deploymentConfig, hre);
+    const deploymentConfig = await (0, deploymentConfig_1.getConfig)(hre.getNetworkName());
+    const assetsToFaucet = await faucetTokens(deploymentConfig);
+    await sendInitialLiquidityToTreasury(deploymentConfig, assetsToFaucet);
 };
 func.tags = ["InitialLiquidity", "il"];
 exports.default = func;

package/dist/deploy/012-transfer-pools-ownership.js

@@ -2,24 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const hardhat_1 = require("hardhat");
 const deploymentConfig_1 = require("../helpers/deploymentConfig");
-const func = async function (hre) {
-    const { deployer } = await (0, hardhat_1.getNamedAccounts)();
-    const { poolConfig, preconfiguredAddresses } = await (0, deploymentConfig_1.getConfig)(hre.network.name);
-    const targetOwner = preconfiguredAddresses.NormalTimelock || deployer;
-    const rewardsDistributors = poolConfig
-        .map((pool) => {
-        const rewards = pool.rewards || [];
-        return rewards.map((_, idx) => `RewardsDistributor_${pool.id}_${idx}`);
-    })
-        .flat();
-    const comptrollers = poolConfig.map((pool) => `Comptroller_${pool.id}`);
-    const contracts = {
-        singleStepOwnership: ["ComptrollerBeacon", "VTokenBeacon"],
-        twoStepOwnership: ["PoolRegistry", ...comptrollers, ...rewardsDistributors],
-    };
-    await transferSingleStepOwnerships(contracts.singleStepOwnership, targetOwner);
-    await transfer2StepOwnerships(contracts.twoStepOwnership, targetOwner);
-};
 const transfer2StepOwnerships = async (contractNames, targetOwner) => {
     const abi = [
         "function owner() view returns (address)",
@@ -59,6 +41,24 @@ const transferSingleStepOwnerships = async (contractNames, targetOwner) => {
         }
     }
 };
+const func = async function (hre) {
+    const { deployer } = await (0, hardhat_1.getNamedAccounts)();
+    const { poolConfig, preconfiguredAddresses } = await (0, deploymentConfig_1.getConfig)(hre.getNetworkName());
+    const targetOwner = preconfiguredAddresses.NormalTimelock || deployer;
+    const rewardsDistributors = poolConfig
+        .map((pool) => {
+        const rewards = pool.rewards || [];
+        return rewards.map((_, idx) => `RewardsDistributor_${pool.id}_${idx}`);
+    })
+        .flat();
+    const comptrollers = poolConfig.map((pool) => `Comptroller_${pool.id}`);
+    const contracts = {
+        singleStepOwnership: ["ComptrollerBeacon", "VTokenBeacon"],
+        twoStepOwnership: ["PoolRegistry", ...comptrollers, ...rewardsDistributors],
+    };
+    await transferSingleStepOwnerships(contracts.singleStepOwnership, targetOwner);
+    await transfer2StepOwnerships(contracts.twoStepOwnership, targetOwner);
+};
 func.tags = ["TransferPoolsOwnership", "il"];
 func.id = "transfer_pools_ownership"; // id required to prevent re-execution
 exports.default = func;

package/dist/deploy/013-vip-based-config.js

@@ -34,14 +34,14 @@ const setRewardSpeed = async (pool, rewardsDistributor, rewardConfig) => {
         value: 0,
     };
 };
-const configureRewards = async (unregisteredRewardDistributors, owner, hre) => {
+const configureRewards = async (unregisteredRewardDistributors, owner) => {
     const commands = await Promise.all(unregisteredRewardDistributors.map(async (pool) => {
         const rewards = pool.rewards || [];
         const poolCommands = await Promise.all(rewards.map(async (rewardConfig, idx) => {
             const contractName = `RewardsDistributor_${pool.id}_${idx}`;
             const rewardsDistributor = await hardhat_1.ethers.getContract(contractName);
             return [
-                ...(await acceptOwnership(contractName, owner, hre)),
+                ...(await acceptOwnership(contractName, owner)),
                 await addRewardsDistributor(rewardsDistributor, pool, rewardConfig),
                 await setRewardSpeed(pool, rewardsDistributor, rewardConfig),
             ];
@@ -50,12 +50,12 @@ const configureRewards = async (unregisteredRewardDistributors, owner, hre) => {
     }));
     return commands.flat();
 };
-const acceptOwnership = async (contractName, targetOwner, hre) => {
-    if (!hre.network.live) {
+const acceptOwnership = async (contractName, targetOwner) => {
+    if (!hardhat_1.network.live) {
         return [];
     }
     const abi = ["function owner() view returns (address)"];
-    const deployment = await hre.deployments.get(contractName);
+    const deployment = await hardhat_1.deployments.get(contractName);
     const contract = await hardhat_1.ethers.getContractAt(abi, deployment.address);
     if ((await contract.owner()) === targetOwner) {
         return [];
@@ -98,20 +98,20 @@ const addPool = (poolRegistry, comptroller, pool) => {
         value: 0,
     };
 };
-const addPools = async (unregisteredPools, poolsOwner, hre) => {
+const addPools = async (unregisteredPools, poolsOwner) => {
     const poolRegistry = await hardhat_1.ethers.getContract("PoolRegistry");
     const commands = await Promise.all(unregisteredPools.map(async (pool) => {
         const comptroller = await hardhat_1.ethers.getContract(`Comptroller_${pool.id}`);
         return [
-            ...(await acceptOwnership(`Comptroller_${pool.id}`, poolsOwner, hre)),
+            ...(await acceptOwnership(`Comptroller_${pool.id}`, poolsOwner)),
             await setOracle(comptroller, pool),
             addPool(poolRegistry, comptroller, pool),
         ];
     }));
     return commands.flat();
 };
-const transferInitialLiquidity = async (vTokenConfig, deploymentConfig, hre) => {
-    if (!hre.network.live) {
+const transferInitialLiquidity = async (vTokenConfig, deploymentConfig) => {
+    if (!hardhat_1.network.live) {
         return [];
     }
     const { preconfiguredAddresses, tokensConfig } = deploymentConfig;
@@ -152,10 +152,10 @@ const approvePoolRegistry = async (poolRegistry, vTokenConfig, deploymentConfig)
         },
     ];
 };
-const addMarket = async (poolRegistry, vTokenAddress, vTokenConfig, hre) => {
+const addMarket = async (poolRegistry, vTokenAddress, vTokenConfig) => {
     const { name, collateralFactor, liquidationThreshold, initialSupply, supplyCap, borrowCap } = vTokenConfig;
     console.log("Adding a command to register " + name + " to PoolRegistry");
-    const receiver = await (0, deploymentUtils_1.toAddress)(vTokenConfig.vTokenReceiver, hre);
+    const receiver = await (0, deploymentUtils_1.toAddress)(vTokenConfig.vTokenReceiver);
     return {
         contract: poolRegistry.address,
         signature: "addMarket((address,uint256,uint256,uint256,address,uint256,uint256))",
@@ -177,7 +177,7 @@ const setReduceReservesBlockDelta = async (vTokenAddress, vTokenConfig) => {
         value: 0,
     };
 };
-const addMarkets = async (unregisteredVTokens, deploymentConfig, hre) => {
+const addMarkets = async (unregisteredVTokens, deploymentConfig) => {
     const poolRegistry = await hardhat_1.ethers.getContract("PoolRegistry");
     const poolCommands = await Promise.all(unregisteredVTokens.map(async (pool) => {
         const vTokenCommands = await Promise.all(pool.vtokens.map(async (vTokenConfig) => {
@@ -185,10 +185,10 @@ const addMarkets = async (unregisteredVTokens, deploymentConfig, hre) => {
             const vToken = await hardhat_1.ethers.getContract(`VToken_${symbol}`);
             console.log("Adding market " + name + " to pool " + pool.name);
             return [
-                ...(await transferInitialLiquidity(vTokenConfig, deploymentConfig, hre)),
+                ...(await transferInitialLiquidity(vTokenConfig, deploymentConfig)),
                 ...(await approvePoolRegistry(poolRegistry, vTokenConfig, deploymentConfig)),
                 await setReduceReservesBlockDelta(vToken.address, vTokenConfig),
-                await addMarket(poolRegistry, vToken.address, vTokenConfig, hre),
+                await addMarket(poolRegistry, vToken.address, vTokenConfig),
             ];
         }));
         return vTokenCommands.flat();
@@ -201,19 +201,19 @@ const makeRole = (mainnetBehavior, targetContract, method) => {
     }
     return hardhat_1.ethers.utils.keccak256(hardhat_1.ethers.utils.solidityPack(["address", "string"], [targetContract, method]));
 };
-const hasPermission = async (accessControl, targetContract, method, caller, hre) => {
-    const role = makeRole(hre.network.live, targetContract, method);
+const hasPermission = async (accessControl, targetContract, method, caller) => {
+    const role = makeRole(hardhat_1.network.live, targetContract, method);
     return accessControl.hasRole(role, caller);
 };
-const configureAccessControls = async (deploymentConfig, hre) => {
+const configureAccessControls = async (deploymentConfig) => {
     const { accessControlConfig, preconfiguredAddresses } = deploymentConfig;
-    const accessControlManagerAddress = await (0, deploymentUtils_1.toAddress)(preconfiguredAddresses.AccessControlManager || "AccessControlManager", hre);
+    const accessControlManagerAddress = await (0, deploymentUtils_1.toAddress)(preconfiguredAddresses.AccessControlManager || "AccessControlManager");
     const accessControlManager = await hardhat_1.ethers.getContractAt("AccessControlManager", accessControlManagerAddress);
     const commands = await Promise.all(accessControlConfig.map(async (entry) => {
         const { caller, target, method } = entry;
-        const callerAddress = await (0, deploymentUtils_1.toAddress)(caller, hre);
-        const targetAddress = await (0, deploymentUtils_1.toAddress)(target, hre);
-        if (await hasPermission(accessControlManager, targetAddress, method, callerAddress, hre)) {
+        const callerAddress = await (0, deploymentUtils_1.toAddress)(caller);
+        const targetAddress = await (0, deploymentUtils_1.toAddress)(target);
+        if (await hasPermission(accessControlManager, targetAddress, method, callerAddress)) {
             return [];
         }
         return [
@@ -253,18 +253,18 @@ const executeCommands = async (commands, hre) => {
 const func = async function (hre) {
     const { getNamedAccounts } = hre;
     const { deployer } = await getNamedAccounts();
-    const deploymentConfig = await (0, deploymentConfig_1.getConfig)(hre.network.name);
+    const deploymentConfig = await (0, deploymentConfig_1.getConfig)(hre.getNetworkName());
     const { poolConfig, preconfiguredAddresses } = deploymentConfig;
-    const unregisteredPools = await (0, deploymentUtils_1.getUnregisteredPools)(poolConfig, hre);
-    const unregisteredVTokens = await (0, deploymentUtils_1.getUnregisteredVTokens)(poolConfig, hre);
-    const unregisteredRewardsDistributors = await (0, deploymentUtils_1.getUnregisteredRewardsDistributors)(poolConfig, hre);
+    const unregisteredPools = await (0, deploymentUtils_1.getUnregisteredPools)(poolConfig);
+    const unregisteredVTokens = await (0, deploymentUtils_1.getUnregisteredVTokens)(poolConfig);
+    const unregisteredRewardsDistributors = await (0, deploymentUtils_1.getUnregisteredRewardsDistributors)(poolConfig);
     const owner = preconfiguredAddresses.NormalTimelock || deployer;
     const commands = [
-        ...(await configureAccessControls(deploymentConfig, hre)),
-        ...(await acceptOwnership("PoolRegistry", owner, hre)),
-        ...(await addPools(unregisteredPools, owner, hre)),
-        ...(await addMarkets(unregisteredVTokens, deploymentConfig, hre)),
-        ...(await configureRewards(unregisteredRewardsDistributors, owner, hre)),
+        ...(await configureAccessControls(deploymentConfig)),
+        ...(await acceptOwnership("PoolRegistry", owner)),
+        ...(await addPools(unregisteredPools, owner)),
+        ...(await addMarkets(unregisteredVTokens, deploymentConfig)),
+        ...(await configureRewards(unregisteredRewardsDistributors, owner)),
     ];
     if (hre.network.live) {
         console.log("Please propose a VIP with the following commands:");

package/dist/deploy/014-riskfund-protocolshare.d.ts

@@ -1,2 +1,2 @@
-import deployRiskFund from "@venusprotocol/protocol-reserve/dist/deploy/006-risk-fund-v2";
+import deployRiskFund from "@venusprotocol/protocol-reserve/dist/deploy/001-risk-fund-v2";
 export default deployRiskFund;

package/dist/deploy/014-riskfund-protocolshare.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const _006_risk_fund_v2_1 = __importDefault(require("@venusprotocol/protocol-reserve/dist/deploy/006-risk-fund-v2"));
-_006_risk_fund_v2_1.default.tags = ["RiskFund", "il"];
-_006_risk_fund_v2_1.default.skip = async (hre) => hre.network.live;
-exports.default = _006_risk_fund_v2_1.default;
+const _001_risk_fund_v2_1 = __importDefault(require("@venusprotocol/protocol-reserve/dist/deploy/001-risk-fund-v2"));
+_001_risk_fund_v2_1.default.tags = ["RiskFund", "il"];
+_001_risk_fund_v2_1.default.skip = async (hre) => hre.network.live;
+exports.default = _001_risk_fund_v2_1.default;

package/dist/deploy/014-shortfall-protocolshare.js

@@ -11,14 +11,14 @@ const func = async function (hre) {
     const { deployments, getNamedAccounts } = hre;
     const { deploy } = deployments;
     const { deployer } = await getNamedAccounts();
-    const { preconfiguredAddresses } = await (0, deploymentConfig_1.getConfig)(hre.network.name);
+    const { preconfiguredAddresses } = await (0, deploymentConfig_1.getConfig)(hre.getNetworkName());
     const poolRegistry = await hardhat_1.ethers.getContract("PoolRegistry");
     const deployerSigner = hardhat_1.ethers.provider.getSigner(deployer);
-    const accessControlManagerAddress = await (0, deploymentUtils_1.toAddress)(preconfiguredAddresses.AccessControlManager || "AccessControlManager", hre);
+    const accessControlManagerAddress = await (0, deploymentUtils_1.toAddress)(preconfiguredAddresses.AccessControlManager || "AccessControlManager");
     const proxyAdmin = await hardhat_1.ethers.getContract("DefaultProxyAdmin");
     const owner = await proxyAdmin.owner();
     const defaultProxyAdmin = await hre.artifacts.readArtifact("hardhat-deploy/solc_0.8/openzeppelin/proxy/transparent/ProxyAdmin.sol:ProxyAdmin");
-    const { isTimeBased, blocksPerYear } = (0, deploymentUtils_1.getBlockOrTimestampBasedDeploymentInfo)(hre.network.name);
+    const { isTimeBased, blocksPerYear } = (0, deploymentUtils_1.getBlockOrTimestampBasedDeploymentInfo)(hre.getNetworkName());
     const riskFund = await hardhat_1.ethers.getContract("RiskFundV2");
     await deploy("Shortfall", {
         from: deployer,
@@ -54,4 +54,9 @@ const func = async function (hre) {
     }
 };
 func.tags = ["Shortfall", "il"];
+// RiskFund not deployed on these networks
+func.skip = async (hre) => hre.getNetworkName() === "sepolia" ||
+    hre.getNetworkName() === "opbnbtestnet" ||
+    hre.getNetworkName() === "opbnbmainnet" ||
+    hre.getNetworkName() === "ethereum";
 exports.default = func;

package/dist/deploy/015-funds-config.js

@@ -1,9 +1,5 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const _001_psr_1 = __importDefault(require("@venusprotocol/protocol-reserve/dist/deploy/001-psr"));
 const hardhat_1 = require("hardhat");
 const getAllMarkets = async (poolRegistry) => {
     const pools = await poolRegistry.getAllPools();
@@ -37,7 +33,6 @@ const func = async function (hre) {
     catch (e) {
         if (!hre.network.live) {
             console.warn("ProtocolShareReserve contract not found. Deploying address");
-            await (0, _001_psr_1.default)(hre);
             protocolShareReserveAddress = (await hardhat_1.ethers.getContract("ProtocolShareReserve")).address;
         }
         else {

package/dist/deploy/018-native-token-gateway.js

@@ -129,8 +129,8 @@ const func = async function (hre) {
     const { deployments, getNamedAccounts } = hre;
     const { deploy } = deployments;
     const { deployer } = await getNamedAccounts();
-    const { preconfiguredAddresses } = await (0, deploymentConfig_1.getConfig)(hre.network.name);
-    const vWNativesInfo = getVWNativeTokens(hre.network.name);
+    const { preconfiguredAddresses } = await (0, deploymentConfig_1.getConfig)(hre.getNetworkName());
+    const vWNativesInfo = getVWNativeTokens(hre.getNetworkName());
     for (const vWNativeInfo of vWNativesInfo) {
         await deploy(`NativeTokenGateway_${vWNativeInfo.name}`, {
             contract: "NativeTokenGateway",
@@ -142,7 +142,7 @@ const func = async function (hre) {
         });
         const nativeTokenGateway = await hardhat_1.ethers.getContract(`NativeTokenGateway_${vWNativeInfo.name}`);
         const targetOwner = preconfiguredAddresses.NormalTimelock || deployer;
-        if (hre.network.live) {
+        if (hre.network.live && (await nativeTokenGateway.owner()) !== targetOwner) {
             const tx = await nativeTokenGateway.transferOwnership(targetOwner);
             await tx.wait();
             console.log(`Transferred ownership of NativeTokenGateway_${vWNativeInfo.name} to Timelock`);

package/dist/deploy/019-deploy-ir-models.js

@@ -12,9 +12,9 @@ const func = async function (hre) {
     const { deployments, getNamedAccounts } = hre;
     const { deploy } = deployments;
     const { deployer } = await getNamedAccounts();
-    const { poolConfig, preconfiguredAddresses } = await (0, deploymentConfig_1.getConfig)(hre.network.name);
-    const { isTimeBased, blocksPerYear } = (0, deploymentUtils_1.getBlockOrTimestampBasedDeploymentInfo)(hre.network.name);
-    const accessControlManagerAddress = await (0, deploymentUtils_1.toAddress)(preconfiguredAddresses.AccessControlManager || "AccessControlManager", hre);
+    const { poolConfig, preconfiguredAddresses } = await (0, deploymentConfig_1.getConfig)(hre.getNetworkName());
+    const { isTimeBased, blocksPerYear } = (0, deploymentUtils_1.getBlockOrTimestampBasedDeploymentInfo)(hre.getNetworkName());
+    const accessControlManagerAddress = await (0, deploymentUtils_1.toAddress)(preconfiguredAddresses.AccessControlManager || "AccessControlManager");
     for (const pool of poolConfig) {
         // Deploy IR Models
         for (const vtoken of pool.vtokens) {
@@ -22,7 +22,6 @@ const func = async function (hre) {
             if (rateModel === deploymentConfig_2.InterestRateModels.JumpRate.toString()) {
                 const [b, m, j, k] = [baseRatePerYear, multiplierPerYear, jumpMultiplierPerYear, kink_].map(mantissaToBps);
                 const rateModelName = `JumpRateModelV2_base${b}bps_slope${m}bps_jump${j}bps_kink${k}bps`;
-                console.log(`Deploying interest rate model ${rateModelName}`);
                 await deploy(rateModelName, {
                     from: deployer,
                     contract: "JumpRateModelV2",
@@ -43,7 +42,6 @@ const func = async function (hre) {
             else {
                 const [b, m] = [baseRatePerYear, multiplierPerYear].map(mantissaToBps);
                 const rateModelName = `WhitePaperInterestRateModel_base${b}bps_slope${m}bps`;
-                console.log(`Deploying interest rate model ${rateModelName}`);
                 await deploy(rateModelName, {
                     from: deployer,
                     contract: "WhitePaperInterestRateModel",