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

chore: upgrade calldata #2159

Merged
merged 62 commits into from
Jun 6, 2024
Merged

chore: upgrade calldata #2159

merged 62 commits into from
Jun 6, 2024

Conversation

kelemeno
Copy link
Contributor

@kelemeno kelemeno commented Jun 6, 2024

What ❔

Why ❔

Checklist

  • PR title corresponds to the body of PR (we generate changelog entries from PRs).
  • Tests for the changes have been added / updated.
  • Documentation comments have been added / updated.
  • Code has been formatted via zk fmt and zk lint.
  • Spellcheck has been run via zk spellcheck.

kelemeno added 30 commits April 29, 2024 12:47
@kelemeno
updated transactions.ts in protocol-upgrade-tool
450d116
@kelemeno
fmt and lint
92176bd
@kelemeno
changing eth watch for new upgrade process
1cfdd78
@kelemeno
added acceptAdmin calldata
3381d77
@kelemeno
add governance accept ownership
6c31c17
@kelemeno
added direct execution via STM
fa51775
@kelemeno
Merge branch 'kl/update-protocol-upgrade-tool-for-stm' of github.com:…
561e196 
…matter-labs/zksync-era into kl/factory-migration-fix-5
@kelemeno
contracts.toml genesis.yaml vk hashes
2aff88c
@kelemeno
generate diamond cut
143a6a5
@kelemeno
contracts bump
2a79d73
@kelemeno
typo
3d7784a
@kelemeno
modified diamond cut
a05a828
@kelemeno
testnet fix upgrade data
170c8e6
@kelemeno
mainnet upgraded data
49d7b60
@kelemeno
add mainnet env
00bda23
@kelemeno
cleaned up script
0cbcae8
@kelemeno
cleaning up, resetting correct contracts
03d399d
@kelemeno
Merge branch 'main' of github.com:matter-labs/zksync-era into kl/fact…
e1db6db 
…ory-migration-fix-6
@kelemeno
spelling
824e7ef
@kelemeno
revert rust code
09253a4
@kelemeno
Merge branch 'main' of github.com:matter-labs/zksync-era into kl/fact…
7315a55 
…ory-migration-fix-6
@kelemeno
Merge branch 'main' of github.com:matter-labs/zksync-era into kl/fact…
9776eac 
…ory-migration-fix-6
@kelemeno
updated the timestamp for thursday
2a5aa0d
@kelemeno
Merge branch 'main' of github.com:matter-labs/zksync-era into kl/fact…
be2d1b0 
…ory-migration-fix-6
@kelemeno
stage proofs fix 2
1598963
@kelemeno
more fixes
ce30377
@kelemeno
stage proofs fix 2
0a3e628
@kelemeno
testnet prover fix 2
2165ae1
@kelemeno
mainnet new data
c14c9a8
@kelemeno
new upgrade timestamp
8a64863
StanislavBreadless
StanislavBreadless reviewed Jun 6, 2024
View reviewed changes
etc/env/base/contracts.toml Show resolved Hide resolved
etc/env/configs/mainnet.toml Outdated Show resolved Hide resolved
etc/env/configs/stage-proofs.toml Outdated Show resolved Hide resolved
etc/env/configs/testnet.toml Outdated Show resolved Hide resolved
etc/env/l1-inits/stage-proofs.env Outdated Show resolved Hide resolved
etc/env/l2-inits/stage.init.env Outdated Show resolved Hide resolved
etc/upgrades/1711451944-hyperchain-upgrade/mainnet/otherUgrades.json Show resolved Hide resolved
StanislavBreadless
StanislavBreadless previously approved these changes Jun 6, 2024
View reviewed changes
etc/env/configs/stage.toml Outdated Show resolved Hide resolved
@kelemeno kelemeno enabled auto-merge June 6, 2024 08:49
@kelemeno kelemeno added this pull request to the merge queue Jun 6, 2024
Merged via the queue into main with commit 500d462 Jun 6, 2024
54 checks passed
@kelemeno kelemeno deleted the kl/factory-migration-fix-6-merge-to-main branch June 6, 2024 14:37
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

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

Successfully merging this pull request may close these issues.
2 participants
@kelemeno @StanislavBreadless