Merge pull request #343 from crytic/dev

Synchronise master with dev

.github/dependabot.yml

@@ -0,0 +1,7 @@
+---
+version: 2
+updates:
+    - package-ecosystem: "github-actions"
+      directory: "/"
+      schedule:
+        interval: "weekly"

.github/workflows/black.yml

@@ -17,10 +17,10 @@ jobs:
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Python 3.8
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: 3.8
 

.github/workflows/ci.yml

@@ -18,7 +18,7 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest", "windows-2022"]
-        type: ["brownie", "buidler", "dapp", "embark", "etherlime", "hardhat", "solc", "truffle", "waffle", "foundry"]
+        type: ["brownie", "buidler", "dapp", "embark", "etherlime", "hardhat", "solc", "truffle", "waffle", "foundry", "standard"]
         exclude:
           # Currently broken, tries to pull git:// which is blocked by GH
           - type: embark
@@ -39,17 +39,17 @@ jobs:
       id: node
       shell: bash
       run: |
-        if [ ${{ matrix.type }} = etherlime ]; then
-          echo '::set-output name=version::10.17.0'
+        if [ "${{ matrix.type }}" = "etherlime" ]; then
+          echo 'version=10.17.0' >> "$GITHUB_OUTPUT"
         else
-          echo '::set-output name=version::lts/*'
+          echo 'version=lts/*' >> "$GITHUB_OUTPUT"
         fi
     - name: Set up Node
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ steps.node.outputs.version }}
     - name: Set up Python 3.8
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v4
       with:
         python-version: 3.8
     - name: Install dependencies
@@ -59,16 +59,17 @@ jobs:
         pip install .
     - name: Set up nix
       if: matrix.type == 'dapp'
-      uses: cachix/install-nix-action@v16
+      uses: cachix/install-nix-action@v18
     - name: Set up cachix
       if: matrix.type == 'dapp'
-      uses: cachix/cachix-action@v10
+      uses: cachix/cachix-action@v12
       with:
         name: dapp
     - name: Run Tests
       env:
         TEST_TYPE: ${{ matrix.type }}
         GITHUB_ETHERSCAN: ${{ secrets.GITHUB_ETHERSCAN }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       shell: bash
       run: |
         bash "scripts/ci_test_${TEST_TYPE}.sh"

.github/workflows/darglint.yml

@@ -13,9 +13,9 @@ jobs:
   tests:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
     - name: Set up Python 3.8
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v4
       with:
         python-version: 3.8
     - name: Run Tests

.github/workflows/etherscan.yml

@@ -27,7 +27,7 @@ jobs:
         echo 'C:\msys64\mingw64\bin' >> "$GITHUB_PATH"
         echo 'C:\msys64\usr\bin' >> "$GITHUB_PATH"
     - name: Set up Python 3.8
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v4
       with:
         python-version: 3.8
     - name: Install dependencies

.github/workflows/linter.yml

@@ -17,10 +17,10 @@ jobs:
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Python 3.8
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: 3.8
 

.github/workflows/mypy.yml

@@ -17,10 +17,10 @@ jobs:
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Python 3.8
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: 3.8
 

.github/workflows/pylint.yml

@@ -17,10 +17,10 @@ jobs:
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Python 3.8
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: 3.8
 

.github/workflows/pytest.yml

@@ -0,0 +1,39 @@
+---
+name: Pytest
+
+defaults:
+  run:
+    # To load bashrc
+    shell: bash -ieo pipefail {0}
+
+on:
+  push:
+    branches:
+      - main
+      - dev
+  pull_request:
+    branches: [main, dev]
+  schedule:
+    # run CI every day even if no PRs/merges occur
+    - cron: '0 12 * * *'
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python 3.8
+      uses: actions/setup-python@v4
+      with:
+        python-version: 3.8
+
+        # Used by ci_test.sh
+    - name: Install dependencies
+      run: |
+        python setup.py install
+        pip install pytest
+        pip install solc-select
+    - name: Run Tests
+      run: |
+        pytest tests/test_metadata.py

.gitignore

@@ -1,6 +1,12 @@
+*.nix
+*.pyc
 .idea/
-crytic_compile.egg-info/
 __pycache__/
-*.pyc
+artifacts
 build/
-dist/
+cache
+crytic_compile.egg-info/
+dist/
+node_modules
+package-lock.json
+result

crytic_compile/__main__.py

@@ -13,6 +13,7 @@
 from crytic_compile.crytic_compile import compile_all, get_platforms
 from crytic_compile.cryticparser import DEFAULTS_FLAG_IN_CONFIG, cryticparser
 from crytic_compile.platform import InvalidCompilation
+from crytic_compile.platform.all_export import PLATFORMS_EXPORT
 from crytic_compile.utils.zip import ZIP_TYPES_ACCEPTED, save_to_zip
 
 if TYPE_CHECKING:
@@ -50,8 +51,8 @@ def parse_args() -> argparse.Namespace:
 
     parser.add_argument(
         "--export-format",
-        help="""Export json with non crytic-compile format
-(default None. Accepted: standard, solc, truffle)""",
+        help=f"""Export json with non crytic-compile format
+            (default None. Accepted: ({", ".join(list(PLATFORMS_EXPORT))})""",
         action="store",
         dest="export_format",
         default=None,
@@ -172,7 +173,7 @@ def _print_filenames(compilation: "CryticCompile") -> None:
     """
     for compilation_id, compilation_unit in compilation.compilation_units.items():
         print(
-            f"Compilation unit: {compilation_id} ({len(compilation_unit.contracts_names)} files, solc {compilation_unit.compiler_version.version})"
+            f"Compilation unit: {compilation_id} solc {compilation_unit.compiler_version.version})"
         )
         for filename, contracts in compilation_unit.filename_to_contracts.items():
             for contract in contracts: