Revert "Hardhat packages upgrade (#604)" (#607)

This reverts commit 8caf066.

Author: Franck

contracts/package.json

@@ -28,9 +28,9 @@
   "author": "Origin Protocol Inc <support@originprotocol.com>",
   "license": "MIT",
   "devDependencies": {
-    "@nomiclabs/hardhat-ethers": "^2.0.2",
+    "@nomiclabs/hardhat-ethers": "^2.0.0",
     "@nomiclabs/hardhat-solhint": "^2.0.0",
-    "@nomiclabs/hardhat-waffle": "^2.0.1",
+    "@nomiclabs/hardhat-waffle": "^2.0.0",
     "@openzeppelin/contracts": "2.5.0",
     "@openzeppelin/hardhat-upgrades": "^1.6.0",
     "@openzeppelin/upgrades": "^2.8.0",
@@ -39,10 +39,10 @@
     "eslint": "^7.6.0",
     "ethereum-waffle": "^3.0.2",
     "ethers": "^5.0.0",
-    "hardhat": "^2.4.0",
+    "hardhat": "^2.0.2",
     "hardhat-contract-sizer": "^2.0.1",
-    "hardhat-deploy": "^0.8.8",
-    "hardhat-deploy-ethers": "^0.3.0-beta.10",
+    "hardhat-deploy": "^0.7.0-beta.18",
+    "hardhat-deploy-ethers": "^0.3.0-beta.5",
     "husky": "^4.3.0",
     "papaparse": "^5.3.0",
     "prettier": "^2.0.5",

contracts/test/vault/compound.js

@@ -428,7 +428,9 @@ describe("Vault with Compound strategy", function () {
         .connect(matt)
         .mint(nonStandardToken.address, usdtUnits("1200"), 0);
     } catch (err) {
-      expect(/ERC20 operation did not succeed/gi.test(err.message)).to.be.true;
+      expect(
+        /revert SafeERC20: ERC20 operation did not succeed/gi.test(err.message)
+      ).to.be.true;
     } finally {
       // Make sure nothing got affected
       await expectApproxSupply(ousd, ousdUnits("200.0"));

contracts/test/vault/index.js

@@ -133,7 +133,9 @@ describe("Vault", function () {
         .connect(anna)
         .mint(nonStandardToken.address, usdtUnits("1500.0"), 0);
     } catch (err) {
-      expect(/ERC20 operation did not succeed/gi.test(err.message)).to.be.true;
+      expect(
+        /revert SafeERC20: ERC20 operation did not succeed/gi.test(err.message)
+      ).to.be.true;
     } finally {
       // Make sure nothing got affected
       await expect(anna).has.a.balanceOf("0.00", ousd);