@venusprotocol/venus-protocol 7.5.0-dev.1 → 7.5.0-dev.2

package/deployments/sepolia.json

@@ -3,7 +3,7 @@
   "chainId": "11155111",
   "contracts": {
     "Prime": {
-      "address": "0x27A8ca2aFa10B9Bc1E57FC4Ca610d9020Aab3739",
+      "address": "0x2Ec432F123FEbb114e6fbf9f4F14baF0B1F14AbC",
       "abi": [
         {
           "anonymous": false,
@@ -1896,7 +1896,7 @@
       ]
     },
     "PrimeLiquidityProvider": {
-      "address": "0x4fCbfE445396f31005b3Fd2F6DE2A986d6E2dCB5",
+      "address": "0x15242a55Ad1842A1aEa09c59cf8366bD2f3CE9B4",
       "abi": [
         {
           "anonymous": false,
@@ -2881,7 +2881,7 @@
       ]
     },
     "PrimeLiquidityProvider_Implementation": {
-      "address": "0x6022165344bBD1DDF1E1F10F4736FD9fb58D5B71",
+      "address": "0xe36F76dc26885CcEce97B96f80f4FA58c89772Fc",
       "abi": [
         {
           "inputs": [
@@ -3738,7 +3738,7 @@
       ]
     },
     "PrimeLiquidityProvider_Proxy": {
-      "address": "0x4fCbfE445396f31005b3Fd2F6DE2A986d6E2dCB5",
+      "address": "0x15242a55Ad1842A1aEa09c59cf8366bD2f3CE9B4",
       "abi": [
         {
           "inputs": [
@@ -3887,7 +3887,7 @@
       ]
     },
     "Prime_Implementation": {
-      "address": "0xF68E8925d45fb6679aE8caF7f859C76BdD964325",
+      "address": "0x3A0e6f7a1927491ff8DAC67958D006a02896E9d4",
       "abi": [
         {
           "inputs": [
@@ -5677,7 +5677,7 @@
       ]
     },
     "Prime_Proxy": {
-      "address": "0x27A8ca2aFa10B9Bc1E57FC4Ca610d9020Aab3739",
+      "address": "0x2Ec432F123FEbb114e6fbf9f4F14baF0B1F14AbC",
       "abi": [
         {
           "inputs": [

package/deployments/sepolia_addresses.json

@@ -2,12 +2,12 @@
   "name": "sepolia",
   "chainId": "11155111",
   "addresses": {
-    "Prime": "0x27A8ca2aFa10B9Bc1E57FC4Ca610d9020Aab3739",
-    "PrimeLiquidityProvider": "0x4fCbfE445396f31005b3Fd2F6DE2A986d6E2dCB5",
-    "PrimeLiquidityProvider_Implementation": "0x6022165344bBD1DDF1E1F10F4736FD9fb58D5B71",
-    "PrimeLiquidityProvider_Proxy": "0x4fCbfE445396f31005b3Fd2F6DE2A986d6E2dCB5",
-    "Prime_Implementation": "0xF68E8925d45fb6679aE8caF7f859C76BdD964325",
-    "Prime_Proxy": "0x27A8ca2aFa10B9Bc1E57FC4Ca610d9020Aab3739",
+    "Prime": "0x2Ec432F123FEbb114e6fbf9f4F14baF0B1F14AbC",
+    "PrimeLiquidityProvider": "0x15242a55Ad1842A1aEa09c59cf8366bD2f3CE9B4",
+    "PrimeLiquidityProvider_Implementation": "0xe36F76dc26885CcEce97B96f80f4FA58c89772Fc",
+    "PrimeLiquidityProvider_Proxy": "0x15242a55Ad1842A1aEa09c59cf8366bD2f3CE9B4",
+    "Prime_Implementation": "0x3A0e6f7a1927491ff8DAC67958D006a02896E9d4",
+    "Prime_Proxy": "0x2Ec432F123FEbb114e6fbf9f4F14baF0B1F14AbC",
     "VTreasuryV8": "0x4116CA92960dF77756aAAc3aFd91361dB657fbF8",
     "XVSStore": "0x03B868C7858F50900fecE4eBc851199e957b5d3D",
     "XVSVaultProxy": "0x1129f882eAa912aE6D4f6D445b2E2b1eCbA99fd5",

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

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const hardhat_1 = require("hardhat");
+const deploymentConfig_1 = require("../helpers/deploymentConfig");
+const func = async function (hre) {
+    const { deployments, network } = hre;
+    const adminAccount = {
+        sepolia: "0x94fa6078b6b8a26f0b6edffbe6501b22a10470fb",
+        ethereum: "0x285960C5B22fD66A736C7136967A3eB15e93CC67",
+        opbnbtestnet: "0xb15f6EfEbC276A3b9805df81b5FB3D50C2A62BDf",
+        opbnbmainnet: "0xC46796a21a3A9FAB6546aF3434F2eBfFd0604207",
+        bscmainnet: await (0, deploymentConfig_1.getContractAddressOrNullAddress)(deployments, "NormalTimelock"),
+        bsctestnet: await (0, deploymentConfig_1.getContractAddressOrNullAddress)(deployments, "NormalTimelock"),
+    };
+    const prime = await hardhat_1.ethers.getContract("Prime");
+    const plp = await hardhat_1.ethers.getContract("PrimeLiquidityProvider");
+    console.log("Transferring Prime ownership to Timelock");
+    await prime.transferOwnership(adminAccount[network.name]);
+    console.log("Transferring PLP ownership to Timelock");
+    await plp.transferOwnership(adminAccount[network.name]);
+};
+func.tags = ["Prime"];
+func.id = "configure_prime"; // id required to prevent re-execution
+exports.default = func;

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

@@ -6,6 +6,7 @@ const func = async function (hre) {
     const { deployments, network, getNamedAccounts } = hre;
     const { deploy } = deployments;
     const { deployer } = await getNamedAccounts();
+    console.log(deployer);
     const TEN_MINUTES = 60 * 10;
     const NINETY_DAYS = 90 * 24 * 60 * 60;
     const ZERO_ADDRESS = hardhat_1.ethers.constants.AddressZero;
@@ -38,20 +39,27 @@ const func = async function (hre) {
     const loopsLimit = 20;
     const isTimeBased = false; // revise this value when deploying on L2s
     const corePoolAddress = await (0, deploymentConfig_1.getContractAddressOrNullAddress)(deployments, "Unitroller");
-    const wrappedNativeToken = (await deployments.get("WBNB")).address;
-    const nativeMarket = (await deployments.get("vBNB")).address;
+    const wrappedNativeToken = await (0, deploymentConfig_1.getContractAddressOrNullAddress)(deployments, "WBNB");
+    const nativeMarket = await (0, deploymentConfig_1.getContractAddressOrNullAddress)(deployments, "vBNB");
     const acmAddress = (await deployments.get("AccessControlManager")).address;
     const xvsVaultAddress = (await deployments.get("XVSVaultProxy")).address;
     const xvsAddress = (await deployments.get("XVS")).address;
     const resilientOracleAddress = (await deployments.get("ResilientOracle")).address;
-    const normalVipTimelockAddress = (await deployments.get("NormalTimelock")).address;
+    const adminAccount = {
+        sepolia: "0x94fa6078b6b8a26f0b6edffbe6501b22a10470fb",
+        ethereum: "0x285960C5B22fD66A736C7136967A3eB15e93CC67",
+        opbnbtestnet: "0xb15f6EfEbC276A3b9805df81b5FB3D50C2A62BDf",
+        opbnbmainnet: "0xC46796a21a3A9FAB6546aF3434F2eBfFd0604207",
+        bscmainnet: await (0, deploymentConfig_1.getContractAddressOrNullAddress)(deployments, "NormalTimelock"),
+        bsctestnet: await (0, deploymentConfig_1.getContractAddressOrNullAddress)(deployments, "NormalTimelock"),
+    };
     await deploy("PrimeLiquidityProvider", {
         from: deployer,
         log: true,
         deterministicDeployment: false,
         args: [isTimeBased, blocksPerYear[networkName]],
         proxy: {
-            owner: network.name === "hardhat" ? deployer : normalVipTimelockAddress,
+            owner: network.name === "hardhat" ? deployer : adminAccount[networkName],
             proxyContract: "OpenZeppelinTransparentProxy",
             execute: {
                 methodName: "initialize",
@@ -74,7 +82,7 @@ const func = async function (hre) {
             isTimeBased,
         ],
         proxy: {
-            owner: network.name === "hardhat" ? deployer : normalVipTimelockAddress,
+            owner: network.name === "hardhat" ? deployer : adminAccount[networkName],
             proxyContract: "OpenZeppelinTransparentProxy",
             execute: {
                 methodName: "initialize",
@@ -84,7 +92,7 @@ const func = async function (hre) {
                     xVSVaultPoolId[networkName],
                     xvsVaultAlphaNumerator,
                     xvsVaultAlphaDenominator,
-                    normalVipTimelockAddress,
+                    acmAddress,
                     plp.address,
                     corePoolAddress,
                     resilientOracleAddress,
@@ -95,6 +103,4 @@ const func = async function (hre) {
     });
 };
 func.tags = ["Prime"];
-// Script is written specifically for bnb chain
-func.skip = async (hre) => hre.network.name !== "bscmainnet" && hre.network.name !== "bsctestnet" && hre.network.name !== "hardhat";
 exports.default = func;

package/dist/hardhat.config.js

@@ -43,6 +43,8 @@ const DEPLOYER_PRIVATE_KEY = process.env.DEPLOYER_PRIVATE_KEY;
                 ethereum: [
                     "node_modules/@venusprotocol/token-bridge/deployments/ethereum",
                     "node_modules/@venusprotocol/governance-contracts/deployments/ethereum",
+                    "node_modules/@venusprotocol/oracle/deployments/ethereum",
+                    "node_modules/@venusprotocol/venus-protocol/deployments/ethereum",
                 ],
                 opbnbmainnet: [
                     "node_modules/@venusprotocol/governance-contracts/deployments/opbnbmainnet",
@@ -154,10 +156,7 @@ const config = {
             url: process.env.ARCHIVE_NODE_sepolia || "https://ethereum-sepolia.blockpi.network/v1/rpc/public",
             chainId: 11155111,
             live: true,
-            gasPrice: 20000000000,
-            accounts: {
-                mnemonic: process.env.MNEMONIC || "",
-            },
+            accounts: DEPLOYER_PRIVATE_KEY ? [`0x${DEPLOYER_PRIVATE_KEY}`] : [],
         },
         ethereum: {
             url: process.env.ARCHIVE_NODE_ethereum || "https://ethereum.blockpi.network/v1/rpc/public",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@venusprotocol/venus-protocol",
-  "version": "7.5.0-dev.1",
+  "version": "7.5.0-dev.2",
   "description": "The Venus Money Market",
   "repository": "git@github.com:VenusProtocol/venus-protocol.git",
   "author": "Venus",
@@ -36,7 +36,7 @@
     "@venusprotocol/governance-contracts": "^1.4.0",
     "@venusprotocol/protocol-reserve": "^1.4.0",
     "@venusprotocol/solidity-utilities": "^1.2.0",
-    "@venusprotocol/token-bridge": "1.0.0",
+    "@venusprotocol/token-bridge": "^1.1.0",
     "bignumber.js": "^9.1.2",
     "dotenv": "^16.0.1",
     "module-alias": "^2.2.2"
@@ -66,7 +66,7 @@
     "@types/node": "^18.7.1",
     "@typescript-eslint/eslint-plugin": "^5.40.0",
     "@typescript-eslint/parser": "^5.40.0",
-    "@venusprotocol/oracle": "1.8.0",
+    "@venusprotocol/oracle": "1.10.0",
     "bignumber.js": "^9.1.2",
     "chai": "^4.3.6",
     "eslint": "^8.25.0",

package/deploy/009.5-configure-prime.ts

@@ -1,22 +0,0 @@
-import { ethers } from "hardhat";
-import { DeployFunction } from "hardhat-deploy/types";
-import { HardhatRuntimeEnvironment } from "hardhat/types";
-
-const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
-  const { deployments } = hre;
-  const normalVipTimelockAddress = (await deployments.get("NormalTimelock")).address;
-
-  const prime = await ethers.getContract("Prime");
-  const plp = await ethers.getContract("PrimeLiquidityProvider");
-
-  console.log("Transferring Prime ownership to Timelock");
-  await prime.transferOwnership(normalVipTimelockAddress);
-
-  console.log("Transferring PLP ownership to Timelock");
-  await plp.transferOwnership(normalVipTimelockAddress);
-};
-
-func.tags = ["Prime"];
-func.id = "configure_prime"; // id required to prevent re-execution
-
-export default func;

package/dist/deploy/009.5-configure-prime.js

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const hardhat_1 = require("hardhat");
-const func = async function (hre) {
-    const { deployments } = hre;
-    const normalVipTimelockAddress = (await deployments.get("NormalTimelock")).address;
-    const prime = await hardhat_1.ethers.getContract("Prime");
-    const plp = await hardhat_1.ethers.getContract("PrimeLiquidityProvider");
-    console.log("Transferring Prime ownership to Timelock");
-    await prime.transferOwnership(normalVipTimelockAddress);
-    console.log("Transferring PLP ownership to Timelock");
-    await plp.transferOwnership(normalVipTimelockAddress);
-};
-func.tags = ["Prime"];
-func.id = "configure_prime"; // id required to prevent re-execution
-exports.default = func;