fix: protobuf and lint fixes

core/bin/external_node/src/main.rs

@@ -8,7 +8,7 @@ use prometheus_exporter::PrometheusExporterConfig;
 use tokio::{sync::watch, task, time::sleep};
 use zksync_basic_types::{Address, L2ChainId};
 use zksync_concurrency::{ctx, scope};
-use zksync_config::configs::{chain::L1BatchCommitDataGeneratorMode, database::MerkleTreeMode};
+use zksync_config::configs::database::MerkleTreeMode;
 use zksync_core::{
     api_server::{
         execution_sandbox::VmConcurrencyLimiter,

core/lib/l1_contract_interface/src/i_executor/structures/commit_batch_info.rs

@@ -58,7 +58,7 @@ impl<'a> Tokenizable for CommitBatchInfo<'a> {
     }
 }
 
-fn pre_boojum_into_token<'a>(l1_batch_commit_with_metadata: &'a L1BatchWithMetadata) -> Token {
+fn pre_boojum_into_token(l1_batch_commit_with_metadata: &L1BatchWithMetadata) -> Token {
     let header = &l1_batch_commit_with_metadata.header;
     let metadata = &l1_batch_commit_with_metadata.metadata;
     Token::Tuple(vec![

core/lib/protobuf_config/src/proto/chain.proto

@@ -18,6 +18,11 @@ enum FeeModelVersion {
   V2 = 1;
 }
 
+enum L1BatchCommitDataGeneratorMode {
+  Rollup = 0;
+  Validium = 1;
+}
+
 message EthNetwork {
   optional Network network = 1; // required
   optional string zksync_network = 2; // required
@@ -51,6 +56,7 @@ message StateKeeper {
   optional uint32 virtual_blocks_per_miniblock = 24; // required
   optional bool upload_witness_inputs_to_gcs = 25; // required
   optional uint64 enum_index_migration_chunk_size = 26; // optional
+  optional L1BatchCommitDataGeneratorMode l1_batch_commit_data_generator_mode = 27; // optional, default to rollup
 }
 
 message OperationsManager {

core/lib/protobuf_config/src/proto/eth_sender.proto

@@ -48,4 +48,5 @@ message GasAdjuster {
   optional uint64 internal_enforced_l1_gas_price = 6; // optional; wei?
   optional uint64 poll_period = 7; // required; s
   optional uint64 max_l1_gas_price = 8; // optional; wei?
+  optional uint64 l1_gas_per_pubdata_byte = 9; // optional; gwei
 }

validium_mode_example/src/main.rs

@@ -80,7 +80,6 @@ async fn main() {
         )
         .from(zk_wallet.l2_address());
 
-
         let eip712_request: Eip712TransactionRequest = request.clone().try_into().unwrap();
         println!("{}", "Deploy".bright_magenta());