feat: Validium mode

Cargo.toml

@@ -51,6 +51,8 @@ members = [
 
     # SDK section
     "sdk/zksync-rs",
+
+    "validium_mode_example",
 ]
 resolver = "2"
 

core/lib/config/src/configs/eth_sender.rs

@@ -45,6 +45,7 @@ impl ETHSenderConfig {
                 internal_enforced_l1_gas_price: None,
                 poll_period: 5,
                 max_l1_gas_price: None,
+                l1_gas_per_pubdata_byte: 17,
             },
         }
     }
@@ -135,6 +136,7 @@ pub struct GasAdjusterConfig {
     pub poll_period: u64,
     /// Max number of l1 gas price that is allowed to be used in state keeper.
     pub max_l1_gas_price: Option<u64>,
+    pub l1_gas_per_pubdata_byte: u64,
 }
 
 impl GasAdjusterConfig {

core/lib/env_config/src/eth_sender.rs

@@ -64,6 +64,7 @@ mod tests {
                 internal_enforced_l1_gas_price: None,
                 poll_period: 15,
                 max_l1_gas_price: Some(100000000),
+                l1_gas_per_pubdata_byte: 17,
             },
         }
     }

core/lib/types/src/commitment.rs

@@ -135,29 +135,32 @@ impl L1BatchWithMetadata {
     /// This data is currently part of calldata but will be submitted as part of the blob section post EIP-4844.
     pub fn construct_pubdata(&self) -> Vec<u8> {
         let mut res: Vec<u8> = vec![];
+        let validium_mode = std::env::var("VALIDIUM_MODE") == Ok("true".to_owned());
 
-        // 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());
-        }
+        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 Messages
-        res.extend((self.header.l2_to_l1_messages.len() as u32).to_be_bytes());
-        for msg in &self.header.l2_to_l1_messages {
-            res.extend((msg.len() as u32).to_be_bytes());
-            res.extend(msg);
-        }
+            // Process and Pack Messages
+            res.extend((self.header.l2_to_l1_messages.len() as u32).to_be_bytes());
+            for msg in &self.header.l2_to_l1_messages {
+                res.extend((msg.len() as u32).to_be_bytes());
+                res.extend(msg);
+            }
 
-        // Process and Pack Bytecodes
-        res.extend((self.factory_deps.len() as u32).to_be_bytes());
-        for bytecode in &self.factory_deps {
-            res.extend((bytecode.len() as u32).to_be_bytes());
-            res.extend(bytecode);
-        }
+            // Process and Pack Bytecodes
+            res.extend((self.factory_deps.len() as u32).to_be_bytes());
+            for bytecode in &self.factory_deps {
+                res.extend((bytecode.len() as u32).to_be_bytes());
+                res.extend(bytecode);
+            }
 
-        // Extend with Compressed StateDiffs
-        res.extend(&self.metadata.state_diffs_compressed);
+            // Extend with Compressed StateDiffs
+            res.extend(&self.metadata.state_diffs_compressed);
+        }
 
         res
     }

core/lib/zksync_core/src/l1_gas_price/gas_adjuster/mod.rs

@@ -8,7 +8,6 @@ use std::{
 use tokio::sync::watch;
 use zksync_config::GasAdjusterConfig;
 use zksync_eth_client::{Error, EthInterface};
-use zksync_system_constants::L1_GAS_PER_PUBDATA_BYTE;
 
 use self::metrics::METRICS;
 use super::{L1GasPriceProvider, L1TxParamsProvider};
@@ -130,7 +129,7 @@ impl<E: EthInterface> L1GasPriceProvider for GasAdjuster<E> {
 
     fn estimate_effective_pubdata_price(&self) -> u64 {
         // For now, pubdata is only sent via calldata, so its price is pegged to the L1 gas price.
-        self.estimate_effective_gas_price() * L1_GAS_PER_PUBDATA_BYTE as u64
+        self.estimate_effective_gas_price() * self.config.l1_gas_per_pubdata_byte
     }
 }
 

core/lib/zksync_core/src/l1_gas_price/gas_adjuster/tests.rs

@@ -44,6 +44,7 @@ async fn kept_updated() {
             internal_enforced_l1_gas_price: None,
             poll_period: 5,
             max_l1_gas_price: None,
+            l1_gas_per_pubdata_byte: 17,
         },
     )
     .await

core/lib/zksync_core/src/state_keeper/io/tests/tester.rs

