@venusprotocol/venus-protocol 7.1.0-dev.1 → 7.1.0-dev.3

package/artifacts/contracts/Tokens/Prime/PrimeStorage.sol/PrimeStorageV1.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/5158b939f09b056403dc17322b3b5c7a.json"
+  "buildInfo": "../../../../build-info/23955c54eec3e914a4d10c9d990fdb4c.json"
 }

package/artifacts/contracts/Tokens/Prime/libs/FixedMath.sol/FixedMath.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../../build-info/5158b939f09b056403dc17322b3b5c7a.json"
+  "buildInfo": "../../../../../build-info/23955c54eec3e914a4d10c9d990fdb4c.json"
 }

package/artifacts/contracts/Tokens/Prime/libs/FixedMath0x.sol/FixedMath0x.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../../build-info/5158b939f09b056403dc17322b3b5c7a.json"
+  "buildInfo": "../../../../../build-info/23955c54eec3e914a4d10c9d990fdb4c.json"
 }

package/artifacts/contracts/Tokens/Prime/libs/Scores.sol/Scores.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../../build-info/5158b939f09b056403dc17322b3b5c7a.json"
+  "buildInfo": "../../../../../build-info/23955c54eec3e914a4d10c9d990fdb4c.json"
 }

package/artifacts/contracts/test/AccessControlManagerMock.sol/AccessControlManagerMock.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/5158b939f09b056403dc17322b3b5c7a.json"
+  "buildInfo": "../../../build-info/23955c54eec3e914a4d10c9d990fdb4c.json"
 }

package/artifacts/contracts/test/LiquidatorHarness.sol/LiquidatorHarness.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/5158b939f09b056403dc17322b3b5c7a.json"
+  "buildInfo": "../../../build-info/23955c54eec3e914a4d10c9d990fdb4c.json"
 }

package/artifacts/contracts/test/MockProtocolShareReserve.sol/IComptroller.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/5158b939f09b056403dc17322b3b5c7a.json"
+  "buildInfo": "../../../build-info/23955c54eec3e914a4d10c9d990fdb4c.json"
 }

package/artifacts/contracts/test/MockProtocolShareReserve.sol/IIncomeDestination.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/5158b939f09b056403dc17322b3b5c7a.json"
+  "buildInfo": "../../../build-info/23955c54eec3e914a4d10c9d990fdb4c.json"
 }

package/artifacts/contracts/test/MockProtocolShareReserve.sol/IMockProtocolShareReserve.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/5158b939f09b056403dc17322b3b5c7a.json"
+  "buildInfo": "../../../build-info/23955c54eec3e914a4d10c9d990fdb4c.json"
 }

package/artifacts/contracts/test/MockProtocolShareReserve.sol/IPoolRegistry.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/5158b939f09b056403dc17322b3b5c7a.json"
+  "buildInfo": "../../../build-info/23955c54eec3e914a4d10c9d990fdb4c.json"
 }

package/artifacts/contracts/test/MockProtocolShareReserve.sol/IPrime.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/5158b939f09b056403dc17322b3b5c7a.json"
+  "buildInfo": "../../../build-info/23955c54eec3e914a4d10c9d990fdb4c.json"
 }

package/artifacts/contracts/test/MockProtocolShareReserve.sol/IVToken.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/5158b939f09b056403dc17322b3b5c7a.json"
+  "buildInfo": "../../../build-info/23955c54eec3e914a4d10c9d990fdb4c.json"
 }

package/artifacts/contracts/test/MockProtocolShareReserve.sol/MaxLoopsLimitHelper.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/5158b939f09b056403dc17322b3b5c7a.json"
+  "buildInfo": "../../../build-info/23955c54eec3e914a4d10c9d990fdb4c.json"
 }

package/artifacts/contracts/test/MockProtocolShareReserve.sol/MockProtocolShareReserve.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/5158b939f09b056403dc17322b3b5c7a.json"
+  "buildInfo": "../../../build-info/23955c54eec3e914a4d10c9d990fdb4c.json"
 }

package/artifacts/contracts/test/PrimeScenario.sol/PrimeScenario.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/5158b939f09b056403dc17322b3b5c7a.json"
+  "buildInfo": "../../../build-info/23955c54eec3e914a4d10c9d990fdb4c.json"
 }

