@ensuro/core 2.7.0 → 2.8.0-beta1

package/js/utils.js

@@ -3,10 +3,13 @@ const ethers = require("ethers");
 const helpers = require("@nomicfoundation/hardhat-network-helpers");
 const { DAY, IMPLEMENTATION_SLOT } = require("./constants");
 
-const _E = ethers.utils.parseEther;
-const _BN = ethers.BigNumber.from;
-const WAD = _BN(10).pow(18); // 1e18
-const RAY = _BN(10).pow(27); // 1e27
+const _E = ethers.parseEther;
+const WAD = 10n ** 18n; // 1e18
+const RAY = 10n ** 27n; // 1e27
+
+function getAddress(addressable) {
+  return addressable.address || addressable.target || addressable;
+}
 
 async function getStorageLayout(hre, contractSrc, contractName) {
   const buildInfo = await hre.artifacts.getBuildInfo(`${contractSrc}:${contractName}`);
@@ -36,14 +39,14 @@ function amountFunction(decimals) {
     if (value === undefined) return undefined;
 
     if (typeof value === "string" || value instanceof String) {
-      return ethers.utils.parseUnits(value, decimals);
+      return ethers.parseUnits(value, decimals);
     }
 
     if (!Number.isInteger(value)) {
-      return _BN(Math.round(value * 1e6)).mul(_BN(Math.pow(10, decimals - 6)));
+      return BigInt(Math.round(value * 1e6).toString()) * BigInt(Math.pow(10, decimals - 6).toString());
     }
 
-    return _BN(value).mul(_BN(10).pow(decimals));
+    return BigInt(value.toString()) * BigInt("10") ** BigInt(decimals.toString());
   };
 }
 
@@ -58,9 +61,7 @@ const _R = amountFunction(27);
  */
 function getRole(role) {
   if (role.startsWith("0x")) return role;
-  return role === "DEFAULT_ADMIN_ROLE"
-    ? ethers.constants.HashZero
-    : ethers.utils.keccak256(ethers.utils.toUtf8Bytes(role));
+  return role === "DEFAULT_ADMIN_ROLE" ? ethers.ZeroHash : ethers.keccak256(ethers.toUtf8Bytes(role));
 }
 
 /**
@@ -79,14 +80,14 @@ function getComponentRole(componentAddress, role) {
   if (!role.startsWith("0x")) role = getRole(role);
 
   // 32 byte array
-  const bytesRole = ethers.utils.arrayify(role);
+  const bytesRole = ethers.getBytes(role);
 
   // 20 byte array
-  const bytesAddress = ethers.utils.arrayify(componentAddress);
+  const bytesAddress = ethers.getBytes(componentAddress);
 
   // xor each byte, padding bytesAddress with zeros at the end
   // eslint-disable-next-line no-bitwise
-  return ethers.utils.hexlify(bytesRole.map((elem, idx) => elem ^ (bytesAddress[idx] || 0)));
+  return ethers.hexlify(bytesRole.map((elem, idx) => elem ^ (bytesAddress[idx] || 0)));
 }
 
 async function getDefaultSigner(hre) {
@@ -154,7 +155,7 @@ function getTransactionEvent(interface, receipt, eventName) {
     } catch (error) {
       continue;
     }
-    if (parsedLog.name == eventName) {
+    if (parsedLog?.name == eventName) {
       return parsedLog;
     }
   }
@@ -164,10 +165,12 @@ function getTransactionEvent(interface, receipt, eventName) {
 /**
  * Builds AccessControl error message for comparison in tests
  */
