@venusprotocol/isolated-pools 1.0.0-dev.2 → 1.0.0-dev.3

package/dist/helpers/utils.d.ts

@@ -0,0 +1,3 @@
+export declare const convertToUnit: (amount: string | number, decimals: number) => string;
+export declare const scaleDownBy: (amount: string | number, decimals: number) => string;
+export declare const AddressOne = "0x0000000000000000000000000000000000000001";

package/dist/helpers/utils.js

@@ -0,0 +1,28 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AddressOne = exports.scaleDownBy = exports.convertToUnit = void 0;
+const bignumber_js_1 = __importDefault(require("bignumber.js"));
+bignumber_js_1.default.config({
+    FORMAT: {
+        decimalSeparator: ".",
+        groupSize: 0,
+        groupSeparator: "",
+        secondaryGroupSize: 0,
+        fractionGroupSeparator: "",
+        fractionGroupSize: 0,
+    },
+    ROUNDING_MODE: bignumber_js_1.default.ROUND_DOWN,
+    EXPONENTIAL_AT: 1e9,
+});
+const convertToUnit = (amount, decimals) => {
+    return new bignumber_js_1.default(amount).times(new bignumber_js_1.default(10).pow(decimals)).toString();
+};
+exports.convertToUnit = convertToUnit;
+const scaleDownBy = (amount, decimals) => {
+    return new bignumber_js_1.default(amount).dividedBy(new bignumber_js_1.default(10).pow(decimals)).toString();
+};
+exports.scaleDownBy = scaleDownBy;
+exports.AddressOne = "0x0000000000000000000000000000000000000001";

package/package.json

@@ -1,21 +1,13 @@
 {
   "name": "@venusprotocol/isolated-pools",
-  "version": "1.0.0-dev.2",
+  "version": "1.0.0-dev.3",
   "description": "",
   "files": [
     "artifacts",
-    "deploy",
-    "helpers",
+    "dist",
     "contracts",
     "deployments"
   ],
-  "exports": {
-    "deploy": "./dist/deploy",
-    "artifacts": "./artifacts",
-    "helpers": "./helpers",
-    "contracts": "./contracts",
-    "deployments": "./deployments"
-  },
   "scripts": {
     "test": "hardhat test",
     "test:integration": "hardhat test tests/integration/index.ts",

package/deploy/001-deploy-mock-tokens.ts

@@ -1,29 +0,0 @@
-import { DeployFunction } from "hardhat-deploy/types";
-import { HardhatRuntimeEnvironment } from "hardhat/types";
-
-import { getConfig } from "../helpers/deploymentConfig";
-
-const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
-  const { deployments, getNamedAccounts }: any = hre;
-  const { deploy } = deployments;
-  const { deployer } = await getNamedAccounts();
-
-  const { tokensConfig } = await getConfig(hre.network.name);
-
-  for (const token of tokensConfig) {
-    if (token.isMock) {
-      const contractName = `Mock${token.symbol}`;
-      await deploy(contractName, {
-        from: deployer,
-        contract: "MockToken",
-        args: [token.name, token.symbol, token.decimals],
-        log: true,
-        autoMine: true, // speed up deployment on local network (ganache, hardhat), no effect on live networks
-      });
-    }
-  }
-};
-
-func.tags = ["MockTokens"];
-
-export default func;

package/deploy/002-price-oracle.ts

@@ -1,7 +0,0 @@
-import deployOracle from "@venusprotocol/oracle/dist/deploy/1-deploy-oracles";
-import { HardhatRuntimeEnvironment } from "hardhat/types";
-
-deployOracle.tags = ["OracleDeploy"];
-deployOracle.skip = async (hre: HardhatRuntimeEnvironment) => hre.network.live;
-
-export default deployOracle;

package/deploy/003-price-oracle-configure-feeds.ts

@@ -1,7 +0,0 @@
-import configureOracleFeeds from "@venusprotocol/oracle/dist/deploy/2-configure-feeds";
-import { HardhatRuntimeEnvironment } from "hardhat/types";
-
-configureOracleFeeds.tags = ["Oracle"];
-configureOracleFeeds.skip = async (hre: HardhatRuntimeEnvironment) => hre.network.live;
-
-export default configureOracleFeeds;

package/deploy/005-access-control.ts

@@ -1,20 +0,0 @@
-import { DeployFunction } from "hardhat-deploy/types";
-import { HardhatRuntimeEnvironment } from "hardhat/types";
-
-const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
-  const { deployments, getNamedAccounts } = hre;
-  const { deploy } = deployments;
-  const { deployer } = await getNamedAccounts();
-
-  await deploy("AccessControlManager", {
-    from: deployer,
-    args: [],
-    log: true,
-    autoMine: true,
-  });
-};
-
-func.tags = ["AccessControl", "il"];
-func.skip = async (hre: HardhatRuntimeEnvironment) => hre.network.live;
-
-export default func;

