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

Bump zksolc compiler version #34

Merged
merged 3 commits into from
Jun 18, 2024
Merged
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
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ name: CI
on:
merge_group:
push:
branches: [ main ]
branches: [main]
pull_request:
branches: [ '**' ]
branches: ["**"]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
tool: cargo-nextest

- name: Download zksolc compiler
run: curl -L https://github.com/matter-labs/zksolc-bin/releases/download/v1.4.1/zksolc-linux-amd64-musl-v1.4.1 --output zksolc && chmod +x zksolc && sudo mv zksolc /usr/bin/zksolc
run: curl -L https://github.com/matter-labs/zksolc-bin/releases/download/v1.5.0/zksolc-linux-amd64-musl-v1.5.0 --output zksolc && chmod +x zksolc && sudo mv zksolc /usr/bin/zksolc

- name: Download solc compiler
run: curl -L https://github.com/ethereum/solidity/releases/download/v0.8.25/solc-static-linux --output solc && chmod +x solc && sudo mv solc /usr/bin/solc
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## Requirements

- [Rust](https://www.rust-lang.org/tools/install)
- [The EraVM Compiler: zksolc 1.4.1](https://github.com/matter-labs/zksolc-bin). Download the [latest binary](https://github.com/matter-labs/zksolc-bin/releases/tag/v1.4.1), then put it under your path. If done correctly, running `zksolc --version` should return 1.4.1.
- [The EraVM Compiler: zksolc 1.5.0](https://github.com/matter-labs/zksolc-bin). Download the [latest binary](https://github.com/matter-labs/zksolc-bin/releases/tag/v1.5.0, then put it under your path. If done correctly, running `zksolc --version` should return 1.5.0.

## Compiling programs

Expand All @@ -22,7 +22,7 @@ As an example, there's an `add.yul` sample program right now. After compiling it
- `add.yul.zasm`: The resulting `EraVM` assembly generated from the yul code. It's a good idea to look at it to see the assembly that's actually going to run.
- `add.yul.zbin`: The bytecode to be run (i.e. the assembled version of the `zasm` file above).
- `programs_add.yul.runtime.optimized.ll`: The optimized LLVM IR generated by the compiler.
- `programs_add.yul.runtime.unoptimized.ll`: The unoptimized LLVM IR generated by the compiler.
- `programs_add.yul.runtime.unoptimized.ll`: The unoptimized LLVM IR generated by the compiler.

## Running programs

Expand All @@ -35,7 +35,7 @@ cargo run -- <path_to_bin>
As an example, if you are running the `add.yul` program mentioned above, you need to run

```
cargo run -- program_artifacts/add.artifacts/add.yul.zbin
cargo run -- program_artifacts/add.artifacts.yul/programs/add.yul.zbin
```

## Documentation
Expand Down
4 changes: 2 additions & 2 deletions tests/integration_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ fn fake_rand() -> usize {
}
fn make_bin_path_yul(file_name: &str) -> String {
format!(
"{}/{}.artifacts.yul/{}.yul.zbin",
"{}/{}.artifacts.yul/programs/{}.yul.zbin",
ARTIFACTS_PATH, file_name, file_name
)
}

fn make_bin_path_asm(file_name: &str) -> String {
format!(
"{}/{}.artifacts.zasm/{}.zasm.zbin",
"{}/{}.artifacts.zasm/programs/{}.zasm.zbin",
ARTIFACTS_PATH, file_name, file_name
)
}
Expand Down