fixed OZ package issue

contracts/mainnet/connectors/instapool_v2/main.sol

@@ -21,6 +21,7 @@ contract LiquidityResolver is DSMath, Stores, Variables, Events {
 
     /**
      * @dev Borrow Flashloan and Cast spells.
+     * @notice Borrow Flashloan and Cast spells.
      * @param token Token Address.
      * @param amt Token Amount.
      * @param route Flashloan source route. (0: dYdX(ETH,DAI,USDC only), 1: MakerDAO(DAI only), 2: Compound(All borrowable tokens in Compound), 3: AaveV2(All borrowable tokens in AaveV2))
@@ -45,6 +46,7 @@ contract LiquidityResolver is DSMath, Stores, Variables, Events {
 
     /**
      * @dev Return token to InstaPool.
+     * @notice Return token to InstaPool.
      * @param token Token Address.
      * @param amt Token Amount.
      * @param getId Get token amount at this ID from `InstaMemory` Contract.

contracts/mainnet/connectors/instapool_v3/main.sol

@@ -21,6 +21,7 @@ contract LiquidityResolver is DSMath, Stores, Variables, Events {
 
     /**
      * @dev Borrow Flashloan and Cast spells.
+     * @notice Borrow Flashloan and Cast spells.
      * @param token Token Address.
      * @param amt Token Amount.
      * @param route Flashloan source route.
@@ -47,6 +48,7 @@ contract LiquidityResolver is DSMath, Stores, Variables, Events {
 
     /**
      * @dev Return token to InstaPool.
+     * @notice Return token to InstaPool.
      * @param token Token Address.
      * @param amt Token Amount.
      * @param getId Get token amount at this ID from `InstaMemory` Contract.
@@ -76,6 +78,7 @@ contract LiquidityResolver is DSMath, Stores, Variables, Events {
 
     /**
      * @dev Borrow multi-tokens Flashloan and Cast spells.
+     * @notice Borrow multi-tokens Flashloan and Cast spells.
      * @param tokens_ Array of Token Addresses.
      * @param amts_ Array of Token Amounts.
      * @param route Flashloan source route.
@@ -101,6 +104,7 @@ contract LiquidityResolver is DSMath, Stores, Variables, Events {
 
     /**
      * @dev Return multi-tokens to InstaPool.
+     * @notice Return multi-tokens to InstaPool.
      * @param tokens_ Array of Token Addresses.
      * @param amts_ Array of Token Amounts.
      * @param getIds Array of getId token amounts.

package.json

@@ -8,8 +8,7 @@
     "coverage": "./node_modules/.bin/solidity-coverage",
     "check": "node status-checks/huskyCheck.js",
     "check-husky": "node status-checks/huskyCheck.js",
-    "deploy": "node scripts/deployConnectorsFromCmd.js",
-    "build-contracts": "sol-merger \"./contracts/connectors/mock.sol\" ./contracts/build"
+    "deploy": "node scripts/deployConnectorsFromCmd.js"
   },
   "repository": {
     "type": "git",
@@ -22,13 +21,12 @@
   },
   "homepage": "https://github.com/InstaDApp/dsa-connectors-new#readme",
   "dependencies": {
-    "@openzeppelin/contracts": "^4.3.2",
+    "@openzeppelin/contracts": "^3.4.0-solc-0.7",
     "@uniswap/v3-core": "^1.0.0",
-    "@uniswap/v3-periphery": "^1.1.1",
-    "chalk": "^4.0.0",
-    "commander": "^7.1.0",
-    "dotenv": "^7.0.0",
-    "hardhat-docgen": "^1.1.1",
+    "@uniswap/v3-periphery": "^1.2.1",
+    "chalk": "^4.1.2",
+    "dotenv": "^10.0.0",
+    "hardhat-docgen": "^1.1.2",
     "minimist": "^1.2.5",
     "solc": "^0.7.0"
   },
@@ -38,7 +36,7 @@
     "@nomiclabs/hardhat-waffle": "^2.0.1",
     "@nomiclabs/hardhat-web3": "^2.0.0",
     "@openzeppelin/test-helpers": "^0.5.15",
-    "@studydefi/money-legos": "^2.3.7",
+    "@studydefi/money-legos": "^2.4.2",
     "@tenderly/hardhat-tenderly": "^1.0.12",
     "chai-as-promised": "^7.1.1",
     "ethereum-waffle": "^3.4.0",
@@ -46,8 +44,7 @@
     "hardhat": "^2.6.7",
     "hardhat-deploy": "^0.9.4",
     "hardhat-deploy-ethers": "^0.3.0-beta.11",
-    "husky": "^6.0.0",
-    "sol-merger": "^2.0.1",
+    "husky": "^7.0.4",
     "solidity-coverage": "0.5.11",
     "web3": "^1.5.2"
   }