feat!: allow to specify vTokenReceiver when adding markets

VenusProtocol · Apr 27, 2023 · 4560b04 · 4560b04
1 parent f0500ae
commit 4560b04
Show file tree

Hide file tree

Showing 8 changed files with 113 additions and 42 deletions.
diff --git a/contracts/Pool/PoolRegistry.sol b/contracts/Pool/PoolRegistry.sol
@@ -47,6 +47,7 @@ contract PoolRegistry is Ownable2StepUpgradeable, AccessControlled, PoolRegistry
         AccessControlManager accessControlManager;
         address beaconAddress;
         uint256 initialSupply;
+        address vTokenReceiver;
         uint256 supplyCap;
         uint256 borrowCap;
     }
@@ -253,14 +254,14 @@ contract PoolRegistry is Ownable2StepUpgradeable, AccessControlled, PoolRegistry
      */
     function addMarket(AddMarketInput memory input) external {
         _checkAccessAllowed("addMarket(AddMarketInput)");
-        require(input.comptroller != address(0), "RegistryPool: Invalid comptroller address");
-        require(input.asset != address(0), "RegistryPool: Invalid asset address");
-
-        require(input.beaconAddress != address(0), "RegistryPool: Invalid beacon address");
+        require(input.comptroller != address(0), "PoolRegistry: Invalid comptroller address");
+        require(input.asset != address(0), "PoolRegistry: Invalid asset address");
+        require(input.beaconAddress != address(0), "PoolRegistry: Invalid beacon address");
+        require(input.vTokenReceiver != address(0), "PoolRegistry: Invalid vTokenReceiver address");
 
         require(
             _vTokens[input.comptroller][input.asset] == address(0),
-            "RegistryPool: Market already added for asset comptroller combination"
+            "PoolRegistry: Market already added for asset comptroller combination"
         );
 
         InterestRateModel rate;
@@ -320,7 +321,7 @@ contract PoolRegistry is Ownable2StepUpgradeable, AccessControlled, PoolRegistry
         token.safeApprove(address(vToken), 0);
         token.safeApprove(address(vToken), input.initialSupply);
 
-        vToken.mintBehalf(msg.sender, input.initialSupply);
+        vToken.mintBehalf(input.vTokenReceiver, input.initialSupply);
 
         emit MarketAdded(address(comptroller), address(vToken));
     }

diff --git a/deploy/009-deploy-pools.ts b/deploy/009-deploy-pools.ts
@@ -5,6 +5,11 @@ import { HardhatRuntimeEnvironment } from "hardhat/types";
 
 import { getConfig, getTokenConfig } from "../helpers/deploymentConfig";
 
+const treasuryAddresses: { [network: string]: string } = {
+  bsctestnet: "0xFEA1c651A47FE29dB9b1bf3cC1f224d8D9CFF68C", // one of testnet admin accounts
+  bscmainnet: "0xF322942f644A996A617BD29c16bd7d231d9F35E9", // Venus Treasury
+};
+
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const { deployments, getNamedAccounts } = hre;
   const { deploy } = deployments;
@@ -137,6 +142,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
         accessControlManager: accessControlManager.address,
         beaconAddress: vTokenBeacon.address,
         initialSupply: initialSupply,
+        vTokenReceiver: hre.network.name === "hardhat" ? deployer : treasuryAddresses[hre.network.name],
         supplyCap: supplyCap,
         borrowCap: borrowCap,
       });

diff --git a/tests/hardhat/Fork/RiskFund.ts b/tests/hardhat/Fork/RiskFund.ts
@@ -344,6 +344,7 @@ const riskFundFixture = async (): Promise<void> => {
     accessControlManager: accessControlManager.address,
     beaconAddress: vTokenBeacon.address,
     initialSupply,
+    vTokenReceiver: admin.address,
     supplyCap: initialSupply,
     borrowCap: initialSupply,
   });
@@ -365,6 +366,7 @@ const riskFundFixture = async (): Promise<void> => {
     accessControlManager: accessControlManager.address,
     beaconAddress: vTokenBeacon.address,
     initialSupply,
+    vTokenReceiver: admin.address,
     supplyCap: initialSupply,
     borrowCap: initialSupply,
   });
@@ -389,6 +391,7 @@ const riskFundFixture = async (): Promise<void> => {
     accessControlManager: accessControlManager.address,
     beaconAddress: vTokenBeacon.address,
     initialSupply,
+    vTokenReceiver: admin.address,
     supplyCap: initialSupply,
     borrowCap: initialSupply,
   });
@@ -413,6 +416,7 @@ const riskFundFixture = async (): Promise<void> => {
     accessControlManager: accessControlManager.address,
     beaconAddress: vTokenBeacon.address,
     initialSupply,
+    vTokenReceiver: admin.address,
     supplyCap: initialSupply,
     borrowCap: initialSupply,
   });
@@ -437,6 +441,7 @@ const riskFundFixture = async (): Promise<void> => {
     accessControlManager: accessControlManager.address,
     beaconAddress: vTokenBeacon.address,
     initialSupply,
+    vTokenReceiver: admin.address,
     supplyCap: initialSupply,
     borrowCap: initialSupply,
   });
@@ -461,6 +466,7 @@ const riskFundFixture = async (): Promise<void> => {
     accessControlManager: accessControlManager.address,
     beaconAddress: vTokenBeacon.address,
     initialSupply,
+    vTokenReceiver: admin.address,
     supplyCap: initialSupply,
     borrowCap: initialSupply,
   });

diff --git a/tests/hardhat/Fork/RiskFundSwap.ts b/tests/hardhat/Fork/RiskFundSwap.ts
@@ -236,6 +236,7 @@ const riskFundFixture = async (): Promise<void> => {
     accessControlManager: fakeAccessControlManager.address,
     beaconAddress: vTokenBeacon.address,
     initialSupply,
+    vTokenReceiver: admin.address,
     supplyCap: initialSupply,
     borrowCap: initialSupply,
   });
@@ -257,6 +258,7 @@ const riskFundFixture = async (): Promise<void> => {
     accessControlManager: fakeAccessControlManager.address,
     beaconAddress: vTokenBeacon.address,
     initialSupply,
+    vTokenReceiver: admin.address,
     supplyCap: initialSupply,
     borrowCap: initialSupply,
   });

diff --git a/tests/hardhat/Lens/PoolLens.ts b/tests/hardhat/Lens/PoolLens.ts
@@ -215,6 +215,7 @@ describe("PoolLens", async function () {
       accessControlManager: fakeAccessControlManager.address,
       beaconAddress: vTokenBeacon.address,
       initialSupply,
+      vTokenReceiver: owner.address,
       supplyCap: convertToUnit(4000, 18),
       borrowCap: convertToUnit(2000, 18),
     });
@@ -236,6 +237,7 @@ describe("PoolLens", async function () {
       accessControlManager: fakeAccessControlManager.address,
       beaconAddress: vTokenBeacon.address,
       initialSupply,
+      vTokenReceiver: owner.address,
       supplyCap: initialSupply,
       borrowCap: initialSupply,
     });