@ensuro/core 2.0.1 → 2.1.0-beta1

package/contracts/interfaces/ILPWhitelist.sol

@@ -37,4 +37,18 @@ interface ILPWhitelist {
     address providerTo,
     uint256 amount
   ) external view returns (bool);
+
+  /**
+   * @dev Indicates whether or not a liquidity provider can withdraw an eToken.
+   *
+   * @param etoken The eToken (see {EToken}) where the provider wants to withdraw money.
+   * @param provider The address of the liquidity provider (user) that wants to withdraw
+   * @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);
 }

package/js/deploy.js

@@ -7,6 +7,12 @@ const _BN = ethers.BigNumber.from;
 const WAD = _BN(1e10).mul(_BN(1e8)); // 1e10*1e8=1e18
 const RAY = WAD.mul(_BN(1e9)); // 1e18*1e9=1e27
 
+const WhitelistStatus = {
+  notdefined: 0,
+  whitelisted: 1,
+  blacklisted: 2,
+};
+
 /**
  * Creates a fixed-point conversion function for the desired number of decimals
  * @param decimals The number of decimals. Must be >= 6.
@@ -153,10 +159,8 @@ async function deployProxyContract({ saveAddr, verify, contractClass, constructo
 }
 
 function parseRole(role) {
-  if (role.startsWith("0x"))
-    return role;
-  if (role === "DEFAULT_ADMIN_ROLE")
-    return ethers.constants.HashZero;
+  if (role.startsWith("0x")) return role;
+  if (role === "DEFAULT_ADMIN_ROLE") return ethers.constants.HashZero;
   return ethers.utils.keccak256(ethers.utils.toUtf8Bytes(role));
 }
 
@@ -255,8 +259,7 @@ async function deployEToken(
     hre
   );
   const policyPool = await hre.ethers.getContractAt("PolicyPool", poolAddress);
-  if (opts.addComponent)
-    await policyPool.addComponent(contract.address, 1);
+  if (opts.addComponent) await policyPool.addComponent(contract.address, 1);
   return contract.address;
 }
 
@@ -271,8 +274,7 @@ async function deployPremiumsAccount({ poolAddress, juniorEtk, seniorEtk, ...opt
     hre
   );
   const policyPool = await hre.ethers.getContractAt("PolicyPool", poolAddress);
-  if (opts.addComponent)
-    await policyPool.addComponent(contract.address, 3);
+  if (opts.addComponent) await policyPool.addComponent(contract.address, 3);
   return contract.address;
 }
 
@@ -338,11 +340,10 @@ async function deployRiskModule(
     await rm.setParam(4, ensuroCocFee);
   }
   if (maxDuration != 24 * 365) {
-    await rm.setParam(9, ensuroCocFee);
+    await rm.setParam(9, maxDuration);
   }
   const policyPool = await hre.ethers.getContractAt("PolicyPool", poolAddress);
-  if (opts.addComponent)
-    await policyPool.addComponent(contract.address, 2);
+  if (opts.addComponent) await policyPool.addComponent(contract.address, 2);
   return contract.address;
 }
 
@@ -415,10 +416,16 @@ async function deployAaveAssetManager({ asset, aave, amClass, ...opts }, hre) {
 }
 
 async function deployWhitelist(
-  { wlClass, poolAddress, extraConstructorArgs, extraArgs, eToken, eToken2, eToken3, ...opts },
+  { wlClass, poolAddress, extraConstructorArgs, extraArgs, eToken, eToken2, eToken3, defaultStatus, ...opts },
   hre
 ) {
   extraArgs = extraArgs || [];
+  if (defaultStatus !== "") {
+    defaultStatus = defaultStatus
+      .split("")
+      .map((WB) => (WB == "W" ? WhitelistStatus.whitelisted : WhitelistStatus.blacklisted));
+    extraArgs.splice(0, 0, defaultStatus);
+  }
   extraConstructorArgs = extraConstructorArgs || [];
   const { contract } = await deployProxyContract(
     {
@@ -706,6 +713,7 @@ function add_task() {
     .addOptionalParam("eToken", "Set the Whitelist to a given eToken", undefined, types.address)
     .addOptionalParam("eToken2", "Set the Whitelist to a given eToken", undefined, types.address)
     .addOptionalParam("eToken3", "Set the Whitelist to a given eToken", undefined, types.address)
+    .addOptionalParam("defaultStatus", "Default Status Ej: 'BWWB'", "BWWB", types.str)
     .addParam("poolAddress", "PolicyPool Address", types.address)
     .setAction(deployWhitelist);
 
@@ -776,4 +784,5 @@ module.exports = {
   deploySignedQuoteRM,
   setAssetManager,
   deployWhitelist,
+  WhitelistStatus,
 };

package/js/test-utils.js

@@ -414,8 +414,8 @@ 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);
+async function makePolicy(pool, rm, cust, payout, premium, lossProb, expiration, internalId, method = "newPolicy") {
+  let tx = await rm.connect(cust)[method](payout, premium, lossProb, expiration, cust.address, internalId);
   let receipt = await tx.wait();
   const newPolicyEvt = getTransactionEvent(pool.interface, receipt, "NewPolicy");
 

package/package.json

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