package/contracts/DelegateBorrowers/MoveDebtDelegate.sol

@@ -7,6 +7,7 @@ import { ReentrancyGuardUpgradeable } from "@openzeppelin/contracts-upgradeable/
 import { SafeERC20Upgradeable } from "@openzeppelin/contracts-upgradeable/token/ERC20/utils/SafeERC20Upgradeable.sol";
 import { IERC20Upgradeable } from "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
 import { ResilientOracleInterface } from "@venusprotocol/oracle/contracts/interfaces/OracleInterface.sol";
+import { ensureNonzeroAddress } from "@venusprotocol/solidity-utilities/contracts/validators.sol";
 
 import { approveOrRevert } from "../lib/approveOrRevert.sol";
 import { IVBep20, IComptroller } from "../InterfacesV8.sol";
@@ -15,9 +16,8 @@ contract MoveDebtDelegate is Ownable2StepUpgradeable, ReentrancyGuardUpgradeable
     /// @dev VToken return value signalling about successful execution
     uint256 internal constant NO_ERROR = 0;
 
-    /// @notice VToken to repay the debt to
-    /// @custom:oz-upgrades-unsafe-allow state-variable-immutable
-    IVBep20 public immutable vTokenToRepay;
+    /// @notice A wildcard indicating that repayment is allowed for _any_ user in the market
+    address public constant ANY_USER = address(1);
 
     /// @notice User to borrow on behalf of
     /// @custom:oz-upgrades-unsafe-allow state-variable-immutable
@@ -26,15 +26,22 @@ contract MoveDebtDelegate is Ownable2StepUpgradeable, ReentrancyGuardUpgradeable
     /// @notice Whether to allow borrowing from the corresponding vToken
     mapping(address => bool) public borrowAllowed;
 
+    /// @notice Whether to allow repaying to the corresponding vToken on behalf of
+    ///   a certain user. Use ANY_USER to check if repayment is allowed for any user.
+    mapping(address => mapping(address => bool)) public repaymentAllowed;
+
+    /// @notice Emitted when vToken is allowed or denied to be borrowed from
+    event BorrowAllowedSet(address indexed vTokenToBorrow, bool allowed);
+
     /// @notice Emitted when vToken is allowed or denied to be borrowed from
-    event BorrowAllowedSet(address indexed vToken, bool allowed);
+    event RepaymentAllowedSet(address indexed vTokenToRepay, address indexed originalBorrower, bool allowed);
 
     /// @notice Emitted if debt is swapped successfully
     event DebtMoved(
         address indexed originalBorrower,
-        address vTokenRepaid,
+        address indexed vTokenRepaid,
         uint256 repaidAmount,
-        address indexed newBorrower,
+        address newBorrower,
         address indexed vTokenBorrowed,
         uint256 borrowedAmount
     );
@@ -55,14 +62,15 @@ contract MoveDebtDelegate is Ownable2StepUpgradeable, ReentrancyGuardUpgradeable
     /// @notice Thrown if borrowing from the corresponding vToken is not allowed
     error BorrowNotAllowed(address vToken);
 
+    /// @notice Thrown if repaying the debts of the borrower to the corresponding vToken is not allowed
+    error RepaymentNotAllowed(address vToken, address borrower);
+
     using SafeERC20Upgradeable for IERC20Upgradeable;
 
     /// @notice Constructor for the implementation contract. Sets immutable variables.
-    /// @param vTokenToRepay_ VToken to repay the debt to
     /// @param newBorrower_ User to borrow on behalf of
     /// @custom:oz-upgrades-unsafe-allow constructor
