refactor: use address from npm packages

copy_contracts.sh

@@ -16,10 +16,19 @@ mkdir -p ./contracts/protocol
 cp -rf ./node_modules/@venusprotocol/venus-protocol/contracts/ ./contracts/protocol/contracts
 rm -rf contracts/protocol/contracts/test
 
+mkdir -p ./contracts/protocol-reserve
+cp -rf ./node_modules/@venusprotocol/protocol-reserve/contracts/ ./contracts/protocol-reserve/contracts
+rm -rf contracts/protocol-reserve/contracts/Test
+
 mkdir -p ./contracts/governance/contracts/Governance
 mkdir -p ./contracts/governance/contracts/legacy
+mkdir -p ./contracts/governance/contracts/test
+
 cp -rf ./node_modules/@venusprotocol/governance-contracts/contracts/legacy ./contracts/governance/contracts
-cp ./node_modules/@venusprotocol/governance-contracts/contracts/Governance/GovernorBravoInterfaces.sol ./contracts/governance/contracts/Governance/GovernorBravoInterfaces.sol
+cp ./node_modules/@venusprotocol/governance-contracts/contracts/test/TestTimelockV8.sol ./contracts/governance/contracts/test/TestTimelockV8.sol
+cp -rf ./node_modules/@venusprotocol/governance-contracts/contracts/Governance ./contracts/governance/contracts
+rm ./contracts/governance/contracts/Governance/AccessControlManager.sol
+rm ./contracts/governance/contracts/Governance/Timelock.sol
 
 rm -rf contracts/protocol/contracts/Lens/VenusLens.sol
 

deploy/000-governance-access-control.ts

@@ -1,15 +1,62 @@
-import accessControl from '@venusprotocol/governance-contracts/dist/deploy/001-access-control';
+import accessControl from '@venusprotocol/governance-contracts/dist/deploy/002-access-control';
 import { DeployFunction } from 'hardhat-deploy/types';
 import { HardhatRuntimeEnvironment } from 'hardhat/types';
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const { deployments, getNamedAccounts } = hre;
   const { deploy } = deployments;
   const { deployer } = await getNamedAccounts();
+
+  const networkName = hre.network.name;
 
