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.

Sign up for GitHub

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

Zksolc version 1.3.14 support #123

Closed
wants to merge 6 commits into from
Closed

Zksolc version 1.3.14 support #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2a5ab4c
re-syncing to the newest foundry version (#114)
mm-zk Aug 10, 2023
128846d
add compatibility for zksolc up to v1.3.14
sammyshakes Sep 29, 2023
cdb227c
add idiomatic approach to filename retrieval
sammyshakes Sep 29, 2023
762bbe4
remove unecessary input of contract_path to compiler as throwing erro…
sammyshakes Sep 29, 2023
222bce4
formatting
sammyshakes Sep 29, 2023
2e37cf4
formatting mised instance
sammyshakes Sep 29, 2023
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
17 changes: 17 additions & 0 deletions .github/workflows/secrets_scanner.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Leaked Secrets Scan
on: [pull_request]
jobs:
TruffleHog:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
with:
fetch-depth: 0
- name: TruffleHog OSS
uses: trufflesecurity/trufflehog@0c66d30c1f4075cee1aada2e1ab46dabb1b0071a
with:
path: ./
base: ${{ github.event.repository.default_branch }}
head: HEAD
extra_args: --debug --only-verified
137 changes: 0 additions & 137 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,127 +121,6 @@ jobs:
# see https://github.com/foundry-rs/foundry/pull/3959
export LD_LIBRARY_PATH="$(rustc --print sysroot)/lib"
cargo nextest run --partition count:${{ matrix.partition }}/2 --retries 3 --archive-file nextest-integration.tar.zst -E '${{ matrix.job.filter }}'

forge-std-tests:
name: forge std tests / ${{ matrix.job.name }}
runs-on: ubuntu-latest
needs: build-tests
strategy:
matrix:
job:
- name: forge-std-test
filter: "test(~forge_std)"
env:
ETH_RPC_URL: https://eth-mainnet.alchemyapi.io/v2/C3JEvfW6VgtqZQa-Qp1E-2srEiIc02sD
steps:
- uses: actions/checkout@v3
- uses: taiki-e/install-action@nextest
- uses: dtolnay/rust-toolchain@stable
- name: Download archives
uses: actions/download-artifact@v3
with:
name: integration-tests

- name: Forge RPC cache
uses: actions/cache@v3
if: matrix.job.name != 'forge-std-test'
with:
path: "$HOME/.foundry/cache"
key: rpc-cache-${{ hashFiles('cli/tests/rpc-cache-keyfile') }}
- name: Setup git config
run: |
git config --global user.name "GitHub Actions Bot"
git config --global user.email "<>"

- name: cargo nextest
run: |
# see https://github.com/foundry-rs/foundry/pull/3959
export LD_LIBRARY_PATH="$(rustc --print sysroot)/lib"
cargo nextest run --retries 3 --archive-file nextest-integration.tar.zst -E '${{ matrix.job.filter }}'

integration:
name: integration tests / ${{ matrix.job.name }}
runs-on: ubuntu-latest
needs: build-tests
strategy:
matrix:
job:
- name: non-forking
filter: "!test(~fork) & !test(~live) & !test(~issue) & !test(~forge_std)"
- name: forking
filter: "test(~fork) & !test(~live)"
partition: [1, 2]
env:
ETH_RPC_URL: https://eth-mainnet.alchemyapi.io/v2/C3JEvfW6VgtqZQa-Qp1E-2srEiIc02sD
steps:
- uses: actions/checkout@v3
- uses: taiki-e/install-action@nextest
- uses: dtolnay/rust-toolchain@stable
- name: Download archives
uses: actions/download-artifact@v3
with:
name: integration-tests

- name: Forge RPC cache
uses: actions/cache@v3
if: matrix.job.name != 'non-forking'
with:
path: "$HOME/.foundry/cache"
key: rpc-cache-${{ hashFiles('cli/tests/rpc-cache-keyfile') }}
- name: Setup git config
run: |
git config --global user.name "GitHub Actions Bot"
git config --global user.email "<>"

- name: cargo nextest
run: |
# see https://github.com/foundry-rs/foundry/pull/3959
export LD_LIBRARY_PATH="$(rustc --print sysroot)/lib"
cargo nextest run --partition count:${{ matrix.partition }}/2 --retries 3 --archive-file nextest-integration.tar.zst -E '${{ matrix.job.filter }}'

external-integration:
name: external integration tests / ${{ matrix.job.name }}
runs-on: ubuntu-latest
needs: build-tests
strategy:
matrix:
job:
- name: non-forking
filter: "!test(~fork_integration) & !test(~live)"
- name: forking
filter: "test(~fork_integration) & !test(~live)"
env:
ETH_RPC_URL: https://eth-mainnet.alchemyapi.io/v2/C3JEvfW6VgtqZQa-Qp1E-2srEiIc02sD
steps:
- uses: actions/checkout@v3
- uses: taiki-e/install-action@nextest
- uses: dtolnay/rust-toolchain@stable
- name: Download archives
uses: actions/download-artifact@v3
with:
name: external-integration-tests

- name: Forge RPC cache
uses: actions/cache@v3
if: matrix.job.name != 'non-forking'
with:
path: "$HOME/.foundry/cache"
key: rpc-cache-${{ hashFiles('cli/tests/rpc-cache-keyfile') }}

- name: Setup git config
run: |
git config --global user.name "GitHub Actions Bot"
git config --global user.email "<>"

- name: Force use of HTTPS for submodules
run: git config --global url."https://github.com/".insteadOf "[email protected]:"

- name: cargo nextest
run: |
# see https://github.com/foundry-rs/foundry/pull/3959
export LD_LIBRARY_PATH="$(rustc --print sysroot)/lib"
cargo nextest run --retries 3 --archive-file nextest-external-integration.tar.zst -E '${{ matrix.job.filter }}'

doctests:
name: doc tests
runs-on: ubuntu-latest
Expand All @@ -253,12 +132,6 @@ jobs:
- name: cargo test
run: cargo test --locked --workspace --all-features --doc

cross-platform:
name: Cross-platform tests
if: github.event_name != 'pull_request'
needs: [unit, integration, doctests]
uses: ./.github/workflows/cross-platform.yml

clippy:
name: clippy
runs-on: ubuntu-latest
Expand All @@ -281,13 +154,3 @@ jobs:
components: rustfmt
- run: cargo fmt --all --check

forge-fmt:
name: forge fmt
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@stable
- uses: Swatinem/rust-cache@v2
- name: forge fmt
run: cargo run --bin forge -- fmt --check testdata/
Loading