chore: Add constructor args to SM 1.4

dimsome · Oct 23, 2021 · c564a64 · c564a64
1 parent 5de8202
commit c564a64
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 20 deletions.
diff --git a/contracts/savings/SavingsManager.sol b/contracts/savings/SavingsManager.sol
@@ -21,8 +21,8 @@ import { YieldValidator } from "../shared/YieldValidator.sol";
  * @author  mStable
  * @notice  Savings Manager collects interest from mAssets and sends them to the
  *          corresponding Savings Contract, performing some validation in the process.
- * @dev     VERSION: 1.3
- *          DATE:    2020-12-09
+ * @dev     VERSION: 1.4
+ *          DATE:    2021-10-15
  */
 contract SavingsManager is ISavingsManager, PausableModule {
     using StableMath for uint256;
@@ -80,13 +80,24 @@ contract SavingsManager is ISavingsManager, PausableModule {
 
     constructor(
         address _nexus,
-        address _mUSD,
-        address _savingsContract,
+        address[] memory _mAssets,
+        address[] memory _savingsContracts,
+        address[] memory _revenueRecipients,
         uint256 _savingsRate,
         uint256 _duration
     ) PausableModule(_nexus) {
-        _updateSavingsContract(_mUSD, _savingsContract);
-        emit SavingsContractAdded(_mUSD, _savingsContract);
+        uint256 len = _mAssets.length;
+        require(
+            _savingsContracts.length == len && _revenueRecipients.length == len,
+            "Invalid inputs"
+        );
+        for (uint256 i = 0; i < len; i++) {
+            _updateSavingsContract(_mAssets[i], _savingsContracts[i]);
+            emit SavingsContractAdded(_mAssets[i], _savingsContracts[i]);
+
+            revenueRecipients[_mAssets[i]] = IRevenueRecipient(_revenueRecipients[i]);
+            emit RevenueRecipientSet(_mAssets[i], _revenueRecipients[i]);
+        }
         savingsRate = _savingsRate;
         DURATION = _duration;
     }
@@ -169,8 +180,8 @@ contract SavingsManager is ISavingsManager, PausableModule {
      * @param _savingsRate   Rate of savings sent to SavingsContract (100% = 1e18)
      */
     function setSavingsRate(uint256 _savingsRate) external onlyGovernor {
-        // Greater than 60% upto 100%
-        require(_savingsRate >= 6e17 && _savingsRate <= 1e18, "Must be a valid rate");
+        // Greater than 25% up to 100%
+        require(_savingsRate >= 25e16 && _savingsRate <= 1e18, "Must be a valid rate");
         savingsRate = _savingsRate;
         emit SavingsRateChanged(_savingsRate);
     }

diff --git a/test/masset/liquidator.spec.ts b/test/masset/liquidator.spec.ts
@@ -127,8 +127,9 @@ describe("Liquidator", () => {
         await save.initialize(sa.default.address, "Savings Credit", "imUSD")
         savings = await new SavingsManager__factory(sa.default.signer).deploy(
             nexus.address,
-            mUSD.address,
-            save.address,
+            [mUSD.address],
+            [save.address],
+            [ZERO_ADDRESS],
             simpleToExactAmount(1, 18),
             ONE_WEEK,
         )

diff --git a/test/polygon/pliquidator.spec.ts b/test/polygon/pliquidator.spec.ts
@@ -103,8 +103,9 @@ describe("Liquidator", () => {
         await save.initialize(sa.default.address, "Savings Credit", "imUSD")
         savings = await new SavingsManager__factory(sa.default.signer).deploy(
             nexus.address,
-            mUSD.address,
-            save.address,
+            [mUSD.address],
+            [save.address],
+            [ZERO_ADDRESS],
             simpleToExactAmount(1, 18),
             ONE_WEEK,
         )

diff --git a/test/savings/savings-manager.spec.ts b/test/savings/savings-manager.spec.ts
@@ -49,8 +49,9 @@ describe("SavingsManager", async () => {
 
         savingsManager = await new SavingsManager__factory(sa.default.signer).deploy(
             nexus.address,
-            mUSD.address,
-            savingsContract.address,
+            [mUSD.address],
+            [savingsContract.address],
+            [ZERO_ADDRESS],
             simpleToExactAmount(1),
             ONE_WEEK,
         )
@@ -89,8 +90,9 @@ describe("SavingsManager", async () => {
             await expect(
                 new SavingsManager__factory(sa.default.signer).deploy(
                     ZERO_ADDRESS,
-                    mUSD.address,
-                    savingsContract.address,
+                    [mUSD.address],
+                    [savingsContract.address],
+                    [ZERO_ADDRESS],
                     simpleToExactAmount(1),
                     ONE_WEEK,
                 ),
@@ -101,8 +103,9 @@ describe("SavingsManager", async () => {
             await expect(
                 new SavingsManager__factory(sa.default.signer).deploy(
                     nexus.address,
-                    ZERO_ADDRESS,
-                    savingsContract.address,
+                    [ZERO_ADDRESS],
+                    [savingsContract.address],
+                    [ZERO_ADDRESS],
                     simpleToExactAmount(1),
                     ONE_WEEK,
                 ),
@@ -113,8 +116,9 @@ describe("SavingsManager", async () => {
             await expect(
                 new SavingsManager__factory(sa.default.signer).deploy(
                     nexus.address,
-                    mUSD.address,
-                    ZERO_ADDRESS,
+                    [mUSD.address],
+                    [ZERO_ADDRESS],
+                    [ZERO_ADDRESS],
                     simpleToExactAmount(1),
                     ONE_WEEK,
                 ),