fix: merge conflict

Author: web3rover

CHANGELOG.md

@@ -130,7 +130,7 @@ $ yarn hardhat --network <network-name> --export ./deployments/<network-name>.js
 ### Source Code Verification
 
 In order to verify the source code of already deployed contracts, run:
-`npx hardhat etherscan-verify --network <network_name>`
+`npx hardhat verify --network <network-name> <contract-address> <constructor-arg1> <constructor-arg2>`
 
 Make sure you have added `ETHERSCAN_API_KEY` in `.env` file.
 

README.md

@@ -1,10 +1,12 @@
 // SPDX-License-Identifier: BSD-3-Clause
 pragma solidity 0.8.25;
 
-import "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";
-import "@venusprotocol/governance-contracts/contracts/Governance/AccessControlledV8.sol";
-import "@openzeppelin/contracts-upgradeable/token/ERC20/utils/SafeERC20Upgradeable.sol";
-import { IProtocolShareReserve, IWBNB, VBNBAdminStorage, VTokenInterface } from "./VBNBAdminStorage.sol";
+import { ReentrancyGuardUpgradeable } from "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";
+import { AccessControlledV8 } from "@venusprotocol/governance-contracts/contracts/Governance/AccessControlledV8.sol";
+import { SafeERC20Upgradeable } from "@openzeppelin/contracts-upgradeable/token/ERC20/utils/SafeERC20Upgradeable.sol";
+import { IProtocolShareReserve } from "../external/IProtocolShareReserve.sol";
+import { IWBNB } from "../external/IWBNB.sol";
+import { VBNBAdminStorage, VTokenInterface } from "./VBNBAdminStorage.sol";
 
 /**
  * @title VBNBAdmin

audits/142_upgradeSolidity8_certik_20250824.pdf

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BSD-3-Clause
 pragma solidity 0.8.25;
 
-import "@openzeppelin/contracts-upgradeable/token/ERC20/utils/SafeERC20Upgradeable.sol";
+import { IProtocolShareReserve } from "../external/IProtocolShareReserve.sol";
 
 interface VTokenInterface {
     function _reduceReserves(uint reduceAmount) external returns (uint);
@@ -13,19 +13,6 @@ interface VTokenInterface {
     function _setInterestRateModel(address newInterestRateModel) external returns (uint);
 }
 
-interface IWBNB is IERC20Upgradeable {
-    function deposit() external payable;
-}
-
-interface IProtocolShareReserve {
-    enum IncomeType {
-        SPREAD,
-        LIQUIDATION
-    }
-
-    function updateAssetsState(address comptroller, address asset, IncomeType incomeType) external;
-}
-
 contract VBNBAdminStorage {
     /// @notice address of protocol share reserve contract
     IProtocolShareReserve public protocolShareReserve;

audits/143_upgradeSolidity8_quantstamp_20250829.pdf

@@ -1,13 +1,28 @@
-pragma solidity ^0.5.16;
-
-import "../Tokens/VTokens/VToken.sol";
-import "../Oracle/PriceOracle.sol";
-import "../Tokens/VAI/VAIControllerInterface.sol";
-import { ComptrollerTypes } from "./ComptrollerStorage.sol";
+// SPDX-License-Identifier: BSD-3-Clause
+
+pragma solidity 0.8.25;
+
+import { ResilientOracleInterface } from "@venusprotocol/oracle/contracts/interfaces/OracleInterface.sol";
+
+import { VToken } from "../Tokens/VTokens/VToken.sol";
+import { VAIControllerInterface } from "../Tokens/VAI/VAIControllerInterface.sol";
+import { WeightFunction } from "./Diamond/interfaces/IFacetBase.sol";
+
+enum Action {
+    MINT,
+    REDEEM,
+    BORROW,
+    REPAY,
+    SEIZE,
+    LIQUIDATE,
+    TRANSFER,
+    ENTER_MARKET,
+    EXIT_MARKET
+}
 
-contract ComptrollerInterface {
+interface ComptrollerInterface {
     /// @notice Indicator that this is a Comptroller contract (for inspection)
-    bool public constant isComptroller = true;
+    function isComptroller() external pure returns (bool);
 
     /*** Assets You Are In ***/
 
