Skip to content
Merged
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
2 changes: 1 addition & 1 deletion contracts
Submodule contracts updated 86 files
+61 −0 .github/workflows/build-docker.yaml
+22 −15 .github/workflows/build-release.yaml
+6 −1 .github/workflows/dead-links.yaml
+2 −1 .github/workflows/l2-contracts-ci.yaml
+5 −3 .github/workflows/secrets_scanner.yaml
+81 −0 .github/workflows/update-hashes-on-demand.yaml
+15 −15 AllContractsHashes.json
+1 −1 CODEOWNERS
+2 −2 CONTRIBUTING.md
+5 −2 README.md
+2 −0 _typos.toml
+83 −0 docker/protocol/Dockerfile
+2 −71 docs/README.md
+0 −47 docs/bridging/asset_router/asset_router.md
+ docs/bridging/asset_router/img/bridge_contracts.png
+ docs/bridging/asset_router/img/custom_asset_handler_registration.png
+0 −33 docs/bridging/asset_router/overview.md
+ docs/bridging/bridgehub/img/L1_L2_tx_processing_on_L2.png
+ docs/bridging/bridgehub/img/gateway_architecture.png
+ docs/bridging/bridgehub/img/requestL2TransactionDirect.png
+ docs/bridging/bridgehub/img/requestL2TransactionTwoBridges_depositEthToUSDC.png
+ docs/bridging/bridgehub/img/requestL2TransactionTwoBridges_token.png
+0 −243 docs/bridging/bridgehub/overview.md
+0 −114 docs/chain_management/admin_role.md
+0 −72 docs/chain_management/chain_genesis.md
+0 −70 docs/chain_management/chain_type_manager.md
+ docs/chain_management/img/create_new_chain.png
+0 −41 docs/chain_management/upgrade_process.md
+0 −20 docs/consensus/consensus-registry.md
+0 −43 docs/evm_emulation/differences_from_cancun_evm.md
+0 −43 docs/evm_emulation/evm_gas_emulation.md
+0 −18 docs/evm_emulation/evm_predeploys_list.md
+0 −249 docs/evm_emulation/technical_overview.md
+0 −43 docs/gateway/chain_migration.md
+0 −27 docs/gateway/gateway_da.md
+0 −159 docs/gateway/gateway_protocol_upgrades.md
+ docs/gateway/img/ctm_gw_registration.png
+ docs/gateway/img/gateway_architecture.png
+ docs/gateway/img/l1_gw_l2_messaging.png
+ docs/gateway/img/l1_l2_messaging.png
+ docs/gateway/img/migrate_from_gw.png
+ docs/gateway/img/migrate_to_gw.png
+ docs/gateway/img/nested_l2_gw_l1_messaging.png
+ docs/gateway/img/nested_l2_gw_l1_messaging_2.png
+ docs/gateway/img/new_bridging_contracts.png
+0 −184 docs/gateway/l2_gw_l1_messaging.md
+0 −50 docs/gateway/messaging_via_gateway.md
+0 −25 docs/gateway/overview.md
+0 −11 docs/glossary.md
+ docs/img/reading_order.png
+0 −103 docs/l2_system_contracts/batches_and_blocks_on_zksync.md
+0 −251 docs/l2_system_contracts/elliptic_curve_precompiles.md
+0 −728 docs/l2_system_contracts/system_contracts_bootloader_description.md
+0 −309 docs/l2_system_contracts/zksync_fee_model.md
+0 −0 docs/overview.md
+0 −49 docs/settlement_contracts/data_availability/custom_da.md
+ docs/settlement_contracts/data_availability/img/Custom-da-external.png
+ docs/settlement_contracts/data_availability/img/Rollup_DA.png
+ docs/settlement_contracts/data_availability/img/custom_da.png
+0 −80 docs/settlement_contracts/data_availability/rollup_da.md
+0 −286 docs/settlement_contracts/data_availability/standard_pubdata_format.md
+0 −89 docs/settlement_contracts/data_availability/state_diff_compression_v1_spec.md
+ docs/settlement_contracts/img/Diamond-scheme.png
+ docs/settlement_contracts/priority_queue/img/PQ1.png
+ docs/settlement_contracts/priority_queue/img/PQ2.png
+ docs/settlement_contracts/priority_queue/img/PQ3.png
+0 −137 docs/settlement_contracts/priority_queue/priority-queue.md
+0 −98 docs/settlement_contracts/priority_queue/processing_of_l1-l2_txs.md
+0 −174 docs/settlement_contracts/zkchain_basics.md
+0 −100 docs/upgrade_history/gateway_preparation_upgrade/gateway_diff_review.md
+0 −185 docs/upgrade_history/gateway_preparation_upgrade/upgrade_process_(no_gateway_chain).md
+0 −61 docs/upgrade_history/v27_evm_emulation/v27-evm-emulation.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
+1 −1 l1-contracts/deploy-scripts/gateway/GatewayCTMFromL1.s.sol
+1 −1 l1-contracts/foundry.toml
+2 −2 l1-contracts/package.json
+0 −0 l1-contracts/test/foundry/l1/unit/concrete/GatewayTransactionFilterer/CheckTransaction.sol
+0 −0 l1-contracts/test/foundry/l1/unit/concrete/GatewayTransactionFilterer/ManageWhitelist.sol
+0 −0 l1-contracts/test/foundry/l1/unit/concrete/GatewayTransactionFilterer/_GatewayTransactionFilterer_Shared.t.sol
+0 −0 l1-contracts/test/foundry/l1/unit/concrete/chain-registrator/ChainRegistrar.t.sol
+0 −0 l1-contracts/test/foundry/l1/unit/concrete/common/libraries/L2ContractHelper/L2ContractHelper.t.sol
+8 −8 tools/data/fflonk_scheduler_key.json
+16 −16 tools/data/plonk_scheduler_key.json
94 changes: 47 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 @@ -251,22 +251,22 @@ rust-eigenda-signers = "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.153.5"
circuit_sequencer_api = "=0.153.5"
circuit_definitions = "=0.153.5"
crypto_codegen = { package = "zksync_solidity_vk_codegen", version = "=0.32.6" }
circuit_encodings = "=0.153.6"
circuit_sequencer_api = "=0.153.6"
circuit_definitions = "=0.153.6"
crypto_codegen = { package = "zksync_solidity_vk_codegen", version = "=0.32.7" }

