Release v2.11.0: Product Pricing Updates (#1307)

Author: duxxud

contracts/interfaces/IAssessmentViewer.sol

@@ -10,7 +10,12 @@ interface IAssessmentViewer {
     uint withdrawableUntilIndex;
   }
 
+  struct AssessmentStakeLockedState {
+    bool isStakeLocked;
+    uint stakeLockupExpiry;
+  }
+
   function getRewards(address user) external view returns (AssessmentRewards memory);
 
-  function isStakeLocked(address member) external view returns (bool stakeLocked);
+  function getStakeLocked(address member) external view returns (AssessmentStakeLockedState memory);
 }

contracts/interfaces/ICover.sol

@@ -103,14 +103,14 @@ interface ICover {
 
   function getGlobalRewardsRatio() external view returns (uint);
 
-  function getGlobalMinPriceRatio() external pure returns (uint);
+  function getDefaultMinPriceRatio() external pure returns (uint);
 
   function getGlobalCapacityAndPriceRatios() external view returns (
     uint _globalCapacityRatio,
-    uint _globalMinPriceRatio
+    uint _defaultMinPriceRatio
   );
 
-  function GLOBAL_MIN_PRICE_RATIO() external view returns (uint);
+  function DEFAULT_MIN_PRICE_RATIO() external view returns (uint);
 
   /* === MUTATIVE FUNCTIONS ==== */
 
@@ -125,8 +125,6 @@ interface ICover {
     uint amount
   ) external returns (address coverOwner);
 
-  function changeStakingPoolFactoryOperator() external;
-
   function coverNFT() external returns (ICoverNFT);
 
   function stakingNFT() external returns (IStakingNFT);

contracts/interfaces/ICoverProducts.sol

@@ -17,7 +17,9 @@ struct ProductInitializationParams {
 
 struct Product {
   uint16 productType;
-  address yieldTokenAddress;
+  uint16 minPrice;
+  // leftover memory gap from the previously used address field yieldTokenAddress
+  uint144 __gap;
   // cover assets bitmap. each bit represents whether the asset with
   // the index of that bit is enabled as a cover asset for this product
   uint32 coverAssets;
@@ -99,6 +101,8 @@ interface ICoverProducts {
 
   function getInitialPrices(uint[] calldata productIds) external view returns (uint[] memory);
 
+  function getMinPrices(uint[] calldata productIds) external view returns (uint[] memory);
+
   function prepareStakingProductsParams(
     ProductInitializationParams[] calldata params
   ) external returns (
@@ -127,7 +131,7 @@ interface ICoverProducts {
 
   // Misc
   error UnsupportedCoverAssets();
-  error InitialPriceRatioBelowGlobalMinPriceRatio();
+  error InitialPriceRatioBelowMinPriceRatio();
   error InitialPriceRatioAbove100Percent();
   error CapacityReductionRatioAbove100Percent();
 

contracts/interfaces/IMasterAwareV2.sol

@@ -14,11 +14,11 @@ interface IMasterAwareV2 {
     SP, // StakingProducts.sol
     PS, // LegacyPooledStaking.sol
     GV, // Governance.sol
-    GW, // LegacyGateway.sol - removed
-    CL, // CoverMigrator.sol - removed
+    UNUSED_GW, // LegacyGateway.sol - removed
+    UNUSED_CL, // CoverMigrator.sol - removed
     AS, // Assessment.sol
     CI, // IndividualClaims.sol - Claims for Individuals
-    CG, // YieldTokenIncidents.sol - Claims for Groups
+    UNUSED_CG, // YieldTokenIncidents.sol - Claims for Groups -- removed
     RA, // Ramm.sol
     ST,  // SafeTracker.sol
     CP  // CoverProducts.sol

contracts/interfaces/INexusViewer.sol

@@ -23,6 +23,7 @@ interface INexusViewer {
   struct StakedNXM {
     uint stakingPoolTotalActiveStake; // Total amount of active stake in staking pools in NXM
     uint assessmentStake; // Locked assessment stake in NXM
+    uint assessmentStakeLockupExpiry; // Locked stake expiry timestamp
     uint assessmentRewards; // Locked assessment rewards in NXM
   }
 

contracts/interfaces/IStakingPool.sol

@@ -17,7 +17,7 @@ struct AllocationRequest {
   uint globalCapacityRatio;
   uint capacityReductionRatio;
   uint rewardRatio;
-  uint globalMinPrice;
+  uint productMinPrice;
 }
 
 struct BurnStakeParams {
@@ -157,11 +157,6 @@ interface IStakingPool {
     uint reductionRatio
   ) external view returns (uint[] memory trancheCapacities);
 
-  function updateRewardsShares(
-    uint trancheId,
-    uint[] calldata tokenIds
-  ) external;
-
   /* ========== EVENTS ========== */
 
   event StakeDeposited(address indexed user, uint256 amount, uint256 trancheId, uint256 tokenId);

contracts/interfaces/IStakingProducts.sol

@@ -56,12 +56,10 @@ interface IStakingProducts {
     uint productId,
     uint period,
     uint coverAmount,
-    uint initialCapacityUsed,
     uint totalCapacity,
-    uint globalMinPrice,
+    uint productMinPrice,
     bool useFixedPrice,
-    uint nxmPerAllocationUnit,
-    uint allocationUnitsPerNxm
+    uint nxmPerAllocationUnit
   ) external returns (uint premium);
 
   function calculateFixedPricePremium(
@@ -77,32 +75,13 @@ interface IStakingProducts {
     StakedProduct memory product,
     uint period,
     uint coverAmount,
-    uint initialCapacityUsed,
     uint totalCapacity,
     uint targetPrice,
     uint currentBlockTimestamp,
     uint nxmPerAllocationUnit,
-    uint allocationUnitsPerNxm,
     uint targetPriceDenominator
   ) external pure returns (uint premium, StakedProduct memory);
 
-  function calculatePremiumPerYear(
-    uint basePrice,
-    uint coverAmount,
-    uint initialCapacityUsed,
-    uint totalCapacity,
-    uint nxmPerAllocationUnit,
-    uint allocationUnitsPerNxm,
-    uint targetPriceDenominator
-  ) external pure returns (uint);
-
-  // Calculates the premium for a given cover amount starting with the surge point
-  function calculateSurgePremium(
-    uint amountOnSurge,
-    uint totalCapacity,
-    uint allocationUnitsPerNxm
-  ) external pure returns (uint);
-
   /* ========== STAKING POOL CREATION ========== */
 
   function stakingPool(uint poolId) external view returns (IStakingPool);
@@ -149,7 +128,7 @@ interface IStakingProducts {
   // Staking Pool creation
   error ProductDoesntExistOrIsDeprecated();
   error InvalidProductType();
-  error TargetPriceBelowGlobalMinPriceRatio();
+  error TargetPriceBelowMinPriceRatio();
 
   // IPFS
   error IpfsHashRequired();

contracts/interfaces/IYieldTokenIncidents.sol

@@ -7,10 +7,10 @@ import "../../interfaces/ICoverNFT.sol";
 
 contract CoverGeneric is ICover {
 
-  uint public constant GLOBAL_MIN_PRICE_RATIO = 100; // 1%
+  uint public constant DEFAULT_MIN_PRICE_RATIO = 100; // 1%
   uint public constant MAX_COMMISSION_RATIO = 3000; // 30%
 
-  function getGlobalMinPriceRatio() public virtual pure returns (uint) {
+  function getDefaultMinPriceRatio() public virtual pure returns (uint) {
     revert("Unsupported");
   }
 

contracts/mocks/generic/CoverGeneric.sol

@@ -6,6 +6,8 @@ import "../../interfaces/ICoverProducts.sol";
 
 contract CoverProductsGeneric is ICoverProducts {
 
+  uint public constant DEFAULT_MIN_PRICE_RATIO = 100; // 1%
+
   /* ========== VIEWS ========== */
 
   function getProductType(uint) external virtual view returns (ProductType memory) {
@@ -85,6 +87,10 @@ contract CoverProductsGeneric is ICoverProducts {
     revert("Unsupported");
   }
 
+  function getMinPrices(uint[] calldata) external view virtual returns (uint[] memory) {
+    revert("Unsupported");
+  }
+
   function prepareStakingProductsParams(
     ProductInitializationParams[] calldata
   ) external virtual pure returns (