@ensuro/core 2.0.0-beta1 → 2.0.0-beta10

package/contracts/Reserve.sol

@@ -2,33 +2,212 @@
 pragma solidity ^0.8.0;
 
 import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
+import {Address} from "@openzeppelin/contracts/utils/Address.sol";
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import {IPolicyPool} from "./interfaces/IPolicyPool.sol";
+import {IAssetManager} from "./interfaces/IAssetManager.sol";
+import {IAccessManager} from "./interfaces/IAccessManager.sol";
 import {PolicyPoolComponent} from "./PolicyPoolComponent.sol";
 
 /**
  * @title Base contract for Ensuro cash reserves
- * @dev This contract implements the methods related with management of the reserves and payments
+ * @dev This contract implements the methods related with management of the reserves and payments. {EToken} and
+ * {PremiumsAccount} inherit from this contract.
+ *
+ * These contracts have an asset manager {IAssetManager} that's a strategy contract that runs in the same context
+ * (called with delegatecall) that apply some strategy to reinvest the assets managed by the contract to generate
+ * additional returns.
+ *
  * @custom:security-contact security@ensuro.co
  * @author Ensuro
  */
 abstract contract Reserve is PolicyPoolComponent {
   using SafeERC20 for IERC20Metadata;
+  using Address for address;
 
   /// @custom:oz-upgrades-unsafe-allow state-variable-immutable
   // solhint-disable-next-line var-name-mixedcase
-  uint256 public immutable NEGLIGIBLE_AMOUNT; // init as 10**(decimals/2) == 0.001 USD
+  uint256 internal immutable NEGLIGIBLE_AMOUNT; // init as 10**(decimals/2) == 0.001 USD
 
+  /**
+   * @dev Reserve constructor. Calculates NEGLIGIBLE_AMOUNT to avoid rounding errors.
+   *
+   * @param policyPool_ The {PolicyPool} where this reserve will be plugged
+   */
   /// @custom:oz-upgrades-unsafe-allow constructor
   constructor(IPolicyPool policyPool_) PolicyPoolComponent(policyPool_) {
     NEGLIGIBLE_AMOUNT = 10**(policyPool_.currency().decimals() / 2);
   }
 
+  /**
+   * @dev Refills the reserve's balance, deinvesting from the asset manager to be able to make a payment
+   *
+   * @param amount The amount of the payment that needs to be made
+   * @return Returns the actual amount deinvested (how much the `currency().balanceof(this)` was increased). It might be
+   * more than `amount` because the asset manager might want to give more liquidity to the reserve to avoid further
+   * deinvestments. After the call, the `currency().balanceof(this)` should be greater than `amount` (unless unsolvency
+   * problem).
+   */
+  function _refillWallet(uint256 amount) internal returns (uint256) {
+    address am = address(assetManager());
+    if (am != address(0)) {
+      bytes memory result = am.functionDelegateCall(
+        abi.encodeWithSelector(IAssetManager.refillWallet.selector, amount),
+        "Error refilling wallet"
+      );
+      return abi.decode(result, (uint256));
+    }
+    return 0;
+  }
+
+  /**
+   * @dev Internal function that transfers money to a destination. It might need to call `_refillWallet` to deinvest
+   * some money to have enought liquidity for the payment.
+   *
+   * @param destination The destination of the transfer.
+   * @param amount The amount to be transferred.
+   */
   function _transferTo(address destination, uint256 amount) internal {
     if (amount == 0) return;
     uint256 balance = currency().balanceOf(address(this));
-    if (balance < amount && (amount - balance) < NEGLIGIBLE_AMOUNT) amount = balance;
-    // TODO: asset management
+    if (balance < amount) {
+      balance += _refillWallet(amount);
+      if (amount > balance) {
+        if ((amount - balance) < NEGLIGIBLE_AMOUNT) {
+          amount = balance;
+        } // else - No need to do anything since safeTransfer will fail anyway
+      }
+    }
     currency().safeTransfer(destination, amount);
   }
+
+  /**
+   * @dev Returns the address of the asset manager for this reserve. The asset manager is the contract that manages the
+   * funds to generate additional yields. Can be `address(0)` if no asset manager has been set.
+   */
+  function assetManager() public view virtual returns (IAssetManager);
+
+  /**
+   * @dev Internal function that needs to be implemented by child contracts because they might store the asset manager
+   * address in a different way. This function just stores the value, doesn't do any validation (validations are done on
+   * `setAssetManager`.
+   *
+   * @param newAM The address of the new asset manager for the reserve.
+   */
+  function _setAssetManager(IAssetManager newAM) internal virtual;
+
+  /**
+   * @dev Internal function that needs to be implemented by child contracts to record the earnings (or losses if
+   * negative) generated by the asset management.
+   *
+   * @param earnings The amount of earnings (or losses if negative) generated since last time the earnings were
+   * recorded.
+   */
+  function _assetEarnings(int256 earnings) internal virtual;
+
+  /**
+   * @dev Sets the asset manager for this reserve. If the reserve had previously an asset manager, it will deinvest all
+   * the funds, making all of the liquid in the reserve balance.
+   *
+   * Requirements:
+   * - The caller must have been granted of global or component roles GUARDIAN_ROLE or LEVEL1_ROLE.
+   *
+   * Events:
+   * - Emits ComponentChanged with action setAssetManager or setAssetManagerForced
+   *
+   * @param newAM The address of the new asset manager to assign to the reserve. If is `address(0)` it means the reserve
+   * will not have an asset manager. If not `address(0)` it MUST be a contract following the IAssetManager interface.
+   * @param force When a previous asset manager exists, before setting the new one, the funds are deinvested. When
+   * `force` is true, an error in the deinvestAll() operation is ignored. When `force` is false, if `deinvestAll()`
+   * fails, it reverts.
+   */
+  function setAssetManager(IAssetManager newAM, bool force)
+    external
+    onlyGlobalOrComponentRole2(GUARDIAN_ROLE, LEVEL1_ROLE)
+  {
+    require(
+      address(newAM) == address(0) || address(newAM).isContract(),
+      "The assetManager is not a contract!"
+    );
+    address am = address(assetManager());
+    IAccessManager.GovernanceActions action = IAccessManager.GovernanceActions.setAssetManager;
+    if (am != address(0)) {
+      if (force) {
+        // Ignores success or not
+        // solhint-disable-next-line avoid-low-level-calls
+        (bool success, bytes memory result) = am.delegatecall(
+          abi.encodeWithSelector(IAssetManager.deinvestAll.selector)
+        );
+        if (!success) {
+          action = IAccessManager.GovernanceActions.setAssetManagerForced;
+        } else {
+          _assetEarnings(abi.decode(result, (int256)));
+        }
+      } else {
+        bytes memory result = am.functionDelegateCall(
+          abi.encodeWithSelector(IAssetManager.deinvestAll.selector)
+        );
+        _assetEarnings(abi.decode(result, (int256)));
+      }
+    }
+    _setAssetManager(newAM);
+    am = address(assetManager());
+    if (am != address(0)) {
+      am.functionDelegateCall(abi.encodeWithSelector(IAssetManager.connect.selector));
+    }
+    _componentChanged(action, address(newAM));
+  }
+
+  /**
+   * @dev Calls {IAssetManager-rebalance} of the assigned asset manager (fails if no asset manager). This operation is
+   * intended to give the opportunity to rebalance the liquid and invested for better returns and/or gas optimization.
+   *
+   * - Emits {IAssetManager-MoneyInvested} or {IAssetManager-MoneyDeinvested}
+   */
+  function rebalance() public whenNotPaused {
+    address(assetManager()).functionDelegateCall(
+      abi.encodeWithSelector(IAssetManager.rebalance.selector)
+    );
+  }
+
+  /**
+   * @dev Calls {IAssetManager-recordEarnings} of the assigned asset manager (fails if no asset manager). The asset
+   * manager will return the earnings since last time the earnings where recorded. It then calls `_assetEarnings` to
+   * reflect the earnings in the way defined for each reserve.
+   *
+   * - Emits {IAssetManager-EarningsRecorded}
+   */
+  function recordEarnings() public whenNotPaused {
+    bytes memory result = address(assetManager()).functionDelegateCall(
+      abi.encodeWithSelector(IAssetManager.recordEarnings.selector)
+    );
+    _assetEarnings(abi.decode(result, (int256)));
+  }
+
+  /**
+   * @dev Function that calls both `recordEarnings()` and `rebalance()` (in that order). Usually scheduled to run once a
+   * day by a keeper or crontask.
+   */
+  function checkpoint() external whenNotPaused {
+    recordEarnings();
+    rebalance();
+  }
+
+  /**
+   * @dev This function allows to call custom functions of the asset manager (for example for setting parameters).
+   *      This functions will be called with `delegatecall`, in the context of the reserve.
+   *
+   * Requirements:
+   * - The caller must have been granted of global or component roles LEVEL2_ROLE.
+   *
+   * @param functionCall Abi encoded function call to make.
+   * @return Returns the return value of the function called, to be decoded by the receiver.
+   */
+  function forwardToAssetManager(bytes memory functionCall)
+    external
+    onlyGlobalOrComponentRole(LEVEL2_ROLE)
+    returns (bytes memory)
+  {
+    return address(assetManager()).functionDelegateCall(functionCall);
+  }
 }

