@ensuro/core 2.6.2 → 2.8.0-beta1

package/contracts/interfaces/IAccessManager.sol

@@ -108,11 +108,7 @@ interface IAccessManager is IAccessControlUpgradeable {
    * @param role2 Another role such as `keccak256("GUARDIAN_ROLE")` that's global
    * @param account The user address for who we want to verify the permission
    */
-  function checkRole2(
-    bytes32 role1,
-    bytes32 role2,
-    address account
-  ) external view;
+  function checkRole2(bytes32 role1, bytes32 role2, address account) external view;
 
   /**
    * @dev Checks if a user has been granted a given component role and reverts if it doesn't
@@ -122,12 +118,7 @@ interface IAccessManager is IAccessControlUpgradeable {
    * @param alsoGlobal If true, it will accept not only the component role, but also the (global) `role` itself.
    *                   If false, only the component role is accepted
    */
-  function checkComponentRole(
-    address component,
-    bytes32 role,
-    address account,
-    bool alsoGlobal
-  ) external view;
+  function checkComponentRole(address component, bytes32 role, address account, bool alsoGlobal) external view;
 
   /**
    * @dev Checks if a user has been granted any of the two component roles specified and reverts if it doesn't

package/contracts/interfaces/IEToken.sol

@@ -67,11 +67,7 @@ interface IEToken is IERC20 {
    * @param policyInterestRate The annualized interest rate that was paid for the `scrAmount`, must be the same that was
    * sent in `lockScr` call.
    */
-  function unlockScr(
-    uint256 scrAmount,
-    uint256 policyInterestRate,
-    int256 adjustment
-  ) external;
+  function unlockScr(uint256 scrAmount, uint256 policyInterestRate, int256 adjustment) external;
 
   /**
    * @dev Registers a deposit of liquidity in the pool. Called from the PolicyPool, assumes the amount has already been

package/contracts/interfaces/ILPWhitelist.sol

@@ -16,11 +16,7 @@ interface ILPWhitelist {
    * @param amount The amount of the deposit
    * @return true if `provider` deposit is accepted, false if not
    */
-  function acceptsDeposit(
-    IEToken etoken,
-    address provider,
-    uint256 amount
-  ) external view returns (bool);
+  function acceptsDeposit(IEToken etoken, address provider, uint256 amount) external view returns (bool);
 
   /**
    * @dev Indicates whether or not the eTokens can be transferred from `providerFrom` to `providerTo`
@@ -46,9 +42,5 @@ interface ILPWhitelist {
    * @param amount The amount of the withdrawal
    * @return true if `provider` withdraw request is accepted, false if not
    */
-  function acceptsWithdrawal(
-    IEToken etoken,
-    address provider,
-    uint256 amount
-  ) external view returns (bool);
+  function acceptsWithdrawal(IEToken etoken, address provider, uint256 amount) external view returns (bool);
 }

package/contracts/interfaces/IPolicyHolder.sol

@@ -18,11 +18,7 @@ interface IPolicyHolder is IERC721Receiver {
    *
    * The selector can be obtained in Solidity with `IPolicyPool.onPolicyExpired.selector`.
    */
-  function onPolicyExpired(
-    address operator,
-    address from,
-    uint256 policyId
-  ) external returns (bytes4);
+  function onPolicyExpired(address operator, address from, uint256 policyId) external returns (bytes4);
 
   /**
    * @dev Whenever an Policy is resolved with payout > 0, this function is called
@@ -33,10 +29,5 @@ interface IPolicyHolder is IERC721Receiver {
    *
    * The selector can be obtained in Solidity with `IPolicyPool.onPayoutReceived.selector`.
    */
-  function onPayoutReceived(
-    address operator,
-    address from,
-    uint256 policyId,
-    uint256 amount
-  ) external returns (bytes4);
+  function onPayoutReceived(address operator, address from, uint256 policyId, uint256 amount) external returns (bytes4);
 }

package/contracts/interfaces/IPremiumsAccount.sol