package/deploy/006-deploy-factories.ts

@@ -1,82 +0,0 @@
-import { ethers } from "hardhat";
-import { DeployResult } from "hardhat-deploy/dist/types";
-import { DeployFunction } from "hardhat-deploy/types";
-import { HardhatRuntimeEnvironment } from "hardhat/types";
-
-const ADDRESS_ONE = "0x0000000000000000000000000000000000000001";
-const treasuryAddresses: { [network: string]: string } = {
-  hardhat: "0x70997970C51812dc3A010C7d01b50e0d17dc79C8", // signer[1] from hardhat mnemonic
-  bsctestnet: "0xFEA1c651A47FE29dB9b1bf3cC1f224d8D9CFF68C", // one of testnet admin accounts
-  bscmainnet: "0xF322942f644A996A617BD29c16bd7d231d9F35E9", // Venus Treasury
-};
-
-type AcmAddresses = {
-  bsctestnet: string;
-  bscmainnet: string;
-};
-
-const acmAddresses: AcmAddresses = {
-  bsctestnet: "0x45f8a08F534f34A97187626E05d4b6648Eeaa9AA",
-  bscmainnet: "0x4788629ABc6cFCA10F9f969efdEAa1cF70c23555",
-};
-
-const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
-  const { deployments, getNamedAccounts } = hre;
-  const { deploy } = deployments;
-  const { deployer } = await getNamedAccounts();
-  let accessControlManager;
-  if (hre.network.live) {
-    const networkName = hre.network.name === "bscmainnet" ? "bscmainnet" : "bsctestnet";
-    accessControlManager = await ethers.getContractAt("AccessControlManager", acmAddresses[networkName]);
-  } else {
-    accessControlManager = await ethers.getContract("AccessControlManager");
-  }
-
-  const vBep20Factory: DeployResult = await deploy("VTokenProxyFactory", {
-    from: deployer,
-    args: [],
-    log: true,
-    autoMine: true, // speed up deployment on local network (ganache, hardhat), no effect on live networks
-  });
-
-  const jumpRateModelFactory: DeployResult = await deploy("JumpRateModelFactory", {
-    from: deployer,
-    args: [],
-    log: true,
-    autoMine: true,
-  });
-
-  const whitePaperRateFactory: DeployResult = await deploy("WhitePaperInterestRateModelFactory", {
-    from: deployer,
-    args: [],
-    log: true,
-    autoMine: true,
-  });
-
-  await deploy("PoolRegistry", {
-    from: deployer,
-    contract: "PoolRegistry",
-    proxy: {
-      owner: deployer,
-      proxyContract: "OpenZeppelinTransparentProxy",
-      execute: {
-        methodName: "initialize",
-        args: [
-          vBep20Factory.address,
-          jumpRateModelFactory.address,
-          whitePaperRateFactory.address,
-          ADDRESS_ONE,
-          treasuryAddresses[hre.network.name],
-          accessControlManager.address,
-        ],
-      },
-      upgradeIndex: 0,
-    },
-    autoMine: true,
-    log: true,
-  });
-};
-
-func.tags = ["Factories", "il"];
-
-export default func;

package/deploy/007-access-control-configure.ts

