Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ name: CI
on:
pull_request:
merge_group:
push:
branches:
- evl-update-dependencies-prover-23-1-0

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
Expand Down
2 changes: 1 addition & 1 deletion contracts
Submodule contracts updated 51 files
+1 −1 .github/pull_request_template.md
+3 −0 .github/workflows/build-release.yaml
+3 −0 .github/workflows/codespell.yaml
+1 −1 .github/workflows/dead-links.yaml
+2 −1 .github/workflows/invariant-tests.yaml
+3 −2 .github/workflows/l1-contracts-ci.yaml
+3 −0 .github/workflows/l2-contracts-ci.yaml
+3 −0 .github/workflows/nodejs-license.yaml
+4 −0 .github/workflows/secrets_scanner.yaml
+3 −0 .github/workflows/slither.yaml
+3 −0 .github/workflows/system-contracts-ci.yaml
+2 −0 .lycheeignore
+1 −0 .solhint.json
+16 −16 AllContractsHashes.json
+ audits/ZKsync Protocol Defense Audit - Final Report (Sept 2024).pdf
+ audits/v28/ZKsync Crypto Precompile Audit.pdf
+ audits/v28/ZKsync Era-contracts Precompile Audit.pdf
+ audits/v28/ZKsync Protocol Precompiles Implementation Audit.pdf
+ audits/v28/pr-review.pdf
+ audits/v28/report-cantinacode-matter-labs-0321_final.pdf
+3 −3 l1-contracts/README.md
+3 −3 l1-contracts/contracts/state-transition/verifiers/L1VerifierFflonk.sol
+5 −5 l1-contracts/contracts/state-transition/verifiers/L1VerifierPlonk.sol
+3 −3 l1-contracts/contracts/state-transition/verifiers/L2VerifierFflonk.sol
+5 −5 l1-contracts/contracts/state-transition/verifiers/L2VerifierPlonk.sol
+0 −0 l1-contracts/deploy-scripts/GatewayPreparation.sol
+2 −1 l1-contracts/deploy-scripts/upgrade/EcosystemUpgrade.s.sol
+3 −1 l1-contracts/package.json
+977 −0 l1-contracts/scripts/abi/TestnetProtocolUpgradeHandler.json
+131 −0 l1-contracts/scripts/upgrade-scripts.ts
+26 −14 l1-contracts/scripts/utils.ts
+76 −0 l1-contracts/scripts/verify-on-l2-explorer.ts
+51 −0 l1-contracts/test/foundry/l1/integration/L1GatewayTests.t.sol
+62 −0 l1-contracts/upgrade-envs/v0.28.0-precompiles/mainnet.toml
+3,479 −0 l1-contracts/upgrade-envs/v0.28.0-precompiles/output/mainnet/run-latest.json
+103 −0 l1-contracts/upgrade-envs/v0.28.0-precompiles/output/mainnet/v28-ecosystem-mainnet.toml
+143 −0 l1-contracts/upgrade-envs/v0.28.0-precompiles/output/mainnet/v28-ecosystem-mainnet.yaml
+462 −0 l1-contracts/upgrade-envs/v0.28.0-precompiles/output/mainnet/verification-logs
+103 −0 l1-contracts/upgrade-envs/v0.28.0-precompiles/output/testnet/v28-ecosystem.toml
+119 −0 l1-contracts/upgrade-envs/v0.28.0-precompiles/output/testnet/v28-ecosystem.yaml
+63 −0 l1-contracts/upgrade-envs/v0.28.0-precompiles/output/testnet/verification-logs.txt
+55 −0 l1-contracts/upgrade-envs/v0.28.0-precompiles/testnet.toml
+1 −2 l2-contracts/contracts/ConsensusRegistry.sol
+0 −2 l2-contracts/contracts/interfaces/IConsensusRegistry.sol
+0 −1 l2-contracts/src/deploy-force-deploy-upgrader-through-l1.ts
+2 −23 l2-contracts/test/consensusRegistry.test.ts
+1 −0 package.json
+1 −1 system-contracts/scripts/generate-bootloader-artifacts.ts
+7 −0 tools/README.md
+9 −9 tools/data/fflonk_scheduler_key.json
+17 −17 tools/data/plonk_scheduler_key.json
125 changes: 78 additions & 47 deletions core/Cargo.lock

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

