From 42c64e91e13b6b37619f1459f927fa046ef01097 Mon Sep 17 00:00:00 2001 From: Igor Aleksanov Date: Wed, 18 Oct 2023 10:09:17 +0400 Subject: [PATCH] feat(config): Extract everything not related to the env config from zksync_config crate (#245) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # What ❔ - Removes (unused) test_config from zksync_config crate - Moves system constants from zksync_config crate to a separate one ## Why ❔ - Get rid of the dependency on the `zksync_config` in non-binary crates. - Better logical separation ## Checklist - [x] 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.~~ - [x] Code has been formatted via `zk fmt` and `zk lint`. --- Cargo.lock | 39 +++++++++--- Cargo.toml | 3 +- core/lib/basic_types/src/basic_fri_types.rs | 18 ++++++ core/lib/basic_types/src/lib.rs | 1 + .../config/src/configs/fri_prover_group.rs | 18 +----- core/lib/config/src/lib.rs | 2 - core/lib/config/src/test_config/mod.rs | 63 ------------------- core/lib/constants/Cargo.toml | 24 +++++++ .../src/constants => constants/src}/blocks.rs | 0 .../constants => constants/src}/contracts.rs | 0 .../src/constants => constants/src}/crypto.rs | 0 .../constants => constants/src}/ethereum.rs | 0 .../src}/fees/intrinsic.rs | 0 .../constants => constants/src}/fees/mod.rs | 0 .../constants/mod.rs => constants/src/lib.rs} | 0 .../src}/system_context.rs | 0 .../src}/trusted_slots.rs | 0 core/lib/dal/Cargo.toml | 2 +- core/lib/dal/src/blocks_web3_dal.rs | 2 +- core/lib/dal/src/fri_prover_dal.rs | 4 +- core/lib/merkle_tree/Cargo.toml | 2 +- .../merkle_tree/tests/integration/domain.rs | 2 +- core/lib/test_account/Cargo.toml | 2 +- core/lib/test_account/src/lib.rs | 6 +- core/lib/types/Cargo.toml | 2 +- core/lib/types/src/block.rs | 2 +- core/lib/types/src/commitment.rs | 2 +- core/lib/types/src/storage/mod.rs | 2 +- core/lib/types/src/system_contracts.rs | 4 +- core/lib/types/src/tokens.rs | 2 +- core/lib/types/src/transaction_request.rs | 2 +- core/lib/types/src/vm_trace.rs | 2 +- core/lib/vm/Cargo.toml | 2 +- core/lib/vm/src/constants.rs | 2 +- core/lib/vm/src/old_vm/oracles/storage.rs | 2 +- core/lib/vm/src/old_vm/utils.rs | 2 +- core/lib/vm/src/oracles/storage.rs | 2 +- core/lib/vm/src/tests/default_aa.rs | 2 +- core/lib/vm/src/tests/get_used_contracts.rs | 2 +- core/lib/vm/src/tests/l1_tx_execution.rs | 2 +- core/lib/vm/src/tests/l2_blocks.rs | 4 +- core/lib/vm/src/tests/require_eip712.rs | 2 +- core/lib/vm/src/tracers/call.rs | 2 +- core/lib/vm/src/tracers/refunds.rs | 2 +- core/lib/vm/src/tracers/utils.rs | 2 +- core/lib/vm/src/tracers/validation/mod.rs | 4 +- core/lib/vm/src/types/internals/vm_state.rs | 2 +- .../vm/src/types/outputs/execution_result.rs | 2 +- core/lib/vm/src/utils/fee.rs | 2 +- core/lib/vm/src/utils/l2_blocks.rs | 4 +- core/lib/vm/src/utils/overhead.rs | 2 +- core/lib/zksync_core/Cargo.toml | 1 + .../src/api_server/execution_sandbox/apply.rs | 6 +- .../src/api_server/execution_sandbox/mod.rs | 2 +- core/lib/zksync_core/src/eth_watch/mod.rs | 2 +- .../src/state_keeper/io/seal_logic.rs | 2 +- core/lib/zksync_core/src/state_keeper/mod.rs | 2 +- .../zksync_core/src/state_keeper/tests/mod.rs | 3 +- .../src/witness_generator/basic_circuits.rs | 2 +- core/multivm_deps/vm_1_3_2/Cargo.toml | 2 +- .../vm_1_3_2/src/oracles/storage.rs | 2 +- .../vm_1_3_2/src/oracles/tracer/call.rs | 2 +- .../vm_1_3_2/src/oracles/tracer/utils.rs | 2 +- .../vm_1_3_2/src/oracles/tracer/validation.rs | 4 +- core/multivm_deps/vm_1_3_2/src/utils.rs | 2 +- core/multivm_deps/vm_1_3_2/src/vm.rs | 2 +- .../vm_1_3_2/src/vm_with_bootloader.rs | 2 +- core/multivm_deps/vm_m5/Cargo.toml | 2 +- .../multivm_deps/vm_m5/src/oracles/storage.rs | 4 +- .../vm_m5/src/tests/bootloader.rs | 2 +- core/multivm_deps/vm_m5/src/utils.rs | 2 +- core/multivm_deps/vm_m5/src/vm.rs | 2 +- .../vm_m5/src/vm_with_bootloader.rs | 2 +- core/multivm_deps/vm_m6/Cargo.toml | 2 +- .../multivm_deps/vm_m6/src/oracles/storage.rs | 2 +- .../vm_m6/src/oracles/tracer/call.rs | 2 +- .../vm_m6/src/oracles/tracer/utils.rs | 2 +- .../vm_m6/src/oracles/tracer/validation.rs | 2 +- core/multivm_deps/vm_m6/src/utils.rs | 2 +- core/multivm_deps/vm_m6/src/vm.rs | 2 +- .../vm_m6/src/vm_with_bootloader.rs | 2 +- .../multivm_deps/vm_virtual_blocks/Cargo.toml | 2 +- .../vm_virtual_blocks/src/constants.rs | 2 +- .../src/old_vm/oracles/storage.rs | 2 +- .../vm_virtual_blocks/src/old_vm/utils.rs | 2 +- .../vm_virtual_blocks/src/tests/default_aa.rs | 2 +- .../src/tests/get_used_contracts.rs | 2 +- .../src/tests/l1_tx_execution.rs | 2 +- .../vm_virtual_blocks/src/tests/l2_blocks.rs | 4 +- .../src/tests/require_eip712.rs | 2 +- .../vm_virtual_blocks/src/tracers/call.rs | 2 +- .../vm_virtual_blocks/src/tracers/refunds.rs | 2 +- .../vm_virtual_blocks/src/tracers/utils.rs | 2 +- .../src/tracers/validation/mod.rs | 4 +- .../src/types/internals/vm_state.rs | 2 +- .../src/types/outputs/execution_result.rs | 2 +- .../vm_virtual_blocks/src/utils/fee.rs | 2 +- .../vm_virtual_blocks/src/utils/l2_blocks.rs | 4 +- .../vm_virtual_blocks/src/utils/overhead.rs | 2 +- core/tests/loadnext/Cargo.toml | 3 +- .../src/account/tx_command_executor.rs | 2 +- core/tests/loadnext/src/executor.rs | 2 +- core/tests/vm-benchmark/harness/Cargo.toml | 2 +- core/tests/vm-benchmark/harness/src/lib.rs | 2 +- .../src/gpu_prover_job_processor.rs | 4 +- prover/prover_fri/src/main.rs | 3 +- prover/prover_fri/src/prover_job_processor.rs | 4 +- prover/prover_fri/src/utils.rs | 3 +- prover/prover_fri_utils/src/lib.rs | 2 +- prover/witness_generator/Cargo.toml | 1 + prover/witness_generator/src/utils.rs | 2 +- .../witness_vector_generator/src/generator.rs | 2 +- 112 files changed, 190 insertions(+), 202 deletions(-) create mode 100644 core/lib/basic_types/src/basic_fri_types.rs delete mode 100644 core/lib/config/src/test_config/mod.rs create mode 100644 core/lib/constants/Cargo.toml rename core/lib/{config/src/constants => constants/src}/blocks.rs (100%) rename core/lib/{config/src/constants => constants/src}/contracts.rs (100%) rename core/lib/{config/src/constants => constants/src}/crypto.rs (100%) rename core/lib/{config/src/constants => constants/src}/ethereum.rs (100%) rename core/lib/{config/src/constants => constants/src}/fees/intrinsic.rs (100%) rename core/lib/{config/src/constants => constants/src}/fees/mod.rs (100%) rename core/lib/{config/src/constants/mod.rs => constants/src/lib.rs} (100%) rename core/lib/{config/src/constants => constants/src}/system_context.rs (100%) rename core/lib/{config/src/constants => constants/src}/trusted_slots.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index c478fb95bcd..08d0f3e39e9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3680,6 +3680,7 @@ dependencies = [ "zksync_contracts", "zksync_eth_client", "zksync_eth_signer", + "zksync_system_constants", "zksync_types", "zksync_utils", "zksync_web3_decl", @@ -7174,10 +7175,10 @@ dependencies = [ "tracing", "vise", "zk_evm 1.3.3", - "zksync_config", "zksync_contracts", "zksync_eth_signer", "zksync_state", + "zksync_system_constants", "zksync_test_account", "zksync_types", "zksync_utils", @@ -7202,9 +7203,9 @@ dependencies = [ "once_cell", "vm", "zk_evm 1.3.3", - "zksync_config", "zksync_contracts", "zksync_state", + "zksync_system_constants", "zksync_types", "zksync_utils", ] @@ -7223,10 +7224,10 @@ dependencies = [ "tracing", "zk_evm 1.3.3", "zkevm-assembly 1.3.2", - "zksync_config", "zksync_contracts", "zksync_eth_signer", "zksync_state", + "zksync_system_constants", "zksync_types", "zksync_utils", ] @@ -7245,11 +7246,11 @@ dependencies = [ "tracing", "vlog", "zk_evm 1.3.1", - "zksync_config", "zksync_contracts", "zksync_crypto", "zksync_state", "zksync_storage", + "zksync_system_constants", "zksync_types", "zksync_utils", ] @@ -7269,11 +7270,11 @@ dependencies = [ "vlog", "zk_evm 1.3.1", "zkevm-assembly 1.3.1", - "zksync_config", "zksync_contracts", "zksync_crypto", "zksync_state", "zksync_storage", + "zksync_system_constants", "zksync_types", "zksync_utils", ] @@ -7292,10 +7293,10 @@ dependencies = [ "tracing", "vise", "zk_evm 1.3.3", - "zksync_config", "zksync_contracts", "zksync_eth_signer", "zksync_state", + "zksync_system_constants", "zksync_test_account", "zksync_types", "zksync_utils", @@ -8126,6 +8127,7 @@ dependencies = [ "zksync_queued_job_processor", "zksync_state", "zksync_storage", + "zksync_system_constants", "zksync_test_account", "zksync_types", "zksync_utils", @@ -8169,9 +8171,9 @@ dependencies = [ "tokio", "tracing", "vise", - "zksync_config", "zksync_contracts", "zksync_health_check", + "zksync_system_constants", "zksync_types", "zksync_utils", ] @@ -8283,9 +8285,9 @@ dependencies = [ "thiserror", "tracing", "vise", - "zksync_config", "zksync_crypto", "zksync_storage", + "zksync_system_constants", "zksync_types", ] @@ -8396,15 +8398,32 @@ dependencies = [ "vise", ] +[[package]] +name = "zksync_system_constants" +version = "0.1.0" +dependencies = [ + "anyhow", + "bigdecimal", + "hex", + "num 0.3.1", + "once_cell", + "serde", + "serde_json", + "url", + "zksync_basic_types", + "zksync_contracts", + "zksync_utils", +] + [[package]] name = "zksync_test_account" version = "0.1.0" dependencies = [ "ethabi", "hex", - "zksync_config", "zksync_contracts", "zksync_eth_signer", + "zksync_system_constants", "zksync_types", "zksync_utils", ] @@ -8433,9 +8452,9 @@ dependencies = [ "zk_evm 1.3.3", "zkevm_test_harness 1.3.3", "zksync_basic_types", - "zksync_config", "zksync_contracts", "zksync_mini_merkle_tree", + "zksync_system_constants", "zksync_utils", ] diff --git a/Cargo.toml b/Cargo.toml index 49039476132..5edfc60b4b0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ members = [ "core/bin/merkle_tree_consistency_checker", "core/bin/rocksdb_util", "core/bin/storage_logs_dedup_migration", - "core/bin/system-constants-generator", + "core/bin/system-constants-generator", "core/bin/verification_key_generator_and_server", "core/bin/verified_sources_fetcher", "core/bin/zksync_server", @@ -15,6 +15,7 @@ members = [ "core/lib/zksync_core", "core/lib/basic_types", "core/lib/config", + "core/lib/constants", "core/lib/contracts", "core/lib/crypto", "core/lib/circuit_breaker", diff --git a/core/lib/basic_types/src/basic_fri_types.rs b/core/lib/basic_types/src/basic_fri_types.rs new file mode 100644 index 00000000000..47444c6675f --- /dev/null +++ b/core/lib/basic_types/src/basic_fri_types.rs @@ -0,0 +1,18 @@ +//! Basic types for FRI prover. + +use serde::{Deserialize, Serialize}; + +#[derive(Debug, Deserialize, Serialize, Clone, Eq, Hash, PartialEq)] +pub struct CircuitIdRoundTuple { + pub circuit_id: u8, + pub aggregation_round: u8, +} + +impl CircuitIdRoundTuple { + pub fn new(circuit_id: u8, aggregation_round: u8) -> Self { + Self { + circuit_id, + aggregation_round, + } + } +} diff --git a/core/lib/basic_types/src/lib.rs b/core/lib/basic_types/src/lib.rs index 3223dfddf59..86cc8c59221 100644 --- a/core/lib/basic_types/src/lib.rs +++ b/core/lib/basic_types/src/lib.rs @@ -5,6 +5,7 @@ #[macro_use] mod macros; +pub mod basic_fri_types; pub mod network; use serde::{de, Deserialize, Deserializer, Serialize}; diff --git a/core/lib/config/src/configs/fri_prover_group.rs b/core/lib/config/src/configs/fri_prover_group.rs index 38d01552e86..bce956cfffc 100644 --- a/core/lib/config/src/configs/fri_prover_group.rs +++ b/core/lib/config/src/configs/fri_prover_group.rs @@ -1,22 +1,8 @@ +use serde::Deserialize; use std::collections::{HashMap, HashSet}; use std::env; -use serde::{Deserialize, Serialize}; - -#[derive(Debug, Deserialize, Serialize, Clone, Eq, Hash, PartialEq)] -pub struct CircuitIdRoundTuple { - pub circuit_id: u8, - pub aggregation_round: u8, -} - -impl CircuitIdRoundTuple { - pub fn new(circuit_id: u8, aggregation_round: u8) -> Self { - Self { - circuit_id, - aggregation_round, - } - } -} +use zksync_basic_types::basic_fri_types::CircuitIdRoundTuple; fn load_from_env_variable() -> HashMap> { // Prepare a hash map to store the mapping of group to a vector of tuples diff --git a/core/lib/config/src/lib.rs b/core/lib/config/src/lib.rs index 5c31df1ecad..20eafc6dd90 100644 --- a/core/lib/config/src/lib.rs +++ b/core/lib/config/src/lib.rs @@ -7,5 +7,3 @@ pub use crate::configs::{ }; pub mod configs; -pub mod constants; -pub mod test_config; diff --git a/core/lib/config/src/test_config/mod.rs b/core/lib/config/src/test_config/mod.rs deleted file mode 100644 index 53501a72f5a..00000000000 --- a/core/lib/config/src/test_config/mod.rs +++ /dev/null @@ -1,63 +0,0 @@ -// Built-in deps -use std::fs; -// External uses -use serde::Deserialize; -// Workspace uses -// Local uses - -/// Transforms relative path like `constant/some_file.json` into full path like -/// `$ZKSYNC_HOME/etc/test_config/constant/some_file.json`. -fn config_path(postfix: &str) -> String { - let home = std::env::var("ZKSYNC_HOME").expect("ZKSYNC_HOME variable must be set"); - - format!("{}/etc/test_config/{}", home, postfix) -} - -fn load_json(path: &str) -> serde_json::Value { - serde_json::from_str(&fs::read_to_string(path).expect("Invalid config path")) - .expect("Invalid config format") -} - -/// Common Ethereum parameters. -#[derive(Debug, Deserialize)] -pub struct EthConfig { - /// Set of 12 words for connecting to an Ethereum wallet. - pub test_mnemonic: String, -} - -/// Common Api addresses. -#[derive(Debug, Deserialize)] -pub struct ApiConfig { - /// Address of the rest api. - pub rest_api_url: String, -} - -macro_rules! impl_config { - ($name_config:ident, $file:tt) => { - impl $name_config { - pub fn load() -> Self { - let object = load_json(&config_path(&format!("{}.json", $file))); - serde_json::from_value(object) - .expect(&format!("Cannot deserialize config from '{}'", $file)) - } - } - }; -} - -impl_config!(ApiConfig, "constant/api"); -impl_config!(EthConfig, "constant/eth"); - -#[derive(Debug)] -pub struct TestConfig { - pub eth: EthConfig, - pub api: ApiConfig, -} - -impl TestConfig { - pub fn load() -> Self { - Self { - eth: EthConfig::load(), - api: ApiConfig::load(), - } - } -} diff --git a/core/lib/constants/Cargo.toml b/core/lib/constants/Cargo.toml new file mode 100644 index 00000000000..e7e12206da2 --- /dev/null +++ b/core/lib/constants/Cargo.toml @@ -0,0 +1,24 @@ +[package] +name = "zksync_system_constants" +version = "0.1.0" +edition = "2018" +authors = ["The Matter Labs Team "] +homepage = "https://zksync.io/" +repository = "https://github.com/matter-labs/zksync-era" +license = "MIT OR Apache-2.0" +keywords = ["blockchain", "zksync"] +categories = ["cryptography"] + +[dependencies] +zksync_basic_types = { path = "../../lib/basic_types" } +zksync_utils = { path = "../../lib/utils" } +zksync_contracts = { path = "../../lib/contracts" } + +anyhow = "1.0" +url = "2.1" +num = "0.3.1" +serde = { version = "1.0", features = ["derive"] } +serde_json = "1.0" +once_cell = "1.13.0" +bigdecimal = "0.2.2" +hex = "0.4" diff --git a/core/lib/config/src/constants/blocks.rs b/core/lib/constants/src/blocks.rs similarity index 100% rename from core/lib/config/src/constants/blocks.rs rename to core/lib/constants/src/blocks.rs diff --git a/core/lib/config/src/constants/contracts.rs b/core/lib/constants/src/contracts.rs similarity index 100% rename from core/lib/config/src/constants/contracts.rs rename to core/lib/constants/src/contracts.rs diff --git a/core/lib/config/src/constants/crypto.rs b/core/lib/constants/src/crypto.rs similarity index 100% rename from core/lib/config/src/constants/crypto.rs rename to core/lib/constants/src/crypto.rs diff --git a/core/lib/config/src/constants/ethereum.rs b/core/lib/constants/src/ethereum.rs similarity index 100% rename from core/lib/config/src/constants/ethereum.rs rename to core/lib/constants/src/ethereum.rs diff --git a/core/lib/config/src/constants/fees/intrinsic.rs b/core/lib/constants/src/fees/intrinsic.rs similarity index 100% rename from core/lib/config/src/constants/fees/intrinsic.rs rename to core/lib/constants/src/fees/intrinsic.rs diff --git a/core/lib/config/src/constants/fees/mod.rs b/core/lib/constants/src/fees/mod.rs similarity index 100% rename from core/lib/config/src/constants/fees/mod.rs rename to core/lib/constants/src/fees/mod.rs diff --git a/core/lib/config/src/constants/mod.rs b/core/lib/constants/src/lib.rs similarity index 100% rename from core/lib/config/src/constants/mod.rs rename to core/lib/constants/src/lib.rs diff --git a/core/lib/config/src/constants/system_context.rs b/core/lib/constants/src/system_context.rs similarity index 100% rename from core/lib/config/src/constants/system_context.rs rename to core/lib/constants/src/system_context.rs diff --git a/core/lib/config/src/constants/trusted_slots.rs b/core/lib/constants/src/trusted_slots.rs similarity index 100% rename from core/lib/config/src/constants/trusted_slots.rs rename to core/lib/constants/src/trusted_slots.rs diff --git a/core/lib/dal/Cargo.toml b/core/lib/dal/Cargo.toml index c11fdb35da8..75926727858 100644 --- a/core/lib/dal/Cargo.toml +++ b/core/lib/dal/Cargo.toml @@ -12,7 +12,7 @@ categories = ["cryptography"] [dependencies] vise = { git = "https://github.com/matter-labs/vise.git", version = "0.1.0", rev = "dd05139b76ab0843443ab3ff730174942c825dae" } zksync_utils = { path = "../utils" } -zksync_config = { path = "../config" } +zksync_system_constants = { path = "../constants" } zksync_contracts = { path = "../contracts" } zksync_types = { path = "../types" } zksync_health_check = { path = "../health_check" } diff --git a/core/lib/dal/src/blocks_web3_dal.rs b/core/lib/dal/src/blocks_web3_dal.rs index 03ec1c1930f..86f84de0973 100644 --- a/core/lib/dal/src/blocks_web3_dal.rs +++ b/core/lib/dal/src/blocks_web3_dal.rs @@ -1,7 +1,7 @@ use bigdecimal::BigDecimal; use sqlx::Row; -use zksync_config::constants::EMPTY_UNCLES_HASH; +use zksync_system_constants::EMPTY_UNCLES_HASH; use zksync_types::{ api, ethabi::Address, diff --git a/core/lib/dal/src/fri_prover_dal.rs b/core/lib/dal/src/fri_prover_dal.rs index ed3307c8b55..4cdad1c304b 100644 --- a/core/lib/dal/src/fri_prover_dal.rs +++ b/core/lib/dal/src/fri_prover_dal.rs @@ -1,9 +1,9 @@ use std::{collections::HashMap, convert::TryFrom, time::Duration}; -use zksync_config::configs::fri_prover_group::CircuitIdRoundTuple; -use zksync_types::protocol_version::FriProtocolVersionId; use zksync_types::{ + basic_fri_types::CircuitIdRoundTuple, proofs::{AggregationRound, FriProverJobMetadata, JobCountStatistics, StuckJobs}, + protocol_version::FriProtocolVersionId, L1BatchNumber, }; diff --git a/core/lib/merkle_tree/Cargo.toml b/core/lib/merkle_tree/Cargo.toml index 3756bdf5766..1204bdf6c94 100644 --- a/core/lib/merkle_tree/Cargo.toml +++ b/core/lib/merkle_tree/Cargo.toml @@ -22,7 +22,7 @@ thiserror = "1.0" tracing = "0.1" [dev-dependencies] -zksync_config = { path = "../config" } +zksync_system_constants = { path = "../constants" } assert_matches = "1.5.0" clap = { version = "4.2.2", features = ["derive"] } diff --git a/core/lib/merkle_tree/tests/integration/domain.rs b/core/lib/merkle_tree/tests/integration/domain.rs index 933d86070fe..ec76ebd4b7e 100644 --- a/core/lib/merkle_tree/tests/integration/domain.rs +++ b/core/lib/merkle_tree/tests/integration/domain.rs @@ -6,10 +6,10 @@ use tempfile::TempDir; use std::slice; -use zksync_config::constants::ACCOUNT_CODE_STORAGE_ADDRESS; use zksync_crypto::hasher::blake2::Blake2Hasher; use zksync_merkle_tree::{domain::ZkSyncTree, HashTree}; use zksync_storage::RocksDB; +use zksync_system_constants::ACCOUNT_CODE_STORAGE_ADDRESS; use zksync_types::{ proofs::StorageLogMetadata, AccountTreeId, Address, L1BatchNumber, StorageKey, StorageLog, H256, }; diff --git a/core/lib/test_account/Cargo.toml b/core/lib/test_account/Cargo.toml index 3585410e6d1..572b5c2d09c 100644 --- a/core/lib/test_account/Cargo.toml +++ b/core/lib/test_account/Cargo.toml @@ -12,7 +12,7 @@ readme = "README.md" [dependencies] zksync_types = { path = "../types" } -zksync_config = { path = "../config" } +zksync_system_constants = { path = "../constants" } zksync_utils = { path = "../utils" } zksync_eth_signer = { path = "../eth_signer" } zksync_contracts = { path = "../contracts" } diff --git a/core/lib/test_account/src/lib.rs b/core/lib/test_account/src/lib.rs index abc57b937ea..00764df6dc4 100644 --- a/core/lib/test_account/src/lib.rs +++ b/core/lib/test_account/src/lib.rs @@ -1,9 +1,9 @@ use ethabi::Token; -use zksync_config::constants::{ - CONTRACT_DEPLOYER_ADDRESS, MAX_GAS_PER_PUBDATA_BYTE, REQUIRED_L1_TO_L2_GAS_PER_PUBDATA_BYTE, -}; use zksync_contracts::test_contracts::LoadnextContractExecutionParams; use zksync_contracts::{deployer_contract, load_contract}; +use zksync_system_constants::{ + CONTRACT_DEPLOYER_ADDRESS, MAX_GAS_PER_PUBDATA_BYTE, REQUIRED_L1_TO_L2_GAS_PER_PUBDATA_BYTE, +}; use zksync_types::fee::Fee; use zksync_types::l2::L2Tx; use zksync_types::utils::deployed_address_create; diff --git a/core/lib/types/Cargo.toml b/core/lib/types/Cargo.toml index 08c47dd99f0..faf3fb2144c 100644 --- a/core/lib/types/Cargo.toml +++ b/core/lib/types/Cargo.toml @@ -11,7 +11,7 @@ categories = ["cryptography"] readme = "README.md" [dependencies] -zksync_config = { path = "../config" } +zksync_system_constants = { path = "../constants" } zksync_utils = { path = "../utils" } zksync_basic_types = { path = "../basic_types" } zksync_contracts = { path = "../contracts" } diff --git a/core/lib/types/src/block.rs b/core/lib/types/src/block.rs index d37c97324bd..845a48c6822 100644 --- a/core/lib/types/src/block.rs +++ b/core/lib/types/src/block.rs @@ -1,5 +1,5 @@ use serde::{Deserialize, Serialize}; -use zksync_config::constants::SYSTEM_BLOCK_INFO_BLOCK_NUMBER_MULTIPLIER; +use zksync_system_constants::SYSTEM_BLOCK_INFO_BLOCK_NUMBER_MULTIPLIER; use std::{fmt, ops}; diff --git a/core/lib/types/src/commitment.rs b/core/lib/types/src/commitment.rs index a5f930058ba..8e7da1186fa 100644 --- a/core/lib/types/src/commitment.rs +++ b/core/lib/types/src/commitment.rs @@ -10,8 +10,8 @@ use serde::{Deserialize, Serialize}; use std::{collections::HashMap, convert::TryFrom}; -use zksync_config::constants::ZKPORTER_IS_AVAILABLE; use zksync_mini_merkle_tree::MiniMerkleTree; +use zksync_system_constants::ZKPORTER_IS_AVAILABLE; use crate::{ block::L1BatchHeader, diff --git a/core/lib/types/src/storage/mod.rs b/core/lib/types/src/storage/mod.rs index bf790b58d3d..46b98575f12 100644 --- a/core/lib/types/src/storage/mod.rs +++ b/core/lib/types/src/storage/mod.rs @@ -11,7 +11,7 @@ pub mod witness_block_state; pub mod writes; pub use log::*; -pub use zksync_config::constants::*; +pub use zksync_system_constants::*; use zksync_utils::address_to_h256; /// Typed fully qualified key of the storage slot in global state tree. diff --git a/core/lib/types/src/system_contracts.rs b/core/lib/types/src/system_contracts.rs index b925f8ddd0f..f4fd4e14ffc 100644 --- a/core/lib/types/src/system_contracts.rs +++ b/core/lib/types/src/system_contracts.rs @@ -1,11 +1,11 @@ use std::path::PathBuf; use zksync_basic_types::{AccountTreeId, Address, U256}; -use zksync_config::constants::{ +use zksync_contracts::{read_sys_contract_bytecode, ContractLanguage, SystemContractsRepo}; +use zksync_system_constants::{ BOOTLOADER_UTILITIES_ADDRESS, BYTECODE_COMPRESSOR_ADDRESS, COMPLEX_UPGRADER_ADDRESS, EVENT_WRITER_ADDRESS, }; -use zksync_contracts::{read_sys_contract_bytecode, ContractLanguage, SystemContractsRepo}; use crate::{ block::DeployedContract, ACCOUNT_CODE_STORAGE_ADDRESS, BOOTLOADER_ADDRESS, diff --git a/core/lib/types/src/tokens.rs b/core/lib/types/src/tokens.rs index c89b8af01d9..45d97fee2e3 100644 --- a/core/lib/types/src/tokens.rs +++ b/core/lib/types/src/tokens.rs @@ -2,7 +2,7 @@ use chrono::{DateTime, Utc}; use num::{rational::Ratio, BigUint}; use serde::{Deserialize, Serialize}; use zksync_basic_types::Address; -pub use zksync_config::constants::ETHEREUM_ADDRESS; +pub use zksync_system_constants::ETHEREUM_ADDRESS; use zksync_utils::UnsignedRatioSerializeAsDecimal; #[derive(Debug, Serialize, Deserialize, Clone, PartialEq)] diff --git a/core/lib/types/src/transaction_request.rs b/core/lib/types/src/transaction_request.rs index c9af634c3e4..3c450e77c89 100644 --- a/core/lib/types/src/transaction_request.rs +++ b/core/lib/types/src/transaction_request.rs @@ -7,7 +7,7 @@ use serde::{Deserialize, Serialize}; use thiserror::Error; use zksync_basic_types::H256; -use zksync_config::constants::{MAX_GAS_PER_PUBDATA_BYTE, USED_BOOTLOADER_MEMORY_BYTES}; +use zksync_system_constants::{MAX_GAS_PER_PUBDATA_BYTE, USED_BOOTLOADER_MEMORY_BYTES}; use zksync_utils::bytecode::{hash_bytecode, validate_bytecode, InvalidBytecodeError}; use zksync_utils::{concat_and_hash, u256_to_h256}; diff --git a/core/lib/types/src/vm_trace.rs b/core/lib/types/src/vm_trace.rs index c1fafa088da..6b37848dc5a 100644 --- a/core/lib/types/src/vm_trace.rs +++ b/core/lib/types/src/vm_trace.rs @@ -4,7 +4,7 @@ use std::collections::{HashMap, HashSet}; use std::fmt; use std::fmt::Display; use zk_evm::zkevm_opcode_defs::FarCallOpcode; -use zksync_config::constants::BOOTLOADER_ADDRESS; +use zksync_system_constants::BOOTLOADER_ADDRESS; use zksync_utils::u256_to_h256; #[derive(Debug, Serialize, Deserialize, Clone, PartialEq)] diff --git a/core/lib/vm/Cargo.toml b/core/lib/vm/Cargo.toml index 57d3bdf2da4..f5270b33a23 100644 --- a/core/lib/vm/Cargo.toml +++ b/core/lib/vm/Cargo.toml @@ -12,7 +12,7 @@ categories = ["cryptography"] [dependencies] vise = { git = "https://github.com/matter-labs/vise.git", version = "0.1.0", rev = "dd05139b76ab0843443ab3ff730174942c825dae" } zk_evm = { git = "https://github.com/matter-labs/era-zk_evm.git", branch = "v1.3.3" } -zksync_config = { path = "../config" } +zksync_system_constants = { path = "../../lib/constants" } zksync_types = { path = "../types" } zksync_utils = { path = "../utils" } zksync_state = { path = "../state" } diff --git a/core/lib/vm/src/constants.rs b/core/lib/vm/src/constants.rs index 1c1cb3d5017..0b77bd0d43d 100644 --- a/core/lib/vm/src/constants.rs +++ b/core/lib/vm/src/constants.rs @@ -1,6 +1,6 @@ use zk_evm::aux_structures::MemoryPage; -use zksync_config::constants::{ +use zksync_system_constants::{ L1_GAS_PER_PUBDATA_BYTE, MAX_L2_TX_GAS_LIMIT, MAX_NEW_FACTORY_DEPS, MAX_TXS_IN_BLOCK, USED_BOOTLOADER_MEMORY_WORDS, }; diff --git a/core/lib/vm/src/old_vm/oracles/storage.rs b/core/lib/vm/src/old_vm/oracles/storage.rs index 482cc69bbbd..e1f5467253a 100644 --- a/core/lib/vm/src/old_vm/oracles/storage.rs +++ b/core/lib/vm/src/old_vm/oracles/storage.rs @@ -72,7 +72,7 @@ impl StorageOracle { } fn is_storage_key_free(&self, key: &StorageKey) -> bool { - key.address() == &zksync_config::constants::SYSTEM_CONTEXT_ADDRESS + key.address() == &zksync_system_constants::SYSTEM_CONTEXT_ADDRESS || *key == storage_key_for_eth_balance(&BOOTLOADER_ADDRESS) } diff --git a/core/lib/vm/src/old_vm/utils.rs b/core/lib/vm/src/old_vm/utils.rs index 5df4c6aa801..7ef211aa540 100644 --- a/core/lib/vm/src/old_vm/utils.rs +++ b/core/lib/vm/src/old_vm/utils.rs @@ -10,8 +10,8 @@ use zk_evm::{ vm_state::PrimitiveValue, zkevm_opcode_defs::FatPointer, }; -use zksync_config::constants::L1_GAS_PER_PUBDATA_BYTE; use zksync_state::WriteStorage; +use zksync_system_constants::L1_GAS_PER_PUBDATA_BYTE; use zksync_types::{Address, U256}; diff --git a/core/lib/vm/src/oracles/storage.rs b/core/lib/vm/src/oracles/storage.rs index 42d4f802247..60403556c47 100644 --- a/core/lib/vm/src/oracles/storage.rs +++ b/core/lib/vm/src/oracles/storage.rs @@ -84,7 +84,7 @@ impl StorageOracle { } fn is_storage_key_free(&self, key: &StorageKey) -> bool { - key.address() == &zksync_config::constants::SYSTEM_CONTEXT_ADDRESS + key.address() == &zksync_system_constants::SYSTEM_CONTEXT_ADDRESS || *key == storage_key_for_eth_balance(&BOOTLOADER_ADDRESS) } diff --git a/core/lib/vm/src/tests/default_aa.rs b/core/lib/vm/src/tests/default_aa.rs index b4c5f6b5832..173a76bf308 100644 --- a/core/lib/vm/src/tests/default_aa.rs +++ b/core/lib/vm/src/tests/default_aa.rs @@ -1,4 +1,4 @@ -use zksync_config::constants::L2_ETH_TOKEN_ADDRESS; +use zksync_system_constants::L2_ETH_TOKEN_ADDRESS; use zksync_types::system_contracts::{DEPLOYMENT_NONCE_INCREMENT, TX_NONCE_INCREMENT}; use zksync_types::{get_code_key, get_known_code_key, get_nonce_key, AccountTreeId, U256}; diff --git a/core/lib/vm/src/tests/get_used_contracts.rs b/core/lib/vm/src/tests/get_used_contracts.rs index 90a8816eb55..2749d7a79b9 100644 --- a/core/lib/vm/src/tests/get_used_contracts.rs +++ b/core/lib/vm/src/tests/get_used_contracts.rs @@ -2,8 +2,8 @@ use std::collections::{HashMap, HashSet}; use itertools::Itertools; -use zksync_config::constants::CONTRACT_DEPLOYER_ADDRESS; use zksync_state::WriteStorage; +use zksync_system_constants::CONTRACT_DEPLOYER_ADDRESS; use zksync_test_account::Account; use zksync_types::{Execute, U256}; use zksync_utils::bytecode::hash_bytecode; diff --git a/core/lib/vm/src/tests/l1_tx_execution.rs b/core/lib/vm/src/tests/l1_tx_execution.rs index cd1c8f2460c..2f83d8b3f20 100644 --- a/core/lib/vm/src/tests/l1_tx_execution.rs +++ b/core/lib/vm/src/tests/l1_tx_execution.rs @@ -1,4 +1,4 @@ -use zksync_config::constants::BOOTLOADER_ADDRESS; +use zksync_system_constants::BOOTLOADER_ADDRESS; use zksync_types::l2_to_l1_log::L2ToL1Log; use zksync_types::storage_writes_deduplicator::StorageWritesDeduplicator; use zksync_types::{get_code_key, get_known_code_key, U256}; diff --git a/core/lib/vm/src/tests/l2_blocks.rs b/core/lib/vm/src/tests/l2_blocks.rs index 9deac837f90..192930d73a4 100644 --- a/core/lib/vm/src/tests/l2_blocks.rs +++ b/core/lib/vm/src/tests/l2_blocks.rs @@ -14,10 +14,10 @@ use crate::{ VmExecutionMode, }; use zk_evm::aux_structures::Timestamp; -use zksync_config::constants::{ +use zksync_state::{ReadStorage, WriteStorage}; +use zksync_system_constants::{ CURRENT_VIRTUAL_BLOCK_INFO_POSITION, REQUIRED_L1_TO_L2_GAS_PER_PUBDATA_BYTE, }; -use zksync_state::{ReadStorage, WriteStorage}; use zksync_types::block::{pack_block_info, unpack_block_info}; use zksync_types::{ block::{legacy_miniblock_hash, miniblock_hash}, diff --git a/core/lib/vm/src/tests/require_eip712.rs b/core/lib/vm/src/tests/require_eip712.rs index 4c2515ae2ef..f3cef309fb8 100644 --- a/core/lib/vm/src/tests/require_eip712.rs +++ b/core/lib/vm/src/tests/require_eip712.rs @@ -2,9 +2,9 @@ use std::convert::TryInto; use ethabi::Token; -use zksync_config::constants::L2_ETH_TOKEN_ADDRESS; use zksync_eth_signer::raw_ethereum_tx::TransactionParameters; use zksync_eth_signer::EthereumSigner; +use zksync_system_constants::L2_ETH_TOKEN_ADDRESS; use zksync_types::fee::Fee; use zksync_types::l2::L2Tx; use zksync_types::transaction_request::TransactionRequest; diff --git a/core/lib/vm/src/tracers/call.rs b/core/lib/vm/src/tracers/call.rs index bd008b7187d..5cd7aff789c 100644 --- a/core/lib/vm/src/tracers/call.rs +++ b/core/lib/vm/src/tracers/call.rs @@ -8,8 +8,8 @@ use zk_evm::zkevm_opcode_defs::{ CALL_IMPLICIT_CALLDATA_FAT_PTR_REGISTER, RET_IMPLICIT_RETURNDATA_PARAMS_REGISTER, }; -use zksync_config::constants::CONTRACT_DEPLOYER_ADDRESS; use zksync_state::{StoragePtr, WriteStorage}; +use zksync_system_constants::CONTRACT_DEPLOYER_ADDRESS; use zksync_types::vm_trace::{Call, CallType}; use zksync_types::U256; diff --git a/core/lib/vm/src/tracers/refunds.rs b/core/lib/vm/src/tracers/refunds.rs index 16e03f06916..ed4e2c96342 100644 --- a/core/lib/vm/src/tracers/refunds.rs +++ b/core/lib/vm/src/tracers/refunds.rs @@ -5,8 +5,8 @@ use zk_evm::{ tracing::{BeforeExecutionData, VmLocalStateData}, vm_state::VmLocalState, }; -use zksync_config::constants::{PUBLISH_BYTECODE_OVERHEAD, SYSTEM_CONTEXT_ADDRESS}; use zksync_state::{StoragePtr, WriteStorage}; +use zksync_system_constants::{PUBLISH_BYTECODE_OVERHEAD, SYSTEM_CONTEXT_ADDRESS}; use zksync_types::{ event::{extract_long_l2_to_l1_messages, extract_published_bytecodes}, l2_to_l1_log::L2ToL1Log, diff --git a/core/lib/vm/src/tracers/utils.rs b/core/lib/vm/src/tracers/utils.rs index 5f9090d6180..3d966f03b91 100644 --- a/core/lib/vm/src/tracers/utils.rs +++ b/core/lib/vm/src/tracers/utils.rs @@ -5,7 +5,7 @@ use zk_evm::{ zkevm_opcode_defs::{FatPointer, LogOpcode, Opcode, UMAOpcode}, }; -use zksync_config::constants::{ +use zksync_system_constants::{ ECRECOVER_PRECOMPILE_ADDRESS, KECCAK256_PRECOMPILE_ADDRESS, KNOWN_CODES_STORAGE_ADDRESS, L1_MESSENGER_ADDRESS, SHA256_PRECOMPILE_ADDRESS, }; diff --git a/core/lib/vm/src/tracers/validation/mod.rs b/core/lib/vm/src/tracers/validation/mod.rs index 77baa420dd2..bb020b8f59d 100644 --- a/core/lib/vm/src/tracers/validation/mod.rs +++ b/core/lib/vm/src/tracers/validation/mod.rs @@ -11,12 +11,12 @@ use zk_evm::{ zkevm_opcode_defs::{ContextOpcode, FarCallABI, LogOpcode, Opcode}, }; -use zksync_config::constants::{ +use zksync_state::{StoragePtr, WriteStorage}; +use zksync_system_constants::{ ACCOUNT_CODE_STORAGE_ADDRESS, BOOTLOADER_ADDRESS, CONTRACT_DEPLOYER_ADDRESS, KECCAK256_PRECOMPILE_ADDRESS, L2_ETH_TOKEN_ADDRESS, MSG_VALUE_SIMULATOR_ADDRESS, SYSTEM_CONTEXT_ADDRESS, }; -use zksync_state::{StoragePtr, WriteStorage}; use zksync_types::{ get_code_key, vm_trace::ViolatedValidationRule, web3::signing::keccak256, AccountTreeId, diff --git a/core/lib/vm/src/types/internals/vm_state.rs b/core/lib/vm/src/types/internals/vm_state.rs index fa478251501..363408293aa 100644 --- a/core/lib/vm/src/types/internals/vm_state.rs +++ b/core/lib/vm/src/types/internals/vm_state.rs @@ -13,8 +13,8 @@ use zk_evm::{ use zk_evm::zkevm_opcode_defs::{ BOOTLOADER_BASE_PAGE, BOOTLOADER_CODE_PAGE, STARTING_BASE_PAGE, STARTING_TIMESTAMP, }; -use zksync_config::constants::BOOTLOADER_ADDRESS; use zksync_state::{StoragePtr, WriteStorage}; +use zksync_system_constants::BOOTLOADER_ADDRESS; use zksync_types::block::legacy_miniblock_hash; use zksync_types::{zkevm_test_harness::INITIAL_MONOTONIC_CYCLE_COUNTER, Address, MiniblockNumber}; use zksync_utils::h256_to_u256; diff --git a/core/lib/vm/src/types/outputs/execution_result.rs b/core/lib/vm/src/types/outputs/execution_result.rs index bb46cb41ec8..44aa053bfc1 100644 --- a/core/lib/vm/src/types/outputs/execution_result.rs +++ b/core/lib/vm/src/types/outputs/execution_result.rs @@ -1,5 +1,5 @@ use crate::{Halt, VmExecutionStatistics, VmRevertReason}; -use zksync_config::constants::PUBLISH_BYTECODE_OVERHEAD; +use zksync_system_constants::PUBLISH_BYTECODE_OVERHEAD; use zksync_types::event::{extract_long_l2_to_l1_messages, extract_published_bytecodes}; use zksync_types::tx::tx_execution_info::VmExecutionLogs; use zksync_types::tx::ExecutionMetrics; diff --git a/core/lib/vm/src/utils/fee.rs b/core/lib/vm/src/utils/fee.rs index e2e0bdbe599..b89c996575a 100644 --- a/core/lib/vm/src/utils/fee.rs +++ b/core/lib/vm/src/utils/fee.rs @@ -1,5 +1,5 @@ //! Utility functions for vm -use zksync_config::constants::MAX_GAS_PER_PUBDATA_BYTE; +use zksync_system_constants::MAX_GAS_PER_PUBDATA_BYTE; use zksync_utils::ceil_div; use crate::old_vm::utils::eth_price_per_pubdata_byte; diff --git a/core/lib/vm/src/utils/l2_blocks.rs b/core/lib/vm/src/utils/l2_blocks.rs index ca33bce0dfd..189ad8e79c5 100644 --- a/core/lib/vm/src/utils/l2_blocks.rs +++ b/core/lib/vm/src/utils/l2_blocks.rs @@ -1,10 +1,10 @@ use crate::{L2Block, L2BlockEnv}; -use zksync_config::constants::{ +use zksync_state::{ReadStorage, StoragePtr}; +use zksync_system_constants::{ SYSTEM_CONTEXT_ADDRESS, SYSTEM_CONTEXT_CURRENT_L2_BLOCK_HASHES_POSITION, SYSTEM_CONTEXT_CURRENT_L2_BLOCK_INFO_POSITION, SYSTEM_CONTEXT_CURRENT_TX_ROLLING_HASH_POSITION, SYSTEM_CONTEXT_STORED_L2_BLOCK_HASHES, }; -use zksync_state::{ReadStorage, StoragePtr}; use zksync_types::block::unpack_block_info; use zksync_types::web3::signing::keccak256; use zksync_types::{AccountTreeId, MiniblockNumber, StorageKey, H256, U256}; diff --git a/core/lib/vm/src/utils/overhead.rs b/core/lib/vm/src/utils/overhead.rs index 6fdce9c724e..1d502ef2d15 100644 --- a/core/lib/vm/src/utils/overhead.rs +++ b/core/lib/vm/src/utils/overhead.rs @@ -1,6 +1,6 @@ use crate::constants::{BLOCK_OVERHEAD_GAS, BLOCK_OVERHEAD_PUBDATA, BOOTLOADER_TX_ENCODING_SPACE}; use zk_evm::zkevm_opcode_defs::system_params::MAX_TX_ERGS_LIMIT; -use zksync_config::constants::{MAX_L2_TX_GAS_LIMIT, MAX_TXS_IN_BLOCK}; +use zksync_system_constants::{MAX_L2_TX_GAS_LIMIT, MAX_TXS_IN_BLOCK}; use zksync_types::l1::is_l1_tx_type; use zksync_types::U256; use zksync_utils::ceil_div_u256; diff --git a/core/lib/zksync_core/Cargo.toml b/core/lib/zksync_core/Cargo.toml index bd0b079bd5f..9826cf53de6 100644 --- a/core/lib/zksync_core/Cargo.toml +++ b/core/lib/zksync_core/Cargo.toml @@ -17,6 +17,7 @@ zksync_dal = { path = "../dal" } zksync_config = { path = "../config" } zksync_utils = { path = "../utils" } zksync_contracts = { path = "../contracts" } +zksync_system_constants = { path = "../../lib/constants" } zksync_commitment_utils = { path = "../commitment_utils" } zksync_eth_client = { path = "../eth_client" } zksync_eth_signer = { path = "../eth_signer" } diff --git a/core/lib/zksync_core/src/api_server/execution_sandbox/apply.rs b/core/lib/zksync_core/src/api_server/execution_sandbox/apply.rs index f438d5bd37f..ac84d360314 100644 --- a/core/lib/zksync_core/src/api_server/execution_sandbox/apply.rs +++ b/core/lib/zksync_core/src/api_server/execution_sandbox/apply.rs @@ -10,12 +10,12 @@ use std::time::{Duration, Instant}; use multivm::VmInstance; use vm::{constants::BLOCK_GAS_LIMIT, HistoryDisabled, L1BatchEnv, L2BlockEnv, SystemEnv}; -use zksync_config::constants::{ +use zksync_dal::{ConnectionPool, SqlxError, StorageProcessor}; +use zksync_state::{PostgresStorage, ReadStorage, StorageView, WriteStorage}; +use zksync_system_constants::{ SYSTEM_CONTEXT_ADDRESS, SYSTEM_CONTEXT_CURRENT_L2_BLOCK_INFO_POSITION, SYSTEM_CONTEXT_CURRENT_TX_ROLLING_HASH_POSITION, ZKPORTER_IS_AVAILABLE, }; -use zksync_dal::{ConnectionPool, SqlxError, StorageProcessor}; -use zksync_state::{PostgresStorage, ReadStorage, StorageView, WriteStorage}; use zksync_types::{ api, block::{legacy_miniblock_hash, pack_block_info, unpack_block_info}, diff --git a/core/lib/zksync_core/src/api_server/execution_sandbox/mod.rs b/core/lib/zksync_core/src/api_server/execution_sandbox/mod.rs index cf98406e84a..893494e4761 100644 --- a/core/lib/zksync_core/src/api_server/execution_sandbox/mod.rs +++ b/core/lib/zksync_core/src/api_server/execution_sandbox/mod.rs @@ -3,9 +3,9 @@ use std::time::Duration; use tokio::runtime::Handle; use vm::utils::fee::derive_base_fee_and_gas_per_pubdata; -use zksync_config::constants::PUBLISH_BYTECODE_OVERHEAD; use zksync_dal::{ConnectionPool, SqlxError, StorageProcessor}; use zksync_state::{PostgresStorage, PostgresStorageCaches, ReadStorage, StorageView}; +use zksync_system_constants::PUBLISH_BYTECODE_OVERHEAD; use zksync_types::{api, AccountTreeId, L2ChainId, MiniblockNumber, U256}; use zksync_utils::bytecode::{compress_bytecode, hash_bytecode}; diff --git a/core/lib/zksync_core/src/eth_watch/mod.rs b/core/lib/zksync_core/src/eth_watch/mod.rs index 1cd2eb95947..d6494ae040d 100644 --- a/core/lib/zksync_core/src/eth_watch/mod.rs +++ b/core/lib/zksync_core/src/eth_watch/mod.rs @@ -9,10 +9,10 @@ use tokio::{sync::watch, task::JoinHandle}; use std::time::Duration; -use zksync_config::constants::PRIORITY_EXPIRATION; use zksync_config::ETHWatchConfig; use zksync_dal::{ConnectionPool, StorageProcessor}; use zksync_eth_client::EthInterface; +use zksync_system_constants::PRIORITY_EXPIRATION; use zksync_types::{ web3::types::BlockNumber as Web3BlockNumber, Address, PriorityOpId, ProtocolVersionId, }; diff --git a/core/lib/zksync_core/src/state_keeper/io/seal_logic.rs b/core/lib/zksync_core/src/state_keeper/io/seal_logic.rs index 8eeac5890a2..f8ef912ce6d 100644 --- a/core/lib/zksync_core/src/state_keeper/io/seal_logic.rs +++ b/core/lib/zksync_core/src/state_keeper/io/seal_logic.rs @@ -9,8 +9,8 @@ use std::{ }; use vm::{FinishedL1Batch, L1BatchEnv}; -use zksync_config::constants::ACCOUNT_CODE_STORAGE_ADDRESS; use zksync_dal::StorageProcessor; +use zksync_system_constants::ACCOUNT_CODE_STORAGE_ADDRESS; use zksync_types::{ block::unpack_block_info, CURRENT_VIRTUAL_BLOCK_INFO_POSITION, SYSTEM_CONTEXT_ADDRESS, }; diff --git a/core/lib/zksync_core/src/state_keeper/mod.rs b/core/lib/zksync_core/src/state_keeper/mod.rs index 5e4a56364b2..898a6176bfe 100644 --- a/core/lib/zksync_core/src/state_keeper/mod.rs +++ b/core/lib/zksync_core/src/state_keeper/mod.rs @@ -4,10 +4,10 @@ use std::sync::Arc; use zksync_config::{ configs::chain::{MempoolConfig, NetworkConfig, StateKeeperConfig}, - constants::MAX_TXS_IN_BLOCK, ContractsConfig, DBConfig, }; use zksync_dal::ConnectionPool; +use zksync_system_constants::MAX_TXS_IN_BLOCK; mod batch_executor; pub(crate) mod extractors; diff --git a/core/lib/zksync_core/src/state_keeper/tests/mod.rs b/core/lib/zksync_core/src/state_keeper/tests/mod.rs index f29c3874d72..8a7246943ad 100644 --- a/core/lib/zksync_core/src/state_keeper/tests/mod.rs +++ b/core/lib/zksync_core/src/state_keeper/tests/mod.rs @@ -13,8 +13,9 @@ use vm::{ L1BatchEnv, L2BlockEnv, SystemEnv, TxExecutionMode, VmExecutionResultAndLogs, VmExecutionStatistics, }; -use zksync_config::{configs::chain::StateKeeperConfig, constants::ZKPORTER_IS_AVAILABLE}; +use zksync_config::configs::chain::StateKeeperConfig; use zksync_contracts::{BaseSystemContracts, BaseSystemContractsHashes}; +use zksync_system_constants::ZKPORTER_IS_AVAILABLE; use zksync_types::{ aggregated_operations::AggregatedActionType, block::legacy_miniblock_hash, diff --git a/core/lib/zksync_core/src/witness_generator/basic_circuits.rs b/core/lib/zksync_core/src/witness_generator/basic_circuits.rs index 1a4b33e3e6b..554b166f0bf 100644 --- a/core/lib/zksync_core/src/witness_generator/basic_circuits.rs +++ b/core/lib/zksync_core/src/witness_generator/basic_circuits.rs @@ -13,11 +13,11 @@ use std::{ use vm::{constants::MAX_CYCLES_FOR_TX, HistoryDisabled, SimpleMemory, StorageOracle}; use zksync_config::configs::witness_generator::BasicWitnessGeneratorDataSource; use zksync_config::configs::WitnessGeneratorConfig; -use zksync_config::constants::BOOTLOADER_ADDRESS; use zksync_dal::ConnectionPool; use zksync_object_store::{Bucket, ObjectStore, ObjectStoreFactory, StoredObject}; use zksync_queued_job_processor::JobProcessor; use zksync_state::{PostgresStorage, ReadStorage, ShadowStorage, StorageView, WitnessStorage}; +use zksync_system_constants::BOOTLOADER_ADDRESS; use zksync_types::{ circuit::GEOMETRY_CONFIG, proofs::{AggregationRound, BasicCircuitWitnessGeneratorInput, PrepareBasicCircuitsJob}, diff --git a/core/multivm_deps/vm_1_3_2/Cargo.toml b/core/multivm_deps/vm_1_3_2/Cargo.toml index 9c77ced9093..2b6fe359797 100644 --- a/core/multivm_deps/vm_1_3_2/Cargo.toml +++ b/core/multivm_deps/vm_1_3_2/Cargo.toml @@ -13,7 +13,7 @@ categories = ["cryptography"] zkevm-assembly = { git = "https://github.com/matter-labs/era-zkEVM-assembly.git", branch = "v1.3.2" } zk_evm = { git = "https://github.com/matter-labs/era-zk_evm.git", branch = "v1.3.3" } -zksync_config = { path = "../../lib/config" } +zksync_system_constants = { path = "../../lib/constants" } zksync_types = { path = "../../lib/types" } zksync_utils = { path = "../../lib/utils" } zksync_state = { path = "../../lib/state" } diff --git a/core/multivm_deps/vm_1_3_2/src/oracles/storage.rs b/core/multivm_deps/vm_1_3_2/src/oracles/storage.rs index 0f68fcdd4c9..fd67fad5c41 100644 --- a/core/multivm_deps/vm_1_3_2/src/oracles/storage.rs +++ b/core/multivm_deps/vm_1_3_2/src/oracles/storage.rs @@ -71,7 +71,7 @@ impl StorageOracle { } fn is_storage_key_free(&self, key: &StorageKey) -> bool { - key.address() == &zksync_config::constants::SYSTEM_CONTEXT_ADDRESS + key.address() == &zksync_system_constants::SYSTEM_CONTEXT_ADDRESS || *key == storage_key_for_eth_balance(&BOOTLOADER_ADDRESS) } diff --git a/core/multivm_deps/vm_1_3_2/src/oracles/tracer/call.rs b/core/multivm_deps/vm_1_3_2/src/oracles/tracer/call.rs index 5e0e1bbd22d..455a8b5bc70 100644 --- a/core/multivm_deps/vm_1_3_2/src/oracles/tracer/call.rs +++ b/core/multivm_deps/vm_1_3_2/src/oracles/tracer/call.rs @@ -12,7 +12,7 @@ use zk_evm::zkevm_opcode_defs::{ RET_IMPLICIT_RETURNDATA_PARAMS_REGISTER, }; use zkevm_assembly::zkevm_opcode_defs::FatPointer; -use zksync_config::constants::CONTRACT_DEPLOYER_ADDRESS; +use zksync_system_constants::CONTRACT_DEPLOYER_ADDRESS; use zksync_types::vm_trace::{Call, CallType}; use zksync_types::U256; diff --git a/core/multivm_deps/vm_1_3_2/src/oracles/tracer/utils.rs b/core/multivm_deps/vm_1_3_2/src/oracles/tracer/utils.rs index 9521813a14a..035b40f3018 100644 --- a/core/multivm_deps/vm_1_3_2/src/oracles/tracer/utils.rs +++ b/core/multivm_deps/vm_1_3_2/src/oracles/tracer/utils.rs @@ -10,7 +10,7 @@ use zk_evm::{ tracing::{BeforeExecutionData, VmLocalStateData}, zkevm_opcode_defs::{FatPointer, LogOpcode, Opcode, UMAOpcode}, }; -use zksync_config::constants::{ +use zksync_system_constants::{ ECRECOVER_PRECOMPILE_ADDRESS, KECCAK256_PRECOMPILE_ADDRESS, KNOWN_CODES_STORAGE_ADDRESS, L1_MESSENGER_ADDRESS, SHA256_PRECOMPILE_ADDRESS, }; diff --git a/core/multivm_deps/vm_1_3_2/src/oracles/tracer/validation.rs b/core/multivm_deps/vm_1_3_2/src/oracles/tracer/validation.rs index 0991e16d168..558024ecba0 100644 --- a/core/multivm_deps/vm_1_3_2/src/oracles/tracer/validation.rs +++ b/core/multivm_deps/vm_1_3_2/src/oracles/tracer/validation.rs @@ -18,12 +18,12 @@ use zk_evm::{ }; use crate::oracles::tracer::{utils::get_calldata_page_via_abi, StorageInvocationTracer}; -use zksync_config::constants::{ +use zksync_state::{StoragePtr, WriteStorage}; +use zksync_system_constants::{ ACCOUNT_CODE_STORAGE_ADDRESS, BOOTLOADER_ADDRESS, CONTRACT_DEPLOYER_ADDRESS, KECCAK256_PRECOMPILE_ADDRESS, L2_ETH_TOKEN_ADDRESS, MSG_VALUE_SIMULATOR_ADDRESS, SYSTEM_CONTEXT_ADDRESS, }; -use zksync_state::{StoragePtr, WriteStorage}; use zksync_types::{ get_code_key, web3::signing::keccak256, AccountTreeId, Address, StorageKey, H256, U256, }; diff --git a/core/multivm_deps/vm_1_3_2/src/utils.rs b/core/multivm_deps/vm_1_3_2/src/utils.rs index c0bfe1d4c6d..23137956832 100644 --- a/core/multivm_deps/vm_1_3_2/src/utils.rs +++ b/core/multivm_deps/vm_1_3_2/src/utils.rs @@ -11,9 +11,9 @@ use zk_evm::{ vm_state::PrimitiveValue, zkevm_opcode_defs::FatPointer, }; -use zksync_config::constants::ZKPORTER_IS_AVAILABLE; use zksync_contracts::{read_zbin_bytecode, BaseSystemContracts}; use zksync_state::WriteStorage; +use zksync_system_constants::ZKPORTER_IS_AVAILABLE; use zksync_types::{Address, H160, MAX_L2_TX_GAS_LIMIT, U256}; use zksync_utils::h256_to_u256; diff --git a/core/multivm_deps/vm_1_3_2/src/vm.rs b/core/multivm_deps/vm_1_3_2/src/vm.rs index c8a8bf7e653..3493e28db79 100644 --- a/core/multivm_deps/vm_1_3_2/src/vm.rs +++ b/core/multivm_deps/vm_1_3_2/src/vm.rs @@ -6,8 +6,8 @@ use zk_evm::vm_state::{PrimitiveValue, VmLocalState, VmState}; use zk_evm::witness_trace::DummyTracer; use zk_evm::zkevm_opcode_defs::decoding::{AllowedPcOrImm, EncodingModeProduction, VmEncodingMode}; use zk_evm::zkevm_opcode_defs::definitions::RET_IMPLICIT_RETURNDATA_PARAMS_REGISTER; -use zksync_config::constants::MAX_TXS_IN_BLOCK; use zksync_state::WriteStorage; +use zksync_system_constants::MAX_TXS_IN_BLOCK; use zksync_types::l2_to_l1_log::L2ToL1Log; use zksync_types::tx::tx_execution_info::{TxExecutionStatus, VmExecutionLogs}; use zksync_types::vm_trace::{Call, VmExecutionTrace, VmTrace}; diff --git a/core/multivm_deps/vm_1_3_2/src/vm_with_bootloader.rs b/core/multivm_deps/vm_1_3_2/src/vm_with_bootloader.rs index 6b55ee7b6e8..26eee135e32 100644 --- a/core/multivm_deps/vm_1_3_2/src/vm_with_bootloader.rs +++ b/core/multivm_deps/vm_1_3_2/src/vm_with_bootloader.rs @@ -10,8 +10,8 @@ use zk_evm::{ STARTING_TIMESTAMP, }, }; -use zksync_config::constants::MAX_TXS_IN_BLOCK; use zksync_contracts::BaseSystemContracts; +use zksync_system_constants::MAX_TXS_IN_BLOCK; use zksync_types::{ l1::is_l1_tx_type, zkevm_test_harness::INITIAL_MONOTONIC_CYCLE_COUNTER, Address, Transaction, diff --git a/core/multivm_deps/vm_m5/Cargo.toml b/core/multivm_deps/vm_m5/Cargo.toml index a9bed97eeff..2a65494d618 100644 --- a/core/multivm_deps/vm_m5/Cargo.toml +++ b/core/multivm_deps/vm_m5/Cargo.toml @@ -13,7 +13,7 @@ categories = ["cryptography"] zksync_crypto = { path = "../../lib/crypto" } zksync_types = { path = "../../lib/types" } zksync_utils = { path = "../../lib/utils" } -zksync_config = { path = "../../lib/config" } +zksync_system_constants = { path = "../../lib/constants" } zksync_state = { path = "../../lib/state" } zksync_storage = { path = "../../lib/storage" } diff --git a/core/multivm_deps/vm_m5/src/oracles/storage.rs b/core/multivm_deps/vm_m5/src/oracles/storage.rs index ac0a431a1cf..8bbb85808db 100644 --- a/core/multivm_deps/vm_m5/src/oracles/storage.rs +++ b/core/multivm_deps/vm_m5/src/oracles/storage.rs @@ -79,10 +79,10 @@ impl StorageOracle { fn is_storage_key_free(&self, key: &StorageKey) -> bool { match self.refund_state { MultiVMSubversion::V1 => { - key.address() == &zksync_config::constants::SYSTEM_CONTEXT_ADDRESS + key.address() == &zksync_system_constants::SYSTEM_CONTEXT_ADDRESS } MultiVMSubversion::V2 => { - key.address() == &zksync_config::constants::SYSTEM_CONTEXT_ADDRESS + key.address() == &zksync_system_constants::SYSTEM_CONTEXT_ADDRESS || *key == storage_key_for_eth_balance(&BOOTLOADER_ADDRESS) } } diff --git a/core/multivm_deps/vm_m5/src/tests/bootloader.rs b/core/multivm_deps/vm_m5/src/tests/bootloader.rs index f2b80e9e3c3..99a00efc9c0 100644 --- a/core/multivm_deps/vm_m5/src/tests/bootloader.rs +++ b/core/multivm_deps/vm_m5/src/tests/bootloader.rs @@ -90,7 +90,7 @@ // }; // use once_cell::sync::Lazy; -// use zksync_config::constants::ZKPORTER_IS_AVAILABLE; +// use zksync_system_constants::ZKPORTER_IS_AVAILABLE; // fn run_vm_with_custom_factory_deps<'a>( // oracle_tools: &'a mut OracleTools<'a, false>, diff --git a/core/multivm_deps/vm_m5/src/utils.rs b/core/multivm_deps/vm_m5/src/utils.rs index c498e71bbe3..6340034a7cc 100644 --- a/core/multivm_deps/vm_m5/src/utils.rs +++ b/core/multivm_deps/vm_m5/src/utils.rs @@ -8,8 +8,8 @@ use zk_evm::{ vm_state::PrimitiveValue, zkevm_opcode_defs::FatPointer, }; -use zksync_config::constants::ZKPORTER_IS_AVAILABLE; use zksync_contracts::{read_zbin_bytecode, BaseSystemContracts}; +use zksync_system_constants::ZKPORTER_IS_AVAILABLE; use zksync_types::{Address, StorageLogQuery, H160, MAX_L2_TX_GAS_LIMIT, U256}; use zksync_utils::h256_to_u256; diff --git a/core/multivm_deps/vm_m5/src/vm.rs b/core/multivm_deps/vm_m5/src/vm.rs index a5556621412..84880ce6fcc 100644 --- a/core/multivm_deps/vm_m5/src/vm.rs +++ b/core/multivm_deps/vm_m5/src/vm.rs @@ -6,7 +6,7 @@ use zk_evm::vm_state::{PrimitiveValue, VmLocalState, VmState}; use zk_evm::witness_trace::DummyTracer; use zk_evm::zkevm_opcode_defs::decoding::{AllowedPcOrImm, EncodingModeProduction, VmEncodingMode}; use zk_evm::zkevm_opcode_defs::definitions::RET_IMPLICIT_RETURNDATA_PARAMS_REGISTER; -use zksync_config::constants::MAX_TXS_IN_BLOCK; +use zksync_system_constants::MAX_TXS_IN_BLOCK; use zksync_types::l2_to_l1_log::L2ToL1Log; use zksync_types::tx::tx_execution_info::{TxExecutionStatus, VmExecutionLogs}; diff --git a/core/multivm_deps/vm_m5/src/vm_with_bootloader.rs b/core/multivm_deps/vm_m5/src/vm_with_bootloader.rs index f8398729f9f..537f7141177 100644 --- a/core/multivm_deps/vm_m5/src/vm_with_bootloader.rs +++ b/core/multivm_deps/vm_m5/src/vm_with_bootloader.rs @@ -10,8 +10,8 @@ use zk_evm::{ BOOTLOADER_CALLDATA_PAGE, STARTING_BASE_PAGE, STARTING_TIMESTAMP, }, }; -use zksync_config::constants::MAX_TXS_IN_BLOCK; use zksync_contracts::BaseSystemContracts; +use zksync_system_constants::MAX_TXS_IN_BLOCK; use zksync_types::{ zkevm_test_harness::INITIAL_MONOTONIC_CYCLE_COUNTER, Address, Transaction, BOOTLOADER_ADDRESS, diff --git a/core/multivm_deps/vm_m6/Cargo.toml b/core/multivm_deps/vm_m6/Cargo.toml index 9b4093a7cdb..ee0ed1d72e0 100644 --- a/core/multivm_deps/vm_m6/Cargo.toml +++ b/core/multivm_deps/vm_m6/Cargo.toml @@ -14,7 +14,7 @@ zkevm-assembly = { git = "https://github.com/matter-labs/era-zkEVM-assembly.git" zksync_crypto = { path = "../../lib/crypto" } zksync_types = { path = "../../lib/types" } zksync_utils = { path = "../../lib/utils" } -zksync_config = { path = "../../lib/config" } +zksync_system_constants = { path = "../../lib/constants" } zksync_state = { path = "../../lib/state" } zksync_storage = { path = "../../lib/storage" } diff --git a/core/multivm_deps/vm_m6/src/oracles/storage.rs b/core/multivm_deps/vm_m6/src/oracles/storage.rs index 706bb1319c9..551ffc468d9 100644 --- a/core/multivm_deps/vm_m6/src/oracles/storage.rs +++ b/core/multivm_deps/vm_m6/src/oracles/storage.rs @@ -73,7 +73,7 @@ impl StorageOracle { } fn is_storage_key_free(&self, key: &StorageKey) -> bool { - key.address() == &zksync_config::constants::SYSTEM_CONTEXT_ADDRESS + key.address() == &zksync_system_constants::SYSTEM_CONTEXT_ADDRESS || *key == storage_key_for_eth_balance(&BOOTLOADER_ADDRESS) } diff --git a/core/multivm_deps/vm_m6/src/oracles/tracer/call.rs b/core/multivm_deps/vm_m6/src/oracles/tracer/call.rs index 8ca67145072..a1eae50d663 100644 --- a/core/multivm_deps/vm_m6/src/oracles/tracer/call.rs +++ b/core/multivm_deps/vm_m6/src/oracles/tracer/call.rs @@ -13,7 +13,7 @@ use zk_evm::zkevm_opcode_defs::{ RET_IMPLICIT_RETURNDATA_PARAMS_REGISTER, }; use zkevm_assembly::zkevm_opcode_defs::FatPointer; -use zksync_config::constants::CONTRACT_DEPLOYER_ADDRESS; +use zksync_system_constants::CONTRACT_DEPLOYER_ADDRESS; use zksync_types::vm_trace::{Call, CallType}; use zksync_types::U256; diff --git a/core/multivm_deps/vm_m6/src/oracles/tracer/utils.rs b/core/multivm_deps/vm_m6/src/oracles/tracer/utils.rs index 1d994c3254d..4c1f64b7181 100644 --- a/core/multivm_deps/vm_m6/src/oracles/tracer/utils.rs +++ b/core/multivm_deps/vm_m6/src/oracles/tracer/utils.rs @@ -10,7 +10,7 @@ use zk_evm::{ abstractions::{BeforeExecutionData, VmLocalStateData}, zkevm_opcode_defs::{FatPointer, LogOpcode, Opcode, UMAOpcode}, }; -use zksync_config::constants::{ +use zksync_system_constants::{ ECRECOVER_PRECOMPILE_ADDRESS, KECCAK256_PRECOMPILE_ADDRESS, KNOWN_CODES_STORAGE_ADDRESS, L1_MESSENGER_ADDRESS, SHA256_PRECOMPILE_ADDRESS, }; diff --git a/core/multivm_deps/vm_m6/src/oracles/tracer/validation.rs b/core/multivm_deps/vm_m6/src/oracles/tracer/validation.rs index ebf45993b4c..6d2a08511eb 100644 --- a/core/multivm_deps/vm_m6/src/oracles/tracer/validation.rs +++ b/core/multivm_deps/vm_m6/src/oracles/tracer/validation.rs @@ -21,7 +21,7 @@ use zk_evm::{ use crate::oracles::tracer::{utils::get_calldata_page_via_abi, StorageInvocationTracer}; use crate::storage::{Storage, StoragePtr}; -use zksync_config::constants::{ +use zksync_system_constants::{ ACCOUNT_CODE_STORAGE_ADDRESS, BOOTLOADER_ADDRESS, CONTRACT_DEPLOYER_ADDRESS, KECCAK256_PRECOMPILE_ADDRESS, L2_ETH_TOKEN_ADDRESS, MSG_VALUE_SIMULATOR_ADDRESS, SYSTEM_CONTEXT_ADDRESS, diff --git a/core/multivm_deps/vm_m6/src/utils.rs b/core/multivm_deps/vm_m6/src/utils.rs index ff618156139..16fe10d5659 100644 --- a/core/multivm_deps/vm_m6/src/utils.rs +++ b/core/multivm_deps/vm_m6/src/utils.rs @@ -13,8 +13,8 @@ use zk_evm::{ vm_state::PrimitiveValue, zkevm_opcode_defs::FatPointer, }; -use zksync_config::constants::ZKPORTER_IS_AVAILABLE; use zksync_contracts::{read_zbin_bytecode, BaseSystemContracts}; +use zksync_system_constants::ZKPORTER_IS_AVAILABLE; use zksync_types::{Address, StorageLogQuery, H160, MAX_L2_TX_GAS_LIMIT, U256}; use zksync_utils::h256_to_u256; diff --git a/core/multivm_deps/vm_m6/src/vm.rs b/core/multivm_deps/vm_m6/src/vm.rs index 92ef020ba0f..7a75c28ff31 100644 --- a/core/multivm_deps/vm_m6/src/vm.rs +++ b/core/multivm_deps/vm_m6/src/vm.rs @@ -6,7 +6,7 @@ use zk_evm::vm_state::{PrimitiveValue, VmLocalState, VmState}; use zk_evm::witness_trace::DummyTracer; use zk_evm::zkevm_opcode_defs::decoding::{AllowedPcOrImm, EncodingModeProduction, VmEncodingMode}; use zk_evm::zkevm_opcode_defs::definitions::RET_IMPLICIT_RETURNDATA_PARAMS_REGISTER; -use zksync_config::constants::MAX_TXS_IN_BLOCK; +use zksync_system_constants::MAX_TXS_IN_BLOCK; use zksync_types::l2_to_l1_log::L2ToL1Log; use zksync_types::tx::tx_execution_info::{TxExecutionStatus, VmExecutionLogs}; use zksync_types::vm_trace::{Call, VmExecutionTrace, VmTrace}; diff --git a/core/multivm_deps/vm_m6/src/vm_with_bootloader.rs b/core/multivm_deps/vm_m6/src/vm_with_bootloader.rs index 7362c936378..5be0497d046 100644 --- a/core/multivm_deps/vm_m6/src/vm_with_bootloader.rs +++ b/core/multivm_deps/vm_m6/src/vm_with_bootloader.rs @@ -10,8 +10,8 @@ use zk_evm::{ BOOTLOADER_CALLDATA_PAGE, STARTING_BASE_PAGE, STARTING_TIMESTAMP, }, }; -use zksync_config::constants::MAX_TXS_IN_BLOCK; use zksync_contracts::BaseSystemContracts; +use zksync_system_constants::MAX_TXS_IN_BLOCK; use zksync_types::{ zkevm_test_harness::INITIAL_MONOTONIC_CYCLE_COUNTER, Address, Transaction, BOOTLOADER_ADDRESS, diff --git a/core/multivm_deps/vm_virtual_blocks/Cargo.toml b/core/multivm_deps/vm_virtual_blocks/Cargo.toml index 084c6be84bc..ef45ff0fdec 100644 --- a/core/multivm_deps/vm_virtual_blocks/Cargo.toml +++ b/core/multivm_deps/vm_virtual_blocks/Cargo.toml @@ -12,7 +12,7 @@ categories = ["cryptography"] [dependencies] vise = { git = "https://github.com/matter-labs/vise.git", version = "0.1.0", rev = "dd05139b76ab0843443ab3ff730174942c825dae" } zk_evm = { git = "https://github.com/matter-labs/era-zk_evm.git", branch = "v1.3.3" } -zksync_config = { path = "../../lib/config" } +zksync_system_constants = { path = "../../lib/constants" } zksync_types = { path = "../../lib/types" } zksync_utils = { path = "../../lib/utils" } zksync_state = { path = "../../lib/state" } diff --git a/core/multivm_deps/vm_virtual_blocks/src/constants.rs b/core/multivm_deps/vm_virtual_blocks/src/constants.rs index a51688b851e..975e9c8a309 100644 --- a/core/multivm_deps/vm_virtual_blocks/src/constants.rs +++ b/core/multivm_deps/vm_virtual_blocks/src/constants.rs @@ -1,6 +1,6 @@ use zk_evm::aux_structures::MemoryPage; -use zksync_config::constants::{ +use zksync_system_constants::{ L1_GAS_PER_PUBDATA_BYTE, MAX_L2_TX_GAS_LIMIT, MAX_NEW_FACTORY_DEPS, MAX_TXS_IN_BLOCK, USED_BOOTLOADER_MEMORY_WORDS, }; diff --git a/core/multivm_deps/vm_virtual_blocks/src/old_vm/oracles/storage.rs b/core/multivm_deps/vm_virtual_blocks/src/old_vm/oracles/storage.rs index 482cc69bbbd..e1f5467253a 100644 --- a/core/multivm_deps/vm_virtual_blocks/src/old_vm/oracles/storage.rs +++ b/core/multivm_deps/vm_virtual_blocks/src/old_vm/oracles/storage.rs @@ -72,7 +72,7 @@ impl StorageOracle { } fn is_storage_key_free(&self, key: &StorageKey) -> bool { - key.address() == &zksync_config::constants::SYSTEM_CONTEXT_ADDRESS + key.address() == &zksync_system_constants::SYSTEM_CONTEXT_ADDRESS || *key == storage_key_for_eth_balance(&BOOTLOADER_ADDRESS) } diff --git a/core/multivm_deps/vm_virtual_blocks/src/old_vm/utils.rs b/core/multivm_deps/vm_virtual_blocks/src/old_vm/utils.rs index 5df4c6aa801..7ef211aa540 100644 --- a/core/multivm_deps/vm_virtual_blocks/src/old_vm/utils.rs +++ b/core/multivm_deps/vm_virtual_blocks/src/old_vm/utils.rs @@ -10,8 +10,8 @@ use zk_evm::{ vm_state::PrimitiveValue, zkevm_opcode_defs::FatPointer, }; -use zksync_config::constants::L1_GAS_PER_PUBDATA_BYTE; use zksync_state::WriteStorage; +use zksync_system_constants::L1_GAS_PER_PUBDATA_BYTE; use zksync_types::{Address, U256}; diff --git a/core/multivm_deps/vm_virtual_blocks/src/tests/default_aa.rs b/core/multivm_deps/vm_virtual_blocks/src/tests/default_aa.rs index b4c5f6b5832..173a76bf308 100644 --- a/core/multivm_deps/vm_virtual_blocks/src/tests/default_aa.rs +++ b/core/multivm_deps/vm_virtual_blocks/src/tests/default_aa.rs @@ -1,4 +1,4 @@ -use zksync_config::constants::L2_ETH_TOKEN_ADDRESS; +use zksync_system_constants::L2_ETH_TOKEN_ADDRESS; use zksync_types::system_contracts::{DEPLOYMENT_NONCE_INCREMENT, TX_NONCE_INCREMENT}; use zksync_types::{get_code_key, get_known_code_key, get_nonce_key, AccountTreeId, U256}; diff --git a/core/multivm_deps/vm_virtual_blocks/src/tests/get_used_contracts.rs b/core/multivm_deps/vm_virtual_blocks/src/tests/get_used_contracts.rs index 90a8816eb55..2749d7a79b9 100644 --- a/core/multivm_deps/vm_virtual_blocks/src/tests/get_used_contracts.rs +++ b/core/multivm_deps/vm_virtual_blocks/src/tests/get_used_contracts.rs @@ -2,8 +2,8 @@ use std::collections::{HashMap, HashSet}; use itertools::Itertools; -use zksync_config::constants::CONTRACT_DEPLOYER_ADDRESS; use zksync_state::WriteStorage; +use zksync_system_constants::CONTRACT_DEPLOYER_ADDRESS; use zksync_test_account::Account; use zksync_types::{Execute, U256}; use zksync_utils::bytecode::hash_bytecode; diff --git a/core/multivm_deps/vm_virtual_blocks/src/tests/l1_tx_execution.rs b/core/multivm_deps/vm_virtual_blocks/src/tests/l1_tx_execution.rs index cd1c8f2460c..2f83d8b3f20 100644 --- a/core/multivm_deps/vm_virtual_blocks/src/tests/l1_tx_execution.rs +++ b/core/multivm_deps/vm_virtual_blocks/src/tests/l1_tx_execution.rs @@ -1,4 +1,4 @@ -use zksync_config::constants::BOOTLOADER_ADDRESS; +use zksync_system_constants::BOOTLOADER_ADDRESS; use zksync_types::l2_to_l1_log::L2ToL1Log; use zksync_types::storage_writes_deduplicator::StorageWritesDeduplicator; use zksync_types::{get_code_key, get_known_code_key, U256}; diff --git a/core/multivm_deps/vm_virtual_blocks/src/tests/l2_blocks.rs b/core/multivm_deps/vm_virtual_blocks/src/tests/l2_blocks.rs index 9deac837f90..192930d73a4 100644 --- a/core/multivm_deps/vm_virtual_blocks/src/tests/l2_blocks.rs +++ b/core/multivm_deps/vm_virtual_blocks/src/tests/l2_blocks.rs @@ -14,10 +14,10 @@ use crate::{ VmExecutionMode, }; use zk_evm::aux_structures::Timestamp; -use zksync_config::constants::{ +use zksync_state::{ReadStorage, WriteStorage}; +use zksync_system_constants::{ CURRENT_VIRTUAL_BLOCK_INFO_POSITION, REQUIRED_L1_TO_L2_GAS_PER_PUBDATA_BYTE, }; -use zksync_state::{ReadStorage, WriteStorage}; use zksync_types::block::{pack_block_info, unpack_block_info}; use zksync_types::{ block::{legacy_miniblock_hash, miniblock_hash}, diff --git a/core/multivm_deps/vm_virtual_blocks/src/tests/require_eip712.rs b/core/multivm_deps/vm_virtual_blocks/src/tests/require_eip712.rs index 6538318c26f..4cb69b906ca 100644 --- a/core/multivm_deps/vm_virtual_blocks/src/tests/require_eip712.rs +++ b/core/multivm_deps/vm_virtual_blocks/src/tests/require_eip712.rs @@ -2,9 +2,9 @@ use std::convert::TryInto; use ethabi::Token; -use zksync_config::constants::L2_ETH_TOKEN_ADDRESS; use zksync_eth_signer::raw_ethereum_tx::TransactionParameters; use zksync_eth_signer::EthereumSigner; +use zksync_system_constants::L2_ETH_TOKEN_ADDRESS; use zksync_types::fee::Fee; use zksync_types::l2::L2Tx; use zksync_types::transaction_request::TransactionRequest; diff --git a/core/multivm_deps/vm_virtual_blocks/src/tracers/call.rs b/core/multivm_deps/vm_virtual_blocks/src/tracers/call.rs index 12750247604..e7011cb4dca 100644 --- a/core/multivm_deps/vm_virtual_blocks/src/tracers/call.rs +++ b/core/multivm_deps/vm_virtual_blocks/src/tracers/call.rs @@ -8,8 +8,8 @@ use zk_evm::zkevm_opcode_defs::{ CALL_IMPLICIT_CALLDATA_FAT_PTR_REGISTER, RET_IMPLICIT_RETURNDATA_PARAMS_REGISTER, }; -use zksync_config::constants::CONTRACT_DEPLOYER_ADDRESS; use zksync_state::{StoragePtr, WriteStorage}; +use zksync_system_constants::CONTRACT_DEPLOYER_ADDRESS; use zksync_types::vm_trace::{Call, CallType}; use zksync_types::U256; diff --git a/core/multivm_deps/vm_virtual_blocks/src/tracers/refunds.rs b/core/multivm_deps/vm_virtual_blocks/src/tracers/refunds.rs index 14dc16f7c8e..84c6263f2ac 100644 --- a/core/multivm_deps/vm_virtual_blocks/src/tracers/refunds.rs +++ b/core/multivm_deps/vm_virtual_blocks/src/tracers/refunds.rs @@ -7,8 +7,8 @@ use zk_evm::{ tracing::{BeforeExecutionData, VmLocalStateData}, vm_state::VmLocalState, }; -use zksync_config::constants::{PUBLISH_BYTECODE_OVERHEAD, SYSTEM_CONTEXT_ADDRESS}; use zksync_state::{StoragePtr, WriteStorage}; +use zksync_system_constants::{PUBLISH_BYTECODE_OVERHEAD, SYSTEM_CONTEXT_ADDRESS}; use zksync_types::{ event::{extract_long_l2_to_l1_messages, extract_published_bytecodes}, l2_to_l1_log::L2ToL1Log, diff --git a/core/multivm_deps/vm_virtual_blocks/src/tracers/utils.rs b/core/multivm_deps/vm_virtual_blocks/src/tracers/utils.rs index f86b496b078..43a4a6fc33f 100644 --- a/core/multivm_deps/vm_virtual_blocks/src/tracers/utils.rs +++ b/core/multivm_deps/vm_virtual_blocks/src/tracers/utils.rs @@ -5,7 +5,7 @@ use zk_evm::{ zkevm_opcode_defs::{FatPointer, LogOpcode, Opcode, UMAOpcode}, }; -use zksync_config::constants::{ +use zksync_system_constants::{ ECRECOVER_PRECOMPILE_ADDRESS, KECCAK256_PRECOMPILE_ADDRESS, KNOWN_CODES_STORAGE_ADDRESS, L1_MESSENGER_ADDRESS, SHA256_PRECOMPILE_ADDRESS, }; diff --git a/core/multivm_deps/vm_virtual_blocks/src/tracers/validation/mod.rs b/core/multivm_deps/vm_virtual_blocks/src/tracers/validation/mod.rs index ca66aac9e73..e019c9428a9 100644 --- a/core/multivm_deps/vm_virtual_blocks/src/tracers/validation/mod.rs +++ b/core/multivm_deps/vm_virtual_blocks/src/tracers/validation/mod.rs @@ -11,12 +11,12 @@ use zk_evm::{ zkevm_opcode_defs::{ContextOpcode, FarCallABI, LogOpcode, Opcode}, }; -use zksync_config::constants::{ +use zksync_state::{StoragePtr, WriteStorage}; +use zksync_system_constants::{ ACCOUNT_CODE_STORAGE_ADDRESS, BOOTLOADER_ADDRESS, CONTRACT_DEPLOYER_ADDRESS, KECCAK256_PRECOMPILE_ADDRESS, L2_ETH_TOKEN_ADDRESS, MSG_VALUE_SIMULATOR_ADDRESS, SYSTEM_CONTEXT_ADDRESS, }; -use zksync_state::{StoragePtr, WriteStorage}; use zksync_types::{ get_code_key, web3::signing::keccak256, AccountTreeId, Address, StorageKey, H256, U256, diff --git a/core/multivm_deps/vm_virtual_blocks/src/types/internals/vm_state.rs b/core/multivm_deps/vm_virtual_blocks/src/types/internals/vm_state.rs index 60969241295..101bbe101c2 100644 --- a/core/multivm_deps/vm_virtual_blocks/src/types/internals/vm_state.rs +++ b/core/multivm_deps/vm_virtual_blocks/src/types/internals/vm_state.rs @@ -13,8 +13,8 @@ use zk_evm::{ use zk_evm::zkevm_opcode_defs::{ BOOTLOADER_BASE_PAGE, BOOTLOADER_CODE_PAGE, STARTING_BASE_PAGE, STARTING_TIMESTAMP, }; -use zksync_config::constants::BOOTLOADER_ADDRESS; use zksync_state::{StoragePtr, WriteStorage}; +use zksync_system_constants::BOOTLOADER_ADDRESS; use zksync_types::block::legacy_miniblock_hash; use zksync_types::{zkevm_test_harness::INITIAL_MONOTONIC_CYCLE_COUNTER, Address, MiniblockNumber}; use zksync_utils::h256_to_u256; diff --git a/core/multivm_deps/vm_virtual_blocks/src/types/outputs/execution_result.rs b/core/multivm_deps/vm_virtual_blocks/src/types/outputs/execution_result.rs index bb46cb41ec8..44aa053bfc1 100644 --- a/core/multivm_deps/vm_virtual_blocks/src/types/outputs/execution_result.rs +++ b/core/multivm_deps/vm_virtual_blocks/src/types/outputs/execution_result.rs @@ -1,5 +1,5 @@ use crate::{Halt, VmExecutionStatistics, VmRevertReason}; -use zksync_config::constants::PUBLISH_BYTECODE_OVERHEAD; +use zksync_system_constants::PUBLISH_BYTECODE_OVERHEAD; use zksync_types::event::{extract_long_l2_to_l1_messages, extract_published_bytecodes}; use zksync_types::tx::tx_execution_info::VmExecutionLogs; use zksync_types::tx::ExecutionMetrics; diff --git a/core/multivm_deps/vm_virtual_blocks/src/utils/fee.rs b/core/multivm_deps/vm_virtual_blocks/src/utils/fee.rs index e2e0bdbe599..b89c996575a 100644 --- a/core/multivm_deps/vm_virtual_blocks/src/utils/fee.rs +++ b/core/multivm_deps/vm_virtual_blocks/src/utils/fee.rs @@ -1,5 +1,5 @@ //! Utility functions for vm -use zksync_config::constants::MAX_GAS_PER_PUBDATA_BYTE; +use zksync_system_constants::MAX_GAS_PER_PUBDATA_BYTE; use zksync_utils::ceil_div; use crate::old_vm::utils::eth_price_per_pubdata_byte; diff --git a/core/multivm_deps/vm_virtual_blocks/src/utils/l2_blocks.rs b/core/multivm_deps/vm_virtual_blocks/src/utils/l2_blocks.rs index ca33bce0dfd..189ad8e79c5 100644 --- a/core/multivm_deps/vm_virtual_blocks/src/utils/l2_blocks.rs +++ b/core/multivm_deps/vm_virtual_blocks/src/utils/l2_blocks.rs @@ -1,10 +1,10 @@ use crate::{L2Block, L2BlockEnv}; -use zksync_config::constants::{ +use zksync_state::{ReadStorage, StoragePtr}; +use zksync_system_constants::{ SYSTEM_CONTEXT_ADDRESS, SYSTEM_CONTEXT_CURRENT_L2_BLOCK_HASHES_POSITION, SYSTEM_CONTEXT_CURRENT_L2_BLOCK_INFO_POSITION, SYSTEM_CONTEXT_CURRENT_TX_ROLLING_HASH_POSITION, SYSTEM_CONTEXT_STORED_L2_BLOCK_HASHES, }; -use zksync_state::{ReadStorage, StoragePtr}; use zksync_types::block::unpack_block_info; use zksync_types::web3::signing::keccak256; use zksync_types::{AccountTreeId, MiniblockNumber, StorageKey, H256, U256}; diff --git a/core/multivm_deps/vm_virtual_blocks/src/utils/overhead.rs b/core/multivm_deps/vm_virtual_blocks/src/utils/overhead.rs index 6fdce9c724e..1d502ef2d15 100644 --- a/core/multivm_deps/vm_virtual_blocks/src/utils/overhead.rs +++ b/core/multivm_deps/vm_virtual_blocks/src/utils/overhead.rs @@ -1,6 +1,6 @@ use crate::constants::{BLOCK_OVERHEAD_GAS, BLOCK_OVERHEAD_PUBDATA, BOOTLOADER_TX_ENCODING_SPACE}; use zk_evm::zkevm_opcode_defs::system_params::MAX_TX_ERGS_LIMIT; -use zksync_config::constants::{MAX_L2_TX_GAS_LIMIT, MAX_TXS_IN_BLOCK}; +use zksync_system_constants::{MAX_L2_TX_GAS_LIMIT, MAX_TXS_IN_BLOCK}; use zksync_types::l1::is_l1_tx_type; use zksync_types::U256; use zksync_utils::ceil_div_u256; diff --git a/core/tests/loadnext/Cargo.toml b/core/tests/loadnext/Cargo.toml index da222e5328c..12382b9d6cf 100644 --- a/core/tests/loadnext/Cargo.toml +++ b/core/tests/loadnext/Cargo.toml @@ -17,8 +17,9 @@ zksync_utils = { path = "../../lib/utils" } zksync_eth_signer = { path = "../../lib/eth_signer" } zksync_web3_decl = { path = "../../lib/web3_decl" } zksync_eth_client = { path = "../../lib/eth_client" } -zksync_contracts = { path = "../../lib/contracts" } zksync_config = { path = "../../lib/config" } +zksync_contracts = { path = "../../lib/contracts" } +zksync_system_constants = { path = "../../lib/constants" } vlog = { path = "../../lib/vlog" } prometheus_exporter = { path = "../../lib/prometheus_exporter" } diff --git a/core/tests/loadnext/src/account/tx_command_executor.rs b/core/tests/loadnext/src/account/tx_command_executor.rs index 9338044fa2e..9fb8631fdc1 100644 --- a/core/tests/loadnext/src/account/tx_command_executor.rs +++ b/core/tests/loadnext/src/account/tx_command_executor.rs @@ -8,8 +8,8 @@ use zksync::{ get_approval_based_paymaster_input, get_approval_based_paymaster_input_for_estimation, }, }; -use zksync_config::constants::MAX_L1_TRANSACTION_GAS_LIMIT; use zksync_eth_client::EthInterface; +use zksync_system_constants::MAX_L1_TRANSACTION_GAS_LIMIT; use zksync_types::{ api::{BlockNumber, TransactionReceipt}, l2::L2Tx, diff --git a/core/tests/loadnext/src/executor.rs b/core/tests/loadnext/src/executor.rs index 4998ad338b3..08d1ce47d6a 100644 --- a/core/tests/loadnext/src/executor.rs +++ b/core/tests/loadnext/src/executor.rs @@ -9,9 +9,9 @@ use zksync::utils::{ }; use zksync::web3::{contract::Options, types::TransactionReceipt}; use zksync::{EthNamespaceClient, EthereumProvider, ZksNamespaceClient}; -use zksync_config::constants::MAX_L1_TRANSACTION_GAS_LIMIT; use zksync_eth_client::{BoundEthInterface, EthInterface}; use zksync_eth_signer::PrivateKeySigner; +use zksync_system_constants::MAX_L1_TRANSACTION_GAS_LIMIT; use zksync_types::{ api::BlockNumber, tokens::ETHEREUM_ADDRESS, Address, Nonce, REQUIRED_L1_TO_L2_GAS_PER_PUBDATA_BYTE, U256, U64, diff --git a/core/tests/vm-benchmark/harness/Cargo.toml b/core/tests/vm-benchmark/harness/Cargo.toml index ca02305030e..1252ef4b7aa 100644 --- a/core/tests/vm-benchmark/harness/Cargo.toml +++ b/core/tests/vm-benchmark/harness/Cargo.toml @@ -9,7 +9,7 @@ vm = { path = "../../../lib/vm" } zksync_types = { path = "../../../lib/types" } zksync_state = { path = "../../../lib/state" } zksync_utils = { path = "../../../lib/utils" } -zksync_config = { path = "../../../lib/config" } +zksync_system_constants = { path = "../../../lib/constants" } zksync_contracts = { path = "../../../lib/contracts" } zk_evm = { git = "https://github.com/matter-labs/era-zk_evm.git", branch = "v1.3.3" } once_cell = "1.17" diff --git a/core/tests/vm-benchmark/harness/src/lib.rs b/core/tests/vm-benchmark/harness/src/lib.rs index e439e1359fb..16a40f21ae3 100644 --- a/core/tests/vm-benchmark/harness/src/lib.rs +++ b/core/tests/vm-benchmark/harness/src/lib.rs @@ -4,9 +4,9 @@ use vm::{ constants::BLOCK_GAS_LIMIT, HistoryEnabled, L2BlockEnv, TxExecutionMode, Vm, VmExecutionMode, VmExecutionResultAndLogs, }; -use zksync_config::constants::ethereum::MAX_GAS_PER_PUBDATA_BYTE; use zksync_contracts::{deployer_contract, BaseSystemContracts}; use zksync_state::{InMemoryStorage, StorageView}; +use zksync_system_constants::ethereum::MAX_GAS_PER_PUBDATA_BYTE; use zksync_types::{ block::legacy_miniblock_hash, ethabi::{encode, Token}, diff --git a/prover/prover_fri/src/gpu_prover_job_processor.rs b/prover/prover_fri/src/gpu_prover_job_processor.rs index 7742107c4c9..270f94998c6 100644 --- a/prover/prover_fri/src/gpu_prover_job_processor.rs +++ b/prover/prover_fri/src/gpu_prover_job_processor.rs @@ -16,13 +16,13 @@ pub mod gpu_prover { use zksync_prover_fri_types::circuit_definitions::circuit_definitions::recursion_layer::ZkSyncRecursionLayerProof; use zksync_prover_fri_types::WitnessVectorArtifacts; - use zksync_config::configs::fri_prover_group::{CircuitIdRoundTuple, FriProverGroupConfig}; + use zksync_config::configs::fri_prover_group::FriProverGroupConfig; use zksync_config::configs::FriProverConfig; use zksync_dal::ConnectionPool; use zksync_object_store::ObjectStore; use zksync_prover_fri_types::{CircuitWrapper, FriProofWrapper, ProverServiceDataKey}; use zksync_queued_job_processor::{async_trait, JobProcessor}; - use zksync_types::proofs::SocketAddress; + use zksync_types::{basic_fri_types::CircuitIdRoundTuple, proofs::SocketAddress}; use zksync_vk_setup_data_server_fri::get_setup_data_for_circuit_type; use { shivini::gpu_prove_from_external_witness_data, shivini::ProverContext, diff --git a/prover/prover_fri/src/main.rs b/prover/prover_fri/src/main.rs index c0c428d1c71..f387393c072 100644 --- a/prover/prover_fri/src/main.rs +++ b/prover/prover_fri/src/main.rs @@ -6,7 +6,7 @@ use tokio::sync::watch::Receiver; use tokio::task::JoinHandle; use prometheus_exporter::PrometheusExporterConfig; -use zksync_config::configs::fri_prover_group::{CircuitIdRoundTuple, FriProverGroupConfig}; +use zksync_config::configs::fri_prover_group::FriProverGroupConfig; use zksync_config::configs::FriProverConfig; use zksync_config::ObjectStoreConfig; use zksync_dal::connection::DbVariant; @@ -17,6 +17,7 @@ use zksync_prover_fri_utils::get_all_circuit_id_round_tuples_for; use local_ip_address::local_ip; use zksync_prover_utils::region_fetcher::get_zone; use zksync_queued_job_processor::JobProcessor; +use zksync_types::basic_fri_types::CircuitIdRoundTuple; use zksync_types::proofs::GpuProverInstanceStatus; use zksync_types::proofs::SocketAddress; use zksync_utils::wait_for_tasks::wait_for_tasks; diff --git a/prover/prover_fri/src/prover_job_processor.rs b/prover/prover_fri/src/prover_job_processor.rs index 84e0d0a9b40..e4354c69711 100644 --- a/prover/prover_fri/src/prover_job_processor.rs +++ b/prover/prover_fri/src/prover_job_processor.rs @@ -19,14 +19,14 @@ use zksync_prover_fri_types::circuit_definitions::{ use zkevm_test_harness::prover_utils::{prove_base_layer_circuit, prove_recursion_layer_circuit}; -use zksync_config::configs::fri_prover_group::{CircuitIdRoundTuple, FriProverGroupConfig}; +use zksync_config::configs::fri_prover_group::FriProverGroupConfig; use zksync_config::configs::FriProverConfig; use zksync_dal::ConnectionPool; use zksync_object_store::ObjectStore; use zksync_prover_fri_types::{CircuitWrapper, FriProofWrapper, ProverJob, ProverServiceDataKey}; use zksync_prover_fri_utils::fetch_next_circuit; use zksync_queued_job_processor::{async_trait, JobProcessor}; -use zksync_types::protocol_version::L1VerifierConfig; +use zksync_types::{basic_fri_types::CircuitIdRoundTuple, protocol_version::L1VerifierConfig}; use zksync_vk_setup_data_server_fri::{ get_cpu_setup_data_for_circuit_type, GoldilocksProverSetupData, }; diff --git a/prover/prover_fri/src/utils.rs b/prover/prover_fri/src/utils.rs index 2860e607b1e..de8791c2916 100644 --- a/prover/prover_fri/src/utils.rs +++ b/prover/prover_fri/src/utils.rs @@ -7,7 +7,6 @@ use zksync_prover_fri_types::circuit_definitions::boojum::cs::implementations::r use tokio::sync::Mutex; use zkevm_test_harness::prover_utils::{verify_base_layer_proof, verify_recursion_layer_proof}; -use zksync_config::configs::fri_prover_group::CircuitIdRoundTuple; use zksync_dal::StorageProcessor; use zksync_object_store::ObjectStore; use zksync_prover_fri_types::circuit_definitions::boojum::algebraic_props::round_function::AbsorptionModeOverwrite; @@ -25,7 +24,7 @@ use zksync_prover_fri_types::{ }; use zksync_prover_fri_utils::get_base_layer_circuit_id_for_recursive_layer; -use zksync_types::L1BatchNumber; +use zksync_types::{basic_fri_types::CircuitIdRoundTuple, L1BatchNumber}; pub type F = GoldilocksField; pub type H = GoldilocksPoseidon2Sponge; diff --git a/prover/prover_fri_utils/src/lib.rs b/prover/prover_fri_utils/src/lib.rs index 7c880c2c689..cbe6570d657 100644 --- a/prover/prover_fri_utils/src/lib.rs +++ b/prover/prover_fri_utils/src/lib.rs @@ -1,11 +1,11 @@ use std::time::Instant; -use zksync_config::configs::fri_prover_group::CircuitIdRoundTuple; use zksync_dal::StorageProcessor; use zksync_object_store::{FriCircuitKey, ObjectStore}; use zksync_prover_fri_types::circuit_definitions::circuit_definitions::recursion_layer::base_circuit_type_into_recursive_leaf_circuit_type; use zksync_prover_fri_types::circuit_definitions::circuit_definitions::recursion_layer::ZkSyncRecursionLayerStorageType; use zksync_prover_fri_types::circuit_definitions::zkevm_circuits::scheduler::aux::BaseLayerCircuitType; +use zksync_types::basic_fri_types::CircuitIdRoundTuple; use zksync_prover_fri_types::{ get_current_pod_name, CircuitWrapper, ProverJob, ProverServiceDataKey, diff --git a/prover/witness_generator/Cargo.toml b/prover/witness_generator/Cargo.toml index 21dec33f030..f5a7480195c 100644 --- a/prover/witness_generator/Cargo.toml +++ b/prover/witness_generator/Cargo.toml @@ -13,6 +13,7 @@ publish = false # We don't want to publish our binaries. [dependencies] zksync_dal = { path = "../../core/lib/dal" } zksync_config = { path = "../../core/lib/config" } +zksync_system_constants = { path = "../../core/lib/constants" } prometheus_exporter = { path = "../../core/lib/prometheus_exporter" } vlog = { path = "../../core/lib/vlog" } zksync_queued_job_processor = { path = "../../core/lib/queued_job_processor" } diff --git a/prover/witness_generator/src/utils.rs b/prover/witness_generator/src/utils.rs index 19b3d3239e5..0a70858977f 100644 --- a/prover/witness_generator/src/utils.rs +++ b/prover/witness_generator/src/utils.rs @@ -11,7 +11,6 @@ use zksync_prover_fri_types::circuit_definitions::encodings::recursion_request:: use zkevm_test_harness::boojum::field::goldilocks::GoldilocksField; use zkevm_test_harness::witness::full_block_artifact::BlockBasicCircuits; -use zksync_config::constants::USED_BOOTLOADER_MEMORY_BYTES; use zksync_object_store::{ serialize_using_bincode, AggregationsKey, Bucket, ClosedFormInputKey, FriCircuitKey, ObjectStore, StoredObject, @@ -19,6 +18,7 @@ use zksync_object_store::{ use zksync_prover_fri_types::circuit_definitions::zkevm_circuits::scheduler::input::SchedulerCircuitInstanceWitness; use zksync_prover_fri_types::circuit_definitions::ZkSyncDefaultRoundFunction; use zksync_prover_fri_types::{CircuitWrapper, FriProofWrapper}; +use zksync_system_constants::USED_BOOTLOADER_MEMORY_BYTES; use zksync_types::proofs::AggregationRound; use zksync_types::{L1BatchNumber, U256}; diff --git a/prover/witness_vector_generator/src/generator.rs b/prover/witness_vector_generator/src/generator.rs index 24715398491..9851802a54b 100644 --- a/prover/witness_vector_generator/src/generator.rs +++ b/prover/witness_vector_generator/src/generator.rs @@ -5,7 +5,6 @@ use async_trait::async_trait; use tokio::task::JoinHandle; use tokio::time::sleep; -use zksync_config::configs::fri_prover_group::CircuitIdRoundTuple; use zksync_config::configs::FriWitnessVectorGeneratorConfig; use zksync_dal::ConnectionPool; use zksync_object_store::ObjectStore; @@ -15,6 +14,7 @@ use zksync_prover_fri_utils::fetch_next_circuit; use zksync_prover_fri_utils::get_numeric_circuit_id; use zksync_prover_fri_utils::socket_utils::send_assembly; use zksync_queued_job_processor::JobProcessor; +use zksync_types::basic_fri_types::CircuitIdRoundTuple; use zksync_types::proofs::{GpuProverInstanceStatus, SocketAddress}; use zksync_types::protocol_version::L1VerifierConfig; use zksync_vk_setup_data_server_fri::get_finalization_hints;