@@ -1,142 +0,0 @@
-import { ethers } from "hardhat";
-import { DeployFunction } from "hardhat-deploy/types";
-import { HardhatRuntimeEnvironment } from "hardhat/types";
-
-type AcmAddresses = {
-  bsctestnet: string;
-  bscmainnet: string;
-};
-
-const ADDRESSES: AcmAddresses = {
-  bsctestnet: "0x45f8a08F534f34A97187626E05d4b6648Eeaa9AA",
-  bscmainnet: "0x4788629ABc6cFCA10F9f969efdEAa1cF70c23555",
-};
-
-const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
-  const { deployments, getNamedAccounts } = hre;
-  const { deploy } = deployments;
-  const { deployer } = await getNamedAccounts();
-  const poolRegistry = await ethers.getContract("PoolRegistry");
-  const vBep20Factory = await ethers.getContract("VTokenProxyFactory");
-  let accessControlManager;
-  if (hre.network.live) {
-    const networkName = hre.network.name === "bscmainnet" ? "bscmainnet" : "bsctestnet";
-    accessControlManager = await ethers.getContractAt("AccessControlManager", ADDRESSES[networkName]);
-  } else {
-    await deploy("AccessControlManager", {
-      from: deployer,
-      args: [],
-      log: true,
-      autoMine: true,
-    });
-    accessControlManager = await ethers.getContract("AccessControlManager");
-  }
-
-  console.log("==================================================");
-  console.log("Access Control Initial Configuration: ");
-  console.log("==================================================");
-  console.log("     Role     |      Contract      | Function Sig");
-  console.log("--------------------------------------------------");
-  let tx = await accessControlManager.giveCallPermission(
-    ethers.constants.AddressZero,
-    "setCollateralFactor(address,uint256,uint256)",
-    poolRegistry.address,
-  );
-  await tx.wait();
-
-  console.log("DEFAULT_ADMIN | PoolRegistry       | setCollateralFactor(address,uint256,uint256)");
-
-  tx = await accessControlManager.giveCallPermission(
-    ethers.constants.AddressZero,
-    "setMarketSupplyCaps(address[],uint256[])",
-    poolRegistry.address,
-  );
-  await tx.wait();
-
-  console.log("DEFAULT_ADMIN | PoolRegistry       | setMarketSupplyCaps(address[],uint256[])");
-
-  tx = await accessControlManager.giveCallPermission(
-    ethers.constants.AddressZero,
-    "setMarketBorrowCaps(address[],uint256[])",
-    poolRegistry.address,
-  );
-  await tx.wait();
-  console.log("DEFAULT_ADMIN | PoolRegistry       | setMarketBorrowCaps(address[],uint256[])");
-
-  tx = await accessControlManager.giveCallPermission(
-    ethers.constants.AddressZero,
-    "setLiquidationIncentive(uint256)",
-    poolRegistry.address,
-  );
-  await tx.wait();
-  console.log("DEFAULT_ADMIN | PoolRegistry       | setLiquidationIncentive(uint256)");
-
-  tx = await accessControlManager.giveCallPermission(
-    ethers.constants.AddressZero,
-    "setCloseFactor(uint256)",
-    poolRegistry.address,
-  );
-  await tx.wait();
-  console.log("DEFAULT_ADMIN | PoolRegistry       | setCloseFactor(uint256)");
-
-  tx = await accessControlManager.giveCallPermission(
-    ethers.constants.AddressZero,
-    "setMinLiquidatableCollateral(uint256)",
-    poolRegistry.address,
-  );
-  await tx.wait();
-  console.log("DEFAULT_ADMIN | PoolRegistry       | setMinLiquidatableCollateral(uint256)");
-
-  tx = await accessControlManager.giveCallPermission(
-    ethers.constants.AddressZero,
-    "supportMarket(address)",
-    poolRegistry.address,
-  );
-  await tx.wait();
-  console.log("DEFAULT_ADMIN | PoolRegistry       | supportMarket(address)");
-
-  tx = await accessControlManager.giveCallPermission(
-    ethers.constants.AddressZero,
-    "setInterestRateModel(address)",
-    vBep20Factory.address,
-  );
-  await tx.wait();
-  console.log("DEFAULT_ADMIN | VTokenProxyFactory | setInterestRateModel(address)");
-
-  tx = await accessControlManager.giveCallPermission(
-    ethers.constants.AddressZero,
-    "swapPoolsAssets(address[],uint256[],address[][])",
-    deployer,
-  );
-  await tx.wait();
-  console.log("DEFAULT_ADMIN | Deployer           | swapPoolsAssets(address[],uint256[])");
-
-  tx = await accessControlManager.giveCallPermission(
-    poolRegistry.address,
-    "createRegistryPool(string,address,uint256,uint256,uint256,address,uint256,address)",
-    deployer,
-  );
-  await tx.wait();
-  console.log(
-    "PoolRegistry  | Deployer           | createRegistryPool(string,address,uint256,uint256,uint256,address,uint256,address)",
-  );
-
-  tx = await accessControlManager.giveCallPermission(poolRegistry.address, "addMarket(AddMarketInput)", deployer);
-  await tx.wait();
-  console.log("PoolRegistry  | Deployer           | addMarket(AddMarketInput)");
-
-  tx = await accessControlManager.giveCallPermission(
-    ethers.constants.AddressZero,
-    "setRewardTokenSpeeds(address[],uint256[],uint256[])",
-    deployer,
-  );
-  await tx.wait();
-  console.log("DEFAULT_ADMIN | Deployer           | setRewardTokenSpeeds(address[],uint256[],uint256[])");
-
-  console.log("--------------------------------------------------");
-  console.log("Access Control setup ended successfully");
-};
-
-func.tags = ["AccessControlConfig", "il"];
-
-export default func;