@@ -89,18 +104,25 @@ contract ComptrollerInterface {
         uint repayAmount
     ) external view returns (uint, uint);
 
+    function liquidateCalculateSeizeTokens(
+        address borrower,
+        address vTokenBorrowed,
+        address vTokenCollateral,
+        uint repayAmount
+    ) external view returns (uint, uint);
+
     function setMintedVAIOf(address owner, uint amount) external returns (uint);
 
     function liquidateVAICalculateSeizeTokens(
         address vTokenCollateral,
         uint repayAmount
     ) external view returns (uint, uint);
 
-    function getXVSAddress() public view returns (address);
+    function getXVSAddress() external view returns (address);
 
-    function markets(address) external view returns (bool, uint);
+    function markets(address) external view returns (bool, uint, bool, uint, uint, uint96, bool);
 
-    function oracle() external view returns (PriceOracle);
+    function oracle() external view returns (ResilientOracleInterface);
 
     function getAccountLiquidity(address) external view returns (uint, uint, uint);
 
@@ -130,24 +152,58 @@ contract ComptrollerInterface {
 
     function vaiController() external view returns (VAIControllerInterface);
 
-    function liquidationIncentiveMantissa() external view returns (uint);
-
     function protocolPaused() external view returns (bool);
 
-    function actionPaused(address market, ComptrollerTypes.Action action) public view returns (bool);
+    function actionPaused(address market, Action action) external view returns (bool);
 
     function mintedVAIs(address user) external view returns (uint);
 
     function vaiMintRate() external view returns (uint);
+
+    function userPoolId(address account) external view returns (uint96);
+
+    function getLiquidationIncentive(address vToken) external view returns (uint256);
+
+    function getEffectiveLiquidationIncentive(address account, address vToken) external view returns (uint256);
+
+    function getEffectiveLtvFactor(
+        address account,
+        address vToken,
+        WeightFunction weightingStrategy
+    ) external view returns (uint256);
+
+    function lastPoolId() external view returns (uint96);
+
+    function corePoolId() external pure returns (uint96);
+
+    function pools(
+        uint96 poolId
+    ) external view returns (string memory label, bool isActive, bool allowCorePoolFallback);
+
+    function getPoolVTokens(uint96 poolId) external view returns (address[] memory);
+
+    function poolMarkets(
+        uint96 poolId,
+        address vToken
+    )
+        external
+        view
+        returns (
+            bool isListed,
+            uint256 collateralFactorMantissa,
+            bool isVenus,
+            uint256 liquidationThresholdMantissa,
+            uint256 liquidationIncentiveMantissa,
+            uint96 marketPoolId,
+            bool isBorrowAllowed
+        );
 }
 
 interface IVAIVault {
     function updatePendingRewards() external;
 }
 
 interface IComptroller {
-    function liquidationIncentiveMantissa() external view returns (uint);
-
     /*** Treasury Data ***/
     function treasuryAddress() external view returns (address);
 

audits/149_emode_certik_20250919.pdf

@@ -1,7 +1,9 @@
-pragma solidity ^0.5.16;
-pragma experimental ABIEncoderV2;
+// SPDX-License-Identifier: BSD-3-Clause
 
-import "../Tokens/VTokens/VToken.sol";
+pragma solidity 0.8.25;
+
+import { VToken } from "../Tokens/VTokens/VToken.sol";
+import { WeightFunction } from "./Diamond/interfaces/IFacetBase.sol";
 
 interface ComptrollerLensInterface {
     function liquidateCalculateSeizeTokens(
@@ -11,6 +13,14 @@ interface ComptrollerLensInterface {
         uint actualRepayAmount
     ) external view returns (uint, uint);
 
+    function liquidateCalculateSeizeTokens(
+        address borrower,
+        address comptroller,
+        address vTokenBorrowed,
+        address vTokenCollateral,
+        uint actualRepayAmount
+    ) external view returns (uint, uint);
+
     function liquidateVAICalculateSeizeTokens(
         address comptroller,
         address vTokenCollateral,
@@ -22,6 +32,7 @@ interface ComptrollerLensInterface {
         address account,
         VToken vTokenModify,
         uint redeemTokens,
-        uint borrowAmount
+        uint borrowAmount,
+        WeightFunction weightingStrategy
     ) external view returns (uint, uint, uint);
 }