@venusprotocol/isolated-pools 2.0.0 → 2.1.0-dev.1

package/dist/deploy/004-swap-router.d.ts

@@ -1,2 +1,2 @@
-import deploySwapRouter from "@venusprotocol/venus-protocol/deploy/005-deploy-swaprouter";
+import deploySwapRouter from "@venusprotocol/venus-protocol/dist/deploy/006-deploy-swaprouter";
 export default deploySwapRouter;

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

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const _005_deploy_swaprouter_1 = __importDefault(require("@venusprotocol/venus-protocol/deploy/005-deploy-swaprouter"));
-_005_deploy_swaprouter_1.default.tags = ["SwapRouter", "il"];
-exports.default = _005_deploy_swaprouter_1.default;
+const _006_deploy_swaprouter_1 = __importDefault(require("@venusprotocol/venus-protocol/dist/deploy/006-deploy-swaprouter"));
+_006_deploy_swaprouter_1.default.tags = ["SwapRouter", "il"];
+_006_deploy_swaprouter_1.default.skip = async (hre) => hre.network.live;
+exports.default = _006_deploy_swaprouter_1.default;

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

@@ -1,82 +1,22 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const ERC20 = __importStar(require("@openzeppelin/contracts/build/contracts/ERC20.json"));
 const hardhat_1 = require("hardhat");
 const deploymentConfig_1 = require("../helpers/deploymentConfig");
+const deploymentUtils_1 = require("../helpers/deploymentUtils");
 const utils_1 = require("../helpers/utils");
 const MIN_AMOUNT_TO_CONVERT = (0, utils_1.convertToUnit)(10, 18);
 const MIN_POOL_BAD_DEBT = (0, utils_1.convertToUnit)(1000, 18);
 const maxLoopsLimit = 100;
-const getAllMarkets = async (poolRegistry) => {
-    const pools = await poolRegistry.getAllPools();
-    const markets = await Promise.all(pools.map(async ({ comptroller }) => {
-        const poolComptroller = await hardhat_1.ethers.getContractAt("Comptroller", comptroller);
-        const vTokenAddresses = await poolComptroller.getAllMarkets();
-        const vTokens = await Promise.all(vTokenAddresses.map((vTokenAddress) => hardhat_1.ethers.getContractAt("VToken", vTokenAddress)));
-        return vTokens;
-    }));
-    return markets.flat();
-};
-const configureVToken = async (vToken, shortfallAddress, protocolShareReserveAddress) => {
-    console.log("Setting shortfall contract for vToken: ", vToken.address);
-    const tx1 = await vToken.setShortfallContract(shortfallAddress);
-    await tx1.wait();
-    console.log("Setting protocol share reserve for vToken: ", vToken.address);
-    const tx2 = await vToken.setProtocolShareReserve(protocolShareReserveAddress);
-    await tx2.wait();
-    console.log("Finished configuring vToken: ", vToken.address);
-};
-const acmAddresses = {
-    bsctestnet: "0x45f8a08F534f34A97187626E05d4b6648Eeaa9AA",
-    bscmainnet: "0x4788629ABc6cFCA10F9f969efdEAa1cF70c23555",
-};
 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 busdConfig = (0, deploymentConfig_1.getTokenConfig)("BUSD", tokensConfig);
-    let BUSD;
-    if (busdConfig.isMock) {
-        BUSD = await hardhat_1.ethers.getContract("MockBUSD");
-    }
-    else {
-        BUSD = await hardhat_1.ethers.getContractAt(ERC20.abi, busdConfig.tokenAddress);
-    }
+    const { tokensConfig, preconfiguredAddresses } = await (0, deploymentConfig_1.getConfig)(hre.network.name);
+    const usdt = await (0, deploymentUtils_1.getUnderlyingToken)("USDT", tokensConfig);
     const poolRegistry = await hardhat_1.ethers.getContract("PoolRegistry");
     const deployerSigner = hardhat_1.ethers.provider.getSigner(deployer);
