feat: Use l1 real gas

.gitmodules

@@ -1,3 +1,8 @@
 [submodule "contracts"]
 path = contracts
 url = https://github.com/matter-labs/era-contracts.git
+
+[submodule "era-contracts-lambda"]
+path = era-contracts-lambda
+url = https://github.com/lambdaclass/era-contracts.git
+branch = validium_mode

Cargo.toml

@@ -50,7 +50,7 @@ members = [
     "sdk/zksync-rs",
 
     # Validium Example
-    "zksync_full_stack",
+    "validium_mode_example",
 ]
 resolver = "2"
 

core/lib/multivm/src/versions/vm_latest/old_vm/utils.rs

@@ -7,7 +7,6 @@ use zk_evm_1_4_0::{
     },
 };
 use zksync_state::WriteStorage;
-use zksync_system_constants::L1_GAS_PER_PUBDATA_BYTE;
 use zksync_types::{Address, U256};
 
 use crate::vm_latest::{
@@ -96,12 +95,6 @@ pub(crate) fn precompile_calls_count_after_timestamp(
     sorted_timestamps.len() - sorted_timestamps.partition_point(|t| *t < from_timestamp)
 }
 
-pub(crate) fn eth_price_per_pubdata_byte(l1_gas_price: u64) -> u64 {
-    // This value will typically be a lot less than u64
-    // unless the gas price on L1 goes beyond tens of millions of gwei
-    l1_gas_price * (L1_GAS_PER_PUBDATA_BYTE as u64)
-}
-
 pub(crate) fn vm_may_have_ended_inner<S: WriteStorage, H: HistoryMode>(
     vm: &ZkSyncVmState<S, H>,
 ) -> Option<VmExecutionResult> {

core/lib/multivm/src/versions/vm_latest/oracles/storage.rs

@@ -456,9 +456,17 @@ fn get_pubdata_price_bytes(initial_value: U256, final_value: U256, is_initial: b
         compress_with_best_strategy(initial_value, final_value).len() as u32;
 
     if is_initial {
-        (BYTES_PER_DERIVED_KEY as u32) + compressed_value_size
+        println!("is initial");
+        let pubdata_price_bytes = (BYTES_PER_DERIVED_KEY as u32) + compressed_value_size;
+        println!("pubdata_price_bytes: {}", pubdata_price_bytes);
+        pubdata_price_bytes
+        // (BYTES_PER_DERIVED_KEY as u32) + compressed_value_size
     } else {
-        (BYTES_PER_ENUMERATION_INDEX as u32) + compressed_value_size
+        println!("is repeated");
+        let pubdata_price_bytes = (BYTES_PER_ENUMERATION_INDEX as u32) + compressed_value_size;
+        println!("pubdata_price_bytes: {}", pubdata_price_bytes);
+        pubdata_price_bytes
+        // (BYTES_PER_ENUMERATION_INDEX as u32) + compressed_value_size
     }
 }
 

core/lib/multivm/src/versions/vm_latest/tracers/refunds.rs

@@ -23,17 +23,15 @@ use crate::{
     vm_latest::{
         bootloader_state::BootloaderState,
         constants::{BOOTLOADER_HEAP_PAGE, OPERATOR_REFUNDS_OFFSET, TX_GAS_LIMIT_OFFSET},
-        old_vm::{
-            events::merge_events, history_recorder::HistoryMode, memory::SimpleMemory,
-            utils::eth_price_per_pubdata_byte,
-        },
+        old_vm::{events::merge_events, history_recorder::HistoryMode, memory::SimpleMemory},
         tracers::{
             traits::VmTracer,
             utils::{
                 gas_spent_on_bytecodes_and_long_messages_this_opcode, get_vm_hook_params, VmHook,
             },
         },
         types::internals::ZkSyncVmState,
+        utils::fee::eth_price_per_pubdata_byte,
     },
 };
 

core/lib/multivm/src/versions/vm_latest/utils/fee.rs

@@ -1,8 +1,14 @@
 //! Utility functions for vm
-use zksync_system_constants::MAX_GAS_PER_PUBDATA_BYTE;
+use zksync_system_constants::{L1_GAS_PER_PUBDATA_BYTE, MAX_GAS_PER_PUBDATA_BYTE};
 use zksync_utils::ceil_div;
 
-use crate::vm_latest::old_vm::utils::eth_price_per_pubdata_byte;
+pub(crate) fn eth_price_per_pubdata_byte(l1_gas_price: u64) -> u64 {
+    // This value will typically be a lot less than u64
+    // unless the gas price on L1 goes beyond tens of millions of gwei
+    // TODO: make this check only once
+    let validium_mode = std::env::var("ETH_SENDER_SENDER_VALIDIUM_MODE") == Ok("true".to_string());
+    l1_gas_price * (L1_GAS_PER_PUBDATA_BYTE as u64) * (!validium_mode as u64)
+}
 
 /// Calculates the amount of gas required to publish one byte of pubdata
 pub fn base_fee_to_gas_per_pubdata(l1_gas_price: u64, base_fee: u64) -> u64 {

core/lib/types/src/commitment.rs

@@ -224,14 +224,14 @@ impl L1BatchWithMetadata {
     pub fn construct_pubdata(&self, validium_mode: bool) -> Vec<u8> {
         let mut res: Vec<u8> = vec![];
 
-        // Process and Pack Logs
-        res.extend((self.header.l2_to_l1_logs.len() as u32).to_be_bytes());
-        for l2_to_l1_log in &self.header.l2_to_l1_logs {
-            res.extend(l2_to_l1_log.0.to_bytes());
-        }
-
-        // We do not want to publish L2->L1 msgs, bytecodes, and state diffs in validium mode.
+        // We do not want to publish L2-L1 logs, L2->L1 msgs, bytecodes, and state diffs in validium mode.
         if !validium_mode {
+            // Process and Pack Logs
+            res.extend((self.header.l2_to_l1_logs.len() as u32).to_be_bytes());
+            for l2_to_l1_log in &self.header.l2_to_l1_logs {
+                res.extend(l2_to_l1_log.0.to_bytes());
+            }
+
             // Process and Pack Msgs
             res.extend((self.header.l2_to_l1_messages.len() as u32).to_be_bytes());
             for msg in &self.header.l2_to_l1_messages {

etc/env/base/eth_sender.toml

@@ -7,58 +7,59 @@
 # operator_commit_eth_addr is defined in the `private.toml`
 
 # Amount of confirmations required to consider L1 transaction committed.
-wait_confirmations=1
+wait_confirmations = 1
 # Amount of blocks we will wait before considering L1 transaction stuck.
-expected_wait_time_block=30
+expected_wait_time_block = 30
 # Node polling period in seconds.
-tx_poll_period=1
+tx_poll_period = 1
 # Aggregate txs polling period in seconds.
-aggregate_tx_poll_period=1
+aggregate_tx_poll_period = 1
 # The maximum amount of simultaneously sent Ethereum transactions.
-max_txs_in_flight=30 # Safe in the local environment, do not repeat on prod (right now it will produce way too many extra calls to web3)
-proof_sending_mode="SkipEveryProof"
+max_txs_in_flight = 30                # Safe in the local environment, do not repeat on prod (right now it will produce way too many extra calls to web3)
+proof_sending_mode = "SkipEveryProof"
 
 # Max L2 blocks to commit in one L1 transaction
-max_aggregated_blocks_to_commit=10
+max_aggregated_blocks_to_commit = 10
 # Max L2 blocks to execute in one L1 transaction
-max_aggregated_blocks_to_execute=10
+max_aggregated_blocks_to_execute = 10
 
-aggregated_block_commit_deadline=1
-aggregated_block_prove_deadline=10
-aggregated_block_execute_deadline=10
+aggregated_block_commit_deadline = 1
+aggregated_block_prove_deadline = 10
+aggregated_block_execute_deadline = 10
 
-timestamp_criteria_max_allowed_lag=30
+timestamp_criteria_max_allowed_lag = 30
 
 # Based on geth implementation max size of transaction is 128kb.
-max_eth_tx_data_size=120000
+max_eth_tx_data_size = 120000
 # Aggregated proof sizes to be generated by server.
-aggregated_proof_sizes=[1,4]
+aggregated_proof_sizes = [1, 4]
 
 # Max gas that can be used to execute aggregated operation
 # for now (should be > 4kk which is max gas for one block commit/verify/execute)
-max_aggregated_tx_gas=4000000
+max_aggregated_tx_gas = 4000000
 
 # Max gas that can used to include single block in aggregated operation
-max_single_tx_gas=6000000
+max_single_tx_gas = 6000000
 
 # Max acceptable fee for sending tx to L1
-max_acceptable_priority_fee_in_gwei=100000000000
+max_acceptable_priority_fee_in_gwei = 100000000000
 
-proof_loading_mode="OldProofFromDb"
+proof_loading_mode = "OldProofFromDb"
 
 [eth_sender.gas_adjuster]
 # Priority fee to be used by GasAdjuster (in wei).
-default_priority_fee_per_gas=1_000_000_000
+default_priority_fee_per_gas = 1_000_000_000
 # Max number of base fees from previous blocks to be used to correctly price transactions.
-max_base_fee_samples=10_000
+max_base_fee_samples = 10_000
 # These two are parameters of the base_fee_per_gas formula in GasAdjuster.
 # The possible formulas are:
 # 1. base_fee_median * (A + B * time_in_mempool)
 # 2. base_fee_median * A * B ^ time_in_mempool
 # Currently the second is used.
 # To confirm, see core/bin/zksync_core/src/eth_sender/gas_adjuster/mod.rs
-pricing_formula_parameter_a=1.5
-pricing_formula_parameter_b=1.0005
-internal_l1_pricing_multiplier=0.8
+pricing_formula_parameter_a = 1.5
+pricing_formula_parameter_b = 1.0005
+internal_l1_pricing_multiplier = 0.8
+internal_enforced_l1_gas_price = 30955970638
 # Node polling period in seconds.
-poll_period=5
+poll_period = 5