Merge pull request #462 from VenusProtocol/support-latest-protocol-re…

…serve-package fix: support breaking changes in protocol reserve deployment scripts
VenusProtocol · Dec 19, 2024 · adbda19 · adbda19
2 parents abfe9c0 + d50f1c9
commit adbda19
Show file tree

Hide file tree

Showing 9 changed files with 1,429 additions and 1,320 deletions.
diff --git a/deploy/009-deploy-vtokens.ts b/deploy/009-deploy-vtokens.ts
@@ -1,4 +1,5 @@
-import deployProtocolShareReserve from "@venusprotocol/protocol-reserve/dist/deploy/001-psr";
+import timelocksDeployment from "@venusprotocol/governance-contracts/dist/deploy/001-source-timelocks";
+import deployProtocolShareReserve from "@venusprotocol/protocol-reserve/dist/deploy/000-psr";
 import { BigNumber, BigNumberish } from "ethers";
 import { parseUnits } from "ethers/lib/utils";
 import { ethers } from "hardhat";
@@ -23,7 +24,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
 
   const { isTimeBased, blocksPerYear } = getBlockOrTimestampBasedDeploymentInfo(hre.network.name);
   const maxBorrowRateMantissa = getMaxBorrowRateMantissa(hre.network.name);
-
+  await timelocksDeployment(hre);
   const accessControlManagerAddress = await toAddress(
     preconfiguredAddresses.AccessControlManager || "AccessControlManager",
     hre,

diff --git a/deploy/014-riskfund-protocolshare.ts b/deploy/014-riskfund-protocolshare.ts
@@ -1,4 +1,4 @@
-import deployRiskFund from "@venusprotocol/protocol-reserve/dist/deploy/006-risk-fund-v2";
+import deployRiskFund from "@venusprotocol/protocol-reserve/dist/deploy/001-risk-fund-v2";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 
 deployRiskFund.tags = ["RiskFund", "il"];

diff --git a/deploy/015-funds-config.ts b/deploy/015-funds-config.ts
@@ -1,4 +1,3 @@
-import deployProtocolShareReserve from "@venusprotocol/protocol-reserve/dist/deploy/001-psr";
 import { ethers } from "hardhat";
 import { DeployFunction } from "hardhat-deploy/types";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
@@ -43,7 +42,6 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   } catch (e) {
     if (!hre.network.live) {
       console.warn("ProtocolShareReserve contract not found. Deploying address");
-      await deployProtocolShareReserve(hre);
       protocolShareReserveAddress = (await ethers.getContract("ProtocolShareReserve")).address;
     } else {
       throw e;

diff --git a/package.json b/package.json
@@ -48,7 +48,7 @@
     "@openzeppelin/contracts-upgradeable": "^4.8.3",
     "@openzeppelin/hardhat-upgrades": "^1.21.0",
     "@solidity-parser/parser": "^0.13.2",
-    "@venusprotocol/solidity-utilities": "^2.0.0",
+    "@venusprotocol/solidity-utilities": "2.0.3",
     "ethers": "^5.7.0",
     "hardhat-deploy": "^0.11.14",
     "module-alias": "^2.2.2"
@@ -79,7 +79,7 @@
     "@typescript-eslint/parser": "^5.27.1",
     "@venusprotocol/governance-contracts": "2.6.0",
     "@venusprotocol/oracle": "2.7.0",
-    "@venusprotocol/protocol-reserve": "2.4.0",
+    "@venusprotocol/protocol-reserve": "3.0.1",
     "@venusprotocol/venus-protocol": "9.4.0",
     "bignumber.js": "9.0.0",
     "chai": "^4.3.6",
@@ -113,7 +113,8 @@
     "ganache-core": "github:compound-finance/ganache-core.git#jflatow/unbreak-fork",
     "solidity-parser-antlr": "https://github.com/solidity-parser/parser#0.8.2",
     "@defi-wonderland/smock": "2.3.5",
-    "hardhat": "2.19.4"
+    "hardhat": "2.19.4",
+    "@venusprotocol/solidity-utilities": "2.0.3"
   },
   "publishConfig": {
     "access": "public",

diff --git a/tests/hardhat/Prime.ts b/tests/hardhat/Prime.ts
@@ -197,7 +197,7 @@ async function deployProtocol(): Promise<SetupProtocolFixture> {
     ],
     {
       constructorArgs: [false, blocksPerYear],
-      unsafeAllow: "constructor",
+      unsafeAllow: ["constructor", "internal-function-storage"],
     },
   );
 
@@ -226,7 +226,7 @@ async function deployProtocol(): Promise<SetupProtocolFixture> {
     ],
     {
       constructorArgs: [weth.address, vETH.address, 10512000, stakingPeriod, minimumXVS, maximumXVSCap, false],
-      unsafeAllow: "constructor",
+      unsafeAllow: ["constructor", "internal-function-storage"],
     },
   );
 