16 changes: 8 additions & 8 deletions core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -246,23 +246,23 @@ rust-eigenda-client = "0.1.6"
# However, for the historical version of protocol crates, we have lax requirements. Otherwise,
# Bumping a crypto dependency like `boojum` would require us to republish all the historical packages.

circuit_encodings = "=0.152.3"
circuit_sequencer_api = "=0.152.3"
circuit_definitions = "=0.152.3"
crypto_codegen = { package = "zksync_solidity_vk_codegen", version = "=0.32.1" }
circuit_encodings = "=0.153.1"
circuit_sequencer_api = "=0.153.1"
circuit_definitions = "=0.153.1"
crypto_codegen = { package = "zksync_solidity_vk_codegen", version = "=0.32.3" }

kzg = { package = "zksync_kzg", version = "=0.152.3" }
kzg = { package = "zksync_kzg", version = "=0.153.1" }

zk_evm_1_3_1 = { package = "zk_evm", version = "0.131.0-rc.2" }
zk_evm_1_3_3 = { package = "zk_evm", version = "0.133" }
zk_evm_1_4_0 = { package = "zk_evm", version = "0.140" }
zk_evm_1_4_1 = { package = "zk_evm", version = "0.141" }
zk_evm_1_5_0 = { package = "zk_evm", version = "=0.151.8" }
zk_evm_1_5_2 = { package = "zk_evm", version = "=0.152.3" }
zk_evm_1_5_2 = { package = "zk_evm", version = "=0.153.1" }

fflonk = "=0.32.1"
fflonk = "=0.32.3"

bellman = { package = "zksync_bellman", version = "=0.32.1" }
bellman = { package = "zksync_bellman", version = "=0.32.3" }

# New VM
zksync_vm2 = "=0.4.0"
Expand Down
7 changes: 3 additions & 4 deletions etc/env/file_based/genesis.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
genesis_root: 0x85fa0abaa93032259defb7bc3d060f1fcce909600a71841e9a578db386723966
genesis_rollup_leaf_index: 78
genesis_batch_commitment: 0xc66918c8860c607e73892cb3e686bfba6185f7a49f8c7ec21fb1cce3c4f353cd
genesis_protocol_version: 28
default_aa_hash: 0x010005f72e443c94460f4583fb38ef5d0c5cd9897021c41df840f91465c0392e
bootloader_hash: 0x0100085f9382a7928dd83bfc529121827b5f29f18b9aa10d18aa68e1be7ddc35
l1_chain_id: 9
l2_chain_id: 270
fee_account: '0x0000000000000000000000000000000000000001'
prover:
dummy_verifier: true
snark_wrapper_vk_hash: 0xd90459c5b727b9ceeb2b6192d2953dbf05970edf090333b3ad3bcac1a1442b78
fflonk_snark_wrapper_vk_hash: 0x17e8d7931f1314431359233e65c22657a32c335205e3c24ce292c5819becfaa7
genesis_protocol_semantic_version: 0.28.0
snark_wrapper_vk_hash: 0x1ffc56111a5cfaf5db387f6a31408ad20217e9bc1f31f2f5c1bd38b0d6d7968b
fflonk_snark_wrapper_vk_hash: 0x49eae0bf5c7ea580f4979b366e52b386adc5f42e2ce50fc1d3c4de9a86052bff
genesis_protocol_semantic_version: 0.28.2
evm_emulator_hash: 0x01000d83e0329d9144ad041430fafcbc2b388e5434db8cb8a96e80157738a1da
l1_batch_commit_data_generator_mode: Rollup
Loading
Loading