From d93673244d75626065bf9021e50437bb09194c24 Mon Sep 17 00:00:00 2001 From: IAvecilla Date: Tue, 18 Jun 2024 17:39:31 -0300 Subject: [PATCH 1/3] Update compiled files path --- tests/integration_test.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/integration_test.rs b/tests/integration_test.rs index 1169b51d..a4e61ce6 100644 --- a/tests/integration_test.rs +++ b/tests/integration_test.rs @@ -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 ) } From 20b24f1f214fe1a34d3019345bee47c97a12ea5e Mon Sep 17 00:00:00 2001 From: IAvecilla Date: Tue, 18 Jun 2024 17:39:45 -0300 Subject: [PATCH 2/3] Update README with new zksolc version --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 77c2022b..fcbdd643 100644 --- a/README.md +++ b/README.md @@ -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 @@ -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 @@ -35,7 +35,7 @@ cargo run -- 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 From f6298c26ac4797998c80748c02d0340738cc0601 Mon Sep 17 00:00:00 2001 From: IAvecilla Date: Tue, 18 Jun 2024 17:40:04 -0300 Subject: [PATCH 3/3] Update CI workflow to use new latest zksolc version --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 15e1209a..99858a48 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,9 +3,9 @@ name: CI on: merge_group: push: - branches: [ main ] + branches: [main] pull_request: - branches: [ '**' ] + branches: ["**"] concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -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