-  await deploy('Timelock', {
+  const delayConfig = {
+    hardhat: {
+      normal: 600,
+      fast: 300,
+      critical: 100,
+    },
+    bscmainnet: {
+      normal: 172800,
+      fast: 21600,
+      critical: 3600,
+    },
+    bsctestnet: {
+      normal: 600,
+      fast: 300,
+      critical: 100,
+    },
+    sepolia: {
+      normal: 600,
+      fast: 300,
+      critical: 100,
+    },
+    ethereum: {
+      normal: 172800,
+      fast: 21600,
+      critical: 3600,
+    },
+  };
+
+  await deploy("NormalTimelock", {
+    contract: "TestTimelockV8",
+    from: deployer,
+    args: [deployer, delayConfig[networkName].normal],
+    log: true,
+    autoMine: true,
+  });
+
+  await deploy("FastTrackTimelock", {
+    contract: "TestTimelockV8",
+    from: deployer,
+    args: [deployer, delayConfig[networkName].fast],
+    log: true,
+    autoMine: true,
+  });
+
+  await deploy("CriticalTimelock", {
+    contract: "TestTimelockV8",
     from: deployer,
-    args: [deployer, 3600],
+    args: [deployer, delayConfig[networkName].critical],
     log: true,
     autoMine: true,
   });

deploy/003-configure-feeds.ts

@@ -1,3 +1,3 @@
-import configureFeeds from '@venusprotocol/oracle/dist/deploy/2-configure-feeds';
+import configureFeeds from '@venusprotocol/oracle/dist/deploy/3-configure-feeds';
 
 export default configureFeeds;

deploy/018-governance.ts

@@ -8,11 +8,11 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const { deployer } = await getNamedAccounts();
   const signers = await ethers.getSigners();
 
-  const timelock = await ethers.getContract('Timelock');
+  const timelock = await ethers.getContract('NormalTimelock');
   const xvsVault = await ethers.getContract('XVSVaultProxy');
 
   await deploy('GovernorAlphaTimelock', {
-    contract: 'Timelock',
+    contract: 'TestTimelockV8',
     from: deployer,
     args: [deployer, 3600],
     log: true,
@@ -48,7 +48,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   await governorAlpha.__acceptAdmin();
 
   await deploy('GovernorAlpha2Timelock', {
-    contract: 'Timelock',
+    contract: 'TestTimelockV8',
     from: deployer,
     args: [deployer, 3600],
     log: true,
@@ -96,8 +96,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   });
 
   await deploy('GovernorBravoDelegateV2', {
-    contract:
-      '@venusprotocol/governance-contracts/contracts/Governance/GovernorBravoDelegate.sol:GovernorBravoDelegate',
+    contract: 'GovernorBravoDelegate',
     from: deployer,
     args: [],
     log: true,
@@ -110,7 +109,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const minVotingPeriod = await governorBravoDelegate.MIN_VOTING_PERIOD();
   const minProposalThreshold = await governorBravoDelegate.MIN_PROPOSAL_THRESHOLD();
 
-  await deploy('GovernorBravoDelegatorV1', {
+  await deploy('GovernorBravoDelegator', {
     from: deployer,
     args: [
       timelock.address,
@@ -125,13 +124,6 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     log: true,
     autoMine: true,
   });
-
-  await deploy('GovernorBravoDelegate', {
-    from: deployer,
-    args: [],
-    log: true,
-    autoMine: true,
-  });
 };
 
 func.tags = ['Governance'];

hardhat.config.ts

@@ -21,7 +21,7 @@ const compilers = {
       }
     },
     {
-      version: '0.8.17',
+      version: '0.6.6',
       settings: {
         optimizer: {
           enabled: true,
@@ -47,7 +47,7 @@ const compilers = {
       },
     },
     {
-      version: '0.8.13',
+      version: '0.8.17',
       settings: {
         optimizer: {
           enabled: true,
@@ -60,18 +60,18 @@ const compilers = {
       },
     },
     {
-      version: '0.6.6',
+      version: '0.8.20',
       settings: {
         optimizer: {
-          enabled: !process.env.CI,
+          enabled: true,
         },
         outputSelection: {
           '*': {
             '*': ['storageLayout'],
           },
         },
       },
-    },
+    }
   ],
 }
 
@@ -88,13 +88,6 @@ const config: HardhatUserConfig = {
     sources: `${__dirname}/contracts`,
     artifacts: `${__dirname}/artifacts`,
   },
-  dependencyCompiler: {
-    paths: [
-      '@venusprotocol/governance-contracts/contracts/Governance/Timelock.sol',
-      '@venusprotocol/governance-contracts/contracts/Governance/GovernorBravoDelegate.sol',
-      '@venusprotocol/governance-contracts/contracts/Governance/GovernorBravoDelegator.sol',
-    ],
-  },
   mocha: {
     timeout: 100000000
   },

package.json

@@ -45,11 +45,13 @@
     "@typechain/hardhat": "^6.1.2",
     "@types/mocha": "^9.1.1",
     "@types/mustache": "^4.2.1",
+    "@types/node": "^20.5.9",
     "@typescript-eslint/eslint-plugin": "^5.40.1",
     "@typescript-eslint/parser": "^5.40.1",
-    "@venusprotocol/governance-contracts": "^1.3.0",
-    "@venusprotocol/isolated-pools": "2.1.0-dev.2",
-    "@venusprotocol/oracle": "^1.7.3-dev.1",
+    "@venusprotocol/governance-contracts": "^1.4.0-dev.9",
+    "@venusprotocol/isolated-pools": "^2.3.0-dev.4",
+    "@venusprotocol/oracle": "^1.8.0-dev.5",
+    "@venusprotocol/venus-protocol": "^6.1.0-dev.5",
     "assemblyscript": "0.19.23",
     "chai": "^4.3.6",
     "eslint": "^8.25.0",
@@ -84,5 +86,8 @@
   "packageManager": "yarn@3.2.2",
   "_moduleAliases": {
     "@nomiclabs/hardhat-ethers": "node_modules/hardhat-deploy-ethers"
+  },
+  "dependencies": {
+    "@venusprotocol/protocol-reserve": "^1.1.0"
   }
 }

patches/@venusprotocol+governance-contracts+1.4.0-dev.9.patch

@@ -0,0 +1,30 @@
+diff --git a/node_modules/@venusprotocol/governance-contracts/contracts/legacy/GovernorAlpha.sol b/node_modules/@venusprotocol/governance-contracts/contracts/legacy/GovernorAlpha.sol
+index fca5350..4713034 100644
+--- a/node_modules/@venusprotocol/governance-contracts/contracts/legacy/GovernorAlpha.sol
++++ b/node_modules/@venusprotocol/governance-contracts/contracts/legacy/GovernorAlpha.sol
+@@ -27,8 +27,8 @@ contract GovernorAlpha {
+
+     /// @notice The duration of voting on a proposal, in blocks
+     function votingPeriod() public pure returns (uint) {
+-        return (60 * 60 * 24 * 3) / 3;
+-    } // ~3 days in blocks (assuming 3s blocks)
++        return 100;
++    } // A reasonable amount of block suitable for testing
+
+     /// @notice The address of the Venus Protocol Timelock
+     TimelockInterface public timelock;
+diff --git a/node_modules/@venusprotocol/governance-contracts/contracts/legacy/GovernorAlpha2.sol b/node_modules/@venusprotocol/governance-contracts/contracts/legacy/GovernorAlpha2.sol
+index c009718..0e8e8ec 100644
+--- a/node_modules/@venusprotocol/governance-contracts/contracts/legacy/GovernorAlpha2.sol
++++ b/node_modules/@venusprotocol/governance-contracts/contracts/legacy/GovernorAlpha2.sol
+@@ -27,8 +27,8 @@ contract GovernorAlpha2 {
+
+     /// @notice The duration of voting on a proposal, in blocks
+     function votingPeriod() public pure returns (uint) {
+-        return (60 * 60 * 24 * 3) / 3;
+-    } // ~3 days in blocks (assuming 3s blocks)
++        return 100;
++    } // A reasonable amount of block suitable for testing
+
+     /// @notice The address of the Venus Protocol Timelock
+     TimelockInterface public timelock;