@ensuro/core 2.8.2 → 2.9.0

package/contracts/RiskModule.sol

@@ -30,7 +30,7 @@ abstract contract RiskModule is IRiskModule, PolicyPoolComponent {
   uint16 internal constant MAX_MOC = 4e4; // 400%
 
   // For parameters that can be changed by the risk module provider
-  bytes32 public constant RM_PROVIDER_ROLE = keccak256("RM_PROVIDER_ROLE");
+  bytes32 internal constant RM_PROVIDER_ROLE = keccak256("RM_PROVIDER_ROLE");
 
   /// @custom:oz-upgrades-unsafe-allow state-variable-immutable
   IPremiumsAccount internal immutable _premiumsAccount;
@@ -206,48 +206,33 @@ abstract contract RiskModule is IRiskModule, PolicyPoolComponent {
     return _wallet;
   }
 
-  function setParam(
-    Parameter param,
-    uint256 newValue
-  ) external onlyGlobalOrComponentRole3(LEVEL1_ROLE, LEVEL2_ROLE, LEVEL3_ROLE) {
-    bool tweak = !hasPoolRole(LEVEL2_ROLE) && !hasPoolRole(LEVEL1_ROLE);
+  function setParam(Parameter param, uint256 newValue) external onlyGlobalOrComponentRole2(LEVEL1_ROLE, LEVEL2_ROLE) {
     if (param == Parameter.moc) {
-      require(!tweak || _isTweakWad(_4toWad(_params.moc), newValue, 1e17), "Tweak exceeded");
       _params.moc = _wadTo4(newValue);
     } else if (param == Parameter.jrCollRatio) {
-      require(!tweak || _isTweakWad(_4toWad(_params.jrCollRatio), newValue, 1e17), "Tweak exceeded");
       _params.jrCollRatio = _wadTo4(newValue);
     } else if (param == Parameter.collRatio) {
-      require(!tweak || _isTweakWad(_4toWad(_params.collRatio), newValue, 1e17), "Tweak exceeded");
       _params.collRatio = _wadTo4(newValue);
     } else if (param == Parameter.ensuroPpFee) {
-      require(!tweak || _isTweakWad(_4toWad(_params.ensuroPpFee), newValue, 1e17), "Tweak exceeded");
       _params.ensuroPpFee = _wadTo4(newValue);
     } else if (param == Parameter.ensuroCocFee) {
-      require(!tweak || _isTweakWad(_4toWad(_params.ensuroCocFee), newValue, 1e17), "Tweak exceeded");
       _params.ensuroCocFee = _wadTo4(newValue);
     } else if (param == Parameter.jrRoc) {
-      require(!tweak || _isTweakWad(_4toWad(_params.jrRoc), newValue, 1e17), "Tweak exceeded");
       _params.jrRoc = _wadTo4(newValue);
     } else if (param == Parameter.srRoc) {
-      require(!tweak || _isTweakWad(_4toWad(_params.srRoc), newValue, 1e17), "Tweak exceeded");
       _params.srRoc = _wadTo4(newValue);
     } else if (param == Parameter.maxPayoutPerPolicy) {
-      require(!tweak || _isTweakWad(maxPayoutPerPolicy(), newValue, 1e17), "Tweak exceeded");
       _params.maxPayoutPerPolicy = _amountToX(2, newValue);
     } else if (param == Parameter.exposureLimit) {
       require(newValue >= _activeExposure, "Can't set exposureLimit less than active exposure");
-      require(!tweak || _isTweakWad(exposureLimit(), newValue, 1e17), "Tweak exceeded");
-      require(newValue <= exposureLimit() || hasPoolRole(LEVEL1_ROLE), "Tweak exceeded: Increase requires LEVEL1_ROLE");
+      require(newValue <= exposureLimit() || hasPoolRole(LEVEL1_ROLE), "Increase requires LEVEL1_ROLE");
       _params.exposureLimit = _amountToX(0, newValue);
     } else if (param == Parameter.maxDuration) {
-      require(!tweak, "Tweak exceeded");
       _params.maxDuration = newValue.toUint16();
     }
     _parameterChanged(
       IAccessManager.GovernanceActions(uint256(IAccessManager.GovernanceActions.setMoc) + uint256(param)),
-      newValue,
-      tweak
+      newValue
     );
   }
 
@@ -255,7 +240,7 @@ abstract contract RiskModule is IRiskModule, PolicyPoolComponent {
     return _unpackParams(_params);
   }
 
-  function _unpackParams(PackedParams storage params_) internal view returns (Params memory ret) {
+  function _unpackParams(PackedParams memory params_) internal pure returns (Params memory ret) {
     return
       Params({
         moc: _4toWad(params_.moc),
@@ -268,12 +253,16 @@ abstract contract RiskModule is IRiskModule, PolicyPoolComponent {
       });
   }
 
+  function _makeInternalId(bytes32 policyData) internal pure returns (uint96) {
+    return uint96(uint256(policyData) % 2 ** 96);
+  }
+
   function setWallet(address wallet_) external onlyComponentRole(RM_PROVIDER_ROLE) {
     if (wallet_ == address(0)) {
       revert NoZeroWallet();
     }
     _wallet = wallet_;
-    _parameterChanged(IAccessManager.GovernanceActions.setWallet, uint256(uint160(wallet_)), false);
+    _parameterChanged(IAccessManager.GovernanceActions.setWallet, uint256(uint160(wallet_)));
   }
 
   function getMinimumPremium(

package/contracts/SignedBucketRiskModule.sol

@@ -18,10 +18,10 @@ import {RiskModule} from "./RiskModule.sol";
  * @author Ensuro
  */
 contract SignedBucketRiskModule is RiskModule {
-  bytes32 public constant POLICY_CREATOR_ROLE = keccak256("POLICY_CREATOR_ROLE");
-  bytes32 public constant REPLACER_ROLE = keccak256("REPLACER_ROLE");
-  bytes32 public constant PRICER_ROLE = keccak256("PRICER_ROLE");
-  bytes32 public constant RESOLVER_ROLE = keccak256("RESOLVER_ROLE");
+  bytes32 internal constant POLICY_CREATOR_ROLE = keccak256("POLICY_CREATOR_ROLE");
+  bytes32 internal constant REPLACER_ROLE = keccak256("REPLACER_ROLE");
+  bytes32 internal constant PRICER_ROLE = keccak256("PRICER_ROLE");
+  bytes32 internal constant RESOLVER_ROLE = keccak256("RESOLVER_ROLE");
 
   mapping(uint256 => PackedParams) internal _buckets;
 
@@ -114,7 +114,6 @@ contract SignedBucketRiskModule is RiskModule {
     address payer,
     address onBehalfOf
   ) internal returns (Policy.PolicyData memory createdPolicy) {
-    uint96 internalId = uint96(uint256(policyData) % 2 ** 96);
     createdPolicy = _newPolicyWithParams(
       payout,
       premium,
@@ -122,7 +121,7 @@ contract SignedBucketRiskModule is RiskModule {
       expiration,
       payer,
       onBehalfOf,
-      internalId,
+      _makeInternalId(policyData),
       bucketParams(bucketId)
     );
     emit NewSignedPolicy(createdPolicy.id, policyData);
@@ -225,10 +224,17 @@ contract SignedBucketRiskModule is RiskModule {
       quoteSignatureVS,
       quoteValidUntil
     );
-    uint96 internalId = uint96(uint256(policyData) % 2 ** 96);
     return
-      _replacePolicy(oldPolicy, payout, premium, lossProb, expiration, _msgSender(), internalId, bucketParams(bucketId))
-        .id;
+      _replacePolicy(
+        oldPolicy,
+        payout,
+        premium,
+        lossProb,
+        expiration,
+        _msgSender(),
+        _makeInternalId(policyData),
+        bucketParams(bucketId)
+      ).id;
   }
 
   function resolvePolicy(

package/contracts/SignedQuoteRiskModule.sol

@@ -91,11 +91,14 @@ contract SignedQuoteRiskModule is RiskModule {
     bytes32 quoteHash = ECDSA.toEthSignedMessageHash(
       abi.encodePacked(address(this), payout, premium, lossProb, expiration, policyData, quoteValidUntil)
     );
-    address signer = ECDSA.recover(quoteHash, quoteSignatureR, quoteSignatureVS);
-    _policyPool.access().checkComponentRole(address(this), PRICER_ROLE, signer, false);
-    uint96 internalId = uint96(uint256(policyData) % 2 ** 96);
+    _policyPool.access().checkComponentRole(
+      address(this),
+      PRICER_ROLE,
+      ECDSA.recover(quoteHash, quoteSignatureR, quoteSignatureVS),
+      false
+    );
 
-    createdPolicy = _newPolicy(payout, premium, lossProb, expiration, payer, onBehalfOf, internalId);
+    createdPolicy = _newPolicy(payout, premium, lossProb, expiration, payer, onBehalfOf, _makeInternalId(policyData));
     emit NewSignedPolicy(createdPolicy.id, policyData);
     return createdPolicy;
   }

package/js/test-utils.js

@@ -227,7 +227,6 @@ async function deployPool(options) {
   if (options.dontGrantL123Roles === undefined) {
     await grantRole(hre, accessManager, "LEVEL1_ROLE");
     await grantRole(hre, accessManager, "LEVEL2_ROLE");
-    await grantRole(hre, accessManager, "LEVEL3_ROLE");
   }
 
   return policyPool;
@@ -304,7 +303,7 @@ const fork = {
   },
 };
 
-if (process.env.ENABLE_HH_WARNINGS !== "yes") hre.upgrades.silenceWarnings();
+if (process.env.ENABLE_HH_WARNINGS !== "yes" && hre.upgrades !== undefined) hre.upgrades.silenceWarnings();
 
 module.exports = {
   addEToken,

package/js/utils.js

@@ -203,6 +203,31 @@ function makeQuoteMessage({ rmAddress, payout, premium, lossProb, expiration, po
   );
 }
 
+function paramsAsUint256(params) {
+  /* eslint no-bitwise: "off" */
+  return (
+    (params.moc << 240n) |
+    (params.jrCollRatio << 224n) |
+    (params.collRatio << 208n) |
+    (params.ensuroPpFee << 192n) |
+    (params.ensuroCocFee << 176n) |
+    (params.jrRoc << 160n) |
+    (params.srRoc << 144n)
+  );
+}
+
+/**
+ * Create a packed quote message for later signing or hashing.
+ *
+ * Mimics the behaviour of the FullSignedBucketRiskModule._checkFullSignature method.
+ */
+function makeFullQuoteMessage({ rmAddress, payout, premium, lossProb, expiration, policyData, params, validUntil }) {
+  return ethers.solidityPacked(
+    ["address", "uint256", "uint256", "uint256", "uint40", "bytes32", "uint256", "uint40"],
+    [rmAddress, payout, premium, lossProb, expiration, policyData, paramsAsUint256(params), validUntil]
+  );
+}
+
 /**
  * Create a packed quote message for later signing or hashing.
  *
@@ -263,6 +288,42 @@ async function defaultPolicyParams(
   };
 }
 
+async function defaultPolicyParamsWithBucket(opts, _A = amountFunction(6)) {
+  const ret = await defaultPolicyParams(opts, _A);
+  return { bucketId: opts.bucketId || 0, ...ret };
+}
+
+async function defaultPolicyParamsWithParams(opts, _A = amountFunction(6)) {
+  const ret = await defaultPolicyParams(opts, _A);
+  // struct PackedParams {
+  //   uint16 moc; // Margin Of Conservativism - factor that multiplies lossProb - 4 decimals
+  //   uint16 jrCollRatio; // Collateralization Ratio to compute Junior solvency as % of payout - 4 decimals
+  //   uint16 collRatio; // Collateralization Ratio to compute solvency requirement as % of payout - 4 decimals
+  //   uint16 ensuroPpFee; // % of pure premium that will go for Ensuro treasury - 4 decimals
+  //   uint16 ensuroCocFee; // % of CoC that will go for Ensuro treasury - 4 decimals
+  //   uint16 jrRoc; // Return on Capital paid to Junior LPs - Annualized Percentage - 4 decimals
+  //   uint16 srRoc; // Return on Capital paid to Senior LPs - Annualized Percentage - 4 decimals
+  //   uint32 maxPayoutPerPolicy; // Max Payout per Policy - 2 decimals
+  //   uint32 exposureLimit; // Max exposure (sum of payouts) to be allocated to this module - 0 decimals
+  //   uint16 maxDuration; // Max policy duration (in hours)
+  // }
+  const optsParams = opts.params || {};
+  const wadTo4Decimals = 10n ** 14n;
+  const params = {
+    moc: (optsParams.moc || _W(1)) / wadTo4Decimals,
+    jrCollRatio: (optsParams.jrCollRatio || 0n) / wadTo4Decimals,
+    collRatio: (optsParams.collRatio || _W(1)) / wadTo4Decimals,
+    ensuroPpFee: (optsParams.ensuroPpFee || 0n) / wadTo4Decimals,
+    ensuroCocFee: (optsParams.ensuroCocFee || 0n) / wadTo4Decimals,
+    jrRoc: (optsParams.jrRoc || 0n) / wadTo4Decimals,
+    srRoc: (optsParams.srRoc || _W("0.1")) / wadTo4Decimals, // 10%
+    maxPayoutPerPolicy: 0n, // Not used
+    exposureLimit: 0n, // Not used
+    maxDuration: 0n, // Not used
+  };
+  return { params, ...ret };
+}
+
 function defaultBucketParams({ moc, jrCollRatio, collRatio, ensuroPpFee, ensuroCocFee, jrRoc, srRoc }) {
   return {
     moc: moc !== undefined ? moc : _W("1.1"),
@@ -299,6 +360,8 @@ module.exports = {
   accessControlMessage,
   amountFunction,
   defaultPolicyParams,
+  defaultPolicyParamsWithBucket,
+  defaultPolicyParamsWithParams,
   defaultBucketParams,
   getAddress,
   getComponentRole,
@@ -309,6 +372,8 @@ module.exports = {
   grantComponentRole,
   grantRole,
   makeBucketQuoteMessage,
+  makeFullQuoteMessage,
+  paramsAsUint256,
   makePolicyId,
   makeQuoteMessage,
   makeSignedQuote,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ensuro/core",
   "description": "Ensuro - Decentralized insurance protocol",
-  "version": "2.8.2",
+  "version": "2.9.0",
   "files": [
     "**/*.sol",
     "/build",

package/scripts/deploySmokeTest-fork.sh

@@ -26,7 +26,7 @@ POOL=`readAddress POOL`
 ACCESSMANAGER=`readAddress ACCESSMANAGER`
 echo "PolicyPool = $POOL / AccessManager = $ACCESSMANAGER"
 
-for ROLE in LEVEL1 LEVEL2 LEVEL3; do
+for ROLE in LEVEL1 LEVEL2; do
   npx hardhat --network $NETWORK ens:grantRole --contract-address $ACCESSMANAGER \
       --role ${ROLE}_ROLE || die "Error granting ${ROLE}_ROLE"
 done

package/scripts/deploySmokeTest.sh

@@ -17,7 +17,7 @@ POOL=`readAddress POOL`
 ACCESSMANAGER=`readAddress ACCESSMANAGER`
 echo "PolicyPool = $POOL / AccessManager = $ACCESSMANAGER"
 
-for ROLE in LEVEL1 LEVEL2 LEVEL3; do
+for ROLE in LEVEL1 LEVEL2; do
   npx hardhat --network $NETWORK ens:grantRole --contract-address $ACCESSMANAGER \
       --role ${ROLE}_ROLE || die "Error granting ${ROLE}_ROLE"
 done