kzg = { package = "zksync_kzg", version = "=0.153.5" }
kzg = { package = "zksync_kzg", version = "=0.153.6" }

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.153.5" }
zk_evm_1_5_2 = { package = "zk_evm", version = "=0.153.6" }

fflonk = "=0.32.6"
bellman = { package = "zksync_bellman", version = "=0.32.6" }
fflonk = "=0.32.7"
bellman = { package = "zksync_bellman", version = "=0.32.7" }

# New VM
zksync_vm2 = "=0.5.0"
Expand Down
6 changes: 3 additions & 3 deletions etc/env/file_based/genesis.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
genesis_protocol_semantic_version: 0.29.2
genesis_protocol_semantic_version: 0.29.3
genesis_protocol_version: null
genesis_root: 0x934d46a331e4c617767cade322bc4d262899c0dc5568d2019d4e11301c0cc032
genesis_rollup_leaf_index: 84
Expand All @@ -11,7 +11,7 @@ l2_chain_id: 270
fee_account: '0x0000000000000000000000000000000000000001'
l1_batch_commit_data_generator_mode: Rollup
prover:
snark_wrapper_vk_hash: 0x1ffc56111a5cfaf5db387f6a31408ad20217e9bc1f31f2f5c1bd38b0d6d7968b
fflonk_snark_wrapper_vk_hash: 0x49eae0bf5c7ea580f4979b366e52b386adc5f42e2ce50fc1d3c4de9a86052bff
snark_wrapper_vk_hash: 0x93e83aa1ec05a2ac4de1f0b241394efb9f94a4e7c1784a5a9bf6b85eb930c62a
fflonk_snark_wrapper_vk_hash: 0xe4503cf38485e3d728a7362155d53d3d63293e2fa48dca4f5588aa4625de251f
dummy_verifier: true
custom_genesis_state_path: null
Loading
Loading