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

package/deployments/sepolia_addresses.json

@@ -2,6 +2,12 @@
   "name": "sepolia",
   "chainId": "11155111",
   "addresses": {
+    "Prime": "0x27A8ca2aFa10B9Bc1E57FC4Ca610d9020Aab3739",
+    "PrimeLiquidityProvider": "0x4fCbfE445396f31005b3Fd2F6DE2A986d6E2dCB5",
+    "PrimeLiquidityProvider_Implementation": "0x6022165344bBD1DDF1E1F10F4736FD9fb58D5B71",
+    "PrimeLiquidityProvider_Proxy": "0x4fCbfE445396f31005b3Fd2F6DE2A986d6E2dCB5",
+    "Prime_Implementation": "0xF68E8925d45fb6679aE8caF7f859C76BdD964325",
+    "Prime_Proxy": "0x27A8ca2aFa10B9Bc1E57FC4Ca610d9020Aab3739",
     "VTreasuryV8": "0x4116CA92960dF77756aAAc3aFd91361dB657fbF8",
     "XVSStore": "0x03B868C7858F50900fecE4eBc851199e957b5d3D",
     "XVSVault": "0x4129dF6BB93E9ABb9CC40816E63Be77c3042Ef27",

package/dist/deploy/005-update-governance.js

@@ -44,18 +44,24 @@ const func = async function (hre) {
     const { deployer } = await getNamedAccounts();
     const { deploy } = deployments;
     const addresses = address_1.default[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,
     });
     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,
     });
@@ -73,8 +79,8 @@ const func = async function (hre) {
             await tx.wait();
             console.log("New implementation successfully set to: " + newImplementation.address);
         }
-        const governorProxy_Impl = (await ethers.getContractAt("GovernorBravoDelegate", addresses.governorProxy));
-        tx = await governorProxy_Impl.initialize(addresses.xvsVault, PROPOSAL_CONFIGS, [addresses.normalVipTimelock, timeLockFastTrack.address, timeLockCritical.address], deployer);
+        const governorProxy_Impl = (await ethers.getContractAt("GovernorBravoDelegate", governorProxyAddress));
+        tx = await governorProxy_Impl.initialize(xvsVaultAddress, PROPOSAL_CONFIGS, [normalVipTimelockAddress, timeLockFastTrack.address, timeLockCritical.address], deployer);
         await tx.wait();
         console.log("Sucessfully initialized new governance via proxy: " + governorProxy.address);
     }

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

@@ -9,20 +9,39 @@ const func = async function (hre) {
     const { deployments, network, getNamedAccounts } = hre;
     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 = hardhat_1.ethers.constants.AddressZero;
+    const stakingPeriod = {
+        bsctestnet: TEN_MINUTES,
+        sepolia: TEN_MINUTES,
+        bscmainnet: NINETY_DAYS,
+        ethereum: NINETY_DAYS,
+    };
+    const xVSVaultPoolId = {
+        bsctestnet: 1,
+        sepolia: 0,
+        bscmainnet: 0,
+        ethereum: 0,
+    };
+    const blocksPerYear = {
+        bsctestnet: 10512000,
+        sepolia: 2628000,
+        bscmainnet: 10512000,
+        ethereum: 2628000,
+    };
+    const networkName = network.name;
     const maximumXVSCap = hardhat_1.ethers.utils.parseEther("100000");
     const minimumXVS = hardhat_1.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: address_1.default[networkName].normalVipTimelock,
             proxyContract: "OpenZeppelinTransparentProxy",
@@ -33,17 +52,21 @@ const func = async function (hre) {
         },
     });
     const plp = await hardhat_1.ethers.getContract("PrimeLiquidityProvider");
+    const corePoolAddress = address_1.default[networkName].unitroller;
+    const wrappedNativeToken = address_1.default[networkName].wbnb;
+    const nativeMarket = address_1.default[networkName].vbnb;
     await deploy("Prime", {
         from: deployer,
         log: true,
         deterministicDeployment: false,
         args: [
-            address_1.default[networkName].wbnb,
-            address_1.default[networkName].vbnb,
-            blocksPeryear,
-            stakingPeriod,
+            wrappedNativeToken ? wrappedNativeToken : ZERO_ADDRESS,
+            nativeMarket ? nativeMarket : ZERO_ADDRESS,
+            blocksPerYear[networkName],
+            stakingPeriod[networkName],
             minimumXVS,
             maximumXVSCap,
+            isTimeBased,
         ],
         proxy: {
             owner: address_1.default[networkName].normalVipTimelock,
@@ -53,41 +76,21 @@ const func = async function (hre) {
                 args: [
                     address_1.default[networkName].xvsVault,
                     address_1.default[networkName].xvs,
-                    xVSVaultPoolId,
+                    xVSVaultPoolId[networkName],
                     xvsVaultAlphaNumerator,
                     xvsVaultAlphaDenominator,
                     address_1.default[networkName].acm,
                     plp.address,
-                    address_1.default[networkName].unitroller,
+                    corePoolAddress ? corePoolAddress : ZERO_ADDRESS,
                     address_1.default[networkName].oracle,
                     loopsLimit,
                 ],
             },
         },
     });
-    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,
-    });
-    console.log("Transferring Prime ownership to Timelock");
     const prime = await hardhat_1.ethers.getContract("Prime");
+    await prime.initializeV2(address_1.default[networkName].poolRegistry);
+    console.log("Transferring Prime ownership to Timelock");
     await prime.transferOwnership(address_1.default[networkName].normalVipTimelock);
     console.log("Transferring PLP ownership to Timelock");
     await plp.transferOwnership(address_1.default[networkName].normalVipTimelock);

package/dist/deploy/009-configure-vaults.js

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const hardhat_1 = require("hardhat");
 const adminAccount = {
     sepolia: "0x94fa6078b6b8a26f0b6edffbe6501b22a10470fb",
-    ethereum: "0x285960C5B22fD66A736C7136967A3eB15e93CC67", // ETHEREUM MULTISIG
+    ethereum: "0x285960C5B22fD66A736C7136967A3eB15e93CC67",
+    opbnbtestnet: "0xb15f6EfEbC276A3b9805df81b5FB3D50C2A62BDf", // OPBNBTESTNET MULTISIG
 };
 const func = async function (hre) {
     const { getNamedAccounts } = hre;