feat: add panic if commitment mode differs (Moved)

.dockerignore

@@ -40,3 +40,4 @@ contracts/.git
 !bellman-cuda
 !prover/vk_setup_data_generator_server_fri/data/
 !.github/release-please/manifest.json
+!trusted_setup.json

.gitignore

@@ -33,9 +33,11 @@ Cargo.lock
 /etc/env/*
 !/etc/env/base
 !/etc/env/dev.toml
+!/etc/env/dev_validium.toml
 !/etc/env/docker.toml
 !/etc/env/ext-node.toml
 !/etc/env/ext-node-docker.toml
+!/etc/env/ext-node-validium.toml
 !/etc/env/consensus_config.json
 !/etc/env/en_consensus_config.json
 /etc/tokens/localhost.json

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "contracts"]
 path = contracts
-url = https://github.com/LambdaClass/era-contracts.git
-branch = update_validium_mode_contracts
+url = https://github.com/matter-labs/era-contracts.git
+branch = feat_validium_mode

README.md

@@ -30,7 +30,7 @@ The following questions will be answered by the following resources:
 zkSync Era is distributed under the terms of either
 
 - Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or <http://www.apache.org/licenses/LICENSE-2.0>)
-- MIT license ([LICENSE-MIT](LICENSE-MIT) or <https://opensource.org/license/mit/>)
+- MIT license ([LICENSE-MIT](LICENSE-MIT) or <https://opensource.org/blog/license/mit/>)
 
 at your option.
 

checks-config/era.dic

@@ -411,6 +411,10 @@ prode
 StorageBatchInfo
 CommitBatchInfo
 IExecutor
+SetChainId
+setChainId
+SetChainIdUpgrade
+state_transition_manager_contract
 
 // Names
 Vyper
@@ -896,5 +900,11 @@ downcasting
 parameterized
 reimplementation
 composability
-DeployRequest
 md5
+shivini
+balancer
+lookups
+stateful
+DeployRequest
+getPubdataPricingMode
+Uint

core/bin/block_reverter/src/main.rs

@@ -1,7 +1,10 @@
 use anyhow::Context as _;
 use clap::{Parser, Subcommand};
 use tokio::io::{self, AsyncReadExt};
-use zksync_config::{ContractsConfig, DBConfig, ETHClientConfig, ETHSenderConfig, PostgresConfig};
+use zksync_config::{
+    configs::ObservabilityConfig, ContractsConfig, DBConfig, ETHClientConfig, ETHSenderConfig,
+    PostgresConfig,
+};
 use zksync_core::block_reverter::{
     BlockReverter, BlockReverterEthConfig, BlockReverterFlags, L1ExecutedBatchesRevert,
 };
@@ -68,19 +71,19 @@ enum Command {
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
-    #[allow(deprecated)] // TODO (QIT-21): Use centralized configuration approach.
-    let log_format = vlog::log_format_from_env();
-    #[allow(deprecated)] // TODO (QIT-21): Use centralized configuration approach.
-    let sentry_url = vlog::sentry_url_from_env();
-    #[allow(deprecated)] // TODO (QIT-21): Use centralized configuration approach.
-    let environment = vlog::environment_from_env();
+    let observability_config =
+        ObservabilityConfig::from_env().context("ObservabilityConfig::from_env()")?;
+    let log_format: vlog::LogFormat = observability_config
+        .log_format
+        .parse()
+        .context("Invalid log format")?;
 
     let mut builder = vlog::ObservabilityBuilder::new().with_log_format(log_format);
-    if let Some(sentry_url) = sentry_url {
+    if let Some(sentry_url) = observability_config.sentry_url {
         builder = builder
             .with_sentry_url(&sentry_url)
             .context("Invalid Sentry URL")?
-            .with_sentry_environment(environment);
+            .with_sentry_environment(observability_config.sentry_environment);
     }
     let _guard = builder.build();
 

core/bin/contract-verifier/src/main.rs

@@ -4,7 +4,10 @@ use anyhow::Context as _;
 use futures::{channel::mpsc, executor::block_on, SinkExt, StreamExt};
 use prometheus_exporter::PrometheusExporterConfig;
 use tokio::sync::watch;
-use zksync_config::{configs::PrometheusConfig, ApiConfig, ContractVerifierConfig, PostgresConfig};
+use zksync_config::{
+    configs::{ObservabilityConfig, PrometheusConfig},
+    ApiConfig, ContractVerifierConfig, PostgresConfig,
+};
 use zksync_dal::ConnectionPool;
 use zksync_env_config::FromEnv;
 use zksync_queued_job_processor::JobProcessor;
@@ -140,24 +143,23 @@ async fn main() -> anyhow::Result<()> {
     .await
     .unwrap();
 
-    #[allow(deprecated)] // TODO (QIT-21): Use centralized configuration approach.
-    let log_format = vlog::log_format_from_env();
-    #[allow(deprecated)] // TODO (QIT-21): Use centralized configuration approach.
-    let sentry_url = vlog::sentry_url_from_env();
-    #[allow(deprecated)] // TODO (QIT-21): Use centralized configuration approach.
-    let environment = vlog::environment_from_env();
-
+    let observability_config =
+        ObservabilityConfig::from_env().context("ObservabilityConfig::from_env()")?;
+    let log_format: vlog::LogFormat = observability_config
+        .log_format
+        .parse()
+        .context("Invalid log format")?;
     let mut builder = vlog::ObservabilityBuilder::new().with_log_format(log_format);
-    if let Some(sentry_url) = &sentry_url {
+    if let Some(sentry_url) = &observability_config.sentry_url {
         builder = builder
             .with_sentry_url(sentry_url)
             .expect("Invalid Sentry URL")
-            .with_sentry_environment(environment);
+            .with_sentry_environment(observability_config.sentry_environment);
     }
     let _guard = builder.build();
 
     // Report whether sentry is running after the logging subsystem was initialized.
-    if let Some(sentry_url) = sentry_url {
+    if let Some(sentry_url) = observability_config.sentry_url {
         tracing::info!("Sentry configured with URL: {sentry_url}");
     } else {
         tracing::info!("No sentry URL was provided");

core/bin/contract-verifier/src/verifier.rs

@@ -305,13 +305,17 @@ impl ContractVerifier {
                     enabled: request.req.optimization_used,
                     mode: request.req.optimizer_mode.and_then(|s| s.chars().next()),
                 };
+                let optimizer_value = serde_json::to_value(optimizer).unwrap();
 
                 let settings = Settings {
-                    libraries: None,
                     output_selection: Some(default_output_selection),
-                    optimizer,
                     is_system: request.req.is_system,
-                    metadata: None,
+                    force_evmla: request.req.force_evmla,
+                    other: serde_json::Value::Object(
+                        vec![("optimizer".to_string(), optimizer_value)]
+                            .into_iter()
+                            .collect(),
+                    ),
                 };
 
                 Ok(ZkSolcInput::StandardJson(StandardJson {

core/bin/contract-verifier/src/zksolc_utils.rs

@@ -34,38 +34,23 @@ pub struct Source {
     pub content: String,
 }
 
-#[derive(Debug, Serialize, Deserialize)]
-pub enum MetadataHash {
-    /// Do not include bytecode hash.
-    #[serde(rename = "none")]
-    None,
-}
-
-#[derive(Debug, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Metadata {
-    /// The bytecode hash mode.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub bytecode_hash: Option<MetadataHash>,
-}
-
+/// Compiler settings.
+/// There are fields like `output_selection`, `is_system`, `force_evmla` which are accessed by contract verifier explicitly.
+/// Other fields are accumulated in `other`, this way every field that was in the original request will be passed to a compiler.
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Settings {
-    /// The linker library addresses.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub libraries: Option<HashMap<String, HashMap<String, String>>>,
     /// The output selection filters.
     pub output_selection: Option<serde_json::Value>,
-    /// The optimizer settings.
-    #[serde(default)]
-    pub optimizer: Optimizer,
-    /// The metadata settings.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub metadata: Option<Metadata>,
     /// Flag for system compilation mode.
     #[serde(default)]
     pub is_system: bool,
+    /// Flag to force `evmla` IR.
+    #[serde(default)]
+    pub force_evmla: bool,
+    /// Other fields.
+    #[serde(flatten)]
+    pub other: serde_json::Value,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
@@ -121,6 +106,9 @@ impl ZkSolc {
             if input.settings.is_system {
                 command.arg("--system-mode");
             }
+            if input.settings.force_evmla {
+                command.arg("--force-evmla");
+            }
         }
         command
             .arg("--solc")