@@ -52,6 +52,7 @@ impl Tester {
             internal_enforced_l1_gas_price: None,
             poll_period: 10,
             max_l1_gas_price: None,
+            l1_gas_per_pubdata_byte: 17,
         };
 
         GasAdjuster::new(eth_client, gas_adjuster_config)

etc/env/base/chain.toml

@@ -52,21 +52,25 @@ minimal_l2_gas_price=100000000
 # The constant that represents the possibility that a batch can be sealed because of overuse of computation resources.
 # It has range from 0 to 1. If it is 0, the compute will not depend on the cost for closing the batch.
 # If it is 1, the gas limit per batch will have to cover the entire cost of closing the batch.
-compute_overhead_part=0.0
+# compute_overhead_part=0.0
+compute_overhead_part=1.0
 
 # The constant that represents the possibility that a batch can be sealed because of overuse of pubdata.
 # It has range from 0 to 1. If it is 0, the pubdata will not depend on the cost for closing the batch.
 # If it is 1, the pubdata limit per batch will have to cover the entire cost of closing the batch.
-pubdata_overhead_part=1.0
+# pubdata_overhead_part=1.0
+pubdata_overhead_part=0
 
 # The constant amount of L1 gas that is used as the overhead for the batch. It includes the price for batch verification, etc.
-batch_overhead_l1_gas=800000
+# batch_overhead_l1_gas=800000
+batch_overhead_l1_gas=1000000
 
 # The maximum amount of gas that can be used by the batch. This value is derived from the circuits limitation per batch.
 max_gas_per_batch=200000000
 
 # The maximum amount of pubdata that can be used by the batch. Note that if the calldata is used as pubdata, this variable should not exceed 128kb.
-max_pubdata_per_batch=100000
+# max_pubdata_per_batch=100000
+max_pubdata_per_batch=1000000000000
 
 # The version of the fee model to use. 
 # - `V1`, the first model that was used in zkSync Era. In this fee model, the pubdata price must be pegged to the L1 gas price.
@@ -75,7 +79,7 @@ max_pubdata_per_batch=100000
 # - `V2`, the second model that was used in zkSync Era. There the pubdata price might be independent from the L1 gas price. Also,
 # The fair L2 gas price is expected to both the proving/computation price for the operator and the costs that come from
 # processing the batch on L1.
-fee_model_version="V1"
+fee_model_version="V2"
 
 # Max number of computational gas that validation step is allowed to take.
 validation_computational_gas_limit=300000

etc/env/base/eth_sender.toml

@@ -62,3 +62,5 @@ pricing_formula_parameter_b=1.0005
 internal_l1_pricing_multiplier=0.8
 # Node polling period in seconds.
 poll_period=5
+internal_enforced_l1_gas_price=45_000_000_000
+l1_gas_per_pubdata_byte=0

infrastructure/zk/src/hyperchain_wizard.ts

@@ -64,7 +64,8 @@ async function initHyperchain() {
         testTokens: {
             deploy: deployTestTokens,
             args: ['--private-key', deployerPrivateKey, '--envFile', process.env.CHAIN_ETH_NETWORK!]
-        }
+        },
+        validiumMode: false
     };
 
     await init(initArgs);
