From 4635aa0bc8d10df5dc005d6f165a5fd148cfd2fa Mon Sep 17 00:00:00 2001
From: alpharush <0xalpharush@protonmail.com>
Date: Fri, 22 Mar 2024 14:38:04 -0500
Subject: [PATCH] fix: normalize windows path to handle solc >=0.8.8 filename
 lookup

---
 .github/workflows/pytest.yml                    |   2 +-
 crytic_compile/utils/naming.py                  |   9 +++++----
 tests/call_to_variable-all.sol-0.5.8-legacy.zip | Bin 0 -> 1913 bytes
 3 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 tests/call_to_variable-all.sol-0.5.8-legacy.zip

diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
index 92549ce8..6cedd199 100644
--- a/.github/workflows/pytest.yml
+++ b/.github/workflows/pytest.yml
@@ -40,4 +40,4 @@ jobs:
         pip install solc-select
     - name: Run Tests
       run: |
-        pytest tests/test_metadata.py
+        pytest tests
diff --git a/crytic_compile/utils/naming.py b/crytic_compile/utils/naming.py
index 7f5d1398..b062dd35 100644
--- a/crytic_compile/utils/naming.py
+++ b/crytic_compile/utils/naming.py
@@ -146,7 +146,7 @@ def convert_filename(
         if elements[0] == "/" or elements[0] == "\\":
             elements = elements[1:]  # remove '/'
             elements[0] = elements[0] + ":/"  # add :/
-        filename = Path(*elements)
+        filename = Path(*elements).as_posix_path()
     else:
         filename = Path(filename_txt)
 
@@ -188,10 +188,11 @@ def convert_filename(
         short = relative
 
     short = relative_to_short(short)
-
+    # Starting with v0.8.8 (https://github.com/ethereum/solidity/pull/11545), solc normalizes the paths to not include the drive on Windows,
+    # so it's important we use posix path here to avoid issues with the path comparison.
     return Filename(
-        absolute=str(absolute),
+        absolute=absolute.as_posix(),
         relative=relative.as_posix(),
         short=short.as_posix(),
-        used=str(used_filename),
+        used=Path(used_filename).as_posix(),
     )
diff --git a/tests/call_to_variable-all.sol-0.5.8-legacy.zip b/tests/call_to_variable-all.sol-0.5.8-legacy.zip
new file mode 100644
index 0000000000000000000000000000000000000000..fd360787259f0e33f74974fdc7bc512bc711b844
GIT binary patch
literal 1913
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

literal 0
HcmV?d00001