Update to hardhat

buidler.config.ts → hardat.config.ts

@@ -1,8 +1,8 @@
 require("dotenv").config();
 
-import { usePlugin, task, types } from  "@nomiclabs/buidler/config";
+import { task, types } from  "@nomiclabs/buidler/config";
 
-import {Signer, Wallet, utils, constants, Contract, BytesLike} from "ethers";
+import { Wallet, utils, constants, Contract, BytesLike} from "ethers";
 import {deployContract} from "ethereum-waffle";
 
 import DiamondFactoryArtifact from './artifacts/DiamondFactoryContract.json';
@@ -24,10 +24,10 @@ import { LendingLogicAaveFactory } from "./typechain/LendingLogicAaveFactory";
 import { LendingManagerFactory } from "./typechain/LendingManagerFactory";
 import { StakingLogicYGovFactory } from "./typechain/StakingLogicYGovFactory";
 
-usePlugin("@nomiclabs/buidler-ethers");
-usePlugin('solidity-coverage');
-usePlugin("@nomiclabs/buidler-etherscan");
-usePlugin('solidity-coverage');
+import "@nomiclabs/buidler-ethers";
+import 'solidity-coverage';
+import "@nomiclabs/buidler-etherscan";
+import 'solidity-coverage';
 
 function getSelectors(contract: Contract) {
   const signatures: BytesLike[] = [];
@@ -39,9 +39,9 @@ function getSelectors(contract: Contract) {
 }
 
 const config = {
-  defaultNetwork: 'buidlerevm',
+  defaultNetwork: 'hardhat',
   networks: {
-    buidlerevm: {
+    hardhat: {
       gasPrice: 0,
       blockGasLimit: 10000000,
     },
@@ -68,10 +68,12 @@ const config = {
   },
   solc: {
     version: '0.7.1',
-    optimizer: {
-      // Factory goes above contract size limit
-      enabled: true,
-      runs: 200
+    settings: {
+      optimizer: {
+        // Factory goes above contract size limit
+        enabled: true,
+        runs: 200
+      }
     }
   },
   etherscan: { apiKey: process.env.ETHERSCAN_KEY }

buidler.compile.config.ts → hardhat.compile.config.ts

@@ -1,12 +1,10 @@
-import { usePlugin } from  "@nomiclabs/buidler/config";
-
-usePlugin("@nomiclabs/buidler-ethers");
-usePlugin('solidity-coverage')
+import "@nomiclabs/buidler-ethers";
+import 'solidity-coverage';
 
 const config = {
-  defaultNetwork: 'buidlerevm',
+  defaultNetwork: 'hardhat',
   networks: {
-    buidlerevm: {
+    hardhat: {
       gasPrice: 0,
       blockGasLimit: 100000000,
     },
@@ -22,10 +20,12 @@ const config = {
   },
   solc: {
     version: '0.7.1',
-    optimizer: {
-      // PieFactory pushes contract size over limit. Consider reducing factory size
-      enabled: true,
-      runs: 200
+    settings: {
+      optimizer: {
+        // PieFactory pushes contract size over limit. Consider reducing factory size
+        enabled: true,
+        runs:1000
+      }
     }
   },
 }

package.json

@@ -8,7 +8,7 @@
     "clean": "rm -rf ./build && rm -rf ./typechain && rm -rf ./artifacts",
     "test": "npx buidler test",
     "test:fast": "TS_NODE_TRANSPILE_ONLY=1 npx buidler test",
-    "compile": "npx buidler compile --config buidler.compile.config.ts",
+    "compile": "npx hardhat compile --config hardhat.compile.config.ts --show-stack-traces",
     "typechain": "typechain --target ethers-v5 --outDir typechain ./artifacts/**/*.json",
     "docgen": "solidity-docgen --solc-module solc-0.7 --output-structure readmes",
     "coverage": "npx buidler coverage --network coverage --temp artifacts",
@@ -37,9 +37,11 @@
   },
   "devDependencies": {
     "@codechecks/client": "^0.1.10",
+    "@nomiclabs/hardhat-ethers": "^2.0.2",
     "chai": "^4.2.0",
     "dotenv": "^8.2.0",
     "eth-gas-reporter": "^0.2.17",
+    "hardhat": "^2.6.8",
     "mocha": "^8.1.3",
     "prettier": "^2.1.1",
     "prettier-plugin-solidity": "^1.0.0-alpha.57",