@ensuro/core 2.0.0-beta5 → 2.0.0-beta7

package/contracts/mocks/FixedRateVault.sol

@@ -0,0 +1,85 @@
+//SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.0;
+
+import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+import {ERC4626} from "@openzeppelin/contracts/token/ERC20/extensions/ERC4626.sol";
+import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+import {IMintableERC20} from "./IMintableERC20.sol";
+import {TimeScaled} from "../TimeScaled.sol";
+
+contract FixedRateVault is ERC4626 {
+  using TimeScaled for TimeScaled.ScaledAmount;
+
+  uint256 internal _interestRate;
+  TimeScaled.ScaledAmount internal _totalAssets;
+  bool internal _broken;
+
+  constructor(
+    string memory name_,
+    string memory symbol_,
+    IERC20Metadata asset_,
+    uint256 interestRate_
+  ) ERC20(name_, symbol_) ERC4626(asset_) {
+    _interestRate = interestRate_;
+    _totalAssets.init();
+  }
+
+  /** @dev See {IERC4262-totalAssets}. */
+  function totalAssets() public view virtual override returns (uint256) {
+    require(!_broken, "Vault is broken");
+    return _totalAssets.getScaledAmount(_interestRate);
+  }
+
+  /**
+   * @dev Deposit/mint common workflow.
+   */
+  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);
+  }
+
+  /**
+   * @dev Withdraw/redeem common workflow.
+   */
+  function _withdraw(
+    address caller,
+    address receiver,
+    address owner,
+    uint256 assets,
+    uint256 shares
+  ) internal virtual override {
+    require(!_broken, "Vault is broken");
+    _totalAssets.sub(assets, _interestRate);
+    uint256 balance = IERC20Metadata(asset()).balanceOf(address(this));
+    if (balance < assets) {
+      // Here comes the magic! Free money!
+      IMintableERC20(asset()).mint(address(this), assets - balance);
+    }
+    super._withdraw(caller, receiver, owner, assets, shares);
+  }
+
+  /*
+   * @dev Adds or remove assets not generated by deposits/withdraw - For testing discrete earnings/losses
+   */
+  function discreteEarning(int256 assets) external {
+    if (assets > 0) {
+      _totalAssets.add(uint256(assets), _interestRate);
+    } else {
+      _totalAssets.sub(uint256(-assets), _interestRate);
+    }
+  }
+
+  function setBroken(bool broken_) external {
+    _broken = broken_;
+  }
+
+  function broken() external view returns (bool) {
+    return _broken;
+  }
+}

package/contracts/mocks/PolicyPoolMock.sol

@@ -38,17 +38,14 @@ contract PolicyPoolMock is IPolicyPool {
     return _access;
   }
 