diff --git a/tests/hardhat/Rewards.ts b/tests/hardhat/Rewards.ts
@@ -174,13 +174,13 @@ async function rewardsFixture(isTimeBased: boolean) {
   rewardsDistributor = (await upgrades.deployProxy(
     RewardsDistributor,
     [comptrollerProxy.address, xvs.address, maxLoopsLimit, fakeAccessControlManager.address],
-    { constructorArgs: [isTimeBased, blocksPerYear] },
+    { constructorArgs: [isTimeBased, blocksPerYear], unsafeAllow: ["internal-function-storage"] },
   )) as RewardsDistributor;
 
   const rewardsDistributor2 = await upgrades.deployProxy(
     RewardsDistributor,
     [comptrollerProxy.address, mockDAI.address, maxLoopsLimit, fakeAccessControlManager.address],
-    { constructorArgs: [isTimeBased, blocksPerYear] },
+    { constructorArgs: [isTimeBased, blocksPerYear], unsafeAllow: ["internal-function-storage"] },
   );
   const initialXvs = convertToUnit(1000000, 18);
   await xvs.faucet(initialXvs);
@@ -296,7 +296,7 @@ for (const isTimeBased of [false, true]) {
       rewardsDistributor = (await upgrades.deployProxy(
         RewardsDistributor,
         [comptrollerProxy.address, xvs.address, maxLoopsLimit, fakeAccessControlManager.address],
-        { constructorArgs: [isTimeBased, blocksPerYear] },
+        { constructorArgs: [isTimeBased, blocksPerYear], unsafeAllow: ["internal-function-storage"] },
       )) as RewardsDistributor;
 
       await expect(comptrollerProxy.addRewardsDistributor(rewardsDistributor.address))
@@ -309,7 +309,7 @@ for (const isTimeBased of [false, true]) {
       rewardsDistributor = (await upgrades.deployProxy(
         RewardsDistributor,
         [comptrollerProxy.address, mockWBTC.address, maxLoopsLimit, fakeAccessControlManager.address],
-        { constructorArgs: [isTimeBased, blocksPerYear] },
+        { constructorArgs: [isTimeBased, blocksPerYear], unsafeAllow: ["internal-function-storage"] },
       )) as RewardsDistributor;
 
       await expect(comptrollerProxy.addRewardsDistributor(rewardsDistributor.address))
@@ -370,7 +370,7 @@ for (const isTimeBased of [false, true]) {
       const newRewardsDistributor = (await upgrades.deployProxy(
         RewardsDistributor,
         [comptrollerProxy.address, xvs.address, maxLoopsLimit, fakeAccessControlManager.address],
-        { constructorArgs: [isTimeBased, blocksPerYear] },
+        { constructorArgs: [isTimeBased, blocksPerYear], unsafeAllow: ["internal-function-storage"] },
       )) as RewardsDistributor;
 
       await comptrollerProxy.addRewardsDistributor(newRewardsDistributor.address);

diff --git a/tests/hardhat/Shortfall.ts b/tests/hardhat/Shortfall.ts
@@ -72,7 +72,10 @@ async function shortfallFixture() {
   shortfall = await upgrades.deployProxy(
     Shortfall,
     [fakeRiskFund.address, parseUnits(minimumPoolBadDebt, "18"), accessControlManager.address],
-    { constructorArgs: [isTimeBased, blocksPerYear, nextBidderBlockOrTimestampLimit, waitForFirstBidder] },
+    {
+      constructorArgs: [isTimeBased, blocksPerYear, nextBidderBlockOrTimestampLimit, waitForFirstBidder],
+      unsafeAllow: ["internal-function-storage"],
+    },
   );
 
   [owner, someone, bidder1, bidder2] = await ethers.getSigners();
@@ -207,6 +210,7 @@ async function timeBasedhortfallFixture() {
     [fakeRiskFund.address, parseUnits(minimumPoolBadDebt, "18"), accessControlManager.address],
     {
       constructorArgs: [isTimeBased, blocksPerYear, nextBidderBlockOrTimestampLimit, waitForFirstBidder],
+      unsafeAllow: ["internal-function-storage"],
     },
   );
   [owner, someone, bidder1, bidder2] = await ethers.getSigners();

diff --git a/tests/hardhat/util/TokenTestHelpers.ts b/tests/hardhat/util/TokenTestHelpers.ts
@@ -82,6 +82,7 @@ export const deployVTokenBeacon = async <VTokenFactory extends AnyVTokenFactory
   const VToken = await ethers.getContractFactory<VTokenFactory>(kind);
   const vTokenBeacon = (await upgrades.deployBeacon(VToken, {
     constructorArgs: [isTimeBased, blocksPerYear, maxBorrowRateMantissa],
+    unsafeAllow: ["internal-function-storage"],
   })) as UpgradeableBeacon;
   return vTokenBeacon;
 };