Bumped up hardhat, ethers and oz contracts (#223)

* bumped up hardhat, ethers and ozcontracts

* updated oz contracts path to prevent downstream naming conflicts

* sorted package json

* ran linter

Author: aalavandhan

contracts/UFragments.sol

@@ -372,10 +372,12 @@ contract UFragments is ERC20Detailed, Ownable {
         require(block.timestamp <= deadline);
 
         uint256 ownerNonce = _nonces[owner];
-        bytes32 permitDataDigest =
-            keccak256(abi.encode(PERMIT_TYPEHASH, owner, spender, value, ownerNonce, deadline));
-        bytes32 digest =
-            keccak256(abi.encodePacked("\x19\x01", DOMAIN_SEPARATOR(), permitDataDigest));
+        bytes32 permitDataDigest = keccak256(
+            abi.encode(PERMIT_TYPEHASH, owner, spender, value, ownerNonce, deadline)
+        );
+        bytes32 digest = keccak256(
+            abi.encodePacked("\x19\x01", DOMAIN_SEPARATOR(), permitDataDigest)
+        );
 
         require(owner == ecrecover(digest, v, r, s));
 

contracts/WAMPL.sol

@@ -2,11 +2,12 @@
 
 pragma solidity 0.8.4;
 
-import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import {IERC20} from "openzeppelin-contracts-4.4.1/contracts/token/ERC20/IERC20.sol";
 
-import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
-import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
-import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Permit.sol";
+import {SafeERC20} from "openzeppelin-contracts-4.4.1/contracts/token/ERC20/utils/SafeERC20.sol";
+import {ERC20} from "openzeppelin-contracts-4.4.1/contracts/token/ERC20/ERC20.sol";
+// solhint-disable-next-line max-line-length
+import {ERC20Permit} from "openzeppelin-contracts-4.4.1/contracts/token/ERC20/extensions/draft-ERC20Permit.sol";
 
 /**
  * @title WAMPL (Wrapped AMPL).

package.json

@@ -19,16 +19,19 @@
   "author": "dev-support@ampleforth.org",
   "scripts": {
     "compile": "yarn hardhat compile",
-    "test": "yarn hardhat test",
-    "profile": "REPORT_GAS=true yarn hardhat test test/unit/*.ts",
     "coverage": "yarn hardhat coverage --testfiles 'test/unit/*.ts'",
     "format": "yarn prettier --config .prettierrc --write '**/*.ts' 'contracts/**/*.sol'",
-    "lint": "yarn format && yarn solhint 'contracts/**/*.sol'"
+    "lint": "yarn format && yarn solhint 'contracts/**/*.sol'",
+    "profile": "REPORT_GAS=true yarn hardhat test test/unit/*.ts",
+    "test": "yarn hardhat test"
   },
   "pre-commit": [
     "format",
     "lint"
   ],
+  "dependencies": {
+    "openzeppelin-contracts-4.4.1": "https://github.com/OpenZeppelin/openzeppelin-contracts.git#4.4.1"
+  },
   "devDependencies": {
     "@nomiclabs/hardhat-ethers": "^2.0.1",
     "@nomiclabs/hardhat-etherscan": "^2.1.1",
@@ -39,10 +42,11 @@
     "@types/node": "^14.6.1",
     "bignumber.js": "^9.0.0",
     "chai": "^4.2.0",
-    "ethereum-waffle": "^3.2.1",
+    "ethereum-waffle": "^3.4.0",
     "ethereumjs-util": "^7.0.7",
-    "ethers": "5.0.18",
-    "hardhat": "^2.6.1",
+    "ethers": "^5.5.0",
+    "hardhat": "^2.7.1",
+    "hardhat-gas-reporter": "^1.0.4",
     "pre-commit": "^1.2.2",
     "prettier": "^2.1.1",
     "prettier-plugin-solidity": "^1.0.0-alpha.57",
@@ -52,10 +56,6 @@
     "solidity-coverage": "^0.7.13",
     "stochasm": "^0.5.0",
     "ts-node": "^9.0.0",
-    "typescript": "^4.0.2",
-    "hardhat-gas-reporter": "^1.0.4"
-  },
-  "dependencies": {
-    "@openzeppelin/contracts": "^4.3.0"
+    "typescript": "^4.0.2"
   }
 }

scripts/deploy.ts

