Merge ddf5dc3 into 43b220b

mstable · Apr 22, 2021 · fd5f673 · fd5f673
2 parents 43b220b + ddf5dc3
commit fd5f673
Show file tree

Hide file tree

Showing 63 changed files with 239,522 additions and 239,210 deletions.
diff --git a/.solcover.js b/.solcover.js
@@ -6,6 +6,7 @@ module.exports = {
         "shared/InitializableReentrancyGuard.sol",
         "integrations",
         "masset/peripheral",
+        "masset/versions",
         "peripheral",
         "savings/peripheral",
         "upgradability",

diff --git a/contracts/feeders/FeederPool.sol b/contracts/feeders/FeederPool.sol
@@ -122,7 +122,7 @@ contract FeederPool is
         BassetPersonal calldata _mAsset,
         BassetPersonal calldata _fAsset,
         address[] calldata _mpAssets,
-        InvariantConfig memory _config
+        BasicConfig memory _config
     ) public initializer {
         InitializableToken._initialize(_nameArg, _symbolArg);
 

diff --git a/contracts/interfaces/IInvariantValidator.sol b/contracts/interfaces/IInvariantValidator.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 pragma solidity 0.8.2;
 
-import { BassetData, InvariantConfig } from "../masset/MassetStructs.sol";
+import "../masset/MassetStructs.sol";
 
 abstract contract IInvariantValidator {
     // Mint
@@ -43,4 +43,10 @@ abstract contract IInvariantValidator {
         uint256[] calldata _rawOutputs,
         InvariantConfig memory _config
     ) external view virtual returns (uint256);
+
+    function computePrice(BassetData[] memory _bAssets, InvariantConfig memory _config)
+        public
+        virtual
+        pure
+        returns (uint256 price, uint256 k);
 }
diff --git a/contracts/interfaces/IMasset.sol b/contracts/interfaces/IMasset.sol
@@ -96,6 +96,8 @@ abstract contract IMasset {
 
     function bAssetIndexes(address) external view virtual returns (uint8);
 
+    function getPrice() external view virtual returns (uint256 price, uint256 k);
+
     // SavingsManager
     function collectInterest() external virtual returns (uint256 swapFeesGained, uint256 newSupply);
 
@@ -107,13 +109,9 @@ abstract contract IMasset {
     // Admin
     function setCacheSize(uint256 _cacheSize) external virtual;
 
-    function upgradeForgeValidator(address _newForgeValidator) external virtual;
-
     function setFees(uint256 _swapFee, uint256 _redemptionFee) external virtual;
 
     function setTransferFeesFlag(address _bAsset, bool _flag) external virtual;
 
     function migrateBassets(address[] calldata _bAssets, address _newIntegration) external virtual;
 }
-
-abstract contract Deprecated_BasketManager {}