Merge branch 'dev' into dev-source-unit

Author: montyly

crytic_compile/platform/brownie.py

@@ -206,8 +206,9 @@ def _get_version(compiler: Dict) -> str:
         str: Compiler version
     """
     version = compiler.get("version", "")
-    version = version[len("Version: ") :]
-    version = version[0 : version.find("+")]
+    if "Version:" in version:
+        version = version.split("Version:")[1].strip()
+    version = version[0 : version.find("+")]  # TODO handle not "+" not found
     return version
 
 

crytic_compile/platform/solc_standard_json.py

@@ -4,6 +4,7 @@
 import json
 import logging
 import os
+from pathlib import Path
 import shutil
 import subprocess
 from typing import TYPE_CHECKING, Dict, List, Optional, Union, Any
@@ -132,7 +133,8 @@ def run_solc_standard_json(
     Returns:
         Dict: Solc json output
     """
-    cmd = [compiler_version.compiler, "--standard-json", "--allow-paths", "."]
+    working_dir_resolved = Path(working_dir if working_dir else ".").resolve()
+    cmd = [compiler_version.compiler, "--standard-json", "--allow-paths", str(working_dir_resolved)]
     additional_kwargs: Dict = {"cwd": working_dir} if working_dir else {}
 
     env = dict(os.environ)

scripts/ci_test_dapp.sh

@@ -2,6 +2,11 @@
 
 ### Test dapp integration
 
+# work around having two python versions loading libraries from each other in CI
+OLD_LD_LIBRARY_PATH="$LD_LIBRARY_PATH"
+alias crytic-compile='LD_LIBRARY_PATH=$OLD_LD_LIBRARY_PATH crytic-compile'
+unset LD_LIBRARY_PATH
+
 DIR=$(mktemp -d)
 cd "$DIR" || exit 255