-    constructor(IVBep20 vTokenToRepay_, address newBorrower_) {
-        vTokenToRepay = vTokenToRepay_;
+    constructor(address newBorrower_) {
         newBorrower = newBorrower_;
         _disableInitializers();
     }
@@ -74,16 +82,29 @@ contract MoveDebtDelegate is Ownable2StepUpgradeable, ReentrancyGuardUpgradeable
 
     /**
      * @notice Repays originalBorrower's borrow in vTokenToRepay.underlying() and borrows
-     *   vTokenToBorrow.underlying() on behalf of newBorrower
+     *   vTokenToBorrow.underlying() on behalf of newBorrower.
+     *
      * @param originalBorrower The address of the borrower, whose debt to repay
+     * @param vTokenToRepay VToken to repay to on behalf of originalBorrower
      * @param repayAmount The amount to repay in terms of vTokenToRepay.underlying()
      * @param vTokenToBorrow VToken to borrow from
      */
-    function moveDebt(address originalBorrower, uint256 repayAmount, IVBep20 vTokenToBorrow) external nonReentrant {
+    function moveDebt(
+        IVBep20 vTokenToRepay,
+        address originalBorrower,
+        uint256 repayAmount,
+        IVBep20 vTokenToBorrow
+    ) external nonReentrant {
         if (!borrowAllowed[address(vTokenToBorrow)]) {
             revert BorrowNotAllowed(address(vTokenToBorrow));
         }
-        uint256 actualRepaymentAmount = _repay(originalBorrower, repayAmount);
+
+        mapping(address => bool) storage repaymentAllowedFor = repaymentAllowed[address(vTokenToRepay)];
+        if (!repaymentAllowedFor[ANY_USER] && !repaymentAllowedFor[originalBorrower]) {
+            revert RepaymentNotAllowed(address(vTokenToRepay), originalBorrower);
+        }
+
+        uint256 actualRepaymentAmount = _repay(vTokenToRepay, originalBorrower, repayAmount);
         uint256 amountToBorrow = _convert(vTokenToRepay, vTokenToBorrow, actualRepaymentAmount);
         _borrow(vTokenToBorrow, amountToBorrow);
         emit DebtMoved(
@@ -102,12 +123,29 @@ contract MoveDebtDelegate is Ownable2StepUpgradeable, ReentrancyGuardUpgradeable
      * @param allow Whether to allow borrowing from the corresponding vToken
      */
     function setBorrowAllowed(address vTokenToBorrow, bool allow) external onlyOwner {
+        ensureNonzeroAddress(vTokenToBorrow);
         if (borrowAllowed[vTokenToBorrow] != allow) {
             borrowAllowed[vTokenToBorrow] = allow;
             emit BorrowAllowedSet(vTokenToBorrow, allow);
         }
     }
 
+    /**
+     * @notice Allows or denies repaying the debts of originalBorrower to the corresponding vToken
+     * @param vTokenToRepay VToken to repay to
+     * @param originalBorrower The address of the borrower, whose debt to repay (or ANY_USER to allow
+     *   repayments for all users in the market, e.g. if the market is going to be deprecated soon)
+     * @param allow Whether to allow repaying to the corresponding vToken on behalf of originalBorrower
+     */
+    function setRepaymentAllowed(address vTokenToRepay, address originalBorrower, bool allow) external onlyOwner {
+        ensureNonzeroAddress(vTokenToRepay);
+        ensureNonzeroAddress(originalBorrower);
+        if (repaymentAllowed[vTokenToRepay][originalBorrower] != allow) {
+            repaymentAllowed[vTokenToRepay][originalBorrower] = allow;
+            emit RepaymentAllowedSet(vTokenToRepay, originalBorrower, allow);
+        }
+    }
+
     /**
      * @notice Transfers tokens, accidentially sent to this contract, to the owner
      * @param token ERC-20 token to sweep
@@ -120,10 +158,15 @@ contract MoveDebtDelegate is Ownable2StepUpgradeable, ReentrancyGuardUpgradeable
 
     /**
      * @dev Transfers the funds from the sender and repays a borrow in vToken on behalf of the borrower
+     * @param vTokenToRepay VToken to repay to
      * @param borrower The address of the borrower, whose debt to repay
      * @param repayAmount The amount to repay in terms of underlying
      */
-    function _repay(address borrower, uint256 repayAmount) internal returns (uint256 actualRepaymentAmount) {
+    function _repay(
+        IVBep20 vTokenToRepay,
+        address borrower,
+        uint256 repayAmount
+    ) internal returns (uint256 actualRepaymentAmount) {
         IERC20Upgradeable underlying = IERC20Upgradeable(vTokenToRepay.underlying());
         uint256 balanceBefore = underlying.balanceOf(address(this));
         underlying.safeTransferFrom(msg.sender, address(this), repayAmount);
@@ -143,13 +186,13 @@ contract MoveDebtDelegate is Ownable2StepUpgradeable, ReentrancyGuardUpgradeable
 
     /**
      * @dev Borrows in vToken on behalf of the borrower and transfers the funds to the sender
-     * @param vToken VToken to borrow from
+     * @param vTokenToBorrow VToken to borrow from
      * @param borrowAmount The amount to borrow in terms of underlying
      */
-    function _borrow(IVBep20 vToken, uint256 borrowAmount) internal {
-        IERC20Upgradeable underlying = IERC20Upgradeable(vToken.underlying());
+    function _borrow(IVBep20 vTokenToBorrow, uint256 borrowAmount) internal {
+        IERC20Upgradeable underlying = IERC20Upgradeable(vTokenToBorrow.underlying());
         uint256 balanceBefore = underlying.balanceOf(address(this));
-        uint256 err = vToken.borrowBehalf(newBorrower, borrowAmount);
+        uint256 err = vTokenToBorrow.borrowBehalf(newBorrower, borrowAmount);
         if (err != NO_ERROR) {
             revert BorrowFailed(err);
         }

package/deploy/005-update-governance.ts

@@ -55,12 +55,21 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const { deployer } = await getNamedAccounts();
   const { deploy } = deployments;
   const addresses = ADDRESSES[networkName];
-  const governorProxy = await ethers.getContractAt("GovernorBravoDelegator", addresses.governorProxy);
+
+  if (!addresses.governorProxy || !addresses.xvsVault || !addresses.normalVipTimelock) {
+    throw new Error(`GovernorProxy, XVSVault and NormalTimelock addresses must be defined in ${networkName}`);
+  }
+
+  const governorProxyAddress = addresses.governorProxy.toString();
+  const xvsVaultAddress = addresses.xvsVault.toString();
+  const normalVipTimelockAddress = addresses.normalVipTimelock.toString();
+
+  const governorProxy = await ethers.getContractAt("GovernorBravoDelegator", governorProxyAddress);
 
   const timeLockFastTrack = await deploy("Timelock_FastTrack", {
     contract: "Timelock",
     from: deployer,
-    args: [addresses.governorProxy, timelockDelays[networkName].FAST_TRACK],
+    args: [governorProxyAddress, timelockDelays[networkName].FAST_TRACK],
     log: true,
     autoMine: true,
   });
@@ -68,7 +77,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const timeLockCritical = await deploy("Timelock_Critical", {
     contract: "Timelock",
     from: deployer,
-    args: [addresses.governorProxy, timelockDelays[networkName].CRITICAL],
+    args: [governorProxyAddress, timelockDelays[networkName].CRITICAL],
     log: true,
     autoMine: true,
   });
@@ -89,12 +98,12 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     }
     const governorProxy_Impl = (await ethers.getContractAt(
       "GovernorBravoDelegate",
-      addresses.governorProxy,
+      governorProxyAddress,
     )) as GovernorBravoDelegate;
     tx = await governorProxy_Impl.initialize(
-      addresses.xvsVault,
+      xvsVaultAddress,
       PROPOSAL_CONFIGS,
-      [addresses.normalVipTimelock, timeLockFastTrack.address, timeLockCritical.address],
+      [normalVipTimelockAddress, timeLockFastTrack.address, timeLockCritical.address],
       deployer,
     );
     await tx.wait();

package/deploy/008-deploy-prime.ts

@@ -9,21 +9,47 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const { deploy } = deployments;
   const { deployer } = await getNamedAccounts();
 
-  const networkName = network.name === "bscmainnet" ? "bscmainnet" : "bsctestnet";
-  const stakingPeriod = networkName === "bscmainnet" ? 90 * 24 * 60 * 60 : 60 * 10;
+  const TEN_MINUTES = 60 * 10;
+  const NINETY_DAYS = 90 * 24 * 60 * 60;
+  const ZERO_ADDRESS = ethers.constants.AddressZero;
+
+  interface Config {
+    [key: string]: number;
+  }
+  const stakingPeriod: Config = {
+    bsctestnet: TEN_MINUTES,
+    sepolia: TEN_MINUTES,
+    bscmainnet: NINETY_DAYS,
+    ethereum: NINETY_DAYS,
+  };
+
+  const xVSVaultPoolId: Config = {
+    bsctestnet: 1,
+    sepolia: 0,
+    bscmainnet: 0,
+    ethereum: 0,
+  };
+
+  const blocksPerYear: Config = {
+    bsctestnet: 10_512_000, // 3 sec per block
+    sepolia: 2_628_000, // 12 sec per block
+    bscmainnet: 10_512_000,
+    ethereum: 2_628_000,
+  };
+
+  const networkName: string = network.name;
   const maximumXVSCap = ethers.utils.parseEther("100000");
   const minimumXVS = ethers.utils.parseEther("1000");
-  const xVSVaultPoolId = networkName === "bscmainnet" ? 0 : 1;
   const xvsVaultAlphaNumerator = 1;
   const xvsVaultAlphaDenominator = 2;
-  const blocksPeryear = 10512000;
   const loopsLimit = 20;
+  const isTimeBased = false; // revise this value when deploying on L2s
 
   await deploy("PrimeLiquidityProvider", {
     from: deployer,
     log: true,
     deterministicDeployment: false,
-    args: [],
+    args: [isTimeBased, blocksPerYear[networkName]],
     proxy: {
       owner: ADDRESSES[networkName].normalVipTimelock,
       proxyContract: "OpenZeppelinTransparentProxy",
@@ -36,17 +62,22 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
 
   const plp = await ethers.getContract("PrimeLiquidityProvider");
 
+  const corePoolAddress = ADDRESSES[networkName].unitroller;
+  const wrappedNativeToken = ADDRESSES[networkName].wbnb;
+  const nativeMarket = ADDRESSES[networkName].vbnb;
+
   await deploy("Prime", {
     from: deployer,
     log: true,
     deterministicDeployment: false,
     args: [
-      ADDRESSES[networkName].wbnb,
-      ADDRESSES[networkName].vbnb,
-      blocksPeryear,
-      stakingPeriod,
+      wrappedNativeToken ? wrappedNativeToken : ZERO_ADDRESS,
+      nativeMarket ? nativeMarket : ZERO_ADDRESS,
+      blocksPerYear[networkName],
+      stakingPeriod[networkName],
       minimumXVS,
       maximumXVSCap,
+      isTimeBased,
     ],
     proxy: {
       owner: ADDRESSES[networkName].normalVipTimelock,
@@ -56,12 +87,12 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
         args: [
           ADDRESSES[networkName].xvsVault,
           ADDRESSES[networkName].xvs,
-          xVSVaultPoolId,
+          xVSVaultPoolId[networkName],
           xvsVaultAlphaNumerator,
           xvsVaultAlphaDenominator,
           ADDRESSES[networkName].acm,
           plp.address,
-          ADDRESSES[networkName].unitroller,
+          corePoolAddress ? corePoolAddress : ZERO_ADDRESS,
           ADDRESSES[networkName].oracle,
           loopsLimit,
         ],
@@ -69,32 +100,10 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     },
   });
 
-  await deploy("XVSVault", {
-    from: deployer,
-    log: true,
-    deterministicDeployment: false,
-    args: [],
-    proxy: false,
-  });
-
-  await deploy("PolicyFacet", {
-    from: deployer,
-    log: true,
-    deterministicDeployment: false,
-    args: [],
-    proxy: false,
-  });
-
-  await deploy("SetterFacet", {
-    from: deployer,
-    log: true,
-    deterministicDeployment: false,
-    args: [],
-    proxy: false,
-  });
+  const prime = await ethers.getContract("Prime");
+  await prime.initializeV2(ADDRESSES[networkName].poolRegistry);
 
   console.log("Transferring Prime ownership to Timelock");
-  const prime = await ethers.getContract("Prime");
   await prime.transferOwnership(ADDRESSES[networkName].normalVipTimelock);
 
   console.log("Transferring PLP ownership to Timelock");

package/deploy/009-configure-vaults.ts

@@ -8,6 +8,7 @@ interface AdminAccounts {
 const adminAccount: AdminAccounts = {
   sepolia: "0x94fa6078b6b8a26f0b6edffbe6501b22a10470fb", // SEPOLIA MULTISIG
   ethereum: "0x285960C5B22fD66A736C7136967A3eB15e93CC67", // ETHEREUM MULTISIG
+  opbnbtestnet: "0xb15f6EfEbC276A3b9805df81b5FB3D50C2A62BDf", // OPBNBTESTNET MULTISIG
 };
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {