Merge pull request #305 from AstariaXYZ/c4/changes

C4/changes

.github/workflows/test.yml

@@ -17,7 +17,9 @@ jobs:
           submodules: recursive
           token: ${{ secrets.MY_REPO_PAT }}
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
       - run: yarn
       - uses: onbjerg/foundry-toolchain@v1
         with:

.gitmodules

@@ -5,9 +5,6 @@
 	path = lib/gpl
 	url = https://github.com/AstariaXYZ/astaria-gpl
 	branch = main
-[submodule "lib/clones-with-immutable-args"]
-	path = lib/clones-with-immutable-args
-	url = https://github.com/wighawag/clones-with-immutable-args
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
@@ -17,3 +14,7 @@
 [submodule "lib/seaport"]
 	path = lib/seaport
 	url = https://github.com/projectopensea/seaport
+[submodule "lib/create2-clones-with-immutable-args"]
+	path = lib/create2-clones-with-immutable-args
+	url = https://github.com/emo-eth/create2-clones-with-immutable-args
+	branch = v0.1.1

foundry.toml

@@ -10,6 +10,8 @@ remappings = [
     'solmate/=lib/solmate/src/',
     'gpl/=lib/gpl/src/',
     'clones-with-immutable-args/=lib/clones-with-immutable-args/src/',
+    'create2-clones-with-immutable-args/=lib/create2-clones-with-immutable-args/src/',
+    'create2-helpers/=lib/create2-clones-with-immutable-args/lib/create2-helpers/src/',
     'core/=./src/',
     'seaport/=lib/seaport/contracts',
 ]

package.json

@@ -8,7 +8,7 @@
   },
   "scripts": {
     "lint": "eslint src/**/*.sol",
-    "lint:fix": "prettier --write src/**/*.sol",
+    "lint:fix": "prettier --write src/**/*.sol src/*.sol",
     "postinstall": "husky install"
   },
   "lint-staged": {

remappings.txt

@@ -1,4 +1,6 @@
 clones-with-immutable-args/=lib/clones-with-immutable-args/src/
+create2-clones-with-immutable-args/=lib/create2-clones-with-immutable-args/src/
+create2-helpers/=lib/create2-clones-with-immutable-args/lib/create2-helpers/src/
 forge-std/=lib/forge-std/src/
 eip4626/=lib/foundry_eip-4626/src/
 gpl/=lib/gpl/src/

scripts/coverage.py

@@ -0,0 +1,48 @@
+import json
+import subprocess
+
+coverage_contracts = ["IAstariaRouter", "ClearingHouse", "ICollateralToken", "ILienToken", "IPublicVault", "IVaultImplementation", "WithdrawProxy"]
+excluded_parent_contracts = ["AuthInitializable", "Initializable", "AmountDeriver", "Clone", "IERC1155", "IERC721Receiver", "ERC721", "ZoneInterface", "IERC4626"]
+
+tests = subprocess.run(["forge", "test", "--ffi", "--no-match-contract", "ForkedTest", "-vvvvv"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+with open("coverage.txt", "w") as file:
+    pass
+
+excluded_parent_fns = []
+for contract in excluded_parent_contracts:
+    with open("out/" + contract + ".sol/" + contract + ".json") as file:
+        abi = json.load(file)
+    for fn in abi["methodIdentifiers"].keys():
+        excluded_parent_fns.append(fn.split("(")[0])\
+
+# remove duplicates
+excluded_parent_fns = list(dict.fromkeys(excluded_parent_fns))
+
+for contract in coverage_contracts:
+    with open("out/" + contract + ".sol/" + contract + ".json") as file:
+        abi = json.load(file)
+    covered_fns = abi["methodIdentifiers"]
+    coverage = len(covered_fns)
+    excluded_fns = 0
+    uncovered_fns = []
+    for fn in covered_fns.keys():
+        fn_name = fn.split("(")[0]
+        if fn_name in excluded_parent_fns or fn_name.startswith("get") or fn_name.startswith("is") or fn_name == fn_name.upper():
+            excluded_fns += 1
+        elif fn_name not in tests.stdout.decode("utf-8"):
+            uncovered_fns.append(fn_name)
+            coverage -= 1
+    # store the contents of uncovered_fns in a text file
+    with open("coverage.txt", "a") as file:
+        file.write("\n" + contract + ": ")
+        for fn_name in uncovered_fns:
+            file.write(fn_name + ", ")
+    print(contract + ": " + str(coverage - excluded_fns) + "/" + str(len(covered_fns) - excluded_fns))
+
+
+
+
+
+
+