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

Jump to bottom

Merge main into dev #228

Merged
merged 20 commits into from
Feb 26, 2024
Merged

Merge main into dev #228

merged 20 commits into from
Feb 26, 2024

Conversation

mm-zk
Copy link
Collaborator

@mm-zk mm-zk commented Feb 26, 2024 •
edited
Loading

What ❔

Merging main branch into 'dev'.

  • 1.4.1 release
  • upgrades to l2 bridge scripts and other scripts

StanislavBreadless and others added 20 commits January 12, 2024 14:53
@StanislavBreadless
Merge pull request #164 from matter-labs/dev
4287161 
Syncing main with dev (tests only)
@StanislavBreadless
Merge branch 'main' into release-v20-1.4.1-short-term-fee-model
f44e405
@StanislavBreadless
Cheaper L1->L2 txs + upgrade implementation (#168)
d8ed1d7
@StanislavBreadless
Correctly generate constant (#170)
0da8e15
@krauspt
fix: outdated link to foundry config docs (#172)
583cb67
@AntonD3
Update scheduler_key.json, regenerate verifier (#174)
cc8fe35
@StanislavBreadless
Fix upgrade l2 bridge script (#175)
2dfbc6b
@bogatyy
Fix: early exit in onlyVerifier branch
ebfac9e 
Right now `--only-verifier' still deploys CREATE2 Factory and Multicall3.
In other words, every `zk init` run deploys two copies of the same contracts.
This commit fixes the issue.
@vladbochok
Merge pull request #196 from bogatyy/patch-1
d55ea62
@StanislavBreadless
Merge branch 'main' into release-v20-1.4.1-short-term-fee-model
e1abffb
@StanislavBreadless @vladbochok
@AntonD3 @koloz193 @benceharomi
release v20: Short term fee model + 1.4.1 (#167)
9ffd7cf 
Co-authored-by: vladbochok <vladbochok1@gmail.com>
Co-authored-by: AntonD3 <74021421+AntonD3@users.noreply.github.com>
Co-authored-by: Vlad Bochok <41153528+vladbochok@users.noreply.github.com>
Co-authored-by: koloz <zach.kolodny@gmail.com>
Co-authored-by: AntonD3 <antonv.dyadyuk@gmail.com>
Co-authored-by: Bence Haromi <bence.haromi@gmail.com>
@StanislavBreadless
Revert "release v20: Short term fee model + 1.4.1" (#198)
b20dd4c
@StanislavBreadless
Merge pull request #199 from matter-labs/release-v20-1.4.1-short-term…
b7615f8 
…-fee-model

Release v20 1.4.1 short term fee model
@AntonD3
Update l2 ERC-20 metadata script (#194)
6f322ce
@otani88
ci: update logic for determine branch for releases (#215)
7b1633b
@Deniallugo
Revert "Fix: early exit in onlyVerifier branch" (#217)
7e29cdc
@otani88
ci: add workflow for manual build (#220)
0fd83c7
@ilitteri
fix: Deploy Multicall3 and Create2Factory before deploying `Verif…
7176ea4 
…ier` (#218)
@otani88
ci: fix jobs for create releases (#222)
2dd389c
@mm-zk
Merge branch 'dev' into mmzk_0226_main_clone
61b9599
@mm-zk mm-zk marked this pull request as ready for review February 26, 2024 09:22
@mm-zk mm-zk requested review from StanislavBreadless and removed request for StanislavBreadless February 26, 2024 09:22
@mm-zk mm-zk changed the title Mmzk 0226 main clone Merge main into dev Feb 26, 2024
@mm-zk mm-zk merged commit 80e22f3 into dev Feb 26, 2024
18 checks passed
@mm-zk mm-zk deleted the mmzk_0226_main_clone branch February 26, 2024 09:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@StanislavBreadless StanislavBreadless StanislavBreadless approved these changes

@vladbochok vladbochok Awaiting requested review from vladbochok vladbochok is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@mm-zk @StanislavBreadless @krauspt @AntonD3 @bogatyy @vladbochok @otani88 @Deniallugo @ilitteri