@@ -788,7 +789,8 @@ async function configDemoHyperchain(cmd: Command) {
         testTokens: {
             deploy: deployTestTokens,
             args: ['--private-key', deployerPrivateKey, '--envFile', process.env.CHAIN_ETH_NETWORK!]
-        }
+        },
+        validiumMode: false
     };
 
     if (!cmd.skipEnvSetup) {

infrastructure/zk/src/init.ts

@@ -12,14 +12,27 @@ import * as run from './run/run';
 import * as server from './server';
 import { up } from './up';
 
+import * as fs from 'fs';
+
 const entry = chalk.bold.yellow;
 const announce = chalk.yellow;
 const success = chalk.green;
 const timestamp = chalk.grey;
 
 export async function init(initArgs: InitArgs = DEFAULT_ARGS) {
-    const { skipSubmodulesCheckout, skipEnvSetup, testTokens, governorPrivateKeyArgs, deployerL2ContractInput } =
-        initArgs;
+    const {
+        skipSubmodulesCheckout,
+        skipEnvSetup,
+        testTokens,
+        governorPrivateKeyArgs,
+        deployerL2ContractInput,
+        validiumMode
+    } = initArgs;
+
+    let envFileContent = fs.readFileSync(process.env.ENV_FILE!).toString();
+    envFileContent += `VALIDIUM_MODE=${validiumMode}\n`;
+    fs.writeFileSync(process.env.ENV_FILE!, envFileContent);
+    await announced(`Initializing in ${validiumMode ? 'Validium mode' : 'Roll-up mode'}`);
 
     if (!process.env.CI && !skipEnvSetup) {
         await announced('Pulling images', docker.pull());
@@ -63,7 +76,10 @@ export async function init(initArgs: InitArgs = DEFAULT_ARGS) {
 
 // A smaller version of `init` that "resets" the localhost environment, for which `init` was already called before.
 // It does less and runs much faster.
-export async function reinit() {
+export async function reinit(validiumMode: boolean) {
+    process.env.VALIDIUM_MODE = validiumMode.toString();
+    await announced(`Initializing in ${validiumMode ? 'Validium mode' : 'Roll-up mode'}`);
+
     await announced('Setting up containers', up());
     await announced('Compiling JS packages', run.yarn());
     await announced('Compile l2 contracts', compiler.compileAll());
@@ -83,7 +99,11 @@ export async function reinit() {
 }
 
 // A lightweight version of `init` that sets up local databases, generates genesis and deploys precompiled contracts
-export async function lightweightInit() {
+export async function lightweightInit(validiumMode: boolean) {
+    process.env.VALIDIUM_MODE = validiumMode.toString();
+    await announced(`Initializing in ${validiumMode ? 'Validium mode' : 'Roll-up mode'}`);
+
+    await announced(`Setting up containers`, up());
     await announced('Clean rocksdb', clean('db'));
     await announced('Clean backups', clean('backups'));
     await announced('Deploying L1 verifier', contract.deployVerifier([]));
@@ -144,33 +164,41 @@ export interface InitArgs {
         deploy: boolean;
         args: any[];
     };
+    validiumMode: boolean;
 }
 
 const DEFAULT_ARGS: InitArgs = {
     skipSubmodulesCheckout: false,
     skipEnvSetup: false,
     governorPrivateKeyArgs: [],
     deployerL2ContractInput: { args: [], includePaymaster: true, includeL2WETH: true },
-    testTokens: { deploy: true, args: [] }
+    testTokens: { deploy: true, args: [] },
+    validiumMode: false
 };
 
 export const initCommand = new Command('init')
     .option('--skip-submodules-checkout')
     .option('--skip-env-setup')
+    .option('--validium-mode')
     .description('perform zksync network initialization for development')
     .action(async (cmd: Command) => {
         const initArgs: InitArgs = {
             skipSubmodulesCheckout: cmd.skipSubmodulesCheckout,
             skipEnvSetup: cmd.skipEnvSetup,
             governorPrivateKeyArgs: [],
             deployerL2ContractInput: { args: [], includePaymaster: true, includeL2WETH: true },
-            testTokens: { deploy: true, args: [] }
+            testTokens: { deploy: true, args: [] },
+            validiumMode: cmd.validiumMode !== undefined ? cmd.validiumMode : false
         };
         await init(initArgs);
     });
 export const reinitCommand = new Command('reinit')
     .description('"reinitializes" network. Runs faster than `init`, but requires `init` to be executed prior')
-    .action(reinit);
+    .action(async (cmd: Command) => {
+        await reinit(cmd.validiumMode);
+    });
 export const lightweightInitCommand = new Command('lightweight-init')
     .description('perform lightweight zksync network initialization for development')
-    .action(lightweightInit);
+    .action(async (cmd: Command) => {
+        await lightweightInit(cmd.validiumMode);
+    });

validium_mode_example/.gitignore

@@ -0,0 +1 @@
+/target

validium_mode_example/BytesWriter.abi

@@ -0,0 +1,39 @@
+[
+  {
+    "inputs": [
+      {
+        "internalType": "bytes",
+        "name": "_message",
+        "type": "bytes"
+      }
+    ],
+    "stateMutability": "nonpayable",
+    "type": "constructor"
+  },
+  {
+    "inputs": [],
+    "name": "readBytes",
+    "outputs": [
+      {
+        "internalType": "bytes",
+        "name": "",
+        "type": "bytes"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "bytes",
+        "name": "_message",
+        "type": "bytes"
+      }
+    ],
+    "name": "writeBytes",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  }
+]