-    const swapRouter = await hardhat_1.ethers.getContract("SwapRouter");
-    let accessControl;
-    if (hre.network.live) {
-        const networkName = hre.network.name === "bscmainnet" ? "bscmainnet" : "bsctestnet";
-        accessControl = await hardhat_1.ethers.getContractAt("AccessControlManager", acmAddresses[networkName]);
-    }
-    else {
-        accessControl = await hardhat_1.ethers.getContract("AccessControlManager");
-    }
+    const swapRouterAddress = await (0, deploymentUtils_1.toAddress)(preconfiguredAddresses.SwapRouter_CorePool || "SwapRouter", hre);
+    const accessControlManagerAddress = await (0, deploymentUtils_1.toAddress)(preconfiguredAddresses.AccessControlManager || "AccessControlManager", hre);
     const proxyAdmin = await hardhat_1.ethers.getContract("DefaultProxyAdmin");
     const owner = await proxyAdmin.owner();
     await deploy("RiskFund", {
@@ -87,7 +27,7 @@ const func = async function (hre) {
             proxyContract: "OpenZeppelinTransparentProxy",
             execute: {
                 methodName: "initialize",
-                args: [swapRouter.address, MIN_AMOUNT_TO_CONVERT, BUSD.address, accessControl.address, maxLoopsLimit],
+                args: [swapRouterAddress, MIN_AMOUNT_TO_CONVERT, usdt.address, accessControlManagerAddress, maxLoopsLimit],
             },
             upgradeIndex: 0,
         },
@@ -103,7 +43,7 @@ const func = async function (hre) {
             proxyContract: "OpenZeppelinTransparentProxy",
             execute: {
                 methodName: "initialize",
-                args: [riskFund.address, MIN_POOL_BAD_DEBT, accessControl.address],
+                args: [riskFund.address, MIN_POOL_BAD_DEBT, accessControlManagerAddress],
             },
             upgradeIndex: 0,
         },
@@ -111,11 +51,18 @@ const func = async function (hre) {
         log: true,
     });
     const shortfall = await hardhat_1.ethers.getContract("Shortfall");
-    const tx1 = await shortfall.connect(deployerSigner).updatePoolRegistry(poolRegistry.address);
-    await tx1.wait();
-    const tx2 = await riskFund.setShortfallContractAddress(shortfallDeployment.address);
-    await tx2.wait(1);
-    const protocolShareReserveDeployment = await deploy("ProtocolShareReserve", {
+    if ((await shortfall.poolRegistry()) !== poolRegistry.address) {
+        console.log("Setting PoolRegistry address in Shortfall contract");
+        const tx = await shortfall.connect(deployerSigner).updatePoolRegistry(poolRegistry.address);
+        await tx.wait();
+    }
+    if ((await riskFund.shortfall()) !== shortfall.address) {
+        console.log("Setting Shortfall contract address in RiskFund");
+        const tx = await riskFund.setShortfallContractAddress(shortfallDeployment.address);
+        await tx.wait(1);
+    }
+    const protocolIncomeReceiver = await (0, deploymentUtils_1.toAddress)(preconfiguredAddresses.VTreasury, hre);
+    await deploy("ProtocolShareReserve", {
         from: deployer,
         contract: "ProtocolShareReserve",
         proxy: {
@@ -123,16 +70,29 @@ const func = async function (hre) {
             proxyContract: "OpenZeppelinTransparentProxy",
             execute: {
                 methodName: "initialize",
-                args: [deployer, riskFund.address],
+                args: [protocolIncomeReceiver, riskFund.address],
             },
             upgradeIndex: 0,
         },
         autoMine: true,
         log: true,
     });
-    const allMarkets = await getAllMarkets(poolRegistry);
-    for (const market of allMarkets) {
-        await configureVToken(market, shortfallDeployment.address, protocolShareReserveDeployment.address);
+    for (const contractName of ["ProtocolShareReserve", "RiskFund"]) {
+        const contract = await hardhat_1.ethers.getContract(contractName);
+        if ((await contract.poolRegistry()) !== poolRegistry.address) {
+            console.log(`Setting PoolRegistry address in ${contractName} contract`);
+            const tx = await contract.setPoolRegistry(poolRegistry.address);
+            await tx.wait();
+        }
+    }
+    const targetOwner = preconfiguredAddresses.NormalTimelock || deployer;
+    for (const contractName of ["RiskFund", "Shortfall", "ProtocolShareReserve"]) {
+        const contract = await hardhat_1.ethers.getContract(contractName);
+        if ((await contract.owner()) !== targetOwner && (await contract.pendingOwner()) !== targetOwner) {
+            console.log(`Transferring ownership of ${contractName} to ${targetOwner}`);
+            const tx = await contract.transferOwnership(targetOwner);
+            await tx.wait();
+        }
     }
 };
 func.tags = ["RiskFund", "il"];

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

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const hardhat_1 = require("hardhat");
+const getAllMarkets = async (poolRegistry) => {
+    const pools = await poolRegistry.getAllPools();
+    const markets = await Promise.all(pools.map(async ({ comptroller }) => {
+        const poolComptroller = await hardhat_1.ethers.getContractAt("Comptroller", comptroller);
+        const vTokenAddresses = await poolComptroller.getAllMarkets();
+        const vTokens = await Promise.all(vTokenAddresses.map((vTokenAddress) => hardhat_1.ethers.getContractAt("VToken", vTokenAddress)));
+        return vTokens;
+    }));
+    return markets.flat();
+};
+const setShortfallAddress = async (vToken, shortfallAddress) => {
+    if ((await vToken.shortfall()) !== shortfallAddress) {
+        const tx = await vToken.setShortfallContract(shortfallAddress);
+        await tx.wait();
+    }
+};
+const setProtocolShareReserveAddress = async (vToken, protocolShareReserveAddress) => {
+    if ((await vToken.protocolShareReserve()) !== protocolShareReserveAddress) {
+        const tx = await vToken.setProtocolShareReserve(protocolShareReserveAddress);
+        await tx.wait();
+    }
+};
+const func = async function (_) {
+    const poolRegistry = await hardhat_1.ethers.getContract("PoolRegistry");
+    const vTokens = await getAllMarkets(poolRegistry);
+    const protocolShareReserve = await hardhat_1.ethers.getContract("ProtocolShareReserve");
+    const shortfall = await hardhat_1.ethers.getContract("Shortfall");
+    for (const vToken of vTokens) {
+        await setShortfallAddress(vToken, shortfall.address);
+        await setProtocolShareReserveAddress(vToken, protocolShareReserve.address);
+    }
+};
+func.tags = ["FundsConfig", "il"];
+func.skip = async (hre) => hre.network.live;
+exports.default = func;

package/dist/hardhat.config.js

@@ -162,17 +162,12 @@ const config = {
             chainId: 97,
             live: true,
             gasPrice: 20000000000,
-            accounts: {
-                mnemonic: process.env.MNEMONIC || "",
-            },
+            accounts: process.env.TESTNET_PRIVATE_KEY ? [process.env.TESTNET_PRIVATE_KEY] : [],
         },
         bscmainnet: {
-            url: "https://bsc-dataseed.binance.org/",
+            url: "http://127.0.0.1:1248",
             chainId: 56,
-            live: true,
-            accounts: {
-                mnemonic: process.env.MNEMONIC || "",
-            },
+            timeout: 1200000,
         },
     },
     gasReporter: {
@@ -229,7 +224,10 @@ const config = {
             },
         ],
         deployments: {
-            bsctestnet: ["node_modules/@venusprotocol/oracle/deployments/bsctestnet"],
+            bsctestnet: [
+                "node_modules/@venusprotocol/oracle/deployments/bsctestnet",
+                "node_modules/@venusprotocol/venus-protocol/deployments/bsctestnet",
+            ],
         },
     },
 };

package/dist/helpers/deploymentConfig.js

@@ -14,7 +14,7 @@ const preconfiguredAddresses = {
         VTreasury: "account:deployer",
     },
     bsctestnet: {
-        VTreasury: "0x8b293600c50d6fbdc6ed4251cc75ece29880276f",
+        VTreasury: "0x8b293600C50D6fbdc6Ed4251cc75ECe29880276f",
         NormalTimelock: "0xce10739590001705F7FF231611ba4A48B2820327",
         FastTrackTimelock: "0x3CFf21b7AF8390fE68799D58727d3b4C25a83cb6",
         CriticalTimelock: "0x23B893a7C45a5Eb8c8C062b9F32d0D2e43eD286D",
@@ -23,6 +23,7 @@ const preconfiguredAddresses = {
         PancakeFactory: "0x182859893230dC89b114d6e2D547BFFE30474a21",
         WBNB: "0xae13d989daC2f0dEbFf460aC112a837C89BAa7cd",
         VBNB_CorePool: "0x2E7222e51c0f6e98610A1543Aa3836E092CDe62c",
+        SwapRouter_CorePool: "0x83edf1deE1B730b7e8e13C00ba76027D63a51ac0",
     },
     bscmainnet: {
         VTreasury: "0xF322942f644A996A617BD29c16bd7d231d9F35E9",
@@ -34,6 +35,7 @@ const preconfiguredAddresses = {
         PancakeFactory: "0xcA143Ce32Fe78f1f7019d7d551a6402fC5350c73",
         WBNB: "0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c",
         VBNB_CorePool: "0xA07c5b74C9B40447a954e1466938b865b6BBea36",
+        SwapRouter_CorePool: "0x8938E6dA30b59c1E27d5f70a94688A89F7c815a4",
     },
 };
 const poolRegistryPermissions = () => {
@@ -123,7 +125,7 @@ exports.globalConfig = {
             },
             {
                 isMock: true,
-                name: "Tether",
+                name: "Binance-Peg BSC-USD",
                 symbol: "USDT",
                 decimals: 18,
                 tokenAddress: hardhat_1.ethers.constants.AddressZero,
@@ -1167,7 +1169,7 @@ exports.globalConfig = {
             {
                 isMock: false,
                 name: "Binance-Peg BSC-USD",
-                symbol: "BUSD",
+                symbol: "USDT",
                 decimals: 18,
                 tokenAddress: "0x55d398326f99059fF775485246999027B3197955",
             },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@venusprotocol/isolated-pools",
-  "version": "2.0.0",
+  "version": "2.1.0-dev.1",
   "description": "",
   "files": [
     "artifacts",
@@ -70,7 +70,7 @@
     "@typescript-eslint/parser": "^5.27.1",
     "@venusprotocol/governance-contracts": "^1.0.0",
     "@venusprotocol/oracle": "1.7.2",
-    "@venusprotocol/venus-protocol": "^0.6.0",
+    "@venusprotocol/venus-protocol": "3.0.0-dev.18",
     "bignumber.js": "9.0.0",
     "chai": "^4.3.6",
     "dotenv": "^10.0.0",

package/dist/deploy/015-transfer-funds-ownership.js

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const hardhat_1 = require("hardhat");
-const targetOwners = {
-    hardhat: "0x70997970C51812dc3A010C7d01b50e0d17dc79C8",
-    bsctestnet: "0xFA747c4a62c4D168276329F822d004026A1c05E9",
-    mainnet: "0x939bD8d64c0A9583A7Dcea9933f7b21697ab6396", // NORMAL VIP Timelock
-};
-const contracts = ["RiskFund", "Shortfall", "ProtocolShareReserve"];
-const func = async function (hre) {
-    await transfer2StepOwnerships(contracts, hre.network.name);
-};
-const transfer2StepOwnerships = async (contractNames, networkName) => {
-    for (const contractName of contractNames) {
-        const contract = await hardhat_1.ethers.getContract(contractName);
-        const owner = await contract.owner();
-        let tx;
-        if (owner !== targetOwners[networkName]) {
-            tx = await contract.transferOwnership(targetOwners[networkName]);
-            await tx.wait(1);
-            const pendingOwner = await contract.pendingOwner();
-            console.log(`${contractName} owner ${owner} sucessfully changed to ${pendingOwner}. Please accept the ownership.`);
-        }
-        else {
-            console.error(`${contractName} owner ${owner} is equal to target ownership address ${targetOwners[networkName]}`);
-        }
-    }
-};
-func.tags = ["TransferFundsOwnership"];
-exports.default = func;