@ensuro/core 2.0.0-beta10 → 2.0.0-beta11

package/js/test-utils.js

@@ -2,6 +2,8 @@ const { expect } = require("chai");
 const hre = require("hardhat");
 const { BigNumber } = require("ethers");
 const { LogDescription } = require("ethers/lib/utils");
+const { findAll } = require("solidity-ast/utils");
+
 exports.WEEK = 3600 * 24 * 7;
 exports.DAY = 3600 * 24;
 
@@ -42,7 +44,7 @@ exports.now = function () {
   return Math.floor(new Date().getTime() / 1000);
 };
 
-exports.addRiskModule = async function (
+const createRiskModule = async function (
   pool,
   premiumsAccount,
   contractFactory,
@@ -68,7 +70,7 @@ exports.addRiskModule = async function (
       rmName || "RiskModule",
       _W(scrPercentage) || _W(1),
       _W(ensuroFee) || _W(0),
-      _W(scrInterestRate) || _W(0.1),
+      _W(scrInterestRate) || _W("0.1"),
       _A(maxScrPerPolicy) || _A(1000),
       _A(scrLimit) || _A(1000000),
       wallet || "0xdD2FD4581271e230360230F9337D5c0430Bf44C0", // Random address
@@ -87,11 +89,46 @@ exports.addRiskModule = async function (
     moc = _W(moc);
     await rm.setParam(0, moc);
   }
+  return rm;
+};
+
+exports.createRiskModule = createRiskModule;
+
+exports.addRiskModule = async function (
+  pool,
+  premiumsAccount,
+  contractFactory,
+  {
+    rmName,
+    scrPercentage,
+    scrInterestRate,
+    ensuroFee,
+    maxScrPerPolicy,
+    scrLimit,
+    moc,
+    wallet,
+    extraArgs,
+    extraConstructorArgs,
+  }
+) {
+  const rm = await createRiskModule(pool, premiumsAccount, contractFactory, {
+    rmName,
+    scrPercentage,
+    scrInterestRate,
+    ensuroFee,
+    maxScrPerPolicy,
+    scrLimit,
+    moc,
+    wallet,
+    extraArgs,
+    extraConstructorArgs,
+  });
+
   await pool.addComponent(rm.address, 2);
   return rm;
 };
 
-exports.addEToken = async function (
+const createEToken = async function (
   pool,
   { etkName, etkSymbol, maxUtilizationRate, poolLoanInterestRate, extraArgs, extraConstructorArgs }
 ) {
@@ -101,8 +138,8 @@ exports.addEToken = async function (
   const etk = await hre.upgrades.deployProxy(
     EToken,
     [
-      etkName || "EToken",
-      etkSymbol || "eUSD1YEAR",
+      etkName === undefined ? "EToken" : etkName,
+      etkSymbol === undefined ? "eUSD1YEAR" : etkSymbol,
       _W(maxUtilizationRate) || _W(1),
       _W(poolLoanInterestRate) || _W("0.05"),
       ...extraArgs,
@@ -115,6 +152,23 @@ exports.addEToken = async function (
   );
 
   await etk.deployed();
+  return etk;
+};
+
+exports.createEToken = createEToken;
+
+exports.addEToken = async function (
+  pool,
+  { etkName, etkSymbol, maxUtilizationRate, poolLoanInterestRate, extraArgs, extraConstructorArgs }
+) {
+  const etk = await createEToken(pool, {
+    etkName,
+    etkSymbol,
+    maxUtilizationRate,
+    poolLoanInterestRate,
+    extraArgs,
+    extraConstructorArgs,
+  });
   await pool.addComponent(etk.address, 1);
   return etk;
 };
@@ -161,21 +215,42 @@ const getTransactionEvent = function (interface, receipt, eventName) {
 
 exports.getTransactionEvent = getTransactionEvent;
 
+const randomAddress = "0x89cDb70Fee571251a66E34caa1673cE40f7549Dc";
+
+/**
+ * Deploys de PolicyPool contract and AccessManager
+ *
+ * By default deployes de PolicyPool and AccessManager and grants LEVEL 1, 2, 3 permissions
+ *
+ * options:
+ * - .currency: mandatory, the address of the currency used in the PolicyPool
+ * - .access: if specified, doesn't create an AccessManager, uses this address.toLowerCase
+ * - .nftName: default "Policy NFT"
+ * - .nftSymbol: default "EPOL"
+ * - .treasuryAddress: default randomAddress
+ * - .grantRoles: default []. List of additional roles to grant
+ * - .dontGrantL123Roles: if specified, doesn't grants LEVEL1, 2 and 3 roles.
+ */
 exports.deployPool = async function (hre, options) {
   const PolicyPool = await hre.ethers.getContractFactory("PolicyPool");
   const AccessManager = await hre.ethers.getContractFactory("AccessManager");
 
-  // Deploy AccessManager
-  const accessManager = await hre.upgrades.deployProxy(AccessManager, [], { kind: "uups" });
+  let accessManager;
 
-  await accessManager.deployed();
+  if (options.access === undefined) {
+    // Deploy AccessManager
+    accessManager = await hre.upgrades.deployProxy(AccessManager, [], { kind: "uups" });
+    await accessManager.deployed();
+  } else {
+    accessManager = await hre.ethers.getContractAt("AccessManager", options.access);
+  }
 
   const policyPool = await hre.upgrades.deployProxy(
     PolicyPool,
     [
-      options.nftName || "Policy NFT",
-      options.nftSymbol || "EPOL",
-      options.treasuryAddress || hre.ethers.constants.AddressZero,
+      options.nftName === undefined ? "Policy NFT" : options.nftName,
+      options.nftSymbol === undefined ? "EPOL" : options.nftSymbol,
+      options.treasuryAddress || randomAddress,
     ],
     {
       constructorArgs: [accessManager.address, options.currency],
@@ -190,9 +265,12 @@ exports.deployPool = async function (hre, options) {
     await grantRole(hre, accessManager, role);
   }
 
-  await grantRole(hre, accessManager, "LEVEL1_ROLE");
-  await grantRole(hre, accessManager, "LEVEL2_ROLE");
-  await grantRole(hre, accessManager, "LEVEL3_ROLE");
+  if (options.dontGrantL123Roles === undefined) {
+    await grantRole(hre, accessManager, "LEVEL1_ROLE");
+    await grantRole(hre, accessManager, "LEVEL2_ROLE");
+    await grantRole(hre, accessManager, "LEVEL3_ROLE");
+  }
+
   return policyPool;
 };
 
@@ -251,41 +329,48 @@ async function grantComponentRole(hre, accessManager, component, role, user) {
 
 exports.grantComponentRole = grantComponentRole;
 
-exports._E = hre.ethers.utils.parseEther;
+const _E = hre.ethers.utils.parseEther;
+exports._E = _E;
 
 const _BN = hre.ethers.BigNumber.from;
-const WAD = _BN(1e10).mul(_BN(1e8)); // 1e10*1e8=1e18
-const RAY = WAD.mul(_BN(1e9)); // 1e18*1e9=1e27
-
 exports._BN = _BN;
 
-const _W = function (value) {
-  if (value === undefined) return undefined;
-  if (!Number.isInteger(value)) return _BN(Math.round(value * 1e9)).mul(_BN(1e9));
-  return _BN(value).mul(WAD);
-};
-
-exports._W = _W;
+const WAD = _BN(10).pow(18); // 1e18
+exports.WAD = WAD;
 
-const _R = function (value) {
-  if (value === undefined) return undefined;
-  if (!Number.isInteger(value)) return _BN(Math.round(value * 1e9)).mul(WAD);
-  return _BN(value).mul(RAY);
-};
-
-exports._R = _R;
+const RAY = _BN(10).pow(27); // 1e27
+exports.RAY = RAY;
 
-exports.amountFunction = function (decimals) {
-  // Decimals must be at least 6
+/**
+ * Creates a fixed-point conversion function for the desired number of decimals
+ * @param decimals The number of decimals. Must be >= 6.
+ * @returns The amount function created. The function can receive strings (recommended),
+ *          floats/doubles (not recommended) and integers.
+ *
+ *          Floats will be rounded to 6 decimal before scaling.
+ */
+function amountFunction(decimals) {
   return function (value) {
     if (value === undefined) return undefined;
+
     if (typeof value === "string" || value instanceof String) {
-      return _BN(value).mul(_BN(Math.pow(10, decimals)));
-    } else {
+      return hre.ethers.utils.parseUnits(value, decimals);
+    }
+
+    if (!Number.isInteger(value)) {
       return _BN(Math.round(value * 1e6)).mul(_BN(Math.pow(10, decimals - 6)));
     }
+
+    return _BN(value).mul(_BN(10).pow(decimals));
   };
-};
+}
+exports.amountFunction = amountFunction;
+
+const _W = amountFunction(18);
+exports._W = _W;
+
+const _R = amountFunction(27);
+exports._R = _R;
 
 /**
  * Builds the component role identifier
@@ -353,4 +438,21 @@ function getRole(role) {
 
 exports.getRole = getRole;
 
+async function getStorageLayout(contractSrc, contractName) {
+  const buildInfo = await hre.artifacts.getBuildInfo(`${contractSrc}:${contractName}`);
+  if (buildInfo === undefined) throw new Error(`Contract ${contractSrc}:${contractName} not in artifacts`);
+
+  const solcOutput = buildInfo.output;
+
+  const storageLayouts = {};
+
+  for (const def of findAll("ContractDefinition", solcOutput.sources[contractSrc].ast)) {
+    storageLayouts[def.name] = solcOutput.contracts[contractSrc][def.name].storageLayout;
+  }
+
+  return storageLayouts[contractName];
+}
+
+exports.getStorageLayout = getStorageLayout;
+
 if (process.env.ENABLE_HH_WARNINGS !== "yes") hre.upgrades.silenceWarnings();

package/package.json

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