test: ci_test_etherscan.sh, chore: lint/refactor

crytic · Feb 1, 2024 · d47b73a · d47b73a
1 parent b5f0d62
commit d47b73a
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 4 deletions.
diff --git a/crytic_compile/platform/etherscan.py b/crytic_compile/platform/etherscan.py
@@ -423,18 +423,26 @@ def compile(self, crytic_compile: "CryticCompile", **kwargs: str) -> None:
             evm_version=evm_version,
             via_ir=via_ir_enabled,
         )
-        
+
         metadata_config = {
             "solc_remaps": remappings if remappings else {},
             "solc_solcs_select": compiler_version,
-            "solc_args": ("--via-ir" if via_ir_enabled else "")
-            + ("--optimize --optimize-runs " + str(optimize_runs) if optimize_runs else "")
-            + ("--evm-version " + evm_version if evm_version else ""),
+            "solc_args": " ".join(
+                filter(
+                    None,
+                    [
+                        "--via-ir" if via_ir_enabled else "",
+                        "--optimize --optimize-runs " + str(optimize_runs) if optimize_runs else "",
+                        "--evm-version " + evm_version if evm_version else "",
+                    ],
+                )
+            ),
         }
 
         with open(
             os.path.join(working_dir if working_dir else export_dir, "crytic_compile.config.json"),
             "w",
+            encoding="utf-8",
         ) as f:
             json.dump(metadata_config, f)
 

diff --git a/scripts/ci_test_etherscan.sh b/scripts/ci_test_etherscan.sh
@@ -99,3 +99,34 @@ then
     exit 255
 fi
 echo "::endgroup::"
+
+# From crytic/crytic-compile#544
+echo "::group::Etherscan #8"
+crytic-compile 0x9AB6b21cDF116f611110b048987E58894786C244 --etherscan-apikey "$GITHUB_ETHERSCAN"
+
+if [ $? -ne 0 ]
+then
+    echo "Etherscan #8 test failed"
+    exit 255
+fi
+
+dir_name=$(ls crytic-export/etherscan-contracts/ | grep 0x9AB6b21cDF116f611110b048987E58894786C244)
+cd crytic-export/etherscan-contracts/$dir_name
+
+if [ ! -f crytic_compile.config.json ]; then
+    echo "crytic_compile.config.json does not exist"
+    exit 255
+fi
+
+# TODO: Globbing at crytic_compile.py:720 to run with '.'
+crytic-compile 'contracts/InterestRates/InterestRatePositionManager.f.sol' --config-file crytic_compile.config.json
+
+if [ $? -ne 0 ]
+then
+    echo "crytic-compile command failed"
+    exit 255
+fi
+
+cd ../../../
+
+echo "::endgroup::"