-function accessControlMessage(address, component, role) {
-  const roleHash = component !== null ? getComponentRole(component, role) : getRole(role);
+function accessControlMessage(user, component, role) {
+  const userAddr = getAddress(user);
+  const compAddr = component !== null ? getAddress(component) : component;
+  const roleHash = component !== null ? getComponentRole(compAddr, role) : getRole(role);
 
-  return `AccessControl: account ${address.toLowerCase()} is missing role ${roleHash}`;
+  return `AccessControl: account ${userAddr.toLowerCase()} is missing role ${roleHash}`;
 }
 
 /**
@@ -175,8 +178,12 @@ function accessControlMessage(address, component, role) {
  *
  * Mimics the PolicyPool.newPolicy method of building the policy id.
  */
-function makePolicyId(rmAddress, internalId) {
-  return _BN(rmAddress).shl(96).add(internalId);
+function makePolicyId(rm, internalId) {
+  const rmAddress = getAddress(rm);
+  const bigRmAddress = BigInt(rmAddress);
+  // eslint-disable-next-line no-bitwise
+  const shiftedValue = (bigRmAddress << BigInt(96)) + BigInt(internalId);
+  return shiftedValue;
 }
 
 /**
@@ -185,7 +192,7 @@ function makePolicyId(rmAddress, internalId) {
  * Mimics the behaviour of the SignedQuoteRiskModule._newSignedPolicy method.
  */
 function makeQuoteMessage({ rmAddress, payout, premium, lossProb, expiration, policyData, validUntil }) {
-  return ethers.utils.solidityPack(
+  return ethers.solidityPacked(
     ["address", "uint256", "uint256", "uint256", "uint40", "bytes32", "uint40"],
     [rmAddress, payout, premium, lossProb, expiration, policyData, validUntil]
   );
@@ -206,7 +213,7 @@ function makeBucketQuoteMessage({
   bucketId,
   validUntil,
 }) {
-  return ethers.utils.solidityPack(
+  return ethers.solidityPacked(
     ["address", "uint256", "uint256", "uint256", "uint40", "bytes32", "uint256", "uint40"],
     [rmAddress, payout, premium, lossProb, expiration, policyData, bucketId, validUntil]
   );
@@ -219,30 +226,55 @@ function makeBucketQuoteMessage({
  */
 async function makeSignedQuote(signer, policyParams, makeQuoteMessageFn = makeQuoteMessage) {
   const quoteMessage = makeQuoteMessageFn(policyParams);
-  return ethers.utils.splitSignature(await signer.signMessage(ethers.utils.arrayify(quoteMessage)));
+  return ethers.Signature.from(await signer.signMessage(ethers.getBytes(quoteMessage)));
+}
+
+/**
+ * Recover address from signed quote
+ */
+function recoverAddress(policyParams, signature, makeQuoteMessageFn = makeQuoteMessage) {
+  const quoteMessage = makeQuoteMessageFn(policyParams);
+  const msg = ethers.getBytes(quoteMessage);
+  return ethers.verifyMessage(msg, signature);
 }
 
 /**
  * Build a default policy parameters object.
  */
 async function defaultPolicyParams(
-  { rmAddress, payout, premium, lossProb, expiration, policyData, validUntil },
+  { rm, payout, premium, lossProb, expiration, policyData, validUntil },
   _A = amountFunction(6)
 ) {
   const now = await helpers.time.latest();
+  const rmAddress = rm ? await ethers.resolveAddress(rm) : rm;
   return {
     rmAddress,
     payout: payout || _A(1000),
-    premium: premium || ethers.constants.MaxUint256,
+    premium: premium || ethers.MaxUint256,
     lossProb: lossProb || _W(0.1),
     expiration: expiration || now + DAY * 30,
-    policyData: policyData || ethers.utils.hexlify(ethers.utils.randomBytes(32)),
+    policyData: policyData || ethers.hexlify(ethers.randomBytes(32)),
     validUntil: validUntil || now + DAY * 30,
   };
 }
 
-async function readImplementationAddress(contractAddress) {
-  const implStorage = await ethers.provider.getStorageAt(contractAddress, IMPLEMENTATION_SLOT);
+function defaultBucketParams({ moc, jrCollRatio, collRatio, ensuroPpFee, ensuroCocFee, jrRoc, srRoc }) {
+  return {
+    moc: moc !== undefined ? moc : _W("1.1"),
+    jrCollRatio: jrCollRatio !== undefined ? jrCollRatio : _W("0.1"),
+    collRatio: collRatio !== undefined ? collRatio : _W("0.2"),
+    ensuroPpFee: ensuroPpFee !== undefined ? ensuroPpFee : _W("0.05"),
+    ensuroCocFee: ensuroCocFee !== undefined ? ensuroCocFee : _W("0.2"),
+    jrRoc: jrRoc !== undefined ? jrRoc : _W("0.1"),
+    srRoc: srRoc !== undefined ? srRoc : _W("0.2"),
+    asParams: function () {
+      return [this.moc, this.jrCollRatio, this.collRatio, this.ensuroPpFee, this.ensuroCocFee, this.jrRoc, this.srRoc];
+    },
+  };
+}
+
+async function readImplementationAddress(hre, contractAddress) {
+  const implStorage = await hre.ethers.provider.getStorageAt(contractAddress, IMPLEMENTATION_SLOT);
   return ethers.utils.getAddress(ethers.utils.hexDataSlice(implStorage, 12));
 }
 
@@ -252,17 +284,17 @@ async function readImplementationAddress(contractAddress) {
  * @returns {ethers.BigNumber}
  */
 function uintKeccak(value) {
-  return ethers.BigNumber.from(ethers.utils.keccak256(ethers.utils.toUtf8Bytes(value)));
+  return BigInt(ethers.keccak256(ethers.toUtf8Bytes(value)));
 }
 
 module.exports = {
-  _BN,
   _E,
   _R,
   _W,
   accessControlMessage,
   amountFunction,
   defaultPolicyParams,
+  defaultBucketParams,
   getComponentRole,
   getDefaultSigner,
   getRole,
@@ -276,6 +308,7 @@ module.exports = {
   makeSignedQuote,
   RAY,
   readImplementationAddress,
+  recoverAddress,
   uintKeccak,
   WAD,
 };

package/package.json

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

package/scripts/utils.sh

@@ -13,23 +13,34 @@ export DEPLOY_AMOUNT_DECIMALS=6
 
 NETWORK=${NETWORK:-localhost}
 
+getHHNodePID() {
+    ps ax | grep "/.bin/hardhat node" | grep -v grep  | awk '{print $1}'
+}
+
+waitHHNode() {
+    if [ -z "$1" ]; then
+        echo "Usage: $0 <node_url>"
+        exit 1
+    fi
+    while ! curl $1 --fail -X POST -H "Content-Type: application/json" -d '{"method":"eth_blockNumber","params":[],"id":1,"jsonrpc":"2.0"}' > /dev/null 2>&1; do
+        echo "Waiting for node start"
+        sleep 1
+    done
+}
+
 startHHNode() {
     if [ $NETWORK == "localhost" ]; then
-        HHNODE_RUNNING=`ps aux | grep "/.bin/hardhat node" | grep -v grep  | cut -c10-15`
-        if [ -z $HHNODE_RUNNING ]; then
-            START_HHNODE=1
+        HHNODE_RUNNING=$(getHHNodePID)
+        if [ -n "$HHNODE_RUNNING" ]; then
+            echo "Terminating existing hardhat node at PID $HHNODE_RUNNING"
+            kill -- $HHNODE_RUNNING
         fi
     fi
 
-    if [ ! -z $START_HHNODE ]; then
-        echo "Starting hardhat node"
-        # npx hardhat node $* >/dev/null &
-        node_modules/.bin/hardhat node $* >/dev/null &
+    echo "Starting hardhat node"
+    node_modules/.bin/hardhat node "$@" > /dev/null &
 
-        HHNODE_PID=$!
-        sleep 5
-        kill -0 $HHNODE_PID || die "Error launching hardhat node localhost"
-    fi
+    waitHHNode http://localhost:8545
 }
 
 readAddress() {
@@ -59,7 +70,7 @@ readPK() {
 }
 
 killPID() {
-    if [ ! -z $1 ]; then
+    if [ -n "$1" ]; then
         kill $1
     fi
 }