Merge pull request #110 from morpho-dao/fix/import-paths

Make imports relative

Author: Rubilmax

.gitmodules

@@ -4,3 +4,7 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
+[submodule "lib/openzeppelin-contracts"]
+	path = lib/openzeppelin-contracts
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts
+	branch = v4.8.0

hardhat.config.ts

@@ -3,21 +3,27 @@ dotenv.config({ path: './.env.local' });
 import '@nomiclabs/hardhat-etherscan';
 import '@nomiclabs/hardhat-waffle';
 import 'hardhat-gas-reporter';
+import 'hardhat-contract-sizer';
+import 'solidity-coverage';
 
 module.exports = {
   defaultNetwork: 'hardhat',
   networks: {
     hardhat: {},
   },
   solidity: {
-    version: '0.8.7',
+    version: '0.8.17',
     settings: {
       optimizer: {
         enabled: true,
         runs: 200,
       },
     },
   },
+  paths: {
+    sources: './src',
+    tests: './test-ts',
+  },
   etherscan: {
     apiKey: process.env.ETHERSCAN_API_KEY,
   },

lib/openzeppelin-contracts

@@ -8,13 +8,13 @@
   "scripts": {
     "test": "npx hardhat test test-ts/*.ts",
     "coverage": "npx hardhat coverage",
-    "lint": "yarn run lint:sol && yarn run lint:js",
+    "lint": "yarn run lint:sol && yarn run lint:ts",
     "lint:ts": "eslint . --ext .ts",
     "lint:sol": "solhint 'contracts/**/*.sol'",
-    "fix": "yarn fix:sol && yarn fix:js",
+    "fix": "yarn fix:sol && yarn fix:ts",
     "fix:ts": "prettier --config .prettierrc.json './**/*.ts' --write",
-    "fix:sol": "prettier --write 'contracts/**/*.sol'",
-    "size": "yarn run hardhat size-contracts",
+    "fix:sol": "prettier --write 'src/**/*.sol'",
+    "size": "npx hardhat size-contracts",
     "postinstall": "husky install"
   },
   "devDependencies": {
@@ -32,6 +32,7 @@
     "ethereum-waffle": "^3.4.0",
     "ethers": "^5.4.1",
     "hardhat": "^2.5.0",
+    "hardhat-contract-sizer": "^2.6.1",
     "hardhat-gas-reporter": "^1.0.4",
     "husky": "^7.0.1",
     "prettier": "^2.3.2",
@@ -41,8 +42,5 @@
     "solidity-coverage": "^0.7.16",
     "ts-node": "10.4.0",
     "typescript": "4.5.2"
-  },
-  "dependencies": {
-    "@openzeppelin/contracts": "4.7.3"
   }
 }

package.json

@@ -1,4 +1,2 @@
-@openzeppelin/=node_modules/@openzeppelin/
-forge-std/=lib/forge-std/src/
 ds-test/=lib/ds-test/src/
-hardhat/=node_modules/hardhat/
+forge-std/=lib/forge-std/src/

remappings.txt

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity ^0.8.0;
 
-import "@openzeppelin/contracts/utils/math/SafeCast.sol";
+import "../lib/openzeppelin-contracts/contracts/utils/math/SafeCast.sol";
 
 library HeapOrdering {
     struct Account {

src/HeapOrdering.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity ^0.8.0;
 
-import "@openzeppelin/contracts/utils/math/SafeCast.sol";
+import "../lib/openzeppelin-contracts/contracts/utils/math/SafeCast.sol";
 
 library ThreeHeapOrdering {
     struct Account {

src/ThreeHeapOrdering.sol

@@ -22,7 +22,7 @@ describe('Test RedBlackBinaryTree Library', () => {
 
   describe('Print tree', () => {
     it('Apply instructions', async () => {
-      await testScenario('./test/instruction.json', testRedBlackBinaryTree);
+      await testScenario('./test-ts/instruction.json', testRedBlackBinaryTree);
       await printTreeStucture(testRedBlackBinaryTree);
     });
   });

test-ts/test-print-tree.ts

@@ -23,6 +23,11 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
+"@colors/colors@1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
+  integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==
+
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz#33bf4b7b39c178821606f669bbc447a6a629786b"
@@ -743,11 +748,6 @@
     "@types/sinon-chai" "^3.2.3"
     "@types/web3" "1.0.19"
 
-"@openzeppelin/contracts@4.7.3":
-  version "4.7.3"
-  resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.7.3.tgz#939534757a81f8d69cc854c7692805684ff3111e"
-  integrity sha512-dGRS0agJzu8ybo44pCIf3xBaPQN/65AIXNgK8+4gzKd5kbvlqyxryUYVLJv7fK98Seyd2hDZzVEHSWAh0Bt1Yw==
-
 "@resolver-engine/core@^0.3.3":
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/@resolver-engine/core/-/core-0.3.3.tgz#590f77d85d45bc7ecc4e06c654f41345db6ca967"
@@ -2638,7 +2638,7 @@ chalk@^2.0.0, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^4.1.0:
+chalk@^4.0.0, chalk@^4.1.0:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -2775,6 +2775,15 @@ cli-table3@^0.5.0:
   optionalDependencies:
     colors "^1.1.2"
 
+cli-table3@^0.6.0:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.3.tgz#61ab765aac156b52f222954ffc607a6f01dbeeb2"
+  integrity sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==
+  dependencies:
+    string-width "^4.2.0"
+  optionalDependencies:
+    "@colors/colors" "1.5.0"
+
 cli-width@^2.0.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"
@@ -4953,6 +4962,14 @@ har-validator@~5.1.3:
     ajv "^6.12.3"
     har-schema "^2.0.0"
 
+hardhat-contract-sizer@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/hardhat-contract-sizer/-/hardhat-contract-sizer-2.6.1.tgz#2b0046a55fa1ec96f19fdab7fde372377401c874"
+  integrity sha512-b8wS7DBvyo22kmVwpzstAQTdDCThpl/ySBqZh5ga9Yxjf61/uTL12TEg5nl7lDeWy73ntEUzxMwY6XxbQEc2wA==
+  dependencies:
+    chalk "^4.0.0"
+    cli-table3 "^0.6.0"
+
 hardhat-gas-reporter@^1.0.4:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/hardhat-gas-reporter/-/hardhat-gas-reporter-1.0.9.tgz#9a2afb354bc3b6346aab55b1c02ca556d0e16450"