package/deploy/008-deploy-pool-lens.ts

@@ -1,19 +0,0 @@
-import { DeployFunction } from "hardhat-deploy/types";
-import { HardhatRuntimeEnvironment } from "hardhat/types";
-
-const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
-  const { deployments, getNamedAccounts } = hre;
-  const { deploy } = deployments;
-  const { deployer } = await getNamedAccounts();
-
-  await deploy("PoolLens", {
-    from: deployer,
-    args: [],
-    log: true,
-    autoMine: true,
-  });
-};
-
-func.tags = ["PoolLens", "il"];
-
-export default func;

package/deploy/009-deploy-pools.ts

@@ -1,171 +0,0 @@
-import { ethers } from "hardhat";
-import { DeployResult } from "hardhat-deploy/dist/types";
-import { DeployFunction } from "hardhat-deploy/types";
-import { HardhatRuntimeEnvironment } from "hardhat/types";
-
-import { getConfig, getTokenConfig } from "../helpers/deploymentConfig";
-
-const treasuryAddresses: { [network: string]: string } = {
-  bsctestnet: "0xFEA1c651A47FE29dB9b1bf3cC1f224d8D9CFF68C", // one of testnet admin accounts
-  bscmainnet: "0xF322942f644A996A617BD29c16bd7d231d9F35E9", // Venus Treasury
-};
-
-type AcmAddresses = {
-  bsctestnet: string;
-  bscmainnet: string;
-};
-
-const acmAddresses: AcmAddresses = {
-  bsctestnet: "0x45f8a08F534f34A97187626E05d4b6648Eeaa9AA",
-  bscmainnet: "0x4788629ABc6cFCA10F9f969efdEAa1cF70c23555",
-};
-
-const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
-  const { deployments, getNamedAccounts } = hre;
-  const { deploy } = deployments;
-  const { deployer } = await getNamedAccounts();
-  let tx;
-  const priceOracle = await ethers.getContract("ResilientOracle");
-  const poolRegistry = await ethers.getContract("PoolRegistry");
-  let accessControlManager;
-  if (hre.network.live) {
-    const networkName = hre.network.name === "bscmainnet" ? "bscmainnet" : "bsctestnet";
-    accessControlManager = await ethers.getContractAt("AccessControlManager", acmAddresses[networkName]);
-  } else {
-    accessControlManager = await ethers.getContract("AccessControlManager");
-  }
-  const maxLoopsLimit = 150;
-
-  // Comptroller Beacon
-  const comptrollerImpl: DeployResult = await deploy("ComptrollerImpl", {
-    contract: "Comptroller",
-    from: deployer,
-    args: [poolRegistry.address],
-    log: true,
-    autoMine: true,
-  });
-
-  const ComptrollerBeacon: DeployResult = await deploy("ComptrollerBeacon", {
-    contract: "Beacon",
-    from: deployer,
-    args: [comptrollerImpl.address],
-    log: true,
-    autoMine: true,
-  });
-
-  // VToken Beacon
-  const vTokenImpl: DeployResult = await deploy("VtokenImpl", {
-    contract: "VToken",
-    from: deployer,
-    args: [],
-    log: true,
-    autoMine: true,
-  });
-
-  const vTokenBeacon: DeployResult = await deploy("VTokenBeacon", {
-    contract: "Beacon",
-    from: deployer,
-    args: [vTokenImpl.address],
-    log: true,
-    autoMine: true,
-  });
-
-  const { tokensConfig, poolConfig } = await getConfig(hre.network.name);
-  let pools = await poolRegistry.callStatic.getAllPools();
-
-  for (let i = 0; i < poolConfig.length; i++) {
-    const pool = poolConfig[i];
-    let comptrollerProxy;
-
-    if (i >= pools.length) {
-      // Create pool
-      console.log("Registering new pool with name " + pool.name);
-      tx = await poolRegistry.createRegistryPool(
-        pool.name,
-        ComptrollerBeacon.address,
-        pool.closeFactor,
-        pool.liquidationIncentive,
-        pool.minLiquidatableCollateral,
-        priceOracle.address,
-        maxLoopsLimit,
-        accessControlManager.address,
-      );
-      await tx.wait();
-      console.log("New Pool Registered");
-      pools = await poolRegistry.callStatic.getAllPools();
-      comptrollerProxy = await ethers.getContractAt("Comptroller", pools[i].comptroller);
-      tx = await comptrollerProxy.acceptOwnership();
-      await tx.wait();
-    } else {
-      comptrollerProxy = await ethers.getContractAt("Comptroller", pools[i].comptroller);
-    }
-
-    // Add Markets
-    for (const vtoken of pool.vtokens) {
-      const {
-        name,
-        asset,
-        symbol,
-        rateModel,
-        baseRatePerYear,
-        multiplierPerYear,
-        jumpMultiplierPerYear,
-        kink_,
-        collateralFactor,
-        liquidationThreshold,
-        reserveFactor,
-        initialSupply,
-        supplyCap,
-        borrowCap,
-      } = vtoken;
-
-      const token = getTokenConfig(asset, tokensConfig);
-      let tokenContract;
-      if (token.isMock) {
-        tokenContract = await ethers.getContract(`Mock${token.symbol}`);
-        console.log("Minting " + initialSupply + " mock tokens to owner");
-        tx = await tokenContract.faucet(initialSupply);
-        await tx.wait(1);
-      } else {
-        tokenContract = await ethers.getContractAt(
-          "@openzeppelin/contracts/token/ERC20/ERC20.sol:ERC20",
-          token.tokenAddress,
-        );
-        // Make sure that deployer has at least `initialSupply` balance of the token
-      }
-
-      console.log("Approving PoolRegistry for: " + initialSupply);
-      tx = await tokenContract.approve(poolRegistry.address, initialSupply);
-      await tx.wait(1);
-      console.log("Adding market " + name + " to pool " + pool.name);
-      tx = await poolRegistry.addMarket({
-        comptroller: comptrollerProxy.address,
-        asset: tokenContract.address,
-        decimals: 8,
-        name: name,
-        symbol: symbol,
-        rateModel: rateModel,
-        baseRatePerYear: baseRatePerYear,
-        multiplierPerYear: multiplierPerYear,
-        jumpMultiplierPerYear: jumpMultiplierPerYear,
-        kink_: kink_,
-        collateralFactor: collateralFactor,
-        liquidationThreshold: liquidationThreshold,
-        reserveFactor: reserveFactor,
-        accessControlManager: accessControlManager.address,
-        beaconAddress: vTokenBeacon.address,
-        initialSupply: initialSupply,
-        vTokenReceiver: hre.network.name === "hardhat" ? deployer : treasuryAddresses[hre.network.name],
-        supplyCap: supplyCap,
-        borrowCap: borrowCap,
-      });
-      await tx.wait();
-      console.log(`Market ${name} added to pool ${pool.name}`);
-      console.log(`-----------------------------------------`);
-    }
-  }
-};
-
-func.tags = ["Pools", "il"];
-
-export default func;

