Merge branch 'dev' into dependabot/github_actions/dev/actions/checkout-4

Author: montyly

.github/workflows/ci.yml

@@ -22,7 +22,7 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest", "windows-2022"]
-        type: ["brownie", "buidler", "dapp", "embark", "hardhat", "solc", "truffle", "waffle", "foundry", "standard", "vyper"]
+        type: ["brownie", "buidler", "dapp", "embark", "hardhat", "solc", "truffle", "waffle", "foundry", "standard", "vyper", "solc_multi_file", "hardhat_multi_file"]
         exclude:
           # Currently broken, tries to pull git:// which is blocked by GH
           - type: embark

crytic_compile/compilation_unit.py

@@ -46,6 +46,10 @@ def __init__(self, crytic_compile: "CryticCompile", unique_id: str):
             compiler="N/A", version="N/A", optimized=False
         )
 
+        # if the compilation unit comes from etherscan-like service and is a proxy,
+        # store the implementation address
+        self._implementation_address: Optional[str] = None
+
         self._crytic_compile: "CryticCompile" = crytic_compile
 
         if unique_id == ".":
@@ -130,6 +134,24 @@ def create_source_unit(self, filename: Filename) -> SourceUnit:
                 self.filenames.append(filename)
         return self._source_units[filename]
 
+    @property
+    def implementation_address(self) -> Optional[str]:
+        """Return the implementation address if the compilation unit is a proxy
+
+        Returns:
+            Optional[str]: Implementation address
+        """
+        return self._implementation_address
+
+    @implementation_address.setter
+    def implementation_address(self, implementation: str) -> None:
+        """Set the implementation address
+
+        Args:
+            implementation (str): Implementation address
+        """
+        self._implementation_address = implementation
+
     # endregion
     ###################################################################################
     ###################################################################################

crytic_compile/platform/etherscan.py

@@ -401,6 +401,14 @@ def compile(self, crytic_compile: "CryticCompile", **kwargs: str) -> None:
             optimize_runs=optimize_runs,
         )
         compilation_unit.compiler_version.look_for_installed_version()
+
+        if "Proxy" in result and result["Proxy"] == "1":
+            assert "Implementation" in result
+            implementation = str(result["Implementation"])
+            if target.startswith(tuple(SUPPORTED_NETWORK)):
+                implementation = f"{target[:target.find(':')]}:{implementation}"
+            compilation_unit.implementation_address = implementation
+
         solc_standard_json.standalone_compile(
             filenames,
             compilation_unit,

scripts/ci_test_etherscan.sh

@@ -7,10 +7,14 @@ cd "$DIR" || exit 255
 
 solc-select use 0.4.25 --always-install
 
-delay_no_key () {
+delay_etherscan () {
     # Perform a small sleep when API key is not available (e.g. on PR CI from external contributor)
     if [ "$GITHUB_ETHERSCAN" = "" ]; then
         sleep 5s
+    else
+      # Always sleep 2 second in the CI
+      # We have a lot of concurrent github action so this is needed
+      sleep 2s
     fi
 }
 
@@ -24,7 +28,7 @@ then
 fi
 echo "::endgroup::"
 
-delay_no_key
+delay_etherscan
 
 # From crytic/slither#1154
 echo "::group::Etherscan #3"
@@ -37,7 +41,7 @@ then
 fi
 echo "::endgroup::"
 
-delay_no_key
+delay_etherscan
 
 # From crytic/crytic-compile#415
 echo "::group::Etherscan #4"
@@ -50,7 +54,7 @@ then
 fi
 echo "::endgroup::"
 
-delay_no_key
+delay_etherscan
 
 # From crytic/crytic-compile#150
 echo "::group::Etherscan #5"
@@ -70,6 +74,8 @@ then
 fi
 echo "::endgroup::"
 
+delay_etherscan
+
 # From crytic/crytic-compile#151
 echo "::group::Etherscan #6"
 crytic-compile 0x4c808e3c011514d5016536af11218eec537eb6f5 --compile-remove-metadata --etherscan-apikey "$GITHUB_ETHERSCAN"

scripts/ci_test_hardhat_multi_file.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+DIR=$(mktemp -d)
+
+cp -r tests/hardhat-multi-file "$DIR"
+cd "$DIR/hardhat-multi-file" || exit 255
+npm install
+crytic-compile --compile-remove-metadata --export-formats solc,truffle .
+
+cd - || exit 255
+node tests/process_combined_solc.js "$DIR/hardhat-multi-file/crytic-export/combined_solc.json" "$DIR"
+DIFF=$(diff -r "$DIR/hardhat-multi-file/crytic-export" tests/expected/hardhat-multi-file)
+if [ "$?" != "0" ] || [ "$DIFF" != "" ]
+then  
+    echo "hardhat-multi-file test failed"
+    echo "$DIFF"
+    exit 255
+fi

scripts/ci_test_solc_multi_file.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+DIR=$(mktemp -d)
+
+cp -r tests/solc-multi-file "$DIR"
+cd "$DIR/solc-multi-file" || exit 255
+crytic-compile --compile-remove-metadata --export-formats solc,truffle A.sol
+
+cd - || exit 255
+node tests/process_combined_solc.js "$DIR/solc-multi-file/crytic-export/combined_solc.json" "$DIR"
+DIFF=$(diff -r "$DIR/solc-multi-file/crytic-export" tests/expected/solc-multi-file)
+if [ "$?" != "0" ] || [ "$DIFF" != "" ]
+then  
+    echo "solc-multi-file test failed"
+    echo "$DIFF"
+    exit 255
+fi