Merge pull request #911 from NexusMutual/release-candidate

Release v2.1.1
NexusMutual · Jul 26, 2023 · e30fe5c · e30fe5c
2 parents 2ed32cd + 1d642ac
commit e30fe5c
Show file tree

Hide file tree

Showing 225 changed files with 6,191 additions and 5,459 deletions.
diff --git a/contracts/modules/cover/Cover.sol b/contracts/modules/cover/Cover.sol
@@ -152,6 +152,7 @@ contract Cover is ICover, MasterAwareV2, IStakingPoolBeacon, ReentrancyGuard, Mu
       allocationRequest.coverId = coverId;
       allocationRequest.period = params.period;
       allocationRequest.gracePeriod = _productTypes[product.productType].gracePeriod;
+      allocationRequest.useFixedPrice = product.useFixedPrice;
       allocationRequest.globalCapacityRatio = GLOBAL_CAPACITY_RATIO;
       allocationRequest.capacityReductionRatio = product.capacityReductionRatio;
       allocationRequest.rewardRatio = GLOBAL_REWARDS_RATIO;

diff --git a/deployments/package.json b/deployments/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nexusmutual/deployments",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Nexus Mutual deployed contract addresses and abis",
   "exports": {
     ".": "./dist/index.js",

diff --git a/hardhat.config.js/index.js b/hardhat.config.js/index.js
@@ -34,6 +34,7 @@ const config = {
     recursive: false,
     timeout: 0,
     slow: 5000,
+    jobs: Number(process.env.MOCHA_JOBS) || 3,
   },
 
   networks: require('./networks'),

diff --git a/hardhat.config.js/tasks.js b/hardhat.config.js/tasks.js
@@ -1,11 +1,6 @@
 const { task } = require('hardhat/config');
 const { TASK_TYPECHAIN } = require('@typechain/hardhat/dist/constants');
-const { TASK_COMPILE, TASK_TEST_SETUP_TEST_ENVIRONMENT, TASK_TEST } = require('hardhat/builtin-tasks/task-names');
-
-task(TASK_TEST, async (args, hre, runSuper) => {
-  const testFiles = args.testFiles.length ? args.testFiles : ['test/index.js'];
-  await runSuper({ ...args, testFiles });
-});
+const { TASK_COMPILE, TASK_TEST_SETUP_TEST_ENVIRONMENT } = require('hardhat/builtin-tasks/task-names');
 
 task(TASK_TEST_SETUP_TEST_ENVIRONMENT, async (_, hre) => {
   const accounts = await hre.ethers.getSigners();
@@ -28,33 +23,27 @@ task(TASK_TYPECHAIN, async (args, hre, runSuper) => {
   await runSuper();
 });
 
-task(TASK_COMPILE)
-  .addFlag('generateStorageLayout', 'Generate storage layout')
-  .setAction(async function ({ generateStorageLayout }, hre, runSuper) {
-    if (!generateStorageLayout) {
-      return runSuper();
-    }
-
-    const { compilers, overrides } = hre.config.solidity;
+task(TASK_COMPILE).setAction(async function (_, hre, runSuper) {
+  const { compilers, overrides } = hre.config.solidity;
 
-    // add storageLayout to compilers if missing
-    for (const compiler of compilers) {
-      const output = compiler.settings.outputSelection['*']['*'];
-      if (!output.includes('storageLayout')) {
-        output.push('storageLayout');
-      }
+  // add storageLayout to compilers if missing
+  for (const compiler of compilers) {
+    const output = compiler.settings.outputSelection['*']['*'];
+    if (!output.includes('storageLayout')) {
+      output.push('storageLayout');
     }
+  }
 
-    // add storageLayout to overrides if missing
-    for (const source of Object.keys(overrides)) {
-      const output = overrides[source].settings.outputSelection['*']['*'];
-      if (!output.includes('storageLayout')) {
-        output.push('storageLayout');
-      }
+  // add storageLayout to overrides if missing
+  for (const source of Object.keys(overrides)) {
+    const output = overrides[source].settings.outputSelection['*']['*'];
+    if (!output.includes('storageLayout')) {
+      output.push('storageLayout');
     }
+  }
 
-    await runSuper();
-  });
+  await runSuper();
+});
 
 task('coverage').setAction(async function (args, hre, runSuper) {
   hre.config.warnings = {