-  function policyNFT() external pure override returns (address) {
-    return address(0);
-  }
-
   function treasury() external pure override returns (address) {
     return address(0);
   }
 
   function newPolicy(
     Policy.PolicyData memory policy,
-    address, /* customer */
+    address, /* caller */
+    address, /* policyHolder */
     uint96 internalId
   ) external override returns (uint256) {
     policy.id = (uint256(uint160(address(policy.riskModule))) << 96) + internalId;

package/contracts/mocks/RiskModuleMock.sol

@@ -0,0 +1,69 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.0;
+
+import {IPolicyPool} from "../interfaces/IPolicyPool.sol";
+import {IPremiumsAccount} from "../interfaces/IPremiumsAccount.sol";
+import {RiskModule} from "../RiskModule.sol";
+import {Policy} from "../Policy.sol";
+
+/**
+ * @title Trustful Risk Module
+ * @dev Risk Module without any validation, just the newPolicy and resolvePolicy need to be called by
+        authorized users
+ * @custom:security-contact security@ensuro.co
+ * @author Ensuro
+ */
+
+contract RiskModuleMock is RiskModule {
+  bytes32 public constant PRICER_ROLE = keccak256("PRICER_ROLE");
+  bytes32 public constant RESOLVER_ROLE = keccak256("RESOLVER_ROLE");
+
+  /// @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
+
+  /**
+   * @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 newPolicy(
+    uint256 payout,
+    uint256 premium,
+    uint256 lossProb,
+    uint40 expiration,
+    address payer,
+    address onBehalfOf,
+    uint96 internalId
+  ) external onlyComponentRole(PRICER_ROLE) returns (uint256) {
+    return _newPolicy(payout, premium, lossProb, expiration, payer, onBehalfOf, internalId).id;
+  }
+}

package/js/test-utils.js

@@ -70,7 +70,7 @@ exports.addRiskModule = async function (
       _W(scrInterestRate) || _W(0.1),
       _A(maxScrPerPolicy) || _A(1000),
       _A(scrLimit) || _A(1000000),
-      wallet || "0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC", // Random address
+      wallet || "0xdD2FD4581271e230360230F9337D5c0430Bf44C0", // Random address
       ...extraArgs,
     ],
     {
@@ -86,7 +86,7 @@ exports.addRiskModule = async function (
     moc = _W(moc);
     await rm.setParam(0, moc);
   }
-  await pool.addRiskModule(rm.address);
+  await pool.addComponent(rm.address, 2);
   return rm;
 };
 
@@ -114,7 +114,7 @@ exports.addEToken = async function (
   );
 
   await etk.deployed();
-  await pool.addEToken(etk.address);
+  await pool.addComponent(etk.address, 1);
   return etk;
 };
 
@@ -142,7 +142,7 @@ exports.impersonate = async function (address, setBalanceTo) {
  * @param {String} eventName The name of the event we are interested in
  * @returns {LogDescription}
  */
-exports.getTransactionEvent = function (interface, receipt, eventName) {
+const getTransactionEvent = function (interface, receipt, eventName) {
   // for each log in the transaction receipt
   for (const log of receipt.events) {
     let parsedLog;
@@ -158,43 +158,34 @@ exports.getTransactionEvent = function (interface, receipt, eventName) {
   return null; // not found
 };
 
+exports.getTransactionEvent = getTransactionEvent;
+
 exports.deployPool = async function (hre, options) {
   const PolicyPool = await ethers.getContractFactory("PolicyPool");
   const AccessManager = await ethers.getContractFactory("AccessManager");
-  const PolicyNFT = await ethers.getContractFactory("PolicyNFT");
-
-  // Deploy PolicyNFT
-  const policyNFT = await hre.upgrades.deployProxy(
-    PolicyNFT,
-    [
-      options.nftName || "Policy NFT",
-      options.nftSymbol || "EPOL",
-      options.policyPoolDetAddress || ethers.constants.AddressZero,
-    ],
-    { kind: "uups" }
-  );
-  await policyNFT.deployed();
 
   // Deploy AccessManager
-  const accessManager = await hre.upgrades.deployProxy(AccessManager, [
-    options.policyPoolDetAddress || ethers.constants.AddressZero,
-  ], {kind: 'uups'});
+  const accessManager = await hre.upgrades.deployProxy(AccessManager, [], { kind: "uups" });
 
   await accessManager.deployed();
 
   const policyPool = await hre.upgrades.deployProxy(
     PolicyPool,
-    [options.treasuryAddress || ethers.constants.AddressZero],
+    [
+      options.nftName || "Policy NFT",
+      options.nftSymbol || "EPOL",
+      options.treasuryAddress || ethers.constants.AddressZero,
+    ],
     {
-      constructorArgs: [accessManager.address, policyNFT.address, options.currency],
-      kind: 'uups',
+      constructorArgs: [accessManager.address, options.currency],
+      kind: "uups",
       unsafeAllow: ["delegatecall"],
     }
   );
 
   await policyPool.deployed();
 
-  for (const role of (options.grantRoles || [])) {
+  for (const role of options.grantRoles || []) {
     await grantRole(hre, accessManager, role);
   }
 
@@ -217,7 +208,7 @@ exports.deployPremiumsAccount = async function (hre, pool, options) {
   });
 
   await premiumsAccount.deployed();
-  await pool.addPremiumsAccount(premiumsAccount.address);
+  await pool.addComponent(premiumsAccount.address, 3);
   return premiumsAccount;
 };
 
@@ -242,18 +233,18 @@ async function grantRole(hre, contract, role, user) {
 
 exports.grantRole = grantRole;
 
-async function grantComponentRole(hre, contract, component, role, user) {
+async function grantComponentRole(hre, accessManager, component, role, user) {
   let userAddress;
   if (user === undefined) {
     user = await _getDefaultSigner(hre);
     userAddress = user.address;
   } else {
-    userAddress = user;
+    userAddress = user.address === undefined ? user : user.address;
   }
   const roleHex = ethers.utils.keccak256(ethers.utils.toUtf8Bytes(role));
-  const componentRole = await contract.getComponentRole(component.address, roleHex);
-  if (!(await contract.hasRole(componentRole, userAddress))) {
-    await contract.grantComponentRole(component.address, roleHex, userAddress);
+  const componentRole = await accessManager.getComponentRole(component.address, roleHex);
+  if (!(await accessManager.hasRole(componentRole, userAddress))) {
+    await accessManager.grantComponentRole(component.address, roleHex, userAddress);
   }
 }
 
@@ -303,7 +294,7 @@ Mimics the behaviour of the PolicyPoolConfig.getComponentRole method
 Component roles are roles created doing XOR between the component
 address and the original role.
 
-Example: 
+Example:
     getComponentRole("0xc6e7DF5E7b4f2A278906862b61205850344D4e7d", "ORACLE_ADMIN_ROLE")
     // "0x05e01b185238b49f750d03d945e38a7f6c3be8b54de0ee42d481eb7814f0d3a8"
 */
@@ -334,3 +325,19 @@ function makePolicyId(rm, internalId) {
 }
 
 exports.makePolicyId = makePolicyId;
+
+async function makePolicy(pool, rm, cust, payout, premium, lossProb, expiration, internalId) {
+  let tx = await rm.connect(cust).newPolicy(payout, premium, lossProb, expiration, cust.address, internalId);
+  let receipt = await tx.wait();
+  const newPolicyEvt = getTransactionEvent(pool.interface, receipt, "NewPolicy");
+
+  return newPolicyEvt;
+}
+
+exports.makePolicy = makePolicy;
+
+async function blockchainNow(owner) {
+  return (await owner.provider.getBlock("latest")).timestamp;
+}
+
+exports.blockchainNow = blockchainNow;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ensuro/core",
   "description": "Ensuro - Decentralized insurance protocol",
-  "version": "2.0.0-beta5",
+  "version": "v2.0.0-beta7",
   "files": [
     "**/*.sol",
     "/build/contracts/*.json",