@@ -41,9 +41,9 @@ task('deploy:ampl', 'Deploy ampleforth contracts').setAction(
     // deploy Policy
     const uFragmentsPolicy = await (
       await hre.upgrades.deployProxy(
-        (await hre.ethers.getContractFactory('UFragmentsPolicy')).connect(
-          deployer,
-        ),
+        (
+          await hre.ethers.getContractFactory('UFragmentsPolicy')
+        ).connect(deployer),
         [owner, uFragments.address, BASE_CPI.toString()],
         {
           initializer: 'initialize(address,address,uint256)',

test/unit/Orchestrator.ts

@@ -37,13 +37,8 @@ async function mockedOrchestrator() {
 
 describe('Orchestrator', function () {
   before('setup Orchestrator contract', async () => {
-    ;({
-      deployer,
-      user,
-      orchestrator,
-      mockPolicy,
-      mockDownstream,
-    } = await waffle.loadFixture(mockedOrchestrator))
+    ;({ deployer, user, orchestrator, mockPolicy, mockDownstream } =
+      await waffle.loadFixture(mockedOrchestrator))
   })
 
   describe('when sent ether', async function () {
@@ -97,9 +92,8 @@ describe('Orchestrator', function () {
 
   describe('when there is a single transaction', async function () {
     before('adding a transaction', async function () {
-      const updateOneArgEncoded = await mockDownstream.populateTransaction.updateOneArg(
-        12345,
-      )
+      const updateOneArgEncoded =
+        await mockDownstream.populateTransaction.updateOneArg(12345)
       await orchestrator
         .connect(deployer)
         .addTransaction(mockDownstream.address, updateOneArgEncoded.data)
@@ -133,10 +127,8 @@ describe('Orchestrator', function () {
 
   describe('when there are two transactions', async function () {
     before('adding a transaction', async function () {
-      const updateTwoArgsEncoded = await mockDownstream.populateTransaction.updateTwoArgs(
-        12345,
-        23456,
-      )
+      const updateTwoArgsEncoded =
+        await mockDownstream.populateTransaction.updateTwoArgs(12345, 23456)
       await orchestrator
         .connect(deployer)
         .addTransaction(mockDownstream.address, updateTwoArgsEncoded.data)
@@ -263,9 +255,8 @@ describe('Orchestrator', function () {
 
   describe('when a transaction reverts', async function () {
     before('adding 3 transactions', async function () {
-      const updateOneArgEncoded = await mockDownstream.populateTransaction.updateOneArg(
-        123,
-      )
+      const updateOneArgEncoded =
+        await mockDownstream.populateTransaction.updateOneArg(123)
       await orchestrator
         .connect(deployer)
         .addTransaction(mockDownstream.address, updateOneArgEncoded.data)
@@ -275,10 +266,8 @@ describe('Orchestrator', function () {
         .connect(deployer)
         .addTransaction(mockDownstream.address, revertsEncoded.data)
 
-      const updateTwoArgsEncoded = await mockDownstream.populateTransaction.updateTwoArgs(
-        12345,
-        23456,
-      )
+      const updateTwoArgsEncoded =
+        await mockDownstream.populateTransaction.updateTwoArgs(12345, 23456)
       await orchestrator
         .connect(deployer)
         .addTransaction(mockDownstream.address, updateTwoArgsEncoded.data)
@@ -293,7 +282,8 @@ describe('Orchestrator', function () {
   describe('Access Control', function () {
     describe('addTransaction', async function () {
       it('should be callable by owner', async function () {
-        const updateNoArgEncoded = await mockDownstream.populateTransaction.updateNoArg()
+        const updateNoArgEncoded =
+          await mockDownstream.populateTransaction.updateNoArg()
         await expect(
           orchestrator
             .connect(deployer)
@@ -302,7 +292,8 @@ describe('Orchestrator', function () {
       })
 
       it('should not be callable by others', async function () {
-        const updateNoArgEncoded = await mockDownstream.populateTransaction.updateNoArg()
+        const updateNoArgEncoded =
+          await mockDownstream.populateTransaction.updateNoArg()
         await expect(
           orchestrator
             .connect(user)

test/unit/UFragmentsPolicy.ts

@@ -855,7 +855,9 @@ describe('UFragmentsPolicy:Rebase', async function () {
           INITIAL_RATE_60P_MORE,
           INITIAL_CPI,
           20,
-          (await parseRebaseLog(r)).timestampSec,
+          (
+            await parseRebaseLog(r)
+          ).timestampSec,
         )
     })
 

test/unit/WAMPL.ts

@@ -893,7 +893,6 @@ describe('Underlying Rebase:Contraction', async function () {
   })
 })
 
-
 describe('user sends funds to the contract incorrectly', async function () {
   beforeEach('setup WAMPL contract', setupContracts)