package/contracts/RiskModule.sol

@@ -1,12 +1,13 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.0;
 
-import {WadRayMath} from "./WadRayMath.sol";
+import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";
+import {WadRayMath} from "./dependencies/WadRayMath.sol";
 import {IPolicyPool} from "./interfaces/IPolicyPool.sol";
 import {PolicyPoolComponent} from "./PolicyPoolComponent.sol";
 import {IRiskModule} from "./interfaces/IRiskModule.sol";
 import {IPremiumsAccount} from "./interfaces/IPremiumsAccount.sol";
-import {IPolicyPoolConfig} from "./interfaces/IPolicyPoolConfig.sol";
+import {IAccessManager} from "./interfaces/IAccessManager.sol";
 import {Policy} from "./Policy.sol";
 
 /**
@@ -18,6 +19,7 @@ import {Policy} from "./Policy.sol";
 abstract contract RiskModule is IRiskModule, PolicyPoolComponent {
   using Policy for Policy.PolicyData;
   using WadRayMath for uint256;
+  using SafeCast for uint256;
 
   uint256 internal constant SECONDS_IN_YEAR_WAD = 31536000e18; /* 365 * 24 * 3600 * 10e18 */
 
@@ -153,7 +155,7 @@ abstract contract RiskModule is IRiskModule, PolicyPoolComponent {
 
   function _wadTo4(uint256 value) internal pure returns (uint16) {
     // Wad to 4 decimals
-    return uint16(value / 1e14);
+    return (value / 1e14).toUint16();
   }
 
   // solhint-disable-next-line func-name-mixedcase
@@ -164,7 +166,7 @@ abstract contract RiskModule is IRiskModule, PolicyPoolComponent {
 
   function _amountToX(uint8 decimals, uint256 value) internal view returns (uint32) {
     // Wad to X decimals
-    return uint32(value / 10**(currency().decimals() - decimals));
+    return (value / 10**(currency().decimals() - decimals)).toUint32();
   }
 
   function maxPayoutPerPolicy() public view override returns (uint256) {
@@ -189,7 +191,7 @@ abstract contract RiskModule is IRiskModule, PolicyPoolComponent {
 
   function setParam(Parameter param, uint256 newValue)
     external
-    onlyPoolRole3(LEVEL1_ROLE, LEVEL2_ROLE, LEVEL3_ROLE)
+    onlyGlobalOrComponentRole3(LEVEL1_ROLE, LEVEL2_ROLE, LEVEL3_ROLE)
   {
     bool tweak = !hasPoolRole(LEVEL2_ROLE) && !hasPoolRole(LEVEL1_ROLE);
     if (param == Parameter.moc) {
@@ -235,11 +237,11 @@ abstract contract RiskModule is IRiskModule, PolicyPoolComponent {
       _params.exposureLimit = _amountToX(0, newValue);
     } else if (param == Parameter.maxDuration) {
       require(!tweak, "Tweak exceeded");
-      _params.maxDuration = uint16(newValue);
+      _params.maxDuration = newValue.toUint16();
     }
     _parameterChanged(
-      IPolicyPoolConfig.GovernanceActions(
-        uint256(IPolicyPoolConfig.GovernanceActions.setMoc) + uint256(param)
+      IAccessManager.GovernanceActions(
+        uint256(IAccessManager.GovernanceActions.setMoc) + uint256(param)
       ),
       newValue,
       tweak
@@ -261,11 +263,7 @@ abstract contract RiskModule is IRiskModule, PolicyPoolComponent {
 
   function setWallet(address wallet_) external onlyComponentRole(RM_PROVIDER_ROLE) {
     _wallet = wallet_;
-    _parameterChanged(
-      IPolicyPoolConfig.GovernanceActions.setWallet,
-      uint256(uint160(wallet_)),
-      false
-    );
+    _parameterChanged(IAccessManager.GovernanceActions.setWallet, uint256(uint160(wallet_)), false);
   }
 
   function getMinimumPremium(
@@ -304,8 +302,9 @@ abstract contract RiskModule is IRiskModule, PolicyPoolComponent {
    * @param payout The exposure (maximum payout) of the policy
    * @param premium The premium that will be paid by the policyHolder
    * @param lossProb The probability of having to pay the maximum payout (wad)
+   * @param payer The account that pays for the premium
    * @param expiration The expiration of the policy (timestamp)
-   * @param customer The policy holder
+   * @param onBehalfOf The policy holder
    * @param internalId An id that's unique within this module and it will be used to identify the policy
    */
   function _newPolicy(
@@ -313,18 +312,26 @@ abstract contract RiskModule is IRiskModule, PolicyPoolComponent {
     uint256 premium,
     uint256 lossProb,
     uint40 expiration,
-    address customer,
+    address payer,
+    address onBehalfOf,
     uint96 internalId
   ) internal whenNotPaused returns (Policy.PolicyData memory) {
+    if (premium == type(uint256).max) {
+      premium = getMinimumPremium(payout, lossProb, expiration);
+    }
     require(premium < payout, "Premium must be less than payout");
     uint40 now_ = uint40(block.timestamp);
     require(expiration > now_, "Expiration must be in the future");
     require(((expiration - now_) / 3600) < _params.maxDuration, "Policy exceeds max duration");
-    require(customer != address(0), "Customer can't be zero address");
+    require(onBehalfOf != address(0), "Customer can't be zero address");
     require(
-      _policyPool.currency().allowance(customer, address(_policyPool)) >= premium,
+      _policyPool.currency().allowance(payer, address(_policyPool)) >= premium,
       "You must allow ENSURO to transfer the premium"
     );
+    require(
+      payer == _msgSender() || _policyPool.currency().allowance(payer, _msgSender()) >= premium,
+      "Payer must allow caller to transfer the premium"
+    );
     require(payout <= maxPayoutPerPolicy(), "RiskModule: Payout is more than maximum per policy");
     Policy.PolicyData memory policy = Policy.initialize(
       this,
@@ -335,8 +342,8 @@ abstract contract RiskModule is IRiskModule, PolicyPoolComponent {
       expiration
     );
     _activeExposure += policy.payout;
-    require(_activeExposure <= exposureLimit(), "RiskModule: SCR limit exceeded");
-    uint256 policyId = _policyPool.newPolicy(policy, customer, internalId);
+    require(_activeExposure <= exposureLimit(), "RiskModule: Exposure limit exceeded");
+    uint256 policyId = _policyPool.newPolicy(policy, payer, onBehalfOf, internalId);
     policy.id = policyId;
     return policy;
   }

package/contracts/SignedQuoteRiskModule.sol

@@ -0,0 +1,241 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.0;
+
+import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
+import {IPolicyPool} from "./interfaces/IPolicyPool.sol";
+import {IPremiumsAccount} from "./interfaces/IPremiumsAccount.sol";
+import {RiskModule} from "./RiskModule.sol";
+import {Policy} from "./Policy.sol";
+
+/**
+ * @title SignedQuote Risk Module
+ * @dev Risk Module that for policy creation verifies the different components of the price have been signed by a
+        trusted account (PRICER_ROLE). For the resolution (resolvePolicy), it has to be called by an authorized user
+ * @custom:security-contact security@ensuro.co
+ * @author Ensuro
+ */
+contract SignedQuoteRiskModule is RiskModule {
+  bytes32 public constant POLICY_CREATOR_ROLE = keccak256("POLICY_CREATOR_ROLE");
+  bytes32 public constant PRICER_ROLE = keccak256("PRICER_ROLE");
+  bytes32 public constant RESOLVER_ROLE = keccak256("RESOLVER_ROLE");
+
+  /// @custom:oz-upgrades-unsafe-allow state-variable-immutable
+  bool internal immutable _creationIsOpen;
+
+  event NewSignedPolicy(uint256 indexed policyId, bytes32 policyData);
+
+  /// @custom:oz-upgrades-unsafe-allow constructor
+  constructor(
+    IPolicyPool policyPool_,
+    IPremiumsAccount premiumsAccount_,
+    bool creationIsOpen_
+  ) RiskModule(policyPool_, premiumsAccount_) {
+    _creationIsOpen = creationIsOpen_;
+  }
+
+  /**
+   * @dev Initializes the RiskModule
+   * @param name_ Name of the Risk Module
+   * @param collRatio_ Collateralization ratio to compute solvency requirement as % of payout (in ray)
+   * @param ensuroPpFee_ % of pure premium that will go for Ensuro treasury (in ray)
+   * @param srRoc_ return on capital paid to Senior LPs (annualized percentage - in ray)
+   * @param maxPayoutPerPolicy_ Maximum payout per policy (in wad)
+   * @param exposureLimit_ Max exposure (sum of payouts) to be allocated to this module (in wad)
+   * @param wallet_ Address of the RiskModule provider
+   */
+  function initialize(
+    string memory name_,
+    uint256 collRatio_,
+    uint256 ensuroPpFee_,
+    uint256 srRoc_,
+    uint256 maxPayoutPerPolicy_,
+    uint256 exposureLimit_,
+    address wallet_
+  ) public initializer {
+    __RiskModule_init(
+      name_,
+      collRatio_,
+      ensuroPpFee_,
+      srRoc_,
+      maxPayoutPerPolicy_,
+      exposureLimit_,
+      wallet_
+    );
+  }
+
+  function _newPolicySigned(
+    uint256 payout,
+    uint256 premium,
+    uint256 lossProb,
+    uint40 expiration,
+    bytes32 policyData,
+    bytes32 quoteSignatureR,
+    bytes32 quoteSignatureVS,
+    uint40 quoteValidUntil,
+    address payer,
+    address onBehalfOf
+  ) internal returns (uint256 policyId) {
+    if (!_creationIsOpen)
+      _policyPool.access().checkComponentRole(
+        address(this),
+        POLICY_CREATOR_ROLE,
+        _msgSender(),
+        false
+      );
+    require(quoteValidUntil >= block.timestamp, "Quote expired");
+
+    /**
+     * Checks the quote has been signed by an authorized user
+     * The "quote" is computed as hash of the following fields (encodePacked):
+     * - address(this): the address of this RiskModule
+     * - payout, premium, lossProb, expiration: the base parameters of the policy
+     * - policyData: a hash of the private details of the policy. The calculation should include some
+     *   unique id (quoteId), so each policyData identifies a policy.
+     * - quoteValidUntil: the maximum validity of the quote
+     */
+    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);
+
+    policyId = _newPolicy(payout, premium, lossProb, expiration, payer, onBehalfOf, internalId).id;
+    emit NewSignedPolicy(policyId, policyData);
+    return policyId;
+  }
+
+  /**
+   * @dev Creates a new Policy using a signed quote. The caller is the payer of the policy.
+   *
+   * Requirements:
+   * - The caller approved the spending of the premium to the PolicyPool
+   * - The quote has been signed by an address with the component role PRICER_ROLE
+   *
+   * Emits:
+   * - {PolicyPool.NewPolicy}
+   * - {NewSignedPolicy}
+   *
+   * @param payout The exposure (maximum payout) of the policy
+   * @param premium The premium that will be paid by the payer
+   * @param lossProb The probability of having to pay the maximum payout (wad)
+   * @param expiration The expiration of the policy (timestamp)
+   * @param onBehalfOf The policy holder
+   * @param policyData A hash of the private details of the policy. The last 96 bits will be used as internalId
+   * @param quoteSignatureR The signature of the "quote". R component (EIP-2098 signature)
+   * @param quoteSignatureVS The signature of the "quote". VS component (EIP-2098 signature)
+   * @param quoteValidUntil The expiration of the quote
+   * @return Returns the id of the created policy
+   */
+  function newPolicy(
+    uint256 payout,
+    uint256 premium,
+    uint256 lossProb,
+    uint40 expiration,
+    address onBehalfOf,
+    bytes32 policyData,
+    bytes32 quoteSignatureR,
+    bytes32 quoteSignatureVS,
+    uint40 quoteValidUntil
+  ) external returns (uint256) {
+    return
+      _newPolicySigned(
+        payout,
+        premium,
+        lossProb,
+        expiration,
+        policyData,
+        quoteSignatureR,
+        quoteSignatureVS,
+        quoteValidUntil,
+        _msgSender(),
+        onBehalfOf
+      );
+  }
+
+  /**
+   * @dev Creates a new Policy using a signed quote. The payer is the policy holder
+   *
+   * Requirements:
+   * - currency().allowance(onBehalfOf, _msgSender()) > 0
+   * - The quote has been signed by an address with the component role PRICER_ROLE
+   *
+   * Emits:
+   * - {PolicyPool.NewPolicy}
+   * - {NewSignedPolicy}
+   *
+   * @param payout The exposure (maximum payout) of the policy
+   * @param premium The premium that will be paid by the payer
+   * @param lossProb The probability of having to pay the maximum payout (wad)
+   * @param expiration The expiration of the policy (timestamp)
+   * @param onBehalfOf The policy holder
+   * @param policyData A hash of the private details of the policy. The last 96 bits will be used as internalId
+   * @param quoteSignatureR The signature of the "quote". R component (EIP-2098 signature)
+   * @param quoteSignatureVS The signature of the "quote". VS component (EIP-2098 signature)
+   * @param quoteValidUntil The expiration of the quote
+   * @return Returns the id of the created policy
+   */
+  function newPolicyPaidByHolder(
+    uint256 payout,
+    uint256 premium,
+    uint256 lossProb,
+    uint40 expiration,
+    address onBehalfOf,
+    bytes32 policyData,
+    bytes32 quoteSignatureR,
+    bytes32 quoteSignatureVS,
+    uint40 quoteValidUntil
+  ) external returns (uint256) {
+    require(
+      onBehalfOf == _msgSender() || currency().allowance(onBehalfOf, _msgSender()) > 0,
+      "Sender is not authorized to create policies onBehalfOf"
+    );
+    /**
+     * The standard is the payer should be the _msgSender() but usually, in this type of module,
+     * the sender is an operative account managed by software, where the onBehalfOf is a more
+     * secure account (hardware wallet) that does the cash movements.
+     * This non standard behaviour allows for a more secure setup, where the sender never manages
+     * cash.
+     * We leverage the currency's allowance mechanism to allow the sender access to the payer's
+     * funds.
+     * Note that this allowance won't be spent, so anything above 0 is accepted.
+     */
+    return
+      _newPolicySigned(
+        payout,
+        premium,
+        lossProb,
+        expiration,
+        policyData,
+        quoteSignatureR,
+        quoteSignatureVS,
+        quoteValidUntil,
+        onBehalfOf,
+        onBehalfOf
+      );
+  }
+
+  function resolvePolicy(Policy.PolicyData calldata policy, uint256 payout)
+    external
+    onlyComponentRole(RESOLVER_ROLE)
+    whenNotPaused
+  {
+    _policyPool.resolvePolicy(policy, payout);
+  }
+
+  function resolvePolicyFullPayout(Policy.PolicyData calldata policy, bool customerWon)
+    external
+    onlyComponentRole(RESOLVER_ROLE)
+    whenNotPaused
+  {
+    _policyPool.resolvePolicyFullPayout(policy, customerWon);
+  }
+}

package/contracts/TimeScaled.sol

@@ -2,7 +2,8 @@
 
 pragma solidity ^0.8.0;
 
-import {WadRayMath} from "./WadRayMath.sol";
+import {WadRayMath} from "./dependencies/WadRayMath.sol";
+import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";
 
 /**
  * @title TimeScaled
@@ -12,13 +13,15 @@ import {WadRayMath} from "./WadRayMath.sol";
  */
 library TimeScaled {
   using WadRayMath for uint256;
+  using SafeCast for uint256;
 
-  uint256 internal constant SECONDS_PER_YEAR = 365 days;
-  uint128 public constant MIN_SCALE = 1e17; // 0.0000000001 == 1e-10 in ray
+  uint256 private constant SECONDS_PER_YEAR = 365 days;
+  uint112 private constant MIN_SCALE = 1e17; // 0.0000000001 == 1e-10 in ray
+  uint112 private constant RAY112 = 1e27;
 
   struct ScaledAmount {
-    uint128 scale;
-    uint96 amount;
+    uint112 scale;
+    uint112 amount;
     uint32 lastUpdate;
   }
 
@@ -27,7 +30,7 @@ library TimeScaled {
     if (scaledAmount.amount == 0) {
       scaledAmount.lastUpdate = uint32(block.timestamp);
     } else {
-      scaledAmount.scale = uint128(getScale(scaledAmount, interestRate));
+      scaledAmount.scale = getScale(scaledAmount, interestRate).toUint112();
       scaledAmount.lastUpdate = uint32(block.timestamp);
     }
   }
@@ -44,7 +47,7 @@ library TimeScaled {
     uint256 timeDifference = uint256(now_ - scaledAmount.lastUpdate);
     return
       uint256(scaledAmount.scale).rayMul(
-        ((interestRate.wadToRay() * timeDifference) / SECONDS_PER_YEAR) + WadRayMath.ray()
+        ((interestRate.wadToRay() * timeDifference) / SECONDS_PER_YEAR) + WadRayMath.RAY
       );
   }
 
@@ -61,7 +64,7 @@ library TimeScaled {
   }
 
   function init(ScaledAmount storage scaledAmount) internal {
-    scaledAmount.scale = uint128(WadRayMath.ray());
+    scaledAmount.scale = RAY112;
     scaledAmount.amount = 0;
     scaledAmount.lastUpdate = uint32(block.timestamp);
   }
@@ -89,7 +92,7 @@ library TimeScaled {
   ) internal returns (uint256) {
     updateScale(scaledAmount, interestRate);
     uint256 scaledAdd = scaleAmount(scaledAmount, amount);
-    scaledAmount.amount += uint96(scaledAdd);
+    scaledAmount.amount += scaledAdd.toUint96();
     return scaledAdd;
   }
 
@@ -100,10 +103,10 @@ library TimeScaled {
   ) internal returns (uint256) {
     updateScale(scaledAmount, interestRate);
     uint256 scaledSub = scaleAmount(scaledAmount, amount);
-    scaledAmount.amount -= uint96(scaledSub);
+    scaledAmount.amount -= scaledSub.toUint96();
     if (scaledAmount.amount == 0) {
       // Reset scale if amount == 0
-      scaledAmount.scale = uint128(WadRayMath.ray());
+      scaledAmount.scale = RAY112;
     }
     return scaledSub;
   }
@@ -115,9 +118,10 @@ library TimeScaled {
   ) internal {
     updateScale(scaledAmount, interestRate);
     uint256 newScaledAmount = uint256(int256(getScaledAmount(scaledAmount, interestRate)) + amount);
-    scaledAmount.scale = uint128(
-      newScaledAmount.wadToRay().rayDiv(uint256(scaledAmount.amount).wadToRay())
-    );
+    scaledAmount.scale = newScaledAmount
+      .wadToRay()
+      .rayDiv(uint256(scaledAmount.amount).wadToRay())
+      .toUint112();
     require(scaledAmount.scale >= MIN_SCALE, "Scale too small, can lead to rounding errors");
   }
 
@@ -127,7 +131,7 @@ library TimeScaled {
     returns (uint256)
   {
     uint256 ts = getScaledAmount(scaledAmount, interestRate);
-    uint256 minTs = uint256(scaledAmount.amount).wadToRay().rayMul(MIN_SCALE * 10).rayToWad();
+    uint256 minTs = uint256(scaledAmount.amount).wadToRay().rayMul(MIN_SCALE).rayToWad();
     if (ts > minTs) return ts - minTs;
     else return 0;
   }