fix: support breaking changes in protocol reserve deployment scripts

VenusProtocol · Dec 19, 2024 · a30a86a · a30a86a
1 parent 390eab4
commit a30a86a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 28 deletions.
diff --git a/deploy/009-deploy-vtokens.ts b/deploy/009-deploy-vtokens.ts
@@ -1,4 +1,4 @@
-import setupDeployment from "@venusprotocol/protocol-reserve/dist/deploy/000-1-setup";
+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";
@@ -24,7 +24,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
 
   const { isTimeBased, blocksPerYear } = getBlockOrTimestampBasedDeploymentInfo(hre.network.name);
   const maxBorrowRateMantissa = getMaxBorrowRateMantissa(hre.network.name);
-  await setupDeployment(hre);
+  await timelocksDeployment(hre);
   const accessControlManagerAddress = await toAddress(
     preconfiguredAddresses.AccessControlManager || "AccessControlManager",
     hre,

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": "v3.0.1",
+    "@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/yarn.lock b/yarn.lock
@@ -3432,8 +3432,8 @@ __metadata:
     "@typescript-eslint/parser": ^5.27.1
     "@venusprotocol/governance-contracts": 2.6.0
     "@venusprotocol/oracle": 2.7.0
-    "@venusprotocol/protocol-reserve": v3.0.1
-    "@venusprotocol/solidity-utilities": ^2.0.0
+    "@venusprotocol/protocol-reserve": 3.0.1
+    "@venusprotocol/solidity-utilities": 2.0.3
     "@venusprotocol/venus-protocol": 9.4.0
     bignumber.js: 9.0.0
     chai: ^4.3.6
@@ -3487,53 +3487,46 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@venusprotocol/protocol-reserve@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@venusprotocol/protocol-reserve@npm:3.0.0"
+"@venusprotocol/protocol-reserve@npm:3.0.1":
+  version: 3.0.1
+  resolution: "@venusprotocol/protocol-reserve@npm:3.0.1"
   dependencies:
     "@nomiclabs/hardhat-ethers": ^2.2.3
     "@openzeppelin/contracts": ^4.8.3
     "@openzeppelin/contracts-upgradeable": ^4.8.3
     "@openzeppelin/hardhat-upgrades": ^1.21.0
     "@solidity-parser/parser": ^0.13.2
+    "@venusprotocol/governance-contracts": ^2.6.0
+    "@venusprotocol/isolated-pools": ^3.4.0
+    "@venusprotocol/oracle": ^2.7.0
     "@venusprotocol/solidity-utilities": ^2.0.3
     "@venusprotocol/venus-protocol": ^9.1.0
     ethers: ^5.7.0
-    hardhat-deploy: ^0.11.14
+    hardhat-deploy: ^0.14.0
     module-alias: ^2.2.2
-  checksum: d492ea9f2d2e1a587eeeddcdaa56ee87db0eee47674d62dfa34278c679f78b79a7045f5e2a2322e0cab42c45abd8248841318e8ad0a02ab35299520c3fccc901
+  checksum: 704e4b923ef8fae6840cb53b9eced0504778ba879e3930de26ceb79d65e017d598b71baeeba980fff2b01ca78d6745bd48d9bb7082cda4178c547078661ea594
   languageName: node
   linkType: hard
 
-"@venusprotocol/protocol-reserve@npm:v3.0.1":
-  version: 3.0.1
-  resolution: "@venusprotocol/protocol-reserve@npm:3.0.1"
+"@venusprotocol/protocol-reserve@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@venusprotocol/protocol-reserve@npm:3.0.0"
   dependencies:
     "@nomiclabs/hardhat-ethers": ^2.2.3
     "@openzeppelin/contracts": ^4.8.3
     "@openzeppelin/contracts-upgradeable": ^4.8.3
     "@openzeppelin/hardhat-upgrades": ^1.21.0
     "@solidity-parser/parser": ^0.13.2
-    "@venusprotocol/governance-contracts": ^2.6.0
-    "@venusprotocol/isolated-pools": ^3.4.0
-    "@venusprotocol/oracle": ^2.7.0
     "@venusprotocol/solidity-utilities": ^2.0.3
     "@venusprotocol/venus-protocol": ^9.1.0
     ethers: ^5.7.0
-    hardhat-deploy: ^0.14.0
+    hardhat-deploy: ^0.11.14
     module-alias: ^2.2.2
-  checksum: 704e4b923ef8fae6840cb53b9eced0504778ba879e3930de26ceb79d65e017d598b71baeeba980fff2b01ca78d6745bd48d9bb7082cda4178c547078661ea594
-  languageName: node
-  linkType: hard
-
-"@venusprotocol/solidity-utilities@npm:2.0.0":
-  version: 2.0.0
-  resolution: "@venusprotocol/solidity-utilities@npm:2.0.0"
-  checksum: 87a2ce2fd1d702bc04c4e98d675b904176c7f2489476e8da586d1782b48faae92aa4f2ba894737773d189ba72a6b274f1464cf2e0308e62758303d0adde749e6
+  checksum: d492ea9f2d2e1a587eeeddcdaa56ee87db0eee47674d62dfa34278c679f78b79a7045f5e2a2322e0cab42c45abd8248841318e8ad0a02ab35299520c3fccc901
   languageName: node
   linkType: hard
 
-"@venusprotocol/solidity-utilities@npm:^2.0.0, @venusprotocol/solidity-utilities@npm:^2.0.3":
+"@venusprotocol/solidity-utilities@npm:2.0.3":
   version: 2.0.3
   resolution: "@venusprotocol/solidity-utilities@npm:2.0.3"
   checksum: 5f196d61989e1b276b6f2d515c0410f3af07deee9bec58a6657e61d46b1810b2da6e2880d1ec737fd410f23a035c2db47b6a3ab2274cac229cabfcf03d4424ac