@@ -39,11 +39,7 @@ interface IPremiumsAccount {
    * @param policy The policy that was resolved
    * @param payout The amount that has to be transferred to `policyHolder`
    */
-  function policyResolvedWithPayout(
-    address policyHolder,
-    Policy.PolicyData memory policy,
-    uint256 payout
-  ) external;
+  function policyResolvedWithPayout(address policyHolder, Policy.PolicyData memory policy, uint256 payout) external;
 
   /**
    * @dev The PremiumsAccount is notified that the policy has expired, unlocks the SCR and earns the pure premium.

package/contracts/migration/LPManualWhitelistV20.sol

@@ -30,10 +30,7 @@ abstract contract LPManualWhitelistV20 is ILPWhitelist, PolicyPoolComponent {
     __PolicyPoolComponent_init();
   }
 
-  function whitelistAddress(address provider, bool whitelisted)
-    external
-    onlyComponentRole(LP_WHITELIST_ROLE)
-  {
+  function whitelistAddress(address provider, bool whitelisted) external onlyComponentRole(LP_WHITELIST_ROLE) {
     if (_whitelisted[provider] != whitelisted) {
       _whitelisted[provider] = whitelisted;
       emit LPWhitelisted(provider, whitelisted);
@@ -47,20 +44,11 @@ abstract contract LPManualWhitelistV20 is ILPWhitelist, PolicyPoolComponent {
     return super.supportsInterface(interfaceId) || interfaceId == type(ILPWhitelist).interfaceId;
   }
 
-  function acceptsDeposit(
-    IEToken,
-    address provider,
-    uint256
-  ) external view override returns (bool) {
+  function acceptsDeposit(IEToken, address provider, uint256) external view override returns (bool) {
     return _whitelisted[provider];
   }
 
-  function acceptsTransfer(
-    IEToken,
-    address,
-    address providerTo,
-    uint256
-  ) external view override returns (bool) {
+  function acceptsTransfer(IEToken, address, address providerTo, uint256) external view override returns (bool) {
     return _whitelisted[providerTo];
   }
 

package/contracts/migration/LPManualWhitelistV20Upgraded.sol

@@ -15,11 +15,7 @@ import {LPManualWhitelistV20} from "./LPManualWhitelistV20.sol";
 contract LPManualWhitelistV20Upgraded is LPManualWhitelistV20 {
   constructor(IPolicyPool policyPool_) LPManualWhitelistV20(policyPool_) {}
 
-  function acceptsWithdrawal(
-    IEToken etk,
-    address provider,
-    uint256 amount
-  ) external view override returns (bool) {
+  function acceptsWithdrawal(IEToken etk, address provider, uint256 amount) external view override returns (bool) {
     return this.acceptsDeposit(etk, provider, amount);
   }
 }

package/contracts/mocks/FixedRateVault.sol

@@ -33,12 +33,7 @@ contract FixedRateVault is ERC4626 {
   /**
    * @dev Deposit/mint common workflow.
    */
-  function _deposit(
-    address caller,
-    address receiver,
-    uint256 assets,
-    uint256 shares
-  ) internal virtual override {
+  function _deposit(address caller, address receiver, uint256 assets, uint256 shares) internal virtual override {
     require(!_broken, "Vault is broken");
     _totalAssets.add(assets, _interestRate);
     super._deposit(caller, receiver, assets, shares);

package/contracts/mocks/PolicyHolderMock.sol

@@ -3,18 +3,31 @@ pragma solidity ^0.8.0;
 
 import {IPolicyHolder} from "../interfaces/IPolicyHolder.sol";
 import {IERC721Receiver} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 
 contract PolicyHolderMock is IPolicyHolder {
   uint256 public policyId;
   uint256 public payout;
   bool public fail;
+  bool public emptyRevert;
   bool public notImplemented;
+  bool public badlyImplemented;
+  bool public noERC165;
 
-  event NotificationReceived(uint256 kind, uint256 policyId, address operator, address from);
+  enum NotificationKind {
+    PolicyReceived,
+    PayoutReceived,
+    PolicyExpired
+  }
 
-  constructor(bool fail_) {
-    fail = fail_;
+  event NotificationReceived(NotificationKind kind, uint256 policyId, address operator, address from);
+
+  constructor() {
+    fail = false;
     notImplemented = false;
+    badlyImplemented = false;
+    emptyRevert = false;
+    noERC165 = false;
     payout = type(uint256).max;
   }
 
@@ -26,37 +39,65 @@ contract PolicyHolderMock is IPolicyHolder {
     notImplemented = notImplemented_;
   }
 
+  function setBadlyImplemented(bool badlyImplemented_) external {
+    badlyImplemented = badlyImplemented_;
+  }
+
+  function setNoERC165(bool noERC165_) external {
+    noERC165 = noERC165_;
+  }
+
+  function setEmptyRevert(bool emptyRevert_) external {
+    emptyRevert = emptyRevert_;
+  }
+
+  /**
+   * @dev See {IERC165-supportsInterface}.
+   */
+  function supportsInterface(bytes4 interfaceId) public view virtual returns (bool) {
+    if (noERC165)
+      assembly {
+        revert(0, 0)
+      }
+    if (notImplemented) return false;
+    return interfaceId == type(IPolicyHolder).interfaceId || interfaceId == type(IERC165).interfaceId;
+  }
+
   function onERC721Received(
     address operator,
     address from,
     uint256 policyId_,
     bytes calldata
   ) external override returns (bytes4) {
-    if (notImplemented)
-      // solhint-disable-next-line no-inline-assembly
-      assembly {
-        revert(0, 0)
-      }
-    if (fail) revert("onERC721Received: They told me I have to fail");
+    if (fail)
+      if (emptyRevert)
+        assembly {
+          revert(0, 0)
+        }
+      else revert("onERC721Received: They told me I have to fail");
+
     policyId = policyId_;
-    emit NotificationReceived(0, policyId_, operator, from);
+    payout = type(uint256).max;
+    emit NotificationReceived(NotificationKind.PolicyReceived, policyId_, operator, from);
+
+    if (badlyImplemented) return bytes4(0x0badf00d);
+
     return IERC721Receiver.onERC721Received.selector;
   }
 
-  function onPolicyExpired(
-    address operator,
-    address from,
-    uint256 policyId_
-  ) external override returns (bytes4) {
-    if (notImplemented)
-      // solhint-disable-next-line no-inline-assembly
-      assembly {
-        revert(0, 0)
-      }
-    if (fail) revert("onPolicyExpired: They told me I have to fail");
+  function onPolicyExpired(address operator, address from, uint256 policyId_) external override returns (bytes4) {
+    if (fail)
+      if (emptyRevert)
+        assembly {
+          revert(0, 0)
+        }
+      else revert("onPolicyExpired: They told me I have to fail");
     policyId = policyId_;
     payout = 0;
-    emit NotificationReceived(1, policyId_, operator, from);
+    emit NotificationReceived(NotificationKind.PolicyExpired, policyId_, operator, from);
+
+    if (badlyImplemented) return bytes4(0x0badf00d);
+
     return IPolicyHolder.onPolicyExpired.selector;
   }
 
@@ -75,15 +116,18 @@ contract PolicyHolderMock is IPolicyHolder {
     uint256 policyId_,
     uint256 amount
   ) external override returns (bytes4) {
-    if (notImplemented)
-      // solhint-disable-next-line no-inline-assembly
-      assembly {
-        revert(0, 0)
-      }
-    if (fail) revert("onPayoutReceived: They told me I have to fail");
+    if (fail)
+      if (emptyRevert)
+        assembly {
+          revert(0, 0)
+        }
+      else revert("onPayoutReceived: They told me I have to fail");
     policyId = policyId_;
     payout = amount;
-    emit NotificationReceived(2, policyId_, operator, from);
+    emit NotificationReceived(NotificationKind.PayoutReceived, policyId_, operator, from);
+
+    if (badlyImplemented) return bytes4(0x0badf00d);
+
     return IPolicyHolder.onPayoutReceived.selector;
   }
 }

package/contracts/mocks/PolicyPoolComponentMock.sol

@@ -20,8 +20,6 @@ contract PolicyPoolComponentMock is IPolicyPoolComponent {
    * @dev See {IERC165-supportsInterface}.
    */
   function supportsInterface(bytes4 interfaceId) public view virtual override returns (bool) {
-    return
-      interfaceId == type(IERC165).interfaceId ||
-      interfaceId == type(IPolicyPoolComponent).interfaceId;
+    return interfaceId == type(IERC165).interfaceId || interfaceId == type(IPolicyPoolComponent).interfaceId;
   }
 }

package/contracts/mocks/PolicyPoolMock.sol

@@ -5,7 +5,6 @@ import {IPolicyPool} from "../interfaces/IPolicyPool.sol";
 import {IRiskModule} from "../interfaces/IRiskModule.sol";
 import {IEToken} from "../interfaces/IEToken.sol";
 import {IAccessManager} from "../interfaces/IAccessManager.sol";
-import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import {Policy} from "../Policy.sol";
 import {ForwardProxy} from "./ForwardProxy.sol";
@@ -13,8 +12,7 @@ import {ForwardProxy} from "./ForwardProxy.sol";
 contract PolicyPoolMock is IPolicyPool {
   using Policy for Policy.PolicyData;
 
-  uint256 public constant MAX_INT =
-    0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff;
+  uint256 public constant MAX_INT = 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff;
 
   IERC20Metadata internal _currency;
   IAccessManager internal _access;
@@ -44,8 +42,8 @@ contract PolicyPoolMock is IPolicyPool {
 
   function newPolicy(
     Policy.PolicyData memory policy,
-    address, /* caller */
-    address, /* policyHolder */
+    address /* caller */,
+    address /* policyHolder */,
     uint96 internalId
   ) external override returns (uint256) {
     policy.id = (uint256(uint160(address(policy.riskModule))) << 96) + internalId;
@@ -57,10 +55,7 @@ contract PolicyPoolMock is IPolicyPool {
   function _resolvePolicy(Policy.PolicyData memory policy, uint256 payout) internal {
     require(policy.id != 0, "Policy not found");
     require(policy.hash() == policyHashes[policy.id], "Hash doesn't match");
-    require(
-      msg.sender == address(policy.riskModule),
-      "Only riskModule is authorized to resolve the policy"
-    );
+    require(msg.sender == address(policy.riskModule), "Only riskModule is authorized to resolve the policy");
     delete policies[policy.id];
     delete policyHashes[policy.id];
     emit PolicyResolved(IRiskModule(msg.sender), policy.id, payout);
@@ -74,10 +69,7 @@ contract PolicyPoolMock is IPolicyPool {
     _resolvePolicy(policy, 0);
   }
 
-  function resolvePolicyFullPayout(Policy.PolicyData calldata policy, bool customerWon)
-    external
-    override
-  {
+  function resolvePolicyFullPayout(Policy.PolicyData calldata policy, bool customerWon) external override {
     return _resolvePolicy(policy, customerWon ? policy.payout : 0);
   }
 
@@ -108,14 +100,7 @@ contract PolicyPoolMock is IPolicyPool {
     uint256 lossProb,
     uint40 expiration
   ) external {
-    Policy.PolicyData memory policy = Policy.initialize(
-      riskModule,
-      rmParams,
-      premium,
-      payout,
-      lossProb,
-      expiration
-    );
+    Policy.PolicyData memory policy = Policy.initialize(riskModule, rmParams, premium, payout, lossProb, expiration);
 
     emit NewPolicy(riskModule, policy);
   }
@@ -127,17 +112,12 @@ contract PolicyPoolMock is IPolicyPool {
  *      and other contracts that have functions that can be called only from PolicyPool
  */
 contract PolicyPoolMockForward is ForwardProxy {
-  uint256 public constant MAX_INT =
-    0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff;
+  uint256 public constant MAX_INT = 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff;
 
   IERC20Metadata internal _currency;
   IAccessManager internal _access;
 
-  constructor(
-    address forwardTo,
-    IERC20Metadata currency_,
-    IAccessManager access_
-  ) ForwardProxy(forwardTo) {
+  constructor(address forwardTo, IERC20Metadata currency_, IAccessManager access_) ForwardProxy(forwardTo) {
     _currency = currency_;
     _access = access_;
   }

package/contracts/mocks/RiskModuleMock.sol

@@ -20,9 +20,7 @@ contract RiskModuleMock is RiskModule {
 
   /// @custom:oz-upgrades-unsafe-allow constructor
   // solhint-disable-next-line no-empty-blocks
-  constructor(IPolicyPool policyPool_, IPremiumsAccount premiumsAccount_)
-    RiskModule(policyPool_, premiumsAccount_)
-  {} // solhint-disable-line no-empty-blocks
+  constructor(IPolicyPool policyPool_, IPremiumsAccount premiumsAccount_) RiskModule(policyPool_, premiumsAccount_) {}
 
   /**
    * @dev Initializes the RiskModule
@@ -43,15 +41,7 @@ contract RiskModuleMock is RiskModule {
     uint256 exposureLimit_,
     address wallet_
   ) public initializer {
-    __RiskModule_init(
-      name_,
-      collRatio_,
-      ensuroPpFee_,
-      srRoc_,
-      maxPayoutPerPolicy_,
-      exposureLimit_,
-      wallet_
-    );
+    __RiskModule_init(name_, collRatio_, ensuroPpFee_, srRoc_, maxPayoutPerPolicy_, exposureLimit_, wallet_);
   }
 
   function newPolicy(
@@ -66,10 +56,7 @@ contract RiskModuleMock is RiskModule {
     return _newPolicy(payout, premium, lossProb, expiration, payer, onBehalfOf, internalId).id;
   }
 
-  function resolvePolicy(Policy.PolicyData calldata policy, uint256 payout)
-    external
-    onlyComponentRole(RESOLVER_ROLE)
-  {
+  function resolvePolicy(Policy.PolicyData calldata policy, uint256 payout) external onlyComponentRole(RESOLVER_ROLE) {
     _policyPool.resolvePolicy(policy, payout);
   }
 }

package/contracts/mocks/TestNFT.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.0;
 pragma experimental ABIEncoderV2;
 
-import "@openzeppelin/contracts/token/ERC721/ERC721.sol";
+import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";
 
 contract TestNFT is ERC721 {
   address private _owner;

package/js/constants.js

@@ -1,7 +1,13 @@
-const WEEK = 3600 * 24 * 7;
-const DAY = 3600 * 24;
+const HOUR = 3600;
+const WEEK = HOUR * 24 * 7;
+const DAY = HOUR * 24;
+
+// From https://eips.ethereum.org/EIPS/eip-1967
+const IMPLEMENTATION_SLOT = "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc";
 
 module.exports = {
   WEEK,
   DAY,
+  HOUR,
+  IMPLEMENTATION_SLOT,
 };