Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync Master <> Dev #595

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ jobs:
solc-select use 0.5.7 --always-install
- name: Set up nix
if: matrix.type == 'dapp'
uses: cachix/install-nix-action@v30
uses: cachix/install-nix-action@v31
- name: Set up cachix
if: matrix.type == 'dapp'
uses: cachix/cachix-action@v15
uses: cachix/cachix-action@v16
with:
name: dapp
- name: Install Foundry
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
path: dist/

- name: publish
uses: pypa/[email protected].3
uses: pypa/[email protected].4

- name: sign
uses: sigstore/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @montyly @0xalpharush @bohendo
* @elopez @bohendo @smonicas
15 changes: 15 additions & 0 deletions crytic_compile/platform/etherscan.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,21 @@
"sepoliaera.zksync": ("300", "sepolia-era.zksync.network"),
"xai": ("660279", "xaiscan.io"),
"sepolia.xai": ("37714555429", "sepolia.xaiscan.io"),
"xdc": ("50", "xdcscan.com"),
"testnet.xdc": ("51", "testnet.xdcscan.com"),
"apechain": ("33139", "apescan.io"),
"curtis.apechain": ("33111", "curtis.apescan.io"),
"world": ("480", "worldscan.org"),
"sepolia.world": ("4801", "sepolia.worldscan.org"),
"sophon": ("50104", "sophscan.xyz"),
"testnet.sophon": ("531050104", "testnet.sophscan.xyz"),
"sonic": ("146", "sonicscan.org"),
"testnet.sonic": ("57054", "testnet.sonicscan.org"),
"unichain": ("130", "uniscan.xyz"),
"sepolia.unichain": ("1301", "sepolia.uniscan.xyz"),
"abstract": ("2741", "abscan.org"),
"sepolia.abstract": ("11124", "sepolia.abscan.org"),
"berachain": ("80094", "berascan.com"),
}

SUPPORTED_NETWORK = {**SUPPORTED_NETWORK_V1, **SUPPORTED_NETWORK_V2}
Expand Down
2 changes: 1 addition & 1 deletion crytic_compile/platform/foundry.py
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ def is_dependency(self, path: str) -> bool:
"""
if path in self._cached_dependencies:
return self._cached_dependencies[path]
ret = "lib" in Path(path).parts
ret = "lib" in Path(path).parts or "node_modules" in Path(path).parts
self._cached_dependencies[path] = ret
return ret

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
description="Util to facilitate smart contracts compilation.",
url="https://github.com/crytic/crytic-compile",
author="Trail of Bits",
version="0.3.8",
version="0.3.9",
packages=find_packages(),
# Python 3.12.0 on Windows suffers from https://github.com/python/cpython/issues/109590
# breaking some of our integrations. The issue is fixed in 3.12.1
Expand Down
Loading