Skip to content

Commit

Permalink
feat: protocol 20(vm 1.4.1 + fee model) integration (#258)
Browse files Browse the repository at this point in the history
* Update system contracts

* Update zksync-era, make it compiles

* Fix bootloader debug data, SC build scripts, rebuild SC

* Fix tests

* cargo fmt

* Update rust in workflows

* Small refactoring

* Fix e2e tests

* Use latest zksync-era

* Update SC repo link

* Implement some review improvements

* Reuse zksync-era functionality for fee params

* Update fee params in e2e tests

* Extend gas info

* Update comment

---------

Co-authored-by: Nicolas Villanueva <[email protected]>
  • Loading branch information
AntonD3 and MexicanAce authored Feb 8, 2024
1 parent 3367be6 commit 76608a2
Show file tree
Hide file tree
Showing 116 changed files with 7,055 additions and 6,870 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Install Rust
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: nightly-2023-07-23
toolchain: nightly-2023-08-21
components: rustfmt, clippy

- uses: actions/setup-node@v3
Expand All @@ -44,7 +44,7 @@ jobs:
- name: Install Rust
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: nightly-2023-07-23
toolchain: nightly-2023-08-21

- name: Build Code
run: make all
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Install Rust
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: nightly-2023-07-21
toolchain: nightly-2023-08-21
- name: Setup Pages
uses: actions/configure-pages@v3

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
- name: Install Rust
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: nightly-2023-07-21
toolchain: nightly-2023-08-21
- name: Install target
run: rustup target add ${{ matrix.arch }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Install Rust
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: nightly-2023-07-21
toolchain: nightly-2023-08-21

- name: Install cargo-nextest
run: cargo install cargo-nextest
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
/target
etc/system-contracts/.yarn
etc/system-contracts/node_modules
etc/system-contracts/contracts-preprocessed
etc/system-contracts/cache-zk
etc/system-contracts/artifacts-zk
etc/system-contracts/typechain-types
etc/system-contracts/typechain
etc/system-contracts/.yarnrc.yml
etc/system-contracts/bootloader/build

Expand Down
Loading

0 comments on commit 76608a2

Please sign in to comment.