Skip to content

Commit

Permalink
Merge branch 'main' into daniyar/basic-l1-support
Browse files Browse the repository at this point in the history
  • Loading branch information
itegulov committed Feb 11, 2025
2 parents c15fbd1 + 0489105 commit b7c0287
Show file tree
Hide file tree
Showing 10 changed files with 46 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/release-please/manifest.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
".": "0.2.5"
".": "0.3.0"
}
7 changes: 7 additions & 0 deletions .github/workflows/build-push-docker.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
name: Build and push Docker image

permissions:
contents: write
pull-requests: write
id-token: write
attestations: write
packages: write

on:
workflow_dispatch:
inputs:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/release-please.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ permissions:
pull-requests: write
id-token: write
attestations: write
packages: write

# Run the workflow on push to the main branch and manually
on:
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,9 @@ jobs:
- name: Pack anvil-zksync
run: |
tar -czf anvil-zksync-${{ inputs.tag || inputs.prerelease_name }}-${{ matrix.arch }}.tar.gz \
./target/${{ matrix.arch }}/release/anvil-zksync
tar -C ./target/${{ matrix.arch }}/release -czf \
anvil-zksync-${{ inputs.tag || inputs.prerelease_name }}-${{ matrix.arch }}.tar.gz \
anvil-zksync
- name: Upload artifact
uses: actions/upload-artifact@v4
Expand Down Expand Up @@ -93,7 +94,7 @@ jobs:
shell: 'bash -ex {0}'
run: |
[ ! -z "${{ inputs.tag }}" ] && TAG="${{ inputs.tag }}" \
|| TAG="$(git rev-parse --short HEAD)"
|| TAG="$(git rev-parse --short HEAD)"
echo "tag=${TAG}" >> "${GITHUB_OUTPUT}"
- name: Download artifacts
Expand Down
20 changes: 20 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Changelog

## [0.3.0](https://github.com/matter-labs/anvil-zksync/compare/v0.2.5...v0.3.0) (2025-02-04)


### ⚠ BREAKING CHANGES

* upgrade to protocol v26 (gateway) ([#567](https://github.com/matter-labs/anvil-zksync/issues/567))
* **cli:** replay transactions when forking at a tx hash ([#557](https://github.com/matter-labs/anvil-zksync/issues/557))

### Features

* **cli:** replay transactions when forking at a tx hash ([#557](https://github.com/matter-labs/anvil-zksync/issues/557)) ([a955a9b](https://github.com/matter-labs/anvil-zksync/commit/a955a9bad062046d17aac47c0c5d86738af3f538))
* upgrade to protocol v26 (gateway) ([#567](https://github.com/matter-labs/anvil-zksync/issues/567)) ([94da53c](https://github.com/matter-labs/anvil-zksync/commit/94da53c8fab17423d7f4280f1df3139ee0d4db95))


### Bug Fixes

* add protocol version 26 ([#580](https://github.com/matter-labs/anvil-zksync/issues/580)) ([7465bc7](https://github.com/matter-labs/anvil-zksync/commit/7465bc7f50de819caf909907d129f5f3e575a159))
* make `anvil_reset` follow the same logic as main ([#569](https://github.com/matter-labs/anvil-zksync/issues/569)) ([0000e7d](https://github.com/matter-labs/anvil-zksync/commit/0000e7ddf3585c395b3e68e57dd29e0e6c294713))
12 changes: 6 additions & 6 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ strip = "debuginfo" # Automatically strip symbols from the binary.
lto = "thin" # Enable link-time optimization.

[workspace.package]
version = "0.2.5" # x-release-please-version
version = "0.3.0" # x-release-please-version
edition = "2021"
authors = ["The Matter Labs Team <[email protected]>"]
homepage = "https://zksync.io/"
Expand Down
2 changes: 1 addition & 1 deletion crates/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@ maplit.workspace = true
httptest.workspace = true
tempdir.workspace = true
test-case.workspace = true
backon.workspace = true
backon.workspace = true
3 changes: 2 additions & 1 deletion crates/core/src/node/inner/fork.rs
Original file line number Diff line number Diff line change
Expand Up @@ -931,7 +931,7 @@ impl ForkSource for Fork {
struct SupportedProtocolVersions;

impl SupportedProtocolVersions {
const SUPPORTED_VERSIONS: [ProtocolVersionId; 17] = [
const SUPPORTED_VERSIONS: [ProtocolVersionId; 18] = [
ProtocolVersionId::Version9,
ProtocolVersionId::Version10,
ProtocolVersionId::Version11,
Expand All @@ -949,6 +949,7 @@ impl SupportedProtocolVersions {
ProtocolVersionId::Version23,
ProtocolVersionId::Version24,
ProtocolVersionId::Version25,
ProtocolVersionId::Version26,
];

fn is_supported(version: ProtocolVersionId) -> bool {
Expand Down
6 changes: 3 additions & 3 deletions e2e-tests-rust/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit b7c0287

Please sign in to comment.