package/deploy/010-rewards.ts

@@ -1,84 +0,0 @@
-import { ethers } from "hardhat";
-import { DeployFunction } from "hardhat-deploy/types";
-import { HardhatRuntimeEnvironment } from "hardhat/types";
-
-import { getConfig, getTokenAddress, getTokenConfig } from "../helpers/deploymentConfig";
-
-type AcmAddresses = {
-  bsctestnet: string;
-  bscmainnet: string;
-};
-
-const acmAddresses: AcmAddresses = {
-  bsctestnet: "0x45f8a08F534f34A97187626E05d4b6648Eeaa9AA",
-  bscmainnet: "0x4788629ABc6cFCA10F9f969efdEAa1cF70c23555",
-};
-
-const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
-  const { deployments, getNamedAccounts } = hre;
-  const { deploy } = deployments;
-  const { deployer } = await getNamedAccounts();
-  const maxLoopsLimit = 150;
-  const poolRegistry = await ethers.getContract("PoolRegistry");
-  let accessControl;
-  if (hre.network.live) {
-    const networkName = hre.network.name === "bscmainnet" ? "bscmainnet" : "bsctestnet";
-    accessControl = await ethers.getContractAt("AccessControlManager", acmAddresses[networkName]);
-  } else {
-    accessControl = await ethers.getContract("AccessControlManager");
-  }
-
-  const { tokensConfig, poolConfig } = await getConfig(hre.network.name);
-  const pools = await poolRegistry.callStatic.getAllPools();
-  for (let i = 0; i < poolConfig.length; i++) {
-    const rewards = poolConfig[i].rewards;
-    if (!rewards) continue;
-    for (const reward of rewards) {
-      const comptrollerAddress = pools[i].comptroller;
-      // Get reward token address
-      const tokenConfig = getTokenConfig(reward.asset, tokensConfig);
-      const rewardTokenAddress = await getTokenAddress(tokenConfig, deployments);
-      // Custom contract name so we can obtain the proxy after that easily
-      const contractName = "Rewards" + reward.asset + poolConfig[i].name;
-      await deploy(contractName, {
-        from: deployer,
-        contract: "RewardsDistributor",
-        proxy: {
-          owner: deployer,
-          proxyContract: "OpenZeppelinTransparentProxy",
-          execute: {
-            methodName: "initialize",
-            args: [comptrollerAddress, rewardTokenAddress, maxLoopsLimit, accessControl.address],
-          },
-          upgradeIndex: 0,
-        },
-        autoMine: true,
-        log: true,
-      });
-
-      const rewardsDistributor = await ethers.getContract(contractName);
-      const vTokens: string[] = [];
-      for (const marketUnderlying of reward.markets) {
-        const assetConfig = getTokenConfig(marketUnderlying, tokensConfig);
-        const tokenAddress = await getTokenAddress(assetConfig, deployments);
-        const marketAddress = await poolRegistry.getVTokenForAsset(comptrollerAddress, tokenAddress);
-        vTokens.push(marketAddress);
-      }
-      let tx = await rewardsDistributor.setRewardTokenSpeeds(vTokens, reward.supplySpeeds, reward.borrowSpeeds);
-      await tx.wait(1);
-      const comptrollerProxy = await ethers.getContractAt("Comptroller", pools[i].comptroller);
-      try {
-        console.log("Adding reward distributor to comptroller " + comptrollerAddress);
-        tx = await comptrollerProxy.addRewardsDistributor(rewardsDistributor.address);
-        await tx.wait(1);
-        console.log("Added rewards distributor sucessfully");
-      } catch (e) {
-        console.log("Rewards distributor already added.");
-        continue;
-      }
-    }
-  }
-};
-
-func.tags = ["Rewards", "il"];
-export default func;